rubygems-update 3.4.20 → 3.4.22

data/test/rubygems/test_gem_commands_open_command.rb

@@ -22,20 +22,23 @@ class TestGemCommandsOpenCommand < Gem::TestCase
 
   def test_execute
     @cmd.options[:args] = %w[foo]
-    @cmd.options[:editor] = "#{ruby_with_rubygems_in_load_path} -eexit --"
+    @cmd.options[:editor] = (ruby_with_rubygems_in_load_path + ["-e", "puts(ARGV,Dir.pwd)", "--"]).join(" ")
 
     gem "foo", "1.0.0"
     spec = gem "foo", "1.0.1"
 
     assert_nothing_raised Gem::MockGemUi::TermError do
-      Dir.stub(:chdir, spec.full_gem_path) do
+      stdout, stderr = capture_subprocess_io do
         use_ui @ui do
           @cmd.execute
         end
       end
+      assert_equal [spec.full_gem_path, spec.full_gem_path], stdout.split("\n")
+      assert_equal "", stderr
     end
 
     assert_equal "", @ui.error
+    assert_equal "", @ui.output
   end
 
   def test_wrong_version

data/test/rubygems/test_gem_commands_pristine_command.rb

@@ -54,7 +54,7 @@ class TestGemCommandsPristineCommand < Gem::TestCase
   end
 
   def test_execute_user_install
-    FileUtils.chmod 0555, @gemhome
+    FileUtils.chmod 0o555, @gemhome
 
     a = util_spec "a" do |s|
       s.executables = %w[foo]
@@ -99,7 +99,7 @@ class TestGemCommandsPristineCommand < Gem::TestCase
     assert_equal "Restored #{a.full_name}", out.shift
     assert_empty out, out.inspect
   ensure
-    FileUtils.chmod(0755, @gemhome)
+    FileUtils.chmod(0o755, @gemhome)
   end
 
   def test_execute_all

data/test/rubygems/test_gem_commands_push_command.rb

@@ -3,6 +3,7 @@
 require_relative "helper"
 require_relative "multifactor_auth_utilities"
 require "rubygems/commands/push_command"
+require "rubygems/config_file"
 
 class TestGemCommandsPushCommand < Gem::TestCase
   def setup
@@ -107,7 +108,7 @@ class TestGemCommandsPushCommand < Gem::TestCase
     end
 
     @response = "Successfully registered gem: freewill (1.0.0)"
-    @fetcher.data["#{@spec.metadata['allowed_push_host']}/api/v1/gems"] = HTTPResponseFactory.create(body: @response, code: 200, msg: "OK")
+    @fetcher.data["#{@spec.metadata["allowed_push_host"]}/api/v1/gems"] = HTTPResponseFactory.create(body: @response, code: 200, msg: "OK")
     @fetcher.data["#{Gem.host}/api/v1/gems"] =
       ["fail", 500, "Internal Server Error"]
 
@@ -158,7 +159,7 @@ class TestGemCommandsPushCommand < Gem::TestCase
     }
 
     File.open Gem.configuration.credentials_path, "w" do |f|
-      f.write keys.to_yaml
+      f.write Gem::ConfigFile.dump_with_rubygems_yaml(keys)
     end
     Gem.configuration.load_api_keys
 
@@ -192,7 +193,7 @@ class TestGemCommandsPushCommand < Gem::TestCase
     }
 
     File.open Gem.configuration.credentials_path, "w" do |f|
-      f.write keys.to_yaml
+      f.write Gem::ConfigFile.dump_with_rubygems_yaml(keys)
     end
     Gem.configuration.load_api_keys
 
@@ -233,7 +234,7 @@ class TestGemCommandsPushCommand < Gem::TestCase
     }
 
     File.open Gem.configuration.credentials_path, "w" do |f|
-      f.write keys.to_yaml
+      f.write Gem::ConfigFile.dump_with_rubygems_yaml(keys)
     end
     Gem.configuration.load_api_keys
 
@@ -274,7 +275,7 @@ class TestGemCommandsPushCommand < Gem::TestCase
     }
 
     File.open Gem.configuration.credentials_path, "w" do |f|
-      f.write keys.to_yaml
+      f.write Gem::ConfigFile.dump_with_rubygems_yaml(keys)
     end
     Gem.configuration.load_api_keys
 
@@ -304,7 +305,7 @@ class TestGemCommandsPushCommand < Gem::TestCase
     }
 
     File.open Gem.configuration.credentials_path, "w" do |f|
-      f.write keys.to_yaml
+      f.write Gem::ConfigFile.dump_with_rubygems_yaml(keys)
     end
     Gem.configuration.load_api_keys
 

data/test/rubygems/test_gem_commands_signin_command.rb

@@ -109,7 +109,7 @@ class TestGemCommandsSigninCommand < Gem::TestCase
   def test_execute_with_key_name_and_scope
     email     = "you@example.com"
     password  = "secret"
-    api_key   = "1234"
+    api_key   = "1234abcd"
     fetcher   = Gem::RemoteFetcher.fetcher
 
     key_name_ui = Gem::MockGemUi.new "#{email}\n#{password}\ntest-key\n\ny\n\n\n\n\n\n"
@@ -134,7 +134,7 @@ class TestGemCommandsSigninCommand < Gem::TestCase
   def test_execute_with_key_name_scope_and_mfa_level_of_ui_only
     email     = "you@example.com"
     password  = "secret"
-    api_key   = "1234"
+    api_key   = "1234abcd"
     fetcher   = Gem::RemoteFetcher.fetcher
     mfa_level = "ui_only"
 
@@ -161,7 +161,7 @@ class TestGemCommandsSigninCommand < Gem::TestCase
   def test_execute_with_key_name_scope_and_mfa_level_of_gem_signin
     email     = "you@example.com"
     password  = "secret"
-    api_key   = "1234"
+    api_key   = "1234abcd"
     fetcher   = Gem::RemoteFetcher.fetcher
     mfa_level = "ui_and_gem_signin"
 
@@ -188,7 +188,7 @@ class TestGemCommandsSigninCommand < Gem::TestCase
   def test_execute_with_warnings
     email     = "you@example.com"
     password  = "secret"
-    api_key   = "1234"
+    api_key   = "1234abcd"
     fetcher   = Gem::RemoteFetcher.fetcher
     mfa_level = "disabled"
     warning   = "/[WARNING/] For protection of your account and gems"
@@ -204,14 +204,14 @@ class TestGemCommandsSigninCommand < Gem::TestCase
 
     email     = "you@example.com"
     password  = "secret"
-    api_key   = "1234"
+    api_key   = "1234abcd"
     fetcher   = Gem::RemoteFetcher.fetcher
 
     key_name_ui = Gem::MockGemUi.new "#{email}\n#{password}\ntest-key\n\ny\n\n\n\n\n\ny"
 
     # Set the expected response for the Web-API supplied
     ENV["RUBYGEMS_HOST"]       = host
-    data_key                   = "#{ENV['RUBYGEMS_HOST']}/api/v1/api_key"
+    data_key                   = "#{ENV["RUBYGEMS_HOST"]}/api/v1/api_key"
     fetcher.data[data_key]     = HTTPResponseFactory.create(body: api_key, code: 200, msg: "OK")
 
     use_ui key_name_ui do
@@ -242,9 +242,9 @@ class TestGemCommandsSigninCommand < Gem::TestCase
 
     # Set the expected response for the Web-API supplied
     ENV["RUBYGEMS_HOST"]       = host || Gem::DEFAULT_HOST
-    data_key                   = "#{ENV['RUBYGEMS_HOST']}/api/v1/api_key"
+    data_key                   = "#{ENV["RUBYGEMS_HOST"]}/api/v1/api_key"
     fetcher.data[data_key]     = response
-    profile                    = "#{ENV['RUBYGEMS_HOST']}/api/v1/profile/me.yaml"
+    profile                    = "#{ENV["RUBYGEMS_HOST"]}/api/v1/profile/me.yaml"
     fetcher.data[profile]      = profile_response
     Gem::RemoteFetcher.fetcher = fetcher
 

data/test/rubygems/test_gem_commands_uninstall_command.rb

@@ -158,7 +158,7 @@ class TestGemCommandsUninstallCommand < Gem::InstallerTestCase
     @cmd.execute
 
     assert_equal false, File.exist?(formatted_executable)
-  rescue
+  rescue StandardError
     Gem::Installer.exec_format = nil
   end
 
@@ -229,6 +229,26 @@ class TestGemCommandsUninstallCommand < Gem::InstallerTestCase
     assert File.exist? File.join(@gemhome, "bin", "executable")
   end
 
+  def test_execute_with_multiple_version_specified_as_colon
+    initial_install
+
+    ui = Gem::MockGemUi.new "y\n"
+
+    util_make_gems
+
+    assert_equal 3, Gem::Specification.find_all_by_name("a").length
+
+    @cmd.options[:force] = true
+    @cmd.options[:args] = ["a:1", "a:2"]
+
+    use_ui ui do
+      @cmd.execute
+    end
+
+    assert_equal 1, Gem::Specification.find_all_by_name("a").length
+    assert_equal Gem::Version.new("3.a"), Gem::Specification.find_by_name("a").version
+  end
+
   def test_uninstall_selection
     ui = Gem::MockGemUi.new "1\n"
 

data/test/rubygems/test_gem_commands_unpack_command.rb

@@ -156,7 +156,7 @@ class TestGemCommandsUnpackCommand < Gem::TestCase
 
     util_make_gems
 
-    FileUtils.chmod 0555, @gemhome
+    FileUtils.chmod 0o555, @gemhome
 
     @cmd.options[:args] = %w[b]
 
@@ -168,7 +168,7 @@ class TestGemCommandsUnpackCommand < Gem::TestCase
 
     assert File.exist?(File.join(@tempdir, "b-2")), "b should be unpacked"
   ensure
-    FileUtils.chmod 0755, @gemhome
+    FileUtils.chmod 0o755, @gemhome
   end
 
   def test_execute_with_target_option

data/test/rubygems/test_gem_config_file.rb

@@ -185,7 +185,7 @@ class TestGemConfigFile < Gem::TestCase
 
     temp_cred = File.join Gem.user_home, ".gem", "credentials"
     FileUtils.mkdir_p File.dirname(temp_cred)
-    File.open temp_cred, "w", 0600 do |fp|
+    File.open temp_cred, "w", 0o600 do |fp|
       fp.puts ":rubygems_api_key: 701229f217cdf23b1344c7b4b54ca97"
     end
 
@@ -200,7 +200,7 @@ class TestGemConfigFile < Gem::TestCase
 
     @cfg.rubygems_api_key = "x"
 
-    File.chmod 0644, @cfg.credentials_path
+    File.chmod 0o644, @cfg.credentials_path
 
     use_ui @ui do
       assert_raise Gem::MockGemUi::TermError do
@@ -323,15 +323,20 @@ if you believe they were disclosed to a third party.
   def test_load_api_keys
     temp_cred = File.join Gem.user_home, ".gem", "credentials"
     FileUtils.mkdir_p File.dirname(temp_cred)
-    File.open temp_cred, "w", 0600 do |fp|
-      fp.puts ":rubygems_api_key: 701229f217cdf23b1344c7b4b54ca97"
-      fp.puts ":other: a5fdbb6ba150cbb83aad2bb2fede64c"
+    File.open temp_cred, "w", 0o600 do |fp|
+      fp.puts ":rubygems_api_key: rubygems_b9ce70c306b3a2e248679fbbbd66722d408d3c8c4f00566c"
+      fp.puts ":other: rubygems_9636a120106ea8b81fbc792188251738665711d2ece160c5"
+      fp.puts "http://localhost:3000: rubygems_be293ad9dd71550a012b17d848893b41960b811ce9312b47"
     end
 
     util_config_file
 
-    assert_equal({ :rubygems => "701229f217cdf23b1344c7b4b54ca97",
-                   :other => "a5fdbb6ba150cbb83aad2bb2fede64c" }, @cfg.api_keys)
+    assert_equal(
+      { :rubygems => "rubygems_b9ce70c306b3a2e248679fbbbd66722d408d3c8c4f00566c",
+        :other => "rubygems_9636a120106ea8b81fbc792188251738665711d2ece160c5",
+        "http://localhost:3000" => "rubygems_be293ad9dd71550a012b17d848893b41960b811ce9312b47" },
+      @cfg.api_keys
+    )
   end
 
   def test_load_api_keys_bad_permission
@@ -339,7 +344,7 @@ if you believe they were disclosed to a third party.
 
     @cfg.rubygems_api_key = "x"
 
-    File.chmod 0644, @cfg.credentials_path
+    File.chmod 0o644, @cfg.credentials_path
 
     assert_raise Gem::MockGemUi::TermError do
       @cfg.load_api_keys
@@ -372,7 +377,7 @@ if you believe they were disclosed to a third party.
     unless win_platform?
       stat = File.stat @cfg.credentials_path
 
-      assert_equal 0600, stat.mode & 0600
+      assert_equal 0o600, stat.mode & 0o600
     end
   end
 
@@ -381,7 +386,7 @@ if you believe they were disclosed to a third party.
 
     @cfg.rubygems_api_key = "x"
 
-    File.chmod 0644, @cfg.credentials_path
+    File.chmod 0o644, @cfg.credentials_path
 
     assert_raise Gem::MockGemUi::TermError do
       @cfg.rubygems_api_key = "y"
@@ -395,7 +400,7 @@ if you believe they were disclosed to a third party.
 
     stat = File.stat @cfg.credentials_path
 
-    assert_equal 0644, stat.mode & 0644
+    assert_equal 0o644, stat.mode & 0o644
   end
 
   def test_write
@@ -471,7 +476,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
@@ -514,4 +520,32 @@ if you believe they were disclosed to a third party.
     util_config_file
     assert_equal(true, @cfg.disable_default_gem_server)
   end
+
+  def test_load_with_rubygems_config_hash
+    yaml = <<~YAML
+      ---
+      :foo: bar
+      bar: 100
+      buzz: true
+      alpha: :bravo
+      charlie: ""
+      delta:
+    YAML
+    actual = Gem::ConfigFile.load_with_rubygems_config_hash(yaml)
+
+    assert_equal "bar", actual[:foo]
+    assert_equal 100, actual["bar"]
+    assert_equal true, actual["buzz"]
+    assert_equal :bravo, actual["alpha"]
+    assert_equal nil, actual["charlie"]
+    assert_equal nil, actual["delta"]
+  end
+
+  def test_dump_with_rubygems_yaml
+    symbol_key_hash = { :foo => "bar" }
+
+    actual = Gem::ConfigFile.dump_with_rubygems_yaml(symbol_key_hash)
+
+    assert_equal("---\n:foo: \"bar\"\n", actual)
+  end
 end

data/test/rubygems/test_gem_ext_builder.rb

@@ -52,7 +52,7 @@ install:
     assert_match %r{DESTDIR\\=#{ENV['DESTDIR']}$},         results
     assert_match %r{DESTDIR\\=#{ENV['DESTDIR']} install$}, results
 
-    if /nmake/ !~ results
+    unless /nmake/.match?(results)
       assert_match %r{^clean: destination$},   results
       assert_match %r{^all: destination$},     results
       assert_match %r{^install: destination$}, results

data/test/rubygems/test_gem_ext_cargo_builder.rb

@@ -36,7 +36,7 @@ class TestGemExtCargoBuilder < Gem::TestCase
     end
 
     output = output.join "\n"
-    bundle = File.join(@dest_path, "rust_ruby_example.#{RbConfig::CONFIG['DLEXT']}")
+    bundle = File.join(@dest_path, "rust_ruby_example.#{RbConfig::CONFIG["DLEXT"]}")
 
     assert_match(/Finished/, output)
     assert_match(/release/, output)
@@ -62,7 +62,7 @@ class TestGemExtCargoBuilder < Gem::TestCase
     end
 
     output = output.join "\n"
-    bundle = File.join(@dest_path, "rust_ruby_example.#{RbConfig::CONFIG['DLEXT']}")
+    bundle = File.join(@dest_path, "rust_ruby_example.#{RbConfig::CONFIG["DLEXT"]}")
 
     assert_ffi_handle bundle, "hello_from_rubygems"
     assert_ffi_handle bundle, "hello_from_rubygems_version"

data/test/rubygems/test_gem_gemcutter_utilities.rb

@@ -5,6 +5,7 @@ require_relative "multifactor_auth_utilities"
 require "rubygems"
 require "rubygems/command"
 require "rubygems/gemcutter_utilities"
+require "rubygems/config_file"
 
 class TestGemGemcutterUtilities < Gem::TestCase
   def setup
@@ -41,7 +42,7 @@ class TestGemGemcutterUtilities < Gem::TestCase
     }
 
     File.open Gem.configuration.credentials_path, "w" do |f|
-      f.write keys.to_yaml
+      f.write Gem::ConfigFile.dump_with_rubygems_yaml(keys)
     end
 
     ENV["RUBYGEMS_HOST"] = "http://rubygems.engineyard.com"
@@ -55,7 +56,7 @@ class TestGemGemcutterUtilities < Gem::TestCase
     keys = { :rubygems_api_key => "KEY" }
 
     File.open Gem.configuration.credentials_path, "w" do |f|
-      f.write keys.to_yaml
+      f.write Gem::ConfigFile.dump_with_rubygems_yaml(keys)
     end
 
     Gem.configuration.load_api_keys
@@ -67,7 +68,7 @@ class TestGemGemcutterUtilities < Gem::TestCase
     keys = { :rubygems_api_key => "KEY", :other => "OTHER" }
 
     File.open Gem.configuration.credentials_path, "w" do |f|
-      f.write keys.to_yaml
+      f.write Gem::ConfigFile.dump_with_rubygems_yaml(keys)
     end
 
     Gem.configuration.load_api_keys
@@ -163,8 +164,10 @@ class TestGemGemcutterUtilities < Gem::TestCase
   def test_sign_in_with_other_credentials_doesnt_overwrite_other_keys
     other_api_key = "f46dbb18bb6a9c97cdc61b5b85c186a17403cdcbf"
 
+    config = Hash[:other_api_key, other_api_key]
+
     File.open Gem.configuration.credentials_path, "w" do |f|
-      f.write Hash[:other_api_key, other_api_key].to_yaml
+      f.write Gem::ConfigFile.dump_with_rubygems_yaml(config)
     end
     util_sign_in
 
@@ -317,7 +320,7 @@ class TestGemGemcutterUtilities < Gem::TestCase
   def test_verify_api_key
     keys = { :other => "a5fdbb6ba150cbb83aad2bb2fede64cf040453903" }
     File.open Gem.configuration.credentials_path, "w" do |f|
-      f.write keys.to_yaml
+      f.write Gem::ConfigFile.dump_with_rubygems_yaml(keys)
     end
     Gem.configuration.load_api_keys
 

data/test/rubygems/test_gem_install_update_options.rb

@@ -146,8 +146,8 @@ class TestGemInstallUpdateOptions < Gem::InstallerTestCase
 
       refute @cmd.options[:user_install]
 
-      FileUtils.chmod 0755, @userhome
-      FileUtils.chmod 0000, @gemhome
+      FileUtils.chmod 0o755, @userhome
+      FileUtils.chmod 0o000, @gemhome
 
       Gem.use_paths @gemhome, @userhome
 
@@ -156,7 +156,7 @@ class TestGemInstallUpdateOptions < Gem::InstallerTestCase
       end
     end
   ensure
-    FileUtils.chmod 0755, @gemhome
+    FileUtils.chmod 0o755, @gemhome
   end
 
   def test_vendor

data/test/rubygems/test_gem_installer.rb

@@ -204,8 +204,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
@@ -229,8 +229,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"
@@ -467,14 +467,14 @@ gem 'other', version
     elsif Process.uid.zero?
       pend("test_generate_bin_script_no_perms skipped in root privilege")
     else
-      FileUtils.chmod 0000, util_inst_bindir
+      FileUtils.chmod 0o000, util_inst_bindir
 
       assert_raise Gem::FilePermissionError do
         installer.generate_bin
       end
     end
   ensure
-    FileUtils.chmod 0755, util_inst_bindir unless ($DEBUG || win_platform?)
+    FileUtils.chmod 0o755, util_inst_bindir unless ($DEBUG || win_platform?)
   end
 
   def test_generate_bin_script_no_shebang
@@ -498,7 +498,7 @@ gem 'other', version
 
     wrapper = File.read installed_exec
     assert_match %r{generated by RubyGems}, wrapper
-    # HACK some gems don't have #! in their executables, restore 2008/06
+    # HACK: some gems don't have #! in their executables, restore 2008/06
     #assert_no_match %r|generated by RubyGems|, wrapper
   end
 
@@ -571,14 +571,14 @@ gem 'other', version
     elsif Process.uid.zero?
       pend("test_user_install_disabled_read_only test skipped in root privilege")
     else
-      FileUtils.chmod 0000, util_inst_bindir
+      FileUtils.chmod 0o000, util_inst_bindir
 
       assert_raise Gem::FilePermissionError do
         installer.generate_bin
       end
     end
   ensure
-    FileUtils.chmod 0755, util_inst_bindir unless ($DEBUG || win_platform?)
+    FileUtils.chmod 0o755, util_inst_bindir unless ($DEBUG || win_platform?)
   end
 
   def test_generate_bin_symlink_update_newer
@@ -816,7 +816,7 @@ gem 'other', version
 
     util_build_gem spec
 
-    File.chmod(0555, Gem.plugindir)
+    File.chmod(0o555, Gem.plugindir)
     system_path = File.join(Gem.plugindir, "a_plugin.rb")
     user_path = File.join(Gem.plugindir(Gem.user_dir), "a_plugin.rb")
     installer = util_installer spec, Gem.dir, :user
@@ -838,7 +838,7 @@ gem 'other', version
 
     util_build_gem spec
 
-    File.chmod(0555, Gem.plugindir)
+    File.chmod(0o555, Gem.plugindir)
     system_path = File.join(Gem.plugindir, "a_plugin.rb")
 
     build_root = File.join(@tempdir, "build_root")
@@ -1032,8 +1032,8 @@ end
     exe = File.join gemdir, "bin", "executable"
     assert_path_exist exe
 
-    exe_mode = File.stat(exe).mode & 0111
-    assert_equal 0111, exe_mode, "0%o" % exe_mode unless win_platform?
+    exe_mode = File.stat(exe).mode & 0o111
+    assert_equal 0o111, exe_mode, "0%o" % exe_mode unless win_platform?
 
     assert_path_exist File.join gemdir, "lib", "code.rb"
 
@@ -1617,7 +1617,7 @@ end
         installer.install
       end
       assert_path_exist so
-    rescue
+    rescue StandardError
       puts "-" * 78
       puts File.read File.join(@gemhome, "gems", "a-2", "Makefile")
       puts "-" * 78
@@ -2021,7 +2021,7 @@ end
 
     bin_env = get_bin_env
 
-    assert_equal("#!#{bin_env} #{RbConfig::CONFIG['ruby_install_name']}",
+    assert_equal("#!#{bin_env} #{RbConfig::CONFIG["ruby_install_name"]}",
                  shebang)
   end
 
@@ -2498,7 +2498,7 @@ end
   end
 
   def mask
-    0100755
+    0o100755
   end
 
   def load_relative(value)