rubygems-update 3.3.7 → 3.4.8

data/test/rubygems/test_gem_commands_update_command.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
-require_relative 'helper'
-require 'rubygems/commands/update_command'
+require_relative "helper"
+require "rubygems/commands/update_command"
 
 class TestGemCommandsUpdateCommand < Gem::TestCase
   def setup
@@ -12,20 +12,20 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
     @cmd.options[:document] = []
 
     @specs = spec_fetcher do |fetcher|
-      fetcher.download 'a', 1
-      fetcher.download 'a', 2
-      fetcher.download 'a', '3.a'
+      fetcher.download "a", 1
+      fetcher.download "a", 2
+      fetcher.download "a", "3.a"
     end
 
-    @a1_path  = @specs['a-1'].cache_file
-    @a2_path  = @specs['a-1'].cache_file
-    @a3a_path = @specs['a-3.a'].cache_file
+    @a1_path  = @specs["a-1"].cache_file
+    @a2_path  = @specs["a-1"].cache_file
+    @a3a_path = @specs["a-3.a"].cache_file
   end
 
   def test_execute
     spec_fetcher do |fetcher|
-      fetcher.download 'a', 2
-      fetcher.spec 'a', 1
+      fetcher.download "a", 2
+      fetcher.spec "a", 1
     end
 
     @cmd.options[:args] = []
@@ -43,11 +43,11 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
 
   def test_execute_multiple
     spec_fetcher do |fetcher|
-      fetcher.download 'a',  2
-      fetcher.download 'ab', 2
+      fetcher.download "a",  2
+      fetcher.download "ab", 2
 
-      fetcher.spec 'a',  1
-      fetcher.spec 'ab', 1
+      fetcher.spec "a",  1
+      fetcher.spec "ab", 1
     end
 
     @cmd.options[:args] = %w[a]
@@ -65,7 +65,7 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
 
   def test_execute_system
     spec_fetcher do |fetcher|
-      fetcher.download 'rubygems-update', 9 do |s|
+      fetcher.download "rubygems-update", 9 do |s|
         s.files = %w[setup.rb]
       end
     end
@@ -87,7 +87,7 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
 
   def test_execute_system_at_latest
     spec_fetcher do |fetcher|
-      fetcher.download 'rubygems-update', Gem::VERSION do |s|
+      fetcher.download "rubygems-update", Gem::VERSION do |s|
         s.files = %w[setup.rb]
       end
     end
@@ -108,9 +108,9 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
 
   def test_execute_system_when_latest_does_not_support_your_ruby
     spec_fetcher do |fetcher|
-      fetcher.download 'rubygems-update', 9 do |s|
+      fetcher.download "rubygems-update", 9 do |s|
         s.files = %w[setup.rb]
-        s.required_ruby_version = '> 9'
+        s.required_ruby_version = "> 9"
       end
     end
 
@@ -133,11 +133,11 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
 
   def test_execute_system_multiple
     spec_fetcher do |fetcher|
-      fetcher.download 'rubygems-update', 8 do |s|
+      fetcher.download "rubygems-update", 8 do |s|
         s.files = %w[setup.rb]
       end
 
-      fetcher.download 'rubygems-update', 9 do |s|
+      fetcher.download "rubygems-update", 9 do |s|
         s.files = %w[setup.rb]
       end
     end
@@ -159,7 +159,7 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
 
   def test_execute_system_update_installed
     spec_fetcher do |fetcher|
-      fetcher.download 'rubygems-update', 8 do |s|
+      fetcher.download "rubygems-update", 8 do |s|
         s.files = %w[setup.rb]
       end
     end
@@ -170,7 +170,7 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
     @cmd.execute
 
     spec_fetcher do |fetcher|
-      fetcher.download 'rubygems-update', 9 do |s|
+      fetcher.download "rubygems-update", 9 do |s|
         s.files = %w[setup.rb]
       end
     end
@@ -191,13 +191,44 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
     assert_empty out
   end
 
+  def test_execute_system_update_installed_in_non_default_gem_path
+    rubygems_update_spec = quick_gem "rubygems-update", 9 do |s|
+      write_file File.join(@tempdir, "setup.rb")
+
+      s.files += %w[setup.rb]
+    end
+
+    util_setup_spec_fetcher rubygems_update_spec
+
+    rubygems_update_package = Gem::Package.build rubygems_update_spec
+
+    gemhome2 = "#{@gemhome}2"
+
+    Gem::Installer.at(rubygems_update_package, :install_dir => gemhome2).install
+
+    Gem.use_paths @gemhome, [gemhome2, @gemhome]
+
+    @cmd.options[:args]          = []
+    @cmd.options[:system]        = true
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    out = @ui.output.split "\n"
+    assert_equal "Installing RubyGems 9", out.shift
+    assert_equal "RubyGems system software updated", out.shift
+
+    assert_empty out
+  end
+
   def test_execute_system_specific
     spec_fetcher do |fetcher|
-      fetcher.download 'rubygems-update', 8 do |s|
+      fetcher.download "rubygems-update", 8 do |s|
         s.files = %w[setup.rb]
       end
 
-      fetcher.download 'rubygems-update', 9 do |s|
+      fetcher.download "rubygems-update", 9 do |s|
         s.files = %w[setup.rb]
       end
     end
@@ -219,7 +250,7 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
 
   def test_execute_system_specific_older_than_minimum_supported_rubygems
     spec_fetcher do |fetcher|
-      fetcher.download 'rubygems-update', "2.5.1" do |s|
+      fetcher.download "rubygems-update", "2.5.1" do |s|
         s.files = %w[setup.rb]
       end
     end
@@ -248,7 +279,7 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
 
   def test_execute_system_specific_older_than_3_2_removes_plugins_dir
     spec_fetcher do |fetcher|
-      fetcher.download 'rubygems-update', 3.1 do |s|
+      fetcher.download "rubygems-update", 3.1 do |s|
         s.files = %w[setup.rb]
       end
     end
@@ -266,7 +297,7 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
     @cmd.options[:system]        = "3.1"
 
     FileUtils.mkdir_p Gem.plugindir
-    write_file File.join(Gem.plugindir, 'a_plugin.rb')
+    write_file File.join(Gem.plugindir, "a_plugin.rb")
 
     @cmd.execute
 
@@ -275,7 +306,7 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
 
   def test_execute_system_specific_newer_than_or_equal_to_3_2_leaves_plugins_dir_alone
     spec_fetcher do |fetcher|
-      fetcher.download 'rubygems-update', "3.2.a" do |s|
+      fetcher.download "rubygems-update", "3.2.a" do |s|
         s.files = %w[setup.rb]
       end
     end
@@ -293,7 +324,7 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
     @cmd.options[:system]        = "3.2.a"
 
     FileUtils.mkdir_p Gem.plugindir
-    plugin_file = File.join(Gem.plugindir, 'a_plugin.rb')
+    plugin_file = File.join(Gem.plugindir, "a_plugin.rb")
     write_file plugin_file
 
     @cmd.execute
@@ -304,11 +335,11 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
 
   def test_execute_system_specifically_to_latest_version
     spec_fetcher do |fetcher|
-      fetcher.download 'rubygems-update', 8 do |s|
+      fetcher.download "rubygems-update", 8 do |s|
         s.files = %w[setup.rb]
       end
 
-      fetcher.download 'rubygems-update', 9 do |s|
+      fetcher.download "rubygems-update", 9 do |s|
         s.files = %w[setup.rb]
       end
     end
@@ -369,12 +400,12 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
     @cmd.options[:system] = true
     @cmd.options[:silent] = true
 
-    assert_equal true, @cmd.update_rubygems_arguments.include?('--silent')
+    assert_equal true, @cmd.update_rubygems_arguments.include?("--silent")
   end
 
   def test_execute_system_silent
     spec_fetcher do |fetcher|
-      fetcher.download 'rubygems-update', 9 do |s|
+      fetcher.download "rubygems-update", 9 do |s|
         s.files = %w[setup.rb]
       end
     end
@@ -398,12 +429,12 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
 
   def test_execute_dependencies
     spec_fetcher do |fetcher|
-      fetcher.download 'a', 2, 'b' => 2, 'c' => 2
-      fetcher.download 'b', 2
-      fetcher.download 'c', 2
+      fetcher.download "a", 2, "b" => 2, "c" => 2
+      fetcher.download "b", 2
+      fetcher.download "c", 2
 
-      fetcher.spec 'a', 1, 'c' => '1.2'
-      fetcher.spec 'c', '1.2'
+      fetcher.spec "a", 1, "c" => "1.2"
+      fetcher.spec "c", "1.2"
     end
 
     Gem::Specification.reset
@@ -425,8 +456,8 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
 
   def test_execute_rdoc
     spec_fetcher do |fetcher|
-      fetcher.download 'a', 2
-      fetcher.spec 'a', 1
+      fetcher.download "a", 2
+      fetcher.spec "a", 1
     end
 
     Gem.done_installing(&Gem::RDoc.method(:generation_hook))
@@ -441,16 +472,16 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
 
     wait_for_child_process_to_exit
 
-    a2 = @specs['a-2']
+    a2 = @specs["a-2"]
 
-    assert_path_exist File.join(a2.doc_dir, 'rdoc')
+    assert_path_exist File.join(a2.doc_dir, "rdoc")
   end
 
   def test_execute_named
     spec_fetcher do |fetcher|
-      fetcher.download 'a', 2
+      fetcher.download "a", 2
 
-      fetcher.spec 'a', 1
+      fetcher.spec "a", 1
     end
 
     @cmd.options[:args] = %w[a]
@@ -469,10 +500,10 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
 
   def test_execute_named_some_up_to_date
     spec_fetcher do |fetcher|
-      fetcher.download 'a', 2
-      fetcher.spec 'a', 1
+      fetcher.download "a", 2
+      fetcher.spec "a", 1
 
-      fetcher.spec 'b', 2
+      fetcher.spec "b", 2
     end
 
     @cmd.options[:args] = %w[a b]
@@ -492,7 +523,7 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
 
   def test_execute_named_up_to_date
     spec_fetcher do |fetcher|
-      fetcher.spec 'a', 2
+      fetcher.spec "a", 2
     end
 
     @cmd.options[:args] = %w[a]
@@ -504,15 +535,16 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
     out = @ui.output.split "\n"
     assert_equal "Updating installed gems", out.shift
     assert_equal "Nothing to update", out.shift
+    assert_equal "Gems already up-to-date: a", out.shift
 
     assert_empty out
   end
 
   def test_execute_named_up_to_date_prerelease
     spec_fetcher do |fetcher|
-      fetcher.download 'a', '3.a'
+      fetcher.download "a", "3.a"
 
-      fetcher.gem 'a', 2
+      fetcher.gem "a", 2
     end
 
     @cmd.options[:args] = %w[a]
@@ -532,7 +564,7 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
 
   def test_execute_up_to_date
     spec_fetcher do |fetcher|
-      fetcher.gem 'a', 2
+      fetcher.gem "a", 2
     end
 
     @cmd.options[:args] = []
@@ -574,73 +606,73 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
 
   def test_fetch_remote_gems
     specs = spec_fetcher do |fetcher|
-      fetcher.gem 'a', 1
-      fetcher.gem 'a', 2
+      fetcher.gem "a", 1
+      fetcher.gem "a", 2
     end
 
     expected = [
-      [Gem::NameTuple.new('a', v(2), Gem::Platform::RUBY),
+      [Gem::NameTuple.new("a", v(2), Gem::Platform::RUBY),
        Gem::Source.new(@gem_repo)],
     ]
 
-    assert_equal expected, @cmd.fetch_remote_gems(specs['a-1'])
+    assert_equal expected, @cmd.fetch_remote_gems(specs["a-1"])
   end
 
   def test_fetch_remote_gems_error
     Gem.sources.replace %w[http://nonexistent.example]
 
     assert_raise Gem::RemoteFetcher::FetchError do
-      @cmd.fetch_remote_gems @specs['a-1']
+      @cmd.fetch_remote_gems @specs["a-1"]
     end
   end
 
   def test_fetch_remote_gems_mismatch
-    platform = Gem::Platform.new 'x86-freebsd9'
+    platform = Gem::Platform.new "x86-freebsd9"
 
     specs = spec_fetcher do |fetcher|
-      fetcher.spec 'a', 1
-      fetcher.spec 'a', 2
+      fetcher.spec "a", 1
+      fetcher.spec "a", 2
 
-      fetcher.spec 'a', 2 do |s|
+      fetcher.spec "a", 2 do |s|
         s.platform = platform
       end
     end
 
     expected = [
-      [Gem::NameTuple.new('a', v(2), Gem::Platform::RUBY),
+      [Gem::NameTuple.new("a", v(2), Gem::Platform::RUBY),
        Gem::Source.new(@gem_repo)],
     ]
 
-    assert_equal expected, @cmd.fetch_remote_gems(specs['a-1'])
+    assert_equal expected, @cmd.fetch_remote_gems(specs["a-1"])
   end
 
   def test_fetch_remote_gems_prerelease
     specs = spec_fetcher do |fetcher|
-      fetcher.gem 'a', 1
-      fetcher.gem 'a', 2
-      fetcher.gem 'a', '3.a'
+      fetcher.gem "a", 1
+      fetcher.gem "a", 2
+      fetcher.gem "a", "3.a"
     end
 
     @cmd.options[:prerelease] = true
 
     expected = [
-      [Gem::NameTuple.new('a', v(2), Gem::Platform::RUBY),
+      [Gem::NameTuple.new("a", v(2), Gem::Platform::RUBY),
        Gem::Source.new(@gem_repo)],
-      [Gem::NameTuple.new('a', v('3.a'), Gem::Platform::RUBY),
+      [Gem::NameTuple.new("a", v("3.a"), Gem::Platform::RUBY),
        Gem::Source.new(@gem_repo)],
     ]
 
-    assert_equal expected, @cmd.fetch_remote_gems(specs['a-1'])
+    assert_equal expected, @cmd.fetch_remote_gems(specs["a-1"])
   end
 
   def test_handle_options_system
     @cmd.handle_options %w[--system]
 
     expected = {
-      :args     => [],
+      :args => [],
       :document => %w[ri],
-      :force    => false,
-      :system   => true,
+      :force => false,
+      :system => true,
     }
 
     assert_equal expected, @cmd.options
@@ -656,10 +688,10 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
     @cmd.handle_options %w[--system 1.3.7]
 
     expected = {
-      :args     => [],
+      :args => [],
       :document => %w[ri],
-      :force    => false,
-      :system   => "1.3.7",
+      :force => false,
+      :system => "1.3.7",
     }
 
     assert_equal expected, @cmd.options
@@ -667,11 +699,11 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
 
   def test_update_gem_prerelease
     spec_fetcher do |fetcher|
-      fetcher.spec 'a', '1.a'
-      fetcher.gem  'a', '1.b'
+      fetcher.spec "a", "1.a"
+      fetcher.gem  "a", "1.b"
     end
 
-    @cmd.update_gem 'a', Gem::Requirement.new('= 1.b')
+    @cmd.update_gem "a", Gem::Requirement.new("= 1.b")
 
     refute_empty @cmd.updated
 
@@ -680,15 +712,15 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
 
   def test_update_gem_unresolved_dependency
     spec_fetcher do |fetcher|
-      fetcher.spec 'a', 1
-      fetcher.gem  'a', 2 do |s|
-        s.add_dependency 'b', '>= 2'
+      fetcher.spec "a", 1
+      fetcher.gem  "a", 2 do |s|
+        s.add_dependency "b", ">= 2"
       end
 
-      fetcher.spec 'b', 1
+      fetcher.spec "b", 1
     end
 
-    @cmd.update_gem 'a'
+    @cmd.update_gem "a"
 
     assert_empty @cmd.updated
   end
@@ -698,18 +730,18 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
 
     arguments = @cmd.update_rubygems_arguments
 
-    assert_equal '--prefix',           arguments.shift
+    assert_equal "--prefix",           arguments.shift
     assert_equal Gem.prefix,           arguments.shift
-    assert_equal '--no-document',      arguments.shift
-    assert_equal '--previous-version', arguments.shift
+    assert_equal "--no-document",      arguments.shift
+    assert_equal "--previous-version", arguments.shift
     assert_equal Gem::VERSION,         arguments.shift
     assert_empty arguments
   end
 
   def test_explain
     spec_fetcher do |fetcher|
-      fetcher.download 'a', 2
-      fetcher.spec 'a', 1
+      fetcher.download "a", 2
+      fetcher.spec "a", 1
     end
 
     @cmd.options[:explain] = true
@@ -729,13 +761,13 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
   def test_explain_platform_local
     local = Gem::Platform.local
     spec_fetcher do |fetcher|
-      fetcher.download 'a', 2
+      fetcher.download "a", 2
 
-      fetcher.download 'a', 2 do |s|
+      fetcher.download "a", 2 do |s|
         s.platform = local
       end
 
-      fetcher.spec 'a', 1
+      fetcher.spec "a", 1
     end
 
     @cmd.options[:explain] = true
@@ -755,13 +787,13 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
   def test_explain_platform_ruby
     local = Gem::Platform.local
     spec_fetcher do |fetcher|
-      fetcher.download 'a', 2
+      fetcher.download "a", 2
 
-      fetcher.download 'a', 2 do |s|
+      fetcher.download "a", 2 do |s|
         s.platform = local
       end
 
-      fetcher.spec 'a', 1
+      fetcher.spec "a", 1
     end
 
     # equivalent to --platform=ruby
@@ -780,4 +812,24 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
     assert_equal "  a-2", out.shift
     assert_empty out
   end
+
+  def test_execute_named_not_installed_and_no_update
+    spec_fetcher do |fetcher|
+      fetcher.spec "a", 2
+    end
+
+    @cmd.options[:args] = %w[a b]
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    out = @ui.output.split "\n"
+    assert_equal "Updating installed gems", out.shift
+    assert_equal "Nothing to update", out.shift
+    assert_equal "Gems already up-to-date: a", out.shift
+    assert_equal "Gems not currently installed: b", out.shift
+
+    assert_empty out
+  end
 end

data/test/rubygems/test_gem_commands_which_command.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
-require_relative 'helper'
-require 'rubygems/commands/which_command'
+require_relative "helper"
+require "rubygems/commands/which_command"
 
 class TestGemCommandsWhichCommand < Gem::TestCase
   def setup
@@ -19,7 +19,7 @@ class TestGemCommandsWhichCommand < Gem::TestCase
     end
 
     assert_equal "#{@foo_bar.full_gem_path}/lib/foo_bar.rb\n", @ui.output
-    assert_equal '', @ui.error
+    assert_equal "", @ui.error
   end
 
   def test_execute_directory
@@ -31,7 +31,7 @@ class TestGemCommandsWhichCommand < Gem::TestCase
       end
     end
 
-    assert_equal '', @ui.output
+    assert_equal "", @ui.output
     assert_match %r{Can.t find Ruby library file or shared library directory\n},
                  @ui.error
   end
@@ -63,14 +63,14 @@ class TestGemCommandsWhichCommand < Gem::TestCase
       end
     end
 
-    assert_equal '', @ui.output
+    assert_equal "", @ui.output
     assert_match %r{Can.t find Ruby library file or shared library missinglib\n},
                  @ui.error
   end
 
   def util_foo_bar
     files = %w[lib/foo_bar.rb lib/directory/baz.rb Rakefile]
-    @foo_bar = util_spec 'foo_bar' do |gem|
+    @foo_bar = util_spec "foo_bar" do |gem|
       gem.files = files
     end
     install_specs @foo_bar