rubygems-update 3.1.6 → 3.4.10

data/test/rubygems/test_gem_commands_setup_command.rb

@@ -1,128 +1,123 @@
-# coding: UTF-8
 # frozen_string_literal: true
 
-require 'rubygems/test_case'
-require 'rubygems/commands/setup_command'
+require_relative "helper"
+require "rubygems/commands/setup_command"
 
 class TestGemCommandsSetupCommand < Gem::TestCase
-
-  bundler_gemspec = File.expand_path("../../../bundler/lib/bundler/version.rb", __FILE__)
+  bundler_gemspec = File.expand_path("../../bundler/lib/bundler/version.rb", __dir__)
   if File.exist?(bundler_gemspec)
     BUNDLER_VERS = File.read(bundler_gemspec).match(/VERSION = "(#{Gem::Version::VERSION_PATTERN})"/)[1]
   else
-    BUNDLER_VERS = "2.0.1".freeze
+    BUNDLER_VERS = "2.0.1"
   end
 
   def setup
     super
 
-    @install_dir = File.join @tempdir, 'install'
     @cmd = Gem::Commands::SetupCommand.new
-    @cmd.options[:prefix] = @install_dir
-
-    FileUtils.mkdir_p 'bin'
-    FileUtils.mkdir_p 'lib/rubygems/ssl_certs/rubygems.org'
-
-    File.open 'bin/gem',                   'w' do
-      |io| io.puts '# gem'
-    end
-
-    File.open 'lib/rubygems.rb',           'w' do |io|
-      io.puts '# rubygems.rb'
-    end
-
-    File.open 'lib/rubygems/test_case.rb', 'w' do |io|
-      io.puts '# test_case.rb'
-    end
-
-    File.open 'lib/rubygems/ssl_certs/rubygems.org/foo.pem', 'w' do |io|
-      io.puts 'PEM'
-    end
-
-    FileUtils.mkdir_p 'bundler/exe'
-    FileUtils.mkdir_p 'bundler/lib/bundler'
-
-    File.open 'bundler/exe/bundle',        'w' do |io|
-      io.puts '# bundle'
-    end
-
-    File.open 'bundler/lib/bundler.rb',    'w' do |io|
-      io.puts '# bundler.rb'
-    end
-
-    File.open 'bundler/lib/bundler/b.rb',  'w' do |io|
-      io.puts '# b.rb'
-    end
+    @cmd.options[:document] = []
 
-    FileUtils.mkdir_p 'default/gems'
+    filelist = %w[
+      bin/gem
+      lib/rubygems.rb
+      lib/rubygems/requirement.rb
+      lib/rubygems/ssl_certs/rubygems.org/foo.pem
+      bundler/exe/bundle
+      bundler/exe/bundler
+      bundler/lib/bundler.rb
+      bundler/lib/bundler/b.rb
+      bundler/bin/bundler/man/bundle-b.1
+      bundler/lib/bundler/man/bundle-b.1.ronn
+      bundler/lib/bundler/man/gemfile.5
+      bundler/lib/bundler/man/gemfile.5.ronn
+      bundler/lib/bundler/templates/.circleci/config.yml
+      bundler/lib/bundler/templates/.travis.yml
+    ]
+
+    create_dummy_files(filelist)
 
     gemspec = Gem::Specification.new
     gemspec.author = "Us"
     gemspec.name = "bundler"
     gemspec.version = BUNDLER_VERS
     gemspec.bindir = "exe"
-    gemspec.executables = ["bundle"]
+    gemspec.executables = ["bundle", "bundler"]
 
-    File.open 'bundler/bundler.gemspec',   'w' do |io|
+    File.open "bundler/bundler.gemspec", "w" do |io|
       io.puts gemspec.to_ruby
     end
 
-    open(File.join(Gem.default_specifications_dir, "bundler-1.15.4.gemspec"), 'w') do |io|
+    File.open(File.join(Gem.default_specifications_dir, "bundler-1.15.4.gemspec"), "w") do |io|
       gemspec.version = "1.15.4"
       io.puts gemspec.to_ruby
     end
 
-    FileUtils.mkdir_p File.join(Gem.default_dir, "specifications")
+    spec_fetcher do |fetcher|
+      fetcher.download "bundler", "1.15.4"
 
-    open(File.join(Gem.default_dir, "specifications", "bundler-#{BUNDLER_VERS}.gemspec"), 'w') do |io|
-      io.puts "# bundler-#{BUNDLER_VERS}"
-    end
+      fetcher.gem "bundler", bundler_version
 
-    open(File.join(Gem.default_dir, "specifications", "bundler-audit-1.0.0.gemspec"), 'w') do |io|
-      io.puts '# bundler-audit'
+      fetcher.gem "bundler-audit", "1.0.0"
     end
-
-    FileUtils.mkdir_p 'default/gems/bundler-1.15.4'
-    FileUtils.mkdir_p 'default/gems/bundler-audit-1.0.0'
-  end
-
-  def gem_install(name)
-    gem = util_spec name do |s|
-      s.executables = [name]
-      s.files = %W[bin/#{name}]
-    end
-    write_file File.join @tempdir, 'bin', name do |f|
-      f.puts '#!/usr/bin/ruby'
-    end
-    install_gem gem
-    File.join @gemhome, 'bin', name
   end
 
   def test_execute_regenerate_binstubs
-    gem_bin_path = gem_install 'a'
+    gem_bin_path = gem_install "a"
     write_file gem_bin_path do |io|
-      io.puts 'I changed it!'
+      io.puts "I changed it!"
     end
 
-    @cmd.options[:document] = []
     @cmd.execute
 
     assert_match %r{\A#!}, File.read(gem_bin_path)
   end
 
   def test_execute_no_regenerate_binstubs
-    gem_bin_path = gem_install 'a'
+    gem_bin_path = gem_install "a"
     write_file gem_bin_path do |io|
-      io.puts 'I changed it!'
+      io.puts "I changed it!"
     end
 
-    @cmd.options[:document] = []
     @cmd.options[:regenerate_binstubs] = false
     @cmd.execute
 
     assert_equal "I changed it!\n", File.read(gem_bin_path)
   end
 
+  def test_execute_regenerate_plugins
+    gem_plugin_path = gem_install_with_plugin "a"
+    write_file gem_plugin_path do |io|
+      io.puts "I changed it!"
+    end
+
+    @cmd.execute
+
+    assert_match %r{\Arequire}, File.read(gem_plugin_path)
+  end
+
+  def test_execute_no_regenerate_plugins
+    gem_plugin_path = gem_install_with_plugin "a"
+    write_file gem_plugin_path do |io|
+      io.puts "I changed it!"
+    end
+
+    @cmd.options[:regenerate_plugins] = false
+    @cmd.execute
+
+    assert_equal "I changed it!\n", File.read(gem_plugin_path)
+  end
+
+  def test_execute_regenerate_plugins_creates_plugins_dir_if_not_there
+    gem_plugin_path = gem_install_with_plugin "a"
+
+    # Simulate gem installed with an older rubygems without a plugins layout
+    FileUtils.rm_rf Gem.plugindir
+
+    @cmd.execute
+
+    assert_match %r{\Arequire}, File.read(gem_plugin_path)
+  end
+
   def test_execute_informs_about_installed_executables
     use_ui @ui do
       @cmd.execute
@@ -133,207 +128,259 @@ class TestGemCommandsSetupCommand < Gem::TestCase
     exec_line = out.shift until exec_line == "RubyGems installed the following executables:"
     assert_equal "\t#{default_gem_bin_path}", out.shift
     assert_equal "\t#{default_bundle_bin_path}", out.shift
+    assert_equal "\t#{default_bundler_bin_path}", out.shift
   end
 
   def test_env_shebang_flag
-    gem_bin_path = gem_install 'a'
+    gem_bin_path = gem_install "a"
     write_file gem_bin_path do |io|
-      io.puts 'I changed it!'
+      io.puts "I changed it!"
     end
 
-    @cmd.options[:document] = []
     @cmd.options[:env_shebang] = true
     @cmd.execute
 
-    ruby_exec = sprintf Gem.default_exec_format, 'ruby'
+    ruby_exec = sprintf Gem.default_exec_format, "ruby"
 
-    if Gem.win_platform?
-      assert_match %r%\A#!\s*#{ruby_exec}%, File.read(default_gem_bin_path)
-      assert_match %r%\A#!\s*#{ruby_exec}%, File.read(default_bundle_bin_path)
-      assert_match %r%\A#!\s*#{ruby_exec}%, File.read(gem_bin_path)
-    else
-      assert_match %r%\A#!/usr/bin/env #{ruby_exec}%, File.read(default_gem_bin_path)
-      assert_match %r%\A#!/usr/bin/env #{ruby_exec}%, File.read(default_bundle_bin_path)
-      assert_match %r%\A#!/usr/bin/env #{ruby_exec}%, File.read(gem_bin_path)
-    end
+    bin_env = win_platform? ? "" : %w[/usr/bin/env /bin/env].find {|f| File.executable?(f) } + " "
+    assert_match %r{\A#!\s*#{bin_env}#{ruby_exec}}, File.read(default_gem_bin_path)
+    assert_match %r{\A#!\s*#{bin_env}#{ruby_exec}}, File.read(default_bundle_bin_path)
+    assert_match %r{\A#!\s*#{bin_env}#{ruby_exec}}, File.read(default_bundler_bin_path)
+    assert_match %r{\A#!\s*#{bin_env}#{ruby_exec}}, File.read(gem_bin_path)
   end
 
-  def test_pem_files_in
-    assert_equal %w[rubygems/ssl_certs/rubygems.org/foo.pem],
-                 @cmd.pem_files_in('lib').sort
+  def test_destdir_flag_does_not_try_to_write_to_the_default_gem_home
+    FileUtils.chmod "-w", File.join(@gemhome, "plugins")
+
+    destdir = File.join(@tempdir, "foo")
+
+    @cmd.options[:destdir] = destdir
+    @cmd.execute
+
+    bundler_spec.executables.each do |e|
+      assert_path_exist prepend_destdir(destdir, File.join(@gemhome, "gems", bundler_spec.full_name, bundler_spec.bindir, e))
+    end
   end
 
-  def test_rb_files_in
-    assert_equal %w[rubygems.rb rubygems/test_case.rb],
-                 @cmd.rb_files_in('lib').sort
+  def test_files_in
+    assert_equal %w[rubygems.rb rubygems/requirement.rb rubygems/ssl_certs/rubygems.org/foo.pem],
+                 @cmd.files_in("lib").sort
   end
 
   def test_install_lib
     @cmd.extend FileUtils
 
-    Dir.mktmpdir 'lib' do |dir|
+    Dir.mktmpdir "lib" do |dir|
       @cmd.install_lib dir
 
-      assert_path_exists File.join(dir, 'rubygems.rb')
-      assert_path_exists File.join(dir, 'rubygems/ssl_certs/rubygems.org/foo.pem')
+      assert_path_exist File.join(dir, "rubygems.rb")
+      assert_path_exist File.join(dir, "rubygems/ssl_certs/rubygems.org/foo.pem")
+
+      assert_path_exist File.join(dir, "bundler.rb")
+      assert_path_exist File.join(dir, "bundler/b.rb")
 
-      assert_path_exists File.join(dir, 'bundler.rb')
-      assert_path_exists File.join(dir, 'bundler/b.rb')
+      assert_path_exist File.join(dir, "bundler/templates/.circleci/config.yml")
+      assert_path_exist File.join(dir, "bundler/templates/.travis.yml")
     end
   end
 
   def test_install_default_bundler_gem
     @cmd.extend FileUtils
 
-    bin_dir = File.join(@gemhome, 'bin')
+    bin_dir = File.join(@gemhome, "bin")
     @cmd.install_default_bundler_gem bin_dir
 
-    bundler_spec = Gem::Specification.load("bundler/bundler.gemspec")
     default_spec_path = File.join(Gem.default_specifications_dir, "#{bundler_spec.full_name}.gemspec")
     spec = Gem::Specification.load(default_spec_path)
 
     spec.executables.each do |e|
       if Gem.win_platform?
-        assert_path_exists File.join(bin_dir, "#{e}.bat")
+        assert_path_exist File.join(bin_dir, "#{e}.bat")
       end
 
-      assert_path_exists File.join bin_dir, Gem.default_exec_format % e
+      assert_path_exist File.join bin_dir, e
     end
 
-    default_dir = Gem.default_specifications_dir
-
     # expect to remove other versions of bundler gemspecs on default specification directory.
-    refute_path_exists File.join(default_dir, "bundler-1.15.4.gemspec")
-    assert_path_exists File.join(default_dir, "bundler-#{BUNDLER_VERS}.gemspec")
+    assert_path_not_exist previous_bundler_specification_path
+    assert_path_exist new_bundler_specification_path
 
     # expect to not remove bundler-* gemspecs.
-    assert_path_exists File.join(Gem.default_dir, "specifications", "bundler-audit-1.0.0.gemspec")
+    assert_path_exist File.join(Gem.dir, "specifications", "bundler-audit-1.0.0.gemspec")
 
     # expect to remove normal gem that was same version. because it's promoted default gems.
-    refute_path_exists File.join(Gem.default_dir, "specifications", "bundler-#{BUNDLER_VERS}.gemspec")
+    assert_path_not_exist File.join(Gem.dir, "specifications", "bundler-#{bundler_version}.gemspec")
+
+    assert_path_exist "#{Gem.dir}/gems/bundler-#{bundler_version}"
+    assert_path_exist "#{Gem.dir}/gems/bundler-1.15.4"
+    assert_path_exist "#{Gem.dir}/gems/bundler-audit-1.0.0"
+  end
+
+  def test_install_default_bundler_gem_with_default_gems_not_installed_at_default_dir
+    @cmd.extend FileUtils
 
-    # expect to install default gems. It location was `site_ruby` directory on real world.
-    assert_path_exists "default/gems/bundler-#{BUNDLER_VERS}"
+    gemhome2 = File.join(@tempdir, "gemhome2")
+    Gem.instance_variable_set(:@default_dir, gemhome2)
 
-    # expect to not remove other versions of bundler on `site_ruby`
-    assert_path_exists 'default/gems/bundler-1.15.4'
+    FileUtils.mkdir_p gemhome2
+    bin_dir = File.join(gemhome2, "bin")
 
-    # TODO: We need to assert to remove same version of bundler on gem_dir directory(It's not site_ruby dir)
+    @cmd.install_default_bundler_gem bin_dir
 
-    # expect to not remove bundler-* directory.
-    assert_path_exists 'default/gems/bundler-audit-1.0.0'
+    # expect to remove other versions of bundler gemspecs on default specification directory.
+    assert_path_not_exist previous_bundler_specification_path
+    assert_path_exist new_bundler_specification_path
   end
 
   def test_install_default_bundler_gem_with_force_flag
     @cmd.extend FileUtils
 
-    bin_dir = File.join(@gemhome, 'bin')
-    bundle_bin = File.join(bin_dir, 'bundle')
+    bin_dir = File.join(@gemhome, "bin")
+    bundle_bin = File.join(bin_dir, "bundle")
 
     write_file bundle_bin do |f|
-      f.puts '#!/usr/bin/ruby'
-      f.puts ''
+      f.puts "#!/usr/bin/ruby"
+      f.puts ""
       f.puts 'echo "hello"'
     end
 
-    bindir(bin_dir) do
-      @cmd.options[:force] = true
-
-      @cmd.install_default_bundler_gem bin_dir
+    @cmd.options[:force] = true
 
-      bundler_spec = Gem::Specification.load("bundler/bundler.gemspec")
-      default_spec_path = File.join(Gem.default_specifications_dir, "#{bundler_spec.full_name}.gemspec")
-      spec = Gem::Specification.load(default_spec_path)
+    @cmd.install_default_bundler_gem bin_dir
 
-      spec.executables.each do |e|
-        if Gem.win_platform?
-          assert_path_exists File.join(bin_dir, "#{e}.bat")
-        end
+    default_spec_path = File.join(Gem.default_specifications_dir, "#{bundler_spec.full_name}.gemspec")
+    spec = Gem::Specification.load(default_spec_path)
 
-        assert_path_exists File.join bin_dir, Gem.default_exec_format % e
+    spec.executables.each do |e|
+      if Gem.win_platform?
+        assert_path_exist File.join(bin_dir, "#{e}.bat")
       end
+
+      assert_path_exist File.join bin_dir, e
     end
   end
 
-  def test_remove_old_lib_files
-    lib                   = File.join @install_dir, 'lib'
-    lib_rubygems          = File.join lib, 'rubygems'
-    lib_bundler           = File.join lib, 'bundler'
-    lib_rubygems_defaults = File.join lib_rubygems, 'defaults'
+  def test_install_default_bundler_gem_with_destdir_flag
+    @cmd.extend FileUtils
 
-    securerandom_rb = File.join lib, 'securerandom.rb'
+    FileUtils.chmod "-w", @gemhome
 
-    engine_defaults_rb = File.join lib_rubygems_defaults, 'jruby.rb'
-    os_defaults_rb     = File.join lib_rubygems_defaults, 'operating_system.rb'
+    destdir = File.join(@tempdir, "foo")
+    bin_dir = File.join(destdir, "bin")
 
-    old_builder_rb     = File.join lib_rubygems, 'builder.rb'
-    old_format_rb      = File.join lib_rubygems, 'format.rb'
-    old_bundler_c_rb   = File.join lib_bundler,  'c.rb'
+    @cmd.options[:destdir] = destdir
 
-    FileUtils.mkdir_p lib_rubygems_defaults
-    FileUtils.mkdir_p lib_bundler
+    @cmd.install_default_bundler_gem bin_dir
 
-    File.open securerandom_rb,    'w' do |io|
-      io.puts '# securerandom.rb'
-    end
+    # leaves other versions of bundler gemspecs on default specification directory.
+    assert_path_exist previous_bundler_specification_path
+    assert_path_not_exist new_bundler_specification_path
 
-    File.open old_builder_rb,     'w' do |io|
-      io.puts '# builder.rb'
-    end
+    # installs the updated bundler gemspec to destdir
+    assert_path_not_exist prepend_destdir(destdir, previous_bundler_specification_path)
+    assert_path_exist prepend_destdir(destdir, new_bundler_specification_path)
 
-    File.open old_format_rb,      'w' do |io|
-      io.puts '# format.rb'
+    bundler_spec.executables.each do |e|
+      assert_path_exist prepend_destdir(destdir, File.join(@gemhome, "gems", bundler_spec.full_name, bundler_spec.bindir, e))
     end
+  ensure
+    FileUtils.chmod "+w", @gemhome
+  end
 
-    File.open old_bundler_c_rb,   'w' do |io|
-      io.puts '# c.rb'
-    end
+  def test_install_default_bundler_gem_with_destdir_and_prefix_flags
+    @cmd.extend FileUtils
 
-    File.open engine_defaults_rb, 'w' do |io|
-      io.puts '# jruby.rb'
-    end
+    destdir = File.join(@tempdir, "foo")
+    bin_dir = File.join(destdir, "bin")
+
+    @cmd.options[:destdir] = destdir
+    @cmd.options[:prefix] = "/"
+
+    @cmd.install_default_bundler_gem bin_dir
 
-    File.open os_defaults_rb,     'w' do |io|
-      io.puts '# operating_system.rb'
+    bundler_spec.executables.each do |e|
+      assert_path_exist File.join destdir, "gems", bundler_spec.full_name, bundler_spec.bindir, e
     end
+  end
+
+  def test_remove_old_lib_files
+    lib                   = RbConfig::CONFIG["sitelibdir"]
+    lib_rubygems          = File.join lib, "rubygems"
+    lib_bundler           = File.join lib, "bundler"
+    lib_rubygems_defaults = File.join lib_rubygems, "defaults"
+    lib_bundler_templates = File.join lib_bundler, "templates"
+
+    securerandom_rb = File.join lib, "securerandom.rb"
+
+    engine_defaults_rb = File.join lib_rubygems_defaults, "jruby.rb"
+    os_defaults_rb     = File.join lib_rubygems_defaults, "operating_system.rb"
+
+    old_gauntlet_rubygems_rb = File.join lib, "gauntlet_rubygems.rb"
+
+    old_builder_rb     = File.join lib_rubygems, "builder.rb"
+    old_format_rb      = File.join lib_rubygems, "format.rb"
+    old_bundler_c_rb   = File.join lib_bundler,  "c.rb"
+    old_bundler_ci     = File.join lib_bundler_templates, ".lecacy_ci", "config.yml"
+
+    files_that_go   = [old_gauntlet_rubygems_rb, old_builder_rb, old_format_rb, old_bundler_c_rb, old_bundler_ci]
+    files_that_stay = [securerandom_rb, engine_defaults_rb, os_defaults_rb]
+
+    create_dummy_files(files_that_go + files_that_stay)
 
     @cmd.remove_old_lib_files lib
 
-    refute_path_exists old_builder_rb
-    refute_path_exists old_format_rb
-    refute_path_exists old_bundler_c_rb
+    files_that_go.each {|file| assert_path_not_exist(file) unless file == old_bundler_ci }
+
+    files_that_stay.each {|file| assert_path_exist file }
+  end
+
+  def test_remove_old_man_files
+    man = File.join RbConfig::CONFIG["mandir"], "man"
+
+    ruby_1             = File.join man, "man1", "ruby.1"
+    bundle_b_1         = File.join man, "man1", "bundle-b.1"
+    bundle_b_1_ronn    = File.join man, "man1", "bundle-b.1.ronn"
+    bundle_b_1_txt     = File.join man, "man1", "bundle-b.1.txt"
+    gemfile_5          = File.join man, "man5", "gemfile.5"
+    gemfile_5_ronn     = File.join man, "man5", "gemfile.5.ronn"
+    gemfile_5_txt      = File.join man, "man5", "gemfile.5.txt"
+
+    files_that_go   = [bundle_b_1, bundle_b_1_txt, bundle_b_1_ronn, gemfile_5, gemfile_5_txt, gemfile_5_ronn]
+    files_that_stay = [ruby_1]
+
+    create_dummy_files(files_that_go + files_that_stay)
+
+    @cmd.remove_old_man_files man
+
+    files_that_go.each {|file| assert_path_not_exist file }
 
-    assert_path_exists securerandom_rb
-    assert_path_exists engine_defaults_rb
-    assert_path_exists os_defaults_rb
+    files_that_stay.each {|file| assert_path_exist file }
   end
 
   def test_show_release_notes
     @default_external = @ui.outs.external_encoding
     @ui.outs.set_encoding Encoding::US_ASCII
 
-    @cmd.options[:previous_version] = Gem::Version.new '2.0.2'
+    @cmd.options[:previous_version] = Gem::Version.new "2.0.2"
 
-    File.open 'History.txt', 'w' do |io|
-      io.puts <<-History_txt
-# coding: UTF-8
+    File.open "CHANGELOG.md", "w" do |io|
+      io.puts <<-HISTORY_TXT
+# #{Gem::VERSION} / 2013-03-26
 
-=== #{Gem::VERSION} / 2013-03-26
-
-* Bug fixes:
+## Bug fixes:
   * Fixed release note display for LANG=C when installing rubygems
   * π is tasty
 
-=== 2.0.2 / 2013-03-06
+# 2.0.2 / 2013-03-06
 
-* Bug fixes:
+## Bug fixes:
   * Other bugs fixed
 
-=== 2.0.1 / 2013-03-05
+# 2.0.1 / 2013-03-05
 
-* Bug fixes:
+## Bug fixes:
   * Yet more bugs fixed
-      History_txt
+      HISTORY_TXT
     end
 
     use_ui @ui do
@@ -341,9 +388,9 @@ class TestGemCommandsSetupCommand < Gem::TestCase
     end
 
     expected = <<-EXPECTED
-=== #{Gem::VERSION} / 2013-03-26
+# #{Gem::VERSION} / 2013-03-26
 
-* Bug fixes:
+## Bug fixes:
   * Fixed release note display for LANG=C when installing rubygems
   * π is tasty
 
@@ -359,14 +406,69 @@ class TestGemCommandsSetupCommand < Gem::TestCase
 
   private
 
+  def create_dummy_files(list)
+    list.each do |file|
+      FileUtils.mkdir_p File.dirname(file)
+
+      File.open file, "w" do |io|
+        io.puts "# #{File.basename(file)}"
+      end
+    end
+  end
+
+  def gem_install(name)
+    gem = util_spec name do |s|
+      s.executables = [name]
+      s.files = %W[bin/#{name}]
+    end
+    write_file File.join @tempdir, "bin", name do |f|
+      f.puts "#!/usr/bin/ruby"
+    end
+    install_gem gem
+    File.join @gemhome, "bin", name
+  end
+
+  def gem_install_with_plugin(name)
+    gem = util_spec name do |s|
+      s.files = %W[lib/rubygems_plugin.rb]
+    end
+    write_file File.join @tempdir, "lib", "rubygems_plugin.rb" do |f|
+      f.puts "require '#{gem.plugins.first}'"
+    end
+    install_gem gem
+
+    File.join Gem.plugindir, "#{name}_plugin.rb"
+  end
+
   def default_gem_bin_path
-    gem_exec = sprintf Gem.default_exec_format, 'gem'
-    File.join @install_dir, 'bin', gem_exec
+    File.join RbConfig::CONFIG["bindir"], "gem"
   end
 
   def default_bundle_bin_path
-    bundle_exec = sprintf Gem.default_exec_format, 'bundle'
-    File.join @install_dir, 'bin', bundle_exec
+    File.join RbConfig::CONFIG["bindir"], "bundle"
+  end
+
+  def default_bundler_bin_path
+    File.join RbConfig::CONFIG["bindir"], "bundler"
+  end
+
+  def previous_bundler_specification_path
+    File.join(Gem.default_specifications_dir, "bundler-1.15.4.gemspec")
+  end
+
+  def new_bundler_specification_path
+    File.join(Gem.default_specifications_dir, "bundler-#{bundler_version}.gemspec")
+  end
+
+  def bundler_spec
+    Gem::Specification.load("bundler/bundler.gemspec")
+  end
+
+  def bundler_version
+    bundler_spec.version
   end
 
+  def prepend_destdir(destdir, path)
+    File.join(destdir, path.gsub(/^[a-zA-Z]:/, ""))
+  end
 end unless Gem.java_platform?