rubygems-update 2.6.1 → 3.5.0

data/lib/rubygems/commands/setup_command.rb

@@ -1,98 +1,123 @@
 # frozen_string_literal: true
-require 'rubygems/command'
+
+require_relative "../command"
 
 ##
 # Installs RubyGems itself.  This command is ordinarily only available from a
 # RubyGems checkout or tarball.
 
 class Gem::Commands::SetupCommand < Gem::Command
-  HISTORY_HEADER = /^===\s*[\d.]+\s*\/\s*\d{4}-\d{2}-\d{2}\s*$/
-  VERSION_MATCHER = /^===\s*([\d.]+)\s*\/\s*\d{4}-\d{2}-\d{2}\s*$/
-
-  def initialize
-    require 'tmpdir'
+  HISTORY_HEADER = %r{^#\s*[\d.a-zA-Z]+\s*/\s*\d{4}-\d{2}-\d{2}\s*$}
+  VERSION_MATCHER = %r{^#\s*([\d.a-zA-Z]+)\s*/\s*\d{4}-\d{2}-\d{2}\s*$}
 
-    super 'setup', 'Install RubyGems',
-          :format_executable => true, :document => %w[ri],
-          :site_or_vendor => 'sitelibdir',
-          :destdir => '', :prefix => '', :previous_version => ''
+  ENV_PATHS = %w[/usr/bin/env /bin/env].freeze
 
-    add_option '--previous-version=VERSION',
-               'Previous version of rubygems',
-               'Used for changelog processing' do |version, options|
+  def initialize
+    super "setup", "Install RubyGems",
+          format_executable: false, document: %w[ri],
+          force: true,
+          site_or_vendor: "sitelibdir",
+          destdir: "", prefix: "", previous_version: "",
+          regenerate_binstubs: true,
+          regenerate_plugins: true
+
+    add_option "--previous-version=VERSION",
+               "Previous version of RubyGems",
+               "Used for changelog processing" do |version, options|
       options[:previous_version] = version
     end
 
-    add_option '--prefix=PREFIX',
-               'Prefix path for installing RubyGems',
-               'Will not affect gem repository location' do |prefix, options|
+    add_option "--prefix=PREFIX",
+               "Prefix path for installing RubyGems",
+               "Will not affect gem repository location" do |prefix, options|
       options[:prefix] = File.expand_path prefix
     end
 
-    add_option '--destdir=DESTDIR',
-               'Root directory to install RubyGems into',
-               'Mainly used for packaging RubyGems' do |destdir, options|
+    add_option "--destdir=DESTDIR",
+               "Root directory to install RubyGems into",
+               "Mainly used for packaging RubyGems" do |destdir, options|
       options[:destdir] = File.expand_path destdir
     end
 
-    add_option '--[no-]vendor',
-               'Install into vendorlibdir not sitelibdir' do |vendor, options|
-      options[:site_or_vendor] = vendor ? 'vendorlibdir' : 'sitelibdir'
+    add_option "--[no-]vendor",
+               "Install into vendorlibdir not sitelibdir" do |vendor, options|
+      options[:site_or_vendor] = vendor ? "vendorlibdir" : "sitelibdir"
     end
 
-    add_option '--[no-]format-executable',
-               'Makes `gem` match ruby',
-               'If ruby is ruby18, gem will be gem18' do |value, options|
+    add_option "--[no-]format-executable",
+               "Makes `gem` match ruby",
+               "If Ruby is ruby18, gem will be gem18" do |value, options|
       options[:format_executable] = value
     end
 
-    add_option '--[no-]document [TYPES]', Array,
-               'Generate documentation for RubyGems.',
-               'List the documentation types you wish to',
-               'generate.  For example: rdoc,ri' do |value, options|
+    add_option "--[no-]document [TYPES]", Array,
+               "Generate documentation for RubyGems",
+               "List the documentation types you wish to",
+               "generate.  For example: rdoc,ri" do |value, options|
       options[:document] = case value
                            when nil   then %w[rdoc ri]
                            when false then []
-                           else            value
-                           end
+                           else value
+      end
     end
 
-    add_option '--[no-]rdoc',
-               'Generate RDoc documentation for RubyGems' do |value, options|
-      if value then
-        options[:document] << 'rdoc'
+    add_option "--[no-]rdoc",
+               "Generate RDoc documentation for RubyGems" do |value, options|
+      if value
+        options[:document] << "rdoc"
       else
-        options[:document].delete 'rdoc'
+        options[:document].delete "rdoc"
       end
 
       options[:document].uniq!
     end
 
-    add_option '--[no-]ri',
-               'Generate RI documentation for RubyGems' do |value, options|
-      if value then
-        options[:document] << 'ri'
+    add_option "--[no-]ri",
+               "Generate RI documentation for RubyGems" do |value, options|
+      if value
+        options[:document] << "ri"
       else
-        options[:document].delete 'ri'
+        options[:document].delete "ri"
       end
 
       options[:document].uniq!
     end
 
+    add_option "--[no-]regenerate-binstubs",
+               "Regenerate gem binstubs" do |value, options|
+      options[:regenerate_binstubs] = value
+    end
+
+    add_option "--[no-]regenerate-plugins",
+               "Regenerate gem plugins" do |value, options|
+      options[:regenerate_plugins] = value
+    end
+
+    add_option "-f", "--[no-]force",
+               "Forcefully overwrite binstubs" do |value, options|
+      options[:force] = value
+    end
+
+    add_option("-E", "--[no-]env-shebang",
+               "Rewrite executables with a shebang",
+               "of /usr/bin/env") do |value, options|
+      options[:env_shebang] = value
+    end
+
     @verbose = nil
   end
 
   def check_ruby_version
-    required_version = Gem::Requirement.new '>= 1.8.7'
+    required_version = Gem::Requirement.new ">= 2.6.0"
 
-    unless required_version.satisfied_by? Gem.ruby_version then
+    unless required_version.satisfied_by? Gem.ruby_version
       alert_error "Expected Ruby version #{required_version}, is #{Gem.ruby_version}"
       terminate_interaction 1
     end
   end
 
   def defaults_str # :nodoc:
-    "--format-executable --document ri"
+    "--format-executable --document ri --regenerate-binstubs"
   end
 
   def description # :nodoc:
@@ -109,30 +134,32 @@ prefix and suffix.  If ruby was installed as `ruby18`, gem will be
 installed as `gem18`.
 
 By default, this RubyGems will install gem as:
-  #{Gem.default_exec_format % 'gem'}
+  #{Gem.default_exec_format % "gem"}
     EOF
   end
 
+  module MakeDirs
+    def mkdir_p(path, **opts)
+      super
+      (@mkdirs ||= []) << path
+    end
+  end
+
   def execute
     @verbose = Gem.configuration.really_verbose
 
-    install_destdir = options[:destdir]
-
-    unless install_destdir.empty? then
-      ENV['GEM_HOME'] ||= File.join(install_destdir,
-                                    Gem.default_dir.gsub(/^[a-zA-Z]:/, ''))
-    end
-
     check_ruby_version
 
-    require 'fileutils'
-    if Gem.configuration.really_verbose then
+    require "fileutils"
+    if Gem.configuration.really_verbose
       extend FileUtils::Verbose
     else
       extend FileUtils
     end
+    extend MakeDirs
 
-    lib_dir, bin_dir = make_destination_dirs install_destdir
+    lib_dir, bin_dir = make_destination_dirs
+    man_dir = generate_default_man_dir
 
     install_lib lib_dir
 
@@ -142,20 +169,33 @@ By default, this RubyGems will install gem as:
 
     remove_old_lib_files lib_dir
 
+    # Can be removed one we drop support for bundler 2.2.3 (the last version installing man files to man_dir)
+    remove_old_man_files man_dir if man_dir && File.exist?(man_dir)
+
+    install_default_bundler_gem bin_dir
+
+    if mode = options[:dir_mode]
+      @mkdirs.uniq!
+      File.chmod(mode, @mkdirs)
+    end
+
     say "RubyGems #{Gem::VERSION} installed"
 
+    regenerate_binstubs(bin_dir) if options[:regenerate_binstubs]
+    regenerate_plugins(bin_dir) if options[:regenerate_plugins]
+
     uninstall_old_gemcutter
 
     documentation_success = install_rdoc
 
     say
-    if @verbose then
+    if @verbose
       say "-" * 78
       say
     end
 
     if options[:previous_version].empty?
-      options[:previous_version] = Gem::VERSION.sub(/[0-9]+$/, '0')
+      options[:previous_version] = Gem::VERSION.sub(/[0-9]+$/, "0")
     end
 
     options[:previous_version] = Gem::Version.new(options[:previous_version])
@@ -167,17 +207,17 @@ By default, this RubyGems will install gem as:
     say
 
     say "RubyGems installed the following executables:"
-    say @bin_file_names.map { |name| "\t#{name}\n" }
+    say bin_file_names.map {|name| "\t#{name}\n" }
     say
 
-    unless @bin_file_names.grep(/#{File::SEPARATOR}gem$/) then
+    unless bin_file_names.grep(/#{File::SEPARATOR}gem$/)
       say "If `gem` was installed by a previous RubyGems installation, you may need"
       say "to remove it by hand."
       say
     end
 
     if documentation_success
-      if options[:document].include? 'rdoc' then
+      if options[:document].include? "rdoc"
         say "Rdoc documentation was installed. You may now invoke:"
         say "  gem server"
         say "and then peruse beautifully formatted documentation for your gems"
@@ -188,9 +228,9 @@ By default, this RubyGems will install gem as:
         say
       end
 
-      if options[:document].include? 'ri' then
+      if options[:document].include? "ri"
         say "Ruby Interactive (ri) documentation was installed. ri is kind of like man "
-        say "pages for ruby libraries. You may access it like this:"
+        say "pages for Ruby libraries. You may access it like this:"
         say "  ri Classname"
         say "  ri Classname.class_method"
         say "  ri Classname#instance_method"
@@ -203,35 +243,30 @@ By default, this RubyGems will install gem as:
   end
 
   def install_executables(bin_dir)
-    say "Installing gem executable" if @verbose
+    prog_mode = options[:prog_mode] || 0o755
 
-    @bin_file_names = []
+    executables = { "gem" => "exe" }
+    executables.each do |tool, path|
+      say "Installing #{tool} executable" if @verbose
 
-    Dir.chdir 'bin' do
-      bin_files = Dir['*']
+      Dir.chdir path do
+        bin_file = "gem"
 
-      bin_files.delete 'update_rubygems'
+        require "tmpdir"
 
-      bin_files.each do |bin_file|
-        bin_file_formatted = if options[:format_executable] then
-                               Gem.default_exec_format % bin_file
-                             else
-                               bin_file
-                             end
-
-        dest_file = File.join bin_dir, bin_file_formatted
+        dest_file = target_bin_path(bin_dir, bin_file)
         bin_tmp_file = File.join Dir.tmpdir, "#{bin_file}.#{$$}"
 
         begin
           bin = File.readlines bin_file
-          bin[0] = "#!#{Gem.ruby}\n"
+          bin[0] = shebang
 
-          File.open bin_tmp_file, 'w' do |fp|
+          File.open bin_tmp_file, "w" do |fp|
             fp.puts bin.join
           end
 
-          install bin_tmp_file, dest_file, :mode => 0755
-          @bin_file_names << dest_file
+          install bin_tmp_file, dest_file, mode: prog_mode
+          bin_file_names << dest_file
         ensure
           rm bin_tmp_file
         end
@@ -241,18 +276,18 @@ By default, this RubyGems will install gem as:
         begin
           bin_cmd_file = File.join Dir.tmpdir, "#{bin_file}.bat"
 
-          File.open bin_cmd_file, 'w' do |file|
+          File.open bin_cmd_file, "w" do |file|
             file.puts <<-TEXT
-@ECHO OFF
-IF NOT "%~f0" == "~f0" GOTO :WinNT
-@"#{File.basename(Gem.ruby).chomp('"')}" "#{dest_file}" %1 %2 %3 %4 %5 %6 %7 %8 %9
-GOTO :EOF
-:WinNT
-@"#{File.basename(Gem.ruby).chomp('"')}" "%~dpn0" %*
-TEXT
+  @ECHO OFF
+  IF NOT "%~f0" == "~f0" GOTO :WinNT
+  @"#{File.basename(Gem.ruby).chomp('"')}" "#{dest_file}" %1 %2 %3 %4 %5 %6 %7 %8 %9
+  GOTO :EOF
+  :WinNT
+  @"#{File.basename(Gem.ruby).chomp('"')}" "%~dpn0" %*
+  TEXT
           end
 
-          install bin_cmd_file, "#{dest_file}.bat", :mode => 0755
+          install bin_cmd_file, "#{dest_file}.bat", mode: prog_mode
         ensure
           rm bin_cmd_file
         end
@@ -260,33 +295,32 @@ TEXT
     end
   end
 
-  def install_file file, dest_dir
-    dest_file = File.join dest_dir, file
-    dest_dir = File.dirname dest_file
-    mkdir_p dest_dir unless File.directory? dest_dir
-
-    install file, dest_file, :mode => 0644
+  def shebang
+    if options[:env_shebang]
+      ruby_name = RbConfig::CONFIG["ruby_install_name"]
+      @env_path ||= ENV_PATHS.find {|env_path| File.executable? env_path }
+      "#!#{@env_path} #{ruby_name}\n"
+    else
+      "#!#{Gem.ruby}\n"
+    end
   end
 
   def install_lib(lib_dir)
-    say "Installing RubyGems" if @verbose
+    libs = { "RubyGems" => "lib" }
+    libs["Bundler"] = "bundler/lib"
+    libs.each do |tool, path|
+      say "Installing #{tool}" if @verbose
 
-    lib_files = rb_files_in 'lib'
-    pem_files = pem_files_in 'lib'
+      lib_files = files_in path
 
-    Dir.chdir 'lib' do
-      lib_files.each do |lib_file|
-        install_file lib_file, lib_dir
-      end
-
-      pem_files.each do |pem_file|
-        install_file pem_file, lib_dir
+      Dir.chdir path do
+        install_file_list(lib_files, lib_dir)
       end
     end
   end
 
   def install_rdoc
-    gem_doc_dir = File.join Gem.dir, 'doc'
+    gem_doc_dir = File.join Gem.dir, "doc"
     rubygems_name = "rubygems-#{Gem::VERSION}"
     rubygems_doc_dir = File.join gem_doc_dir, rubygems_name
 
@@ -296,110 +330,161 @@ TEXT
       # ignore
     end
 
-    if File.writable? gem_doc_dir and
-       (not File.exist? rubygems_doc_dir or
-        File.writable? rubygems_doc_dir) then
+    if File.writable?(gem_doc_dir) &&
+       (!File.exist?(rubygems_doc_dir) ||
+        File.writable?(rubygems_doc_dir))
       say "Removing old RubyGems RDoc and ri" if @verbose
-      Dir[File.join(Gem.dir, 'doc', 'rubygems-[0-9]*')].each do |dir|
+      Dir[File.join(Gem.dir, "doc", "rubygems-[0-9]*")].each do |dir|
         rm_rf dir
       end
 
-      require 'rubygems/rdoc'
+      require_relative "../rdoc"
 
-      fake_spec = Gem::Specification.new 'rubygems', Gem::VERSION
+      fake_spec = Gem::Specification.new "rubygems", Gem::VERSION
       def fake_spec.full_gem_path
-        File.expand_path '../../../..', __FILE__
+        File.expand_path "../../..", __dir__
       end
 
-      generate_ri   = options[:document].include? 'ri'
-      generate_rdoc = options[:document].include? 'rdoc'
+      generate_ri   = options[:document].include? "ri"
+      generate_rdoc = options[:document].include? "rdoc"
 
       rdoc = Gem::RDoc.new fake_spec, generate_rdoc, generate_ri
       rdoc.generate
 
       return true
-    elsif @verbose then
+    elsif @verbose
       say "Skipping RDoc generation, #{gem_doc_dir} not writable"
       say "Set the GEM_HOME environment variable if you want RDoc generated"
     end
 
-    return false
+    false
+  end
+
+  def install_default_bundler_gem(bin_dir)
+    current_default_spec = Gem::Specification.default_stubs.find {|s| s.name == "bundler" }
+    specs_dir = if current_default_spec && default_dir == Gem.default_dir
+      Gem::Specification.remove_spec current_default_spec
+      loaded_from = current_default_spec.loaded_from
+      File.delete(loaded_from)
+      File.dirname(loaded_from)
+    else
+      target_specs_dir = File.join(default_dir, "specifications", "default")
+      mkdir_p target_specs_dir, mode: 0o755
+      target_specs_dir
+    end
+
+    new_bundler_spec = Dir.chdir("bundler") { Gem::Specification.load("bundler.gemspec") }
+    full_name = new_bundler_spec.full_name
+    gemspec_path = "#{full_name}.gemspec"
+
+    default_spec_path = File.join(specs_dir, gemspec_path)
+    Gem.write_binary(default_spec_path, new_bundler_spec.to_ruby)
+
+    bundler_spec = Gem::Specification.load(default_spec_path)
+
+    # Remove gemspec that was same version of vendored bundler.
+    normal_gemspec = File.join(default_dir, "specifications", gemspec_path)
+    if File.file? normal_gemspec
+      File.delete normal_gemspec
+    end
+
+    # Remove gem files that were same version of vendored bundler.
+    if File.directory? bundler_spec.gems_dir
+      Dir.entries(bundler_spec.gems_dir).
+        select {|default_gem| File.basename(default_gem) == full_name }.
+        each {|default_gem| rm_r File.join(bundler_spec.gems_dir, default_gem) }
+    end
+
+    require_relative "../installer"
+
+    Dir.chdir("bundler") do
+      built_gem = Gem::Package.build(new_bundler_spec)
+      begin
+        Gem::Installer.at(
+          built_gem,
+          env_shebang: options[:env_shebang],
+          format_executable: options[:format_executable],
+          force: options[:force],
+          install_as_default: true,
+          bin_dir: bin_dir,
+          install_dir: default_dir,
+          wrappers: true
+        ).install
+      ensure
+        FileUtils.rm_f built_gem
+      end
+    end
+
+    new_bundler_spec.executables.each {|executable| bin_file_names << target_bin_path(bin_dir, executable) }
+
+    say "Bundler #{new_bundler_spec.version} installed"
   end
 
-  def make_destination_dirs(install_destdir)
+  def make_destination_dirs
     lib_dir, bin_dir = Gem.default_rubygems_dirs
 
     unless lib_dir
-      lib_dir, bin_dir = generate_default_dirs(install_destdir)
+      lib_dir, bin_dir = generate_default_dirs
     end
 
-    mkdir_p lib_dir
-    mkdir_p bin_dir
+    mkdir_p lib_dir, mode: 0o755
+    mkdir_p bin_dir, mode: 0o755
 
-    return lib_dir, bin_dir
+    [lib_dir, bin_dir]
   end
 
-  def generate_default_dirs(install_destdir)
+  def generate_default_man_dir
     prefix = options[:prefix]
-    site_or_vendor = options[:site_or_vendor]
 
-    if prefix.empty? then
-      lib_dir = RbConfig::CONFIG[site_or_vendor]
-      bin_dir = RbConfig::CONFIG['bindir']
+    if prefix.empty?
+      man_dir = RbConfig::CONFIG["mandir"]
+      return unless man_dir
     else
-      # Apple installed RubyGems into libdir, and RubyGems <= 1.1.0 gets
-      # confused about installation location, so switch back to
-      # sitelibdir/vendorlibdir.
-      if defined?(APPLE_GEM_HOME) and
-        # just in case Apple and RubyGems don't get this patched up proper.
-        (prefix == RbConfig::CONFIG['libdir'] or
-         # this one is important
-         prefix == File.join(RbConfig::CONFIG['libdir'], 'ruby')) then
-         lib_dir = RbConfig::CONFIG[site_or_vendor]
-         bin_dir = RbConfig::CONFIG['bindir']
-      else
-        lib_dir = File.join prefix, 'lib'
-        bin_dir = File.join prefix, 'bin'
-      end
+      man_dir = File.join prefix, "man"
     end
 
-    unless install_destdir.empty? then
-      lib_dir = File.join install_destdir, lib_dir.gsub(/^[a-zA-Z]:/, '')
-      bin_dir = File.join install_destdir, bin_dir.gsub(/^[a-zA-Z]:/, '')
-    end
-
-    [lib_dir, bin_dir]
+    prepend_destdir_if_present(man_dir)
   end
 
-  def pem_files_in dir
-    Dir.chdir dir do
-      Dir[File.join('**', '*pem')]
+  def generate_default_dirs
+    prefix = options[:prefix]
+    site_or_vendor = options[:site_or_vendor]
+
+    if prefix.empty?
+      lib_dir = RbConfig::CONFIG[site_or_vendor]
+      bin_dir = RbConfig::CONFIG["bindir"]
+    else
+      lib_dir = File.join prefix, "lib"
+      bin_dir = File.join prefix, "bin"
     end
+
+    [prepend_destdir_if_present(lib_dir), prepend_destdir_if_present(bin_dir)]
   end
 
-  def rb_files_in dir
+  def files_in(dir)
     Dir.chdir dir do
-      Dir[File.join('**', '*rb')]
+      Dir.glob(File.join("**", "*"), File::FNM_DOTMATCH).
+        select {|f| !File.directory?(f) }
     end
   end
 
   def remove_old_bin_files(bin_dir)
     old_bin_files = {
-      'gem_mirror' => 'gem mirror',
-      'gem_server' => 'gem server',
-      'gemlock' => 'gem lock',
-      'gemri' => 'ri',
-      'gemwhich' => 'gem which',
-      'index_gem_repository.rb' => 'gem generate_index',
+      "gem_mirror" => "gem mirror",
+      "gem_server" => "gem server",
+      "gemlock" => "gem lock",
+      "gemri" => "ri",
+      "gemwhich" => "gem which",
+      "index_gem_repository.rb" => "gem generate_index",
     }
 
     old_bin_files.each do |old_bin_file, new_name|
       old_bin_path = File.join bin_dir, old_bin_file
       next unless File.exist? old_bin_path
 
-      deprecation_message = "`#{old_bin_file}` has been deprecated.  Use `#{new_name}` instead."
+      deprecation_message = "`#{old_bin_file}` has been deprecated. Use `#{new_name}` instead."
 
-      File.open old_bin_path, 'w' do |fp|
+      File.open old_bin_path, "w" do |fp|
         fp.write <<-EOF
 #!#{Gem.ruby}
 
@@ -409,45 +494,59 @@ abort "#{deprecation_message}"
 
       next unless Gem.win_platform?
 
-      File.open "#{old_bin_path}.bat", 'w' do |fp|
-        fp.puts %{@ECHO.#{deprecation_message}}
+      File.open "#{old_bin_path}.bat", "w" do |fp|
+        fp.puts %(@ECHO.#{deprecation_message})
       end
     end
   end
 
-  def remove_old_lib_files lib_dir
-    rubygems_dir = File.join lib_dir, 'rubygems'
-    lib_files = rb_files_in 'lib/rubygems'
+  def remove_old_lib_files(lib_dir)
+    lib_dirs = { File.join(lib_dir, "rubygems") => "lib/rubygems" }
+    lib_dirs[File.join(lib_dir, "bundler")] = "bundler/lib/bundler"
+    lib_dirs.each do |old_lib_dir, new_lib_dir|
+      lib_files = files_in(new_lib_dir)
+
+      old_lib_files = files_in(old_lib_dir)
+
+      to_remove = old_lib_files - lib_files
 
-    old_lib_files = rb_files_in rubygems_dir
+      gauntlet_rubygems = File.join(lib_dir, "gauntlet_rubygems.rb")
+      to_remove << gauntlet_rubygems if File.exist? gauntlet_rubygems
 
-    to_remove = old_lib_files - lib_files
+      to_remove.delete_if do |file|
+        file.start_with? "defaults"
+      end
 
-    to_remove.delete_if do |file|
-      file.start_with? 'defaults'
+      remove_file_list(to_remove, old_lib_dir)
     end
+  end
 
-    Dir.chdir rubygems_dir do
-      to_remove.each do |file|
-        FileUtils.rm_f file
+  def remove_old_man_files(old_man_dir)
+    old_man1_dir = "#{old_man_dir}/man1"
 
-        warn "unable to remove old file #{file} please remove it by hand" if
-          File.exist? file
-      end
+    if File.exist?(old_man1_dir)
+      man1_to_remove = Dir.chdir(old_man1_dir) { Dir["bundle*.1{,.txt,.ronn}"] }
+
+      remove_file_list(man1_to_remove, old_man1_dir)
+    end
+
+    old_man5_dir = "#{old_man_dir}/man5"
+
+    if File.exist?(old_man5_dir)
+      man5_to_remove = Dir.chdir(old_man5_dir) { Dir["gemfile.5{,.txt,.ronn}"] }
+
+      remove_file_list(man5_to_remove, old_man5_dir)
     end
   end
 
   def show_release_notes
-    release_notes = File.join Dir.pwd, 'History.txt'
+    release_notes = File.join Dir.pwd, "CHANGELOG.md"
 
     release_notes =
-      if File.exist? release_notes then
+      if File.exist? release_notes
         history = File.read release_notes
 
-        history.force_encoding Encoding::UTF_8 if
-          Object.const_defined? :Encoding
-
-        history = history.sub(/^# coding:.*?(?=^=)/m, '')
+        history.force_encoding Encoding::UTF_8
 
         text = history.split(HISTORY_HEADER)
         text.shift # correct an off-by-one generated by split
@@ -458,8 +557,8 @@ abort "#{deprecation_message}"
 
         history_string = ""
 
-        until versions.length == 0 or
-              versions.shift < options[:previous_version] do
+        until versions.length == 0 ||
+              versions.shift <= options[:previous_version] do
           history_string += version_lines.shift + text.shift
         end
 
@@ -472,13 +571,98 @@ abort "#{deprecation_message}"
   end
 
   def uninstall_old_gemcutter
-    require 'rubygems/uninstaller'
+    require_relative "../uninstaller"
 
-    ui = Gem::Uninstaller.new('gemcutter', :all => true, :ignore => true,
-                              :version => '< 0.4')
+    ui = Gem::Uninstaller.new("gemcutter", all: true, ignore: true,
+                                           version: "< 0.4")
     ui.uninstall
   rescue Gem::InstallError
   end
 
-end
+  def regenerate_binstubs(bindir)
+    require_relative "pristine_command"
+    say "Regenerating binstubs"
+
+    args = %w[--all --only-executables --silent]
+    args << "--bindir=#{bindir}"
+    if options[:env_shebang]
+      args << "--env-shebang"
+    end
+
+    command = Gem::Commands::PristineCommand.new
+    command.invoke(*args)
+  end
+
+  def regenerate_plugins(bindir)
+    require_relative "pristine_command"
+    say "Regenerating plugins"
+
+    args = %w[--all --only-plugins --silent]
+    args << "--bindir=#{bindir}"
+    args << "--install-dir=#{default_dir}"
+
+    command = Gem::Commands::PristineCommand.new
+    command.invoke(*args)
+  end
+
+  private
+
+  def default_dir
+    prefix = options[:prefix]
+
+    if prefix.empty?
+      dir = Gem.default_dir
+    else
+      dir = prefix
+    end
+
+    prepend_destdir_if_present(dir)
+  end
+
+  def prepend_destdir_if_present(path)
+    destdir = options[:destdir]
+    return path if destdir.empty?
+
+    File.join(options[:destdir], path.gsub(/^[a-zA-Z]:/, ""))
+  end
+
+  def install_file_list(files, dest_dir)
+    files.each do |file|
+      install_file file, dest_dir
+    end
+  end
+
+  def install_file(file, dest_dir)
+    dest_file = File.join dest_dir, file
+    dest_dir = File.dirname dest_file
+    unless File.directory? dest_dir
+      mkdir_p dest_dir, mode: 0o755
+    end
+
+    install file, dest_file, mode: options[:data_mode] || 0o644
+  end
 
+  def remove_file_list(files, dir)
+    Dir.chdir dir do
+      files.each do |file|
+        FileUtils.rm_f file
+
+        warn "unable to remove old file #{file} please remove it by hand" if
+          File.exist? file
+      end
+    end
+  end
+
+  def target_bin_path(bin_dir, bin_file)
+    bin_file_formatted = if options[:format_executable]
+      Gem.default_exec_format % bin_file
+    else
+      bin_file
+    end
+    File.join bin_dir, bin_file_formatted
+  end
+
+  def bin_file_names
+    @bin_file_names ||= []
+  end
+end