rubygems-update 3.1.2 → 3.2.6

data/test/rubygems/test_gem_commands_which_command.rb

@@ -3,7 +3,6 @@ require 'rubygems/test_case'
 require 'rubygems/commands/which_command'
 
 class TestGemCommandsWhichCommand < Gem::TestCase
-
   def setup
     super
     Gem::Specification.reset
@@ -33,7 +32,7 @@ class TestGemCommandsWhichCommand < Gem::TestCase
     end
 
     assert_equal '', @ui.output
-    assert_match %r%Can.t find Ruby library file or shared library directory\n%,
+    assert_match %r{Can.t find Ruby library file or shared library directory\n},
                  @ui.error
   end
 
@@ -51,7 +50,7 @@ class TestGemCommandsWhichCommand < Gem::TestCase
     end
 
     assert_equal "#{@foo_bar.full_gem_path}/lib/foo_bar.rb\n", @ui.output
-    assert_match %r%Can.t find Ruby library file or shared library missinglib\n%,
+    assert_match %r{Can.t find Ruby library file or shared library missinglib\n},
                  @ui.error
   end
 
@@ -65,7 +64,7 @@ class TestGemCommandsWhichCommand < Gem::TestCase
     end
 
     assert_equal '', @ui.output
-    assert_match %r%Can.t find Ruby library file or shared library missinglib\n%,
+    assert_match %r{Can.t find Ruby library file or shared library missinglib\n},
                  @ui.error
   end
 
@@ -82,5 +81,4 @@ class TestGemCommandsWhichCommand < Gem::TestCase
       FileUtils.touch filename
     end
   end
-
 end

data/test/rubygems/test_gem_commands_yank_command.rb

@@ -3,10 +3,11 @@ require 'rubygems/test_case'
 require 'rubygems/commands/yank_command'
 
 class TestGemCommandsYankCommand < Gem::TestCase
-
   def setup
     super
 
+    credential_setup
+
     @cmd = Gem::Commands::YankCommand.new
     @cmd.options[:host] = 'http://example'
 
@@ -16,6 +17,12 @@ class TestGemCommandsYankCommand < Gem::TestCase
     Gem.configuration.api_keys[:KEY] = 'other'
   end
 
+  def teardown
+    credential_teardown
+
+    super
+  end
+
   def test_handle_options
     @cmd.handle_options %w[a --version 1.0 --platform x86-darwin -k KEY --host HOST]
 
@@ -46,8 +53,8 @@ class TestGemCommandsYankCommand < Gem::TestCase
       @cmd.execute
     end
 
-    assert_match %r%Yanking gem from http://example%, @ui.output
-    assert_match %r%Successfully yanked%,      @ui.output
+    assert_match %r{Yanking gem from http://example}, @ui.output
+    assert_match %r{Successfully yanked}, @ui.output
 
     platform = Gem.platforms[1]
     body = @fetcher.last_request.body.split('&').sort
@@ -63,7 +70,7 @@ class TestGemCommandsYankCommand < Gem::TestCase
     yank_uri = 'http://example/api/v1/gems/yank'
     @fetcher.data[yank_uri] = [
       [response_fail, 401, 'Unauthorized'],
-      ['Successfully yanked', 200, 'OK']
+      ['Successfully yanked', 200, 'OK'],
     ]
 
     @cmd.options[:args]           = %w[a]
@@ -77,8 +84,8 @@ class TestGemCommandsYankCommand < Gem::TestCase
 
     assert_match 'You have enabled multi-factor authentication. Please enter OTP code.', @otp_ui.output
     assert_match 'Code: ', @otp_ui.output
-    assert_match %r%Yanking gem from http://example%, @otp_ui.output
-    assert_match %r%Successfully yanked%,      @otp_ui.output
+    assert_match %r{Yanking gem from http://example}, @otp_ui.output
+    assert_match %r{Successfully yanked}, @otp_ui.output
     assert_equal '111111', @fetcher.last_request['OTP']
   end
 
@@ -132,8 +139,8 @@ class TestGemCommandsYankCommand < Gem::TestCase
       @cmd.execute
     end
 
-    assert_match %r%Yanking gem from https://other.example%, @ui.output
-    assert_match %r%Successfully yanked%,      @ui.output
+    assert_match %r{Yanking gem from https://other.example}, @ui.output
+    assert_match %r{Successfully yanked}, @ui.output
 
     body = @fetcher.last_request.body.split('&').sort
     assert_equal %w[gem_name=a version=1.0], body
@@ -141,4 +148,33 @@ class TestGemCommandsYankCommand < Gem::TestCase
     assert_equal [yank_uri], @fetcher.paths
   end
 
+  def test_yank_gem_unathorized_api_key
+    response_forbidden = "The API key doesn't have access"
+    response_success   = 'Successfully yanked'
+    host               = 'http://example'
+
+    @fetcher.data["#{host}/api/v1/gems/yank"] = [
+      [response_forbidden, 403, 'Forbidden'],
+      [response_success, 200, "OK"],
+    ]
+
+    @fetcher.data["#{host}/api/v1/api_key"] = ["", 200, "OK"]
+    @cmd.options[:args]           = %w[a]
+    @cmd.options[:added_platform] = true
+    @cmd.options[:version]        = req('= 1.0')
+    @cmd.instance_variable_set :@host, host
+    @cmd.instance_variable_set :@scope, :yank_rubygem
+
+    @ui = Gem::MockGemUi.new "some@mail.com\npass\n"
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    access_notice = "The existing key doesn't have access of yank_rubygem on http://example. Please sign in to update access."
+    assert_match access_notice, @ui.output
+    assert_match "Email:", @ui.output
+    assert_match "Password:", @ui.output
+    assert_match "Added yank_rubygem scope to the existing API key", @ui.output
+    assert_match response_success, @ui.output
+  end
 end

data/test/rubygems/test_gem_config_file.rb

@@ -3,18 +3,15 @@ require 'rubygems/test_case'
 require 'rubygems/config_file'
 
 class TestGemConfigFile < Gem::TestCase
-
   def setup
     super
 
+    credential_setup
+
     @temp_conf = File.join @tempdir, '.gemrc'
 
     @cfg_args = %W[--config-file #{@temp_conf}]
 
-    @orig_SYSTEM_WIDE_CONFIG_FILE = Gem::ConfigFile::SYSTEM_WIDE_CONFIG_FILE
-    Gem::ConfigFile.send :remove_const, :SYSTEM_WIDE_CONFIG_FILE
-    Gem::ConfigFile.send :const_set, :SYSTEM_WIDE_CONFIG_FILE,
-                         File.join(@tempdir, 'system-gemrc')
     Gem::ConfigFile::OPERATING_SYSTEM_DEFAULTS.clear
     Gem::ConfigFile::PLATFORM_DEFAULTS.clear
 
@@ -27,12 +24,11 @@ class TestGemConfigFile < Gem::TestCase
   def teardown
     Gem::ConfigFile::OPERATING_SYSTEM_DEFAULTS.clear
     Gem::ConfigFile::PLATFORM_DEFAULTS.clear
-    Gem::ConfigFile.send :remove_const, :SYSTEM_WIDE_CONFIG_FILE
-    Gem::ConfigFile.send :const_set, :SYSTEM_WIDE_CONFIG_FILE,
-                         @orig_SYSTEM_WIDE_CONFIG_FILE
 
     ENV['GEMRC'] = @env_gemrc
 
+    credential_teardown
+
     super
   end
 
@@ -177,7 +173,7 @@ class TestGemConfigFile < Gem::TestCase
     assert_nil @cfg.instance_variable_get :@api_keys
 
     temp_cred = File.join Gem.user_home, '.gem', 'credentials'
-    FileUtils.mkdir File.dirname(temp_cred)
+    FileUtils.mkdir_p File.dirname(temp_cred)
     File.open temp_cred, 'w', 0600 do |fp|
       fp.puts ':rubygems_api_key: 701229f217cdf23b1344c7b4b54ca97'
     end
@@ -303,7 +299,7 @@ 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 File.dirname(temp_cred)
+    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"
@@ -392,7 +388,7 @@ if you believe they were disclosed to a third party.
     util_config_file
 
     # These should not be written out to the config file.
-    assert_equal false, @cfg.backtrace,     'backtrace'
+    assert_equal false, @cfg.backtrace, 'backtrace'
     assert_equal Gem::ConfigFile::DEFAULT_BULK_THRESHOLD, @cfg.bulk_threshold,
                  'bulk_threshold'
     assert_equal true, @cfg.update_sources, 'update_sources'
@@ -495,5 +491,4 @@ if you believe they were disclosed to a third party.
     util_config_file
     assert_equal(true, @cfg.disable_default_gem_server)
   end
-
 end

data/test/rubygems/test_gem_dependency.rb

@@ -3,7 +3,6 @@ require 'rubygems/test_case'
 require 'rubygems/dependency'
 
 class TestGemDependency < Gem::TestCase
-
   def test_initialize
     d = dep "pkg", "> 1.0"
 
@@ -391,5 +390,4 @@ class TestGemDependency < Gem::TestCase
     assert_equal dep("a", " >= 1.a").identity, :abs_latest
     assert_equal dep("a").identity, :latest
   end
-
 end

data/test/rubygems/test_gem_dependency_installer.rb

@@ -4,7 +4,6 @@ require 'rubygems/dependency_installer'
 require 'rubygems/security'
 
 class TestGemDependencyInstaller < Gem::TestCase
-
   def setup
     super
     common_installer_setup
@@ -48,69 +47,6 @@ class TestGemDependencyInstaller < Gem::TestCase
     util_reset_gems
   end
 
-  def test_available_set_for_name
-    util_setup_gems
-    p1a, = util_gem 'a', '10.a'
-    util_setup_spec_fetcher p1a, @a1, @a1_pre
-
-    inst = Gem::DependencyInstaller.new
-
-    available = Gem::Deprecate.skip_during do
-      inst.available_set_for 'a', Gem::Requirement.default
-    end
-
-    assert_equal %w[a-1], available.set.map { |s| s.spec.full_name }
-  end
-
-  def test_available_set_for_name_prerelease
-    util_setup_gems
-    p1a, = util_gem 'a', '10.a'
-    util_setup_spec_fetcher p1a, @a1, @a1_pre
-
-    inst = Gem::DependencyInstaller.new :prerelease => true
-
-    available = Gem::Deprecate.skip_during do
-      inst.available_set_for 'a', Gem::Requirement.default
-    end
-
-    assert_equal %w[a-10.a],
-                 available.sorted.map { |s| s.spec.full_name }
-  end
-
-  def test_available_set_for_dep
-    util_setup_gems
-    p1a, = util_gem 'a', '10.a'
-    util_setup_spec_fetcher p1a, @a1, @a1_pre
-
-    inst = Gem::DependencyInstaller.new
-
-    dep = Gem::Dependency.new 'a', Gem::Requirement.default
-
-    available = Gem::Deprecate.skip_during do
-      inst.available_set_for dep, Gem::Requirement.default
-    end
-
-    assert_equal %w[a-1], available.set.map { |s| s.spec.full_name }
-  end
-
-  def test_available_set_for_dep_prerelease
-    util_setup_gems
-    p1a, = util_gem 'a', '10.a'
-    util_setup_spec_fetcher p1a, @a1, @a1_pre
-
-    inst = Gem::DependencyInstaller.new :prerelease => true
-
-    dep = Gem::Dependency.new 'a', Gem::Requirement.default
-    dep.prerelease = true
-
-    available = Gem::Deprecate.skip_during do
-      inst.available_set_for dep, Gem::Requirement.default
-    end
-
-    assert_equal %w[a-10.a],
-                 available.sorted.map { |s| s.spec.full_name }
-  end
-
   def test_install
     util_setup_gems
 
@@ -211,7 +147,7 @@ class TestGemDependencyInstaller < Gem::TestCase
 
     FileUtils.mv @a1_gem, @tempdir
     FileUtils.mv @b1_gem, @tempdir
-    FileUtils.mv  e1_gem, @tempdir
+    FileUtils.mv e1_gem, @tempdir
 
     inst = nil
 
@@ -220,7 +156,7 @@ class TestGemDependencyInstaller < Gem::TestCase
       inst.install 'b'
     end
 
-    assert_equal %w[b-1], inst.installed_gems.map { |s| s.full_name },
+    assert_equal %w[b-1], inst.installed_gems.map {|s| s.full_name },
                  'sanity check'
 
     Dir.chdir @tempdir do
@@ -228,7 +164,7 @@ class TestGemDependencyInstaller < Gem::TestCase
       inst.install 'e'
     end
 
-    assert_equal %w[a-1 e-1], inst.installed_gems.map { |s| s.full_name }
+    assert_equal %w[a-1 e-1], inst.installed_gems.map {|s| s.full_name }
   end
 
   def test_install_cache_dir
@@ -245,7 +181,7 @@ class TestGemDependencyInstaller < Gem::TestCase
       inst.install 'b'
     end
 
-    assert_equal %w[a-1 b-1], inst.installed_gems.map { |s| s.full_name }
+    assert_equal %w[a-1 b-1], inst.installed_gems.map {|s| s.full_name }
 
     assert File.exist? File.join(@gemhome, "cache", @a1.file_name)
     assert File.exist? File.join(@gemhome, "cache", @b1.file_name)
@@ -270,7 +206,7 @@ class TestGemDependencyInstaller < Gem::TestCase
       inst.install 'a', req("= 2")
     end
 
-    assert_equal %w[a-2], inst.installed_gems.map { |s| s.full_name },
+    assert_equal %w[a-2], inst.installed_gems.map {|s| s.full_name },
                  'sanity check'
 
     FileUtils.rm File.join(@tempdir, a2.file_name)
@@ -281,7 +217,7 @@ class TestGemDependencyInstaller < Gem::TestCase
     end
 
     assert_equal %w[a-2 b-1], Gem::Specification.map(&:full_name)
-    assert_equal %w[b-1], inst.installed_gems.map { |s| s.full_name }
+    assert_equal %w[b-1], inst.installed_gems.map {|s| s.full_name }
   end
 
   # This asserts that if a gem's dependency is satisfied by an
@@ -302,7 +238,7 @@ class TestGemDependencyInstaller < Gem::TestCase
     FileUtils.mv @a1_gem, @tempdir
     FileUtils.mv  a2_gem, @tempdir # not in index
     FileUtils.mv @b1_gem, @tempdir
-    FileUtils.mv  a3_gem, @tempdir
+    FileUtils.mv a3_gem, @tempdir
 
     Dir.chdir @tempdir do
       Gem::DependencyInstaller.new.install 'a', req("= 2")
@@ -318,7 +254,7 @@ class TestGemDependencyInstaller < Gem::TestCase
     end
 
     assert_equal %w[a-2 b-1], Gem::Specification.map(&:full_name)
-    assert_equal %w[b-1], inst.installed_gems.map { |s| s.full_name }
+    assert_equal %w[b-1], inst.installed_gems.map {|s| s.full_name }
   end
 
   def test_install_dependency
@@ -341,7 +277,7 @@ class TestGemDependencyInstaller < Gem::TestCase
       inst.install 'b'
     end
 
-    assert_equal %w[a-1 b-1], inst.installed_gems.map { |s| s.full_name }
+    assert_equal %w[a-1 b-1], inst.installed_gems.map {|s| s.full_name }
 
     assert done_installing_ran, 'post installs hook was not run'
   end
@@ -363,7 +299,7 @@ class TestGemDependencyInstaller < Gem::TestCase
       inst.install 'b'
     end
 
-    assert_equal %w[a-1 aa-1 b-1], inst.installed_gems.map { |s| s.full_name }
+    assert_equal %w[a-1 aa-1 b-1], inst.installed_gems.map {|s| s.full_name }
   end
 
   def test_install_dependency_development_deep
@@ -385,7 +321,7 @@ class TestGemDependencyInstaller < Gem::TestCase
       inst.install 'd'
     end
 
-    assert_equal %w[a-1 aa-1 b-1 c-1 d-1], inst.installed_gems.map { |s| s.full_name }
+    assert_equal %w[a-1 aa-1 b-1 c-1 d-1], inst.installed_gems.map {|s| s.full_name }
   end
 
   def test_install_dependency_development_shallow
@@ -407,7 +343,7 @@ class TestGemDependencyInstaller < Gem::TestCase
       inst.install 'd'
     end
 
-    assert_equal %w[c-1 d-1], inst.installed_gems.map { |s| s.full_name }
+    assert_equal %w[c-1 d-1], inst.installed_gems.map {|s| s.full_name }
   end
 
   def test_install_dependency_existing
@@ -423,7 +359,7 @@ class TestGemDependencyInstaller < Gem::TestCase
       inst.install 'b'
     end
 
-    assert_equal %w[b-1], inst.installed_gems.map { |s| s.full_name }
+    assert_equal %w[b-1], inst.installed_gems.map {|s| s.full_name }
   end
 
   def test_install_dependency_existing_extension
@@ -440,7 +376,7 @@ class TestGemDependencyInstaller < Gem::TestCase
     e1 = util_spec 'e', '1', nil, 'extconf.rb' do |s|
       s.extensions << 'extconf.rb'
     end
-    e1_gem = File.join @tempdir, 'gems', "#{e1.full_name}.gem"
+    e1_gem = e1.cache_file
 
     _, f1_gem = util_gem 'f', '1', 'e' => nil
 
@@ -460,7 +396,7 @@ class TestGemDependencyInstaller < Gem::TestCase
       Dir.chdir pwd
     end
 
-    assert_equal %w[f-1], inst.installed_gems.map { |s| s.full_name }
+    assert_equal %w[f-1], inst.installed_gems.map {|s| s.full_name }
 
     assert_path_exists e1.extension_dir
   end
@@ -480,7 +416,7 @@ class TestGemDependencyInstaller < Gem::TestCase
       inst.install 'f'
     end
 
-    assert_equal %w[f-2], inst.installed_gems.map { |s| s.full_name }
+    assert_equal %w[f-2], inst.installed_gems.map {|s| s.full_name }
   end
 
   def test_install_local
@@ -494,7 +430,7 @@ class TestGemDependencyInstaller < Gem::TestCase
       inst.install 'a-1.gem'
     end
 
-    assert_equal %w[a-1], inst.installed_gems.map { |s| s.full_name }
+    assert_equal %w[a-1], inst.installed_gems.map {|s| s.full_name }
   end
 
   def test_install_local_prerelease
@@ -508,7 +444,7 @@ class TestGemDependencyInstaller < Gem::TestCase
       inst.install 'a-1.a.gem'
     end
 
-    assert_equal %w[a-1.a], inst.installed_gems.map { |s| s.full_name }
+    assert_equal %w[a-1.a], inst.installed_gems.map {|s| s.full_name }
   end
 
   def test_install_local_dependency
@@ -524,7 +460,7 @@ class TestGemDependencyInstaller < Gem::TestCase
       inst.install 'b-1.gem'
     end
 
-    assert_equal %w[a-1 b-1], inst.installed_gems.map { |s| s.full_name }
+    assert_equal %w[a-1 b-1], inst.installed_gems.map {|s| s.full_name }
   end
 
   def test_install_local_dependency_installed
@@ -542,7 +478,7 @@ class TestGemDependencyInstaller < Gem::TestCase
       inst.install 'b-1.gem'
     end
 
-    assert_equal %w[b-1], inst.installed_gems.map { |s| s.full_name }
+    assert_equal %w[b-1], inst.installed_gems.map {|s| s.full_name }
   end
 
   def test_install_local_subdir
@@ -555,7 +491,7 @@ class TestGemDependencyInstaller < Gem::TestCase
       inst.install 'gems/a-1.gem'
     end
 
-    assert_equal %w[a-1], inst.installed_gems.map { |s| s.full_name }
+    assert_equal %w[a-1], inst.installed_gems.map {|s| s.full_name }
   end
 
   def test_install_minimal_deps
@@ -581,7 +517,7 @@ class TestGemDependencyInstaller < Gem::TestCase
       inst.install 'b', req('= 1')
     end
 
-    assert_equal %w[b-1], inst.installed_gems.map { |s| s.full_name },
+    assert_equal %w[b-1], inst.installed_gems.map {|s| s.full_name },
                  'sanity check'
 
     Dir.chdir @tempdir do
@@ -589,7 +525,41 @@ class TestGemDependencyInstaller < Gem::TestCase
       inst.install 'e'
     end
 
-    assert_equal %w[a-1 e-1], inst.installed_gems.map { |s| s.full_name }
+    assert_equal %w[a-1 e-1], inst.installed_gems.map {|s| s.full_name }
+  end
+
+  def test_install_no_minimal_deps
+    util_setup_gems
+
+    _, e1_gem = util_gem 'e', '1' do |s|
+      s.add_dependency 'b'
+    end
+
+    _, b2_gem = util_gem 'b', '2' do |s|
+      s.add_dependency 'a'
+    end
+
+    FileUtils.mv @a1_gem, @tempdir
+    FileUtils.mv @b1_gem, @tempdir
+    FileUtils.mv  b2_gem, @tempdir
+    FileUtils.mv  e1_gem, @tempdir
+
+    inst = nil
+
+    Dir.chdir @tempdir do
+      inst = Gem::DependencyInstaller.new :ignore_dependencies => true
+      inst.install 'b', req('= 1')
+    end
+
+    assert_equal %w[b-1], inst.installed_gems.map {|s| s.full_name },
+                 'sanity check'
+
+    Dir.chdir @tempdir do
+      inst = Gem::DependencyInstaller.new :minimal_deps => false
+      inst.install 'e'
+    end
+
+    assert_equal %w[a-1 b-2 e-1], inst.installed_gems.map {|s| s.full_name }
   end
 
   def test_install_no_document
@@ -622,7 +592,7 @@ class TestGemDependencyInstaller < Gem::TestCase
 
     env = "/\\S+/env" unless Gem.win_platform?
 
-    assert_match %r|\A#!#{env} #{RbConfig::CONFIG['ruby_install_name']}\n|,
+    assert_match %r{\A#!#{env} #{RbConfig::CONFIG['ruby_install_name']}\n},
                  File.read(File.join(@gemhome, 'bin', 'a_bin'))
   end
 
@@ -639,7 +609,7 @@ class TestGemDependencyInstaller < Gem::TestCase
       inst.install 'b'
     end
 
-    assert_equal %w[b-1], inst.installed_gems.map { |s| s.full_name }
+    assert_equal %w[b-1], inst.installed_gems.map {|s| s.full_name }
   end
 
   def test_install_build_args
@@ -669,7 +639,7 @@ class TestGemDependencyInstaller < Gem::TestCase
       inst.install 'b'
     end
 
-    assert_equal %w[b-1], inst.installed_gems.map { |s| s.full_name }
+    assert_equal %w[b-1], inst.installed_gems.map {|s| s.full_name }
   end
 
   def test_install_install_dir
@@ -690,7 +660,7 @@ class TestGemDependencyInstaller < Gem::TestCase
       inst.install 'b'
     end
 
-    assert_equal %w[a-1 b-1], inst.installed_gems.map { |s| s.full_name }
+    assert_equal %w[a-1 b-1], inst.installed_gems.map {|s| s.full_name }
 
     assert File.exist?(File.join(gemhome2, 'specifications', @a1.spec_name))
     assert File.exist?(File.join(gemhome2, 'cache', @a1.file_name))
@@ -714,7 +684,7 @@ class TestGemDependencyInstaller < Gem::TestCase
       inst.install 'b'
     end
 
-    assert_equal %w[a-1 b-1], inst.installed_gems.map { |s| s.full_name }
+    assert_equal %w[a-1 b-1], inst.installed_gems.map {|s| s.full_name }
     a1, b1 = inst.installed_gems
 
     assert_equal a1.spec_file, a1.loaded_from
@@ -738,7 +708,7 @@ class TestGemDependencyInstaller < Gem::TestCase
       inst.install 'b'
     end
 
-    assert_equal %w[a-1 b-1], inst.installed_gems.map { |s| s.full_name }
+    assert_equal %w[a-1 b-1], inst.installed_gems.map {|s| s.full_name }
   end
 
   def test_install_domain_local
@@ -757,7 +727,7 @@ class TestGemDependencyInstaller < Gem::TestCase
       assert_equal expected, e.message
     end
 
-    assert_equal [], inst.installed_gems.map { |s| s.full_name }
+    assert_equal [], inst.installed_gems.map {|s| s.full_name }
   end
 
   def test_install_domain_remote
@@ -773,7 +743,7 @@ class TestGemDependencyInstaller < Gem::TestCase
     inst = Gem::DependencyInstaller.new :domain => :remote
     inst.install 'a'
 
-    assert_equal %w[a-1], inst.installed_gems.map { |s| s.full_name }
+    assert_equal %w[a-1], inst.installed_gems.map {|s| s.full_name }
   end
 
   def test_install_dual_repository
@@ -790,7 +760,7 @@ class TestGemDependencyInstaller < Gem::TestCase
       inst.install 'a'
     end
 
-    assert_equal %w[a-1], inst.installed_gems.map { |s| s.full_name },
+    assert_equal %w[a-1], inst.installed_gems.map {|s| s.full_name },
                  'sanity check'
 
     ENV['GEM_HOME'] = @gemhome
@@ -802,7 +772,7 @@ class TestGemDependencyInstaller < Gem::TestCase
       inst.install 'b'
     end
 
-    assert_equal %w[b-1], inst.installed_gems.map { |s| s.full_name }
+    assert_equal %w[b-1], inst.installed_gems.map {|s| s.full_name }
   end
 
   def test_install_reinstall
@@ -813,7 +783,7 @@ class TestGemDependencyInstaller < Gem::TestCase
     inst = nil
 
     Dir.chdir @tempdir do
-      inst = Gem::DependencyInstaller.new
+      inst = Gem::DependencyInstaller.new :force => true
       inst.install 'a'
     end
 
@@ -837,7 +807,7 @@ class TestGemDependencyInstaller < Gem::TestCase
       inst.install 'a'
     end
 
-    assert_equal %w[a-1], inst.installed_gems.map { |s| s.full_name }
+    assert_equal %w[a-1], inst.installed_gems.map {|s| s.full_name }
   end
 
   def test_install_remote_dep
@@ -857,7 +827,7 @@ class TestGemDependencyInstaller < Gem::TestCase
       inst.install dep
     end
 
-    assert_equal %w[a-1], inst.installed_gems.map { |s| s.full_name }
+    assert_equal %w[a-1], inst.installed_gems.map {|s| s.full_name }
   end
 
   def test_install_remote_platform_newer
@@ -890,7 +860,7 @@ class TestGemDependencyInstaller < Gem::TestCase
     inst = Gem::DependencyInstaller.new :domain => :remote
     inst.install 'a'
 
-    assert_equal %w[a-1], inst.installed_gems.map { |s| s.full_name }
+    assert_equal %w[a-1], inst.installed_gems.map {|s| s.full_name }
   end
 
   def test_install_platform_is_ignored_when_a_file_is_specified
@@ -901,17 +871,19 @@ class TestGemDependencyInstaller < Gem::TestCase
     inst = Gem::DependencyInstaller.new :domain => :local
     inst.install a_gem
 
-    assert_equal %w[a-1-cpu-other_platform-1], inst.installed_gems.map { |s| s.full_name }
+    assert_equal %w[a-1-cpu-other_platform-1], inst.installed_gems.map {|s| s.full_name }
   end
 
-  if defined? OpenSSL
+  require 'rubygems/openssl'
+
+  if Gem::HAVE_OPENSSL
     def test_install_security_policy
       util_setup_gems
 
-      data = File.open(@a1_gem, 'rb') { |f| f.read }
+      data = File.open(@a1_gem, 'rb') {|f| f.read }
       @fetcher.data['http://gems.example.com/gems/a-1.gem'] = data
 
-      data = File.open(@b1_gem, 'rb') { |f| f.read }
+      data = File.open(@b1_gem, 'rb') {|f| f.read }
       @fetcher.data['http://gems.example.com/gems/b-1.gem'] = data
 
       policy = Gem::Security::HighSecurity
@@ -924,7 +896,7 @@ class TestGemDependencyInstaller < Gem::TestCase
       assert_equal 'unsigned gems are not allowed by the High Security policy',
                    e.message
 
-      assert_equal %w[], inst.installed_gems.map { |s| s.full_name }
+      assert_equal %w[], inst.installed_gems.map {|s| s.full_name }
     end
   end
 
@@ -938,7 +910,7 @@ class TestGemDependencyInstaller < Gem::TestCase
       inst = Gem::DependencyInstaller.new :wrappers => false, :format_executable => false
       inst.install 'a'
 
-      refute_match(%r|This file was generated by RubyGems.|,
+      refute_match(%r{This file was generated by RubyGems.},
                    File.read(File.join(@gemhome, 'bin', 'a_bin')))
     end
   end
@@ -946,126 +918,77 @@ class TestGemDependencyInstaller < Gem::TestCase
   def test_install_version
     util_setup_d
 
-    data = File.open(@d2_gem, 'rb') { |f| f.read }
+    data = File.open(@d2_gem, 'rb') {|f| f.read }
     @fetcher.data['http://gems.example.com/gems/d-2.gem'] = data
 
-    data = File.open(@d1_gem, 'rb') { |f| f.read }
+    data = File.open(@d1_gem, 'rb') {|f| f.read }
     @fetcher.data['http://gems.example.com/gems/d-1.gem'] = data
 
     inst = Gem::DependencyInstaller.new
 
     inst.install 'd', '= 1'
 
-    assert_equal %w[d-1], inst.installed_gems.map { |s| s.full_name }
+    assert_equal %w[d-1], inst.installed_gems.map {|s| s.full_name }
   end
 
   def test_install_version_default
     util_setup_d
 
-    data = File.open(@d2_gem, 'rb') { |f| f.read }
+    data = File.open(@d2_gem, 'rb') {|f| f.read }
     @fetcher.data['http://gems.example.com/gems/d-2.gem'] = data
 
-    data = File.open(@d1_gem, 'rb') { |f| f.read }
+    data = File.open(@d1_gem, 'rb') {|f| f.read }
     @fetcher.data['http://gems.example.com/gems/d-1.gem'] = data
 
     inst = Gem::DependencyInstaller.new
     inst.install 'd'
 
-    assert_equal %w[d-2], inst.installed_gems.map { |s| s.full_name }
+    assert_equal %w[d-2], inst.installed_gems.map {|s| s.full_name }
   end
 
-  def test_find_gems_gems_with_sources
-    util_setup_gems
+  def test_install_legacy_spec_with_nil_required_rubygems_version
+    path = File.expand_path "../data/null-required-rubygems-version.gemspec.rz", __FILE__
+    spec = Marshal.load Gem.read_binary(path)
+    def spec.validate(*args); end
 
-    inst = Gem::DependencyInstaller.new
-    dep = Gem::Dependency.new 'b', '>= 0'
-
-    Gem::Specification.reset
-
-    set = Gem::Deprecate.skip_during do
-      inst.find_gems_with_sources(dep)
-    end
+    util_build_gem spec
 
-    assert_kind_of Gem::AvailableSet, set
+    cache_file = File.join @tempdir, 'gems', "#{spec.original_name}.gem"
+    FileUtils.mkdir_p File.dirname cache_file
+    FileUtils.mv spec.cache_file, cache_file
 
-    s = set.set.first
+    util_setup_spec_fetcher spec
 
-    assert_equal @b1, s.spec
-    assert_equal Gem::Source.new(@gem_repo), s.source
-  end
+    data = Gem.read_binary(cache_file)
 
-  def test_find_spec_by_name_and_version_wildcard
-    util_gem 'a', 1
-    FileUtils.mv 'gems/a-1.gem', @tempdir
+    @fetcher.data['http://gems.example.com/gems/activesupport-1.0.0.gem'] = data
 
-    FileUtils.touch 'rdoc.gem'
-
-    inst = Gem::DependencyInstaller.new
-
-    available = Gem::Deprecate.skip_during do
-      inst.find_spec_by_name_and_version('*.gem')
-    end
-
-    assert_equal %w[a-1], available.each_spec.map { |spec| spec.full_name }
-  end
-
-  def test_find_spec_by_name_and_version_wildcard_bad_gem
-    FileUtils.touch 'rdoc.gem'
+    dep = Gem::Dependency.new 'activesupport'
 
     inst = Gem::DependencyInstaller.new
+    inst.install dep
 
-    assert_raises Gem::Package::FormatError do
-      Gem::Deprecate.skip_during do
-        inst.find_spec_by_name_and_version '*.gem'
-      end
-    end
+    assert_equal %w[activesupport-1.0.0], Gem::Specification.map(&:full_name)
   end
 
-  def test_find_spec_by_name_and_version_bad_gem
-    FileUtils.touch 'rdoc.gem'
+  def test_find_gems_gems_with_sources
+    util_setup_gems
 
     inst = Gem::DependencyInstaller.new
+    dep = Gem::Dependency.new 'b', '>= 0'
 
-    e = assert_raises Gem::Package::FormatError do
-      Gem::Deprecate.skip_during do
-        inst.find_spec_by_name_and_version 'rdoc.gem'
-      end
-    end
-
-    full_path = File.join @tempdir, 'rdoc.gem'
-    assert_equal "package metadata is missing in #{full_path}", e.message
-  end
-
-  def test_find_spec_by_name_and_version_directory
-    Dir.mkdir 'rdoc'
-
-    inst = Gem::DependencyInstaller.new
+    Gem::Specification.reset
 
-    e = assert_raises Gem::SpecificGemNotFoundException do
-      Gem::Deprecate.skip_during do
-        inst.find_spec_by_name_and_version 'rdoc'
-      end
+    set = Gem::Deprecate.skip_during do
+      inst.find_gems_with_sources(dep)
     end
 
-    assert_equal "Could not find a valid gem 'rdoc' (>= 0) " +
-                 "locally or in a repository",
-                 e.message
-  end
-
-  def test_find_spec_by_name_and_version_file
-    FileUtils.touch 'rdoc'
-
-    inst = Gem::DependencyInstaller.new
+    assert_kind_of Gem::AvailableSet, set
 
-    e = assert_raises Gem::SpecificGemNotFoundException do
-      Gem::Deprecate.skip_during do
-        inst.find_spec_by_name_and_version 'rdoc'
-      end
-    end
+    s = set.set.first
 
-    assert_equal "Could not find a valid gem 'rdoc' (>= 0) " +
-                 "locally or in a repository",
-                 e.message
+    assert_equal @b1, s.spec
+    assert_equal Gem::Source.new(@gem_repo), s.source
   end
 
   def test_find_gems_with_sources_local
@@ -1109,8 +1032,8 @@ class TestGemDependencyInstaller < Gem::TestCase
 
     releases = set.all_specs
 
-    assert releases.any? { |s| s.name == 'a' and s.version.to_s == '1' }
-    refute releases.any? { |s| s.name == 'a' and s.version.to_s == '1.a' }
+    assert releases.any? {|s| s.name == 'a' and s.version.to_s == '1' }
+    refute releases.any? {|s| s.name == 'a' and s.version.to_s == '1.a' }
 
     dependency.prerelease = true
 
@@ -1168,7 +1091,7 @@ class TestGemDependencyInstaller < Gem::TestCase
     inst = Gem::DependencyInstaller.new
     request_set = inst.resolve_dependencies 'b', req('>= 0')
 
-    requests = request_set.sorted_requests.map { |req| req.full_name }
+    requests = request_set.sorted_requests.map {|req| req.full_name }
 
     assert_equal %w[a-1 b-1], requests
   end
@@ -1182,7 +1105,7 @@ class TestGemDependencyInstaller < Gem::TestCase
     inst = Gem::DependencyInstaller.new :ignore_dependencies => true
     request_set = inst.resolve_dependencies 'b', req('>= 0')
 
-    requests = request_set.sorted_requests.map { |req| req.full_name }
+    requests = request_set.sorted_requests.map {|req| req.full_name }
 
     assert request_set.ignore_dependencies
 
@@ -1199,26 +1122,11 @@ class TestGemDependencyInstaller < Gem::TestCase
     inst = Gem::DependencyInstaller.new
     request_set = inst.resolve_dependencies 'a-1.gem', req('>= 0')
 
-    requests = request_set.sorted_requests.map { |req| req.full_name }
+    requests = request_set.sorted_requests.map {|req| req.full_name }
 
     assert_equal %w[a-1], requests
   end
 
-  def util_write_a1_bin
-    write_file File.join('gems', 'a-1', 'bin', 'a_bin') do |fp|
-      fp.puts "#!/usr/bin/ruby"
-    end
-  end
-
-  def util_setup_c1_pre
-    @c1_pre, @c1_pre_gem = util_spec 'c', '1.a' do |s|
-      s.add_dependency 'a', '1.a'
-      s.add_dependency 'b', '1'
-    end
-
-    util_reset_gems
-  end
-
   def util_setup_d
     @d1, @d1_gem = util_gem 'd', '1'
     @d2, @d2_gem = util_gem 'd', '2'
@@ -1226,44 +1134,13 @@ class TestGemDependencyInstaller < Gem::TestCase
     util_reset_gems
   end
 
-  def util_setup_wxyz
-    @x1_m, @x1_m_gem = util_spec 'x', '1' do |s|
-      s.platform = Gem::Platform.new %w[cpu my_platform 1]
-    end
-
-    @x1_o, @x1_o_gem = util_spec 'x', '1' do |s|
-      s.platform = Gem::Platform.new %w[cpu other_platform 1]
-    end
-
-    @w1, @w1_gem = util_spec 'w', '1', 'x' => nil
-
-    @y1, @y1_gem = util_spec 'y', '1'
-    @y1_1_p, @y1_1_p_gem = util_spec 'y', '1.1' do |s|
-      s.platform = Gem::Platform.new %w[cpu my_platform 1]
-    end
-
-    @z1, @z1_gem = util_spec 'z', '1', 'y' => nil
-
-    util_reset_gems
-  end
-
   def util_reset_gems
     @a1     ||= nil
     @b1     ||= nil
     @a1_pre ||= nil
-    @c1_pre ||= nil
     @d1     ||= nil
     @d2     ||= nil
-    @w1     ||= nil
-    @x1_m   ||= nil
-    @x1_o   ||= nil
-    @y1     ||= nil
-    @y1_1_p ||= nil
-    @z1     ||= nil
-
-    util_setup_spec_fetcher(*[@a1, @a1_pre, @b1, @c1_pre,
-                              @d1, @d2, @x1_m, @x1_o, @w1, @y1,
-                              @y1_1_p, @z1].compact)
-  end
 
+    util_setup_spec_fetcher(*[@a1, @a1_pre, @b1, @d1, @d2].compact)
+  end
 end