aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHiroshi SHIBATA <hsbt@ruby-lang.org>2023-03-16 13:07:05 +0900
committerHiroshi SHIBATA <hsbt@ruby-lang.org>2023-03-17 18:50:55 +0900
commit3d4c3f9e4ffc31e652b1bfab4d78f8b27d5b8126 (patch)
treeb70b311fcdaa115a33bce576a166994df4813504
parent4bb5ce8188c7623106d124d3398c6b73bfa8ecd4 (diff)
downloadruby-3d4c3f9e4ffc31e652b1bfab4d78f8b27d5b8126.tar.gz
[rubygems/rubygems] util/rubocop -A --only Style/ParallelAssignment
https://github.com/rubygems/rubygems/commit/5c88c77873
-rw-r--r--lib/rubygems/deprecate.rb3
-rw-r--r--lib/rubygems/ext/builder.rb3
-rw-r--r--lib/rubygems/platform.rb8
-rw-r--r--lib/rubygems/request_set.rb3
-rw-r--r--lib/rubygems/resolver/api_set.rb3
-rw-r--r--lib/rubygems/version.rb3
-rw-r--r--test/rubygems/bundler_test_gem.rb9
-rw-r--r--test/rubygems/helper.rb9
-rw-r--r--test/rubygems/test_gem.rb3
-rw-r--r--test/rubygems/test_gem_command.rb4
-rw-r--r--test/rubygems/test_gem_commands_environment_command.rb3
-rw-r--r--test/rubygems/test_gem_config_file.rb3
-rw-r--r--test/rubygems/test_gem_installer.rb8
-rw-r--r--test/rubygems/test_gem_package.rb3
-rw-r--r--test/rubygems/test_gem_request.rb4
-rw-r--r--test/rubygems/test_gem_request_connection_pools.rb3
-rw-r--r--test/rubygems/test_gem_request_set_gem_dependency_api.rb21
-rw-r--r--test/rubygems/test_gem_specification.rb8
-rw-r--r--test/rubygems/test_gem_update_suggestion.rb18
-rw-r--r--test/rubygems/test_gem_version.rb6
-rw-r--r--test/rubygems/utilities.rb3
21 files changed, 83 insertions, 45 deletions
diff --git a/lib/rubygems/deprecate.rb b/lib/rubygems/deprecate.rb
index 6d700e9be1..c595d4ba7b 100644
--- a/lib/rubygems/deprecate.rb
+++ b/lib/rubygems/deprecate.rb
@@ -81,7 +81,8 @@ module Gem::Deprecate
# Temporarily turn off warnings. Intended for tests only.
def skip_during
- Gem::Deprecate.skip, original = true, Gem::Deprecate.skip
+ original = Gem::Deprecate.skip
+ Gem::Deprecate.skip = true
yield
ensure
Gem::Deprecate.skip = original
diff --git a/lib/rubygems/ext/builder.rb b/lib/rubygems/ext/builder.rb
index 0ec2431f11..9ddcf988e5 100644
--- a/lib/rubygems/ext/builder.rb
+++ b/lib/rubygems/ext/builder.rb
@@ -59,7 +59,8 @@ class Gem::Ext::Builder
verbose = Gem.configuration.really_verbose
begin
- rubygems_gemdeps, ENV["RUBYGEMS_GEMDEPS"] = ENV["RUBYGEMS_GEMDEPS"], nil
+ rubygems_gemdeps = ENV["RUBYGEMS_GEMDEPS"]
+ ENV["RUBYGEMS_GEMDEPS"] = nil
if verbose
puts("current directory: #{dir}")
p(command)
diff --git a/lib/rubygems/platform.rb b/lib/rubygems/platform.rb
index 22009c56b5..3cfe5aa0a0 100644
--- a/lib/rubygems/platform.rb
+++ b/lib/rubygems/platform.rb
@@ -89,7 +89,10 @@ class Gem::Platform
end
os, = arch
- @cpu, os = nil, cpu if os.nil? # legacy jruby
+ if os.nil?
+ @cpu = nil
+ os = cpu
+ end # legacy jruby
@os, @version = case os
when /aix(\d+)?/ then [ "aix", $1 ]
@@ -106,7 +109,8 @@ class Gem::Platform
when /mingw32/ then [ "mingw32", nil ]
when /mingw-?(\w+)?/ then [ "mingw", $1 ]
when /(mswin\d+)(\_(\d+))?/ then
- os, version = $1, $3
+ os = $1
+ version = $3
@cpu = "x86" if @cpu.nil? && os =~ /32$/
[os, version]
when /netbsdelf/ then [ "netbsdelf", nil ]
diff --git a/lib/rubygems/request_set.rb b/lib/rubygems/request_set.rb
index b9b928d3da..f1af47618b 100644
--- a/lib/rubygems/request_set.rb
+++ b/lib/rubygems/request_set.rb
@@ -254,7 +254,8 @@ class Gem::RequestSet
end
def install_into(dir, force = true, options = {})
- gem_home, ENV["GEM_HOME"] = ENV["GEM_HOME"], dir
+ gem_home = ENV["GEM_HOME"]
+ ENV["GEM_HOME"] = dir
existing = force ? [] : specs_in(dir)
existing.delete_if {|s| @always_install.include? s }
diff --git a/lib/rubygems/resolver/api_set.rb b/lib/rubygems/resolver/api_set.rb
index f2bef54a9c..f8f14ff9fa 100644
--- a/lib/rubygems/resolver/api_set.rb
+++ b/lib/rubygems/resolver/api_set.rb
@@ -75,7 +75,8 @@ class Gem::Resolver::APISet < Gem::Resolver::Set
end
def prefetch_now # :nodoc:
- needed, @to_fetch = @to_fetch, []
+ needed = @to_fetch
+ @to_fetch = []
needed.sort.each do |name|
versions(name)
diff --git a/lib/rubygems/version.rb b/lib/rubygems/version.rb
index 52bfed6937..307d429e74 100644
--- a/lib/rubygems/version.rb
+++ b/lib/rubygems/version.rb
@@ -366,7 +366,8 @@ class Gem::Version
i = 0
while i <= limit
- lhs, rhs = lhsegments[i] || 0, rhsegments[i] || 0
+ lhs = lhsegments[i] || 0
+ rhs = rhsegments[i] || 0
i += 1
next if lhs == rhs
diff --git a/test/rubygems/bundler_test_gem.rb b/test/rubygems/bundler_test_gem.rb
index 16a02f343b..ed2ca44141 100644
--- a/test/rubygems/bundler_test_gem.rb
+++ b/test/rubygems/bundler_test_gem.rb
@@ -382,8 +382,10 @@ You may need to `bundle install` to install missing gems
end
def with_path_and_rubyopt(path_value, rubyopt_value)
- path, ENV["PATH"] = ENV["PATH"], path_value
- rubyopt, ENV["RUBYOPT"] = ENV["RUBYOPT"], rubyopt_value
+ path = ENV["PATH"]
+ ENV["PATH"] = path_value
+ rubyopt = ENV["RUBYOPT"]
+ ENV["RUBYOPT"] = rubyopt_value
yield
ensure
@@ -392,7 +394,8 @@ You may need to `bundle install` to install missing gems
end
def with_rubygems_gemdeps(value)
- rubygems_gemdeps, ENV["RUBYGEMS_GEMDEPS"] = ENV["RUBYGEMS_GEMDEPS"], value
+ rubygems_gemdeps = ENV["RUBYGEMS_GEMDEPS"]
+ ENV["RUBYGEMS_GEMDEPS"] = value
yield
ensure
diff --git a/test/rubygems/helper.rb b/test/rubygems/helper.rb
index b4f39c1d79..4674c50abb 100644
--- a/test/rubygems/helper.rb
+++ b/test/rubygems/helper.rb
@@ -120,9 +120,11 @@ class Gem::TestCase < Test::Unit::TestCase
begin
require "tempfile"
- captured_stdout, captured_stderr = Tempfile.new("out"), Tempfile.new("err")
+ captured_stdout = Tempfile.new("out")
+ captured_stderr = Tempfile.new("err")
- orig_stdout, orig_stderr = $stdout.dup, $stderr.dup
+ orig_stdout = $stdout.dup
+ orig_stderr = $stderr.dup
$stdout.reopen captured_stdout
$stderr.reopen captured_stderr
@@ -1307,7 +1309,8 @@ Also, a list:
end
def silence_warnings
- old_verbose, $VERBOSE = $VERBOSE, false
+ old_verbose = $VERBOSE
+ $VERBOSE = false
yield
ensure
$VERBOSE = old_verbose
diff --git a/test/rubygems/test_gem.rb b/test/rubygems/test_gem.rb
index 9f4bf88f99..c2d123f695 100644
--- a/test/rubygems/test_gem.rb
+++ b/test/rubygems/test_gem.rb
@@ -1029,7 +1029,8 @@ class TestGem < Gem::TestCase
end
def test_self_ruby_api_version
- orig_ruby_version, RbConfig::CONFIG["ruby_version"] = RbConfig::CONFIG["ruby_version"], "1.2.3"
+ orig_ruby_version = RbConfig::CONFIG["ruby_version"]
+ RbConfig::CONFIG["ruby_version"] = "1.2.3"
Gem.instance_variable_set :@ruby_api_version, nil
diff --git a/test/rubygems/test_gem_command.rb b/test/rubygems/test_gem_command.rb
index 89330b5b77..a6b31197fe 100644
--- a/test/rubygems/test_gem_command.rb
+++ b/test/rubygems/test_gem_command.rb
@@ -55,7 +55,9 @@ class TestGemCommand < Gem::TestCase
end
def test_self_extra_args
- verbose, $VERBOSE, separator = $VERBOSE, nil, $;
+ verbose = $VERBOSE
+ $VERBOSE = nil
+ separator = $;
extra_args = Gem::Command.extra_args
Gem::Command.extra_args = %w[--all]
diff --git a/test/rubygems/test_gem_commands_environment_command.rb b/test/rubygems/test_gem_commands_environment_command.rb
index 90dea9378e..d0bef723c1 100644
--- a/test/rubygems/test_gem_commands_environment_command.rb
+++ b/test/rubygems/test_gem_commands_environment_command.rb
@@ -11,7 +11,8 @@ class TestGemCommandsEnvironmentCommand < Gem::TestCase
def test_execute
orig_sources = Gem.sources.dup
- orig_path, ENV["PATH"] = ENV["PATH"], %w[/usr/local/bin /usr/bin /bin].join(File::PATH_SEPARATOR)
+ orig_path = ENV["PATH"]
+ ENV["PATH"] = %w[/usr/local/bin /usr/bin /bin].join(File::PATH_SEPARATOR)
Gem.sources.replace %w[http://gems.example.com]
Gem.configuration["gemcutter_key"] = "blah"
diff --git a/test/rubygems/test_gem_config_file.rb b/test/rubygems/test_gem_config_file.rb
index 14adddf1c4..4a3380b6f3 100644
--- a/test/rubygems/test_gem_config_file.rb
+++ b/test/rubygems/test_gem_config_file.rb
@@ -470,7 +470,8 @@ if you believe they were disclosed to a third party.
end
begin
- verbose, $VERBOSE = $VERBOSE, nil
+ verbose = $VERBOSE
+ $VERBOSE = nil
util_config_file
ensure
diff --git a/test/rubygems/test_gem_installer.rb b/test/rubygems/test_gem_installer.rb
index bad5af1cce..1ae9c98fc4 100644
--- a/test/rubygems/test_gem_installer.rb
+++ b/test/rubygems/test_gem_installer.rb
@@ -203,8 +203,8 @@ gem 'other', version
bin_dir = bin_dir.downcase
end
- orig_PATH, ENV["PATH"] =
- ENV["PATH"], [ENV["PATH"], bin_dir].join(File::PATH_SEPARATOR)
+ orig_PATH = ENV["PATH"]
+ ENV["PATH"] = [ENV["PATH"], bin_dir].join(File::PATH_SEPARATOR)
use_ui @ui do
installer.check_that_user_bin_dir_is_in_path
@@ -228,8 +228,8 @@ gem 'other', version
def test_check_that_user_bin_dir_is_in_path_tilde
pend "Tilde is PATH is not supported under MS Windows" if win_platform?
- orig_PATH, ENV["PATH"] =
- ENV["PATH"], [ENV["PATH"], "~/bin"].join(File::PATH_SEPARATOR)
+ orig_PATH = ENV["PATH"]
+ ENV["PATH"] = [ENV["PATH"], "~/bin"].join(File::PATH_SEPARATOR)
installer = setup_base_installer
installer.bin_dir.replace File.join @userhome, "bin"
diff --git a/test/rubygems/test_gem_package.rb b/test/rubygems/test_gem_package.rb
index 7848d118aa..2c77dd5d19 100644
--- a/test/rubygems/test_gem_package.rb
+++ b/test/rubygems/test_gem_package.rb
@@ -205,7 +205,8 @@ class TestGemPackage < Gem::Package::TarTestCase
tar.rewind
- files, symlinks = [], []
+ files = []
+ symlinks = []
Gem::Package::TarReader.new tar do |tar_io|
tar_io.each_entry do |entry|
diff --git a/test/rubygems/test_gem_request.rb b/test/rubygems/test_gem_request.rb
index fc5c1c8355..ebdc98eef5 100644
--- a/test/rubygems/test_gem_request.rb
+++ b/test/rubygems/test_gem_request.rb
@@ -106,8 +106,8 @@ class TestGemRequest < Gem::TestCase
end
def test_configure_connection_for_https_ssl_ca_cert
- ssl_ca_cert, Gem.configuration.ssl_ca_cert =
- Gem.configuration.ssl_ca_cert, CA_CERT_FILE
+ ssl_ca_cert = Gem.configuration.ssl_ca_cert
+ Gem.configuration.ssl_ca_cert = CA_CERT_FILE
connection = Net::HTTP.new "localhost", 443
diff --git a/test/rubygems/test_gem_request_connection_pools.rb b/test/rubygems/test_gem_request_connection_pools.rb
index 488f0f56f9..0fb10601e3 100644
--- a/test/rubygems/test_gem_request_connection_pools.rb
+++ b/test/rubygems/test_gem_request_connection_pools.rb
@@ -120,7 +120,8 @@ class TestGemRequestConnectionPool < Gem::TestCase
end
def test_net_http_args_no_proxy
- orig_no_proxy, ENV["no_proxy"] = ENV["no_proxy"], "example"
+ orig_no_proxy = ENV["no_proxy"]
+ ENV["no_proxy"] = "example"
pools = Gem::Request::ConnectionPools.new nil, []
diff --git a/test/rubygems/test_gem_request_set_gem_dependency_api.rb b/test/rubygems/test_gem_request_set_gem_dependency_api.rb
index bbdcaf9731..a8ecb8a50b 100644
--- a/test/rubygems/test_gem_request_set_gem_dependency_api.rb
+++ b/test/rubygems/test_gem_request_set_gem_dependency_api.rb
@@ -245,7 +245,8 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
end
def test_gem_platforms
- win_platform, Gem.win_platform = Gem.win_platform?, false
+ win_platform = Gem.win_platform?
+ Gem.win_platform = false
with_engine_version "ruby", "2.0.0" do
@gda.gem "a", :platforms => :ruby
@@ -257,7 +258,8 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
end
def test_gem_platforms_bundler_ruby
- win_platform, Gem.win_platform = Gem.win_platform?, false
+ win_platform = Gem.win_platform?
+ Gem.win_platform = false
with_engine_version "ruby", "2.0.0" do
set = Gem::RequestSet.new
@@ -319,7 +321,8 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
end
def test_gem_platforms_maglev
- win_platform, Gem.win_platform = Gem.win_platform?, false
+ win_platform = Gem.win_platform?
+ Gem.win_platform = false
with_engine_version "maglev", "1.0.0" do
set = Gem::RequestSet.new
@@ -355,7 +358,8 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
end
def test_gem_platforms_multiple
- win_platform, Gem.win_platform = Gem.win_platform?, false
+ win_platform = Gem.win_platform?
+ Gem.win_platform = false
with_engine_version "ruby", "2.0.0" do
@gda.gem "a", :platforms => [:mswin, :jruby]
@@ -367,7 +371,8 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
end
def test_gem_platforms_platform
- win_platform, Gem.win_platform = Gem.win_platform?, false
+ win_platform = Gem.win_platform?
+ Gem.win_platform = false
with_engine_version "ruby", "2.0.0" do
@gda.gem "a", :platforms => :jruby, :platform => :ruby
@@ -694,7 +699,8 @@ end
end
def test_platform_multiple
- win_platform, Gem.win_platform = Gem.win_platform?, false
+ win_platform = Gem.win_platform?
+ Gem.win_platform = false
gda = @GDA.new @set, nil
@@ -720,7 +726,8 @@ end
end
def test_platform_ruby
- win_platform, Gem.win_platform = Gem.win_platform?, false
+ win_platform = Gem.win_platform?
+ Gem.win_platform = false
@gda.platform :ruby do
@gda.gem "a"
diff --git a/test/rubygems/test_gem_specification.rb b/test/rubygems/test_gem_specification.rb
index 5d6bf9361f..1194ff9727 100644
--- a/test/rubygems/test_gem_specification.rb
+++ b/test/rubygems/test_gem_specification.rb
@@ -1683,8 +1683,8 @@ dependencies: []
end
def test_extension_dir
- enable_shared, RbConfig::CONFIG["ENABLE_SHARED"] =
- RbConfig::CONFIG["ENABLE_SHARED"], "no"
+ enable_shared = RbConfig::CONFIG["ENABLE_SHARED"]
+ RbConfig::CONFIG["ENABLE_SHARED"] = "no"
ext_spec
@@ -1700,8 +1700,8 @@ dependencies: []
end
def test_extension_dir_override
- enable_shared, RbConfig::CONFIG["ENABLE_SHARED"] =
- RbConfig::CONFIG["ENABLE_SHARED"], "no"
+ enable_shared = RbConfig::CONFIG["ENABLE_SHARED"]
+ RbConfig::CONFIG["ENABLE_SHARED"] = "no"
class << Gem
alias_method :orig_default_ext_dir_for, :default_ext_dir_for
diff --git a/test/rubygems/test_gem_update_suggestion.rb b/test/rubygems/test_gem_update_suggestion.rb
index 520a69ac69..8dcbf791b3 100644
--- a/test/rubygems/test_gem_update_suggestion.rb
+++ b/test/rubygems/test_gem_update_suggestion.rb
@@ -28,9 +28,12 @@ class TestUpdateSuggestion < Gem::TestCase
reset_last_update_check: true,
cmd:
)
- original_config, Gem.configuration[:prevent_update_suggestion] = Gem.configuration[:prevent_update_suggestion], nil
- original_env, ENV["RUBYGEMS_PREVENT_UPDATE_SUGGESTION"] = ENV["RUBYGEMS_PREVENT_UPDATE_SUGGESTION"], nil
- original_disable, Gem.disable_system_update_message = Gem.disable_system_update_message, nil
+ original_config = Gem.configuration[:prevent_update_suggestion]
+ Gem.configuration[:prevent_update_suggestion] = nil
+ original_env = ENV["RUBYGEMS_PREVENT_UPDATE_SUGGESTION"]
+ ENV["RUBYGEMS_PREVENT_UPDATE_SUGGESTION"] = nil
+ original_disable = Gem.disable_system_update_message
+ Gem.disable_system_update_message = nil
Gem.configuration.last_update_check = 0 if reset_last_update_check
Gem.ui.stub :tty?, tty do
@@ -143,7 +146,8 @@ class TestUpdateSuggestion < Gem::TestCase
def test_eglible_for_update_prevent_config
with_eglible_environment(cmd: @cmd) do
begin
- original_config, Gem.configuration[:prevent_update_suggestion] = Gem.configuration[:prevent_update_suggestion], true
+ original_config = Gem.configuration[:prevent_update_suggestion]
+ Gem.configuration[:prevent_update_suggestion] = true
refute @cmd.eglible_for_update?
ensure
Gem.configuration[:prevent_update_suggestion] = original_config
@@ -154,7 +158,8 @@ class TestUpdateSuggestion < Gem::TestCase
def test_eglible_for_update_prevent_env
with_eglible_environment(cmd: @cmd) do
begin
- original_env, ENV["RUBYGEMS_PREVENT_UPDATE_SUGGESTION"] = ENV["RUBYGEMS_PREVENT_UPDATE_SUGGESTION"], "yes"
+ original_env = ENV["RUBYGEMS_PREVENT_UPDATE_SUGGESTION"]
+ ENV["RUBYGEMS_PREVENT_UPDATE_SUGGESTION"] = "yes"
refute @cmd.eglible_for_update?
ensure
ENV["RUBYGEMS_PREVENT_UPDATE_SUGGESTION"] = original_env
@@ -177,7 +182,8 @@ class TestUpdateSuggestion < Gem::TestCase
def test_eglible_for_update_disabled_update
with_eglible_environment(cmd: @cmd) do
begin
- original_disable, Gem.disable_system_update_message = Gem.disable_system_update_message, "disabled"
+ original_disable = Gem.disable_system_update_message
+ Gem.disable_system_update_message = "disabled"
refute @cmd.eglible_for_update?
ensure
Gem.disable_system_update_message = original_disable
diff --git a/test/rubygems/test_gem_version.rb b/test/rubygems/test_gem_version.rb
index f45c72b29c..bb4f6a7f72 100644
--- a/test/rubygems/test_gem_version.rb
+++ b/test/rubygems/test_gem_version.rb
@@ -268,7 +268,8 @@ class TestGemVersion < Gem::TestCase
# Assert that two versions are eql?. Checks both directions.
def assert_version_eql(first, second)
- first, second = v(first), v(second)
+ first = v(first)
+ second = v(second)
assert first.eql?(second), "#{first} is eql? #{second}"
assert second.eql?(first), "#{second} is eql? #{first}"
end
@@ -289,7 +290,8 @@ class TestGemVersion < Gem::TestCase
# directions.
def refute_version_eql(first, second)
- first, second = v(first), v(second)
+ first = v(first)
+ second = v(second)
refute first.eql?(second), "#{first} is NOT eql? #{second}"
refute second.eql?(first), "#{second} is NOT eql? #{first}"
end
diff --git a/test/rubygems/utilities.rb b/test/rubygems/utilities.rb
index 8b9fa98e3d..86784c6c33 100644
--- a/test/rubygems/utilities.rb
+++ b/test/rubygems/utilities.rb
@@ -329,7 +329,8 @@ class Gem::TestCase::SpecFetcherSetup
Gem::Specification.reset
begin
- gem_repo, @test.gem_repo = @test.gem_repo, @repository
+ gem_repo = @test.gem_repo
+ @test.gem_repo = @repository
@test.uri = URI @repository
@test.util_setup_spec_fetcher(*@downloaded)