16 files changed, 148 insertions, 109 deletions
@@ -188,7 +188,7 @@ class Gem::CommandManager
 raise Gem::CommandLineError,
 "Ambiguous command #{cmd_name} matches [#{possibilities.join(', ')}]"
 elsif possibilities.empty?
- raise Gem::CommandLineError, "Unknown command #{cmd_name}"
 end
 self[possibilities.first]
@@ -27,6 +27,8 @@ class Gem::Commands::InstallCommand < Gem::Command
 :without_groups => [],
 })
 super 'install', 'Install a gem into the local repository', defaults
 add_install_update_options
@@ -43,8 +45,9 @@ class Gem::Commands::InstallCommand < Gem::Command
 end
 def defaults_str # :nodoc:
- "--both --version '#{Gem::Requirement.default}' --document --no-force\n" +
- "--install-dir #{Gem.dir} --lock"
 end
 def description # :nodoc:
@@ -6,8 +6,8 @@ require 'rubygems/command'
 # RubyGems checkout or tarball.
 class Gem::Commands::SetupCommand < Gem::Command
- HISTORY_HEADER = /^===\s*[\d.a-zA-Z]+\s*\/\s*\d{4}-\d{2}-\d{2}\s*$/.freeze
- VERSION_MATCHER = /^===\s*([\d.a-zA-Z]+)\s*\/\s*\d{4}-\d{2}-\d{2}\s*$/.freeze
 ENV_PATHS = %w[/usr/bin/env /bin/env].freeze
@@ -167,19 +167,18 @@ By default, this RubyGems will install gem as:
 extend MakeDirs
 lib_dir, bin_dir = make_destination_dirs install_destdir
- man_dir = make_man_dir install_destdir
 install_lib lib_dir
- install_man man_dir
-
 install_executables bin_dir
 remove_old_bin_files bin_dir
 remove_old_lib_files lib_dir
- remove_old_man_files man_dir
 install_default_bundler_gem bin_dir
@@ -330,21 +329,6 @@ By default, this RubyGems will install gem as:
 end
 end
- def install_man(man_dir)
- mans = { 'Bundler' => 'bundler/man' }
- mans.each do |tool, path|
- say "Installing #{tool} manpages" if @verbose
-
- bundler_man1_files = bundler_man1_files_in(path)
- bundler_man5_files = bundler_man5_files_in(path)
-
- Dir.chdir path do
- install_file_list(bundler_man1_files, "#{man_dir}/man1")
- install_file_list(bundler_man5_files, "#{man_dir}/man5")
- end
- end
- end
-
 def install_rdoc
 gem_doc_dir = File.join Gem.dir, 'doc'
 rubygems_name = "rubygems-#{Gem::VERSION}"
@@ -391,9 +375,7 @@ By default, this RubyGems will install gem as:
 specs_dir = File.join(options[:destdir], specs_dir) unless Gem.win_platform?
 mkdir_p specs_dir, :mode => 0755
- bundler_spec = Gem::Specification.load("bundler/bundler.gemspec")
- bundler_spec.files = Dir.chdir("bundler") { Dir["{*.md,{lib,exe,man}/**/*}"] }
- bundler_spec.executables -= %w[bundler bundle_ruby]
 # Remove bundler-*.gemspec in default specification directory.
 Dir.entries(specs_dir).
@@ -455,19 +437,12 @@ By default, this RubyGems will install gem as:
 return lib_dir, bin_dir
 end
- def make_man_dir(install_destdir)
- man_dir = generate_default_man_dir(install_destdir)
-
- mkdir_p man_dir, :mode => 0755
-
- return man_dir
- end
-
 def generate_default_man_dir(install_destdir)
 prefix = options[:prefix]
 if prefix.empty?
 man_dir = RbConfig::CONFIG['mandir']
 else
 man_dir = File.join prefix, 'man'
 end
@@ -518,20 +493,6 @@ By default, this RubyGems will install gem as:
 end
 end
- # for installation of bundler as default gems
- def bundler_man1_files_in(dir)
- Dir.chdir dir do
- Dir['bundle*.1']
- end
- end
-
- # for installation of bundler as default gems
- def bundler_man5_files_in(dir)
- Dir.chdir dir do
- Dir['gemfile.5']
- end
- end
-
 def remove_old_bin_files(bin_dir)
 old_bin_files = {
 'gem_mirror' => 'gem mirror',
@@ -585,33 +546,26 @@ abort "#{deprecation_message}"
 end
 end
- def remove_old_man_files(man_dir)
- man_dirs = { man_dir => "bundler/man" }
- man_dirs.each do |old_man_dir, new_man_dir|
- man1_files = bundler_man1_files_in(new_man_dir)
-
- old_man1_dir = "#{old_man_dir}/man1"
- old_man1_files = bundler_man1_files_in(old_man1_dir)
- old_man1_files += Dir.chdir(old_man1_dir) { Dir["bundle*.1.{txt,ronn}"] }
- man1_to_remove = old_man1_files - man1_files
 remove_file_list(man1_to_remove, old_man1_dir)
- man5_files = bundler_man5_files_in(new_man_dir)
-
- old_man5_dir = "#{old_man_dir}/man5"
- old_man5_files = bundler_man5_files_in(old_man5_dir)
- old_man5_files += Dir.chdir(old_man5_dir) { Dir["gemfile.5.{txt,ronn}"] }
- man5_to_remove = old_man5_files - man5_files
 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 =
 if File.exist? release_notes
@@ -19,9 +19,13 @@ class Gem::Commands::UpdateCommand < Gem::Command
 attr_reader :updated # :nodoc:
 def initialize
- super 'update', 'Update installed gems to the latest version',
- :document => %w[rdoc ri],
- :force => false
 add_install_update_options
@@ -51,7 +55,8 @@ class Gem::Commands::UpdateCommand < Gem::Command
 end
 def defaults_str # :nodoc:
- "--document --no-force --install-dir #{Gem.dir}"
 end
 def description # :nodoc:
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 require 'rubygems/deprecate'
 ##
 # Base exception class for RubyGems. All exception raised by RubyGems are a
@@ -9,6 +10,30 @@ class Gem::Exception < RuntimeError; end
 class Gem::CommandLineError < Gem::Exception; end
 class Gem::DependencyError < Gem::Exception; end
 class Gem::DependencyRemovalException < Gem::Exception; end
@@ -29,7 +29,7 @@ class Gem::Ext::Builder
 make_program = (/mswin/ =~ RUBY_PLATFORM) ? 'nmake' : 'make'
 end
- destdir = '"DESTDIR=%s"' % ENV['DESTDIR']
 ['clean', '', 'install'].each do |target|
 # Pass DESTDIR via command line to override what's in MAKEFLAGS
@@ -37,7 +37,7 @@ class Gem::Ext::Builder
 make_program,
 destdir,
 target,
- ].join(' ').rstrip
 begin
 run(cmd, results, "make #{target}".rstrip, make_dir)
 rescue Gem::InstallError
@@ -56,19 +56,21 @@ class Gem::Ext::Builder
 p(command)
 end
 results << "current directory: #{dir}"
- results << (command.respond_to?(:shelljoin) ? command.shelljoin : command)
 require "open3"
 # Set $SOURCE_DATE_EPOCH for the subprocess.
 env = {'SOURCE_DATE_EPOCH' => Gem.source_date_epoch_string}
- output, status = Open3.capture2e(env, *command, :chdir => dir)
 if verbose
 puts output
 else
 results << output
 end
- rescue => error
- raise Gem::InstallError, "#{command_name || class_name} failed#{error.message}"
 ensure
 ENV['RUBYGEMS_GEMDEPS'] = rubygems_gemdeps
 end
@@ -4,8 +4,7 @@ require_relative '../command'
 class Gem::Ext::CmakeBuilder < Gem::Ext::Builder
 def self.build(extension, dest_path, results, args=[], lib_dir=nil, cmake_dir=Dir.pwd)
 unless File.exist?(File.join(cmake_dir, 'Makefile'))
- cmd = "cmake . -DCMAKE_INSTALL_PREFIX=#{dest_path}"
- cmd << " #{Gem::Command.build_args.join ' '}" unless Gem::Command.build_args.empty?
 run cmd, results, class_name, cmake_dir
 end
@@ -8,8 +8,7 @@
 class Gem::Ext::ConfigureBuilder < Gem::Ext::Builder
 def self.build(extension, dest_path, results, args=[], lib_dir=nil, configure_dir=Dir.pwd)
 unless File.exist?(File.join(configure_dir, 'Makefile'))
- cmd = "sh ./configure --prefix=#{dest_path}"
- cmd << " #{args.join ' '}" unless args.empty?
 run cmd, results, class_name, configure_dir
 end
@@ -181,10 +181,19 @@ module Gem::InstallUpdateOptions
 end
 ##
- # Default options for the gem install command.
 def install_update_defaults_str
- '--document=rdoc,ri --wrappers'
 end
 end
@@ -26,13 +26,15 @@ class Gem::RemoteFetcher
 ##
 # The URI which was being accessed when the exception happened.
- attr_accessor :uri
 def initialize(message, uri)
 super message
 uri = parse_uri(uri)
 uri.password = 'REDACTED' if uri.respond_to?(:password) && uri.password
 @uri = uri.to_s
@@ -58,7 +58,7 @@ class Gem::Resolver::BestSet < Gem::Resolver::ComposedSet
 # The calling method must retry the exception to repeat the lookup.
 def replace_failed_api_set(error) # :nodoc:
- uri = error.uri
 uri = URI uri unless URI === uri
 uri = uri + "."
@@ -43,9 +43,12 @@ class Gem::Resolver::IndexSpecification < Gem::Resolver::Specification
 ##
 # The required_rubygems_version constraint for this specification
 #
 def required_rubygems_version
- spec.required_rubygems_version
 end
 def ==(other)
@@ -35,6 +35,7 @@ class Gem::Source
 end
 @uri = uri
 end
 ##
@@ -118,7 +119,8 @@ class Gem::Source
 # Returns true when it is possible and safe to update the cache directory.
 def update_cache?
- @update_cache ||=
 begin
 File.stat(Gem.user_home).uid == Process.uid
 rescue Errno::ENOENT
@@ -26,7 +26,20 @@ begin
 rescue LoadError
 end
-require 'bundler'
 require 'minitest/autorun'
@@ -250,16 +263,16 @@ class Gem::TestCase < Minitest::Test
 def assert_contains_make_command(target, output, msg = nil)
 if output.match(/\n/)
 msg = message(msg) do
- 'Expected output containing make command "%s": %s' % [
 ('%s %s' % [make_command, target]).rstrip,
- output.inspect,
 ]
 end
 else
 msg = message(msg) do
 'Expected make command "%s": %s' % [
 ('%s %s' % [make_command, target]).rstrip,
- output.inspect,
 ]
 end
 end
@@ -298,6 +311,7 @@ class Gem::TestCase < Minitest::Test
 ENV['XDG_CONFIG_HOME'] = nil
 ENV['XDG_DATA_HOME'] = nil
 ENV['SOURCE_DATE_EPOCH'] = nil
 ENV["TMPDIR"] = @tmp
 @current_dir = Dir.pwd
@@ -49,37 +49,38 @@ module Gem::Text
 end
 end
- # This code is based directly on the Text gem implementation
 # Returns a value representing the "cost" of transforming str1 into str2
 def levenshtein_distance(str1, str2)
- s = str1
- t = str2
- n = s.length
- m = t.length
-
- return m if (0 == n)
- return n if (0 == m)
 d = (0..m).to_a
 x = nil
- str1.each_char.each_with_index do |char1,i|
- e = i + 1
- str2.each_char.each_with_index do |char2,j|
- cost = (char1 == char2) ? 0 : 1
 x = min3(
- d[j + 1] + 1, # insertion
- e + 1, # deletion
- d[j] + cost # substitution
- )
- d[j] = e
- e = x
 end
-
 d[m] = x
 end
- return x
 end
 end
@@ -0,0 +1,21 @@