rubygems-update 3.1.6 → 3.4.10

data/test/rubygems/test_gem_commands_uninstall_command.rb

@@ -1,13 +1,12 @@
 # frozen_string_literal: true
-require 'rubygems/installer_test_case'
-require 'rubygems/commands/uninstall_command'
+require_relative "installer_test_case"
+require "rubygems/commands/uninstall_command"
 
 class TestGemCommandsUninstallCommand < Gem::InstallerTestCase
-
   def setup
     super
     @cmd = Gem::Commands::UninstallCommand.new
-    @executable = File.join(@gemhome, 'bin', 'executable')
+    @executable = File.join(@gemhome, "bin", "executable")
   end
 
   def test_execute_all_named
@@ -15,20 +14,15 @@ class TestGemCommandsUninstallCommand < Gem::InstallerTestCase
 
     util_make_gems
 
-    default = new_default_spec 'default', '1'
+    default = new_default_spec "default", "1"
     install_default_gems default
 
     gemhome2 = "#{@gemhome}2"
 
-    a_4, = util_gem 'a', 4
+    a_4, = util_gem "a", 4
     install_gem a_4, :install_dir => gemhome2
 
-    Gem::Specification.dirs = [@gemhome, gemhome2]
-
-    assert_includes Gem::Specification.all_names, 'a-1'
-    assert_includes Gem::Specification.all_names, 'a-4'
-    assert_includes Gem::Specification.all_names, 'b-2'
-    assert_includes Gem::Specification.all_names, 'default-1'
+    assert_gems_presence "a-1", "a-4", "b-2", "default-1", dirs: [@gemhome, gemhome2]
 
     @cmd.options[:all] = true
     @cmd.options[:args] = %w[a]
@@ -42,10 +36,10 @@ class TestGemCommandsUninstallCommand < Gem::InstallerTestCase
   end
 
   def test_execute_all_named_default_single
-    z_1 = new_default_spec 'z', '1'
+    z_1 = new_default_spec "z", "1"
     install_default_gems z_1
 
-    assert_includes Gem::Specification.all_names, 'z-1'
+    assert_includes Gem::Specification.all_names, "z-1"
 
     @cmd.options[:all] = true
     @cmd.options[:args] = %w[z]
@@ -58,18 +52,18 @@ class TestGemCommandsUninstallCommand < Gem::InstallerTestCase
 
     output = @ui.output.split "\n"
 
-    assert_equal 'Gem z-1 cannot be uninstalled because it is a default gem', output.shift
+    assert_equal "Gem z-1 cannot be uninstalled because it is a default gem", output.shift
   end
 
   def test_execute_all_named_default_multiple
-    z_1 = new_default_spec 'z', '1'
+    z_1 = new_default_spec "z", "1"
     install_default_gems z_1
 
-    z_2, = util_gem 'z', 2
+    z_2, = util_gem "z", 2
     install_gem z_2
 
-    assert_includes Gem::Specification.all_names, 'z-1'
-    assert_includes Gem::Specification.all_names, 'z-2'
+    assert_includes Gem::Specification.all_names, "z-1"
+    assert_includes Gem::Specification.all_names, "z-2"
 
     @cmd.options[:all] = true
     @cmd.options[:args] = %w[z]
@@ -82,15 +76,15 @@ class TestGemCommandsUninstallCommand < Gem::InstallerTestCase
 
     output = @ui.output.split "\n"
 
-    assert_equal 'Gem z-1 cannot be uninstalled because it is a default gem', output.shift
-    assert_equal 'Successfully uninstalled z-2', output.shift
+    assert_equal "Gem z-1 cannot be uninstalled because it is a default gem", output.shift
+    assert_equal "Successfully uninstalled z-2", output.shift
   end
 
   def test_execute_dependency_order
     initial_install
 
-    c = quick_gem 'c' do |spec|
-      spec.add_dependency 'a'
+    c = quick_gem "c" do |spec|
+      spec.add_dependency "a"
     end
 
     util_build_gem c
@@ -111,9 +105,9 @@ class TestGemCommandsUninstallCommand < Gem::InstallerTestCase
 
     output = ui.output.split "\n"
 
-    assert_equal 'Successfully uninstalled c-2', output.shift
+    assert_equal "Successfully uninstalled c-2", output.shift
     assert_equal "Removing executable",          output.shift
-    assert_equal 'Successfully uninstalled a-2', output.shift
+    assert_equal "Successfully uninstalled a-2", output.shift
   end
 
   def test_execute_removes_executable
@@ -150,12 +144,12 @@ class TestGemCommandsUninstallCommand < Gem::InstallerTestCase
 
     FileUtils.rm_f @executable # Wish this didn't happen in #setup
 
-    Gem::Installer.exec_format = 'foo-%s-bar'
+    Gem::Installer.exec_format = "foo-%s-bar"
 
     installer.format_executable = true
     installer.install
 
-    formatted_executable = File.join @gemhome, 'bin', 'foo-executable-bar'
+    formatted_executable = File.join @gemhome, "bin", "foo-executable-bar"
     assert_equal true, File.exist?(formatted_executable)
 
     @cmd.options[:executables] = true
@@ -198,19 +192,19 @@ class TestGemCommandsUninstallCommand < Gem::InstallerTestCase
 
     util_make_gems
 
-    assert_equal 3, Gem::Specification.find_all_by_name('a').length
+    assert_equal 3, Gem::Specification.find_all_by_name("a").length
 
-    @cmd.options[:version] = '1'
+    @cmd.options[:version] = "1"
     @cmd.options[:force] = true
-    @cmd.options[:args] = ['a']
+    @cmd.options[:args] = ["a"]
 
     use_ui ui do
       @cmd.execute
     end
 
-    assert_equal 2, Gem::Specification.find_all_by_name('a').length
+    assert_equal 2, Gem::Specification.find_all_by_name("a").length
 
-    assert File.exist? File.join(@gemhome, 'bin', 'executable')
+    assert File.exist? File.join(@gemhome, "bin", "executable")
   end
 
   def test_execute_with_version_specified_as_colon
@@ -220,18 +214,18 @@ class TestGemCommandsUninstallCommand < Gem::InstallerTestCase
 
     util_make_gems
 
-    assert_equal 3, Gem::Specification.find_all_by_name('a').length
+    assert_equal 3, Gem::Specification.find_all_by_name("a").length
 
     @cmd.options[:force] = true
-    @cmd.options[:args] = ['a:1']
+    @cmd.options[:args] = ["a:1"]
 
     use_ui ui do
       @cmd.execute
     end
 
-    assert_equal 2, Gem::Specification.find_all_by_name('a').length
+    assert_equal 2, Gem::Specification.find_all_by_name("a").length
 
-    assert File.exist? File.join(@gemhome, 'bin', 'executable')
+    assert File.exist? File.join(@gemhome, "bin", "executable")
   end
 
   def test_uninstall_selection
@@ -239,22 +233,22 @@ class TestGemCommandsUninstallCommand < Gem::InstallerTestCase
 
     util_make_gems
 
-    list = Gem::Specification.find_all_by_name 'a'
+    list = Gem::Specification.find_all_by_name "a"
 
-    @cmd.options[:args] = ['a']
+    @cmd.options[:args] = ["a"]
 
     use_ui ui do
       @cmd.execute
     end
 
-    updated_list = Gem::Specification.find_all_by_name('a')
+    updated_list = Gem::Specification.find_all_by_name("a")
     assert_equal list.length - 1, updated_list.length
 
-    assert_match ' 1. a-1',          ui.output
-    assert_match ' 2. a-2',          ui.output
-    assert_match ' 3. a-3.a',        ui.output
-    assert_match ' 4. All versions', ui.output
-    assert_match 'uninstalled a-1',  ui.output
+    assert_match " 1. a-1",          ui.output
+    assert_match " 2. a-2",          ui.output
+    assert_match " 3. a-3.a",        ui.output
+    assert_match " 4. All versions", ui.output
+    assert_match "uninstalled a-1",  ui.output
   end
 
   def test_uninstall_selection_multiple_gems
@@ -262,31 +256,31 @@ class TestGemCommandsUninstallCommand < Gem::InstallerTestCase
 
     util_make_gems
 
-    a_list = Gem::Specification.find_all_by_name('a')
-    b_list = Gem::Specification.find_all_by_name('b')
+    a_list = Gem::Specification.find_all_by_name("a")
+    b_list = Gem::Specification.find_all_by_name("b")
     list   = a_list + b_list
 
-    @cmd.options[:args] = ['a', 'b']
+    @cmd.options[:args] = ["a", "b"]
 
     use_ui ui do
       @cmd.execute
     end
 
-    updated_a_list = Gem::Specification.find_all_by_name('a')
-    updated_b_list = Gem::Specification.find_all_by_name('b')
+    updated_a_list = Gem::Specification.find_all_by_name("a")
+    updated_b_list = Gem::Specification.find_all_by_name("b")
     updated_list   = updated_a_list + updated_b_list
 
     assert_equal list.length - 2, updated_list.length
 
     out = ui.output.split("\n")
-    assert_match 'uninstalled b-2',          out.shift
-    assert_match '',                         out.shift
-    assert_match 'Select gem to uninstall:', out.shift
-    assert_match ' 1. a-1',                  out.shift
-    assert_match ' 2. a-2',                  out.shift
-    assert_match ' 3. a-3.a',                out.shift
-    assert_match ' 4. All versions',         out.shift
-    assert_match 'uninstalled a-1',          out.shift
+    assert_match "uninstalled b-2",          out.shift
+    assert_match "",                         out.shift
+    assert_match "Select gem to uninstall:", out.shift
+    assert_match " 1. a-1",                  out.shift
+    assert_match " 2. a-2",                  out.shift
+    assert_match " 3. a-3.a",                out.shift
+    assert_match " 4. All versions",         out.shift
+    assert_match "uninstalled a-1",          out.shift
     assert_empty                             out
   end
 
@@ -295,22 +289,22 @@ class TestGemCommandsUninstallCommand < Gem::InstallerTestCase
 
     ui = Gem::MockGemUi.new "y\n"
 
-    a_1, = util_gem 'a', 1
+    a_1, = util_gem "a", 1
     install_gem a_1
 
-    a_3a, = util_gem 'a', '3.a'
+    a_3a, = util_gem "a", "3.a"
     install_gem a_3a
 
-    assert_equal 3, Gem::Specification.find_all_by_name('a').length
+    assert_equal 3, Gem::Specification.find_all_by_name("a").length
 
     @cmd.options[:force] = true
-    @cmd.options[:args] = ['a']
+    @cmd.options[:args] = ["a"]
 
     use_ui ui do
       @cmd.execute
     end
 
-    assert_empty Gem::Specification.find_all_by_name('a')
+    assert_empty Gem::Specification.find_all_by_name("a")
     assert_match "Removing executable", ui.output
     refute File.exist? @executable
   end
@@ -322,36 +316,32 @@ class TestGemCommandsUninstallCommand < Gem::InstallerTestCase
 
     util_make_gems
 
-    assert Gem::Specification.find_all_by_name('dep_x').length > 0
-    assert Gem::Specification.find_all_by_name('x').length > 0
+    assert Gem::Specification.find_all_by_name("dep_x").length > 0
+    assert Gem::Specification.find_all_by_name("x").length > 0
 
     @cmd.options[:force] = true
-    @cmd.options[:args] = ['x']
+    @cmd.options[:args] = ["x"]
 
     use_ui ui do
       @cmd.execute
     end
 
-    assert Gem::Specification.find_all_by_name('dep_x').length > 0
-    assert Gem::Specification.find_all_by_name('x').length.zero?
+    assert Gem::Specification.find_all_by_name("dep_x").length > 0
+    assert Gem::Specification.find_all_by_name("x").length.zero?
   end
 
   def test_execute_all
     util_make_gems
 
-    default = new_default_spec 'default', '1'
+    default = new_default_spec "default", "1"
     install_default_gems default
 
     gemhome2 = "#{@gemhome}2"
 
-    a_4, = util_gem 'a', 4
+    a_4, = util_gem "a", 4
     install_gem a_4
 
-    Gem::Specification.dirs = [@gemhome, gemhome2]
-
-    assert_includes Gem::Specification.all_names, 'a-1'
-    assert_includes Gem::Specification.all_names, 'a-4'
-    assert_includes Gem::Specification.all_names, 'default-1'
+    assert_gems_presence "a-1", "a-4", "default-1", dirs: [@gemhome, gemhome2]
 
     @cmd.options[:all] = true
     @cmd.options[:args] = []
@@ -369,16 +359,14 @@ class TestGemCommandsUninstallCommand < Gem::InstallerTestCase
 
     gemhome2 = "#{@gemhome}2"
 
-    a_4, = util_gem 'a', 4
+    a_4, = util_gem "a", 4
     install_gem a_4 , :install_dir => gemhome2
 
-    Gem::Specification.dirs = [@gemhome, gemhome2]
+    assert_gems_presence "a-4", dirs: [@gemhome, gemhome2]
 
-    assert_includes Gem::Specification.all_names, 'a-4'
+    @cmd.options[:args] = ["a:4"]
 
-    @cmd.options[:args] = ['a:4']
-
-    e = assert_raises Gem::InstallError do
+    e = assert_raise Gem::InstallError do
       use_ui ui do
         @cmd.execute
       end
@@ -387,6 +375,26 @@ class TestGemCommandsUninstallCommand < Gem::InstallerTestCase
     assert_includes e.message, "a is not installed in GEM_HOME"
   end
 
+  def test_execute_outside_gem_home_when_install_dir_given
+    gemhome2 = "#{@gemhome}2"
+
+    a_4, = util_gem "a", 4
+    install_gem a_4 , :install_dir => gemhome2
+
+    assert_gems_presence "a-4", dirs: [@gemhome, gemhome2]
+
+    Gem::Specification.dirs = [@gemhome]
+
+    @cmd.options[:install_dir] = gemhome2
+    @cmd.options[:args] = ["a:4"]
+
+    @cmd.execute
+
+    Gem::Specification.dirs = [gemhome2]
+
+    refute_includes Gem::Specification.all_names.sort, "a-4"
+  end
+
   def test_handle_options
     @cmd.handle_options %w[]
 
@@ -398,7 +406,7 @@ class TestGemCommandsUninstallCommand < Gem::InstallerTestCase
   end
 
   def test_handle_options_vendor
-    vendordir(File.join(@tempdir, 'vendor')) do
+    vendordir(File.join(@tempdir, "vendor")) do
       use_ui @ui do
         @cmd.handle_options %w[--vendor]
       end
@@ -421,7 +429,7 @@ WARNING:  Use your OS package manager to uninstall vendor gems
     @cmd.options[:version] = Gem::Requirement.new("> 1")
 
     use_ui @ui do
-      e = assert_raises Gem::MockGemUi::TermError do
+      e = assert_raise Gem::MockGemUi::TermError do
         @cmd.execute
       end
 
@@ -437,11 +445,11 @@ WARNING:  Use your OS package manager to uninstall vendor gems
 
   def test_handle_options_vendor_missing
     vendordir(nil) do
-      e = assert_raises OptionParser::InvalidOption do
+      e = assert_raise Gem::OptionParser::InvalidOption do
         @cmd.handle_options %w[--vendor]
       end
 
-      assert_equal 'invalid option: --vendor your platform is not supported',
+      assert_equal "invalid option: --vendor your platform is not supported",
                    e.message
 
       refute @cmd.options[:vendor]
@@ -450,7 +458,7 @@ WARNING:  Use your OS package manager to uninstall vendor gems
   end
 
   def test_execute_with_gem_not_installed
-    @cmd.options[:args] = ['d']
+    @cmd.options[:args] = ["d"]
 
     use_ui ui do
       @cmd.execute
@@ -478,7 +486,7 @@ WARNING:  Use your OS package manager to uninstall vendor gems
     e = nil
     @cmd.stub :uninstall, uninstall_exception do
       use_ui @ui do
-        e = assert_raises Gem::MockGemUi::TermError do
+        e = assert_raise Gem::MockGemUi::TermError do
           @cmd.execute
         end
       end
@@ -487,7 +495,7 @@ WARNING:  Use your OS package manager to uninstall vendor gems
     end
 
     assert_empty @ui.output
-    assert_match %r!Error: unable to successfully uninstall '#{@spec.name}'!, @ui.error
+    assert_match %r{Error: unable to successfully uninstall '#{@spec.name}'}, @ui.error
   end
 
   private
@@ -503,4 +511,11 @@ WARNING:  Use your OS package manager to uninstall vendor gems
     end
   end
 
+  def assert_gems_presence(*gems, dirs:)
+    Gem::Specification.dirs = dirs
+
+    gems.each do |full_name|
+      assert_includes Gem::Specification.all_names, full_name
+    end
+  end
 end

data/test/rubygems/test_gem_commands_unpack_command.rb

@@ -1,9 +1,8 @@
 # frozen_string_literal: true
-require 'rubygems/test_case'
-require 'rubygems/commands/unpack_command'
+require_relative "helper"
+require "rubygems/commands/unpack_command"
 
 class TestGemCommandsUnpackCommand < Gem::TestCase
-
   def setup
     super
 
@@ -18,28 +17,28 @@ class TestGemCommandsUnpackCommand < Gem::TestCase
     assert_equal(
       @cmd.find_in_cache(File.basename @a1.cache_file),
       @a1.cache_file,
-      'found a-1.gem in the cache'
+      "found a-1.gem in the cache"
     )
   end
 
   def test_get_path
     specs = spec_fetcher do |fetcher|
-      fetcher.gem 'a', 1
+      fetcher.gem "a", 1
     end
 
-    dep = Gem::Dependency.new 'a', 1
+    dep = Gem::Dependency.new "a", 1
     assert_equal(
       @cmd.get_path(dep),
-      specs['a-1'].cache_file,
-      'fetches a-1 and returns the cache path'
+      specs["a-1"].cache_file,
+      "fetches a-1 and returns the cache path"
     )
 
-    FileUtils.rm specs['a-1'].cache_file
+    FileUtils.rm specs["a-1"].cache_file
 
     assert_equal(
       @cmd.get_path(dep),
-      specs['a-1'].cache_file,
-      'when removed from cache, refetches a-1'
+      specs["a-1"].cache_file,
+      "when removed from cache, refetches a-1"
     )
   end
 
@@ -54,18 +53,18 @@ class TestGemCommandsUnpackCommand < Gem::TestCase
       end
     end
 
-    assert File.exist?(File.join(@tempdir, 'a-3.a')), 'a should be unpacked'
-    assert File.exist?(File.join(@tempdir, 'b-2')),   'b should be unpacked'
+    assert File.exist?(File.join(@tempdir, "a-3.a")), "a should be unpacked"
+    assert File.exist?(File.join(@tempdir, "b-2")),   "b should be unpacked"
   end
 
   def test_execute_gem_path
     spec_fetcher do |fetcher|
-      fetcher.gem 'a', '3.a'
+      fetcher.gem "a", "3.a"
     end
 
     Gem.clear_paths
 
-    gemhome2 = File.join @tempdir, 'gemhome2'
+    gemhome2 = File.join @tempdir, "gemhome2"
 
     Gem.use_paths gemhome2, [gemhome2, @gemhome]
 
@@ -77,7 +76,7 @@ class TestGemCommandsUnpackCommand < Gem::TestCase
       end
     end
 
-    assert File.exist?(File.join(@tempdir, 'a-3.a'))
+    assert File.exist?(File.join(@tempdir, "a-3.a"))
   end
 
   def test_execute_gem_path_missing
@@ -85,7 +84,7 @@ class TestGemCommandsUnpackCommand < Gem::TestCase
 
     Gem.clear_paths
 
-    gemhome2 = File.join @tempdir, 'gemhome2'
+    gemhome2 = File.join @tempdir, "gemhome2"
 
     Gem.use_paths gemhome2, [gemhome2, @gemhome]
 
@@ -97,13 +96,13 @@ class TestGemCommandsUnpackCommand < Gem::TestCase
       end
     end
 
-    assert_equal '', @ui.output
+    assert_equal "", @ui.output
   end
 
   def test_execute_remote
     spec_fetcher do |fetcher|
-      fetcher.download 'a', 1
-      fetcher.download 'a', 2
+      fetcher.download "a", 1
+      fetcher.download "a", 2
     end
 
     Gem.configuration.verbose = :really
@@ -115,7 +114,7 @@ class TestGemCommandsUnpackCommand < Gem::TestCase
       end
     end
 
-    assert File.exist?(File.join(@tempdir, 'a-2')), 'a should be unpacked'
+    assert File.exist?(File.join(@tempdir, "a-2")), "a should be unpacked"
   end
 
   def test_execute_spec
@@ -130,15 +129,15 @@ class TestGemCommandsUnpackCommand < Gem::TestCase
       end
     end
 
-    assert File.exist?(File.join(@tempdir, 'a-3.a.gemspec'))
-    assert File.exist?(File.join(@tempdir, 'b-2.gemspec'))
+    assert File.exist?(File.join(@tempdir, "a-3.a.gemspec"))
+    assert File.exist?(File.join(@tempdir, "b-2.gemspec"))
   end
 
   def test_execute_spec_target
     util_make_gems
 
     @cmd.options[:args] = %w[a b]
-    @cmd.options[:target] = 'specs'
+    @cmd.options[:target] = "specs"
     @cmd.options[:spec] = true
 
     use_ui @ui do
@@ -147,12 +146,12 @@ class TestGemCommandsUnpackCommand < Gem::TestCase
       end
     end
 
-    assert File.exist?(File.join(@tempdir, 'specs/a-3.a.gemspec'))
-    assert File.exist?(File.join(@tempdir, 'specs/b-2.gemspec'))
+    assert File.exist?(File.join(@tempdir, "specs/a-3.a.gemspec"))
+    assert File.exist?(File.join(@tempdir, "specs/b-2.gemspec"))
   end
 
   def test_execute_sudo
-    skip 'Cannot perform this test on windows (chmod)' if win_platform?
+    pend "Cannot perform this test on windows (chmod)" if win_platform?
 
     util_make_gems
 
@@ -166,7 +165,7 @@ class TestGemCommandsUnpackCommand < Gem::TestCase
       end
     end
 
-    assert File.exist?(File.join(@tempdir, 'b-2')), 'b should be unpacked'
+    assert File.exist?(File.join(@tempdir, "b-2")), "b should be unpacked"
   ensure
     FileUtils.chmod 0755, @gemhome
   end
@@ -174,7 +173,7 @@ class TestGemCommandsUnpackCommand < Gem::TestCase
   def test_execute_with_target_option
     util_make_gems
 
-    target = 'with_target'
+    target = "with_target"
     @cmd.options[:args] = %w[a]
     @cmd.options[:target] = target
 
@@ -184,12 +183,12 @@ class TestGemCommandsUnpackCommand < Gem::TestCase
       end
     end
 
-    assert File.exist?(File.join(@tempdir, target, 'a-3.a'))
+    assert File.exist?(File.join(@tempdir, target, "a-3.a"))
   end
 
   def test_execute_exact_match
-    foo_spec = util_spec 'foo'
-    foo_bar_spec = util_spec 'foo_bar'
+    foo_spec = util_spec "foo"
+    foo_bar_spec = util_spec "foo_bar"
 
     use_ui @ui do
       Dir.chdir @tempdir do
@@ -211,7 +210,7 @@ class TestGemCommandsUnpackCommand < Gem::TestCase
       end
     end
 
-    assert_path_exists File.join(@tempdir, foo_spec.full_name)
+    assert_path_exist File.join(@tempdir, foo_spec.full_name)
   end
 
   def test_handle_options_metadata
@@ -221,5 +220,4 @@ class TestGemCommandsUnpackCommand < Gem::TestCase
 
     assert @cmd.options[:spec]
   end
-
 end