rubygems-update 3.4.22 → 3.5.0

data/lib/rubygems/command.rb

@@ -20,9 +20,7 @@ require_relative "user_interaction"
 class Gem::Command
   include Gem::UserInteraction
 
-  Gem::OptionParser.accept Symbol do |value|
-    value.to_sym
-  end
+  Gem::OptionParser.accept Symbol, &:to_sym
 
   ##
   # The name of the command.
@@ -192,7 +190,7 @@ class Gem::Command
             "Please specify at least one gem name (e.g. gem build GEMNAME)"
     end
 
-    args.select {|arg| arg !~ /^-/ }
+    args.reject {|arg| arg.start_with?("-") }
   end
 
   ##
@@ -316,7 +314,7 @@ class Gem::Command
     options[:build_args] = build_args
 
     if options[:silent]
-      old_ui = self.ui
+      old_ui = ui
       self.ui = ui = Gem::SilentUI.new
     end
 
@@ -459,7 +457,7 @@ class Gem::Command
     until extra.empty? do
       ex = []
       ex << extra.shift
-      ex << extra.shift if /^[^-]/.match?(extra.first.to_s) # rubocop:disable Performance/StartWith
+      ex << extra.shift if /^[^-]/.match?(extra.first.to_s)
       result << ex if handles?(ex)
     end
 
@@ -475,7 +473,7 @@ class Gem::Command
   private
 
   def option_is_deprecated?(option)
-    @deprecated_options[command].has_key?(option)
+    @deprecated_options[command].key?(option)
   end
 
   def add_parser_description # :nodoc:
@@ -487,7 +485,7 @@ class Gem::Command
 
     @parser.separator nil
     @parser.separator "  Description:"
-    formatted.split("\n").each do |line|
+    formatted.each_line do |line|
       @parser.separator "    #{line.rstrip}"
     end
   end
@@ -514,8 +512,8 @@ class Gem::Command
 
     @parser.separator nil
     @parser.separator "  #{title}:"
-    content.split(/\n/).each do |line|
-      @parser.separator "    #{line}"
+    content.each_line do |line|
+      @parser.separator "    #{line.rstrip}"
     end
   end
 
@@ -524,7 +522,7 @@ class Gem::Command
 
     @parser.separator nil
     @parser.separator "  Summary:"
-    wrap(@summary, 80 - 4).split("\n").each do |line|
+    wrap(@summary, 80 - 4).each_line do |line|
       @parser.separator "    #{line.strip}"
     end
   end
@@ -581,12 +579,12 @@ class Gem::Command
   # Add the options common to all commands.
 
   add_common_option("-h", "--help",
-                    "Get help on this command") do |value, options|
+                    "Get help on this command") do |_value, options|
     options[:help] = true
   end
 
   add_common_option("-V", "--[no-]verbose",
-                    "Set the verbose level of output") do |value, options|
+                    "Set the verbose level of output") do |value, _options|
     # Set us to "really verbose" so the progress meter works
     if Gem.configuration.verbose && value
       Gem.configuration.verbose = 1
@@ -595,12 +593,12 @@ class Gem::Command
     end
   end
 
-  add_common_option("-q", "--quiet", "Silence command progress meter") do |value, options|
+  add_common_option("-q", "--quiet", "Silence command progress meter") do |_value, _options|
     Gem.configuration.verbose = false
   end
 
   add_common_option("--silent",
-                    "Silence RubyGems output") do |value, options|
+                    "Silence RubyGems output") do |_value, options|
     options[:silent] = true
   end
 

data/lib/rubygems/command_manager.rb

@@ -106,7 +106,7 @@ class Gem::CommandManager
   # Register all the subcommands supported by the gem command.
 
   def initialize
-    require "timeout"
+    require_relative "timeout"
     @commands = {}
 
     BUILTIN_COMMANDS.each do |name|
@@ -141,7 +141,7 @@ class Gem::CommandManager
   # Return a sorted list of all command names as strings.
 
   def command_names
-    @commands.keys.collect {|key| key.to_s }.sort
+    @commands.keys.collect(&:to_s).sort
   end
 
   ##
@@ -149,7 +149,7 @@ class Gem::CommandManager
 
   def run(args, build_args=nil)
     process_args(args, build_args)
-  rescue StandardError, Timeout::Error => ex
+  rescue StandardError, Gem::Timeout::Error => ex
     if ex.respond_to?(:detailed_message)
       msg = ex.detailed_message(highlight: false).sub(/\A(.*?)(?: \(.+?\))/) { $1 }
     else
@@ -238,7 +238,7 @@ class Gem::CommandManager
         load_error = e
       end
       Gem::Commands.const_get(const_name).new
-    rescue Exception => e
+    rescue StandardError => e
       e = load_error if load_error
 
       alert_error clean_text("Loading command: #{command_name} (#{e.class})\n\t#{e}")
@@ -249,6 +249,7 @@ class Gem::CommandManager
   def invoke_command(args, build_args)
     cmd_name = args.shift.downcase
     cmd = find_command cmd_name
+    terminate_interaction 1 unless cmd
     cmd.deprecation_warning if cmd.deprecated?
     cmd.invoke_with_build_args args, build_args
   end

data/lib/rubygems/commands/build_command.rb

@@ -12,11 +12,11 @@ class Gem::Commands::BuildCommand < Gem::Command
 
     add_platform_option
 
-    add_option "--force", "skip validation of the spec" do |value, options|
+    add_option "--force", "skip validation of the spec" do |_value, options|
       options[:force] = true
     end
 
-    add_option "--strict", "consider warnings as errors when validating the spec" do |value, options|
+    add_option "--strict", "consider warnings as errors when validating the spec" do |_value, options|
       options[:strict] = true
     end
 

data/lib/rubygems/commands/cert_command.rb

@@ -6,7 +6,7 @@ require_relative "../security"
 class Gem::Commands::CertCommand < Gem::Command
   def initialize
     super "cert", "Manage RubyGems certificates and signing settings",
-          :add => [], :remove => [], :list => [], :build => [], :sign => []
+          add: [], remove: [], list: [], build: [], sign: []
 
     add_option("-a", "--add CERT",
                "Add a trusted certificate.") do |cert_file, options|
@@ -263,7 +263,6 @@ For further reading on signing gems see `ri Gem::Security`.
     key = File.read key_file
     passphrase = ENV["GEM_PRIVATE_KEY_PASSPHRASE"]
     options[:key] = OpenSSL::PKey.read key, passphrase
-
   rescue Errno::ENOENT
     alert_error \
       "--private-key not specified and ~/.gem/gem-private_key.pem does not exist"

data/lib/rubygems/commands/check_command.rb

@@ -10,7 +10,7 @@ class Gem::Commands::CheckCommand < Gem::Command
 
   def initialize
     super "check", "Check a gem repository for added or missing files",
-          :alien => true, :doctor => false, :dry_run => false, :gems => true
+          alien: true, doctor: false, dry_run: false, gems: true
 
     add_option("-a", "--[no-]alien",
                'Report "unmanaged" or rogue files in the',
@@ -48,14 +48,14 @@ class Gem::Commands::CheckCommand < Gem::Command
            end
 
     Gem::Validator.new.alien(gems).sort.each do |key, val|
-      unless val.empty?
+      if val.empty?
+        say "#{key} is error-free" if Gem.configuration.verbose
+      else
         say "#{key} has #{val.size} problems"
         val.each do |error_entry|
           say "  #{error_entry.path}:"
           say "    #{error_entry.problem}"
         end
-      else
-        say "#{key} is error-free" if Gem.configuration.verbose
       end
       say
     end

data/lib/rubygems/commands/cleanup_command.rb

@@ -8,16 +8,16 @@ class Gem::Commands::CleanupCommand < Gem::Command
   def initialize
     super "cleanup",
           "Clean up old versions of installed gems",
-          :force => false, :install_dir => Gem.dir,
-          :check_dev => true
+          force: false, install_dir: Gem.dir,
+          check_dev: true
 
     add_option("-n", "-d", "--dry-run",
-               "Do not uninstall gems") do |value, options|
+               "Do not uninstall gems") do |_value, options|
       options[:dryrun] = true
     end
 
     add_option(:Deprecated, "--dryrun",
-               "Do not uninstall gems") do |value, options|
+               "Do not uninstall gems") do |_value, options|
       options[:dryrun] = true
     end
     deprecate_option("--dryrun", extra_msg: "Use --dry-run instead")
@@ -75,7 +75,7 @@ If no gems are named all gems in GEM_HOME are cleaned.
       until done do
         clean_gems
 
-        this_set = @gems_to_cleanup.map {|spec| spec.full_name }.sort
+        this_set = @gems_to_cleanup.map(&:full_name).sort
 
         done = this_set.empty? || last_set == this_set
 
@@ -88,7 +88,7 @@ If no gems are named all gems in GEM_HOME are cleaned.
     say "Clean up complete"
 
     verbose do
-      skipped = @default_gems.map {|spec| spec.full_name }
+      skipped = @default_gems.map(&:full_name)
 
       "Skipped default gems: #{skipped.join ", "}"
     end
@@ -117,12 +117,12 @@ If no gems are named all gems in GEM_HOME are cleaned.
   end
 
   def get_candidate_gems
-    @candidate_gems = unless options[:args].empty?
+    @candidate_gems = if options[:args].empty?
+      Gem::Specification.to_a
+    else
       options[:args].map do |gem_name|
         Gem::Specification.find_all_by_name gem_name
       end.flatten
-    else
-      Gem::Specification.to_a
     end
   end
 
@@ -131,9 +131,7 @@ If no gems are named all gems in GEM_HOME are cleaned.
       @primary_gems[spec.name].version != spec.version
     end
 
-    default_gems, gems_to_cleanup = gems_to_cleanup.partition do |spec|
-      spec.default_gem?
-    end
+    default_gems, gems_to_cleanup = gems_to_cleanup.partition(&:default_gem?)
 
     uninstall_from = options[:user_install] ? Gem.user_dir : @original_home
 
@@ -168,8 +166,8 @@ If no gems are named all gems in GEM_HOME are cleaned.
     say "Attempting to uninstall #{spec.full_name}"
 
     uninstall_options = {
-      :executables => false,
-      :version => "= #{spec.version}",
+      executables: false,
+      version: "= #{spec.version}",
     }
 
     uninstall_options[:user_install] = Gem.user_dir == spec.base_dir

data/lib/rubygems/commands/contents_command.rb

@@ -8,8 +8,8 @@ class Gem::Commands::ContentsCommand < Gem::Command
 
   def initialize
     super "contents", "Display the contents of the installed gems",
-          :specdirs => [], :lib_only => false, :prefix => true,
-          :show_install_dir => false
+          specdirs: [], lib_only: false, prefix: true,
+          show_install_dir: false
 
     add_version_option
 
@@ -94,7 +94,7 @@ prefix or only the files that are requireable.
     gem_path  = spec.full_gem_path
     extra     = "/{#{spec.require_paths.join ","}}" if options[:lib_only]
     glob      = "#{gem_path}#{extra}/**/*"
-    prefix_re = /#{Regexp.escape(gem_path)}\//
+    prefix_re = %r{#{Regexp.escape(gem_path)}/}
 
     Dir[glob].map do |file|
       [gem_path, file.sub(prefix_re, "")]
@@ -104,7 +104,7 @@ prefix or only the files that are requireable.
   def files_in_default_gem(spec)
     spec.files.map do |file|
       case file
-      when /\A#{spec.bindir}\//
+      when %r{\A#{spec.bindir}/}
         # $' is POSTMATCH
         [RbConfig::CONFIG["bindir"], $']
       when /\.so\z/

data/lib/rubygems/commands/dependency_command.rb

@@ -11,15 +11,14 @@ class Gem::Commands::DependencyCommand < Gem::Command
   def initialize
     super "dependency",
           "Show the dependencies of an installed gem",
-          :version => Gem::Requirement.default, :domain => :local
+          version: Gem::Requirement.default, domain: :local
 
     add_version_option
     add_platform_option
     add_prerelease_option
 
     add_option("-R", "--[no-]reverse-dependencies",
-               "Include reverse dependencies in the output") do
-      |value, options|
+               "Include reverse dependencies in the output") do |value, options|
       options[:reverse_dependencies] = value
     end
 
@@ -92,7 +91,7 @@ use with other commands.
   def display_pipe(specs) # :nodoc:
     specs.each do |spec|
       next if spec.dependencies.empty?
-      spec.dependencies.sort_by {|dep| dep.name }.each do |dep|
+      spec.dependencies.sort_by(&:name).each do |dep|
         say "#{dep.name} --version '#{dep.requirement}'"
       end
     end
@@ -153,7 +152,7 @@ use with other commands.
     response = String.new
     response << "  " * level + "Gem #{spec.full_name}\n"
     unless spec.dependencies.empty?
-      spec.dependencies.sort_by {|dep| dep.name }.each do |dep|
+      spec.dependencies.sort_by(&:name).each do |dep|
         response << "  " * level + "  #{dep}\n"
       end
     end

data/lib/rubygems/commands/environment_command.rb

@@ -108,9 +108,7 @@ lib/rubygems/defaults/operating_system.rb
 
     out << "  - RUBYGEMS VERSION: #{Gem::VERSION}\n"
 
-    out << "  - RUBY VERSION: #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}"
-    out << " patchlevel #{RUBY_PATCHLEVEL}" if defined? RUBY_PATCHLEVEL
-    out << ") [#{RUBY_PLATFORM}]\n"
+    out << "  - RUBY VERSION: #{RUBY_VERSION} (#{RUBY_RELEASE_DATE} patchlevel #{RUBY_PATCHLEVEL}) [#{RUBY_PLATFORM}]\n"
 
     out << "  - INSTALLATION DIRECTORY: #{Gem.dir}\n"
 

data/lib/rubygems/commands/exec_command.rb

@@ -23,7 +23,7 @@ class Gem::Commands::ExecCommand < Gem::Command
 
     add_option(:"Install/Update", "--conservative",
       "Prefer the most recent installed version, ",
-      "rather than the latest version overall") do |value, options|
+      "rather than the latest version overall") do |_value, options|
       options[:conservative] = true
     end
   end

data/lib/rubygems/commands/fetch_command.rb

@@ -10,8 +10,8 @@ class Gem::Commands::FetchCommand < Gem::Command
 
   def initialize
     defaults = {
-      :suggest_alternate => true,
-      :version => Gem::Requirement.default,
+      suggest_alternate: true,
+      version: Gem::Requirement.default,
     }
 
     super "fetch", "Download a gem and place it in the current directory", defaults

data/lib/rubygems/commands/generate_index_command.rb

@@ -1,86 +1,51 @@
 # frozen_string_literal: true
 
 require_relative "../command"
-require_relative "../indexer"
 
-##
-# Generates a index files for use as a gem server.
-#
-# See `gem help generate_index`
-
-class Gem::Commands::GenerateIndexCommand < Gem::Command
-  def initialize
-    super "generate_index",
-          "Generates the index files for a gem server directory",
-          :directory => ".", :build_modern => true
+unless defined? Gem::Commands::GenerateIndexCommand
+  class Gem::Commands::GenerateIndexCommand < Gem::Command
+    module RubygemsTrampoline
+      def description # :nodoc:
+        <<~EOF
+          The generate_index command has been moved to the rubygems-generate_index gem.
+        EOF
+      end
 
-    add_option "-d", "--directory=DIRNAME",
-               "repository base dir containing gems subdir" do |dir, options|
-      options[:directory] = File.expand_path dir
-    end
+      def execute
+        alert_error "Install the rubygems-generate_index gem for the generate_index command"
+      end
 
-    add_option "--[no-]modern",
-               "Generate indexes for RubyGems",
-               "(always true)" do |value, options|
-      options[:build_modern] = value
+      def invoke_with_build_args(args, build_args)
+        name = "rubygems-generate_index"
+        spec = begin
+          Gem::Specification.find_by_name(name)
+        rescue Gem::LoadError
+          require "rubygems/dependency_installer"
+          Gem.install(name, Gem::Requirement.default, Gem::DependencyInstaller::DEFAULT_OPTIONS).find {|s| s.name == name }
+        end
+
+        # remove the methods defined in this file so that the methods defined in the gem are used instead,
+        # and without a method redefinition warning
+        %w[description execute invoke_with_build_args].each do |method|
+          RubygemsTrampoline.remove_method(method)
+        end
+        self.class.singleton_class.remove_method(:new)
+
+        spec.activate
+        Gem.load_plugin_files spec.matches_for_glob("rubygems_plugin#{Gem.suffix_pattern}")
+
+        self.class.new.invoke_with_build_args(args, build_args)
+      end
     end
+    private_constant :RubygemsTrampoline
 
-    deprecate_option("--modern", version: "4.0", extra_msg: "Modern indexes (specs, latest_specs, and prerelease_specs) are always generated, so this option is not needed.")
-    deprecate_option("--no-modern", version: "4.0", extra_msg: "The `--no-modern` option is currently ignored. Modern indexes (specs, latest_specs, and prerelease_specs) are always generated.")
-
-    add_option "--update",
-               "Update modern indexes with gems added",
-               "since the last update" do |value, options|
-      options[:update] = value
+    # remove_method(:initialize) warns, but removing new does not warn
+    def self.new
+      command = allocate
+      command.send(:initialize, "generate_index", "Generates the index files for a gem server directory (requires rubygems-generate_index)")
+      command
     end
-  end
-
-  def defaults_str # :nodoc:
-    "--directory . --modern"
-  end
-
-  def description # :nodoc:
-    <<-EOF
-The generate_index command creates a set of indexes for serving gems
-statically.  The command expects a 'gems' directory under the path given to
-the --directory option.  The given directory will be the directory you serve
-as the gem repository.
 
-For `gem generate_index --directory /path/to/repo`, expose /path/to/repo via
-your HTTP server configuration (not /path/to/repo/gems).
-
-When done, it will generate a set of files like this:
-
-  gems/*.gem                                   # .gem files you want to
-                                               # index
-
-  specs.<version>.gz                           # specs index
-  latest_specs.<version>.gz                    # latest specs index
-  prerelease_specs.<version>.gz                # prerelease specs index
-  quick/Marshal.<version>/<gemname>.gemspec.rz # Marshal quick index file
-
-The .rz extension files are compressed with the inflate algorithm.
-The Marshal version number comes from ruby's Marshal::MAJOR_VERSION and
-Marshal::MINOR_VERSION constants.  It is used to ensure compatibility.
-    EOF
-  end
-
-  def execute
-    # This is always true because it's the only way now.
-    options[:build_modern] = true
-
-    if !File.exist?(options[:directory]) ||
-       !File.directory?(options[:directory])
-      alert_error "unknown directory name #{options[:directory]}."
-      terminate_interaction 1
-    else
-      indexer = Gem::Indexer.new options.delete(:directory), options
-
-      if options[:update]
-        indexer.update_index
-      else
-        indexer.generate_index
-      end
-    end
+    prepend(RubygemsTrampoline)
   end
 end

data/lib/rubygems/commands/help_command.rb

@@ -324,7 +324,7 @@ platform.
 
     margin_width = 4
 
-    desc_width = @command_manager.command_names.map {|n| n.size }.max + 4
+    desc_width = @command_manager.command_names.map(&:size).max + 4
 
     summary_width = 80 - margin_width - desc_width
     wrap_indent = " " * (margin_width + desc_width)
@@ -333,7 +333,7 @@ platform.
     @command_manager.command_names.each do |cmd_name|
       command = @command_manager[cmd_name]
 
-      next if command.deprecated?
+      next if command&.deprecated?
 
       summary =
         if command
@@ -343,7 +343,7 @@ platform.
         end
 
       summary = wrap(summary, summary_width).split "\n"
-      out << sprintf(format, cmd_name, summary.shift)
+      out << format(format, cmd_name, summary.shift)
       until summary.empty? do
         out << "#{wrap_indent}#{summary.shift}"
       end

data/lib/rubygems/commands/info_command.rb

@@ -8,8 +8,8 @@ class Gem::Commands::InfoCommand < Gem::Command
 
   def initialize
     super "info", "Show information for the given gem",
-         :name => //, :domain => :local, :details => false, :versions => true,
-         :installed => nil, :version => Gem::Requirement.default
+         name: //, domain: :local, details: false, versions: true,
+         installed: nil, version: Gem::Requirement.default
 
     add_query_options
 

data/lib/rubygems/commands/install_command.rb

@@ -23,11 +23,11 @@ class Gem::Commands::InstallCommand < Gem::Command
 
   def initialize
     defaults = Gem::DependencyInstaller::DEFAULT_OPTIONS.merge({
-      :format_executable => false,
-      :lock => true,
-      :suggest_alternate => true,
-      :version => Gem::Requirement.default,
-      :without_groups => [],
+      format_executable: false,
+      lock: true,
+      suggest_alternate: true,
+      version: Gem::Requirement.default,
+      without_groups: [],
     })
 
     defaults.merge!(install_update_options)
@@ -48,7 +48,7 @@ class Gem::Commands::InstallCommand < Gem::Command
   end
 
   def defaults_str # :nodoc:
-    "--both --version '#{Gem::Requirement.default}' --no-force\n" +
+    "--both --version '#{Gem::Requirement.default}' --no-force\n" \
       "--install-dir #{Gem.dir} --lock\n" +
       install_update_defaults_str
   end
@@ -136,13 +136,6 @@ You can use `i` command instead of `install`.
     "#{program_name} [options] GEMNAME [GEMNAME ...] -- --build-flags"
   end
 
-  def check_install_dir # :nodoc:
-    if options[:install_dir] && options[:user_install]
-      alert_error "Use --install-dir or --user-install but not both"
-      terminate_interaction 1
-    end
-  end
-
   def check_version # :nodoc:
     if options[:version] != Gem::Requirement.default &&
        get_all_gem_names.size > 1
@@ -162,7 +155,6 @@ You can use `i` command instead of `install`.
 
     ENV.delete "GEM_PATH" if options[:install_dir].nil?
 
-    check_install_dir
     check_version
 
     load_hooks
@@ -171,7 +163,7 @@ You can use `i` command instead of `install`.
 
     show_installed
 
-    say update_suggestion if eglible_for_update?
+    say update_suggestion if eligible_for_update?
 
     terminate_interaction exit_code
   end
@@ -263,7 +255,7 @@ You can use `i` command instead of `install`.
     return unless errors
 
     errors.each do |x|
-      return unless Gem::SourceFetchProblem === x
+      next unless Gem::SourceFetchProblem === x
 
       require_relative "../uri"
       msg = "Unable to pull data from '#{Gem::Uri.redact(x.source.uri)}': #{x.error.message}"

data/lib/rubygems/commands/list_command.rb

@@ -11,8 +11,8 @@ class Gem::Commands::ListCommand < Gem::Command
 
   def initialize
     super "list", "Display local gems whose name matches REGEXP",
-         :domain => :local, :details => false, :versions => true,
-         :installed => nil, :version => Gem::Requirement.default
+         domain: :local, details: false, versions: true,
+         installed: nil, version: Gem::Requirement.default
 
     add_query_options
   end

data/lib/rubygems/commands/lock_command.rb

@@ -5,7 +5,7 @@ require_relative "../command"
 class Gem::Commands::LockCommand < Gem::Command
   def initialize
     super "lock", "Generate a lockdown list of gems",
-          :strict => false
+          strict: false
 
     add_option "-s", "--[no-]strict",
                "fail if unable to satisfy a dependency" do |strict, options|

data/lib/rubygems/commands/open_command.rb

@@ -70,7 +70,7 @@ class Gem::Commands::OpenCommand < Gem::Command
   end
 
   def open_editor(path)
-    system(*@editor.split(/\s+/) + [path], { :chdir => path })
+    system(*@editor.split(/\s+/) + [path], { chdir: path })
   end
 
   def spec_for(name)

data/lib/rubygems/commands/owner_command.rb

@@ -39,7 +39,7 @@ permission to.
     add_proxy_option
     add_key_option
     add_otp_option
-    defaults.merge! :add => [], :remove => []
+    defaults.merge! add: [], remove: []
 
     add_option "-a", "--add NEW_OWNER", "Add an owner by user identifier" do |value, options|
       options[:add] << value