rubygems-update 1.0.1 → 1.1.0

data/test/test_gem_commands_server_command.rb

@@ -20,7 +20,7 @@ class TestGemCommandsServerCommand < RubyGemTestCase
     @cmd.send :handle_options, %w[-p 9999 -d /nonexistent --daemon]
 
     assert_equal true, @cmd.options[:daemon]
-    assert_equal '/nonexistent', @cmd.options[:gemdir]
+    assert_equal File.expand_path('/nonexistent'), @cmd.options[:gemdir]
     assert_equal 9999, @cmd.options[:port]
   end
 end

data/test/test_gem_commands_sources_command.rb

@@ -31,10 +31,11 @@ class TestGemCommandsSourcesCommand < RubyGemTestCase
   def test_execute_add
     util_setup_fake_fetcher
 
-    @si = Gem::SourceIndex.new @gem1.full_name => @gem1.name
+    si = Gem::SourceIndex.new
+    si.add_spec @a1
 
     @fetcher.data["http://beta-gems.example.com/Marshal.#{@marshal_version}"] =
-      @si.dump
+      si.dump
 
     @cmd.handle_options %w[--add http://beta-gems.example.com]
 
@@ -45,7 +46,7 @@ class TestGemCommandsSourcesCommand < RubyGemTestCase
     end
 
     expected = <<-EOF
-Bulk updating Gem source index for: http://beta-gems.example.com
+Bulk updating Gem source index for: http://beta-gems.example.com/
 http://beta-gems.example.com added to sources
     EOF
 
@@ -60,14 +61,11 @@ http://beta-gems.example.com added to sources
   def test_execute_add_nonexistent_source
     util_setup_fake_fetcher
 
-    @si = Gem::SourceIndex.new @gem1.full_name => @gem1.name
-
     @fetcher.data["http://beta-gems.example.com/Marshal.#{@marshal_version}"] =
       proc do
         raise Gem::RemoteFetcher::FetchError, 'it died'
       end
 
-
     Gem::RemoteFetcher.instance_variable_set :@fetcher, @fetcher
 
     @cmd.handle_options %w[--add http://beta-gems.example.com]
@@ -104,6 +102,41 @@ beta-gems.example.com is not a URI
     assert_equal '', @ui.error
   end
 
+  def test_execute_clear_all
+    @cmd.handle_options %w[--clear-all]
+
+    util_setup_source_info_cache
+
+    cache = Gem::SourceInfoCache.cache
+    cache.update
+    cache.write_cache
+
+    assert File.exist?(cache.system_cache_file),
+           'system cache file'
+    assert File.exist?(cache.latest_system_cache_file),
+           'latest system cache file'
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    expected = <<-EOF
+*** Removed user source cache ***
+*** Removed latest user source cache ***
+*** Removed system source cache ***
+*** Removed latest system source cache ***
+    EOF
+
+    assert_equal expected, @ui.output
+    assert_equal '', @ui.error
+
+    assert !File.exist?(cache.system_cache_file),
+           'system cache file'
+    assert !File.exist?(cache.latest_system_cache_file),
+           'latest system cache file'
+
+  end
+
   def test_execute_remove
     @cmd.handle_options %W[--remove #{@gem_repo}]
 
@@ -122,20 +155,45 @@ beta-gems.example.com is not a URI
     assert_equal [], Gem::SourceInfoCache.cache_data.keys
   end
 
+  def test_execute_remove_no_network
+    @cmd.handle_options %W[--remove #{@gem_repo}]
+
+    util_setup_fake_fetcher
+
+    @fetcher.data["#{@gem_repo}/Marshal.#{Gem.marshal_version}"] = proc do
+      raise Gem::RemoteFetcher::FetchError
+    end
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    expected = "#{@gem_repo} removed from sources\n"
+
+    assert_equal expected, @ui.output
+    assert_equal '', @ui.error
+
+    Gem::SourceInfoCache.cache.flush
+    assert_equal [], Gem::SourceInfoCache.cache_data.keys
+  end
+
   def test_execute_update
     @cmd.handle_options %w[--update]
 
     util_setup_source_info_cache
+    Gem::SourceInfoCache.reset
+
     util_setup_fake_fetcher
-    @si = Gem::SourceIndex.new @gem1.full_name => @gem1.name
-    @fetcher.data["#{@gem_repo}/Marshal.#{@marshal_version}"] = @si.dump
+    si = Gem::SourceIndex.new
+    si.add_spec @a1
+    @fetcher.data["#{@gem_repo}/Marshal.#{@marshal_version}"] = si.dump
 
     use_ui @ui do
       @cmd.execute
     end
 
     expected = <<-EOF
-Bulk updating Gem source index for: #{@gem_repo}
+Bulk updating Gem source index for: #{@gem_repo}/
 source cache successfully updated
     EOF
 

data/test/test_gem_commands_specification_command.rb

@@ -12,6 +12,7 @@ class TestGemCommandsSpecificationCommand < RubyGemTestCase
 
   def test_execute
     foo = quick_gem 'foo'
+    Gem.source_index.add_spec foo
 
     @cmd.options[:args] = %w[foo]
 
@@ -85,8 +86,8 @@ class TestGemCommandsSpecificationCommand < RubyGemTestCase
       @cmd.execute
     end
 
-    assert_equal "#{foo.to_yaml}\n", @ui.output
-    assert_equal "WARNING:  Remote information is not complete\n\n", @ui.error
+    assert_match %r|\A--- !ruby/object:Gem::Specification|, @ui.output
+    assert_match %r|name: foo|, @ui.output
   end
 
 end

data/test/test_gem_commands_unpack_command.rb

@@ -17,15 +17,57 @@ class TestGemCommandsUnpackCommand < RubyGemTestCase
 
     @cmd.options[:args] = %w[a]
 
-      use_ui @ui do
-        Dir.chdir @tempdir do
-          @cmd.execute
-        end
+    use_ui @ui do
+      Dir.chdir @tempdir do
+        @cmd.execute
+      end
+    end
+
+    assert File.exist?(File.join(@tempdir, 'a-2'))
+  end
+
+  def test_execute_gem_path
+    util_make_gems
+
+    Gem.clear_paths
+
+    gemhome2 = File.join @tempdir, 'gemhome2'
+
+    Gem.send :set_paths, [gemhome2, @gemhome].join(File::PATH_SEPARATOR)
+    Gem.send :set_home, gemhome2
+
+    @cmd.options[:args] = %w[a]
+
+    use_ui @ui do
+      Dir.chdir @tempdir do
+        @cmd.execute
       end
+    end
 
     assert File.exist?(File.join(@tempdir, 'a-2'))
   end
 
+  def test_execute_gem_path_missing
+    util_make_gems
+
+    Gem.clear_paths
+
+    gemhome2 = File.join @tempdir, 'gemhome2'
+
+    Gem.send :set_paths, [gemhome2, @gemhome].join(File::PATH_SEPARATOR)
+    Gem.send :set_home, gemhome2
+
+    @cmd.options[:args] = %w[z]
+
+    use_ui @ui do
+      Dir.chdir @tempdir do
+        @cmd.execute
+      end
+    end
+
+    assert_equal '', @ui.output
+  end
+
   def test_execute_with_target_option
     util_make_gems
 

data/test/test_gem_commands_update_command.rb

@@ -0,0 +1,174 @@
+require 'test/unit'
+require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
+require 'rubygems/commands/update_command'
+
+class TestGemCommandsUpdateCommand < RubyGemTestCase
+
+  def setup
+    super
+
+    @cmd = Gem::Commands::UpdateCommand.new
+
+    util_setup_fake_fetcher
+
+    @a1_path = File.join @gemhome, 'cache', "#{@a1.full_name}.gem"
+    @a2_path = File.join @gemhome, 'cache', "#{@a2.full_name}.gem"
+
+    @fetcher.data["#{@gem_repo}/Marshal.#{@marshal_version}"] =
+      @source_index.dump
+    @fetcher.data["#{@gem_repo}/gems/#{@a1.full_name}.gem"] = read_binary @a1_path
+    @fetcher.data["#{@gem_repo}/gems/#{@a2.full_name}.gem"] = read_binary @a2_path
+  end
+
+  def test_execute
+    util_remove_gems
+
+    Gem::Installer.new(@a1_path).install
+
+    @cmd.options[:args] = []
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    out = @ui.output.split "\n"
+    assert_equal "Updating installed gems", out.shift
+    assert_match %r|Bulk updating|, out.shift
+    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 out.empty?, out.inspect
+  end
+
+  # before:
+  #   a1 -> c1.2
+  # after:
+  #   a2 -> b2 # new dependency
+  #   a2 -> c2
+
+  def test_execute_dependencies
+    @a1.add_dependency 'c', '1.2'
+
+    @c2 = quick_gem 'c', '2' do |s|
+      s.files = %w[lib/code.rb]
+      s.require_paths = %w[lib]
+    end
+
+    @a2.add_dependency 'c', '2'
+    @a2.add_dependency 'b', '2'
+
+    @b2_path = File.join @gemhome, 'cache', "#{@b2.full_name}.gem"
+    @c1_2_path = File.join @gemhome, 'cache', "#{@c1_2.full_name}.gem"
+    @c2_path = File.join @gemhome, 'cache', "#{@c2.full_name}.gem"
+
+    @source_index = Gem::SourceIndex.new
+    @source_index.add_spec @a1
+    @source_index.add_spec @a2
+    @source_index.add_spec @b2
+    @source_index.add_spec @c1_2
+    @source_index.add_spec @c2
+
+    util_build_gem @a1
+    util_build_gem @a2
+    util_build_gem @c2
+
+    @fetcher.data["#{@gem_repo}/Marshal.#{@marshal_version}"] =
+      @source_index.dump
+    @fetcher.data["#{@gem_repo}/gems/#{@a1.full_name}.gem"] = read_binary @a1_path
+    @fetcher.data["#{@gem_repo}/gems/#{@a2.full_name}.gem"] = read_binary @a2_path
+    @fetcher.data["#{@gem_repo}/gems/#{@b2.full_name}.gem"] = read_binary @b2_path
+    @fetcher.data["#{@gem_repo}/gems/#{@c1_2.full_name}.gem"] =
+      read_binary @c1_2_path
+    @fetcher.data["#{@gem_repo}/gems/#{@c2.full_name}.gem"] = read_binary @c2_path
+
+    util_remove_gems
+
+    Gem::Installer.new(@c1_2_path).install
+    Gem::Installer.new(@a1_path).install
+
+    @cmd.options[:args] = []
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    out = @ui.output.split "\n"
+    assert_equal "Updating installed gems", out.shift
+    assert_match %r|Bulk updating|, out.shift
+    assert_equal "Updating #{@a2.name}", out.shift
+    assert_equal "Successfully installed #{@c2.full_name}", out.shift
+    assert_equal "Successfully installed #{@b2.full_name}", out.shift
+    assert_equal "Successfully installed #{@a2.full_name}", out.shift
+    assert_equal "Gems updated: #{@c2.name}, #{@b2.name}, #{@a2.name}",
+                 out.shift
+
+    assert out.empty?, out.inspect
+  end
+
+  def test_execute_named
+    util_remove_gems
+
+    Gem::Installer.new(@a1_path).install
+
+    @cmd.options[:args] = [@a1.name]
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    out = @ui.output.split "\n"
+    assert_equal "Updating installed gems", out.shift
+    assert_match %r|Bulk updating|, out.shift
+    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 out.empty?, out.inspect
+  end
+
+  def test_execute_named_up_to_date
+    util_remove_gems
+
+    Gem::Installer.new(@a2_path).install
+
+    @cmd.options[:args] = [@a2.name]
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    out = @ui.output.split "\n"
+    assert_equal "Updating installed gems", out.shift
+    assert_match %r|Bulk updating|, out.shift
+    assert_equal "Nothing to update", out.shift
+
+    assert out.empty?, out.inspect
+  end
+
+  def test_execute_up_to_date
+    util_remove_gems
+
+    Gem::Installer.new(@a2_path).install
+
+    @cmd.options[:args] = []
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    out = @ui.output.split "\n"
+    assert_equal "Updating installed gems", out.shift
+    assert_match %r|Bulk updating|, out.shift
+    assert_equal "Nothing to update", out.shift
+
+    assert out.empty?, out.inspect
+  end
+
+  def util_remove_gems
+    FileUtils.rm_r File.join(@gemhome, 'gems')
+    FileUtils.rm_r File.join(@gemhome, 'specifications')
+  end
+
+end
+

data/test/test_gem_dependency_installer.rb

@@ -54,8 +54,8 @@ class TestGemDependencyInstaller < RubyGemTestCase
     inst = nil
 
     Dir.chdir @tempdir do
-      inst = Gem::DependencyInstaller.new 'a'
-      inst.install
+      inst = Gem::DependencyInstaller.new
+      inst.install 'a'
     end
 
     assert_equal Gem::SourceIndex.new(@a1.full_name => @a1),
@@ -70,8 +70,8 @@ class TestGemDependencyInstaller < RubyGemTestCase
     inst = nil
 
     Dir.chdir @tempdir do
-      inst = Gem::DependencyInstaller.new 'b'
-      inst.install
+      inst = Gem::DependencyInstaller.new
+      inst.install 'b'
     end
 
     assert_equal %w[a-1 b-1], inst.installed_gems.map { |s| s.full_name }
@@ -84,8 +84,8 @@ class TestGemDependencyInstaller < RubyGemTestCase
     inst = nil
 
     Dir.chdir @tempdir do
-      inst = Gem::DependencyInstaller.new 'b'
-      inst.install
+      inst = Gem::DependencyInstaller.new
+      inst.install 'b'
     end
 
     assert_equal %w[b-1], inst.installed_gems.map { |s| s.full_name }
@@ -102,8 +102,8 @@ class TestGemDependencyInstaller < RubyGemTestCase
     inst = nil
 
     Dir.chdir @tempdir do
-      inst = Gem::DependencyInstaller.new 'f'
-      inst.install
+      inst = Gem::DependencyInstaller.new
+      inst.install 'f'
     end
 
     assert_equal %w[f-2], inst.installed_gems.map { |s| s.full_name }
@@ -114,19 +114,49 @@ class TestGemDependencyInstaller < RubyGemTestCase
     inst = nil
 
     Dir.chdir @tempdir do
-      inst = Gem::DependencyInstaller.new 'a-1.gem'
-      inst.install
+      inst = Gem::DependencyInstaller.new :domain => :local
+      inst.install 'a-1.gem'
     end
 
     assert_equal %w[a-1], inst.installed_gems.map { |s| s.full_name }
   end
 
+  def test_install_local_dependency
+    FileUtils.mv @a1_gem, @tempdir
+    FileUtils.mv @b1_gem, @tempdir
+
+    inst = nil
+
+    Dir.chdir @tempdir do
+      inst = Gem::DependencyInstaller.new :domain => :local
+      inst.install 'b-1.gem'
+    end
+
+    assert_equal %w[a-1 b-1], inst.installed_gems.map { |s| s.full_name }
+  end
+
+  def test_install_local_dependency_installed
+    FileUtils.mv @a1_gem, @tempdir
+    FileUtils.mv @b1_gem, @tempdir
+
+    inst = nil
+
+    Dir.chdir @tempdir do
+      Gem::Installer.new('a-1.gem').install
+
+      inst = Gem::DependencyInstaller.new :domain => :local
+      inst.install 'b-1.gem'
+    end
+
+    assert_equal %w[b-1], inst.installed_gems.map { |s| s.full_name }
+  end
+
   def test_install_local_subdir
     inst = nil
-    
+
     Dir.chdir @tempdir do
-      inst = Gem::DependencyInstaller.new 'gems/a-1.gem'
-      inst.install
+      inst = Gem::DependencyInstaller.new :domain => :local
+      inst.install 'gems/a-1.gem'
     end
 
     assert_equal %w[a-1], inst.installed_gems.map { |s| s.full_name }
@@ -137,12 +167,11 @@ class TestGemDependencyInstaller < RubyGemTestCase
     inst = nil
 
     Dir.chdir @tempdir do
-      inst = Gem::DependencyInstaller.new 'a', nil, :env_shebang => true,
-                                          :wrappers => true
-      inst.install
+      inst = Gem::DependencyInstaller.new :env_shebang => true, :wrappers => true
+      inst.install 'a'
     end
 
-    assert_match %r|\A#!/usr/bin/env ruby\n|,
+    assert_match %r|\A#!/usr/bin/env #{Gem::ConfigMap[:RUBY_INSTALL_NAME]}\n|,
                  File.read(File.join(@gemhome, 'bin', 'a_bin'))
   end
 
@@ -153,8 +182,8 @@ class TestGemDependencyInstaller < RubyGemTestCase
     inst = nil
 
     Dir.chdir @tempdir do
-      inst = Gem::DependencyInstaller.new 'b', nil, :force => true
-      inst.install
+      inst = Gem::DependencyInstaller.new :force => true
+      inst.install 'b'
     end
 
     assert_equal %w[b-1], inst.installed_gems.map { |s| s.full_name }
@@ -165,8 +194,8 @@ class TestGemDependencyInstaller < RubyGemTestCase
     inst = nil
 
     Dir.chdir @tempdir do
-      inst = Gem::DependencyInstaller.new 'b', nil, :ignore_dependencies => true
-      inst.install
+      inst = Gem::DependencyInstaller.new :ignore_dependencies => true
+      inst.install 'b'
     end
 
     assert_equal %w[b-1], inst.installed_gems.map { |s| s.full_name }
@@ -179,8 +208,8 @@ class TestGemDependencyInstaller < RubyGemTestCase
     inst = nil
 
     Dir.chdir @tempdir do
-      inst = Gem::DependencyInstaller.new 'a', nil, :install_dir => gemhome2
-      inst.install
+      inst = Gem::DependencyInstaller.new :install_dir => gemhome2
+      inst.install 'a'
     end
 
     assert_equal %w[a-1], inst.installed_gems.map { |s| s.full_name }
@@ -201,8 +230,8 @@ class TestGemDependencyInstaller < RubyGemTestCase
     inst = nil
 
     Dir.chdir @tempdir do
-      inst = Gem::DependencyInstaller.new 'b', nil, :domain => :both
-      inst.install
+      inst = Gem::DependencyInstaller.new :domain => :both
+      inst.install 'b'
     end
 
     assert_equal %w[a-1 b-1], inst.installed_gems.map { |s| s.full_name }
@@ -217,14 +246,34 @@ class TestGemDependencyInstaller < RubyGemTestCase
     assert_equal b1_expected, b1.loaded_from
   end
 
+  def test_install_domain_both_no_network
+    Gem::SourceInfoCache.instance_variable_set :@cache, nil
+
+    @fetcher.data["http://gems.example.com/gems/Marshal.#{@marshal_version}"] =
+      proc do
+        raise Gem::RemoteFetcher::FetchError
+      end
+
+    FileUtils.mv @a1_gem, @tempdir
+    FileUtils.mv @b1_gem, @tempdir
+    inst = nil
+
+    Dir.chdir @tempdir do
+      inst = Gem::DependencyInstaller.new :domain => :both
+      inst.install 'b'
+    end
+
+    assert_equal %w[a-1 b-1], inst.installed_gems.map { |s| s.full_name }
+  end
+
   def test_install_domain_local
     FileUtils.mv @b1_gem, @tempdir
     inst = nil
 
     Dir.chdir @tempdir do
       e = assert_raise Gem::InstallError do
-        inst = Gem::DependencyInstaller.new 'b', nil, :domain => :local
-        inst.install
+        inst = Gem::DependencyInstaller.new :domain => :local
+        inst.install 'b'
       end
       assert_equal 'b requires a (>= 0)', e.message
     end
@@ -240,8 +289,43 @@ class TestGemDependencyInstaller < RubyGemTestCase
 
     @fetcher.data['http://gems.example.com/gems/a-1.gem'] = a1_data
 
-    inst = Gem::DependencyInstaller.new 'a', nil, :domain => :remote
-    inst.install
+    inst = Gem::DependencyInstaller.new :domain => :remote
+    inst.install 'a'
+
+    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|
+      a1_data = fp.read
+    end
+
+    @fetcher.data['http://gems.example.com/gems/a-1.gem'] = a1_data
+
+    inst = Gem::DependencyInstaller.new
+
+    Dir.chdir @tempdir do
+      inst.install 'a'
+    end
+
+    assert_equal %w[a-1], inst.installed_gems.map { |s| s.full_name }
+  end
+
+  def test_install_remote_dep
+    a1_data = nil
+    File.open @a1_gem, 'rb' do |fp|
+      a1_data = fp.read
+    end
+
+    @fetcher.data['http://gems.example.com/gems/a-1.gem'] = a1_data
+
+    inst = Gem::DependencyInstaller.new
+
+    Dir.chdir @tempdir do
+      dep = Gem::Dependency.new @a1.name, @a1.version
+      inst.install dep
+    end
 
     assert_equal %w[a-1], inst.installed_gems.map { |s| s.full_name }
   end
@@ -266,8 +350,8 @@ class TestGemDependencyInstaller < RubyGemTestCase
     @fetcher.data["http://gems.example.com/gems/#{a2_o.full_name}.gem"] =
       a2_o_data
 
-    inst = Gem::DependencyInstaller.new 'a', nil, :domain => :remote
-    inst.install
+    inst = Gem::DependencyInstaller.new :domain => :remote
+    inst.install 'a'
 
     assert_equal %w[a-1], inst.installed_gems.map { |s| s.full_name }
   end
@@ -278,8 +362,8 @@ class TestGemDependencyInstaller < RubyGemTestCase
     inst = nil
 
     Dir.chdir @tempdir do
-      inst = Gem::DependencyInstaller.new 'a'
-      inst.install
+      inst = Gem::DependencyInstaller.new
+      inst.install 'a'
     end
 
     assert_equal Gem::SourceIndex.new(@a1.full_name => @a1),
@@ -288,160 +372,69 @@ class TestGemDependencyInstaller < RubyGemTestCase
     assert_equal %w[a-1], inst.installed_gems.map { |s| s.full_name }
   end
 
-  def test_install_security_policy
-    FileUtils.mv @a1_gem, @cache_dir
-    FileUtils.mv @b1_gem, @cache_dir
-    policy = Gem::Security::HighSecurity
-    inst = Gem::DependencyInstaller.new 'b', nil, :security_policy => policy
-
-    e = assert_raise Gem::Exception do
-      inst.install
-    end
-
-    assert_equal 'Unsigned gem', e.message
-
-    assert_equal %w[], inst.installed_gems.map { |s| s.full_name }
-  end
-
-  def test_install_wrappers
-    FileUtils.mv @a1_gem, @cache_dir
-    inst = Gem::DependencyInstaller.new 'a', :wrappers => true
+  if defined? OpenSSL then
+    def test_install_security_policy
+      data = File.open(@a1_gem, 'rb') { |f| f.read }
+      @fetcher.data['http://gems.example.com/gems/a-1.gem'] = data
 
-    inst.install
+      data = File.open(@b1_gem, 'rb') { |f| f.read }
+      @fetcher.data['http://gems.example.com/gems/b-1.gem'] = data
 
-    assert_match %r|This file was generated by RubyGems.|,
-                 File.read(File.join(@gemhome, 'bin', 'a_bin'))
-  end
-
-  def test_install_version
-    FileUtils.mv @d1_gem, @cache_dir
-    FileUtils.mv @d2_gem, @cache_dir
-    inst = Gem::DependencyInstaller.new 'd', '= 1'
+      policy = Gem::Security::HighSecurity
+      inst = Gem::DependencyInstaller.new :security_policy => policy
 
-    inst.install
-
-    assert_equal %w[d-1], inst.installed_gems.map { |s| s.full_name }
-  end
-
-  def test_install_version_default
-    FileUtils.mv @d1_gem, @cache_dir
-    FileUtils.mv @d2_gem, @cache_dir
-    inst = Gem::DependencyInstaller.new 'd'
+      e = assert_raise Gem::Exception do
+        inst.install 'b'
+      end
 
-    inst.install
+      assert_equal 'Unsigned gem', e.message
 
-    assert_equal %w[d-2], inst.installed_gems.map { |s| s.full_name }
-  end
-
-  def test_download
-    a1_data = nil
-    File.open @a1_gem, 'rb' do |fp|
-      a1_data = fp.read
+      assert_equal %w[], inst.installed_gems.map { |s| s.full_name }
     end
-
-    @fetcher.data['http://gems.example.com/gems/a-1.gem'] = a1_data
-
-    inst = Gem::DependencyInstaller.new 'a'
-
-    a1_cache_gem = File.join(@gemhome, 'cache', "#{@a1.full_name}.gem")
-    assert_equal a1_cache_gem, inst.download(@a1, 'http://gems.example.com')
-
-    assert File.exist?(a1_cache_gem)
   end
 
-  def test_download_cached
-    FileUtils.mv @a1_gem, @cache_dir
-
-    inst = Gem::DependencyInstaller.new 'a'
-
-    assert_equal File.join(@gemhome, 'cache', "#{@a1.full_name}.gem"),
-                 inst.download(@a1, 'http://gems.example.com')
-  end
+  # Wrappers don't work on mswin
+  unless win_platform? then
+    def test_install_no_wrappers
+      @fetcher.data['http://gems.example.com/gems/a-1.gem'] = read_binary(@a1_gem)
 
-  def test_download_local
-    FileUtils.mv @a1_gem, @tempdir
-    local_path = File.join @tempdir, "#{@a1.full_name}.gem"
-    inst = nil
+      inst = Gem::DependencyInstaller.new :wrappers => false
+      inst.install 'a'
 
-    Dir.chdir @tempdir do
-      inst = Gem::DependencyInstaller.new 'a'
+      assert_no_match(%r|This file was generated by RubyGems.|,
+                      File.read(File.join(@gemhome, 'bin', 'a_bin')))
     end
-
-    assert_equal File.join(@gemhome, 'cache', "#{@a1.full_name}.gem"),
-                 inst.download(@a1, local_path)
   end
 
-  def test_download_install_dir
-    a1_data = nil
-    File.open @a1_gem, 'rb' do |fp|
-      a1_data = fp.read
-    end
-
-    @fetcher.data['http://gems.example.com/gems/a-1.gem'] = a1_data
-
-    install_dir = File.join @tempdir, 'more_gems'
-
-    inst = Gem::DependencyInstaller.new 'a', nil, :install_dir => install_dir
-
-    a1_cache_gem = File.join install_dir, 'cache', "#{@a1.full_name}.gem"
-    assert_equal a1_cache_gem, inst.download(@a1, 'http://gems.example.com')
+  def test_install_version
+    data = File.open(@d2_gem, 'rb') { |f| f.read }
+    @fetcher.data['http://gems.example.com/gems/d-2.gem'] = data
 
-    assert File.exist?(a1_cache_gem)
-  end
+    data = File.open(@d1_gem, 'rb') { |f| f.read }
+    @fetcher.data['http://gems.example.com/gems/d-1.gem'] = data
 
-  unless win_platform? then # File.chmod doesn't work
-    def test_download_local_read_only
-      FileUtils.mv @a1_gem, @tempdir
-      local_path = File.join @tempdir, "#{@a1.full_name}.gem"
-      inst = nil
-      File.chmod 0555, File.join(@gemhome, 'cache')
+    inst = Gem::DependencyInstaller.new
 
-      Dir.chdir @tempdir do
-        inst = Gem::DependencyInstaller.new 'a'
-      end
+    inst.install 'd', '= 1'
 
-      assert_equal File.join(@tempdir, "#{@a1.full_name}.gem"),
-        inst.download(@a1, local_path)
-    ensure
-      File.chmod 0755, File.join(@gemhome, 'cache')
-    end
+    assert_equal %w[d-1], inst.installed_gems.map { |s| s.full_name }
   end
 
-  def test_download_platform_legacy
-    original_platform = 'old-platform'
-
-    e1, e1_gem = util_gem 'e', '1' do |s|
-      s.platform = Gem::Platform::CURRENT
-      s.instance_variable_set :@original_platform, original_platform
-    end
-
-    e1_data = nil
-    File.open e1_gem, 'rb' do |fp|
-      e1_data = fp.read
-    end
-
-    @fetcher.data["http://gems.example.com/gems/e-1-#{original_platform}.gem"] = e1_data
-
-    inst = Gem::DependencyInstaller.new 'a'
-
-    e1_cache_gem = File.join(@gemhome, 'cache', "#{e1.full_name}.gem")
-    assert_equal e1_cache_gem, inst.download(e1, 'http://gems.example.com')
-
-    assert File.exist?(e1_cache_gem)
-  end
+  def test_install_version_default
+    data = File.open(@d2_gem, 'rb') { |f| f.read }
+    @fetcher.data['http://gems.example.com/gems/d-2.gem'] = data
 
-  def test_download_unsupported
-    inst = Gem::DependencyInstaller.new 'a'
+    data = File.open(@d1_gem, 'rb') { |f| f.read }
+    @fetcher.data['http://gems.example.com/gems/d-1.gem'] = data
 
-    e = assert_raise Gem::InstallError do
-      inst.download @a1, 'ftp://gems.rubyforge.org'
-    end
+    inst = Gem::DependencyInstaller.new
+    inst.install 'd'
 
-    assert_equal 'unsupported URI scheme ftp', e.message
+    assert_equal %w[d-2], inst.installed_gems.map { |s| s.full_name }
   end
 
   def test_find_gems_gems_with_sources
-    inst = Gem::DependencyInstaller.new 'a'
+    inst = Gem::DependencyInstaller.new
     dep = Gem::Dependency.new 'b', '>= 0'
 
     assert_equal [[@b1, 'http://gems.example.com']],
@@ -450,7 +443,7 @@ class TestGemDependencyInstaller < RubyGemTestCase
 
   def test_find_gems_with_sources_local
     FileUtils.mv @a1_gem, @tempdir
-    inst = Gem::DependencyInstaller.new 'b'
+    inst = Gem::DependencyInstaller.new
     dep = Gem::Dependency.new 'a', '>= 0'
     gems = nil
 
@@ -460,7 +453,7 @@ class TestGemDependencyInstaller < RubyGemTestCase
 
     assert_equal 2, gems.length
     remote = gems.first
-    assert_equal @a1, remote.first, 'remote spec'
+    assert_equal 'a-1', remote.first.full_name, 'remote spec'
     assert_equal 'http://gems.example.com', remote.last, 'remote path'
 
     local = gems.last
@@ -470,7 +463,9 @@ class TestGemDependencyInstaller < RubyGemTestCase
   end
 
   def test_gather_dependencies
-    inst = Gem::DependencyInstaller.new 'b'
+    inst = Gem::DependencyInstaller.new
+    inst.find_spec_by_name_and_version 'b'
+    inst.gather_dependencies
 
     assert_equal %w[a-1 b-1], inst.gems_to_install.map { |s| s.full_name }
   end
@@ -486,7 +481,9 @@ class TestGemDependencyInstaller < RubyGemTestCase
     @fetcher.uri = URI.parse 'http://gems.example.com'
     @fetcher.data['http://gems.example.com/gems/yaml'] = si.to_yaml
 
-    inst = Gem::DependencyInstaller.new 'c'
+    inst = Gem::DependencyInstaller.new
+    inst.find_spec_by_name_and_version 'c'
+    inst.gather_dependencies
 
     assert_equal %w[b-2 c-1], inst.gems_to_install.map { |s| s.full_name }
   end
@@ -494,14 +491,18 @@ class TestGemDependencyInstaller < RubyGemTestCase
   def test_gather_dependencies_platform_alternate
     util_set_arch 'cpu-my_platform1'
 
-    inst = Gem::DependencyInstaller.new 'w'
+    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 }
   end
 
   def test_gather_dependencies_platform_bump
-    inst = Gem::DependencyInstaller.new 'z'
+    inst = Gem::DependencyInstaller.new
+    inst.find_spec_by_name_and_version 'z'
+    inst.gather_dependencies
 
     assert_equal %w[y-1 z-1], inst.gems_to_install.map { |s| s.full_name }
   end
@@ -516,27 +517,11 @@ class TestGemDependencyInstaller < RubyGemTestCase
     @fetcher.uri = URI.parse 'http://gems.example.com'
     @fetcher.data['http://gems.example.com/gems/yaml'] = si.to_yaml
 
-    inst = Gem::DependencyInstaller.new 'e'
+    inst = Gem::DependencyInstaller.new
+    inst.find_spec_by_name_and_version 'e'
+    inst.gather_dependencies
 
     assert_equal %w[d-1 e-1], inst.gems_to_install.map { |s| s.full_name }
   end
-
-  def util_gem(name, version, &block)
-    spec = quick_gem(name, version, &block)
-
-    util_build_gem spec
-
-    cache_file = File.join @tempdir, 'gems', "#{spec.original_name}.gem"
-    FileUtils.mv File.join(@gemhome, 'cache', "#{spec.original_name}.gem"),
-                 cache_file
-    FileUtils.rm File.join(@gemhome, 'specifications',
-                           "#{spec.full_name}.gemspec")
-
-    spec.loaded_from = nil
-    spec.loaded = false
-
-    [spec, cache_file]
-  end
-
 end