rubygems-update 1.8.30 → 2.0.0.preview2

data/test/rubygems/test_gem_commands_which_command.rb

@@ -41,19 +41,19 @@ class TestGemCommandsWhichCommand < Gem::TestCase
 
     util_foo_bar
 
-    @cmd.handle_options %w[foo_bar missing]
+    @cmd.handle_options %w[foo_bar missinglib]
 
     use_ui @ui do
       @cmd.execute
     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 missing\n%,
+    assert_match %r%Can.t find ruby library file or shared library missinglib\n%,
                  @ui.error
   end
 
   def test_execute_missing
-    @cmd.handle_options %w[missing]
+    @cmd.handle_options %w[missinglib]
 
     use_ui @ui do
       assert_raises Gem::MockGemUi::TermError do
@@ -62,7 +62,7 @@ class TestGemCommandsWhichCommand < Gem::TestCase
     end
 
     assert_equal '', @ui.output
-    assert_match %r%Can.t find ruby library file or shared library missing\n%,
+    assert_match %r%Can.t find ruby library file or shared library missinglib\n%,
                  @ui.error
   end
 

data/test/rubygems/test_gem_commands_yank_command.rb

@@ -0,0 +1,97 @@
+require 'rubygems/test_case'
+require 'rubygems/commands/yank_command'
+
+class TestGemCommandsYankCommand < Gem::TestCase
+  def setup
+    super
+
+    @cmd = Gem::Commands::YankCommand.new
+    @cmd.host = 'http://example'
+
+    @fetcher = Gem::RemoteFetcher.fetcher
+
+    Gem.configuration.rubygems_api_key = 'key'
+    Gem.configuration.api_keys[:KEY]  = 'other'
+  end
+
+  def test_handle_options
+    @cmd.handle_options %w[a --version 1.0 --platform x86-darwin -k KEY]
+
+    assert_equal %w[a],        @cmd.options[:args]
+    assert_equal 'KEY',        @cmd.options[:key]
+    assert_nil                 @cmd.options[:platform]
+    assert_equal req('= 1.0'), @cmd.options[:version]
+  end
+
+  def test_handle_options_missing_argument
+    %w[-v --version -p --platform].each do |option|
+      assert_raises OptionParser::MissingArgument do
+        @cmd.handle_options %W[a #{option}]
+      end
+    end
+  end
+
+  def test_execute
+    yank_uri = 'http://example/api/v1/gems/yank'
+    @fetcher.data[yank_uri] = ['Successfully yanked', 200, 'OK']
+
+    @cmd.options[:args]           = %w[a]
+    @cmd.options[:added_platform] = true
+    @cmd.options[:version]        = req('= 1.0')
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    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
+    assert_equal %W[gem_name=a platform=#{platform} version=1.0], body
+
+    assert_equal 'key', @fetcher.last_request['Authorization']
+
+    assert_equal [yank_uri], @fetcher.paths
+  end
+
+  def test_execute_key
+    yank_uri = 'http://example/api/v1/gems/yank'
+    @fetcher.data[yank_uri] = ['Successfully yanked', 200, 'OK']
+
+    @cmd.options[:args]    = %w[a]
+    @cmd.options[:version] = req('= 1.0')
+    @cmd.options[:key]     = 'KEY'
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    body = @fetcher.last_request.body.split('&').sort
+    assert_equal %w[gem_name=a version=1.0], body
+    assert_equal 'other', @fetcher.last_request['Authorization']
+  end
+
+  def test_execute_undo
+    unyank_uri = 'http://example/api/v1/gems/unyank'
+    @fetcher.data[unyank_uri] = ['Successfully unyanked', 200, 'OK']
+
+    @cmd.options[:args]    = %w[a]
+    @cmd.options[:version] = req('= 1.0')
+    @cmd.options[:undo]    = true
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    assert_match %r%Unyanking gem from http://example%, @ui.output
+    assert_match %r%Successfully unyanked%,      @ui.output
+
+    body = @fetcher.last_request.body.split('&').sort
+    assert_equal %w[gem_name=a version=1.0], body
+
+    assert_equal [unyank_uri], @fetcher.paths
+  end
+
+end
+

data/test/rubygems/test_gem_config_file.rb

@@ -17,6 +17,9 @@ class TestGemConfigFile < Gem::TestCase
     Gem::ConfigFile::OPERATING_SYSTEM_DEFAULTS.clear
     Gem::ConfigFile::PLATFORM_DEFAULTS.clear
 
+    @env_gemrc = ENV['GEMRC']
+    ENV['GEMRC'] = ''
+
     util_config_file
   end
 
@@ -27,6 +30,8 @@ class TestGemConfigFile < Gem::TestCase
     Gem::ConfigFile.send :const_set, :SYSTEM_WIDE_CONFIG_FILE,
                          @orig_SYSTEM_WIDE_CONFIG_FILE
 
+    ENV['GEMRC'] = @env_gemrc
+
     super
   end
 
@@ -35,7 +40,6 @@ class TestGemConfigFile < Gem::TestCase
 
     assert_equal false, @cfg.backtrace
     assert_equal true, @cfg.update_sources
-    assert_equal false, @cfg.benchmark
     assert_equal Gem::ConfigFile::DEFAULT_BULK_THRESHOLD, @cfg.bulk_threshold
     assert_equal true, @cfg.verbose
     assert_equal [@gem_repo], Gem.sources
@@ -43,7 +47,6 @@ class TestGemConfigFile < Gem::TestCase
     File.open @temp_conf, 'w' do |fp|
       fp.puts ":backtrace: true"
       fp.puts ":update_sources: false"
-      fp.puts ":benchmark: true"
       fp.puts ":bulk_threshold: 10"
       fp.puts ":verbose: false"
       fp.puts ":sources:"
@@ -59,7 +62,6 @@ class TestGemConfigFile < Gem::TestCase
     util_config_file
 
     assert_equal true, @cfg.backtrace
-    assert_equal true, @cfg.benchmark
     assert_equal 10, @cfg.bulk_threshold
     assert_equal false, @cfg.verbose
     assert_equal false, @cfg.update_sources
@@ -131,6 +133,37 @@ class TestGemConfigFile < Gem::TestCase
     assert_equal true, @cfg.backtrace
   end
 
+  def test_initialize_environment_variable_override
+    File.open Gem::ConfigFile::SYSTEM_WIDE_CONFIG_FILE, 'w' do |fp|
+      fp.puts ':backtrace: false'
+      fp.puts ':verbose: false'
+      fp.puts ':bulk_threshold: 2048'
+    end
+
+    conf1 = File.join @tempdir, 'gemrc1'
+    File.open conf1, 'w' do |fp|
+      fp.puts ':backtrace: true'
+    end
+
+    conf2 = File.join @tempdir, 'gemrc2'
+    File.open conf2, 'w' do |fp|
+      fp.puts ':verbose: true'
+    end
+
+    conf3 = File.join @tempdir, 'gemrc3'
+    File.open conf3, 'w' do |fp|
+      fp.puts ':verbose: :loud'
+    end
+
+    ENV['GEMRC'] = conf1 + ':' + conf2 + ';' + conf3
+
+    util_config_file
+
+    assert_equal true, @cfg.backtrace
+    assert_equal :loud, @cfg.verbose
+    assert_equal 2048, @cfg.bulk_threshold
+  end
+
   def test_handle_arguments
     args = %w[--backtrace --bunch --of --args here]
 
@@ -149,16 +182,6 @@ class TestGemConfigFile < Gem::TestCase
     assert_equal true, @cfg.backtrace
   end
 
-  def test_handle_arguments_benchmark
-    assert_equal false, @cfg.benchmark
-
-    args = %w[--benchmark]
-
-    @cfg.handle_arguments args
-
-    assert_equal true, @cfg.benchmark
-  end
-
   def test_handle_arguments_debug
     old_dollar_DEBUG = $DEBUG
     assert_equal false, $DEBUG
@@ -174,12 +197,12 @@ class TestGemConfigFile < Gem::TestCase
 
   def test_handle_arguments_override
     File.open @temp_conf, 'w' do |fp|
-      fp.puts ":benchmark: false"
+      fp.puts ":backtrace: false"
     end
 
-    util_config_file %W[--benchmark --config-file=#{@temp_conf}]
+    util_config_file %W[--backtrace --config-file=#{@temp_conf}]
 
-    assert_equal true, @cfg.benchmark
+    assert_equal true, @cfg.backtrace
   end
 
   def test_handle_arguments_traceback
@@ -206,7 +229,6 @@ class TestGemConfigFile < Gem::TestCase
 
   def test_write
     @cfg.backtrace = true
-    @cfg.benchmark = true
     @cfg.update_sources = false
     @cfg.bulk_threshold = 10
     @cfg.verbose = false
@@ -219,7 +241,6 @@ class TestGemConfigFile < Gem::TestCase
 
     # These should not be written out to the config file.
     assert_equal false, @cfg.backtrace,     'backtrace'
-    assert_equal false, @cfg.benchmark,     'benchmark'
     assert_equal Gem::ConfigFile::DEFAULT_BULK_THRESHOLD, @cfg.bulk_threshold,
                  'bulk_threshold'
     assert_equal true, @cfg.update_sources, 'update_sources'
@@ -234,7 +255,6 @@ class TestGemConfigFile < Gem::TestCase
   def test_write_from_hash
     File.open @temp_conf, 'w' do |fp|
       fp.puts ":backtrace: true"
-      fp.puts ":benchmark: true"
       fp.puts ":bulk_threshold: 10"
       fp.puts ":update_sources: false"
       fp.puts ":verbose: false"
@@ -246,7 +266,6 @@ class TestGemConfigFile < Gem::TestCase
     util_config_file
 
     @cfg.backtrace = :junk
-    @cfg.benchmark = :junk
     @cfg.update_sources = :junk
     @cfg.bulk_threshold = 20
     @cfg.verbose = :junk
@@ -259,7 +278,6 @@ class TestGemConfigFile < Gem::TestCase
 
     # These should not be written out to the config file
     assert_equal true,  @cfg.backtrace,      'backtrace'
-    assert_equal true,  @cfg.benchmark,      'benchmark'
     assert_equal 10,    @cfg.bulk_threshold, 'bulk_threshold'
     assert_equal false, @cfg.update_sources, 'update_sources'
     assert_equal false, @cfg.verbose,        'verbose'
@@ -295,6 +313,26 @@ class TestGemConfigFile < Gem::TestCase
                   :other => 'a5fdbb6ba150cbb83aad2bb2fede64c'}, @cfg.api_keys)
   end
 
+  def test_save_credentials_file_with_strict_permissions
+    util_config_file
+    FileUtils.mkdir File.dirname(@cfg.credentials_path)
+    @cfg.rubygems_api_key = '701229f217cdf23b1344c7b4b54ca97'
+    mode = 0100600 & (~File.umask)
+    assert_equal mode, File.stat(@cfg.credentials_path).mode unless win_platform?
+  end
+
+  def test_ignore_invalid_config_file
+    File.open @temp_conf, 'w' do |fp|
+      fp.puts "some-non-yaml-hash-string"
+    end
+
+    # Avoid writing stuff to output when running tests
+    Gem::ConfigFile.class_eval { def warn(args); end }
+
+    # This should not raise exception
+    util_config_file
+  end
+
   def test_load_ssl_verify_mode_from_config
     File.open @temp_conf, 'w' do |fp|
       fp.puts ":ssl_verify_mode: 1"
@@ -315,5 +353,12 @@ class TestGemConfigFile < Gem::TestCase
     @cfg = Gem::ConfigFile.new args
   end
 
+  def test_disable_default_gem_server
+    File.open @temp_conf, 'w' do |fp|
+      fp.puts ":disable_default_gem_server: true"
+    end
+    util_config_file
+    assert_equal(true, @cfg.disable_default_gem_server)
+  end
 end
 

data/test/rubygems/test_gem_dependency.rb

@@ -9,6 +9,15 @@ class TestGemDependency < Gem::TestCase
     assert_equal req("> 1.0"), d.requirement
   end
 
+  def test_initialize_type_bad
+    e = assert_raises ArgumentError do
+      Gem::Dependency.new 'monkey' => '1.0'
+    end
+
+    assert_equal 'dependency name must be a String, was {"monkey"=>"1.0"}',
+                 e.message
+  end
+
   def test_initialize_double
     d = dep "pkg", "> 1.0", "< 2.0"
     assert_equal req("> 1.0", "< 2.0"), d.requirement
@@ -173,5 +182,42 @@ class TestGemDependency < Gem::TestCase
     assert dep('a', '= 1').specific?
   end
 
+  def test_to_specs_suggests_other_versions
+    a = util_spec 'a', '1.0', 'b' => '>= 1.0'
+
+    a_file = File.join a.gem_dir, 'lib', 'a_file.rb'
+
+    write_file a_file do |io|
+      io.puts '# a_file.rb'
+    end
+
+    dep = Gem::Dependency.new "a", "= 2.0"
+
+    e = assert_raises Gem::LoadError do
+      dep.to_specs
+    end
+
+    assert_equal "Could not find 'a' (= 2.0) - did find: [a-1.0]", e.message
+  end
+
+  def test_to_specs_indicates_total_gem_set_size
+    a = util_spec 'a', '1.0', 'b' => '>= 1.0'
+
+    a_file = File.join a.gem_dir, 'lib', 'a_file.rb'
+
+    write_file a_file do |io|
+      io.puts '# a_file.rb'
+    end
+
+    dep = Gem::Dependency.new "b", "= 2.0"
+
+    e = assert_raises Gem::LoadError do
+      dep.to_specs
+    end
+
+    assert_equal "Could not find 'b' (= 2.0) among 1 total gem(s)", e.message
+  end
+
+
 end
 

data/test/rubygems/test_gem_dependency_installer.rb

@@ -23,6 +23,14 @@ class TestGemDependencyInstaller < Gem::TestCase
       s.add_development_dependency 'aa'
     end
 
+    @c1, @c1_gem         = util_gem 'c', '1' do |s|
+      s.add_development_dependency 'b'
+    end
+
+    @d1, @d1_gem         = util_gem 'd', '1' do |s|
+      s.add_development_dependency 'c'
+    end
+
     util_clear_gems
     util_reset_gems
   end
@@ -42,6 +50,62 @@ class TestGemDependencyInstaller < Gem::TestCase
     assert_equal [@a1], inst.installed_gems
   end
 
+  def test_install_prerelease
+    util_setup_gems
+
+    p1a, gem = util_gem 'a', '10.a'
+
+    util_setup_spec_fetcher(p1a, @a1, @a1_pre)
+    util_clear_gems
+
+    p1a_data = Gem.read_binary(gem)
+
+    @fetcher.data['http://gems.example.com/gems/a-10.a.gem'] = p1a_data
+
+    dep = Gem::Dependency.new "a"
+    inst = Gem::DependencyInstaller.new :prerelease => true
+    inst.install dep
+
+    assert_equal %w[a-10.a], Gem::Specification.map(&:full_name)
+    assert_equal [p1a], inst.installed_gems
+  end
+
+  def test_install_when_only_prerelease
+    p1a, gem = util_gem 'p', '1.a'
+
+    util_setup_spec_fetcher(p1a)
+    util_clear_gems
+
+    p1a_data = Gem.read_binary(gem)
+
+    @fetcher.data['http://gems.example.com/gems/p-1.a.gem'] = p1a_data
+
+    dep = Gem::Dependency.new "p"
+    inst = Gem::DependencyInstaller.new
+    inst.install dep
+
+    assert_equal %w[], Gem::Specification.map(&:full_name)
+    assert_equal [], inst.installed_gems
+  end
+
+  def test_install_prerelease_skipped_when_normal_ver
+    util_setup_gems
+
+    util_setup_spec_fetcher(@a1, @a1_pre)
+    util_clear_gems
+
+    p1a_data = Gem.read_binary(@a1_gem)
+
+    @fetcher.data['http://gems.example.com/gems/a-1.gem'] = p1a_data
+
+    dep = Gem::Dependency.new "a"
+    inst = Gem::DependencyInstaller.new :prerelease => true
+    inst.install dep
+
+    assert_equal %w[a-1], Gem::Specification.map(&:full_name)
+    assert_equal [@a1], inst.installed_gems
+  end
+
   def test_install_all_dependencies
     util_setup_gems
 
@@ -69,14 +133,44 @@ class TestGemDependencyInstaller < Gem::TestCase
     assert_equal %w[e-1 a-1], inst.installed_gems.map { |s| s.full_name }
   end
 
-  def test_install_cache_dir
+  def test_install_ignore_satified_deps
     util_setup_gems
 
+    _, e1_gem = util_gem 'e', '1' do |s|
+      s.add_dependency 'b'
+    end
+
+    util_clear_gems
+
     FileUtils.mv @a1_gem, @tempdir
     FileUtils.mv @b1_gem, @tempdir
+    FileUtils.mv e1_gem, @tempdir
+
+    Dir.chdir @tempdir do
+      i = Gem::DependencyInstaller.new :ignore_dependencies => true
+      i.install 'b'
+    end
+
     inst = nil
 
     Dir.chdir @tempdir do
+      inst = Gem::DependencyInstaller.new :minimal_deps => true
+      inst.install 'e'
+    end
+
+    assert_equal %w[e-1], inst.installed_gems.map { |s| s.full_name }
+  end
+
+  def test_install_cache_dir
+    util_setup_gems
+
+    dir = "dir"
+    Dir.mkdir dir
+    FileUtils.mv @a1_gem, dir
+    FileUtils.mv @b1_gem, dir
+    inst = nil
+
+    Dir.chdir dir do
       inst = Gem::DependencyInstaller.new :cache_dir => @tempdir
       inst.install 'b'
     end
@@ -103,7 +197,7 @@ class TestGemDependencyInstaller < Gem::TestCase
 
     Dir.chdir @tempdir do
       inst = Gem::DependencyInstaller.new
-      inst.install 'a-2'
+      inst.install 'a', Gem::Requirement.create("= 2")
     end
 
     FileUtils.rm File.join(@tempdir, a2.file_name)
@@ -117,19 +211,67 @@ class TestGemDependencyInstaller < Gem::TestCase
     assert_equal %w[b-1], inst.installed_gems.map { |s| s.full_name }
   end
 
-  def test_install_dependency
+  # This asserts that if a gem's dependency is satisfied by an
+  # already installed gem, RubyGems doesn't installed a newer
+  # version
+  def test_install_doesnt_upgrade_installed_depedencies
     util_setup_gems
 
+    a2, a2_gem = util_gem 'a', '2'
+    a3, a3_gem = util_gem 'a', '3'
+
+    util_setup_spec_fetcher @a1, a3, @b1
+
+    FileUtils.rm_rf File.join(@gemhome, 'gems')
+
+    Gem::Specification.reset
+
     FileUtils.mv @a1_gem, @tempdir
+    FileUtils.mv a2_gem, @tempdir # not in index
     FileUtils.mv @b1_gem, @tempdir
+    FileUtils.mv a3_gem, @tempdir
+
     inst = nil
 
+    Dir.chdir @tempdir do
+      inst = Gem::DependencyInstaller.new
+      inst.install 'a', Gem::Requirement.create("= 2")
+    end
+
+    FileUtils.rm File.join(@tempdir, a2.file_name)
+
     Dir.chdir @tempdir do
       inst = Gem::DependencyInstaller.new
       inst.install 'b'
     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 }
+  end
+
+  def test_install_dependency
+    util_setup_gems
+
+    done_installing_ran = false
+    inst = nil
+
+    Gem.done_installing do |installer, specs|
+      done_installing_ran = true
+      assert_equal inst, installer
+      assert_equal [@a1, @b1], specs
+    end
+
+    FileUtils.mv @a1_gem, @tempdir
+    FileUtils.mv @b1_gem, @tempdir
+
+    Dir.chdir @tempdir do
+      inst = Gem::DependencyInstaller.new(:build_docs_in_background => false)
+      inst.install 'b'
+    end
+
     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
 
   def test_install_dependency_development
@@ -152,6 +294,50 @@ class TestGemDependencyInstaller < Gem::TestCase
     assert_equal %w[a-1 aa-1 b-1], inst.installed_gems.map { |s| s.full_name }
   end
 
+  def test_install_dependency_development_deep
+    util_setup_gems
+
+    @aa1, @aa1_gem = util_gem 'aa', '1'
+
+    util_reset_gems
+
+    FileUtils.mv @a1_gem, @tempdir
+    FileUtils.mv @aa1_gem, @tempdir
+    FileUtils.mv @b1_gem, @tempdir
+    FileUtils.mv @c1_gem, @tempdir
+    FileUtils.mv @d1_gem, @tempdir
+    inst = nil
+
+    Dir.chdir @tempdir do
+      inst = Gem::DependencyInstaller.new(:development => true)
+      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 }
+  end
+
+  def test_install_dependency_development_shallow
+    util_setup_gems
+
+    @aa1, @aa1_gem = util_gem 'aa', '1'
+
+    util_reset_gems
+
+    FileUtils.mv @a1_gem, @tempdir
+    FileUtils.mv @aa1_gem, @tempdir
+    FileUtils.mv @b1_gem, @tempdir
+    FileUtils.mv @c1_gem, @tempdir
+    FileUtils.mv @d1_gem, @tempdir
+    inst = nil
+
+    Dir.chdir @tempdir do
+      inst = Gem::DependencyInstaller.new(:development => true, :dev_shallow => true)
+      inst.install 'd'
+    end
+
+    assert_equal %w[c-1 d-1], inst.installed_gems.map { |s| s.full_name }
+  end
+
   def test_install_dependency_existing
     util_setup_gems
 
@@ -517,11 +703,12 @@ class TestGemDependencyInstaller < Gem::TestCase
       policy = Gem::Security::HighSecurity
       inst = Gem::DependencyInstaller.new :security_policy => policy
 
-      e = assert_raises Gem::Exception do
+      e = assert_raises Gem::Security::Exception do
         inst.install 'b'
       end
 
-      assert_equal 'Unsigned gem', e.message
+      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 }
     end
@@ -581,7 +768,14 @@ class TestGemDependencyInstaller < Gem::TestCase
 
     Gem::Specification.reset
 
-    assert_equal [[@b1, @gem_repo]], inst.find_gems_with_sources(dep)
+    set = inst.find_gems_with_sources(dep)
+
+    assert_kind_of Gem::AvailableSet, set
+
+    s = set.set.first
+
+    assert_equal @b1, s.spec
+    assert_equal Gem::Source.new(@gem_repo), s.source
   end
 
   def test_find_gems_with_sources_local
@@ -590,21 +784,24 @@ class TestGemDependencyInstaller < Gem::TestCase
     FileUtils.mv @a1_gem, @tempdir
     inst = Gem::DependencyInstaller.new
     dep = Gem::Dependency.new 'a', '>= 0'
-    gems = nil
+    set = nil
 
     Dir.chdir @tempdir do
-      gems = inst.find_gems_with_sources dep
+      set = inst.find_gems_with_sources dep
     end
 
-    assert_equal 2, gems.length
-    remote = gems.first
-    assert_equal 'a-1', remote.first.full_name, 'remote spec'
-    assert_equal @gem_repo, remote.last, 'remote path'
+    gems = set.sorted
 
-    local = gems.last
-    assert_equal 'a-1', local.first.full_name, 'local spec'
+    assert_equal 2, gems.length
+    local = gems.first
+    assert_equal 'a-1', local.spec.full_name, 'local spec'
     assert_equal File.join(@tempdir, @a1.file_name),
-                 local.last, 'local path'
+                 local.source.download(local.spec), 'local path'
+
+    remote = gems.last
+    assert_equal 'a-1', remote.spec.full_name, 'remote spec'
+    assert_equal Gem::Source.new(@gem_repo), remote.source, 'remote path'
+
   end
 
   def test_find_gems_with_sources_prerelease
@@ -615,7 +812,7 @@ class TestGemDependencyInstaller < Gem::TestCase
     dependency = Gem::Dependency.new('a', Gem::Requirement.default)
 
     releases =
-      installer.find_gems_with_sources(dependency).map { |gems, *| gems }
+      installer.find_gems_with_sources(dependency).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' }
@@ -623,9 +820,22 @@ class TestGemDependencyInstaller < Gem::TestCase
     dependency.prerelease = true
 
     prereleases =
-      installer.find_gems_with_sources(dependency).map { |gems, *| gems }
+      installer.find_gems_with_sources(dependency).all_specs
+
+    assert_equal [@a1_pre, @a1], prereleases
+  end
+
+  def test_find_gems_with_sources_with_bad_source
+    Gem.sources.replace ["http://not-there.nothing"]
+
+    installer = Gem::DependencyInstaller.new
+
+    dep = Gem::Dependency.new('a')
+
+    out = installer.find_gems_with_sources(dep)
 
-    assert_equal [@a1_pre], prereleases
+    assert out.empty?
+    assert_kind_of Gem::SourceFetchProblem, installer.errors.first
   end
 
   def assert_resolve expected, *specs