rubygems-update 2.6.0 → 3.4.22

data/test/rubygems/test_gem_commands_check_command.rb

@@ -1,16 +1,16 @@
 # frozen_string_literal: true
-require 'rubygems/test_case'
-require 'rubygems/commands/check_command'
 
-class TestGemCommandsCheckCommand < Gem::TestCase
+require_relative "helper"
+require "rubygems/commands/check_command"
 
+class TestGemCommandsCheckCommand < Gem::TestCase
   def setup
     super
 
     @cmd = Gem::Commands::CheckCommand.new
   end
 
-  def gem name
+  def gem(name)
     spec = quick_gem name do |gem|
       gem.files = %W[lib/#{name}.rb Rakefile]
     end
@@ -46,24 +46,23 @@ class TestGemCommandsCheckCommand < Gem::TestCase
   end
 
   def test_doctor
-    gem 'a'
-    b = gem 'b'
+    gem "a"
+    b = gem "b"
 
     FileUtils.rm b.spec_file
 
-    assert_path_exists b.gem_dir
-    refute_path_exists b.spec_file
+    assert_path_exist b.gem_dir
+    assert_path_not_exist b.spec_file
 
     Gem.use_paths @gemhome
 
-    capture_io do
+    capture_output do
       use_ui @ui do
         @cmd.doctor
       end
     end
 
-    refute_path_exists b.gem_dir
-    refute_path_exists b.spec_file
+    assert_path_not_exist b.gem_dir
+    assert_path_not_exist b.spec_file
   end
-
 end

data/test/rubygems/test_gem_commands_cleanup_command.rb

@@ -1,17 +1,17 @@
 # frozen_string_literal: true
-require 'rubygems/test_case'
-require 'rubygems/commands/cleanup_command'
-require 'rubygems/installer'
 
-class TestGemCommandsCleanupCommand < Gem::TestCase
+require_relative "helper"
+require "rubygems/commands/cleanup_command"
+require "rubygems/installer"
 
+class TestGemCommandsCleanupCommand < Gem::TestCase
   def setup
     super
 
     @cmd = Gem::Commands::CleanupCommand.new
 
-    @a_1 = util_spec 'a', 1
-    @a_2 = util_spec 'a', 2
+    @a_1 = util_spec "a", 1
+    @a_2 = util_spec "a", 2
 
     install_gem @a_1
     install_gem @a_2
@@ -23,26 +23,57 @@ class TestGemCommandsCleanupCommand < Gem::TestCase
   end
 
   def test_handle_options_dry_run
-    @cmd.handle_options %w[--dryrun]
+    @cmd.handle_options %w[--dry-run]
     assert @cmd.options[:dryrun]
   end
 
+  def test_handle_options_deprecated_dry_run
+    use_ui @ui do
+      @cmd.handle_options %w[--dryrun]
+      assert @cmd.options[:dryrun]
+    end
+
+    assert_equal \
+      "WARNING:  The \"--dryrun\" option has been deprecated and will be removed in future versions of Rubygems. Use --dry-run instead\n",
+      @ui.error
+  end
+
   def test_handle_options_n
     @cmd.handle_options %w[-n]
     assert @cmd.options[:dryrun]
   end
 
+  def test_handle_options_check_development
+    @cmd.handle_options []
+    assert @cmd.options[:check_dev]
+
+    %w[-D --check-development].each do |options|
+      @cmd.handle_options [options]
+      assert @cmd.options[:check_dev]
+    end
+
+    %w[--no-check-development].each do |options|
+      @cmd.handle_options [options]
+      refute @cmd.options[:check_dev]
+    end
+  end
+
   def test_execute
     @cmd.options[:args] = %w[a]
 
     @cmd.execute
 
-    refute_path_exists @a_1.gem_dir
+    assert_path_not_exist @a_1.gem_dir
   end
 
   def test_execute_all_dependencies
-    @b_1 = util_spec 'b', 1 do |s| s.add_dependency 'a', '1' end
-    @b_2 = util_spec 'b', 2 do |s| s.add_dependency 'a', '2' end
+    @b_1 = util_spec "b", 1 do |s|
+      s.add_dependency "a", "1"
+    end
+
+    @b_2 = util_spec "b", 2 do |s|
+      s.add_dependency "a", "2"
+    end
 
     install_gem @b_1
     install_gem @b_2
@@ -51,19 +82,57 @@ class TestGemCommandsCleanupCommand < Gem::TestCase
 
     @cmd.execute
 
-    refute_path_exists @a_1.gem_dir
-    refute_path_exists @b_1.gem_dir
+    assert_path_not_exist @a_1.gem_dir
+    assert_path_not_exist @b_1.gem_dir
+  end
+
+  def test_execute_dev_dependencies
+    @b_1 = util_spec "b", 1 do |s|
+      s.add_development_dependency "a", "1"
+    end
+
+    @c_1 = util_spec "c", 1 do |s|
+      s.add_development_dependency "a", "2"
+    end
+
+    install_gem @b_1
+    install_gem @c_1
+
+    @cmd.handle_options %w[--check-development]
+
+    @cmd.execute
+
+    assert_path_exist @a_1.gem_dir
+  end
+
+  def test_execute_without_dev_dependencies
+    @b_1 = util_spec "b", 1 do |s|
+      s.add_development_dependency "a", "1"
+    end
+
+    @c_1 = util_spec "c", 1 do |s|
+      s.add_development_dependency "a", "2"
+    end
+
+    install_gem @b_1
+    install_gem @c_1
+
+    @cmd.handle_options %w[--no-check-development]
+
+    @cmd.execute
+
+    assert_path_not_exist @a_1.gem_dir
   end
 
   def test_execute_all
-    gemhome2 = File.join @tempdir, 'gemhome2'
+    gemhome2 = File.join @tempdir, "gemhome2"
 
     Gem.ensure_gem_subdirectories gemhome2
 
     Gem.use_paths @gemhome, gemhome2
 
-    @b_1 = util_spec 'b', 1
-    @b_2 = util_spec 'b', 2
+    @b_1 = util_spec "b", 1
+    @b_2 = util_spec "b", 2
 
     install_gem @b_1
     install_gem @b_2
@@ -72,50 +141,50 @@ class TestGemCommandsCleanupCommand < Gem::TestCase
 
     @cmd.execute
 
-    assert_equal @gemhome, Gem.dir, 'GEM_HOME'
-    assert_equal [@gemhome, gemhome2], Gem.path.sort, 'GEM_PATH'
+    assert_equal @gemhome, Gem.dir, "GEM_HOME"
+    assert_equal [@gemhome, gemhome2], Gem.path.sort, "GEM_PATH"
 
-    refute_path_exists @a_1.gem_dir
-    refute_path_exists @b_1.gem_dir
+    assert_path_not_exist @a_1.gem_dir
+    assert_path_not_exist @b_1.gem_dir
   end
 
   def test_execute_all_user
-    @a_1_1, = util_gem 'a', '1.1'
+    @a_1_1, = util_gem "a", "1.1"
     @a_1_1 = install_gem @a_1_1 # pick up user install path
 
     Gem::Specification.dirs = [Gem.dir, Gem.user_dir]
 
-    assert_path_exists @a_1.gem_dir
-    assert_path_exists @a_1_1.gem_dir
+    assert_path_exist @a_1.gem_dir
+    assert_path_exist @a_1_1.gem_dir
 
     @cmd.options[:args] = %w[a]
 
     @cmd.execute
 
-    refute_path_exists @a_1.gem_dir
-    refute_path_exists @a_1_1.gem_dir
+    assert_path_not_exist @a_1.gem_dir
+    assert_path_not_exist @a_1_1.gem_dir
   end
 
   def test_execute_all_user_no_sudo
-    FileUtils.chmod 0555, @gemhome
+    FileUtils.chmod 0o555, @gemhome
 
-    @a_1_1, = util_gem 'a', '1.1'
+    @a_1_1, = util_gem "a", "1.1"
     @a_1_1 = install_gem @a_1_1, :user_install => true # pick up user install path
 
     Gem::Specification.dirs = [Gem.dir, Gem.user_dir]
 
-    assert_path_exists @a_1.gem_dir
-    assert_path_exists @a_1_1.gem_dir
+    assert_path_exist @a_1.gem_dir
+    assert_path_exist @a_1_1.gem_dir
 
     @cmd.options[:args] = %w[a]
 
     @cmd.execute
 
-    assert_path_exists @a_1.gem_dir
-    assert_path_exists @a_1_1.gem_dir
+    assert_path_exist @a_1.gem_dir
+    assert_path_exist @a_1_1.gem_dir
   ensure
-    FileUtils.chmod 0755, @gemhome
-  end unless win_platform?
+    FileUtils.chmod 0o755, @gemhome
+  end unless win_platform? || Process.uid.zero?
 
   def test_execute_dry_run
     @cmd.options[:args] = %w[a]
@@ -123,15 +192,15 @@ class TestGemCommandsCleanupCommand < Gem::TestCase
 
     @cmd.execute
 
-    assert_path_exists @a_1.gem_dir
+    assert_path_exist @a_1.gem_dir
   end
 
   def test_execute_keeps_older_versions_with_deps
-    @b_1 = util_spec 'b', 1
-    @b_2 = util_spec 'b', 2
+    @b_1 = util_spec "b", 1
+    @b_2 = util_spec "b", 2
 
-    @c = util_spec 'c', 1 do |s|
-      s.add_dependency 'b', '1'
+    @c = util_spec "c", 1 do |s|
+      s.add_dependency "b", "1"
     end
 
     install_gem @b_1
@@ -142,18 +211,18 @@ class TestGemCommandsCleanupCommand < Gem::TestCase
 
     @cmd.execute
 
-    assert_path_exists @b_1.gem_dir
+    assert_path_exist @b_1.gem_dir
   end
 
   def test_execute_ignore_default_gem_verbose
     Gem.configuration.verbose = :really
 
-    @b_1 = util_spec 'b', 1
+    @b_1 = util_spec "b", 1
     @b_default = new_default_spec "b", "2"
-    @b_2 = util_spec 'b', 3
+    @b_2 = util_spec "b", 3
 
     install_gem @b_1
-    install_default_specs @b_default
+    install_default_gems @b_default
     install_gem @b_2
 
     @cmd.options[:args] = []
@@ -162,17 +231,17 @@ class TestGemCommandsCleanupCommand < Gem::TestCase
       @cmd.execute
     end
 
-    assert_match %r%^Skipped default gems: b-2%, @ui.output
+    assert_match %r{^Skipped default gems: b-2}, @ui.output
     assert_empty @ui.error
   end
 
   def test_execute_remove_gem_home_only
-    c_1, = util_gem 'c', '1'
-    c_2, = util_gem 'c', '2'
-    d_1, = util_gem 'd', '1'
-    d_2, = util_gem 'd', '2'
-    e_1, = util_gem 'e', '1'
-    e_2, = util_gem 'e', '2'
+    c_1, = util_gem "c", "1"
+    c_2, = util_gem "c", "2"
+    d_1, = util_gem "d", "1"
+    d_2, = util_gem "d", "2"
+    e_1, = util_gem "e", "1"
+    e_2, = util_gem "e", "2"
 
     c_1 = install_gem c_1, :user_install => true # pick up user install path
     c_2 = install_gem c_2
@@ -189,9 +258,35 @@ class TestGemCommandsCleanupCommand < Gem::TestCase
 
     @cmd.execute
 
-    assert_path_exists c_1.gem_dir
-    refute_path_exists d_1.gem_dir
-    refute_path_exists e_1.gem_dir
+    assert_path_exist c_1.gem_dir
+    assert_path_not_exist d_1.gem_dir
+    assert_path_not_exist e_1.gem_dir
   end
-end
 
+  def test_execute_user_install
+    c_1, = util_gem "c", "1.0"
+    c_2, = util_gem "c", "1.1"
+
+    d_1, = util_gem "d", "1.0"
+    d_2, = util_gem "d", "1.1"
+
+    c_1 = install_gem c_1, :user_install => true # pick up user install path
+    c_2 = install_gem c_2, :user_install => true # pick up user install path
+
+    d_1 = install_gem d_1
+    d_2 = install_gem d_2
+
+    Gem::Specification.dirs = [Gem.dir, Gem.user_dir]
+
+    @cmd.handle_options %w[--user-install]
+    @cmd.options[:args] = []
+
+    @cmd.execute
+
+    assert_path_not_exist c_1.gem_dir
+    assert_path_exist c_2.gem_dir
+
+    assert_path_exist d_1.gem_dir
+    assert_path_exist d_2.gem_dir
+  end
+end

data/test/rubygems/test_gem_commands_contents_command.rb

@@ -1,16 +1,16 @@
 # frozen_string_literal: true
-require 'rubygems/test_case'
-require 'rubygems/commands/contents_command'
 
-class TestGemCommandsContentsCommand < Gem::TestCase
+require_relative "helper"
+require "rubygems/commands/contents_command"
 
+class TestGemCommandsContentsCommand < Gem::TestCase
   def setup
     super
 
     @cmd = Gem::Commands::ContentsCommand.new
   end
 
-  def gem name, version = 2
+  def gem(name, version = 2)
     spec = quick_gem name, version do |gem|
       gem.files = %W[lib/#{name}.rb Rakefile]
     end
@@ -21,58 +21,58 @@ class TestGemCommandsContentsCommand < Gem::TestCase
   def test_execute
     @cmd.options[:args] = %w[foo]
 
-    gem 'foo'
+    gem "foo"
 
     use_ui @ui do
       @cmd.execute
     end
 
-    assert_match %r|lib/foo\.rb|, @ui.output
-    assert_match %r|Rakefile|, @ui.output
+    assert_match %r{lib/foo\.rb}, @ui.output
+    assert_match %r{Rakefile}, @ui.output
     assert_equal "", @ui.error
   end
 
   def test_execute_all
     @cmd.options[:all] = true
 
-    gem 'foo'
-    gem 'bar'
+    gem "foo"
+    gem "bar"
 
     use_ui @ui do
       @cmd.execute
     end
 
-    assert_match %r|lib/foo\.rb|, @ui.output
-    assert_match %r|lib/bar\.rb|, @ui.output
-    assert_match %r|Rakefile|, @ui.output
+    assert_match %r{lib/foo\.rb}, @ui.output
+    assert_match %r{lib/bar\.rb}, @ui.output
+    assert_match %r{Rakefile}, @ui.output
     assert_equal "", @ui.error
   end
 
   def test_execute_bad_gem
     @cmd.options[:args] = %w[foo]
 
-    assert_raises Gem::MockGemUi::TermError do
+    assert_raise Gem::MockGemUi::TermError do
       use_ui @ui do
         @cmd.execute
       end
     end
 
-    assert_match %r|Unable to find gem 'foo' in default gem paths|, @ui.output
-    assert_match %r|Directories searched:|, @ui.output
+    assert_match %r{Unable to find gem 'foo' in default gem paths}, @ui.output
+    assert_match %r{Directories searched:}, @ui.output
     assert_equal "", @ui.error
   end
 
   def test_execute_exact_match
     @cmd.options[:args] = %w[foo]
-    gem 'foo'
-    gem 'bar'
+    gem "foo"
+    gem "bar"
 
     use_ui @ui do
       @cmd.execute
     end
 
-    assert_match %r|lib/foo\.rb|, @ui.output
-    assert_match %r|Rakefile|, @ui.output
+    assert_match %r{lib/foo\.rb}, @ui.output
+    assert_match %r{Rakefile}, @ui.output
     assert_equal "", @ui.error
   end
 
@@ -80,14 +80,14 @@ class TestGemCommandsContentsCommand < Gem::TestCase
     @cmd.options[:args] = %w[foo]
     @cmd.options[:lib_only] = true
 
-    gem 'foo'
+    gem "foo"
 
     use_ui @ui do
       @cmd.execute
     end
 
-    assert_match %r|lib/foo\.rb|, @ui.output
-    refute_match %r|Rakefile|, @ui.output
+    assert_match %r{lib/foo\.rb}, @ui.output
+    refute_match %r{Rakefile}, @ui.output
 
     assert_equal "", @ui.error
   end
@@ -95,7 +95,23 @@ class TestGemCommandsContentsCommand < Gem::TestCase
   def test_execute_missing_single
     @cmd.options[:args] = %w[foo]
 
-    assert_raises Gem::MockGemUi::TermError do
+    assert_raise Gem::MockGemUi::TermError do
+      use_ui @ui do
+        @cmd.execute
+      end
+    end
+
+    assert_match "Unable to find gem 'foo'", @ui.output
+    assert_empty @ui.error
+  end
+
+  def test_execute_missing_version
+    @cmd.options[:args] = %w[foo]
+    @cmd.options[:version] = Gem::Requirement.new "= 2"
+
+    gem "foo", 1
+
+    assert_raise Gem::MockGemUi::TermError do
       use_ui @ui do
         @cmd.execute
       end
@@ -108,7 +124,7 @@ class TestGemCommandsContentsCommand < Gem::TestCase
   def test_execute_missing_multiple
     @cmd.options[:args] = %w[foo bar]
 
-    gem 'foo'
+    gem "foo"
 
     use_ui @ui do
       @cmd.execute
@@ -123,16 +139,16 @@ class TestGemCommandsContentsCommand < Gem::TestCase
   def test_execute_multiple
     @cmd.options[:args] = %w[foo bar]
 
-    gem 'foo'
-    gem 'bar'
+    gem "foo"
+    gem "bar"
 
     use_ui @ui do
       @cmd.execute
     end
 
-    assert_match %r|lib/foo\.rb|, @ui.output
-    assert_match %r|lib/bar\.rb|, @ui.output
-    assert_match %r|Rakefile|, @ui.output
+    assert_match %r{lib/foo\.rb}, @ui.output
+    assert_match %r{lib/bar\.rb}, @ui.output
+    assert_match %r{Rakefile}, @ui.output
     assert_equal "", @ui.error
   end
 
@@ -140,13 +156,30 @@ class TestGemCommandsContentsCommand < Gem::TestCase
     @cmd.options[:args] = %w[foo]
     @cmd.options[:show_install_dir] = true
 
-    gem 'foo'
+    gem "foo"
 
     use_ui @ui do
       @cmd.execute
     end
 
-    expected = File.join @gemhome, 'gems', 'foo-2'
+    expected = File.join @gemhome, "gems", "foo-2"
+
+    assert_equal "#{expected}\n", @ui.output
+    assert_equal "", @ui.error
+  end
+
+  def test_execute_show_install_dir_latest_version
+    @cmd.options[:args] = %w[foo]
+    @cmd.options[:show_install_dir] = true
+
+    gem "foo", 1
+    gem "foo", 2
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    expected = File.join @gemhome, "gems", "foo-2"
 
     assert_equal "#{expected}\n", @ui.output
     assert_equal "", @ui.error
@@ -155,16 +188,16 @@ class TestGemCommandsContentsCommand < Gem::TestCase
   def test_execute_show_install_dir_version
     @cmd.options[:args] = %w[foo]
     @cmd.options[:show_install_dir] = true
-    @cmd.options[:version] = Gem::Requirement.new '= 1'
+    @cmd.options[:version] = Gem::Requirement.new "= 1"
 
-    gem 'foo', 1
-    gem 'foo', 2
+    gem "foo", 1
+    gem "foo", 2
 
     use_ui @ui do
       @cmd.execute
     end
 
-    expected = File.join @gemhome, 'gems', 'foo-1'
+    expected = File.join @gemhome, "gems", "foo-1"
 
     assert_equal "#{expected}\n", @ui.output
     assert_equal "", @ui.error
@@ -174,7 +207,7 @@ class TestGemCommandsContentsCommand < Gem::TestCase
     @cmd.options[:args] = %w[foo]
     @cmd.options[:prefix] = false
 
-    gem 'foo'
+    gem "foo"
 
     use_ui @ui do
       @cmd.execute
@@ -195,7 +228,7 @@ lib/foo.rb
                                         nil, "default/gem.rb")
     default_gem_spec.executables = ["default_command"]
     default_gem_spec.files += ["default_gem.so"]
-    install_default_specs(default_gem_spec)
+    install_default_gems(default_gem_spec)
 
     @cmd.options[:args] = %w[default]
 
@@ -204,10 +237,10 @@ lib/foo.rb
     end
 
     expected = [
-      [RbConfig::CONFIG['bindir'], 'default_command'],
-      [RbConfig::CONFIG['rubylibdir'], 'default/gem.rb'],
-      [RbConfig::CONFIG['archdir'], 'default_gem.so']
-    ].sort.map{|a|File.join a}.join "\n"
+      [RbConfig::CONFIG["bindir"], "default_command"],
+      [RbConfig::CONFIG["rubylibdir"], "default/gem.rb"],
+      [RbConfig::CONFIG["archdir"], "default_gem.so"],
+    ].sort.map {|a|File.join a }.join "\n"
 
     assert_equal expected, @ui.output.chomp
     assert_equal "", @ui.error
@@ -232,9 +265,7 @@ lib/foo.rb
     assert @cmd.options[:lib_only]
     refute @cmd.options[:prefix]
     assert_equal %w[foo], @cmd.options[:specdirs]
-    assert_equal Gem::Requirement.new('0.0.2'), @cmd.options[:version]
+    assert_equal Gem::Requirement.new("0.0.2"), @cmd.options[:version]
     assert @cmd.options[:show_install_dir]
   end
-
 end
-