rubygems-update 3.0.9 → 3.1.0.pre1

data/test/rubygems/test_gem_ext_builder.rb

@@ -134,6 +134,7 @@ install:
 
   def test_build_extensions_install_ext_only
     class << Gem
+
       alias orig_install_extension_in_lib install_extension_in_lib
 
       remove_method :install_extension_in_lib
@@ -141,6 +142,7 @@ install:
       def Gem.install_extension_in_lib
         false
       end
+
     end
 
     @spec.extensions << 'ext/extconf.rb'
@@ -177,9 +179,11 @@ install:
     refute_path_exists File.join @spec.gem_dir, 'lib', 'a', 'b.rb'
   ensure
     class << Gem
+
       remove_method :install_extension_in_lib
 
       alias install_extension_in_lib orig_install_extension_in_lib
+
     end
   end
 
@@ -325,4 +329,4 @@ install:
     assert_equal %w[--with-foo-dir=/nonexistent], builder.build_args
   end
 
-end
+end unless Gem.java_platform?

data/test/rubygems/test_gem_ext_cmake_builder.rb

@@ -10,6 +10,8 @@ class TestGemExtCmakeBuilder < Gem::TestCase
     # Details: https://github.com/rubygems/rubygems/issues/1270#issuecomment-177368340
     skip "CmakeBuilder doesn't work on Windows." if Gem.win_platform?
 
+    skip "CmakeBuilder doesn't work on JRuby." if Gem.java_platform? && ENV["CI"]
+
     system('cmake', out: IO::NULL, err: [:child, :out])
 
     skip 'cmake not present' unless $?.success?

data/test/rubygems/test_gem_ext_configure_builder.rb

@@ -18,6 +18,10 @@ class TestGemExtConfigureBuilder < Gem::TestCase
   end
 
   def test_self_build
+    if java_platform? && ENV["CI"]
+      skip("failing on jruby")
+    end
+
     skip("test_self_build skipped on MS Windows (VC++)") if vc_windows?
 
     File.open File.join(@ext, './configure'), 'w' do |configure|
@@ -45,6 +49,10 @@ class TestGemExtConfigureBuilder < Gem::TestCase
   end
 
   def test_self_build_fail
+    if java_platform? && ENV["CI"]
+      skip("failing on jruby")
+    end
+
     skip("test_self_build_fail skipped on MS Windows (VC++)") if vc_windows?
     output = []
 

data/test/rubygems/test_gem_ext_ext_conf_builder.rb

@@ -17,6 +17,10 @@ class TestGemExtExtConfBuilder < Gem::TestCase
   end
 
   def test_class_build
+    if java_platform? && ENV["CI"]
+      skip("failing on jruby")
+    end
+
     if vc_windows? && !nmake_found?
       skip("test_class_build skipped - nmake not found")
     end
@@ -45,6 +49,10 @@ class TestGemExtExtConfBuilder < Gem::TestCase
   end
 
   def test_class_build_rbconfig_make_prog
+    if java_platform? && ENV["CI"]
+      skip("failing on jruby")
+    end
+
     configure_args do
 
       File.open File.join(@ext, 'extconf.rb'), 'w' do |extconf|
@@ -68,6 +76,10 @@ class TestGemExtExtConfBuilder < Gem::TestCase
     env_make = ENV.delete 'MAKE'
     ENV['MAKE'] = 'anothermake'
 
+    if java_platform? && ENV["CI"]
+      skip("failing on jruby")
+    end
+
     configure_args '' do
       File.open File.join(@ext, 'extconf.rb'), 'w' do |extconf|
         extconf.puts "require 'mkmf'\ncreate_makefile 'foo'"

data/test/rubygems/test_gem_ext_rake_builder.rb

@@ -3,6 +3,7 @@ require 'rubygems/test_case'
 require 'rubygems/ext'
 
 class TestGemExtRakeBuilder < Gem::TestCase
+
   def setup
     super
 
@@ -90,4 +91,5 @@ class TestGemExtRakeBuilder < Gem::TestCase
       EO_MKRF
     end
   end
+
 end

data/test/rubygems/test_gem_gemcutter_utilities.rb

@@ -90,7 +90,7 @@ class TestGemGemcutterUtilities < Gem::TestCase
   end
 
   def test_sign_in
-    api_key     = 'a5fdbb6ba150cbb83aad2bb2fede64cf040453903'
+    api_key = 'a5fdbb6ba150cbb83aad2bb2fede64cf040453903'
     util_sign_in [api_key, 200, 'OK']
 
     assert_match %r{Enter your RubyGems.org credentials.}, @sign_in_ui.output
@@ -102,7 +102,7 @@ class TestGemGemcutterUtilities < Gem::TestCase
   end
 
   def test_sign_in_with_host
-    api_key     = 'a5fdbb6ba150cbb83aad2bb2fede64cf040453903'
+    api_key = 'a5fdbb6ba150cbb83aad2bb2fede64cf040453903'
 
     util_sign_in [api_key, 200, 'OK'], 'http://example.com', ['http://example.com']
 
@@ -116,7 +116,7 @@ class TestGemGemcutterUtilities < Gem::TestCase
   end
 
   def test_sign_in_with_host_nil
-    api_key     = 'a5fdbb6ba150cbb83aad2bb2fede64cf040453903'
+    api_key = 'a5fdbb6ba150cbb83aad2bb2fede64cf040453903'
 
     util_sign_in [api_key, 200, 'OK'], nil, [nil]
 
@@ -130,7 +130,7 @@ class TestGemGemcutterUtilities < Gem::TestCase
   end
 
   def test_sign_in_with_host_ENV
-    api_key     = 'a5fdbb6ba150cbb83aad2bb2fede64cf040453903'
+    api_key = 'a5fdbb6ba150cbb83aad2bb2fede64cf040453903'
     util_sign_in [api_key, 200, 'OK'], 'http://example.com'
 
     assert_match "Enter your http://example.com credentials.",
@@ -143,7 +143,7 @@ class TestGemGemcutterUtilities < Gem::TestCase
   end
 
   def test_sign_in_skips_with_existing_credentials
-    api_key     = 'a5fdbb6ba150cbb83aad2bb2fede64cf040453903'
+    api_key = 'a5fdbb6ba150cbb83aad2bb2fede64cf040453903'
     Gem.configuration.rubygems_api_key = api_key
 
     util_sign_in [api_key, 200, 'OK']
@@ -152,8 +152,8 @@ class TestGemGemcutterUtilities < Gem::TestCase
   end
 
   def test_sign_in_skips_with_key_override
-    api_key     = 'a5fdbb6ba150cbb83aad2bb2fede64cf040453903'
-    Gem.configuration.api_keys[:KEY]  = 'other'
+    api_key = 'a5fdbb6ba150cbb83aad2bb2fede64cf040453903'
+    Gem.configuration.api_keys[:KEY] = 'other'
     @cmd.options[:key] = :KEY
     util_sign_in [api_key, 200, 'OK']
 
@@ -173,7 +173,7 @@ class TestGemGemcutterUtilities < Gem::TestCase
     assert_match %r{Enter your RubyGems.org credentials.}, @sign_in_ui.output
     assert_match %r{Signed in.}, @sign_in_ui.output
 
-    credentials   = YAML.load_file Gem.configuration.credentials_path
+    credentials = YAML.load_file Gem.configuration.credentials_path
     assert_equal api_key, credentials[:rubygems_api_key]
     assert_equal other_api_key, credentials[:other_api_key]
   end

data/test/rubygems/test_gem_indexer.rb

@@ -11,7 +11,6 @@ class TestGemIndexer < Gem::TestCase
   def setup
     super
 
-    util_clear_gems
     util_make_gems
 
     @d2_0 = util_spec 'd', '2.0' do |s|
@@ -28,30 +27,23 @@ class TestGemIndexer < Gem::TestCase
     @default = new_default_spec 'default', 2
     install_default_gems @default
 
-    @tempdir = File.join(@tempdir, 'indexer')
+    @indexerdir = File.join(@tempdir, 'indexer')
 
-    gems = File.join(@tempdir, 'gems')
+    gems = File.join(@indexerdir, 'gems')
     FileUtils.mkdir_p gems
     FileUtils.mv Dir[File.join(@gemhome, "cache", '*.gem')], gems
 
-    @indexer = Gem::Indexer.new(@tempdir)
-  end
-
-  def teardown
-    super
-
-    util_clear_gems
-    util_clear_default_gems
+    @indexer = Gem::Indexer.new(@indexerdir)
   end
 
   def test_initialize
-    assert_equal @tempdir, @indexer.dest_directory
+    assert_equal @indexerdir, @indexer.dest_directory
     assert_match %r{#{Dir.mktmpdir('gem_generate_index').match(/.*-/)}}, @indexer.directory
 
-    indexer = Gem::Indexer.new @tempdir
+    indexer = Gem::Indexer.new @indexerdir
     assert indexer.build_modern
 
-    indexer = Gem::Indexer.new @tempdir, :build_modern => true
+    indexer = Gem::Indexer.new @indexerdir, :build_modern => true
     assert indexer.build_modern
   end
 
@@ -100,7 +92,7 @@ class TestGemIndexer < Gem::TestCase
       @indexer.generate_index
     end
 
-    quickdir = File.join @tempdir, 'quick'
+    quickdir = File.join @indexerdir, 'quick'
     marshal_quickdir = File.join quickdir, "Marshal.#{@marshal_version}"
 
     assert_directory_exists quickdir
@@ -111,11 +103,11 @@ class TestGemIndexer < Gem::TestCase
 
     refute_indexed marshal_quickdir, File.basename(@c1_2.spec_file)
 
-    assert_indexed @tempdir, "specs.#{@marshal_version}"
-    assert_indexed @tempdir, "specs.#{@marshal_version}.gz"
+    assert_indexed @indexerdir, "specs.#{@marshal_version}"
+    assert_indexed @indexerdir, "specs.#{@marshal_version}.gz"
 
-    assert_indexed @tempdir, "latest_specs.#{@marshal_version}"
-    assert_indexed @tempdir, "latest_specs.#{@marshal_version}.gz"
+    assert_indexed @indexerdir, "latest_specs.#{@marshal_version}"
+    assert_indexed @indexerdir, "latest_specs.#{@marshal_version}.gz"
   end
 
   def test_generate_index_modern
@@ -125,12 +117,12 @@ class TestGemIndexer < Gem::TestCase
       @indexer.generate_index
     end
 
-    refute_indexed @tempdir, 'yaml'
-    refute_indexed @tempdir, 'yaml.Z'
-    refute_indexed @tempdir, "Marshal.#{@marshal_version}"
-    refute_indexed @tempdir, "Marshal.#{@marshal_version}.Z"
+    refute_indexed @indexerdir, 'yaml'
+    refute_indexed @indexerdir, 'yaml.Z'
+    refute_indexed @indexerdir, "Marshal.#{@marshal_version}"
+    refute_indexed @indexerdir, "Marshal.#{@marshal_version}.Z"
 
-    quickdir = File.join @tempdir, 'quick'
+    quickdir = File.join @indexerdir, 'quick'
     marshal_quickdir = File.join quickdir, "Marshal.#{@marshal_version}"
 
     assert_directory_exists quickdir, 'quickdir should be directory'
@@ -156,11 +148,11 @@ class TestGemIndexer < Gem::TestCase
     refute_indexed quickdir, "#{File.basename(@c1_2.spec_file)}"
     refute_indexed marshal_quickdir, "#{File.basename(@c1_2.spec_file)}"
 
-    assert_indexed @tempdir, "specs.#{@marshal_version}"
-    assert_indexed @tempdir, "specs.#{@marshal_version}.gz"
+    assert_indexed @indexerdir, "specs.#{@marshal_version}"
+    assert_indexed @indexerdir, "specs.#{@marshal_version}.gz"
 
-    assert_indexed @tempdir, "latest_specs.#{@marshal_version}"
-    assert_indexed @tempdir, "latest_specs.#{@marshal_version}.gz"
+    assert_indexed @indexerdir, "latest_specs.#{@marshal_version}"
+    assert_indexed @indexerdir, "latest_specs.#{@marshal_version}.gz"
   end
 
   def test_generate_index_modern_back_to_back
@@ -170,13 +162,13 @@ class TestGemIndexer < Gem::TestCase
       @indexer.generate_index
     end
 
-    @indexer = Gem::Indexer.new @tempdir
+    @indexer = Gem::Indexer.new @indexerdir
     @indexer.build_modern = true
 
     use_ui @ui do
       @indexer.generate_index
     end
-    quickdir = File.join @tempdir, 'quick'
+    quickdir = File.join @indexerdir, 'quick'
     marshal_quickdir = File.join quickdir, "Marshal.#{@marshal_version}"
 
     assert_directory_exists quickdir
@@ -185,11 +177,11 @@ class TestGemIndexer < Gem::TestCase
     assert_indexed marshal_quickdir, "#{File.basename(@a1.spec_file)}.rz"
     assert_indexed marshal_quickdir, "#{File.basename(@a2.spec_file)}.rz"
 
-    assert_indexed @tempdir, "specs.#{@marshal_version}"
-    assert_indexed @tempdir, "specs.#{@marshal_version}.gz"
+    assert_indexed @indexerdir, "specs.#{@marshal_version}"
+    assert_indexed @indexerdir, "specs.#{@marshal_version}.gz"
 
-    assert_indexed @tempdir, "latest_specs.#{@marshal_version}"
-    assert_indexed @tempdir, "latest_specs.#{@marshal_version}.gz"
+    assert_indexed @indexerdir, "latest_specs.#{@marshal_version}"
+    assert_indexed @indexerdir, "latest_specs.#{@marshal_version}.gz"
   end
 
   def test_generate_index_ui
@@ -215,7 +207,7 @@ class TestGemIndexer < Gem::TestCase
       @indexer.generate_index
     end
 
-    specs_path = File.join @tempdir, "specs.#{@marshal_version}"
+    specs_path = File.join @indexerdir, "specs.#{@marshal_version}"
 
     specs_dump = Gem.read_binary specs_path
     specs = Marshal.load specs_dump
@@ -252,7 +244,7 @@ class TestGemIndexer < Gem::TestCase
       @indexer.generate_index
     end
 
-    latest_specs_path = File.join @tempdir, "latest_specs.#{@marshal_version}"
+    latest_specs_path = File.join @indexerdir, "latest_specs.#{@marshal_version}"
 
     latest_specs_dump = Gem.read_binary latest_specs_path
     latest_specs = Marshal.load latest_specs_dump
@@ -282,7 +274,7 @@ class TestGemIndexer < Gem::TestCase
       @indexer.generate_index
     end
 
-    prerelease_specs_path = File.join @tempdir, "prerelease_specs.#{@marshal_version}"
+    prerelease_specs_path = File.join @indexerdir, "prerelease_specs.#{@marshal_version}"
 
     prerelease_specs_dump = Gem.read_binary prerelease_specs_path
     prerelease_specs = Marshal.load prerelease_specs_dump
@@ -306,13 +298,12 @@ class TestGemIndexer < Gem::TestCase
     util_remove_gem sys_gem
   end
 
-
   def test_update_index
     use_ui @ui do
       @indexer.generate_index
     end
 
-    quickdir = File.join @tempdir, 'quick'
+    quickdir = File.join @indexerdir, 'quick'
     marshal_quickdir = File.join quickdir, "Marshal.#{@marshal_version}"
 
     assert_directory_exists quickdir
@@ -326,7 +317,7 @@ class TestGemIndexer < Gem::TestCase
     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'
+    gems = File.join @indexerdir, 'gems'
 
     FileUtils.mv @d2_1.cache_file, gems
     FileUtils.mv @d2_1_a.cache_file, gems

data/test/rubygems/test_gem_install_update_options.rb

@@ -26,10 +26,11 @@ class TestGemInstallUpdateOptions < Gem::InstallerTestCase
       -f
       -i /install_to
       -w
-      --vendor
       --post-install-message
     ]
 
+    args.concat %w[--vendor] unless Gem.java_platform?
+
     args.concat %w[-P HighSecurity] if defined?(OpenSSL::SSL)
 
     assert @cmd.handles?(args)
@@ -111,6 +112,13 @@ class TestGemInstallUpdateOptions < Gem::InstallerTestCase
   end
 
   def test_user_install_enabled
+    @spec = quick_gem 'a' do |spec|
+      util_make_exec spec
+    end
+
+    util_build_gem @spec
+    @gem = @spec.cache_file
+
     @cmd.handle_options %w[--user-install]
 
     assert @cmd.options[:user_install]
@@ -122,6 +130,13 @@ class TestGemInstallUpdateOptions < Gem::InstallerTestCase
   end
 
   def test_user_install_disabled_read_only
+    @spec = quick_gem 'a' do |spec|
+      util_make_exec spec
+    end
+
+    util_build_gem @spec
+    @gem = @spec.cache_file
+
     if win_platform?
       skip('test_user_install_disabled_read_only test skipped on MS Windows')
     elsif Process.uid.zero?
@@ -145,28 +160,26 @@ class TestGemInstallUpdateOptions < Gem::InstallerTestCase
   end
 
   def test_vendor
-    @cmd.handle_options %w[--vendor]
+    vendordir(File.join(@tempdir, 'vendor')) do
+      @cmd.handle_options %w[--vendor]
 
-    assert @cmd.options[:vendor]
-    assert_equal Gem.vendor_dir, @cmd.options[:install_dir]
+      assert @cmd.options[:vendor]
+      assert_equal Gem.vendor_dir, @cmd.options[:install_dir]
+    end
   end
 
   def test_vendor_missing
-    orig_vendordir = RbConfig::CONFIG['vendordir']
-    RbConfig::CONFIG.delete 'vendordir'
-
-    e = assert_raises OptionParser::InvalidOption do
-      @cmd.handle_options %w[--vendor]
-    end
-
-    assert_equal 'invalid option: --vendor your platform is not supported',
-                 e.message
+    vendordir(nil) do
+      e = assert_raises OptionParser::InvalidOption do
+        @cmd.handle_options %w[--vendor]
+      end
 
-    refute @cmd.options[:vendor]
-    refute @cmd.options[:install_dir]
+      assert_equal 'invalid option: --vendor your platform is not supported',
+                   e.message
 
-  ensure
-    RbConfig::CONFIG['vendordir'] = orig_vendordir
+      refute @cmd.options[:vendor]
+      refute @cmd.options[:install_dir]
+    end
   end
 
   def test_post_install_message_no
@@ -180,4 +193,5 @@ class TestGemInstallUpdateOptions < Gem::InstallerTestCase
 
     assert_equal true, @cmd.options[:post_install_message]
   end
+
 end

data/test/rubygems/test_gem_installer.rb

@@ -2,6 +2,7 @@
 require 'rubygems/installer_test_case'
 
 class TestGemInstaller < Gem::InstallerTestCase
+
   @@symlink_supported = nil
 
   def symlink_supported?
@@ -21,11 +22,6 @@ class TestGemInstaller < Gem::InstallerTestCase
     super
     common_installer_setup
 
-    if (self.class.method_defined?(:__name__) ? __name__ : name) =~ /\Atest_install(_|\Z)/
-      FileUtils.rm_r @spec.gem_dir
-      FileUtils.rm_r @user_spec.gem_dir
-    end
-
     @config = Gem.configuration
   end
 
@@ -38,6 +34,8 @@ class TestGemInstaller < Gem::InstallerTestCase
   end
 
   def test_app_script_text
+    installer = setup_base_installer
+
     util_make_exec @spec, ''
 
     expected = <<-EOF
@@ -70,12 +68,14 @@ load Gem.bin_path("a", "executable", version)
 end
     EOF
 
-    wrapper = @installer.app_script_text 'executable'
+    wrapper = installer.app_script_text 'executable'
     assert_equal expected, wrapper
   end
 
   def test_check_executable_overwrite
-    @installer.generate_bin
+    installer = setup_base_installer
+
+    installer.generate_bin
 
     @spec = Gem::Specification.new do |s|
       s.files = ['lib/code.rb']
@@ -87,9 +87,9 @@ end
     end
 
     util_make_exec
-    @installer.gem_dir = @spec.gem_dir
-    @installer.wrappers = true
-    @installer.generate_bin
+    installer.gem_dir = @spec.gem_dir
+    installer.wrappers = true
+    installer.generate_bin
 
     installed_exec = File.join util_inst_bindir, 'executable'
     assert_path_exists installed_exec
@@ -99,6 +99,8 @@ end
   end
 
   def test_check_executable_overwrite_default_bin_dir
+    installer = setup_base_installer
+
     if defined?(RUBY_FRAMEWORK_VERSION)
       orig_RUBY_FRAMEWORK_VERSION = RUBY_FRAMEWORK_VERSION
       Object.send :remove_const, :RUBY_FRAMEWORK_VERSION
@@ -111,7 +113,7 @@ end
     ui = Gem::MockGemUi.new "n\n"
     use_ui ui do
       e = assert_raises Gem::InstallError do
-        @installer.generate_bin
+        installer.generate_bin
       end
 
       conflicted = File.join @gemhome, 'bin', 'executable'
@@ -129,7 +131,9 @@ end
   end
 
   def test_check_executable_overwrite_format_executable
-    @installer.generate_bin
+    installer = setup_base_installer
+
+    installer.generate_bin
 
     @spec = Gem::Specification.new do |s|
       s.files = ['lib/code.rb']
@@ -152,11 +156,11 @@ gem 'other', version
 
     util_make_exec
     Gem::Installer.exec_format = 'foo-%s-bar'
-    @installer.gem_dir = @spec.gem_dir
-    @installer.wrappers = true
-    @installer.format_executable = true
+    installer.gem_dir = @spec.gem_dir
+    installer.wrappers = true
+    installer.format_executable = true
 
-    @installer.generate_bin # should not raise
+    installer.generate_bin # should not raise
 
     installed_exec = File.join util_inst_bindir, 'foo-executable-bar'
     assert_path_exists installed_exec
@@ -168,13 +172,15 @@ gem 'other', version
   end
 
   def test_check_executable_overwrite_other_gem
+    installer = setup_base_installer
+
     util_conflict_executable true
 
     ui = Gem::MockGemUi.new "n\n"
 
     use_ui ui do
       e = assert_raises Gem::InstallError do
-        @installer.generate_bin
+        installer.generate_bin
       end
 
       assert_equal '"executable" from a conflicts with installed executable from conflict',
@@ -183,11 +189,13 @@ gem 'other', version
   end
 
   def test_check_executable_overwrite_other_gem_force
+    installer = setup_base_installer
+
     util_conflict_executable true
-    @installer.wrappers = true
-    @installer.force = true
+    installer.wrappers = true
+    installer.force = true
 
-    @installer.generate_bin
+    installer.generate_bin
 
     installed_exec = File.join util_inst_bindir, 'executable'
     assert_path_exists installed_exec
@@ -197,10 +205,12 @@ gem 'other', version
   end
 
   def test_check_executable_overwrite_other_non_gem
+    installer = setup_base_installer
+
     util_conflict_executable false
-    @installer.wrappers = true
+    installer.wrappers = true
 
-    @installer.generate_bin
+    installer.generate_bin
 
     installed_exec = File.join util_inst_bindir, 'executable'
     assert_path_exists installed_exec
@@ -210,7 +220,9 @@ gem 'other', version
   end unless Gem.win_platform?
 
   def test_check_that_user_bin_dir_is_in_path
-    bin_dir = @installer.bin_dir
+    installer = setup_base_installer
+
+    bin_dir = installer.bin_dir
 
     if Gem.win_platform?
       bin_dir = bin_dir.downcase.gsub(File::SEPARATOR, File::ALT_SEPARATOR)
@@ -220,7 +232,7 @@ gem 'other', version
       ENV['PATH'], [ENV['PATH'], bin_dir].join(File::PATH_SEPARATOR)
 
     use_ui @ui do
-      @installer.check_that_user_bin_dir_is_in_path
+      installer.check_that_user_bin_dir_is_in_path
     end
 
     assert_empty @ui.error
@@ -234,10 +246,11 @@ gem 'other', version
     orig_PATH, ENV['PATH'] =
       ENV['PATH'], [ENV['PATH'], '~/bin'].join(File::PATH_SEPARATOR)
 
-    @installer.bin_dir.replace File.join @userhome, 'bin'
+    installer = setup_base_installer
+    installer.bin_dir.replace File.join @userhome, 'bin'
 
     use_ui @ui do
-      @installer.check_that_user_bin_dir_is_in_path
+      installer.check_that_user_bin_dir_is_in_path
     end
 
     assert_empty @ui.error
@@ -246,11 +259,13 @@ gem 'other', version
   end
 
   def test_check_that_user_bin_dir_is_in_path_not_in_path
+    installer = setup_base_installer
+
     use_ui @ui do
-      @installer.check_that_user_bin_dir_is_in_path
+      installer.check_that_user_bin_dir_is_in_path
     end
 
-    expected = @installer.bin_dir
+    expected = installer.bin_dir
 
     if Gem.win_platform?
       expected = expected.downcase.gsub(File::SEPARATOR, File::ALT_SEPARATOR)
@@ -260,14 +275,16 @@ gem 'other', version
   end
 
   def test_ensure_dependency
+    installer = setup_base_installer
+
     util_spec 'a'
 
     dep = Gem::Dependency.new 'a', '>= 2'
-    assert @installer.ensure_dependency(@spec, dep)
+    assert installer.ensure_dependency(@spec, dep)
 
     dep = Gem::Dependency.new 'b', '> 2'
     e = assert_raises Gem::InstallError do
-      @installer.ensure_dependency @spec, dep
+      installer.ensure_dependency @spec, dep
     end
 
     assert_equal 'a requires b (> 2)', e.message
@@ -304,28 +321,32 @@ gem 'other', version
   end
 
   def test_extract_files
-    @installer.extract_files
+    installer = setup_base_installer
+
+    installer.extract_files
 
     assert_path_exists File.join @spec.gem_dir, 'bin/executable'
   end
 
   def test_generate_bin_bindir
-    @installer.wrappers = true
+    installer = setup_base_installer
+
+    installer.wrappers = true
 
     @spec.executables = %w[executable]
     @spec.bindir = 'bin'
 
-    exec_file = @installer.formatted_program_filename 'executable'
+    exec_file = installer.formatted_program_filename 'executable'
     exec_path = File.join @spec.gem_dir, exec_file
     File.open exec_path, 'w' do |f|
       f.puts '#!/usr/bin/ruby'
     end
 
-    @installer.gem_dir = @spec.gem_dir
+    installer.gem_dir = @spec.gem_dir
 
-    @installer.generate_bin
+    installer.generate_bin
 
-    assert_directory_exists (util_inst_bindir)
+    assert_directory_exists util_inst_bindir
     installed_exec = File.join(util_inst_bindir, 'executable')
     assert_path_exists installed_exec
     assert_equal mask, File.stat(installed_exec).mode unless win_platform?
@@ -361,11 +382,13 @@ gem 'other', version
   end
 
   def test_generate_bin_script
-    @installer.wrappers = true
+    installer = setup_base_installer
+
+    installer.wrappers = true
     util_make_exec
-    @installer.gem_dir = @spec.gem_dir
+    installer.gem_dir = @spec.gem_dir
 
-    @installer.generate_bin
+    installer.generate_bin
     assert_directory_exists util_inst_bindir
     installed_exec = File.join util_inst_bindir, 'executable'
     assert_path_exists installed_exec
@@ -376,13 +399,15 @@ gem 'other', version
   end
 
   def test_generate_bin_script_format
-    @installer.format_executable = true
-    @installer.wrappers = true
+    installer = setup_base_installer
+
+    installer.format_executable = true
+    installer.wrappers = true
     util_make_exec
-    @installer.gem_dir = @spec.gem_dir
+    installer.gem_dir = @spec.gem_dir
 
     Gem::Installer.exec_format = 'foo-%s-bar'
-    @installer.generate_bin
+    installer.generate_bin
     assert_directory_exists util_inst_bindir
     installed_exec = File.join util_inst_bindir, 'foo-executable-bar'
     assert_path_exists installed_exec
@@ -391,12 +416,14 @@ gem 'other', version
   end
 
   def test_generate_bin_script_format_disabled
-    @installer.wrappers = true
+    installer = setup_base_installer
+
+    installer.wrappers = true
     util_make_exec
-    @installer.gem_dir = @spec.gem_dir
+    installer.gem_dir = @spec.gem_dir
 
     Gem::Installer.exec_format = 'foo-%s-bar'
-    @installer.generate_bin
+    installer.generate_bin
     assert_directory_exists util_inst_bindir
     installed_exec = File.join util_inst_bindir, 'executable'
     assert_path_exists installed_exec
@@ -405,7 +432,9 @@ gem 'other', version
   end
 
   def test_generate_bin_script_install_dir
-    @installer.wrappers = true
+    installer = setup_base_installer
+
+    installer.wrappers = true
 
     gem_dir = File.join("#{@gemhome}2", "gems", @spec.full_name)
     gem_bindir = File.join gem_dir, 'bin'
@@ -414,11 +443,11 @@ gem 'other', version
       f.puts "#!/bin/ruby"
     end
 
-    @installer.gem_home = "#{@gemhome}2"
-    @installer.gem_dir = gem_dir
-    @installer.bin_dir = File.join "#{@gemhome}2", 'bin'
+    installer.gem_home = "#{@gemhome}2"
+    installer.gem_dir = gem_dir
+    installer.bin_dir = File.join "#{@gemhome}2", 'bin'
 
-    @installer.generate_bin
+    installer.generate_bin
 
     installed_exec = File.join("#{@gemhome}2", "bin", 'executable')
     assert_path_exists installed_exec
@@ -429,16 +458,20 @@ gem 'other', version
   end
 
   def test_generate_bin_script_no_execs
-    util_execless
+    installer = setup_base_installer
+
+    installer = util_execless
 
-    @installer.wrappers = true
-    @installer.generate_bin
+    installer.wrappers = true
+    installer.generate_bin
 
     refute_path_exists util_inst_bindir, 'bin dir was created when not needed'
   end
 
   def test_generate_bin_script_no_perms
-    @installer.wrappers = true
+    installer = setup_base_installer
+
+    installer.wrappers = true
     util_make_exec
 
     Dir.mkdir util_inst_bindir
@@ -451,7 +484,7 @@ gem 'other', version
       FileUtils.chmod 0000, util_inst_bindir
 
       assert_raises Gem::FilePermissionError do
-        @installer.generate_bin
+        installer.generate_bin
       end
     end
   ensure
@@ -459,7 +492,9 @@ gem 'other', version
   end
 
   def test_generate_bin_script_no_shebang
-    @installer.wrappers = true
+    installer = setup_base_installer
+
+    installer.wrappers = true
     @spec.executables = %w[executable]
 
     gem_dir = File.join @gemhome, 'gems', @spec.full_name
@@ -469,7 +504,7 @@ gem 'other', version
       f.puts "blah blah blah"
     end
 
-    @installer.generate_bin
+    installer.generate_bin
 
     installed_exec = File.join @gemhome, 'bin', 'executable'
     assert_path_exists installed_exec
@@ -482,9 +517,11 @@ gem 'other', version
   end
 
   def test_generate_bin_script_wrappers
-    @installer.wrappers = true
+    installer = setup_base_installer
+
+    installer.wrappers = true
     util_make_exec
-    @installer.gem_dir = @spec.gem_dir
+    installer.gem_dir = @spec.gem_dir
     installed_exec = File.join(util_inst_bindir, 'executable')
 
     real_exec = File.join @spec.gem_dir, 'bin', 'executable'
@@ -495,7 +532,7 @@ gem 'other', version
       FileUtils.ln_s real_exec, installed_exec
     end
 
-    @installer.generate_bin
+    installer.generate_bin
     assert_directory_exists util_inst_bindir
     assert_path_exists installed_exec
     assert_equal mask, File.stat(installed_exec).mode unless win_platform?
@@ -509,11 +546,13 @@ gem 'other', version
   def test_generate_bin_symlink
     return if win_platform? #Windows FS do not support symlinks
 
-    @installer.wrappers = false
+    installer = setup_base_installer
+
+    installer.wrappers = false
     util_make_exec
-    @installer.gem_dir = @spec.gem_dir
+    installer.gem_dir = @spec.gem_dir
 
-    @installer.generate_bin
+    installer.generate_bin
     assert_directory_exists util_inst_bindir
     installed_exec = File.join util_inst_bindir, 'executable'
     assert_equal true, File.symlink?(installed_exec)
@@ -522,18 +561,22 @@ gem 'other', version
   end
 
   def test_generate_bin_symlink_no_execs
-    util_execless
+    installer = setup_base_installer
+
+    installer = util_execless
 
-    @installer.wrappers = false
-    @installer.generate_bin
+    installer.wrappers = false
+    installer.generate_bin
 
     refute_path_exists util_inst_bindir
   end
 
   def test_generate_bin_symlink_no_perms
-    @installer.wrappers = false
+    installer = setup_base_installer
+
+    installer.wrappers = false
     util_make_exec
-    @installer.gem_dir = @spec.gem_dir
+    installer.gem_dir = @spec.gem_dir
 
     Dir.mkdir util_inst_bindir
 
@@ -545,7 +588,7 @@ gem 'other', version
       FileUtils.chmod 0000, util_inst_bindir
 
       assert_raises Gem::FilePermissionError do
-        @installer.generate_bin
+        installer.generate_bin
       end
     end
   ensure
@@ -555,11 +598,13 @@ gem 'other', version
   def test_generate_bin_symlink_update_newer
     return if win_platform? #Windows FS do not support symlinks
 
-    @installer.wrappers = false
+    installer = setup_base_installer
+
+    installer.wrappers = false
     util_make_exec
-    @installer.gem_dir = @spec.gem_dir
+    installer.gem_dir = @spec.gem_dir
 
-    @installer.generate_bin
+    installer.generate_bin
     installed_exec = File.join(util_inst_bindir, 'executable')
     assert_equal(File.join(@spec.gem_dir, 'bin', 'executable'),
                  File.readlink(installed_exec))
@@ -574,8 +619,8 @@ gem 'other', version
     end
 
     util_make_exec
-    @installer.gem_dir = @spec.gem_dir
-    @installer.generate_bin
+    installer.gem_dir = @spec.gem_dir
+    installer.generate_bin
     installed_exec = File.join(util_inst_bindir, 'executable')
     assert_equal(@spec.bin_file('executable'),
                  File.readlink(installed_exec),
@@ -585,11 +630,13 @@ gem 'other', version
   def test_generate_bin_symlink_update_older
     return if !symlink_supported?
 
-    @installer.wrappers = false
+    installer = setup_base_installer
+
+    installer.wrappers = false
     util_make_exec
-    @installer.gem_dir = @spec.gem_dir
+    installer.gem_dir = @spec.gem_dir
 
-    @installer.generate_bin
+    installer.generate_bin
     installed_exec = File.join(util_inst_bindir, 'executable')
     assert_equal(File.join(@spec.gem_dir, 'bin', 'executable'),
                  File.readlink(installed_exec))
@@ -606,10 +653,10 @@ gem 'other', version
     util_make_exec
     one = @spec.dup
     one.version = 1
-    @installer = Gem::Installer.for_spec spec
-    @installer.gem_dir = one.gem_dir
+    installer = Gem::Installer.for_spec spec
+    installer.gem_dir = one.gem_dir
 
-    @installer.generate_bin
+    installer.generate_bin
 
     installed_exec = File.join util_inst_bindir, 'executable'
     expected = File.join @spec.gem_dir, 'bin', 'executable'
@@ -621,11 +668,13 @@ gem 'other', version
   def test_generate_bin_symlink_update_remove_wrapper
     return if !symlink_supported?
 
-    @installer.wrappers = true
+    installer = setup_base_installer
+
+    installer.wrappers = true
     util_make_exec
-    @installer.gem_dir = @spec.gem_dir
+    installer.gem_dir = @spec.gem_dir
 
-    @installer.generate_bin
+    installer.generate_bin
 
     installed_exec = File.join util_inst_bindir, 'executable'
     assert_path_exists installed_exec
@@ -641,10 +690,10 @@ gem 'other', version
     util_make_exec
 
     util_installer @spec, @gemhome
-    @installer.wrappers = false
-    @installer.gem_dir = @spec.gem_dir
+    installer.wrappers = false
+    installer.gem_dir = @spec.gem_dir
 
-    @installer.generate_bin
+    installer.generate_bin
 
     installed_exec = File.join util_inst_bindir, 'executable'
     assert_equal(@spec.bin_file('executable'),
@@ -658,12 +707,15 @@ gem 'other', version
     old_alt_separator = File::ALT_SEPARATOR
     File.__send__(:remove_const, :ALT_SEPARATOR)
     File.const_set(:ALT_SEPARATOR, '\\')
-    @installer.wrappers = false
+
+    installer = setup_base_installer
+
+    installer.wrappers = false
     util_make_exec
-    @installer.gem_dir = @spec.gem_dir
+    installer.gem_dir = @spec.gem_dir
 
     use_ui @ui do
-      @installer.generate_bin
+      installer.generate_bin
     end
 
     assert_directory_exists util_inst_bindir
@@ -689,10 +741,12 @@ gem 'other', version
   def test_generate_bin_uses_default_shebang
     return if !symlink_supported?
 
-    @installer.wrappers = true
+    installer = setup_base_installer
+
+    installer.wrappers = true
     util_make_exec
 
-    @installer.generate_bin
+    installer.generate_bin
 
     default_shebang = Gem.ruby
     shebang_line = open("#{@gemhome}/bin/executable") { |f| f.readlines.first }
@@ -701,7 +755,10 @@ gem 'other', version
   end
 
   def test_initialize
-    spec = util_spec 'a' do |s| s.platform = Gem::Platform.new 'mswin32' end
+    spec = util_spec 'a' do |s|
+      s.platform = Gem::Platform.new 'mswin32'
+    end
+
     gem = File.join @tempdir, spec.file_name
 
     Dir.mkdir util_inst_bindir
@@ -715,6 +772,8 @@ gem 'other', version
   end
 
   def test_initialize_user_install
+    @gem = setup_base_gem
+
     installer = Gem::Installer.at @gem, :user_install => true
 
     assert_equal File.join(Gem.user_dir, 'gems', @spec.full_name),
@@ -723,6 +782,8 @@ gem 'other', version
   end
 
   def test_initialize_user_install_bin_dir
+    @gem = setup_base_gem
+
     installer =
       Gem::Installer.at @gem, :user_install => true, :bin_dir => @tempdir
 
@@ -732,9 +793,7 @@ gem 'other', version
   end
 
   def test_install
-    Dir.mkdir util_inst_bindir
-    util_setup_gem
-    util_clear_gems
+    installer = util_setup_installer
 
     gemdir     = File.join @gemhome, 'gems', @spec.full_name
     cache_file = File.join @gemhome, 'cache', @spec.file_name
@@ -764,7 +823,7 @@ gem 'other', version
     @newspec = nil
     build_rake_in do
       use_ui @ui do
-        @newspec = @installer.install
+        @newspec = installer.install
       end
     end
 
@@ -782,29 +841,25 @@ gem 'other', version
 
     assert_path_exists rakefile
 
-    spec_file = File.join(@gemhome, 'specifications', @spec.spec_name)
-
     assert_equal spec_file, @newspec.loaded_from
     assert_path_exists spec_file
 
-    assert_same @installer, @post_build_hook_arg
-    assert_same @installer, @post_install_hook_arg
-    assert_same @installer, @pre_install_hook_arg
+    assert_same installer, @post_build_hook_arg
+    assert_same installer, @post_install_hook_arg
+    assert_same installer, @pre_install_hook_arg
   end
 
   def test_install_creates_working_binstub
-    Dir.mkdir util_inst_bindir
-    util_setup_gem
-    util_clear_gems
+    installer = util_setup_installer
 
-    @installer.wrappers = true
+    installer.wrappers = true
 
     gemdir = File.join @gemhome, 'gems', @spec.full_name
 
     @newspec = nil
     build_rake_in do
       use_ui @ui do
-        @newspec = @installer.install
+        @newspec = installer.install
       end
     end
 
@@ -818,11 +873,10 @@ gem 'other', version
   end
 
   def test_conflicting_binstubs
-    Dir.mkdir util_inst_bindir
-    util_clear_gems
+    @gem = setup_base_gem
 
     # build old version that has a bin file
-    util_setup_gem do |spec|
+    installer = util_setup_gem do |spec|
       File.open File.join('bin', 'executable'), 'w' do |f|
         f.puts "require 'code'"
       end
@@ -831,17 +885,17 @@ gem 'other', version
       end
     end
 
-    @installer.wrappers = true
+    installer.wrappers = true
     build_rake_in do
       use_ui @ui do
-        @newspec = @installer.install
+        @newspec = installer.install
       end
     end
 
-    old_bin_file = File.join @installer.bin_dir, 'executable'
+    old_bin_file = File.join installer.bin_dir, 'executable'
 
     # build new version that doesn't have a bin file
-    util_setup_gem do |spec|
+    installer = util_setup_gem do |spec|
       FileUtils.rm File.join('bin', 'executable')
       spec.files.delete File.join('bin', 'executable')
       spec.executables.delete 'executable'
@@ -853,7 +907,7 @@ gem 'other', version
 
     build_rake_in do
       use_ui @ui do
-        @newspec = @installer.install
+        @newspec = installer.install
       end
     end
 
@@ -867,16 +921,14 @@ gem 'other', version
   end
 
   def test_install_creates_binstub_that_understand_version
-    Dir.mkdir util_inst_bindir
-    util_setup_gem
-    util_clear_gems
+    installer = util_setup_installer
 
-    @installer.wrappers = true
+    installer.wrappers = true
 
     @newspec = nil
     build_rake_in do
       use_ui @ui do
-        @newspec = @installer.install
+        @newspec = installer.install
       end
     end
 
@@ -897,17 +949,43 @@ gem 'other', version
     assert_includes(e.message, "can't find gem a (= 3.0)")
   end
 
-  def test_install_creates_binstub_that_dont_trust_encoding
-    Dir.mkdir util_inst_bindir
-    util_setup_gem
+  def test_install_creates_binstub_that_prefers_user_installed_gem_to_default
+    install_default_gems new_default_spec('default', '2')
+
+    installer = util_setup_installer do |spec|
+      spec.name = 'default'
+      spec.version = '2'
+    end
+
     util_clear_gems
 
-    @installer.wrappers = true
+    installer.wrappers = true
+
+    @newspec = nil
+    build_rake_in do
+      use_ui @ui do
+        @newspec = installer.install
+      end
+    end
+
+    exe = File.join @gemhome, 'bin', 'executable'
+
+    e = assert_raises RuntimeError do
+      instance_eval File.read(exe)
+    end
+
+    assert_equal(e.message, "ran executable")
+  end
+
+  def test_install_creates_binstub_that_dont_trust_encoding
+    installer = util_setup_installer
+
+    installer.wrappers = true
 
     @newspec = nil
     build_rake_in do
       use_ui @ui do
-        @newspec = @installer.install
+        @newspec = installer.install
       end
     end
 
@@ -930,33 +1008,35 @@ gem 'other', version
   end
 
   def test_install_with_no_prior_files
-    Dir.mkdir util_inst_bindir
-    util_clear_gems
+    installer = util_setup_installer
 
-    util_setup_gem
     build_rake_in do
       use_ui @ui do
-        assert_equal @spec, @installer.install
+        assert_equal @spec, installer.install
       end
     end
 
     gemdir = File.join(@gemhome, 'gems', @spec.full_name)
     assert_path_exists File.join gemdir, 'lib', 'code.rb'
 
-    util_setup_gem
+    installer = util_setup_installer
+
     # 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
+      File.open File.join('lib', 'other.rb'), 'w' do |f|
+        f.puts '1'
+      end
+
       use_ui ui do
         FileUtils.rm @gem
         Gem::Package.build @spec
       end
     end
-    @installer = Gem::Installer.at @gem
+    installer = Gem::Installer.at @gem
     build_rake_in do
       use_ui @ui do
-        assert_equal @spec, @installer.install
+        assert_equal @spec, installer.install
       end
     end
 
@@ -976,12 +1056,14 @@ gem 'other', version
   end
 
   def test_install_missing_dirs
+    installer = setup_base_installer
+
     FileUtils.rm_f File.join(Gem.dir, 'cache')
     FileUtils.rm_f File.join(Gem.dir, 'doc')
     FileUtils.rm_f File.join(Gem.dir, 'specifications')
 
     use_ui @ui do
-      @installer.install
+      installer.install
     end
 
     assert_directory_exists File.join(Gem.dir, 'cache')
@@ -993,7 +1075,7 @@ gem 'other', version
   end
 
   def test_install_post_build_false
-    util_clear_gems
+    installer = setup_base_installer
 
     Gem.post_build do
       false
@@ -1001,7 +1083,7 @@ gem 'other', version
 
     use_ui @ui do
       e = assert_raises Gem::InstallError do
-        @installer.install
+        installer.install
       end
 
       location = "#{__FILE__}:#{__LINE__ - 9}"
@@ -1017,14 +1099,14 @@ gem 'other', version
   end
 
   def test_install_post_build_nil
-    util_clear_gems
+    installer = setup_base_installer
 
     Gem.post_build do
       nil
     end
 
     use_ui @ui do
-      @installer.install
+      installer.install
     end
 
     spec_file = File.join @gemhome, 'specifications', @spec.spec_name
@@ -1035,7 +1117,7 @@ gem 'other', version
   end
 
   def test_install_pre_install_false
-    util_clear_gems
+    installer = setup_base_installer
 
     Gem.pre_install do
       false
@@ -1043,7 +1125,7 @@ gem 'other', version
 
     use_ui @ui do
       e = assert_raises Gem::InstallError do
-        @installer.install
+        installer.install
       end
 
       location = "#{__FILE__}:#{__LINE__ - 9}"
@@ -1056,14 +1138,14 @@ gem 'other', version
   end
 
   def test_install_pre_install_nil
-    util_clear_gems
+    installer = setup_base_installer
 
     Gem.pre_install do
       nil
     end
 
     use_ui @ui do
-      @installer.install
+      installer.install
     end
 
     spec_file = File.join @gemhome, 'specifications', @spec.spec_name
@@ -1071,26 +1153,28 @@ gem 'other', version
   end
 
   def test_install_with_message
+    @spec = setup_base_spec
     @spec.post_install_message = 'I am a shiny gem!'
 
     use_ui @ui do
       path = Gem::Package.build @spec
 
-      @installer = Gem::Installer.at path
-      @installer.install
+      installer = Gem::Installer.at path
+      installer.install
     end
 
     assert_match %r|I am a shiny gem!|, @ui.output
   end
 
   def test_install_with_skipped_message
+    @spec = setup_base_spec
     @spec.post_install_message = 'I am a shiny gem!'
 
     use_ui @ui do
       path = Gem::Package.build @spec
 
-      @installer = Gem::Installer.at path, :post_install_message => false
-      @installer.install
+      installer = Gem::Installer.at path, :post_install_message => false
+      installer.install
     end
 
     refute_match %r|I am a shiny gem!|, @ui.output
@@ -1099,6 +1183,7 @@ gem 'other', version
   def test_install_extension_dir
     gemhome2 = "#{@gemhome}2"
 
+    @spec = setup_base_spec
     @spec.extensions << "extconf.rb"
     write_file File.join(@tempdir, "extconf.rb") do |io|
       io.write <<-RUBY
@@ -1122,6 +1207,8 @@ gem 'other', version
   end
 
   def test_install_extension_dir_is_removed_on_reinstall
+    @spec = setup_base_spec
+
     @spec.extensions << "extconf.rb"
     write_file File.join(@tempdir, "extconf.rb") do |io|
       io.write <<-RUBY
@@ -1157,6 +1244,7 @@ gem 'other', version
   end
 
   def test_install_user_extension_dir
+    @spec = setup_base_spec
     @spec.extensions << "extconf.rb"
     write_file File.join(@tempdir, "extconf.rb") do |io|
       io.write <<-RUBY
@@ -1186,6 +1274,9 @@ gem 'other', version
   end
 
   def test_find_lib_file_after_install
+    skip "extensions don't quite work on jruby" if Gem.java_platform?
+
+    @spec = setup_base_spec
     @spec.extensions << "extconf.rb"
     write_file File.join(@tempdir, "extconf.rb") do |io|
       io.write <<-RUBY
@@ -1229,6 +1320,9 @@ gem 'other', version
   end
 
   def test_install_extension_and_script
+    skip "Makefile creation crashes on jruby" if Gem.java_platform?
+
+    @spec = setup_base_spec
     @spec.extensions << "extconf.rb"
     write_file File.join(@tempdir, "extconf.rb") do |io|
       io.write <<-RUBY
@@ -1259,14 +1353,17 @@ gem 'other', version
     use_ui @ui do
       path = Gem::Package.build @spec
 
-      @installer = Gem::Installer.at path
-      @installer.install
+      installer = Gem::Installer.at path
+      installer.install
     end
     assert_path_exists File.join @spec.gem_dir, rb
     assert_path_exists File.join @spec.gem_dir, rb2
   end
 
   def test_install_extension_flat
+    skip "extensions don't quite work on jruby" if Gem.java_platform?
+
+    @spec = setup_base_spec
     @spec.require_paths = ["."]
 
     @spec.extensions << "extconf.rb"
@@ -1284,17 +1381,17 @@ gem 'other', version
     end
 
     # empty depend file for no auto dependencies
-    @spec.files += %W"depend #{@spec.name}.c".each {|file|
+    @spec.files += %W"depend #{@spec.name}.c".each do |file|
       write_file File.join(@tempdir, file)
-    }
+    end
 
     so = File.join(@spec.gem_dir, "#{@spec.name}.#{RbConfig::CONFIG["DLEXT"]}")
     refute_path_exists so
     use_ui @ui do
       path = Gem::Package.build @spec
 
-      @installer = Gem::Installer.at path
-      @installer.install
+      installer = Gem::Installer.at path
+      installer.install
     end
     assert_path_exists so
   rescue
@@ -1313,49 +1410,56 @@ gem 'other', version
   end
 
   def test_installation_satisfies_dependency_eh
+    installer = setup_base_installer
+
     util_spec 'a'
 
     dep = Gem::Dependency.new 'a', '>= 2'
-    assert @installer.installation_satisfies_dependency?(dep)
+    assert installer.installation_satisfies_dependency?(dep)
 
     dep = Gem::Dependency.new 'a', '> 2'
-    refute @installer.installation_satisfies_dependency?(dep)
+    refute installer.installation_satisfies_dependency?(dep)
   end
 
   def test_installation_satisfies_dependency_eh_development
-    @installer.options[:development] = true
-    @installer.options[:dev_shallow] = true
+    installer = setup_base_installer
+    installer.options[:development] = true
+    installer.options[:dev_shallow] = true
 
     util_spec 'a'
 
     dep = Gem::Dependency.new 'a', :development
-    assert @installer.installation_satisfies_dependency?(dep)
+    assert installer.installation_satisfies_dependency?(dep)
   end
 
   def test_pre_install_checks_dependencies
+    installer = setup_base_installer
     @spec.add_dependency 'b', '> 5'
-    util_setup_gem
+    installer = util_setup_gem
 
     use_ui @ui do
       assert_raises Gem::InstallError do
-        @installer.install
+        installer.install
       end
     end
   end
 
   def test_pre_install_checks_dependencies_ignore
+    installer = util_setup_installer
     @spec.add_dependency 'b', '> 5'
-    @installer.ignore_dependencies = true
+    installer.ignore_dependencies = true
 
     build_rake_in do
       use_ui @ui do
-        assert @installer.pre_install_checks
+        assert installer.pre_install_checks
       end
     end
   end
 
   def test_pre_install_checks_dependencies_install_dir
     gemhome2 = "#{@gemhome}2"
+
+    @gem = setup_base_gem
     @spec.add_dependency 'd'
 
     quick_gem 'd', 2
@@ -1418,9 +1522,9 @@ gem 'other', version
     gem = File.join(@gemhome, 'cache', spec.file_name)
 
     use_ui @ui do
-      @installer = Gem::Installer.at gem
+      installer = Gem::Installer.at gem
       e = assert_raises Gem::RuntimeRequirementNotMetError do
-        @installer.pre_install_checks
+        installer.pre_install_checks
       end
       rgv = Gem::VERSION
       assert_equal "old_rubygems_required requires RubyGems version < 0. The current RubyGems version is #{rgv}. " +
@@ -1440,9 +1544,9 @@ gem 'other', version
     gem = File.join(@gemhome, 'cache', spec.file_name)
 
     use_ui @ui do
-      @installer = Gem::Installer.at gem
+      installer = Gem::Installer.at gem
       e = assert_raises Gem::InstallError do
-        @installer.pre_install_checks
+        installer.pre_install_checks
       end
       assert_equal '#<Gem::Specification name=../malicious version=1> has an invalid name', e.message
     end
@@ -1460,9 +1564,9 @@ gem 'other', version
     gem = File.join(@gemhome, 'cache', spec.file_name)
 
     use_ui @ui do
-      @installer = Gem::Installer.at gem
+      installer = Gem::Installer.at gem
       e = assert_raises Gem::InstallError do
-        @installer.pre_install_checks
+        installer.pre_install_checks
       end
       assert_equal "#<Gem::Specification name=malicious\n::Object.const_set(:FROM_EVAL, true)# version=1> has an invalid name", e.message
     end
@@ -1482,9 +1586,9 @@ gem 'other', version
     gem = File.join(@gemhome, 'cache', spec.file_name)
 
     use_ui @ui do
-      @installer = Gem::Installer.at gem
+      installer = Gem::Installer.at gem
       e = assert_raises Gem::InstallError do
-        @installer.pre_install_checks
+        installer.pre_install_checks
       end
       assert_equal "#<Gem::Specification name=malicious version=1> has an invalid require_paths", e.message
     end
@@ -1505,9 +1609,9 @@ gem 'other', version
     gem = File.join(@gemhome, 'cache', spec.file_name)
 
     use_ui @ui do
-      @installer = Gem::Installer.at gem
+      installer = Gem::Installer.at gem
       e = assert_raises Gem::InstallError do
-        @installer.pre_install_checks
+        installer.pre_install_checks
       end
       assert_equal "#<Gem::Specification name=malicious version=1> has an invalid extensions", e.message
     end
@@ -1526,9 +1630,9 @@ gem 'other', version
     gem = File.join(@gemhome, 'cache', spec.file_name)
 
     use_ui @ui do
-      @installer = Gem::Installer.at gem
+      installer = Gem::Installer.at gem
       e = assert_raises Gem::InstallError do
-        @installer.pre_install_checks
+        installer.pre_install_checks
       end
       assert_equal "#<Gem::Specification name=malicious version=1> has an invalid specification_version", e.message
     end
@@ -1547,75 +1651,90 @@ gem 'other', version
     gem = File.join(@gemhome, 'cache', spec.file_name)
 
     use_ui @ui do
-      @installer = Gem::Installer.at gem
-      @installer.ignore_dependencies = true
+      installer = Gem::Installer.at gem
+      installer.ignore_dependencies = true
       e = assert_raises Gem::InstallError do
-        @installer.pre_install_checks
+        installer.pre_install_checks
       end
       assert_equal "#<Gem::Specification name=malicious version=1> has an invalid dependencies", e.message
     end
   end
 
   def test_shebang
+    installer = setup_base_installer
+
     util_make_exec @spec, "#!/usr/bin/ruby"
 
-    shebang = @installer.shebang 'executable'
+    shebang = installer.shebang 'executable'
 
     assert_equal "#!#{Gem.ruby}", shebang
   end
 
   def test_process_options
-    assert_nil @installer.build_root
-    assert_equal File.join(@gemhome, 'bin'), @installer.bin_dir
-    assert_equal @gemhome, @installer.gem_home
+    installer = setup_base_installer
+
+    assert_nil installer.build_root
+    assert_equal File.join(@gemhome, 'bin'), installer.bin_dir
+    assert_equal @gemhome, installer.gem_home
   end
 
   def test_process_options_build_root
     build_root = File.join @tempdir, 'build_root'
 
-    @installer = Gem::Installer.at @gem, :build_root => build_root
+    @gem = setup_base_gem
+    installer = Gem::Installer.at @gem, :build_root => build_root
 
-    assert_equal Pathname(build_root), @installer.build_root
-    assert_equal File.join(build_root, @gemhome, 'bin'), @installer.bin_dir
-    assert_equal File.join(build_root, @gemhome), @installer.gem_home
+    assert_equal Pathname(build_root), installer.build_root
+    assert_equal File.join(build_root, @gemhome, 'bin'), installer.bin_dir
+    assert_equal File.join(build_root, @gemhome), installer.gem_home
   end
 
   def test_shebang_arguments
+    installer = setup_base_installer
+
     util_make_exec @spec, "#!/usr/bin/ruby -ws"
 
-    shebang = @installer.shebang 'executable'
+    shebang = installer.shebang 'executable'
 
     assert_equal "#!#{Gem.ruby} -ws", shebang
   end
 
   def test_shebang_empty
+    installer = setup_base_installer
+
     util_make_exec @spec, ''
 
-    shebang = @installer.shebang 'executable'
+    shebang = installer.shebang 'executable'
     assert_equal "#!#{Gem.ruby}", shebang
   end
 
   def test_shebang_env
+    installer = setup_base_installer
+
     util_make_exec @spec, "#!/usr/bin/env ruby"
 
-    shebang = @installer.shebang 'executable'
+    shebang = installer.shebang 'executable'
 
     assert_equal "#!#{Gem.ruby}", shebang
   end
 
   def test_shebang_env_arguments
+    installer = setup_base_installer
+
     util_make_exec @spec, "#!/usr/bin/env ruby -ws"
 
-    shebang = @installer.shebang 'executable'
+    shebang = installer.shebang 'executable'
 
     assert_equal "#!#{Gem.ruby} -ws", shebang
   end
 
   def test_shebang_env_shebang
+    installer = setup_base_installer
+
     util_make_exec @spec, ''
-    @installer.env_shebang = true
+    installer.env_shebang = true
 
-    shebang = @installer.shebang 'executable'
+    shebang = installer.shebang 'executable'
 
     env_shebang = "/usr/bin/env" unless Gem.win_platform?
 
@@ -1624,54 +1743,68 @@ gem 'other', version
   end
 
   def test_shebang_nested
+    installer = setup_base_installer
+
     util_make_exec @spec, "#!/opt/local/ruby/bin/ruby"
 
-    shebang = @installer.shebang 'executable'
+    shebang = installer.shebang 'executable'
 
     assert_equal "#!#{Gem.ruby}", shebang
   end
 
   def test_shebang_nested_arguments
+    installer = setup_base_installer
+
     util_make_exec @spec, "#!/opt/local/ruby/bin/ruby -ws"
 
-    shebang = @installer.shebang 'executable'
+    shebang = installer.shebang 'executable'
 
     assert_equal "#!#{Gem.ruby} -ws", shebang
   end
 
   def test_shebang_version
+    installer = setup_base_installer
+
     util_make_exec @spec, "#!/usr/bin/ruby18"
 
-    shebang = @installer.shebang 'executable'
+    shebang = installer.shebang 'executable'
 
     assert_equal "#!#{Gem.ruby}", shebang
   end
 
   def test_shebang_version_arguments
+    installer = setup_base_installer
+
     util_make_exec @spec, "#!/usr/bin/ruby18 -ws"
 
-    shebang = @installer.shebang 'executable'
+    shebang = installer.shebang 'executable'
 
     assert_equal "#!#{Gem.ruby} -ws", shebang
   end
 
   def test_shebang_version_env
+    installer = setup_base_installer
+
     util_make_exec @spec, "#!/usr/bin/env ruby18"
 
-    shebang = @installer.shebang 'executable'
+    shebang = installer.shebang 'executable'
 
     assert_equal "#!#{Gem.ruby}", shebang
   end
 
   def test_shebang_version_env_arguments
+    installer = setup_base_installer
+
     util_make_exec @spec, "#!/usr/bin/env ruby18 -ws"
 
-    shebang = @installer.shebang 'executable'
+    shebang = installer.shebang 'executable'
 
     assert_equal "#!#{Gem.ruby} -ws", shebang
   end
 
   def test_shebang_custom
+    installer = setup_base_installer
+
     conf = Gem::ConfigFile.new []
     conf[:custom_shebang] = 'test'
 
@@ -1679,12 +1812,14 @@ gem 'other', version
 
     util_make_exec @spec, "#!/usr/bin/ruby"
 
-    shebang = @installer.shebang 'executable'
+    shebang = installer.shebang 'executable'
 
     assert_equal "#!test", shebang
   end
 
   def test_shebang_custom_with_expands
+    installer = setup_base_installer
+
     bin_env = win_platform? ? '' : '/usr/bin/env'
     conf = Gem::ConfigFile.new []
     conf[:custom_shebang] = '1 $env 2 $ruby 3 $exec 4 $name'
@@ -1693,12 +1828,14 @@ gem 'other', version
 
     util_make_exec @spec, "#!/usr/bin/ruby"
 
-    shebang = @installer.shebang 'executable'
+    shebang = installer.shebang 'executable'
 
     assert_equal "#!1 #{bin_env} 2 #{Gem.ruby} 3 executable 4 a", shebang
   end
 
   def test_shebang_custom_with_expands_and_arguments
+    installer = setup_base_installer
+
     bin_env = win_platform? ? '' : '/usr/bin/env'
     conf = Gem::ConfigFile.new []
     conf[:custom_shebang] = '1 $env 2 $ruby 3 $exec'
@@ -1707,30 +1844,34 @@ gem 'other', version
 
     util_make_exec @spec, "#!/usr/bin/ruby -ws"
 
-    shebang = @installer.shebang 'executable'
+    shebang = installer.shebang 'executable'
 
     assert_equal "#!1 #{bin_env} 2 #{Gem.ruby} -ws 3 executable", shebang
   end
 
   def test_unpack
-    util_setup_gem
+    installer = util_setup_installer
 
     dest = File.join @gemhome, 'gems', @spec.full_name
 
-    @installer.unpack dest
+    Gem::Deprecate.skip_during do
+      installer.unpack dest
+    end
 
     assert_path_exists File.join dest, 'lib', 'code.rb'
     assert_path_exists File.join dest, 'bin', 'executable'
   end
 
   def test_write_build_info_file
+    installer = setup_base_installer
+
     refute_path_exists @spec.build_info_file
 
-    @installer.build_args = %w[
+    installer.build_args = %w[
       --with-libyaml-dir /usr/local/Cellar/libyaml/0.1.4
     ]
 
-    @installer.write_build_info_file
+    installer.write_build_info_file
 
     assert_path_exists @spec.build_info_file
 
@@ -1740,14 +1881,17 @@ gem 'other', version
   end
 
   def test_write_build_info_file_empty
+    installer = setup_base_installer
+
     refute_path_exists @spec.build_info_file
 
-    @installer.write_build_info_file
+    installer.write_build_info_file
 
     refute_path_exists @spec.build_info_file
   end
 
   def test_write_build_info_file_install_dir
+    @gem = setup_base_gem
     installer = Gem::Installer.at @gem, :install_dir => "#{@gemhome}2"
 
     installer.build_args = %w[
@@ -1762,6 +1906,7 @@ gem 'other', version
   end
 
   def test_write_cache_file
+    @gem = setup_base_gem
     cache_file = File.join @gemhome, 'cache', @spec.file_name
     gem = File.join @gemhome, @spec.file_name
 
@@ -1777,13 +1922,14 @@ gem 'other', version
   end
 
   def test_write_spec
+    @spec = setup_base_spec
     FileUtils.rm @spec.spec_file
     refute_path_exists @spec.spec_file
 
-    @installer = Gem::Installer.for_spec @spec
-    @installer.gem_home = @gemhome
+    installer = Gem::Installer.for_spec @spec
+    installer.gem_home = @gemhome
 
-    @installer.write_spec
+    installer.write_spec
 
     assert_path_exists @spec.spec_file
 
@@ -1795,15 +1941,16 @@ gem 'other', version
   end
 
   def test_write_spec_writes_cached_spec
+    @spec = setup_base_spec
     FileUtils.rm @spec.spec_file
     refute_path_exists @spec.spec_file
 
     @spec.files = %w[a.rb b.rb c.rb]
 
-    @installer = Gem::Installer.for_spec @spec
-    @installer.gem_home = @gemhome
+    installer = Gem::Installer.for_spec @spec
+    installer.gem_home = @gemhome
 
-    @installer.write_spec
+    installer.write_spec
 
     # cached specs have no file manifest:
     @spec.files = []
@@ -1812,7 +1959,9 @@ gem 'other', version
   end
 
   def test_dir
-    assert_match %r!/gemhome/gems/a-2$!, @installer.dir
+    installer = setup_base_installer
+
+    assert_match %r!/gemhome/gems/a-2$!, installer.dir
   end
 
   def test_default_gem_loaded_from
@@ -1823,14 +1972,16 @@ gem 'other', version
   end
 
   def test_default_gem_without_wrappers
+    installer = setup_base_installer
+
     FileUtils.rm_f File.join(Gem.dir, 'specifications')
 
-    @installer.wrappers = false
-    @installer.options[:install_as_default] = true
-    @installer.gem_dir = @spec.gem_dir
+    installer.wrappers = false
+    installer.options[:install_as_default] = true
+    installer.gem_dir = @spec.gem_dir
 
     use_ui @ui do
-      @installer.install
+      installer.install
     end
 
     assert_directory_exists File.join(@spec.gem_dir, 'bin')
@@ -1854,14 +2005,14 @@ gem 'other', version
   end
 
   def test_default_gem_with_wrappers
-    FileUtils.rm_f File.join(Gem.dir, 'specifications')
+    installer = setup_base_installer
 
-    @installer.wrappers = true
-    @installer.options[:install_as_default] = true
-    @installer.gem_dir = @spec.gem_dir
+    installer.wrappers = true
+    installer.options[:install_as_default] = true
+    installer.gem_dir = @spec.gem_dir
 
     use_ui @ui do
-      @installer.install
+      installer.install
     end
 
     assert_directory_exists util_inst_bindir
@@ -1874,8 +2025,6 @@ gem 'other', version
   end
 
   def test_default_gem_with_exe_as_bindir
-    FileUtils.rm_f File.join(Gem.dir, 'specifications')
-
     @spec = quick_gem 'c' do |spec|
       util_make_exec spec, '#!/usr/bin/ruby', 'exe'
     end
@@ -1905,6 +2054,16 @@ gem 'other', version
     assert_equal ['exe/executable'], default_spec.files
   end
 
+  def test_package_attribute
+    gem = quick_gem 'c' do |spec|
+      util_make_exec spec, '#!/usr/bin/ruby', 'exe'
+    end
+
+    installer = util_installer(gem, @gemhome)
+    assert_respond_to(installer, :package)
+    assert_kind_of(Gem::Package, installer.package)
+  end
+
   def old_ruby_required(requirement)
     spec = util_spec 'old_ruby_required', '1' do |s|
       s.required_ruby_version = requirement
@@ -1919,7 +2078,7 @@ gem 'other', version
     @spec = util_spec 'z'
     util_build_gem @spec
 
-    @installer = util_installer @spec, @gemhome
+    util_installer @spec, @gemhome
   end
 
   def util_conflict_executable(wrappers)
@@ -1937,4 +2096,5 @@ gem 'other', version
   def mask
     0100755 & (~File.umask)
   end
+
 end