rubygems-update 3.1.0 → 3.2.0

data/test/rubygems/test_gem_ext_ext_conf_builder.rb

@@ -1,11 +1,9 @@
-# coding: UTF-8
 # frozen_string_literal: true
 
 require 'rubygems/test_case'
 require 'rubygems/ext'
 
 class TestGemExtExtConfBuilder < Gem::TestCase
-
   def setup
     super
 
@@ -31,12 +29,9 @@ class TestGemExtExtConfBuilder < Gem::TestCase
 
     output = []
 
-    Dir.chdir @ext do
-      result =
-        Gem::Ext::ExtConfBuilder.build 'extconf.rb', @dest_path, output
+    result = Gem::Ext::ExtConfBuilder.build 'extconf.rb', @dest_path, output, [], nil, @ext
 
-      assert_same result, output
-    end
+    assert_same result, output
 
     assert_match(/^current directory:/, output[0])
     assert_match(/^#{Gem.ruby}.* extconf.rb/, output[1])
@@ -61,9 +56,7 @@ class TestGemExtExtConfBuilder < Gem::TestCase
 
       output = []
 
-      Dir.chdir @ext do
-        Gem::Ext::ExtConfBuilder.build 'extconf.rb', @dest_path, output
-      end
+      Gem::Ext::ExtConfBuilder.build 'extconf.rb', @dest_path, output, [], nil, @ext
 
       assert_equal "creating Makefile\n", output[2]
       assert_contains_make_command 'clean', output[4]
@@ -88,9 +81,7 @@ class TestGemExtExtConfBuilder < Gem::TestCase
       output = []
 
       assert_raises Gem::InstallError do
-        Dir.chdir @ext do
-          Gem::Ext::ExtConfBuilder.build 'extconf.rb', @dest_path, output
-        end
+        Gem::Ext::ExtConfBuilder.build 'extconf.rb', @dest_path, output, [], nil, @ext
       end
 
       assert_equal "creating Makefile\n",   output[2]
@@ -114,9 +105,7 @@ class TestGemExtExtConfBuilder < Gem::TestCase
     output = []
 
     error = assert_raises Gem::InstallError do
-      Dir.chdir @ext do
-        Gem::Ext::ExtConfBuilder.build 'extconf.rb', @dest_path, output
-      end
+      Gem::Ext::ExtConfBuilder.build 'extconf.rb', @dest_path, output, [], nil, @ext
     end
 
     assert_equal 'extconf failed, exit code 1', error.message
@@ -141,9 +130,7 @@ class TestGemExtExtConfBuilder < Gem::TestCase
 
     output = []
 
-    Dir.chdir @ext do
-      Gem::Ext::ExtConfBuilder.build 'extconf.rb', @dest_path, output
-    end
+    Gem::Ext::ExtConfBuilder.build 'extconf.rb', @dest_path, output, [], nil, @ext
 
     refute_includes(output, "To see why this extension failed to compile, please check the mkmf.log which can be found here:\n")
 
@@ -183,9 +170,7 @@ end
 
     output = []
 
-    Dir.chdir @ext do
-      Gem::Ext::ExtConfBuilder.build 'extconf.rb', @dest_path, output
-    end
+    Gem::Ext::ExtConfBuilder.build 'extconf.rb', @dest_path, output, [], nil, @ext
 
     assert_contains_make_command 'clean', output[4]
     assert_contains_make_command '', output[7]
@@ -209,9 +194,7 @@ end
       makefile.puts "install:"
     end
 
-    Dir.chdir @ext do
-      Gem::Ext::ExtConfBuilder.make @ext, output
-    end
+    Gem::Ext::ExtConfBuilder.make @ext, output, @ext
 
     assert_contains_make_command 'clean', output[1]
     assert_contains_make_command '', output[4]
@@ -220,9 +203,7 @@ end
 
   def test_class_make_no_Makefile
     error = assert_raises Gem::InstallError do
-      Dir.chdir @ext do
-        Gem::Ext::ExtConfBuilder.make @ext, ['output']
-      end
+      Gem::Ext::ExtConfBuilder.make @ext, ['output'], @ext
     end
 
     assert_equal 'Makefile not found', error.message
@@ -241,5 +222,4 @@ end
       RbConfig::CONFIG.delete 'configure_args'
     end
   end
-
 end

data/test/rubygems/test_gem_ext_rake_builder.rb

@@ -3,7 +3,6 @@ require 'rubygems/test_case'
 require 'rubygems/ext'
 
 class TestGemExtRakeBuilder < Gem::TestCase
-
   def setup
     super
 
@@ -19,15 +18,13 @@ class TestGemExtRakeBuilder < Gem::TestCase
     output = []
 
     build_rake_in do |rake|
-      Dir.chdir @ext do
-        Gem::Ext::RakeBuilder.build 'mkrf_conf.rb', @dest_path, output
-      end
+      Gem::Ext::RakeBuilder.build 'mkrf_conf.rb', @dest_path, output, [], nil, @ext
 
       output = output.join "\n"
 
-      refute_match %r%^rake failed:%, output
-      assert_match %r%^#{Regexp.escape @@ruby} mkrf_conf\.rb%, output
-      assert_match %r%^#{Regexp.escape rake} RUBYARCHDIR\\=#{Regexp.escape @dest_path} RUBYLIBDIR\\=#{Regexp.escape @dest_path}%, output
+      refute_match %r{^rake failed:}, output
+      assert_match %r{^#{Regexp.escape Gem.ruby} mkrf_conf\.rb}, output
+      assert_match %r{^#{Regexp.escape rake} RUBYARCHDIR\\=#{Regexp.escape @dest_path} RUBYLIBDIR\\=#{Regexp.escape @dest_path}}, output
     end
   end
 
@@ -39,16 +36,14 @@ class TestGemExtRakeBuilder < Gem::TestCase
     output = []
 
     build_rake_in do |rake|
-      Dir.chdir @ext do
-        non_empty_args_list = ['']
-        Gem::Ext::RakeBuilder.build 'mkrf_conf.rb', @dest_path, output, non_empty_args_list
-      end
+      non_empty_args_list = ['']
+      Gem::Ext::RakeBuilder.build 'mkrf_conf.rb', @dest_path, output, non_empty_args_list, nil, @ext
 
       output = output.join "\n"
 
-      refute_match %r%^rake failed:%, output
-      assert_match %r%^#{Regexp.escape @@ruby} mkrf_conf\.rb%, output
-      assert_match %r%^#{Regexp.escape rake} RUBYARCHDIR\\=#{Regexp.escape @dest_path} RUBYLIBDIR\\=#{Regexp.escape @dest_path}%, output
+      refute_match %r{^rake failed:}, output
+      assert_match %r{^#{Regexp.escape Gem.ruby} mkrf_conf\.rb}, output
+      assert_match %r{^#{Regexp.escape rake} RUBYARCHDIR\\=#{Regexp.escape @dest_path} RUBYLIBDIR\\=#{Regexp.escape @dest_path}}, output
     end
   end
 
@@ -56,14 +51,12 @@ class TestGemExtRakeBuilder < Gem::TestCase
     output = []
 
     build_rake_in do |rake|
-      Dir.chdir @ext do
-        Gem::Ext::RakeBuilder.build "ext/Rakefile", @dest_path, output, ["test1", "test2"]
-      end
+      Gem::Ext::RakeBuilder.build "ext/Rakefile", @dest_path, output, ["test1", "test2"], nil, @ext
 
       output = output.join "\n"
 
-      refute_match %r%^rake failed:%, output
-      assert_match %r%^#{Regexp.escape rake} RUBYARCHDIR\\=#{Regexp.escape @dest_path} RUBYLIBDIR\\=#{Regexp.escape @dest_path} test1 test2%, output
+      refute_match %r{^rake failed:}, output
+      assert_match %r{^#{Regexp.escape rake} RUBYARCHDIR\\=#{Regexp.escape @dest_path} RUBYLIBDIR\\=#{Regexp.escape @dest_path} test1 test2}, output
     end
   end
 
@@ -73,12 +66,10 @@ class TestGemExtRakeBuilder < Gem::TestCase
 
     build_rake_in(false) do |rake|
       error = assert_raises Gem::InstallError do
-        Dir.chdir @ext do
-          Gem::Ext::RakeBuilder.build "mkrf_conf.rb", @dest_path, output
-        end
+        Gem::Ext::RakeBuilder.build "mkrf_conf.rb", @dest_path, output, [], nil, @ext
       end
 
-      assert_match %r%^rake failed%, error.message
+      assert_match %r{^rake failed}, error.message
     end
   end
 
@@ -91,5 +82,4 @@ class TestGemExtRakeBuilder < Gem::TestCase
       EO_MKRF
     end
   end
-
 end

data/test/rubygems/test_gem_gem_runner.rb

@@ -2,12 +2,13 @@
 require 'rubygems/test_case'
 
 class TestGemGemRunner < Gem::TestCase
-
   def setup
     super
 
     require 'rubygems/command'
     @orig_args = Gem::Command.build_args
+    @orig_specific_extra_args = Gem::Command.specific_extra_args_hash.dup
+    @orig_extra_args = Gem::Command.extra_args.dup
 
     require 'rubygems/gem_runner'
     @runner = Gem::GemRunner.new
@@ -17,6 +18,8 @@ class TestGemGemRunner < Gem::TestCase
     super
 
     Gem::Command.build_args = @orig_args
+    Gem::Command.specific_extra_args_hash = @orig_specific_extra_args
+    Gem::Command.extra_args = @orig_extra_args
   end
 
   def test_do_configuration
@@ -67,4 +70,44 @@ class TestGemGemRunner < Gem::TestCase
     assert_equal %w[--foo], args
   end
 
+  def test_query_is_deprecated
+    args = %w[query]
+
+    use_ui @ui do
+      @runner.run(args)
+    end
+
+    assert_match(/WARNING:  query command is deprecated. It will be removed in Rubygems [0-9]+/, @ui.error)
+    assert_match(/WARNING:  It is recommended that you use `gem search` or `gem list` instead/, @ui.error)
+  end
+
+  def test_info_succeeds
+    args = %w[info]
+
+    use_ui @ui do
+      @runner.run(args)
+    end
+
+    assert_empty @ui.error
+  end
+
+  def test_list_succeeds
+    args = %w[list]
+
+    use_ui @ui do
+      @runner.run(args)
+    end
+
+    assert_empty @ui.error
+  end
+
+  def test_search_succeeds
+    args = %w[search]
+
+    use_ui @ui do
+      @runner.run(args)
+    end
+
+    assert_empty @ui.error
+  end
 end

data/test/rubygems/test_gem_gemcutter_utilities.rb

@@ -5,9 +5,11 @@ require 'rubygems/command'
 require 'rubygems/gemcutter_utilities'
 
 class TestGemGemcutterUtilities < Gem::TestCase
-
   def setup
     super
+
+    credential_setup
+
     # below needed for random testing, class property
     Gem.configuration.disable_default_gem_server = nil
 
@@ -22,13 +24,15 @@ class TestGemGemcutterUtilities < Gem::TestCase
     ENV['RUBYGEMS_HOST'] = nil
     Gem.configuration.rubygems_api_key = nil
 
+    credential_teardown
+
     super
   end
 
   def test_alternate_key_alternate_host
     keys = {
       :rubygems_api_key => 'KEY',
-      "http://rubygems.engineyard.com" => "EYKEY"
+      "http://rubygems.engineyard.com" => "EYKEY",
     }
 
     FileUtils.mkdir_p File.dirname Gem.configuration.credentials_path
@@ -198,7 +202,7 @@ class TestGemGemcutterUtilities < Gem::TestCase
 
     assert_match 'You have enabled multi-factor authentication. Please enter OTP code.', @sign_in_ui.output
     assert_match 'Code: ', @sign_in_ui.output
-    assert_match 'Signed in.', @sign_in_ui.output
+    assert_match 'Signed in with API key:', @sign_in_ui.output
     assert_equal '111111', @fetcher.last_request['OTP']
   end
 
@@ -229,7 +233,7 @@ class TestGemGemcutterUtilities < Gem::TestCase
     @fetcher.data["#{host}/api/v1/api_key"] = response
     Gem::RemoteFetcher.fetcher = @fetcher
 
-    @sign_in_ui = Gem::MockGemUi.new("#{email}\n#{password}\n" + extra_input)
+    @sign_in_ui = Gem::MockGemUi.new("#{email}\n#{password}\n\n\n\n\n\n\n\n\n" + extra_input)
 
     use_ui @sign_in_ui do
       if args.length > 0
@@ -257,5 +261,4 @@ class TestGemGemcutterUtilities < Gem::TestCase
       @cmd.verify_api_key :missing
     end
   end
-
 end

data/test/rubygems/test_gem_impossible_dependencies_error.rb

@@ -2,7 +2,6 @@
 require 'rubygems/test_case'
 
 class TestGemImpossibleDependenciesError < Gem::TestCase
-
   def test_message_conflict
     request = dependency_request dep('net-ssh', '>= 2.0.13'), 'rye', '0.9.8'
 
@@ -57,5 +56,4 @@ rye-0.9.8 requires net-ssh (>= 2.0.13) but it conflicted:
 
     assert_equal expected, error.message
   end
-
 end

data/test/rubygems/test_gem_indexer.rb

@@ -2,12 +2,7 @@
 require 'rubygems/test_case'
 require 'rubygems/indexer'
 
-unless defined?(Builder::XChar)
-  warn "Gem::Indexer tests are being skipped.  Install builder gem."
-end
-
 class TestGemIndexer < Gem::TestCase
-
   def setup
     super
 
@@ -189,15 +184,15 @@ class TestGemIndexer < Gem::TestCase
       @indexer.generate_index
     end
 
-    assert_match %r%^\.\.\.\.\.\.\.\.\.\.\.\.$%, @ui.output
-    assert_match %r%^Generating Marshal quick index gemspecs for 12 gems$%,
+    assert_match %r{^\.\.\.\.\.\.\.\.\.\.\.\.$}, @ui.output
+    assert_match %r{^Generating Marshal quick index gemspecs for 12 gems$},
                  @ui.output
-    assert_match %r%^Complete$%, @ui.output
-    assert_match %r%^Generating specs index$%, @ui.output
-    assert_match %r%^Generating latest specs index$%, @ui.output
-    assert_match %r%^Generating prerelease specs index$%, @ui.output
-    assert_match %r%^Complete$%, @ui.output
-    assert_match %r%^Compressing indices$%, @ui.output
+    assert_match %r{^Complete$}, @ui.output
+    assert_match %r{^Generating specs index$}, @ui.output
+    assert_match %r{^Generating latest specs index$}, @ui.output
+    assert_match %r{^Generating prerelease specs index$}, @ui.output
+    assert_match %r{^Complete$}, @ui.output
+    assert_match %r{^Compressing indices$}, @ui.output
 
     assert_equal '', @ui.error
   end
@@ -359,5 +354,4 @@ class TestGemIndexer < Gem::TestCase
     file = File.join dir, name
     refute File.exist?(file), "#{file} exists"
   end
-
-end if defined?(Builder::XChar)
+end

data/test/rubygems/test_gem_install_update_options.rb

@@ -5,7 +5,6 @@ require 'rubygems/command'
 require 'rubygems/dependency_installer'
 
 class TestGemInstallUpdateOptions < Gem::InstallerTestCase
-
   def setup
     super
 
@@ -31,7 +30,7 @@ class TestGemInstallUpdateOptions < Gem::InstallerTestCase
 
     args.concat %w[--vendor] unless Gem.java_platform?
 
-    args.concat %w[-P HighSecurity] if defined?(OpenSSL::SSL)
+    args.concat %w[-P HighSecurity] if Gem::HAVE_OPENSSL
 
     assert @cmd.handles?(args)
   end
@@ -93,7 +92,7 @@ class TestGemInstallUpdateOptions < Gem::InstallerTestCase
   end
 
   def test_security_policy
-    skip 'openssl is missing' unless defined?(OpenSSL::SSL)
+    skip 'openssl is missing' unless Gem::HAVE_OPENSSL
 
     @cmd.handle_options %w[-P HighSecurity]
 
@@ -101,7 +100,7 @@ class TestGemInstallUpdateOptions < Gem::InstallerTestCase
   end
 
   def test_security_policy_unknown
-    skip 'openssl is missing' unless defined?(OpenSSL::SSL)
+    skip 'openssl is missing' unless Gem::HAVE_OPENSSL
 
     @cmd.add_install_update_options
 
@@ -194,4 +193,15 @@ class TestGemInstallUpdateOptions < Gem::InstallerTestCase
     assert_equal true, @cmd.options[:post_install_message]
   end
 
+  def test_minimal_deps_no
+    @cmd.handle_options %w[--no-minimal-deps]
+
+    assert_equal false, @cmd.options[:minimal_deps]
+  end
+
+  def test_minimal_deps
+    @cmd.handle_options %w[--minimal-deps]
+
+    assert_equal true, @cmd.options[:minimal_deps]
+  end
 end

data/test/rubygems/test_gem_installer.rb

@@ -2,25 +2,6 @@
 require 'rubygems/installer_test_case'
 
 class TestGemInstaller < Gem::InstallerTestCase
-
-  @@symlink_supported = nil
-
-  # Our CI does not currently hit the "symlink not supported" case, but this is
-  # needed for Windows developers without symlink support enabled (the default
-  # for non admin) to be able to run the tests successfully
-  def symlink_supported?
-    if @@symlink_supported.nil?
-      begin
-        File.symlink("", "")
-      rescue Errno::ENOENT, Errno::EEXIST
-        @@symlink_supported = true
-      rescue NotImplementedError, SystemCallError
-        @@symlink_supported = false
-      end
-    end
-    @@symlink_supported
-  end
-
   def setup
     super
     common_installer_setup
@@ -98,38 +79,25 @@ end
     assert_path_exists installed_exec
 
     wrapper = File.read installed_exec
-    assert_match %r|generated by RubyGems|, wrapper
+    assert_match %r{generated by RubyGems}, wrapper
   end
 
   def test_check_executable_overwrite_default_bin_dir
-    installer = setup_base_installer
+    installer = setup_base_installer(false)
 
-    if defined?(RUBY_FRAMEWORK_VERSION)
-      orig_RUBY_FRAMEWORK_VERSION = RUBY_FRAMEWORK_VERSION
-      Object.send :remove_const, :RUBY_FRAMEWORK_VERSION
-    end
-    orig_bindir = RbConfig::CONFIG['bindir']
-    RbConfig::CONFIG['bindir'] = Gem.bindir
+    bindir(Gem.bindir) do
+      util_conflict_executable false
 
-    util_conflict_executable false
+      ui = Gem::MockGemUi.new "n\n"
+      use_ui ui do
+        e = assert_raises Gem::InstallError do
+          installer.generate_bin
+        end
 
-    ui = Gem::MockGemUi.new "n\n"
-    use_ui ui do
-      e = assert_raises Gem::InstallError do
-        installer.generate_bin
+        conflicted = File.join @gemhome, 'bin', 'executable'
+        assert_match %r{\A"executable" from a conflicts with (?:#{Regexp.quote(conflicted)}|installed executable from conflict)\z},
+                     e.message
       end
-
-      conflicted = File.join @gemhome, 'bin', 'executable'
-      assert_match %r%\A"executable" from a conflicts with (?:#{Regexp.quote(conflicted)}|installed executable from conflict)\z%,
-                   e.message
-    end
-  ensure
-    Object.const_set :RUBY_FRAMEWORK_VERSION, orig_RUBY_FRAMEWORK_VERSION if
-      orig_RUBY_FRAMEWORK_VERSION
-    if orig_bindir
-      RbConfig::CONFIG['bindir'] = orig_bindir
-    else
-      RbConfig::CONFIG.delete 'bindir'
     end
   end
 
@@ -169,13 +137,13 @@ gem 'other', version
     assert_path_exists installed_exec
 
     wrapper = File.read installed_exec
-    assert_match %r|generated by RubyGems|, wrapper
+    assert_match %r{generated by RubyGems}, wrapper
   ensure
     Gem::Installer.exec_format = nil
   end
 
   def test_check_executable_overwrite_other_gem
-    installer = setup_base_installer
+    installer = setup_base_installer(false)
 
     util_conflict_executable true
 
@@ -204,7 +172,7 @@ gem 'other', version
     assert_path_exists installed_exec
 
     wrapper = File.read installed_exec
-    assert_match %r|generated by RubyGems|, wrapper
+    assert_match %r{generated by RubyGems}, wrapper
   end
 
   def test_check_executable_overwrite_other_non_gem
@@ -219,7 +187,7 @@ gem 'other', version
     assert_path_exists installed_exec
 
     wrapper = File.read installed_exec
-    assert_match %r|generated by RubyGems|, wrapper
+    assert_match %r{generated by RubyGems}, wrapper
   end unless Gem.win_platform?
 
   def test_check_that_user_bin_dir_is_in_path
@@ -228,7 +196,7 @@ gem 'other', version
     bin_dir = installer.bin_dir
 
     if Gem.win_platform?
-      bin_dir = bin_dir.downcase.gsub(File::SEPARATOR, File::ALT_SEPARATOR)
+      bin_dir = bin_dir.downcase
     end
 
     orig_PATH, ENV['PATH'] =
@@ -239,6 +207,16 @@ gem 'other', version
     end
 
     assert_empty @ui.error
+
+    return unless win_platform?
+
+    ENV['PATH'] = [orig_PATH, bin_dir.tr(File::SEPARATOR, File::ALT_SEPARATOR)].join(File::PATH_SEPARATOR)
+
+    use_ui @ui do
+      installer.check_that_user_bin_dir_is_in_path
+    end
+
+    assert_empty @ui.error
   ensure
     ENV['PATH'] = orig_PATH
   end
@@ -271,7 +249,7 @@ gem 'other', version
     expected = installer.bin_dir
 
     if Gem.win_platform?
-      expected = expected.downcase.gsub(File::SEPARATOR, File::ALT_SEPARATOR)
+      expected = expected.downcase
     end
 
     assert_match expected, @ui.error
@@ -309,7 +287,7 @@ gem 'other', version
   end
 
   def test_ensure_loadable_spec_security_policy
-    skip 'openssl is missing' unless defined?(OpenSSL::SSL)
+    skip 'openssl is missing' unless Gem::HAVE_OPENSSL
 
     _, a_gem = util_gem 'a', 2 do |s|
       s.add_dependency 'garbage ~> 5'
@@ -355,7 +333,7 @@ gem 'other', version
     assert_equal mask, File.stat(installed_exec).mode unless win_platform?
 
     wrapper = File.read installed_exec
-    assert_match %r|generated by RubyGems|, wrapper
+    assert_match %r{generated by RubyGems}, wrapper
   end
 
   def test_generate_bin_bindir_with_user_install_warning
@@ -367,7 +345,7 @@ gem 'other', version
 
     options = {
       :bin_dir => bin_dir,
-      :install_dir => "/non/existent"
+      :install_dir => "/non/existent",
     }
 
     inst = Gem::Installer.at '', options
@@ -398,7 +376,7 @@ gem 'other', version
     assert_equal mask, File.stat(installed_exec).mode unless win_platform?
 
     wrapper = File.read installed_exec
-    assert_match %r|generated by RubyGems|, wrapper
+    assert_match %r{generated by RubyGems}, wrapper
   end
 
   def test_generate_bin_script_format
@@ -457,7 +435,7 @@ gem 'other', version
     assert_equal mask, File.stat(installed_exec).mode unless win_platform?
 
     wrapper = File.read installed_exec
-    assert_match %r|generated by RubyGems|, wrapper
+    assert_match %r{generated by RubyGems}, wrapper
   end
 
   def test_generate_bin_script_no_execs
@@ -514,7 +492,7 @@ gem 'other', version
     assert_equal mask, File.stat(installed_exec).mode unless win_platform?
 
     wrapper = File.read installed_exec
-    assert_match %r|generated by RubyGems|, wrapper
+    assert_match %r{generated by RubyGems}, wrapper
     # HACK some gems don't have #! in their executables, restore 2008/06
     #assert_no_match %r|generated by RubyGems|, wrapper
   end
@@ -540,9 +518,9 @@ gem 'other', version
     assert_path_exists installed_exec
     assert_equal mask, File.stat(installed_exec).mode unless win_platform?
 
-    assert_match %r|generated by RubyGems|, File.read(installed_exec)
+    assert_match %r{generated by RubyGems}, File.read(installed_exec)
 
-    refute_match %r|generated by RubyGems|, File.read(real_exec),
+    refute_match %r{generated by RubyGems}, File.read(real_exec),
                  'real executable overwritten'
   end
 
@@ -752,11 +730,152 @@ gem 'other', version
     installer.generate_bin
 
     default_shebang = Gem.ruby
-    shebang_line = open("#{@gemhome}/bin/executable") { |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_generate_plugins
+    installer = util_setup_installer do |spec|
+      write_file File.join(@tempdir, 'lib', 'rubygems_plugin.rb') do |io|
+        io.write "puts __FILE__"
+      end
+
+      spec.files += %w[lib/rubygems_plugin.rb]
+    end
+
+    build_rake_in do
+      installer.install
+    end
+
+    plugin_path = File.join Gem.plugindir, 'a_plugin.rb'
+
+    FileUtils.rm plugin_path
+
+    installer.generate_plugins
+
+    assert File.exist?(plugin_path), 'plugin not written'
+  end
+
+  def test_generate_plugins_with_install_dir
+    spec = quick_gem 'a' do |s|
+      write_file File.join(@tempdir, 'lib', 'rubygems_plugin.rb') do |io|
+        io.write "puts __FILE__"
+      end
+
+      s.files += %w[lib/rubygems_plugin.rb]
+    end
+
+    util_build_gem spec
+
+    plugin_path = File.join "#{@gemhome}2", 'plugins', 'a_plugin.rb'
+    installer = util_installer spec, "#{@gemhome}2"
+
+    assert_equal spec, installer.install
+
+    assert File.exist?(plugin_path), 'plugin not written to install_dir'
+  end
+
+  def test_generate_plugins_with_user_install
+    spec = quick_gem 'a' do |s|
+      write_file File.join(@tempdir, 'lib', 'rubygems_plugin.rb') do |io|
+        io.write "puts __FILE__"
+      end
+
+      s.files += %w[lib/rubygems_plugin.rb]
+    end
+
+    util_build_gem spec
+
+    File.chmod(0555, Gem.plugindir)
+    system_path = File.join(Gem.plugindir, 'a_plugin.rb')
+    user_path = File.join(Gem.plugindir(Gem.user_dir), 'a_plugin.rb')
+    installer = util_installer spec, Gem.dir, :user
+
+    assert_equal spec, installer.install
+
+    assert !File.exist?(system_path), 'plugin incorrectly written to system plugins_dir'
+    assert File.exist?(user_path), 'plugin not written to user plugins_dir'
+  end
+
+  def test_generate_plugins_with_build_root
+    spec = quick_gem 'a' do |s|
+      write_file File.join(@tempdir, 'lib', 'rubygems_plugin.rb') do |io|
+        io.write "puts __FILE__"
+      end
+
+      s.files += %w[lib/rubygems_plugin.rb]
+    end
+
+    util_build_gem spec
+
+    File.chmod(0555, Gem.plugindir)
+    system_path = File.join(Gem.plugindir, 'a_plugin.rb')
+
+    build_root = File.join(@tempdir, 'build_root')
+    build_root_path = File.join(build_root, Gem.plugindir.gsub(/^[a-zA-Z]:/, ''), 'a_plugin.rb')
+
+    installer = Gem::Installer.at spec.cache_file, :build_root => build_root
+
+    assert_equal spec, installer.install
+
+    assert !File.exist?(system_path), 'plugin written incorrect written to system plugins_dir'
+    assert File.exist?(build_root_path), 'plugin not written to build_root'
+  end
+
+  def test_keeps_plugins_up_to_date
+    # NOTE: version a-2 is already installed by setup hooks
+
+    write_file File.join(@tempdir, 'lib', 'rubygems_plugin.rb') do |io|
+      io.write "puts __FILE__"
+    end
+
+    build_rake_in do
+      util_setup_installer do |spec|
+        spec.version = '1'
+        spec.files += %w[lib/rubygems_plugin.rb]
+      end.install
+
+      plugin_path = File.join Gem.plugindir, 'a_plugin.rb'
+      refute File.exist?(plugin_path), 'old version installed while newer version without plugin also installed, but plugin written'
+
+      util_setup_installer do |spec|
+        spec.version = '2'
+        spec.files += %w[lib/rubygems_plugin.rb]
+      end.install
+
+      plugin_path = File.join Gem.plugindir, 'a_plugin.rb'
+      assert File.exist?(plugin_path), 'latest version reinstalled, but plugin not written'
+      assert_match %r{\Arequire.*a-2/lib/rubygems_plugin\.rb}, File.read(plugin_path), 'written plugin has incorrect content'
+
+      util_setup_installer do |spec|
+        spec.version = '3'
+        spec.files += %w[lib/rubygems_plugin.rb]
+      end.install
+
+      plugin_path = File.join Gem.plugindir, 'a_plugin.rb'
+      assert File.exist?(plugin_path), 'latest version installed, but plugin removed'
+      assert_match %r{\Arequire.*a-3/lib/rubygems_plugin\.rb}, File.read(plugin_path), 'written plugin has incorrect content'
+
+      util_setup_installer do |spec|
+        spec.version = '4'
+      end.install
+
+      refute File.exist?(plugin_path), 'new version installed without a plugin while older version with a plugin installed, but plugin not removed'
+    end
+  end
+
+  def test_generates_plugins_dir_under_install_dir_if_not_there
+    Gem.use_paths "#{@gemhome}2" # Set GEM_HOME to an uninitialized repo
+
+    @spec = util_spec 'a'
+
+    path = Gem::Package.build @spec
+
+    installer = Gem::Installer.at path, :install_dir => "#{@gemhome}3"
+    assert_equal @spec, installer.install
+  end
+
   def test_initialize
     spec = util_spec 'a' do |s|
       s.platform = Gem::Platform.new 'mswin32'
@@ -953,7 +1072,13 @@ gem 'other', version
   end
 
   def test_install_creates_binstub_that_prefers_user_installed_gem_to_default
-    install_default_gems new_default_spec('default', '2')
+    default_spec = new_default_spec('default', '2', nil, 'exe/executable')
+    default_spec.executables = 'executable'
+    install_default_gems default_spec
+
+    exe = File.join @gemhome, 'bin', 'executable'
+
+    assert_path_exists exe, "default gem's executable not installed"
 
     installer = util_setup_installer do |spec|
       spec.name = 'default'
@@ -971,8 +1096,6 @@ gem 'other', version
       end
     end
 
-    exe = File.join @gemhome, 'bin', 'executable'
-
     e = assert_raises RuntimeError do
       instance_eval File.read(exe)
     end
@@ -1036,7 +1159,7 @@ gem 'other', version
         Gem::Package.build @spec
       end
     end
-    installer = Gem::Installer.at @gem
+    installer = Gem::Installer.at @gem, :force => true
     build_rake_in do
       use_ui @ui do
         assert_equal @spec, installer.install
@@ -1058,6 +1181,15 @@ gem 'other', version
     assert_path_exists gem_dir
   end
 
+  def test_install_build_root
+    build_root = File.join(@tempdir, 'build_root')
+
+    @gem = setup_base_gem
+    installer = Gem::Installer.at @gem, :build_root => build_root
+
+    assert_equal @spec, installer.install
+  end
+
   def test_install_missing_dirs
     installer = setup_base_installer
 
@@ -1166,7 +1298,7 @@ gem 'other', version
       installer.install
     end
 
-    assert_match %r|I am a shiny gem!|, @ui.output
+    assert_match %r{I am a shiny gem!}, @ui.output
   end
 
   def test_install_with_skipped_message
@@ -1180,7 +1312,7 @@ gem 'other', version
       installer.install
     end
 
-    refute_match %r|I am a shiny gem!|, @ui.output
+    refute_match %r{I am a shiny gem!}, @ui.output
   end
 
   def test_install_extension_dir
@@ -1239,7 +1371,7 @@ gem 'other', version
 
     # reinstall the gem, this is also the same as pristine
     use_ui @ui do
-      installer = Gem::Installer.at path
+      installer = Gem::Installer.at path, :force => true
       installer.install
     end
 
@@ -1316,7 +1448,7 @@ gem 'other', version
       installer.install
     end
 
-    expected = File.join @spec.full_require_paths.find { |path|
+    expected = File.join @spec.full_require_paths.find {|path|
       File.exist? File.join path, 'b.rb'
     }, 'b.rb'
     assert_equal expected, @spec.matches_for_glob('b.rb').first
@@ -1384,7 +1516,7 @@ gem 'other', version
     end
 
     # empty depend file for no auto dependencies
-    @spec.files += %W"depend #{@spec.name}.c".each do |file|
+    @spec.files += %W[depend #{@spec.name}.c].each do |file|
       write_file File.join(@tempdir, file)
     end
 
@@ -1439,6 +1571,7 @@ gem 'other', version
     installer = setup_base_installer
     @spec.add_dependency 'b', '> 5'
     installer = util_setup_gem
+    installer.force = false
 
     use_ui @ui do
       assert_raises Gem::InstallError do
@@ -1683,13 +1816,24 @@ gem 'other', version
 
   def test_process_options_build_root
     build_root = File.join @tempdir, 'build_root'
+    bin_dir = File.join(build_root, @gemhome.gsub(/^[a-zA-Z]:/, ''), 'bin')
+    gem_home = File.join(build_root, @gemhome.gsub(/^[a-zA-Z]:/, ''))
+    plugins_dir = File.join(build_root, @gemhome.gsub(/^[a-zA-Z]:/, ''), 'plugins')
 
     @gem = setup_base_gem
-    installer = Gem::Installer.at @gem, :build_root => build_root
+    installer = use_ui(@ui) { Gem::Installer.at @gem, :build_root => build_root }
+
+    assert_equal build_root, installer.build_root
+    assert_equal bin_dir, installer.bin_dir
+    assert_equal gem_home, 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
+    errors = @ui.error.split("\n")
+
+    assert_equal "WARNING:  You build with buildroot.", errors.shift
+    assert_equal "  Build root: #{build_root}", errors.shift
+    assert_equal "  Bin dir: #{bin_dir}", errors.shift
+    assert_equal "  Gem home: #{gem_home}", errors.shift
+    assert_equal "  Plugins dir: #{plugins_dir}", errors.shift
   end
 
   def test_shebang_arguments
@@ -1739,9 +1883,9 @@ gem 'other', version
 
     shebang = installer.shebang 'executable'
 
-    env_shebang = "/usr/bin/env" unless Gem.win_platform?
+    bin_env = get_bin_env
 
-    assert_equal("#!#{env_shebang} #{RbConfig::CONFIG['ruby_install_name']}",
+    assert_equal("#!#{bin_env} #{RbConfig::CONFIG['ruby_install_name']}",
                  shebang)
   end
 
@@ -1820,10 +1964,18 @@ gem 'other', version
     assert_equal "#!test", shebang
   end
 
+  def get_bin_env
+    if win_platform?
+      ""
+    else
+      %w[/usr/bin/env /bin/env].find {|f| File.executable?(f) }
+    end
+  end
+
   def test_shebang_custom_with_expands
     installer = setup_base_installer
 
-    bin_env = win_platform? ? '' : '/usr/bin/env'
+    bin_env = get_bin_env
     conf = Gem::ConfigFile.new []
     conf[:custom_shebang] = '1 $env 2 $ruby 3 $exec 4 $name'
 
@@ -1839,7 +1991,7 @@ gem 'other', version
   def test_shebang_custom_with_expands_and_arguments
     installer = setup_base_installer
 
-    bin_env = win_platform? ? '' : '/usr/bin/env'
+    bin_env = get_bin_env
     conf = Gem::ConfigFile.new []
     conf[:custom_shebang] = '1 $env 2 $ruby 3 $exec'
 
@@ -1964,7 +2116,7 @@ gem 'other', version
   def test_dir
     installer = setup_base_installer
 
-    assert_match %r!/gemhome/gems/a-2$!, installer.dir
+    assert_match %r{/gemhome/gems/a-2$}, installer.dir
   end
 
   def test_default_gem_loaded_from
@@ -2004,7 +2156,13 @@ gem 'other', version
     assert_path_exists installed_exec
 
     wrapper = File.read installed_exec
-    refute_match %r|generated by RubyGems|, wrapper
+
+    if symlink_supported?
+      refute_match %r{generated by RubyGems}, wrapper
+    else # when symlink not supported, it warns and fallbacks back to installing wrapper
+      assert_match %r{Unable to use symlinks, installing wrapper}, @ui.error
+      assert_match %r{generated by RubyGems}, wrapper
+    end
   end
 
   def test_default_gem_with_wrappers
@@ -2024,7 +2182,7 @@ gem 'other', version
     assert_path_exists installed_exec
 
     wrapper = File.read installed_exec
-    assert_match %r|generated by RubyGems|, wrapper
+    assert_match %r{generated by RubyGems}, wrapper
   end
 
   def test_default_gem_with_exe_as_bindir
@@ -2057,6 +2215,23 @@ gem 'other', version
     assert_equal ['exe/executable'], default_spec.files
   end
 
+  def test_default_gem_to_specific_install_dir
+    @gem = setup_base_gem
+    installer = util_installer @spec, "#{@gemhome}2"
+    installer.options[:install_as_default] = true
+
+    use_ui @ui do
+      installer.install
+    end
+
+    assert_directory_exists File.join("#{@gemhome}2", 'specifications')
+    assert_directory_exists File.join("#{@gemhome}2", 'specifications', 'default')
+
+    default_spec = eval File.read File.join("#{@gemhome}2", 'specifications', 'default', 'a-2.gemspec')
+    assert_equal Gem::Version.new("2"), default_spec.version
+    assert_equal ['bin/executable'], default_spec.files
+  end
+
   def test_package_attribute
     gem = quick_gem 'c' do |spec|
       util_make_exec spec, '#!/usr/bin/ruby', 'exe'
@@ -2067,6 +2242,16 @@ gem 'other', version
     assert_kind_of(Gem::Package, installer.package)
   end
 
+  def test_gem_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, :gem)
+    assert_kind_of(String, installer.gem)
+  end
+
   def old_ruby_required(requirement)
     spec = util_spec 'old_ruby_required', '1' do |s|
       s.required_ruby_version = requirement
@@ -2097,7 +2282,6 @@ gem 'other', version
   end
 
   def mask
-    0100755 & (~File.umask)
+    0100755
   end
-
 end