rubygems-update 3.0.3 → 3.4.7

data/test/rubygems/test_gem_indexer.rb

@@ -1,51 +1,63 @@
 # frozen_string_literal: true
-require 'rubygems/test_case'
-require 'rubygems/indexer'
-
-unless defined?(Builder::XChar)
-  warn "Gem::Indexer tests are being skipped.  Install builder gem." if $VERBOSE
-end
+require_relative "helper"
+require "rubygems/indexer"
 
 class TestGemIndexer < Gem::TestCase
-
   def setup
     super
 
-    util_clear_gems
     util_make_gems
 
-    @d2_0 = util_spec 'd', '2.0' do |s|
+    @d2_0 = util_spec "d", "2.0" do |s|
       s.date = Gem::Specification::TODAY - 86400 * 3
     end
     util_build_gem @d2_0
 
-    @d2_0_a = util_spec 'd', '2.0.a'
+    @d2_0_a = util_spec "d", "2.0.a"
     util_build_gem @d2_0_a
 
-    @d2_0_b = util_spec 'd', '2.0.b'
+    @d2_0_b = util_spec "d", "2.0.b"
     util_build_gem @d2_0_b
 
-    @default = new_default_spec 'default', 2
+    @default = new_default_spec "default", 2
     install_default_gems @default
 
-    @tempdir = File.join(@tempdir, 'indexer')
+    @indexerdir = File.join(@tempdir, "indexer")
 
-    gems = File.join(@tempdir, 'gems')
+    gems = File.join(@indexerdir, "gems")
     FileUtils.mkdir_p gems
-    FileUtils.mv Dir[File.join(@gemhome, "cache", '*.gem')], gems
+    FileUtils.mv Dir[File.join(@gemhome, "cache", "*.gem")], gems
 
-    @indexer = Gem::Indexer.new(@tempdir)
+    @indexer = Gem::Indexer.new(@indexerdir)
+  end
+
+  def teardown
+    FileUtils.rm_rf(@indexer.directory)
+  ensure
+    super
+  end
+
+  def with_indexer(dir, **opts)
+    indexer = Gem::Indexer.new(dir, **opts)
+    build_directory = indexer.directory
+    yield indexer
+  ensure
+    FileUtils.rm_rf(build_directory) if build_directory
   end
 
   def test_initialize
-    assert_equal @tempdir, @indexer.dest_directory
-    assert_match %r{#{Dir.mktmpdir('gem_generate_index').match(/.*-/)}}, @indexer.directory
+    assert_equal @indexerdir, @indexer.dest_directory
+    Dir.mktmpdir("gem_generate_index") do |tmpdir|
+      assert_match %r{#{tmpdir.match(/.*-/)}}, @indexer.directory
+    end
 
-    indexer = Gem::Indexer.new @tempdir
-    assert indexer.build_modern
+    with_indexer(@indexerdir) do |indexer|
+      assert_predicate indexer, :build_modern
+    end
 
-    indexer = Gem::Indexer.new @tempdir, :build_modern => true
-    assert indexer.build_modern
+    with_indexer(@indexerdir, :build_modern => true) do |indexer|
+      assert_predicate indexer, :build_modern
+    end
   end
 
   def test_build_indices
@@ -85,7 +97,7 @@ class TestGemIndexer < Gem::TestCase
                 ["pl",     Gem::Version.new("1"),   "i386-linux"],
                 ["x",      Gem::Version.new("1"),   "ruby"]]
 
-    assert_equal expected, latest_specs, 'latest_specs'
+    assert_equal expected, latest_specs, "latest_specs"
   end
 
   def test_generate_index
@@ -93,22 +105,24 @@ class TestGemIndexer < Gem::TestCase
       @indexer.generate_index
     end
 
-    quickdir = File.join @tempdir, 'quick'
+    quickdir = File.join @indexerdir, "quick"
     marshal_quickdir = File.join quickdir, "Marshal.#{@marshal_version}"
 
-    assert File.directory?(quickdir)
-    assert File.directory?(marshal_quickdir)
+    assert_directory_exists quickdir
+    assert_directory_exists marshal_quickdir
 
     assert_indexed marshal_quickdir, "#{File.basename(@a1.spec_file)}.rz"
     assert_indexed marshal_quickdir, "#{File.basename(@a2.spec_file)}.rz"
 
     refute_indexed marshal_quickdir, File.basename(@c1_2.spec_file)
 
-    assert_indexed @tempdir, "specs.#{@marshal_version}"
-    assert_indexed @tempdir, "specs.#{@marshal_version}.gz"
+    assert_indexed @indexerdir, "specs.#{@marshal_version}"
+    assert_indexed @indexerdir, "specs.#{@marshal_version}.gz"
+
+    assert_indexed @indexerdir, "latest_specs.#{@marshal_version}"
+    assert_indexed @indexerdir, "latest_specs.#{@marshal_version}.gz"
 
-    assert_indexed @tempdir, "latest_specs.#{@marshal_version}"
-    assert_indexed @tempdir, "latest_specs.#{@marshal_version}.gz"
+    refute_directory_exists @indexer.directory
   end
 
   def test_generate_index_modern
@@ -118,16 +132,16 @@ class TestGemIndexer < Gem::TestCase
       @indexer.generate_index
     end
 
-    refute_indexed @tempdir, 'yaml'
-    refute_indexed @tempdir, 'yaml.Z'
-    refute_indexed @tempdir, "Marshal.#{@marshal_version}"
-    refute_indexed @tempdir, "Marshal.#{@marshal_version}.Z"
+    refute_indexed @indexerdir, "yaml"
+    refute_indexed @indexerdir, "yaml.Z"
+    refute_indexed @indexerdir, "Marshal.#{@marshal_version}"
+    refute_indexed @indexerdir, "Marshal.#{@marshal_version}.Z"
 
-    quickdir = File.join @tempdir, 'quick'
+    quickdir = File.join @indexerdir, "quick"
     marshal_quickdir = File.join quickdir, "Marshal.#{@marshal_version}"
 
-    assert File.directory?(quickdir), 'quickdir should be directory'
-    assert File.directory?(marshal_quickdir)
+    assert_directory_exists quickdir, "quickdir should be directory"
+    assert_directory_exists marshal_quickdir
 
     refute_indexed quickdir, "index"
     refute_indexed quickdir, "index.rz"
@@ -149,11 +163,11 @@ class TestGemIndexer < Gem::TestCase
     refute_indexed quickdir, "#{File.basename(@c1_2.spec_file)}"
     refute_indexed marshal_quickdir, "#{File.basename(@c1_2.spec_file)}"
 
-    assert_indexed @tempdir, "specs.#{@marshal_version}"
-    assert_indexed @tempdir, "specs.#{@marshal_version}.gz"
+    assert_indexed @indexerdir, "specs.#{@marshal_version}"
+    assert_indexed @indexerdir, "specs.#{@marshal_version}.gz"
 
-    assert_indexed @tempdir, "latest_specs.#{@marshal_version}"
-    assert_indexed @tempdir, "latest_specs.#{@marshal_version}.gz"
+    assert_indexed @indexerdir, "latest_specs.#{@marshal_version}"
+    assert_indexed @indexerdir, "latest_specs.#{@marshal_version}.gz"
   end
 
   def test_generate_index_modern_back_to_back
@@ -163,26 +177,27 @@ class TestGemIndexer < Gem::TestCase
       @indexer.generate_index
     end
 
-    @indexer = Gem::Indexer.new @tempdir
-    @indexer.build_modern = true
+    with_indexer @indexerdir do |indexer|
+      indexer.build_modern = true
 
-    use_ui @ui do
-      @indexer.generate_index
-    end
-    quickdir = File.join @tempdir, 'quick'
-    marshal_quickdir = File.join quickdir, "Marshal.#{@marshal_version}"
+      use_ui @ui do
+        indexer.generate_index
+      end
+      quickdir = File.join @indexerdir, "quick"
+      marshal_quickdir = File.join quickdir, "Marshal.#{@marshal_version}"
 
-    assert File.directory?(quickdir)
-    assert File.directory?(marshal_quickdir)
+      assert_directory_exists quickdir
+      assert_directory_exists marshal_quickdir
 
-    assert_indexed marshal_quickdir, "#{File.basename(@a1.spec_file)}.rz"
-    assert_indexed marshal_quickdir, "#{File.basename(@a2.spec_file)}.rz"
+      assert_indexed marshal_quickdir, "#{File.basename(@a1.spec_file)}.rz"
+      assert_indexed marshal_quickdir, "#{File.basename(@a2.spec_file)}.rz"
 
-    assert_indexed @tempdir, "specs.#{@marshal_version}"
-    assert_indexed @tempdir, "specs.#{@marshal_version}.gz"
+      assert_indexed @indexerdir, "specs.#{@marshal_version}"
+      assert_indexed @indexerdir, "specs.#{@marshal_version}.gz"
 
-    assert_indexed @tempdir, "latest_specs.#{@marshal_version}"
-    assert_indexed @tempdir, "latest_specs.#{@marshal_version}.gz"
+      assert_indexed @indexerdir, "latest_specs.#{@marshal_version}"
+      assert_indexed @indexerdir, "latest_specs.#{@marshal_version}.gz"
+    end
   end
 
   def test_generate_index_ui
@@ -190,17 +205,17 @@ class TestGemIndexer < Gem::TestCase
       @indexer.generate_index
     end
 
-    assert_match %r%^\.\.\.\.\.\.\.\.\.\.\.\.$%, @ui.output
-    assert_match %r%^Generating Marshal quick index gemspecs for 12 gems$%,
+    assert_match %r{^\.\.\.\.\.\.\.\.\.\.\.\.$}, @ui.output
+    assert_match %r{^Generating Marshal quick index gemspecs for 12 gems$},
                  @ui.output
-    assert_match %r%^Complete$%, @ui.output
-    assert_match %r%^Generating specs index$%, @ui.output
-    assert_match %r%^Generating latest specs index$%, @ui.output
-    assert_match %r%^Generating prerelease specs index$%, @ui.output
-    assert_match %r%^Complete$%, @ui.output
-    assert_match %r%^Compressing indices$%, @ui.output
-
-    assert_equal '', @ui.error
+    assert_match %r{^Complete$}, @ui.output
+    assert_match %r{^Generating specs index$}, @ui.output
+    assert_match %r{^Generating latest specs index$}, @ui.output
+    assert_match %r{^Generating prerelease specs index$}, @ui.output
+    assert_match %r{^Complete$}, @ui.output
+    assert_match %r{^Compressing indices$}, @ui.output
+
+    assert_equal "", @ui.error
   end
 
   def test_generate_index_specs
@@ -208,36 +223,36 @@ class TestGemIndexer < Gem::TestCase
       @indexer.generate_index
     end
 
-    specs_path = File.join @tempdir, "specs.#{@marshal_version}"
+    specs_path = File.join @indexerdir, "specs.#{@marshal_version}"
 
     specs_dump = Gem.read_binary specs_path
     specs = Marshal.load specs_dump
 
     expected = [
-      ['a',      Gem::Version.new(1),     'ruby'],
-      ['a',      Gem::Version.new(2),     'ruby'],
-      ['a_evil', Gem::Version.new(9),     'ruby'],
-      ['b',      Gem::Version.new(2),     'ruby'],
-      ['c',      Gem::Version.new('1.2'), 'ruby'],
-      ['d',      Gem::Version.new('2.0'), 'ruby'],
-      ['dep_x',  Gem::Version.new(1),     'ruby'],
-      ['pl',     Gem::Version.new(1),     'i386-linux'],
-      ['x',      Gem::Version.new(1),     'ruby'],
+      ["a",      Gem::Version.new(1),     "ruby"],
+      ["a",      Gem::Version.new(2),     "ruby"],
+      ["a_evil", Gem::Version.new(9),     "ruby"],
+      ["b",      Gem::Version.new(2),     "ruby"],
+      ["c",      Gem::Version.new("1.2"), "ruby"],
+      ["d",      Gem::Version.new("2.0"), "ruby"],
+      ["dep_x",  Gem::Version.new(1),     "ruby"],
+      ["pl",     Gem::Version.new(1),     "i386-linux"],
+      ["x",      Gem::Version.new(1),     "ruby"],
     ]
 
     assert_equal expected, specs
 
     assert_same specs[0].first, specs[1].first,
-                'identical names not identical'
+                "identical names not identical"
 
     assert_same specs[0][1],    specs[-1][1],
-                'identical versions not identical'
+                "identical versions not identical"
 
     assert_same specs[0].last, specs[1].last,
-                'identical platforms not identical'
+                "identical platforms not identical"
 
     refute_same specs[1][1], specs[5][1],
-                'different versions not different'
+                "different versions not different"
   end
 
   def test_generate_index_latest_specs
@@ -245,29 +260,29 @@ class TestGemIndexer < Gem::TestCase
       @indexer.generate_index
     end
 
-    latest_specs_path = File.join @tempdir, "latest_specs.#{@marshal_version}"
+    latest_specs_path = File.join @indexerdir, "latest_specs.#{@marshal_version}"
 
     latest_specs_dump = Gem.read_binary latest_specs_path
     latest_specs = Marshal.load latest_specs_dump
 
     expected = [
-      ['a',      Gem::Version.new(2),     'ruby'],
-      ['a_evil', Gem::Version.new(9),     'ruby'],
-      ['b',      Gem::Version.new(2),     'ruby'],
-      ['c',      Gem::Version.new('1.2'), 'ruby'],
-      ['d',      Gem::Version.new('2.0'), 'ruby'],
-      ['dep_x',  Gem::Version.new(1),     'ruby'],
-      ['pl',     Gem::Version.new(1),     'i386-linux'],
-      ['x',      Gem::Version.new(1),     'ruby'],
+      ["a",      Gem::Version.new(2),     "ruby"],
+      ["a_evil", Gem::Version.new(9),     "ruby"],
+      ["b",      Gem::Version.new(2),     "ruby"],
+      ["c",      Gem::Version.new("1.2"), "ruby"],
+      ["d",      Gem::Version.new("2.0"), "ruby"],
+      ["dep_x",  Gem::Version.new(1),     "ruby"],
+      ["pl",     Gem::Version.new(1),     "i386-linux"],
+      ["x",      Gem::Version.new(1),     "ruby"],
     ]
 
     assert_equal expected, latest_specs
 
     assert_same latest_specs[0][1],   latest_specs[2][1],
-                'identical versions not identical'
+                "identical versions not identical"
 
     assert_same latest_specs[0].last, latest_specs[1].last,
-                'identical platforms not identical'
+                "identical platforms not identical"
   end
 
   def test_generate_index_prerelease_specs
@@ -275,14 +290,14 @@ class TestGemIndexer < Gem::TestCase
       @indexer.generate_index
     end
 
-    prerelease_specs_path = File.join @tempdir, "prerelease_specs.#{@marshal_version}"
+    prerelease_specs_path = File.join @indexerdir, "prerelease_specs.#{@marshal_version}"
 
     prerelease_specs_dump = Gem.read_binary prerelease_specs_path
     prerelease_specs = Marshal.load prerelease_specs_dump
 
-    assert_equal [['a', Gem::Version.new('3.a'),   'ruby'],
-                  ['d', Gem::Version.new('2.0.a'), 'ruby'],
-                  ['d', Gem::Version.new('2.0.b'), 'ruby']],
+    assert_equal [["a", Gem::Version.new("3.a"),   "ruby"],
+                  ["d", Gem::Version.new("2.0.a"), "ruby"],
+                  ["d", Gem::Version.new("2.0.b"), "ruby"]],
                  prerelease_specs
   end
 
@@ -292,34 +307,33 @@ class TestGemIndexer < Gem::TestCase
   def with_system_gems
     Gem::Specification.reset
 
-    sys_gem = util_spec 'systemgem', '1.0'
+    sys_gem = util_spec "systemgem", "1.0"
     util_build_gem sys_gem
     install_default_gems sys_gem
     yield
     util_remove_gem sys_gem
   end
 
-
   def test_update_index
     use_ui @ui do
       @indexer.generate_index
     end
 
-    quickdir = File.join @tempdir, 'quick'
+    quickdir = File.join @indexerdir, "quick"
     marshal_quickdir = File.join quickdir, "Marshal.#{@marshal_version}"
 
-    assert File.directory?(quickdir)
-    assert File.directory?(marshal_quickdir)
+    assert_directory_exists quickdir
+    assert_directory_exists marshal_quickdir
 
-    @d2_1 = util_spec 'd', '2.1'
+    @d2_1 = util_spec "d", "2.1"
     util_build_gem @d2_1
     @d2_1_tuple = [@d2_1.name, @d2_1.version, @d2_1.original_platform]
 
-    @d2_1_a = util_spec 'd', '2.2.a'
+    @d2_1_a = util_spec "d", "2.2.a"
     util_build_gem @d2_1_a
     @d2_1_a_tuple = [@d2_1_a.name, @d2_1_a.version, @d2_1_a.original_platform]
 
-    gems = File.join @tempdir, 'gems'
+    gems = File.join @indexerdir, "gems"
 
     FileUtils.mv @d2_1.cache_file, gems
     FileUtils.mv @d2_1_a.cache_file, gems
@@ -349,6 +363,8 @@ class TestGemIndexer < Gem::TestCase
 
       assert_includes pre_specs_index, @d2_1_a_tuple
       refute_includes pre_specs_index, @d2_1_tuple
+
+      refute_directory_exists @indexer.directory
     end
   end
 
@@ -361,5 +377,4 @@ class TestGemIndexer < Gem::TestCase
     file = File.join dir, name
     refute File.exist?(file), "#{file} exists"
   end
-
-end if defined?(Builder::XChar)
+end

data/test/rubygems/test_gem_install_update_options.rb

@@ -1,15 +1,14 @@
 # frozen_string_literal: true
-require 'rubygems/installer_test_case'
-require 'rubygems/install_update_options'
-require 'rubygems/command'
-require 'rubygems/dependency_installer'
+require_relative "installer_test_case"
+require "rubygems/install_update_options"
+require "rubygems/command"
+require "rubygems/dependency_installer"
 
 class TestGemInstallUpdateOptions < Gem::InstallerTestCase
-
   def setup
     super
 
-    @cmd = Gem::Command.new 'dummy', 'dummy',
+    @cmd = Gem::Command.new "dummy", "dummy",
                             Gem::DependencyInstaller::DEFAULT_OPTIONS
     @cmd.extend Gem::InstallUpdateOptions
     @cmd.add_install_update_options
@@ -26,11 +25,12 @@ class TestGemInstallUpdateOptions < Gem::InstallerTestCase
       -f
       -i /install_to
       -w
-      --vendor
       --post-install-message
     ]
 
-    args.concat %w[-P HighSecurity] if defined?(OpenSSL::SSL)
+    args.concat %w[--vendor] unless Gem.java_platform?
+
+    args.concat %w[-P HighSecurity] if Gem::HAVE_OPENSSL
 
     assert @cmd.handles?(args)
   end
@@ -38,7 +38,7 @@ class TestGemInstallUpdateOptions < Gem::InstallerTestCase
   def test_build_root
     @cmd.handle_options %w[--build-root build_root]
 
-    assert_equal File.expand_path('build_root'), @cmd.options[:build_root]
+    assert_equal File.expand_path("build_root"), @cmd.options[:build_root]
   end
 
   def test_doc
@@ -92,7 +92,7 @@ class TestGemInstallUpdateOptions < Gem::InstallerTestCase
   end
 
   def test_security_policy
-    skip 'openssl is missing' unless defined?(OpenSSL::SSL)
+    pend "openssl is missing" unless Gem::HAVE_OPENSSL
 
     @cmd.handle_options %w[-P HighSecurity]
 
@@ -100,32 +100,46 @@ class TestGemInstallUpdateOptions < Gem::InstallerTestCase
   end
 
   def test_security_policy_unknown
-    skip 'openssl is missing' unless defined?(OpenSSL::SSL)
+    pend "openssl is missing" unless Gem::HAVE_OPENSSL
 
     @cmd.add_install_update_options
 
-    e = assert_raises OptionParser::InvalidArgument do
+    e = assert_raise Gem::OptionParser::InvalidArgument do
       @cmd.handle_options %w[-P UnknownSecurity]
     end
     assert_includes e.message, "UnknownSecurity"
   end
 
   def test_user_install_enabled
+    @spec = quick_gem "a" do |spec|
+      util_make_exec spec
+    end
+
+    util_build_gem @spec
+    @gem = @spec.cache_file
+
     @cmd.handle_options %w[--user-install]
 
     assert @cmd.options[:user_install]
 
     @installer = Gem::Installer.at @gem, @cmd.options
     @installer.install
-    assert_path_exists File.join(Gem.user_dir, 'gems')
-    assert_path_exists File.join(Gem.user_dir, 'gems', @spec.full_name)
+    assert_path_exist File.join(Gem.user_dir, "gems")
+    assert_path_exist File.join(Gem.user_dir, "gems", @spec.full_name)
   end
 
   def test_user_install_disabled_read_only
+    @spec = quick_gem "a" do |spec|
+      util_make_exec spec
+    end
+
+    util_build_gem @spec
+    @gem = @spec.cache_file
+
     if win_platform?
-      skip('test_user_install_disabled_read_only test skipped on MS Windows')
+      pend("test_user_install_disabled_read_only test skipped on MS Windows")
     elsif Process.uid.zero?
-      skip('test_user_install_disabled_read_only test skipped in root privilege')
+      pend("test_user_install_disabled_read_only test skipped in root privilege")
     else
       @cmd.handle_options %w[--no-user-install]
 
@@ -136,7 +150,7 @@ class TestGemInstallUpdateOptions < Gem::InstallerTestCase
 
       Gem.use_paths @gemhome, @userhome
 
-      assert_raises(Gem::FilePermissionError) do
+      assert_raise(Gem::FilePermissionError) do
         Gem::Installer.at(@gem, @cmd.options).install
       end
     end
@@ -145,28 +159,26 @@ class TestGemInstallUpdateOptions < Gem::InstallerTestCase
   end
 
   def test_vendor
-    @cmd.handle_options %w[--vendor]
+    vendordir(File.join(@tempdir, "vendor")) do
+      @cmd.handle_options %w[--vendor]
 
-    assert @cmd.options[:vendor]
-    assert_equal Gem.vendor_dir, @cmd.options[:install_dir]
+      assert @cmd.options[:vendor]
+      assert_equal Gem.vendor_dir, @cmd.options[:install_dir]
+    end
   end
 
   def test_vendor_missing
-    orig_vendordir = RbConfig::CONFIG['vendordir']
-    RbConfig::CONFIG.delete 'vendordir'
-
-    e = assert_raises OptionParser::InvalidOption do
-      @cmd.handle_options %w[--vendor]
-    end
-
-    assert_equal 'invalid option: --vendor your platform is not supported',
-                 e.message
+    vendordir(nil) do
+      e = assert_raise Gem::OptionParser::InvalidOption do
+        @cmd.handle_options %w[--vendor]
+      end
 
-    refute @cmd.options[:vendor]
-    refute @cmd.options[:install_dir]
+      assert_equal "invalid option: --vendor your platform is not supported",
+                   e.message
 
-  ensure
-    RbConfig::CONFIG['vendordir'] = orig_vendordir
+      refute @cmd.options[:vendor]
+      refute @cmd.options[:install_dir]
+    end
   end
 
   def test_post_install_message_no
@@ -180,4 +192,16 @@ class TestGemInstallUpdateOptions < Gem::InstallerTestCase
 
     assert_equal true, @cmd.options[:post_install_message]
   end
+
+  def test_minimal_deps_no
+    @cmd.handle_options %w[--no-minimal-deps]
+
+    assert_equal false, @cmd.options[:minimal_deps]
+  end
+
+  def test_minimal_deps
+    @cmd.handle_options %w[--minimal-deps]
+
+    assert_equal true, @cmd.options[:minimal_deps]
+  end
 end