1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[rubygems/rubygems] util/rubocop -A --only Style/NestedParenthesizedCalls

Browse Source 
https://github.com/rubygems/rubygems/commit/a875fdb535
This commit is contained in:
Hiroshi SHIBATA 2023-03-16 13:08:18 +09:00
parent 3d4c3f9e4f
commit 567db6064b
8 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/rubygems/installer.rb
View File

@ -810,7 +810,7 @@ TEXT
ruby_exe = "#{rb_config["RUBY_INSTALL_NAME"]}#{rb_config["EXEEXT"]}" ruby_exe = "#{rb_config["RUBY_INSTALL_NAME"]}#{rb_config["EXEEXT"]}"
ruby_exe = "ruby.exe" if ruby_exe.empty? ruby_exe = "ruby.exe" if ruby_exe.empty?
if File.exist?(File.join bindir, ruby_exe) if File.exist?(File.join(bindir, ruby_exe))
# stub & ruby.exe within same folder. Portable # stub & ruby.exe within same folder. Portable
<<-TEXT <<-TEXT
@ECHO OFF @ECHO OFF

4
lib/rubygems/request_set/gem_dependency_api.rb
View File

@ -532,8 +532,8 @@ Gem dependencies file #{@path} includes git reference for both ref/branch and ta
# platform matches the current platform. # platform matches the current platform.
def gem_platforms(name, options) # :nodoc: def gem_platforms(name, options) # :nodoc:
platform_names = Array(options.delete :platform) platform_names = Array(options.delete(:platform))
platform_names.concat Array(options.delete :platforms) platform_names.concat Array(options.delete(:platforms))
platform_names.concat @current_platforms if @current_platforms platform_names.concat @current_platforms if @current_platforms
return true if platform_names.empty? return true if platform_names.empty?

6
test/rubygems/bundler_test_gem.rb
View File

@ -36,7 +36,7 @@ class TestBundlerGem < Gem::TestCase
s.files << discover_path s.files << discover_path
end end
write_file(File.join "gems", spec.full_name, discover_path) do |fp| write_file(File.join("gems", spec.full_name, discover_path)) do |fp|
fp.puts "# #{spec.full_name}" fp.puts "# #{spec.full_name}"
end end
@ -44,11 +44,11 @@ class TestBundlerGem < Gem::TestCase
end end
Gem.refresh Gem.refresh
write_file(File.join Dir.pwd, "Gemfile") do |fp| write_file(File.join(Dir.pwd, "Gemfile")) do |fp|
fp.puts "source 'https://rubygems.org'" fp.puts "source 'https://rubygems.org'"
fp.puts "gem '#{foo1.name}', '#{foo1.version}'" fp.puts "gem '#{foo1.name}', '#{foo1.version}'"
end end
Gem.use_gemdeps(File.join Dir.pwd, "Gemfile") Gem.use_gemdeps(File.join(Dir.pwd, "Gemfile"))
expected = [ expected = [
File.expand_path("test/rubygems/sff/discover.rb", PROJECT_DIR), File.expand_path("test/rubygems/sff/discover.rb", PROJECT_DIR),

2
test/rubygems/test_deprecate.rb
View File

@ -28,7 +28,7 @@ class TestDeprecate < Gem::TestCase
assert_equal true, Gem::Deprecate.skip assert_equal true, Gem::Deprecate.skip
Gem::Deprecate.skip = nil Gem::Deprecate.skip = nil
assert([true,false].include? Gem::Deprecate.skip) assert([true,false].include?(Gem::Deprecate.skip))
end end
def test_skip def test_skip

4
test/rubygems/test_gem.rb
View File

@ -734,7 +734,7 @@ class TestGem < Gem::TestCase
s.files << discover_path s.files << discover_path
end end
write_file(File.join "gems", spec.full_name, discover_path) do |fp| write_file(File.join("gems", spec.full_name, discover_path)) do |fp|
fp.puts "# #{spec.full_name}" fp.puts "# #{spec.full_name}"
end end
@ -766,7 +766,7 @@ class TestGem < Gem::TestCase
s.files << discover_path s.files << discover_path
end end
write_file(File.join "gems", spec.full_name, discover_path) do |fp| write_file(File.join("gems", spec.full_name, discover_path)) do |fp|
fp.puts "# #{spec.full_name}" fp.puts "# #{spec.full_name}"
end end

2
test/rubygems/test_gem_commands_unpack_command.rb
View File

@ -15,7 +15,7 @@ class TestGemCommandsUnpackCommand < Gem::TestCase
util_make_gems util_make_gems
assert_equal( assert_equal(
@cmd.find_in_cache(File.basename @a1.cache_file), @cmd.find_in_cache(File.basename(@a1.cache_file)),
@a1.cache_file, @a1.cache_file,
"found a-1.gem in the cache" "found a-1.gem in the cache"
) )

12
test/rubygems/test_gem_request.rb
View File

@ -185,7 +185,7 @@ class TestGemRequest < Gem::TestCase
end end
def test_fetch def test_fetch
uri = Gem::Uri.new(URI.parse "#{@gem_repo}/specs.#{Gem.marshal_version}") uri = Gem::Uri.new(URI.parse("#{@gem_repo}/specs.#{Gem.marshal_version}"))
response = util_stub_net_http(:body => :junk, :code => 200) do response = util_stub_net_http(:body => :junk, :code => 200) do
@request = make_request(uri, Net::HTTP::Get, nil, nil) @request = make_request(uri, Net::HTTP::Get, nil, nil)
@ -198,7 +198,7 @@ class TestGemRequest < Gem::TestCase
def test_fetch_basic_auth def test_fetch_basic_auth
Gem.configuration.verbose = :really Gem.configuration.verbose = :really
uri = Gem::Uri.new(URI.parse "https://user:pass@example.rubygems/specs.#{Gem.marshal_version}") uri = Gem::Uri.new(URI.parse("https://user:pass@example.rubygems/specs.#{Gem.marshal_version}"))
conn = util_stub_net_http(:body => :junk, :code => 200) do |c| conn = util_stub_net_http(:body => :junk, :code => 200) do |c|
use_ui @ui do use_ui @ui do
@request = make_request(uri, Net::HTTP::Get, nil, nil) @request = make_request(uri, Net::HTTP::Get, nil, nil)
@ -214,7 +214,7 @@ class TestGemRequest < Gem::TestCase
def test_fetch_basic_auth_encoded def test_fetch_basic_auth_encoded
Gem.configuration.verbose = :really Gem.configuration.verbose = :really
uri = Gem::Uri.new(URI.parse "https://user:%7BDEScede%7Dpass@example.rubygems/specs.#{Gem.marshal_version}") uri = Gem::Uri.new(URI.parse("https://user:%7BDEScede%7Dpass@example.rubygems/specs.#{Gem.marshal_version}"))
conn = util_stub_net_http(:body => :junk, :code => 200) do |c| conn = util_stub_net_http(:body => :junk, :code => 200) do |c|
use_ui @ui do use_ui @ui do
@ -231,7 +231,7 @@ class TestGemRequest < Gem::TestCase
def test_fetch_basic_oauth_encoded def test_fetch_basic_oauth_encoded
Gem.configuration.verbose = :really Gem.configuration.verbose = :really
uri = Gem::Uri.new(URI.parse "https://%7BDEScede%7Dpass:x-oauth-basic@example.rubygems/specs.#{Gem.marshal_version}") uri = Gem::Uri.new(URI.parse("https://%7BDEScede%7Dpass:x-oauth-basic@example.rubygems/specs.#{Gem.marshal_version}"))
conn = util_stub_net_http(:body => :junk, :code => 200) do |c| conn = util_stub_net_http(:body => :junk, :code => 200) do |c|
use_ui @ui do use_ui @ui do
@ -247,7 +247,7 @@ class TestGemRequest < Gem::TestCase
end end
def test_fetch_head def test_fetch_head
uri = Gem::Uri.new(URI.parse "#{@gem_repo}/specs.#{Gem.marshal_version}") uri = Gem::Uri.new(URI.parse("#{@gem_repo}/specs.#{Gem.marshal_version}"))
response = util_stub_net_http(:body => "", :code => 200) do |_conn| response = util_stub_net_http(:body => "", :code => 200) do |_conn|
@request = make_request(uri, Net::HTTP::Get, nil, nil) @request = make_request(uri, Net::HTTP::Get, nil, nil)
@request.fetch @request.fetch
@ -258,7 +258,7 @@ class TestGemRequest < Gem::TestCase
end end
def test_fetch_unmodified def test_fetch_unmodified
uri = Gem::Uri.new(URI.parse "#{@gem_repo}/specs.#{Gem.marshal_version}") uri = Gem::Uri.new(URI.parse("#{@gem_repo}/specs.#{Gem.marshal_version}"))
t = Time.utc(2013, 1, 2, 3, 4, 5) t = Time.utc(2013, 1, 2, 3, 4, 5)
conn, response = util_stub_net_http(:body => "", :code => 304) do |c| conn, response = util_stub_net_http(:body => "", :code => 304) do |c|
@request = make_request(uri, Net::HTTP::Get, t, nil) @request = make_request(uri, Net::HTTP::Get, t, nil)

4
test/rubygems/test_require.rb
View File

@ -383,8 +383,8 @@ class TestGemRequire < Gem::TestCase
# Remove an old default gem version directly from disk as if someone ran # Remove an old default gem version directly from disk as if someone ran
# gem cleanup. # gem cleanup.
FileUtils.rm_rf(File.join @gemhome, "#{b1.full_name}") FileUtils.rm_rf(File.join(@gemhome, "#{b1.full_name}"))
FileUtils.rm_rf(File.join @gemhome, "specifications", "default", "#{b1.full_name}.gemspec") FileUtils.rm_rf(File.join(@gemhome, "specifications", "default", "#{b1.full_name}.gemspec"))
# Require gems that have not been removed. # Require gems that have not been removed.
assert_require "a/b" assert_require "a/b"