util/rubocop -A --only Layout/SpaceInsideArrayLiteralBrackets
This commit is contained in:
Hiroshi SHIBATA
parent
3e1f767cd5
commit
0373615948
@ -74,7 +74,7 @@ The push command will use ~/.gem/credentials to authenticate to a server, but yo
|
||||
@host ||= push_host
|
||||
|
||||
# Always include @host, even if it's nil
|
||||
args += [ @host, push_host ]
|
||||
args += [@host, push_host]
|
||||
|
||||
say "Pushing gem to #{@host || Gem.host}..."
|
||||
|
||||
|
||||
@ -105,10 +105,11 @@ module Gem::Deprecate
|
||||
define_method name do |*args, &block|
|
||||
klass = self.is_a? Module
|
||||
target = klass ? "#{self}." : "#{self.class}#"
|
||||
msg = [ "NOTE: #{target}#{name} is deprecated",
|
||||
repl == :none ? " with no replacement" : "; use #{repl} instead",
|
||||
". It will be removed on or after %4d-%02d." % [year, month],
|
||||
"\n#{target}#{name} called from #{Gem.location_of_caller.join(":")}",
|
||||
msg = [
|
||||
"NOTE: #{target}#{name} is deprecated",
|
||||
repl == :none ? " with no replacement" : "; use #{repl} instead",
|
||||
". It will be removed on or after %4d-%02d." % [year, month],
|
||||
"\n#{target}#{name} called from #{Gem.location_of_caller.join(":")}",
|
||||
]
|
||||
warn "#{msg.join}." unless Gem::Deprecate.skip
|
||||
send old, *args, &block
|
||||
@ -130,10 +131,11 @@ module Gem::Deprecate
|
||||
define_method name do |*args, &block|
|
||||
klass = self.is_a? Module
|
||||
target = klass ? "#{self}." : "#{self.class}#"
|
||||
msg = [ "NOTE: #{target}#{name} is deprecated",
|
||||
replacement == :none ? " with no replacement" : "; use #{replacement} instead",
|
||||
". It will be removed in Rubygems #{Gem::Deprecate.next_rubygems_major_version}",
|
||||
"\n#{target}#{name} called from #{Gem.location_of_caller.join(":")}",
|
||||
msg = [
|
||||
"NOTE: #{target}#{name} is deprecated",
|
||||
replacement == :none ? " with no replacement" : "; use #{replacement} instead",
|
||||
". It will be removed in Rubygems #{Gem::Deprecate.next_rubygems_major_version}",
|
||||
"\n#{target}#{name} called from #{Gem.location_of_caller.join(":")}",
|
||||
]
|
||||
warn "#{msg.join}." unless Gem::Deprecate.skip
|
||||
send old, *args, &block
|
||||
@ -150,8 +152,9 @@ module Gem::Deprecate
|
||||
end
|
||||
|
||||
define_method "deprecation_warning" do
|
||||
msg = [ "#{self.command} command is deprecated",
|
||||
". It will be removed in Rubygems #{version}.\n",
|
||||
msg = [
|
||||
"#{self.command} command is deprecated",
|
||||
". It will be removed in Rubygems #{version}.\n",
|
||||
]
|
||||
|
||||
alert_warning msg.join.to_s unless Gem::Deprecate.skip
|
||||
|
||||
@ -95,30 +95,30 @@ class Gem::Platform
|
||||
end # legacy jruby
|
||||
|
||||
@os, @version = case os
|
||||
when /aix(\d+)?/ then [ "aix", $1 ]
|
||||
when /cygwin/ then [ "cygwin", nil ]
|
||||
when /darwin(\d+)?/ then [ "darwin", $1 ]
|
||||
when /^macruby$/ then [ "macruby", nil ]
|
||||
when /freebsd(\d+)?/ then [ "freebsd", $1 ]
|
||||
when /^java$/, /^jruby$/ then [ "java", nil ]
|
||||
when /^java([\d.]*)/ then [ "java", $1 ]
|
||||
when /^dalvik(\d+)?$/ then [ "dalvik", $1 ]
|
||||
when /^dotnet$/ then [ "dotnet", nil ]
|
||||
when /^dotnet([\d.]*)/ then [ "dotnet", $1 ]
|
||||
when /linux-?(\w+)?/ then [ "linux", $1 ]
|
||||
when /mingw32/ then [ "mingw32", nil ]
|
||||
when /mingw-?(\w+)?/ then [ "mingw", $1 ]
|
||||
when /aix(\d+)?/ then ["aix", $1]
|
||||
when /cygwin/ then ["cygwin", nil]
|
||||
when /darwin(\d+)?/ then ["darwin", $1]
|
||||
when /^macruby$/ then ["macruby", nil]
|
||||
when /freebsd(\d+)?/ then ["freebsd", $1]
|
||||
when /^java$/, /^jruby$/ then ["java", nil]
|
||||
when /^java([\d.]*)/ then ["java", $1]
|
||||
when /^dalvik(\d+)?$/ then ["dalvik", $1]
|
||||
when /^dotnet$/ then ["dotnet", nil]
|
||||
when /^dotnet([\d.]*)/ then ["dotnet", $1]
|
||||
when /linux-?(\w+)?/ then ["linux", $1]
|
||||
when /mingw32/ then ["mingw32", nil]
|
||||
when /mingw-?(\w+)?/ then ["mingw", $1]
|
||||
when /(mswin\d+)(\_(\d+))?/ then
|
||||
os = $1
|
||||
version = $3
|
||||
@cpu = "x86" if @cpu.nil? && os =~ /32$/
|
||||
[os, version]
|
||||
when /netbsdelf/ then [ "netbsdelf", nil ]
|
||||
when /openbsd(\d+\.\d+)?/ then [ "openbsd", $1 ]
|
||||
when /solaris(\d+\.\d+)?/ then [ "solaris", $1 ]
|
||||
when /netbsdelf/ then ["netbsdelf", nil]
|
||||
when /openbsd(\d+\.\d+)?/ then ["openbsd", $1]
|
||||
when /solaris(\d+\.\d+)?/ then ["solaris", $1]
|
||||
# test
|
||||
when /^(\w+_platform)(\d+)?/ then [ $1, $2 ]
|
||||
else [ "unknown", nil ]
|
||||
when /^(\w+_platform)(\d+)?/ then [$1, $2]
|
||||
else ["unknown", nil]
|
||||
end
|
||||
when Gem::Platform then
|
||||
@cpu = arch.cpu
|
||||
@ -213,17 +213,17 @@ class Gem::Platform
|
||||
when String then
|
||||
# This data is from http://gems.rubyforge.org/gems/yaml on 19 Aug 2007
|
||||
other = case other
|
||||
when /^i686-darwin(\d)/ then ["x86", "darwin", $1 ]
|
||||
when /^i\d86-linux/ then ["x86", "linux", nil ]
|
||||
when "java", "jruby" then [nil, "java", nil ]
|
||||
when /^dalvik(\d+)?$/ then [nil, "dalvik", $1 ]
|
||||
when /dotnet(\-(\d+\.\d+))?/ then ["universal","dotnet", $2 ]
|
||||
when /mswin32(\_(\d+))?/ then ["x86", "mswin32", $2 ]
|
||||
when /mswin64(\_(\d+))?/ then ["x64", "mswin64", $2 ]
|
||||
when "powerpc-darwin" then ["powerpc", "darwin", nil ]
|
||||
when /powerpc-darwin(\d)/ then ["powerpc", "darwin", $1 ]
|
||||
when /sparc-solaris2.8/ then ["sparc", "solaris", "2.8" ]
|
||||
when /universal-darwin(\d)/ then ["universal", "darwin", $1 ]
|
||||
when /^i686-darwin(\d)/ then ["x86", "darwin", $1]
|
||||
when /^i\d86-linux/ then ["x86", "linux", nil]
|
||||
when "java", "jruby" then [nil, "java", nil]
|
||||
when /^dalvik(\d+)?$/ then [nil, "dalvik", $1]
|
||||
when /dotnet(\-(\d+\.\d+))?/ then ["universal","dotnet", $2]
|
||||
when /mswin32(\_(\d+))?/ then ["x86", "mswin32", $2]
|
||||
when /mswin64(\_(\d+))?/ then ["x64", "mswin64", $2]
|
||||
when "powerpc-darwin" then ["powerpc", "darwin", nil]
|
||||
when /powerpc-darwin(\d)/ then ["powerpc", "darwin", $1]
|
||||
when /sparc-solaris2.8/ then ["sparc", "solaris", "2.8"]
|
||||
when /universal-darwin(\d)/ then ["universal", "darwin", $1]
|
||||
else other
|
||||
end
|
||||
|
||||
|
||||
@ -1552,8 +1552,8 @@ class TestGem < Gem::TestCase
|
||||
assert_equal m1.gem_dir, File.join(Gem.user_dir, "gems", "m-1")
|
||||
|
||||
tests = [
|
||||
[:dir0, [ Gem.dir, Gem.user_dir], m0],
|
||||
[:dir1, [ Gem.user_dir, Gem.dir], m1],
|
||||
[:dir0, [Gem.dir, Gem.user_dir], m0],
|
||||
[:dir1, [Gem.user_dir, Gem.dir], m1],
|
||||
]
|
||||
|
||||
tests.each do |_name, _paths, expected|
|
||||
@ -1604,7 +1604,7 @@ class TestGem < Gem::TestCase
|
||||
install_gem m, :install_dir => Gem.dir
|
||||
install_gem m, :install_dir => Gem.user_dir
|
||||
|
||||
Gem.use_paths Gem.dir, [ Gem.dir, Gem.user_dir]
|
||||
Gem.use_paths Gem.dir, [Gem.dir, Gem.user_dir]
|
||||
|
||||
assert_equal \
|
||||
File.join(Gem.dir, "gems", "m-1"),
|
||||
|
||||
@ -286,7 +286,7 @@ class TestGemRequirement < Gem::TestCase
|
||||
end
|
||||
|
||||
def test_illformed_requirements
|
||||
[ ">>> 1.3.5", "> blah" ].each do |rq|
|
||||
[">>> 1.3.5", "> blah"].each do |rq|
|
||||
assert_raise Gem::Requirement::BadRequirementError, "req [#{rq}] should fail" do
|
||||
Gem::Requirement.new rq
|
||||
end
|
||||
|
||||
@ -1973,8 +1973,8 @@ dependencies: []
|
||||
test_cases = {
|
||||
"i386-mswin32" => ["x86", "mswin32", "60"],
|
||||
"i386-mswin32_80" => ["x86", "mswin32", "80"],
|
||||
"i386-mingw32" => ["x86", "mingw32", nil ],
|
||||
"x86-darwin8" => ["x86", "darwin", "8" ],
|
||||
"i386-mingw32" => ["x86", "mingw32", nil],
|
||||
"x86-darwin8" => ["x86", "darwin", "8"],
|
||||
}
|
||||
|
||||
test_cases.each do |arch, expected|
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user