rubygems-update 1.5.3 → 1.6.0

data/test/rubygems/test_gem_commands_specification_command.rb

@@ -10,7 +10,7 @@ class TestGemCommandsSpecificationCommand < Gem::TestCase
   end
 
   def test_execute
-    foo = quick_gem 'foo'
+    foo = quick_spec 'foo'
     Gem.source_index.add_spec foo
 
     @cmd.options[:args] = %w[foo]
@@ -25,8 +25,8 @@ class TestGemCommandsSpecificationCommand < Gem::TestCase
   end
 
   def test_execute_all
-    quick_gem 'foo', '0.0.1'
-    quick_gem 'foo', '0.0.2'
+    quick_spec 'foo', '0.0.1'
+    quick_spec 'foo', '0.0.2'
 
     @cmd.options[:args] = %w[foo]
     @cmd.options[:all] = true
@@ -56,8 +56,8 @@ class TestGemCommandsSpecificationCommand < Gem::TestCase
   end
 
   def test_execute_exact_match
-    quick_gem 'foo'
-    quick_gem 'foo_bar'
+    quick_spec 'foo'
+    quick_spec 'foo_bar'
 
     @cmd.options[:args] = %w[foo]
 
@@ -71,7 +71,7 @@ class TestGemCommandsSpecificationCommand < Gem::TestCase
   end
 
   def test_execute_field
-    foo = quick_gem 'foo'
+    foo = quick_spec 'foo'
     Gem.source_index.add_spec foo
 
     @cmd.options[:args] = %w[foo name]
@@ -84,7 +84,7 @@ class TestGemCommandsSpecificationCommand < Gem::TestCase
   end
 
   def test_execute_marshal
-    foo = quick_gem 'foo'
+    foo = quick_spec 'foo'
     Gem.source_index.add_spec foo
 
     @cmd.options[:args] = %w[foo]
@@ -120,7 +120,7 @@ class TestGemCommandsSpecificationCommand < Gem::TestCase
   end
 
   def test_execute_ruby
-    foo = quick_gem 'foo'
+    foo = quick_spec 'foo'
     Gem.source_index.add_spec foo
 
     @cmd.options[:args] = %w[foo]

data/test/rubygems/test_gem_commands_stale_command.rb

@@ -10,10 +10,11 @@ class TestGemCommandsStaleCommand < Gem::TestCase
 
   def test_execute_sorts
     files = %w[lib/foo_bar.rb Rakefile]
-    foo_bar = quick_gem 'foo_bar' do |gem|
+    foo_bar = quick_spec 'foo_bar' do |gem|
       gem.files = files
     end
-    bar_baz = quick_gem 'bar_baz' do |gem|
+
+    bar_baz = quick_spec 'bar_baz' do |gem|
       gem.files = files
     end
 
@@ -30,6 +31,7 @@ class TestGemCommandsStaleCommand < Gem::TestCase
     use_ui @ui do
       @cmd.execute
     end
+
     lines = @ui.output.split("\n")
     assert_equal("#{foo_bar.name}-#{foo_bar.version}", lines[0].split.first)
     assert_equal("#{bar_baz.name}-#{bar_baz.version}", lines[1].split.first)

data/test/rubygems/test_gem_commands_uninstall_command.rb

@@ -27,7 +27,7 @@ class TestGemCommandsUninstallCommand < Gem::InstallerTestCase
       end
     end
 
-    if win_platform?
+    if win_platform? then
       assert File.exist?(@executable)
     else
       assert File.symlink?(@executable)
@@ -36,9 +36,9 @@ class TestGemCommandsUninstallCommand < Gem::InstallerTestCase
     # Evil hack to prevent false removal success
     FileUtils.rm_f @executable
 
-    open(@executable, "wb+") {|f| f.puts "binary"}
+    open @executable, "wb+" do |f| f.puts "binary" end
 
-    @cmd.options[:args] = Array(@spec.name)
+    @cmd.options[:args] = [@spec.name]
     use_ui @ui do
       @cmd.execute
     end
@@ -50,6 +50,25 @@ class TestGemCommandsUninstallCommand < Gem::InstallerTestCase
     assert_nil output.shift, "UI output should have contained only two lines"
   end
 
+  def test_execute_removes_formatted_executable
+    FileUtils.rm_f @executable # Wish this didn't happen in #setup
+
+    Gem::Installer.exec_format = 'foo-%s-bar'
+
+    @installer.format_executable = true
+    @installer.install
+
+    formatted_executable = File.join @gemhome, 'bin', 'foo-executable-bar'
+    assert_equal true, File.exist?(formatted_executable)
+
+    @cmd.options[:format_executable] = true
+    @cmd.execute
+
+    assert_equal false, File.exist?(formatted_executable)
+  rescue
+    Gem::Installer.exec_format = nil
+  end
+
   def test_execute_not_installed
     @cmd.options[:args] = ["foo"]
     e = assert_raises Gem::InstallError do
@@ -64,7 +83,7 @@ class TestGemCommandsUninstallCommand < Gem::InstallerTestCase
   end
 
   def test_execute_prerelease
-    @spec = quick_gem "pre", "2.b"
+    @spec = quick_spec "pre", "2.b"
     @gem = File.join @tempdir, @spec.file_name
     FileUtils.touch @gem
 

data/test/rubygems/test_gem_commands_unpack_command.rb

@@ -16,7 +16,7 @@ class TestGemCommandsUnpackCommand < Gem::TestCase
 
     assert_equal(
       @cmd.find_in_cache(@a1.file_name), 
-      File.join(@gemhome, 'cache', @a1.file_name), 
+      Gem.cache_gem(@a1.file_name, @gemhome),
       'found a-1.gem in the cache'
     )
   end
@@ -28,7 +28,7 @@ class TestGemCommandsUnpackCommand < Gem::TestCase
     
     a1_data = nil
 
-    open File.join(@gemhome, 'cache', @a1.file_name), 'rb' do |fp|
+    open Gem.cache_gem(@a1.file_name, @gemhome), 'rb' do |fp|
       a1_data = fp.read
     end
 
@@ -38,15 +38,15 @@ class TestGemCommandsUnpackCommand < Gem::TestCase
     dep = Gem::Dependency.new(@a1.name, @a1.version)
     assert_equal(
       @cmd.get_path(dep), 
-      File.join(@gemhome, 'cache', @a1.file_name), 
+      Gem.cache_gem(@a1.file_name, @gemhome), 
       'fetches a-1 and returns the cache path'
     )
 
-    FileUtils.rm File.join(@gemhome, 'cache', @a1.file_name)
+    FileUtils.rm Gem.cache_gem(@a1.file_name, @gemhome)
 
     assert_equal(
       @cmd.get_path(dep), 
-      File.join(@gemhome, 'cache', @a1.file_name), 
+      Gem.cache_gem(@a1.file_name, @gemhome), 
       'when removed from cache, refetches a-1'
     )
   end
@@ -68,6 +68,8 @@ class TestGemCommandsUnpackCommand < Gem::TestCase
 
   def test_execute_gem_path
     util_make_gems
+    util_setup_spec_fetcher
+    util_setup_fake_fetcher
 
     Gem.clear_paths
 
@@ -115,7 +117,7 @@ class TestGemCommandsUnpackCommand < Gem::TestCase
     util_clear_gems
 
     a2_data = nil
-    open File.join(@gemhome, 'cache', @a2.file_name), 'rb' do |fp|
+    open Gem.cache_gem(@a2.file_name, @gemhome), 'rb' do |fp|
       a2_data = fp.read
     end
 
@@ -169,8 +171,8 @@ class TestGemCommandsUnpackCommand < Gem::TestCase
   end
 
   def test_execute_exact_match
-    foo_spec = quick_gem 'foo'
-    foo_bar_spec = quick_gem 'foo_bar'
+    foo_spec = quick_spec 'foo'
+    foo_bar_spec = quick_spec 'foo_bar'
 
     use_ui @ui do
       Dir.chdir @tempdir do

data/test/rubygems/test_gem_commands_update_command.rb

@@ -1,6 +1,12 @@
 require 'rubygems/test_case'
 require 'rubygems/commands/update_command'
 
+begin
+  gem "rdoc"
+rescue Gem::LoadError
+  # ignore
+end
+
 class TestGemCommandsUpdateCommand < Gem::TestCase
 
   def setup
@@ -13,8 +19,8 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
 
     util_setup_fake_fetcher
 
-    @a1_path = File.join @gemhome, 'cache', @a1.file_name
-    @a2_path = File.join @gemhome, 'cache', @a2.file_name
+    @a1_path = Gem.cache_gem(@a1.file_name, @gemhome)
+    @a2_path = Gem.cache_gem(@a2.file_name, @gemhome)
 
     util_setup_spec_fetcher @a1, @a2
 
@@ -30,8 +36,8 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
     Gem::Installer.new(@a1_path).install
 
     @cmd.options[:args] = []
-    @cmd.options[:generate_rdoc] = true
-    @cmd.options[:generate_ri]   = true
+    @cmd.options[:generate_rdoc] = false
+    @cmd.options[:generate_ri]   = false
 
     use_ui @ui do
       @cmd.execute
@@ -42,14 +48,11 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
     assert_equal "Updating #{@a2.name}", out.shift
     assert_equal "Successfully installed #{@a2.full_name}", out.shift
     assert_equal "Gems updated: #{@a2.name}", out.shift
-    assert_equal "Installing ri documentation for a-2...", out.shift
-    assert_equal "Installing RDoc documentation for a-2...", out.shift
-
     assert_empty out
   end
 
   def util_setup_rubygem version
-    gem = quick_gem('rubygems-update', version.to_s) do |s|
+    gem = quick_spec('rubygems-update', version.to_s) do |s|
       s.files = %w[setup.rb]
     end
     write_file File.join(*%W[gems #{gem.original_name} setup.rb])
@@ -72,7 +75,7 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
 
   def util_add_to_fetcher *specs
     specs.each do |spec|
-      gem_file = File.join @gemhome, 'cache', spec.file_name
+      gem_file = Gem.cache_gem(spec.file_name, @gemhome)
 
       @fetcher.data["http://gems.example.com/gems/#{spec.file_name}"] =
         Gem.read_binary gem_file
@@ -201,7 +204,7 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
   def test_execute_dependencies
     @a1.add_dependency 'c', '1.2'
 
-    @c2 = quick_gem 'c', '2' do |s|
+    @c2 = quick_spec 'c', '2' do |s|
       s.files = %w[lib/code.rb]
       s.require_paths = %w[lib]
     end
@@ -209,9 +212,9 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
     @a2.add_dependency 'c', '2'
     @a2.add_dependency 'b', '2'
 
-    @b2_path   = File.join @gemhome, 'cache', @b2.file_name
-    @c1_2_path = File.join @gemhome, 'cache', @c1_2.file_name
-    @c2_path   = File.join @gemhome, 'cache', @c2.file_name
+    @b2_path   = Gem.cache_gem(@b2.file_name, @gemhome)
+    @c1_2_path = Gem.cache_gem(@c1_2.file_name, @gemhome)
+    @c2_path   = Gem.cache_gem(@c2.file_name, @gemhome)
 
     @source_index = Gem::SourceIndex.new
     @source_index.add_spec @a1

data/test/rubygems/test_gem_commands_which_command.rb

@@ -51,7 +51,7 @@ class TestGemCommandsWhichCommand < Gem::TestCase
 
   def util_foo_bar
     files = %w[lib/foo_bar.rb Rakefile]
-    @foo_bar = quick_gem 'foo_bar' do |gem|
+    @foo_bar = quick_spec 'foo_bar' do |gem|
       gem.files = files
     end
 

data/test/rubygems/test_gem_config_file.rb

@@ -277,6 +277,20 @@ class TestGemConfigFile < Gem::TestCase
     assert_equal "701229f217cdf23b1344c7b4b54ca97", @cfg.rubygems_api_key
   end
 
+  def test_load_api_keys_from_config
+    temp_cred = File.join Gem.user_home, '.gem', 'credentials'
+    FileUtils.mkdir File.dirname(temp_cred)
+    File.open temp_cred, 'w' do |fp|
+      fp.puts ":rubygems_api_key: 701229f217cdf23b1344c7b4b54ca97"
+      fp.puts ":other: a5fdbb6ba150cbb83aad2bb2fede64c"
+    end
+
+    util_config_file
+
+    assert_equal({:rubygems => '701229f217cdf23b1344c7b4b54ca97',
+                  :other => 'a5fdbb6ba150cbb83aad2bb2fede64c'}, @cfg.api_keys)
+  end
+
   def util_config_file(args = @cfg_args)
     @cfg = Gem::ConfigFile.new args
   end

data/test/rubygems/test_gem_dependency.rb

@@ -100,6 +100,45 @@ class TestGemDependency < Gem::TestCase
     refute_equal dep("pkg", :development), dep("pkg", :runtime), "type"
   end
 
+  def test_merge
+    a1 = dep 'a', '~> 1.0'
+    a2 = dep 'a', '= 1.0'
+
+    a3 = a1.merge a2
+
+    assert_equal dep('a', '~> 1.0', '= 1.0'), a3
+  end
+
+  def test_merge_default
+    a1 = dep 'a'
+    a2 = dep 'a', '1'
+
+    a3 = a1.merge a2
+
+    assert_equal dep('a', '1'), a3
+  end
+
+  def test_merge_name_mismatch
+    a = dep 'a'
+    b = dep 'b'
+
+    e = assert_raises ArgumentError do
+      a.merge b
+    end
+
+    assert_equal 'a (>= 0) and b (>= 0) have different names',
+                 e.message
+  end
+
+  def test_merge_other_default
+    a1 = dep 'a', '1'
+    a2 = dep 'a'
+
+    a3 = a1.merge a2
+
+    assert_equal dep('a', '1'), a3
+  end
+
   def test_prerelease_eh
     d = dep "pkg", "= 1"
 

data/test/rubygems/test_gem_dependency_installer.rb

@@ -1,65 +1,27 @@
 require 'rubygems/test_case'
 require 'rubygems/dependency_installer'
+require 'rubygems/security'
 
 class TestGemDependencyInstaller < Gem::TestCase
 
   def setup
     super
 
-    @gems_dir = File.join @tempdir, 'gems'
-    @cache_dir = File.join @gemhome, 'cache'
-    FileUtils.mkdir @gems_dir
+    @gems_dir  = File.join @tempdir, 'gems'
+    @cache_dir = Gem.cache_dir(@gemhome)
 
-    write_file File.join('gems', 'a-1', 'bin', 'a_bin') do |fp|
-      fp.puts "#!/usr/bin/ruby"
-    end
+    FileUtils.mkdir @gems_dir
 
-    @a1, @a1_gem = util_gem 'a', '1' do |s| s.executables << 'a_bin' end
-    @aa1, @aa1_gem = util_gem 'aa', '1'
+    @a1, @a1_gem         = util_gem 'a', '1' do |s| s.executables << 'a_bin' end
     @a1_pre, @a1_pre_gem = util_gem 'a', '1.a'
-
-    @b1, @b1_gem = util_gem 'b', '1' do |s|
-      s.add_dependency 'a'
-      s.add_development_dependency 'aa'
-    end
-
-    @b1_pre, @b1_pre_gem = util_gem 'b', '1.a' do |s|
+    @b1, @b1_gem         = util_gem 'b', '1' do |s|
       s.add_dependency 'a'
       s.add_development_dependency 'aa'
     end
 
-    @c1_pre, @c1_pre_gem = util_gem 'c', '1.a' do |s|
-      s.add_dependency 'a', '1.a'
-      s.add_dependency 'b', '1'
-    end
-
-    @d1, @d1_gem = util_gem 'd', '1'
-    @d2, @d2_gem = util_gem 'd', '2'
-
-    @x1_m, @x1_m_gem = util_gem 'x', '1' do |s|
-      s.platform = Gem::Platform.new %w[cpu my_platform 1]
-    end
-
-    @x1_o, @x1_o_gem = util_gem 'x', '1' do |s|
-      s.platform = Gem::Platform.new %w[cpu other_platform 1]
-    end
-
-    @w1, @w1_gem = util_gem 'w', '1', 'x' => nil
-
-    @y1, @y1_gem = util_gem 'y', '1'
-    @y1_1_p, @y1_1_p_gem = util_gem 'y', '1.1' do |s|
-      s.platform = Gem::Platform.new %w[cpu my_platform 1]
-    end
-
-    @z1, @z1_gem = util_gem 'z', '1', 'y' => nil
-
-    @fetcher = Gem::FakeFetcher.new
-    Gem::RemoteFetcher.fetcher = @fetcher
-
-    util_setup_spec_fetcher(@a1, @a1_pre, @b1, @b1_pre, @c1_pre, @d1, @d2,
-                            @x1_m, @x1_o, @w1, @y1, @y1_1_p, @z1)
+    Gem::RemoteFetcher.fetcher = @fetcher = Gem::FakeFetcher.new
 
-    util_clear_gems
+    util_reset_gems
   end
 
   def test_install
@@ -114,8 +76,8 @@ class TestGemDependencyInstaller < Gem::TestCase
 
     assert_equal %w[a-1 b-1], inst.installed_gems.map { |s| s.full_name }
 
-    assert File.exist?(File.join(@tempdir, 'cache', @a1.file_name))
-    assert File.exist?(File.join(@tempdir, 'cache', @b1.file_name))
+    assert Gem.cache_gem(@a1.file_name, @gemhome)
+    assert Gem.cache_gem(@b1.file_name, @gemhome)
   end
 
   def test_install_dependencies_satisfied
@@ -162,6 +124,10 @@ class TestGemDependencyInstaller < Gem::TestCase
   end
 
   def test_install_dependency_development
+    @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
@@ -315,7 +281,7 @@ class TestGemDependencyInstaller < Gem::TestCase
     assert_equal %w[a-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))
+    assert File.exist?(Gem.cache_gem(@a1.file_name, gemhome2))
   end
 
   def test_install_domain_both
@@ -370,12 +336,13 @@ class TestGemDependencyInstaller < Gem::TestCase
     Gem.source_index.remove_spec @a1_pre.full_name
 
     Dir.chdir @tempdir do
-      e = assert_raises Gem::InstallError do
+      e = assert_raises Gem::DependencyError do
         inst = Gem::DependencyInstaller.new :domain => :local
         inst.install 'b'
       end
 
-      assert_equal 'b requires a (>= 0, runtime)', e.message
+      expected = "Unable to resolve dependencies: b requires a (>= 0)"
+      assert_equal expected, e.message
     end
 
     assert_equal [], inst.installed_gems.map { |s| s.full_name }
@@ -419,6 +386,22 @@ class TestGemDependencyInstaller < Gem::TestCase
     assert_equal %w[b-1], inst.installed_gems.map { |s| s.full_name }
   end
 
+  def test_install_reinstall
+    Gem::Installer.new(@a1_gem).install
+    FileUtils.mv @a1_gem, @tempdir
+    inst = nil
+
+    Dir.chdir @tempdir do
+      inst = Gem::DependencyInstaller.new
+      inst.install 'a'
+    end
+
+    assert_equal Gem::SourceIndex.new(@a1.full_name => @a1),
+                 Gem::SourceIndex.from_installed_gems
+
+    assert_equal %w[a-1], inst.installed_gems.map { |s| s.full_name }
+  end
+
   def test_install_remote
     a1_data = nil
     File.open @a1_gem, 'rb' do |fp|
@@ -454,7 +437,7 @@ class TestGemDependencyInstaller < Gem::TestCase
     assert_equal %w[a-1], inst.installed_gems.map { |s| s.full_name }
   end
 
-  def test_install_domain_remote_platform_newer
+  def test_install_remote_platform_newer
     a2_o, a2_o_gem = util_gem 'a', '2' do |s|
       s.platform = Gem::Platform.new %w[cpu other_platform 1]
     end
@@ -482,22 +465,6 @@ class TestGemDependencyInstaller < Gem::TestCase
     assert_equal %w[a-1], inst.installed_gems.map { |s| s.full_name }
   end
 
-  def test_install_reinstall
-    Gem::Installer.new(@a1_gem).install
-    FileUtils.mv @a1_gem, @tempdir
-    inst = nil
-
-    Dir.chdir @tempdir do
-      inst = Gem::DependencyInstaller.new
-      inst.install 'a'
-    end
-
-    assert_equal Gem::SourceIndex.new(@a1.full_name => @a1),
-                 Gem::SourceIndex.from_installed_gems
-
-    assert_equal %w[a-1], inst.installed_gems.map { |s| s.full_name }
-  end
-
   if defined? OpenSSL then
     def test_install_security_policy
       data = File.open(@a1_gem, 'rb') { |f| f.read }
@@ -533,6 +500,8 @@ class TestGemDependencyInstaller < Gem::TestCase
   end
 
   def test_install_version
+    util_setup_d
+
     data = File.open(@d2_gem, 'rb') { |f| f.read }
     @fetcher.data['http://gems.example.com/gems/d-2.gem'] = data
 
@@ -547,6 +516,8 @@ class TestGemDependencyInstaller < Gem::TestCase
   end
 
   def test_install_version_default
+    util_setup_d
+
     data = File.open(@d2_gem, 'rb') { |f| f.read }
     @fetcher.data['http://gems.example.com/gems/d-2.gem'] = data
 
@@ -613,7 +584,22 @@ class TestGemDependencyInstaller < Gem::TestCase
     util_setup_spec_fetcher(*specs)
 
     inst = Gem::DependencyInstaller.new
-    inst.find_spec_by_name_and_version 'a'
+    inst.find_spec_by_name_and_version specs.first.name
+    inst.gather_dependencies
+
+    actual = inst.gems_to_install.map { |s| s.full_name }
+    assert_equal expected, actual
+  end
+
+  def assert_resolve_pre expected, *specs
+    util_clear_gems
+
+    util_setup_spec_fetcher(*specs)
+
+    spec = specs.first
+
+    inst = Gem::DependencyInstaller.new :prerelease => true
+    inst.find_spec_by_name_and_version spec.name, spec.version
     inst.gather_dependencies
 
     actual = inst.gems_to_install.map { |s| s.full_name }
@@ -628,47 +614,182 @@ class TestGemDependencyInstaller < Gem::TestCase
     assert_equal %w[a-1 b-1], inst.gems_to_install.map { |s| s.full_name }
   end
 
+  ##
+  # [A1] depends on
+  #    [B] > 0 (satisfied by 2.0)
+  # [B1] depends on
+  #    [C] > 0 (satisfied by 1.0)
+  # [B2] depends on nothing!
+  # [C1] depends on nothing
+
+  def test_gather_dependencies_dropped
+    a1, = util_spec 'a', '1', 'b' => nil
+    b1, = util_spec 'b', '1', 'c' => nil
+    b2, = util_spec 'b', '2'
+    c1, = util_spec 'c', '1'
+
+    assert_resolve %w[b-2 a-1], a1, b1, b2, c1
+  end
+
+  ##
+  # [A] depends on
+  #     [B] >= 1.0 (satisfied by 1.1) depends on
+  #         [Z]
+  #     [C] >= 1.0 depends on
+  #         [B] = 1.0
+  #
+  # and should backtrack to resolve using b-1.0, pruning Z from the
+  # resolve.
+
+  def test_gather_dependencies_raggi_the_edgecase_generator
+    a,  _ = util_spec 'a', '1.0', 'b' => '>= 1.0', 'c' => '>= 1.0'
+    b1, _ = util_spec 'b', '1.0'
+    b2, _ = util_spec 'b', '1.1', 'z' => '>= 1.0'
+    c,  _ = util_spec 'c', '1.0', 'b' => '= 1.0'
+
+    assert_resolve %w[b-1.0 c-1.0 a-1.0], a, b1, b2, c
+  end
+
+  ##
+  # [A] depends on
+  #     [B] >= 1.0 (satisfied by 2.0)
+  #     [C]  = 1.0 depends on
+  #         [B] ~> 1.0
+  #
+  # and should resolve using b-1.0
+
+  def test_gather_dependencies_over
+    a, _  = util_spec 'a', '1.0', 'b' => '>= 1.0', 'c' => '= 1.0'
+    b1, _ = util_spec 'b', '1.0'
+    b2, _ = util_spec 'b', '2.0'
+    c,  _ = util_spec 'c', '1.0', 'b' => '~> 1.0'
+
+    assert_resolve %w[b-1.0 c-1.0 a-1.0], a, b1, b2, c
+  end
+
+  ##
+  # [A] depends on
+  #     [B] ~> 1.0 (satisfied by 1.1)
+  #     [C]  = 1.0 depends on
+  #         [B] = 1.0
+  #
+  # and should resolve using b-1.0
+  #
+  # TODO: this is not under, but over... under would require depth
+  # first resolve through a dependency that is later pruned.
+
+  def test_gather_dependencies_under
+    a,   _ = util_spec 'a', '1.0', 'b' => '~> 1.0', 'c' => '= 1.0'
+    b10, _ = util_spec 'b', '1.0'
+    b11, _ = util_spec 'b', '1.1'
+    c,   _ = util_spec 'c', '1.0', 'b' => '= 1.0'
+
+    assert_resolve %w[b-1.0 c-1.0 a-1.0], a, b10, b11, c
+  end
+
+  # under
+  #
+  # [A] depends on
+  #     [B] ~> 1.0 (satisfied by 1.0)
+  #     [C]  = 1.0 depends on
+  #         [B] = 2.0
+
+  def test_gather_dependencies_divergent
+    a, _  = util_spec 'a', '1.0', 'b' => '~> 1.0', 'c' => '= 1.0'
+    b1, _ = util_spec 'b', '1.0'
+    b2, _ = util_spec 'b', '2.0'
+    c,  _ = util_spec 'c', '1.0', 'b' => '= 2.0'
+
+    assert_raises Gem::DependencyError do
+      assert_resolve :ignored, a, b1, b2, c
+    end
+  end
+
   def test_gather_dependencies_platform_alternate
+    util_setup_wxyz
     util_set_arch 'cpu-my_platform1'
 
-    inst = Gem::DependencyInstaller.new
-    inst.find_spec_by_name_and_version 'w'
-    inst.gather_dependencies
-
-    assert_equal %w[x-1-cpu-my_platform-1 w-1],
-                 inst.gems_to_install.map { |s| s.full_name }
+    assert_resolve %w[x-1-cpu-my_platform-1 w-1], @w1, @x1_m
   end
 
   def test_gather_dependencies_platform_bump
-    inst = Gem::DependencyInstaller.new
-    inst.find_spec_by_name_and_version 'z'
-    inst.gather_dependencies
+    util_setup_wxyz
 
-    assert_equal %w[y-1 z-1], inst.gems_to_install.map { |s| s.full_name }
+    assert_resolve %w[y-1 z-1], @z1, @y1
   end
 
   def test_gather_dependencies_prerelease
-    inst = Gem::DependencyInstaller.new :prerelease => true
-    inst.find_spec_by_name_and_version 'c', '1.a'
-    inst.gather_dependencies
+    util_setup_c1_pre
 
-    assert_equal %w[a-1.a b-1 c-1.a],
-                 inst.gems_to_install.map { |s| s.full_name }
+    assert_resolve_pre %w[a-1.a b-1 c-1.a], @c1_pre, @a1_pre, @b1
   end
 
   def test_gather_dependencies_old_required
-    e1, = util_gem 'e', '1', 'd' => '= 1'
-
+    util_setup_d
+    e1, = util_spec 'e', '1', 'd' => '= 1'
     util_clear_gems
 
-    util_setup_spec_fetcher @d1, @d2, e1
+    assert_resolve %w[d-1 e-1], e1, @d1, @d2
+  end
 
-    inst = Gem::DependencyInstaller.new
-    inst.find_spec_by_name_and_version 'e'
-    inst.gather_dependencies
+  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
 
-    assert_equal %w[d-1 e-1], inst.gems_to_install.map { |s| s.full_name }
+    util_reset_gems
   end
 
-end
+  def util_setup_d
+    @d1, @d1_gem = util_gem 'd', '1'
+    @d2, @d2_gem = util_gem 'd', '2'
+
+    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
+    @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)
+
+    util_clear_gems
+  end
+end