rubygems-update 1.5.3 → 1.6.0

data/test/rubygems/test_gem_dependency_list.rb

@@ -8,17 +8,17 @@ class TestGemDependencyList < Gem::TestCase
 
     @deplist = Gem::DependencyList.new
 
-    @a1 = quick_gem 'a', '1'
-    @a2 = quick_gem 'a', '2'
-    @a3 = quick_gem 'a', '3'
+    @a1 = quick_spec 'a', '1'
+    @a2 = quick_spec 'a', '2'
+    @a3 = quick_spec 'a', '3'
 
-    @b1 = quick_gem 'b', '1' do |s| s.add_dependency 'a', '>= 1' end
-    @b2 = quick_gem 'b', '2' do |s| s.add_dependency 'a', '>= 1' end
+    @b1 = quick_spec 'b', '1' do |s| s.add_dependency 'a', '>= 1' end
+    @b2 = quick_spec 'b', '2' do |s| s.add_dependency 'a', '>= 1' end
 
-    @c1 = quick_gem 'c', '1' do |s| s.add_dependency 'b', '>= 1' end
-    @c2 = quick_gem 'c', '2'
+    @c1 = quick_spec 'c', '1' do |s| s.add_dependency 'b', '>= 1' end
+    @c2 = quick_spec 'c', '2'
 
-    @d1 = quick_gem 'd', '1' do |s| s.add_dependency 'c', '>= 1' end
+    @d1 = quick_spec 'd', '1' do |s| s.add_dependency 'c', '>= 1' end
   end
 
   def test_self_from_source_index
@@ -66,9 +66,9 @@ class TestGemDependencyList < Gem::TestCase
   end
 
   def test_dependency_order_development
-    e1 = quick_gem 'e', '1'
-    f1 = quick_gem 'f', '1'
-    g1 = quick_gem 'g', '1'
+    e1 = quick_spec 'e', '1'
+    f1 = quick_spec 'f', '1'
+    g1 = quick_spec 'g', '1'
 
     @a1.add_dependency 'e'
     @a1.add_dependency 'f'
@@ -94,7 +94,7 @@ class TestGemDependencyList < Gem::TestCase
 
   def test_dependency_order_diamond
     util_diamond
-    e1 = quick_gem 'e', '1'
+    e1 = quick_spec 'e', '1'
     @deplist.add e1
     @a1.add_dependency 'e', '>= 1'
 
@@ -122,6 +122,8 @@ class TestGemDependencyList < Gem::TestCase
   end
 
   def test_ok_eh
+    util_clear_gems
+
     assert @deplist.ok?, 'no dependencies'
 
     @deplist.add @b2
@@ -133,14 +135,30 @@ class TestGemDependencyList < Gem::TestCase
     assert @deplist.ok?, 'satisfied dependency'
   end
 
+  def test_why_not_ok_eh
+    util_clear_gems
+
+    assert_equal({},  @deplist.why_not_ok?)
+
+    @deplist.add @b2
+
+    exp = {
+      "b" => [
+              Gem::Dependency.new("a", ">= 1")
+             ]
+    }
+
+    assert_equal exp, @deplist.why_not_ok?
+  end
+
   def test_ok_eh_mismatch
-    a1 = quick_gem 'a', '1'
-    a2 = quick_gem 'a', '2'
+    a1 = quick_spec 'a', '1'
+    a2 = quick_spec 'a', '2'
 
-    b = quick_gem 'b', '1' do |s| s.add_dependency 'a', '= 1' end
-    c = quick_gem 'c', '1' do |s| s.add_dependency 'a', '= 2' end
+    b = quick_spec 'b', '1' do |s| s.add_dependency 'a', '= 1' end
+    c = quick_spec 'c', '1' do |s| s.add_dependency 'a', '= 2' end
 
-    d = quick_gem 'd', '1' do |s|
+    d = quick_spec 'd', '1' do |s|
       s.add_dependency 'b'
       s.add_dependency 'c'
     end
@@ -186,6 +204,8 @@ class TestGemDependencyList < Gem::TestCase
   end
 
   def test_remove_by_name
+    util_clear_gems
+
     @deplist.add @a1, @b2
 
     @deplist.remove_by_name "a-1"

data/test/rubygems/test_gem_doc_manager.rb

@@ -6,25 +6,26 @@ class TestGemDocManager < Gem::TestCase
   def setup
     super
 
-    @spec = quick_gem 'a'
+    @spec = quick_gem 'a', 2
     @manager = Gem::DocManager.new(@spec)
   end
 
   def test_uninstall_doc_unwritable
-    orig_mode = File.stat(@spec.installation_path).mode
+    path = @spec.installation_path
+    orig_mode = File.stat(path).mode
 
     # File.chmod has no effect on MS Windows directories (it needs ACL).
     if win_platform?
       skip("test_uninstall_doc_unwritable skipped on MS Windows")
     else
-      File.chmod(0, @spec.installation_path)
+      File.chmod 0000, path
     end
 
     assert_raises Gem::FilePermissionError do
       @manager.uninstall_doc
     end
   ensure
-    File.chmod orig_mode, @spec.installation_path
+    File.chmod orig_mode, path
   end
 
 end

data/test/rubygems/test_gem_format.rb

@@ -1,5 +1,5 @@
 require 'rubygems/package/tar_test_case'
-require 'test/rubygems/simple_gem'
+require 'rubygems/simple_gem'
 require 'rubygems/format'
 
 class TestGemFormat < Gem::Package::TarTestCase
@@ -14,7 +14,7 @@ class TestGemFormat < Gem::Package::TarTestCase
   def test_class_from_file_by_path
     util_make_gems
 
-    gems = Dir[File.join(@gemhome, 'cache', '*.gem')]
+    gems = Dir[Gem.cache_gem('*.gem', @gemhome)]
 
     names = [@a1, @a2, @a3a, @a_evil9, @b2, @c1_2, @pl1].map do |spec|
       spec.original_name

data/test/rubygems/test_gem_gemcutter_utilities.rb

@@ -1,5 +1,6 @@
 require 'rubygems/test_case'
 require 'rubygems'
+require 'rubygems/command'
 require 'rubygems/gemcutter_utilities'
 
 class TestGemGemcutterUtilities < Gem::TestCase
@@ -14,6 +15,35 @@ class TestGemGemcutterUtilities < Gem::TestCase
     @cmd.extend Gem::GemcutterUtilities
   end
 
+  def test_api_key
+    keys = { :rubygems_api_key => 'KEY' }
+    FileUtils.mkdir_p File.dirname Gem.configuration.credentials_path
+
+    open Gem.configuration.credentials_path, 'w' do |f|
+      f.write keys.to_yaml
+    end
+
+    Gem.configuration.load_api_keys
+
+    assert_equal 'KEY', @cmd.api_key
+  end
+
+  def test_api_key_override
+    keys = { :rubygems_api_key => 'KEY', :other => 'OTHER' }
+    FileUtils.mkdir_p File.dirname Gem.configuration.credentials_path
+
+    open Gem.configuration.credentials_path, 'w' do |f|
+      f.write keys.to_yaml
+    end
+
+    Gem.configuration.load_api_keys
+
+    @cmd.add_key_option
+    @cmd.handle_options %w[--key other]
+
+    assert_equal 'OTHER', @cmd.api_key
+  end
+
   def test_sign_in
     api_key     = 'a5fdbb6ba150cbb83aad2bb2fede64cf040453903'
     util_sign_in [api_key, 200, 'OK']
@@ -99,5 +129,23 @@ class TestGemGemcutterUtilities < Gem::TestCase
     end
   end
 
+  def test_verify_api_key
+    keys = {:other => 'a5fdbb6ba150cbb83aad2bb2fede64cf040453903'}
+    FileUtils.mkdir_p File.dirname(Gem.configuration.credentials_path)
+    File.open Gem.configuration.credentials_path, 'w' do |f|
+      f.write keys.to_yaml
+    end
+    Gem.configuration.load_api_keys
+
+    assert_equal 'a5fdbb6ba150cbb83aad2bb2fede64cf040453903',
+                 @cmd.verify_api_key(:other)
+  end
+
+  def test_verify_missing_api_key
+    assert_raises Gem::MockGemUi::TermError do
+      @cmd.verify_api_key :missing
+    end
+  end
+
 end
 

data/test/rubygems/test_gem_indexer.rb

@@ -12,21 +12,22 @@ class TestGemIndexer < Gem::TestCase
 
     util_make_gems
 
-    @d2_0 = quick_gem 'd', '2.0' do |s|
+    @d2_0 = quick_spec 'd', '2.0' do |s|
       s.date = Gem::Specification::TODAY - 86400 * 3
     end
     util_build_gem @d2_0
 
-    @d2_0_a = quick_gem 'd', '2.0.a'
+    @d2_0_a = quick_spec 'd', '2.0.a'
     util_build_gem @d2_0_a
 
-    @d2_0_b = quick_gem 'd', '2.0.b'
+    @d2_0_b = quick_spec 'd', '2.0.b'
     util_build_gem @d2_0_b
 
+    @tempdir = File.join(@tempdir, 'indexer')
+
     gems = File.join(@tempdir, 'gems')
     FileUtils.mkdir_p gems
-    cache_gems = File.join @gemhome, 'cache', '*.gem'
-    FileUtils.mv Dir[cache_gems], gems
+    FileUtils.mv Dir[Gem.cache_gem('*.gem', @gemhome)], gems
 
     @indexer = Gem::Indexer.new @tempdir, :rss_title => 'ExampleForge gems',
                                 :rss_host => 'example.com',
@@ -54,7 +55,7 @@ class TestGemIndexer < Gem::TestCase
   end
 
   def test_build_indicies
-    spec = quick_gem 'd', '2.0'
+    spec = quick_spec 'd', '2.0'
     spec.instance_variable_set :@original_platform, ''
 
     @indexer.make_temp_directories
@@ -504,17 +505,17 @@ eighty characters.&lt;/pre&gt;
     assert File.directory?(quickdir)
     assert File.directory?(marshal_quickdir)
 
-    @d2_1 = quick_gem 'd', '2.1'
+    @d2_1 = quick_spec 'd', '2.1'
     util_build_gem @d2_1
     @d2_1_tuple = [@d2_1.name, @d2_1.version, @d2_1.original_platform]
 
-    @d2_1_a = quick_gem 'd', '2.2.a'
+    @d2_1_a = quick_spec 'd', '2.2.a'
     util_build_gem @d2_1_a
     @d2_1_a_tuple = [@d2_1_a.name, @d2_1_a.version, @d2_1_a.original_platform]
 
     gems = File.join @tempdir, 'gems'
-    FileUtils.mv File.join(@gemhome, 'cache', @d2_1.file_name), gems
-    FileUtils.mv File.join(@gemhome, 'cache', @d2_1_a.file_name), gems
+    FileUtils.mv Gem.cache_gem(@d2_1.file_name, @gemhome), gems
+    FileUtils.mv Gem.cache_gem(@d2_1_a.file_name, @gemhome), gems
 
     use_ui @ui do
       @indexer.update_index

data/test/rubygems/test_gem_install_update_options.rb

@@ -63,6 +63,4 @@ class TestGemInstallUpdateOptions < Gem::InstallerTestCase
   ensure
     FileUtils.chmod 0755, @gemhome
   end
-
 end
-

data/test/rubygems/test_gem_installer.rb

@@ -3,7 +3,8 @@ require 'rubygems/installer_test_case'
 class TestGemInstaller < Gem::InstallerTestCase
 
   def test_app_script_text
-    util_make_exec '2', ''
+    @spec.version = 2
+    util_make_exec @spec, ''
 
     expected = <<-EOF
 #!#{Gem.ruby}
@@ -24,10 +25,10 @@ if ARGV.first =~ /^_(.*)_$/ and Gem::Version.correct? $1 then
 end
 
 gem 'a', version
-load Gem.bin_path('a', 'my_exec', version)
+load Gem.bin_path('a', 'executable', version)
     EOF
 
-    wrapper = @installer.app_script_text 'my_exec'
+    wrapper = @installer.app_script_text 'executable'
     assert_equal expected, wrapper
   end
 
@@ -95,7 +96,7 @@ load Gem.bin_path('a', 'my_exec', version)
       @installer.ensure_dependency @spec, dep
     end
 
-    assert_equal 'a requires b (> 2, runtime)', e.message
+    assert_equal 'a requires b (> 2)', e.message
   end
 
   def test_extract_files
@@ -164,11 +165,11 @@ load Gem.bin_path('a', 'my_exec', version)
   def test_generate_bin_bindir
     @installer.wrappers = true
 
-    @spec.executables = ["my_exec"]
+    @spec.executables = %w[executable]
     @spec.bindir = '.'
 
-    exec_file = @installer.formatted_program_filename "my_exec"
-    exec_path = File.join util_gem_dir(@spec.version), exec_file
+    exec_file = @installer.formatted_program_filename 'executable'
+    exec_path = File.join util_gem_dir(@spec), exec_file
     File.open exec_path, 'w' do |f|
       f.puts '#!/usr/bin/ruby'
     end
@@ -178,7 +179,7 @@ load Gem.bin_path('a', 'my_exec', version)
     @installer.generate_bin
 
     assert_equal true, File.directory?(util_inst_bindir)
-    installed_exec = File.join(util_inst_bindir, "my_exec")
+    installed_exec = File.join(util_inst_bindir, 'executable')
     assert_equal true, File.exist?(installed_exec)
     assert_equal(0100755, File.stat(installed_exec).mode) unless win_platform?
 
@@ -193,7 +194,7 @@ load Gem.bin_path('a', 'my_exec', version)
 
     @installer.generate_bin
     assert_equal true, File.directory?(util_inst_bindir)
-    installed_exec = File.join(util_inst_bindir, "my_exec")
+    installed_exec = File.join(util_inst_bindir, 'executable')
     assert_equal true, File.exist?(installed_exec)
     assert_equal(0100755, File.stat(installed_exec).mode) unless win_platform?
 
@@ -210,7 +211,7 @@ load Gem.bin_path('a', 'my_exec', version)
     Gem::Installer.exec_format = 'foo-%s-bar'
     @installer.generate_bin
     assert_equal true, File.directory?(util_inst_bindir)
-    installed_exec = File.join util_inst_bindir, 'foo-my_exec-bar'
+    installed_exec = File.join util_inst_bindir, 'foo-executable-bar'
     assert_equal true, File.exist?(installed_exec)
   ensure
     Gem::Installer.exec_format = nil
@@ -224,7 +225,7 @@ load Gem.bin_path('a', 'my_exec', version)
     Gem::Installer.exec_format = 'foo-%s-bar'
     @installer.generate_bin
     assert_equal true, File.directory?(util_inst_bindir)
-    installed_exec = File.join util_inst_bindir, 'my_exec'
+    installed_exec = File.join util_inst_bindir, 'executable'
     assert_equal true, File.exist?(installed_exec)
   ensure
     Gem::Installer.exec_format = nil
@@ -232,12 +233,12 @@ load Gem.bin_path('a', 'my_exec', version)
 
   def test_generate_bin_script_install_dir
     @installer.wrappers = true
-    @spec.executables = ["my_exec"]
+    @spec.executables = %w[executable]
 
     gem_dir = File.join "#{@gemhome}2", 'gems', @spec.full_name
     gem_bindir = File.join gem_dir, 'bin'
     FileUtils.mkdir_p gem_bindir
-    File.open File.join(gem_bindir, "my_exec"), 'w' do |f|
+    File.open File.join(gem_bindir, 'executable'), 'w' do |f|
       f.puts "#!/bin/ruby"
     end
 
@@ -246,7 +247,7 @@ load Gem.bin_path('a', 'my_exec', version)
 
     @installer.generate_bin
 
-    installed_exec = File.join("#{@gemhome}2", 'bin', 'my_exec')
+    installed_exec = File.join("#{@gemhome}2", 'bin', 'executable')
     assert_equal true, File.exist?(installed_exec)
     assert_equal(0100755, File.stat(installed_exec).mode) unless win_platform?
 
@@ -255,9 +256,12 @@ load Gem.bin_path('a', 'my_exec', version)
   end
 
   def test_generate_bin_script_no_execs
+    util_execless
+
     @installer.wrappers = true
     @installer.generate_bin
-    assert_equal false, File.exist?(util_inst_bindir)
+
+    refute File.exist?(util_inst_bindir), 'bin dir was created when not needed'
   end
 
   def test_generate_bin_script_no_perms
@@ -281,18 +285,18 @@ load Gem.bin_path('a', 'my_exec', version)
 
   def test_generate_bin_script_no_shebang
     @installer.wrappers = true
-    @spec.executables = ["my_exec"]
+    @spec.executables = %w[executable]
 
     gem_dir = File.join @gemhome, 'gems', @spec.full_name
     gem_bindir = File.join gem_dir, 'bin'
     FileUtils.mkdir_p gem_bindir
-    File.open File.join(gem_bindir, "my_exec"), 'w' do |f|
+    File.open File.join(gem_bindir, 'executable'), 'w' do |f|
       f.puts "blah blah blah"
     end
 
     @installer.generate_bin
 
-    installed_exec = File.join @gemhome, 'bin', 'my_exec'
+    installed_exec = File.join @gemhome, 'bin', 'executable'
     assert_equal true, File.exist?(installed_exec)
     assert_equal 0100755, File.stat(installed_exec).mode unless win_platform?
 
@@ -306,9 +310,9 @@ load Gem.bin_path('a', 'my_exec', version)
     @installer.wrappers = true
     util_make_exec
     @installer.gem_dir = util_gem_dir
-    installed_exec = File.join(util_inst_bindir, "my_exec")
+    installed_exec = File.join(util_inst_bindir, 'executable')
 
-    real_exec = File.join util_gem_dir, 'bin', 'my_exec'
+    real_exec = File.join util_gem_dir, 'bin', 'executable'
 
     # fake --no-wrappers for previous install
     unless Gem.win_platform? then
@@ -336,16 +340,19 @@ load Gem.bin_path('a', 'my_exec', version)
 
     @installer.generate_bin
     assert_equal true, File.directory?(util_inst_bindir)
-    installed_exec = File.join(util_inst_bindir, "my_exec")
+    installed_exec = File.join(util_inst_bindir, 'executable')
     assert_equal true, File.symlink?(installed_exec)
-    assert_equal(File.join(util_gem_dir, "bin", "my_exec"),
+    assert_equal(File.join(util_gem_dir, 'bin', 'executable'),
                  File.readlink(installed_exec))
   end
 
   def test_generate_bin_symlink_no_execs
+    util_execless
+
     @installer.wrappers = false
     @installer.generate_bin
-    assert_equal false, File.exist?(util_inst_bindir)
+
+    refute File.exist?(util_inst_bindir)
   end
 
   def test_generate_bin_symlink_no_perms
@@ -376,8 +383,8 @@ load Gem.bin_path('a', 'my_exec', version)
     @installer.gem_dir = util_gem_dir
 
     @installer.generate_bin
-    installed_exec = File.join(util_inst_bindir, "my_exec")
-    assert_equal(File.join(util_gem_dir, "bin", "my_exec"),
+    installed_exec = File.join(util_inst_bindir, 'executable')
+    assert_equal(File.join(util_gem_dir, 'bin', 'executable'),
                  File.readlink(installed_exec))
 
     @spec = Gem::Specification.new do |s|
@@ -389,11 +396,12 @@ load Gem.bin_path('a', 'my_exec', version)
       s.require_path = 'lib'
     end
 
-    util_make_exec '3'
-    @installer.gem_dir = File.join util_gem_dir('3')
+    @spec.version = 3
+    util_make_exec
+    @installer.gem_dir = File.join util_gem_dir @spec
     @installer.generate_bin
-    installed_exec = File.join(util_inst_bindir, "my_exec")
-    assert_equal(File.join(util_gem_bindir('3'), "my_exec"),
+    installed_exec = File.join(util_inst_bindir, 'executable')
+    assert_equal(File.join(util_gem_bindir(@spec), 'executable'),
                  File.readlink(installed_exec),
                  "Ensure symlink moved to latest version")
   end
@@ -406,8 +414,8 @@ load Gem.bin_path('a', 'my_exec', version)
     @installer.gem_dir = util_gem_dir
 
     @installer.generate_bin
-    installed_exec = File.join(util_inst_bindir, "my_exec")
-    assert_equal(File.join(util_gem_dir, "bin", "my_exec"),
+    installed_exec = File.join(util_inst_bindir, 'executable')
+    assert_equal(File.join(util_gem_dir, 'bin', 'executable'),
                  File.readlink(installed_exec))
 
     spec = Gem::Specification.new do |s|
@@ -419,14 +427,16 @@ load Gem.bin_path('a', 'my_exec', version)
       s.require_path = 'lib'
     end
 
-    util_make_exec '1'
-    @installer.gem_dir = util_gem_dir('1')
+    util_make_exec
+    one = @spec.dup
+    one.version = 1
+    @installer.gem_dir = util_gem_dir one
     @installer.spec = spec
 
     @installer.generate_bin
 
-    installed_exec = File.join(util_inst_bindir, "my_exec")
-    assert_equal(File.join(util_gem_dir('2'), "bin", "my_exec"),
+    installed_exec = File.join(util_inst_bindir, 'executable')
+    assert_equal(File.join(util_gem_dir, 'bin', 'executable'),
                  File.readlink(installed_exec),
                  "Ensure symlink not moved")
   end
@@ -439,7 +449,7 @@ load Gem.bin_path('a', 'my_exec', version)
     @installer.gem_dir = util_gem_dir
 
     @installer.generate_bin
-    installed_exec = File.join(util_inst_bindir, "my_exec")
+    installed_exec = File.join(util_inst_bindir, 'executable')
     assert_equal true, File.exist?(installed_exec)
 
     @spec = Gem::Specification.new do |s|
@@ -452,11 +462,12 @@ load Gem.bin_path('a', 'my_exec', version)
     end
 
     @installer.wrappers = false
-    util_make_exec '3'
-    @installer.gem_dir = util_gem_dir '3'
+    @spec.version = 3
+    util_make_exec
+    @installer.gem_dir = util_gem_dir
     @installer.generate_bin
-    installed_exec = File.join(util_inst_bindir, "my_exec")
-    assert_equal(File.join(util_gem_dir('3'), "bin", "my_exec"),
+    installed_exec = File.join(util_inst_bindir, 'executable')
+    assert_equal(File.join(util_gem_dir, 'bin', 'executable'),
                  File.readlink(installed_exec),
                  "Ensure symlink moved to latest version")
   end
@@ -473,7 +484,7 @@ load Gem.bin_path('a', 'my_exec', version)
     end
 
     assert_equal true, File.directory?(util_inst_bindir)
-    installed_exec = File.join(util_inst_bindir, "my_exec")
+    installed_exec = File.join(util_inst_bindir, 'executable')
     assert_equal true, File.exist?(installed_exec)
 
     assert_match(/Unable to use symlinks on Windows, installing wrapper/i,
@@ -494,19 +505,18 @@ load Gem.bin_path('a', 'my_exec', version)
     @installer.generate_bin
 
     default_shebang = Gem.ruby
-    shebang_line = open("#{@gemhome}/bin/my_exec") { |f| f.readlines.first }
+    shebang_line = open("#{@gemhome}/bin/executable") { |f| f.readlines.first }
     assert_match(/\A#!/, shebang_line)
     assert_match(/#{default_shebang}/, shebang_line)
   end
 
   def test_initialize
-    spec = quick_gem 'a' do |s| s.platform = Gem::Platform.new 'mswin32' end
+    spec = quick_spec 'a' do |s| s.platform = Gem::Platform.new 'mswin32' end
     gem = File.join @tempdir, spec.file_name
 
     Dir.mkdir util_inst_bindir
     util_build_gem spec
-    FileUtils.mv File.join(@gemhome, 'cache', spec.file_name),
-                 @tempdir
+    FileUtils.mv Gem.cache_gem(spec.file_name, @gemhome), @tempdir
 
     installer = Gem::Installer.new gem
 
@@ -519,7 +529,7 @@ load Gem.bin_path('a', 'my_exec', version)
     util_clear_gems
 
     gemdir     = File.join @gemhome, 'gems', @spec.full_name
-    cache_file = File.join @gemhome, 'cache', @spec.file_name
+    cache_file = Gem.cache_gem(@spec.file_name, @gemhome)
     stub_exe   = File.join @gemhome, 'bin', 'executable'
     rakefile   = File.join gemdir, 'ext', 'a', 'Rakefile'
 
@@ -568,6 +578,42 @@ load Gem.bin_path('a', 'my_exec', version)
     assert_same @installer, @pre_install_hook_arg
   end
 
+  def test_install_with_no_prior_files
+    Dir.mkdir util_inst_bindir
+    util_clear_gems
+
+    util_setup_gem
+    build_rake_in do
+      use_ui @ui do
+        assert_equal @spec, @installer.install
+      end
+    end
+
+    gemdir = File.join(@gemhome, 'gems', @spec.full_name)
+    assert File.exist?(File.join(gemdir, 'lib', 'code.rb'))
+
+    util_setup_gem
+    # Morph spec to have lib/other.rb instead of code.rb and recreate
+    @spec.files = File.join('lib', 'other.rb')
+    Dir.chdir @tempdir do
+      File.open File.join('lib', 'other.rb'), 'w' do |f| f.puts '1' end
+      use_ui ui do
+        FileUtils.rm @gem
+        Gem::Builder.new(@spec).build
+      end
+    end
+    @installer = Gem::Installer.new @gem
+    build_rake_in do
+      use_ui @ui do
+        assert_equal @spec, @installer.install
+      end
+    end
+
+    assert File.exist?(File.join(gemdir, 'lib', 'other.rb'))
+    refute(File.exist?(File.join(gemdir, 'lib', 'code.rb')),
+           "code.rb from prior install of same gem shouldn't remain here")
+  end
+
   def test_install_bad_gem
     gem = nil
 
@@ -604,7 +650,7 @@ load Gem.bin_path('a', 'my_exec', version)
     gemhome2 = "#{@gemhome}2"
     @spec.add_dependency 'b'
 
-    b2 = quick_gem 'b', 2
+    b2 = quick_spec 'b', 2
 
     FileUtils.mv @gemhome, gemhome2
     Gem.source_index.gems.delete b2.full_name
@@ -660,7 +706,7 @@ load Gem.bin_path('a', 'my_exec', version)
   end
 
   def test_install_missing_dirs
-    FileUtils.rm_f File.join(Gem.dir, 'cache')
+    FileUtils.rm_f Gem.cache_dir
     FileUtils.rm_f File.join(Gem.dir, 'docs')
     FileUtils.rm_f File.join(Gem.dir, 'specifications')
 
@@ -670,11 +716,11 @@ load Gem.bin_path('a', 'my_exec', version)
       @installer.install
     end
 
-    File.directory? File.join(Gem.dir, 'cache')
+    File.directory? Gem.cache_dir
     File.directory? File.join(Gem.dir, 'docs')
     File.directory? File.join(Gem.dir, 'specifications')
 
-    assert File.exist?(File.join(@gemhome, 'cache', @spec.file_name))
+    assert File.exist?(Gem.cache_gem(@spec.file_name, @gemhome))
     assert File.exist?(File.join(@gemhome, 'specifications', @spec.spec_name))
   end
 
@@ -780,13 +826,13 @@ load Gem.bin_path('a', 'my_exec', version)
   end
 
   def test_install_wrong_rubygems_version
-    spec = quick_gem 'old_rubygems_required', '1' do |s|
+    spec = quick_spec 'old_rubygems_required', '1' do |s|
       s.required_rubygems_version = '< 0'
     end
 
     util_build_gem spec
 
-    gem = File.join @gemhome, 'cache', spec.file_name
+    gem = Gem.cache_gem(spec.file_name, @gemhome)
 
     use_ui @ui do
       @installer = Gem::Installer.new gem
@@ -807,49 +853,49 @@ load Gem.bin_path('a', 'my_exec', version)
   end
 
   def test_shebang
-    util_make_exec '2', "#!/usr/bin/ruby"
+    util_make_exec @spec, "#!/usr/bin/ruby"
 
-    shebang = @installer.shebang 'my_exec'
+    shebang = @installer.shebang 'executable'
 
     assert_equal "#!#{Gem.ruby}", shebang
   end
 
   def test_shebang_arguments
-    util_make_exec '2', "#!/usr/bin/ruby -ws"
+    util_make_exec @spec, "#!/usr/bin/ruby -ws"
 
-    shebang = @installer.shebang 'my_exec'
+    shebang = @installer.shebang 'executable'
 
     assert_equal "#!#{Gem.ruby} -ws", shebang
   end
 
   def test_shebang_empty
-    util_make_exec '2', ''
+    util_make_exec @spec, ''
 
-    shebang = @installer.shebang 'my_exec'
+    shebang = @installer.shebang 'executable'
     assert_equal "#!#{Gem.ruby}", shebang
   end
 
   def test_shebang_env
-    util_make_exec '2', "#!/usr/bin/env ruby"
+    util_make_exec @spec, "#!/usr/bin/env ruby"
 
-    shebang = @installer.shebang 'my_exec'
+    shebang = @installer.shebang 'executable'
 
     assert_equal "#!#{Gem.ruby}", shebang
   end
 
   def test_shebang_env_arguments
-    util_make_exec '2', "#!/usr/bin/env ruby -ws"
+    util_make_exec @spec, "#!/usr/bin/env ruby -ws"
 
-    shebang = @installer.shebang 'my_exec'
+    shebang = @installer.shebang 'executable'
 
     assert_equal "#!#{Gem.ruby} -ws", shebang
   end
 
   def test_shebang_env_shebang
-    util_make_exec '2', ''
+    util_make_exec @spec, ''
     @installer.env_shebang = true
 
-    shebang = @installer.shebang 'my_exec'
+    shebang = @installer.shebang 'executable'
 
     env_shebang = "/usr/bin/env" unless Gem.win_platform?
 
@@ -858,49 +904,49 @@ load Gem.bin_path('a', 'my_exec', version)
   end
 
   def test_shebang_nested
-    util_make_exec '2', "#!/opt/local/ruby/bin/ruby"
+    util_make_exec @spec, "#!/opt/local/ruby/bin/ruby"
 
-    shebang = @installer.shebang 'my_exec'
+    shebang = @installer.shebang 'executable'
 
     assert_equal "#!#{Gem.ruby}", shebang
   end
 
   def test_shebang_nested_arguments
-    util_make_exec '2', "#!/opt/local/ruby/bin/ruby -ws"
+    util_make_exec @spec, "#!/opt/local/ruby/bin/ruby -ws"
 
-    shebang = @installer.shebang 'my_exec'
+    shebang = @installer.shebang 'executable'
 
     assert_equal "#!#{Gem.ruby} -ws", shebang
   end
 
   def test_shebang_version
-    util_make_exec '2', "#!/usr/bin/ruby18"
+    util_make_exec @spec, "#!/usr/bin/ruby18"
 
-    shebang = @installer.shebang 'my_exec'
+    shebang = @installer.shebang 'executable'
 
     assert_equal "#!#{Gem.ruby}", shebang
   end
 
   def test_shebang_version_arguments
-    util_make_exec '2', "#!/usr/bin/ruby18 -ws"
+    util_make_exec @spec, "#!/usr/bin/ruby18 -ws"
 
-    shebang = @installer.shebang 'my_exec'
+    shebang = @installer.shebang 'executable'
 
     assert_equal "#!#{Gem.ruby} -ws", shebang
   end
 
   def test_shebang_version_env
-    util_make_exec '2', "#!/usr/bin/env ruby18"
+    util_make_exec @spec, "#!/usr/bin/env ruby18"
 
-    shebang = @installer.shebang 'my_exec'
+    shebang = @installer.shebang 'executable'
 
     assert_equal "#!#{Gem.ruby}", shebang
   end
 
   def test_shebang_version_env_arguments
-    util_make_exec '2', "#!/usr/bin/env ruby18 -ws"
+    util_make_exec @spec, "#!/usr/bin/env ruby18 -ws"
 
-    shebang = @installer.shebang 'my_exec'
+    shebang = @installer.shebang 'executable'
 
     assert_equal "#!#{Gem.ruby} -ws", shebang
   end
@@ -931,14 +977,41 @@ load Gem.bin_path('a', 'my_exec', version)
     assert_equal @spec, eval(File.read(spec_file))
   end
 
+  def test_write_spec_writes_cached_spec
+    spec_dir = File.join @gemhome, 'specifications'
+    spec_file = File.join spec_dir, @spec.spec_name
+    FileUtils.rm spec_file
+    refute File.exist?(spec_file)
+
+    @spec.files = %w[a.rb b.rb c.rb]
+
+    @installer.spec = @spec
+    @installer.gem_home = @gemhome
+
+    @installer.write_spec
+
+    # cached specs have no file manifest:
+    @spec.files = []
+
+    assert_equal @spec, eval(File.read(spec_file))
+  end
+
   def old_ruby_required
-    spec = quick_gem 'old_ruby_required', '1' do |s|
+    spec = quick_spec 'old_ruby_required', '1' do |s|
       s.required_ruby_version = '= 1.4.6'
     end
 
     util_build_gem spec
 
-    File.join @gemhome, 'cache', spec.file_name
+    Gem.cache_gem(spec.file_name, @gemhome)
+  end
+
+  def util_execless
+    @spec = quick_spec 'z'
+
+    gem = File.join @tempdir, @spec.file_name
+
+    @installer = util_installer @spec, gem, @gemhome
   end
 
 end