rubygems-update 3.3.18 → 3.6.2

data/lib/rubygems/commands/cert_command.rb

@@ -1,69 +1,70 @@
 # frozen_string_literal: true
-require_relative '../command'
-require_relative '../security'
+
+require_relative "../command"
+require_relative "../security"
 
 class Gem::Commands::CertCommand < Gem::Command
   def initialize
-    super 'cert', 'Manage RubyGems certificates and signing settings',
-          :add => [], :remove => [], :list => [], :build => [], :sign => []
+    super "cert", "Manage RubyGems certificates and signing settings",
+          add: [], remove: [], list: [], build: [], sign: []
 
-    add_option('-a', '--add CERT',
-               'Add a trusted certificate.') do |cert_file, options|
+    add_option("-a", "--add CERT",
+               "Add a trusted certificate.") do |cert_file, options|
       options[:add] << open_cert(cert_file)
     end
 
-    add_option('-l', '--list [FILTER]',
-               'List trusted certificates where the',
-               'subject contains FILTER') do |filter, options|
-      filter ||= ''
+    add_option("-l", "--list [FILTER]",
+               "List trusted certificates where the",
+               "subject contains FILTER") do |filter, options|
+      filter ||= ""
 
       options[:list] << filter
     end
 
-    add_option('-r', '--remove FILTER',
-               'Remove trusted certificates where the',
-               'subject contains FILTER') do |filter, options|
+    add_option("-r", "--remove FILTER",
+               "Remove trusted certificates where the",
+               "subject contains FILTER") do |filter, options|
       options[:remove] << filter
     end
 
-    add_option('-b', '--build EMAIL_ADDR',
-               'Build private key and self-signed',
-               'certificate for EMAIL_ADDR') do |email_address, options|
+    add_option("-b", "--build EMAIL_ADDR",
+               "Build private key and self-signed",
+               "certificate for EMAIL_ADDR") do |email_address, options|
       options[:build] << email_address
     end
 
-    add_option('-C', '--certificate CERT',
-               'Signing certificate for --sign') do |cert_file, options|
+    add_option("-C", "--certificate CERT",
+               "Signing certificate for --sign") do |cert_file, options|
       options[:issuer_cert] = open_cert(cert_file)
       options[:issuer_cert_file] = cert_file
     end
 
-    add_option('-K', '--private-key KEY',
-               'Key for --sign or --build') do |key_file, options|
+    add_option("-K", "--private-key KEY",
+               "Key for --sign or --build") do |key_file, options|
       options[:key] = open_private_key(key_file)
     end
 
-    add_option('-A', '--key-algorithm ALGORITHM',
-               'Select which key algorithm to use for --build') do |algorithm, options|
+    add_option("-A", "--key-algorithm ALGORITHM",
+               "Select which key algorithm to use for --build") do |algorithm, options|
       options[:key_algorithm] = algorithm
     end
 
-    add_option('-s', '--sign CERT',
-               'Signs CERT with the key from -K',
-               'and the certificate from -C') do |cert_file, options|
+    add_option("-s", "--sign CERT",
+               "Signs CERT with the key from -K",
+               "and the certificate from -C") do |cert_file, options|
       raise Gem::OptionParser::InvalidArgument, "#{cert_file}: does not exist" unless
         File.file? cert_file
 
       options[:sign] << cert_file
     end
 
-    add_option('-d', '--days NUMBER_OF_DAYS',
-               'Days before the certificate expires') do |days, options|
+    add_option("-d", "--days NUMBER_OF_DAYS",
+               "Days before the certificate expires") do |days, options|
       options[:expiration_length_days] = days.to_i
     end
 
-    add_option('-R', '--re-sign',
-               'Re-signs the certificate from -C with the key from -K') do |resign, options|
+    add_option("-R", "--re-sign",
+               "Re-signs the certificate from -C with the key from -K") do |resign, options|
       options[:resign] = resign
     end
   end
@@ -93,7 +94,7 @@ class Gem::Commands::CertCommand < Gem::Command
 
   def open_private_key(key_file)
     check_openssl
-    passphrase = ENV['GEM_PRIVATE_KEY_PASSPHRASE']
+    passphrase = ENV["GEM_PRIVATE_KEY_PASSPHRASE"]
     key = OpenSSL::PKey.read File.read(key_file), passphrase
     raise Gem::OptionParser::InvalidArgument,
       "#{key_file}: private key not found" unless key.private?
@@ -135,7 +136,7 @@ class Gem::Commands::CertCommand < Gem::Command
   end
 
   def build(email)
-    if !valid_email?(email)
+    unless valid_email?(email)
       raise Gem::CommandLineError, "Invalid email address #{email}"
     end
 
@@ -152,7 +153,7 @@ class Gem::Commands::CertCommand < Gem::Command
 
   def build_cert(email, key) # :nodoc:
     expiration_length_days = options[:expiration_length_days] ||
-      Gem.configuration.cert_expiration_length_days
+                             Gem.configuration.cert_expiration_length_days
 
     cert = Gem::Security.create_cert_email(
       email,
@@ -166,10 +167,10 @@ class Gem::Commands::CertCommand < Gem::Command
   def build_key # :nodoc:
     return options[:key] if options[:key]
 
-    passphrase = ask_for_password 'Passphrase for your Private Key:'
+    passphrase = ask_for_password "Passphrase for your Private Key:"
     say "\n"
 
-    passphrase_confirmation = ask_for_password 'Please repeat the passphrase for your Private Key:'
+    passphrase_confirmation = ask_for_password "Please repeat the passphrase for your Private Key:"
     say "\n"
 
     raise Gem::CommandLineError,
@@ -177,9 +178,9 @@ class Gem::Commands::CertCommand < Gem::Command
 
     algorithm = options[:key_algorithm] || Gem::Security::DEFAULT_KEY_ALGORITHM
     key = Gem::Security.create_key(algorithm)
-    key_path = Gem::Security.write key, "gem-private_key.pem", 0600, passphrase
+    key_path = Gem::Security.write key, "gem-private_key.pem", 0o600, passphrase
 
-    return key, key_path
+    [key, key_path]
   end
 
   def certificates_matching(filter)
@@ -260,9 +261,8 @@ For further reading on signing gems see `ri Gem::Security`.
   def load_default_key
     key_file = File.join Gem.default_key_path
     key = File.read key_file
-    passphrase = ENV['GEM_PRIVATE_KEY_PASSPHRASE']
+    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"
@@ -291,7 +291,7 @@ For further reading on signing gems see `ri Gem::Security`.
     cert = File.read cert_file
     cert = OpenSSL::X509::Certificate.new cert
 
-    permissions = File.stat(cert_file).mode & 0777
+    permissions = File.stat(cert_file).mode & 0o777
 
     issuer_cert = options[:issuer_cert]
     issuer_key = options[:key]

data/lib/rubygems/commands/check_command.rb

@@ -1,63 +1,68 @@
 # frozen_string_literal: true
-require_relative '../command'
-require_relative '../version_option'
-require_relative '../validator'
-require_relative '../doctor'
+
+require_relative "../command"
+require_relative "../version_option"
+require_relative "../validator"
+require_relative "../doctor"
 
 class Gem::Commands::CheckCommand < Gem::Command
   include Gem::VersionOption
 
   def initialize
-    super 'check', 'Check a gem repository for added or missing files',
-          :alien => true, :doctor => false, :dry_run => false, :gems => true
+    super "check", "Check a gem repository for added or missing files",
+          alien: true, doctor: false, dry_run: false, gems: true
 
-    add_option('-a', '--[no-]alien',
+    add_option("-a", "--[no-]alien",
                'Report "unmanaged" or rogue files in the',
-               'gem repository') do |value, options|
+               "gem repository") do |value, options|
       options[:alien] = value
     end
 
-    add_option('--[no-]doctor',
-               'Clean up uninstalled gems and broken',
-               'specifications') do |value, options|
+    add_option("--[no-]doctor",
+               "Clean up uninstalled gems and broken",
+               "specifications") do |value, options|
       options[:doctor] = value
     end
 
-    add_option('--[no-]dry-run',
-               'Do not remove files, only report what',
-               'would be removed') do |value, options|
+    add_option("--[no-]dry-run",
+               "Do not remove files, only report what",
+               "would be removed") do |value, options|
       options[:dry_run] = value
     end
 
-    add_option('--[no-]gems',
-               'Check installed gems for problems') do |value, options|
+    add_option("--[no-]gems",
+               "Check installed gems for problems") do |value, options|
       options[:gems] = value
     end
 
-    add_version_option 'check'
+    add_version_option "check"
   end
 
   def check_gems
-    say 'Checking gems...'
+    say "Checking gems..."
     say
-    gems = get_all_gem_names rescue []
+    gems = begin
+             get_all_gem_names
+           rescue StandardError
+             []
+           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
   end
 
   def doctor
-    say 'Checking for files from uninstalled gems...'
+    say "Checking for files from uninstalled gems..."
     say
 
     Gem.path.each do |gem_repo|
@@ -72,11 +77,11 @@ class Gem::Commands::CheckCommand < Gem::Command
   end
 
   def arguments # :nodoc:
-    'GEMNAME       name of gem to check'
+    "GEMNAME       name of gem to check"
   end
 
   def defaults_str # :nodoc:
-    '--gems --alien'
+    "--gems --alien"
   end
 
   def description # :nodoc:

data/lib/rubygems/commands/cleanup_command.rb

@@ -1,35 +1,36 @@
 # frozen_string_literal: true
-require_relative '../command'
-require_relative '../dependency_list'
-require_relative '../uninstaller'
+
+require_relative "../command"
+require_relative "../dependency_list"
+require_relative "../uninstaller"
 
 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
+    super "cleanup",
+          "Clean up old versions of installed gems",
+          force: false, install_dir: Gem.dir,
+          check_dev: true
 
-    add_option('-n', '-d', '--dry-run',
-               'Do not uninstall gems') do |value, options|
+    add_option("-n", "-d", "--dry-run",
+               "Do not uninstall gems") do |_value, options|
       options[:dryrun] = true
     end
 
-    add_option(:Deprecated, '--dryrun',
-               'Do not uninstall gems') do |value, options|
+    add_option(:Deprecated, "--dryrun",
+               "Do not uninstall gems") do |_value, options|
       options[:dryrun] = true
     end
-    deprecate_option('--dryrun', extra_msg: 'Use --dry-run instead')
+    deprecate_option("--dryrun", extra_msg: "Use --dry-run instead")
 
-    add_option('-D', '--[no-]check-development',
-               'Check development dependencies while uninstalling',
-               '(default: true)') do |value, options|
+    add_option("-D", "--[no-]check-development",
+               "Check development dependencies while uninstalling",
+               "(default: true)") do |value, options|
       options[:check_dev] = value
     end
 
-    add_option('--[no-]user-install',
-               'Cleanup in user\'s home directory instead',
-               'of GEM_HOME.') do |value, options|
+    add_option("--[no-]user-install",
+               "Cleanup in user's home directory instead",
+               "of GEM_HOME.") do |value, options|
       options[:user_install] = value
     end
 
@@ -37,8 +38,6 @@ class Gem::Commands::CleanupCommand < Gem::Command
     @default_gems    = []
     @full            = nil
     @gems_to_cleanup = nil
-    @original_home   = nil
-    @original_path   = nil
     @primary_gems    = nil
   end
 
@@ -74,7 +73,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
 
@@ -87,16 +86,13 @@ 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 ', '}"
+      "Skipped default gems: #{skipped.join ", "}"
     end
   end
 
   def clean_gems
-    @original_home = Gem.dir
-    @original_path = Gem.path
-
     get_primary_gems
     get_candidate_gems
     get_gems_to_cleanup
@@ -111,17 +107,15 @@ If no gems are named all gems in GEM_HOME are cleaned.
     deps.reverse_each do |spec|
       uninstall_dep spec
     end
-
-    Gem::Specification.reset
   end
 
   def get_candidate_gems
-    @candidate_gems = unless options[:args].empty?
-      options[:args].map do |gem_name|
-        Gem::Specification.find_all_by_name gem_name
-      end.flatten
-    else
+    @candidate_gems = if options[:args].empty?
       Gem::Specification.to_a
+    else
+      options[:args].flat_map do |gem_name|
+        Gem::Specification.find_all_by_name gem_name
+      end
     end
   end
 
@@ -130,11 +124,9 @@ 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
+    uninstall_from = options[:user_install] ? Gem.user_dir : Gem.dir
 
     gems_to_cleanup = gems_to_cleanup.select do |spec|
       spec.base_dir == uninstall_from
@@ -149,7 +141,7 @@ If no gems are named all gems in GEM_HOME are cleaned.
     @primary_gems = {}
 
     Gem::Specification.each do |spec|
-      if @primary_gems[spec.name].nil? or
+      if @primary_gems[spec.name].nil? ||
          @primary_gems[spec.name].version < spec.version
         @primary_gems[spec.name] = spec
       end
@@ -167,8 +159,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
@@ -182,8 +174,5 @@ If no gems are named all gems in GEM_HOME are cleaned.
       say "Unable to uninstall #{spec.full_name}:"
       say "\t#{e.class}: #{e.message}"
     end
-  ensure
-    # Restore path Gem::Uninstaller may have changed
-    Gem.use_paths @original_home, *@original_path
   end
 end

data/lib/rubygems/commands/contents_command.rb

@@ -1,39 +1,40 @@
 # frozen_string_literal: true
-require_relative '../command'
-require_relative '../version_option'
+
+require_relative "../command"
+require_relative "../version_option"
 
 class Gem::Commands::ContentsCommand < Gem::Command
   include Gem::VersionOption
 
   def initialize
-    super 'contents', 'Display the contents of the installed gems',
-          :specdirs => [], :lib_only => false, :prefix => true,
-          :show_install_dir => false
+    super "contents", "Display the contents of the installed gems",
+          specdirs: [], lib_only: false, prefix: true,
+          show_install_dir: false
 
     add_version_option
 
-    add_option('--all',
+    add_option("--all",
                "Contents for all gems") do |all, options|
       options[:all] = all
     end
 
-    add_option('-s', '--spec-dir a,b,c', Array,
+    add_option("-s", "--spec-dir a,b,c", Array,
                "Search for gems under specific paths") do |spec_dirs, options|
       options[:specdirs] = spec_dirs
     end
 
-    add_option('-l', '--[no-]lib-only',
+    add_option("-l", "--[no-]lib-only",
                "Only return files in the Gem's lib_dirs") do |lib_only, options|
       options[:lib_only] = lib_only
     end
 
-    add_option('--[no-]prefix',
+    add_option("--[no-]prefix",
                "Don't include installed path prefix") do |prefix, options|
       options[:prefix] = prefix
     end
 
-    add_option('--[no-]show-install-dir',
-               'Show only the gem install dir') do |show, options|
+    add_option("--[no-]show-install-dir",
+               "Show only the gem install dir") do |show, options|
       options[:show_install_dir] = show
     end
 
@@ -77,7 +78,7 @@ prefix or only the files that are requireable.
           gem_contents name
         end
 
-      terminate_interaction 1 unless found or names.length > 1
+      terminate_interaction 1 unless found || names.length > 1
     end
   end
 
@@ -91,9 +92,9 @@ prefix or only the files that are requireable.
 
   def files_in_gem(spec)
     gem_path  = spec.full_gem_path
-    extra     = "/{#{spec.require_paths.join ','}}" if options[:lib_only]
+    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, "")]
@@ -101,15 +102,22 @@ prefix or only the files that are requireable.
   end
 
   def files_in_default_gem(spec)
-    spec.files.map do |file|
-      case file
-      when /\A#{spec.bindir}\//
-        # $' is POSTMATCH
-        [RbConfig::CONFIG['bindir'], $']
-      when /\.so\z/
-        [RbConfig::CONFIG['archdir'], file]
+    spec.files.filter_map do |file|
+      if file.start_with?("#{spec.bindir}/")
+        [RbConfig::CONFIG["bindir"], file.delete_prefix("#{spec.bindir}/")]
       else
-        [RbConfig::CONFIG['rubylibdir'], file]
+        gem spec.name, spec.version
+
+        require_path = spec.require_paths.find do |path|
+          file.start_with?("#{path}/")
+        end
+
+        requirable_part = file.delete_prefix("#{require_path}/")
+
+        resolve = $LOAD_PATH.resolve_feature_path(requirable_part)&.last
+        next unless resolve
+
+        [resolve.delete_suffix(requirable_part), requirable_part]
       end
     end
   end
@@ -177,12 +185,12 @@ prefix or only the files that are requireable.
       @spec_dirs.sort.each {|dir| say dir }
     end
 
-    return nil
+    nil
   end
 
   def specification_directories # :nodoc:
-    options[:specdirs].map do |i|
+    options[:specdirs].flat_map do |i|
       [i, File.join(i, "specifications")]
-    end.flatten
+    end
   end
 end

data/lib/rubygems/commands/dependency_command.rb

@@ -1,28 +1,28 @@
 # frozen_string_literal: true
-require_relative '../command'
-require_relative '../local_remote_options'
-require_relative '../version_option'
+
+require_relative "../command"
+require_relative "../local_remote_options"
+require_relative "../version_option"
 
 class Gem::Commands::DependencyCommand < Gem::Command
   include Gem::LocalRemoteOptions
   include Gem::VersionOption
 
   def initialize
-    super 'dependency',
-          'Show the dependencies of an installed gem',
-          :version => Gem::Requirement.default, :domain => :local
+    super "dependency",
+          "Show the dependencies of an installed gem",
+          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|
+    add_option("-R", "--[no-]reverse-dependencies",
+               "Include reverse dependencies in the output") do |value, options|
       options[:reverse_dependencies] = value
     end
 
-    add_option('-p', '--pipe',
+    add_option("-p", "--pipe",
                "Pipe Format (name --version ver)") do |value, options|
       options[:pipe_format] = value
     end
@@ -77,7 +77,7 @@ use with other commands.
         name_matches = name_pattern ? name_pattern =~ spec.name : true
         version_matches = requirement.satisfied_by?(spec.version)
 
-        name_matches and version_matches
+        name_matches && version_matches
       }.map(&:to_spec)
     end
 
@@ -90,10 +90,9 @@ use with other commands.
 
   def display_pipe(specs) # :nodoc:
     specs.each do |spec|
-      unless spec.dependencies.empty?
-        spec.dependencies.sort_by {|dep| dep.name }.each do |dep|
-          say "#{dep.name} --version '#{dep.requirement}'"
-        end
+      next if spec.dependencies.empty?
+      spec.dependencies.sort_by(&:name).each do |dep|
+        say "#{dep.name} --version '#{dep.requirement}'"
       end
     end
   end
@@ -133,8 +132,8 @@ use with other commands.
   end
 
   def ensure_local_only_reverse_dependencies # :nodoc:
-    if options[:reverse_dependencies] and remote? and not local?
-      alert_error 'Only reverse dependencies for local gems are supported.'
+    if options[:reverse_dependencies] && remote? && !local?
+      alert_error "Only reverse dependencies for local gems are supported."
       terminate_interaction 1
     end
   end
@@ -142,7 +141,7 @@ use with other commands.
   def ensure_specs(specs) # :nodoc:
     return unless specs.empty?
 
-    patterns = options[:args].join ','
+    patterns = options[:args].join ","
     say "No gems found matching #{patterns} (#{options[:version]})" if
       Gem.configuration.verbose
 
@@ -151,10 +150,10 @@ use with other commands.
 
   def print_dependencies(spec, level = 0) # :nodoc:
     response = String.new
-    response << '  ' * level + "Gem #{spec.full_name}\n"
+    response << "  " * level + "Gem #{spec.full_name}\n"
     unless spec.dependencies.empty?
-      spec.dependencies.sort_by {|dep| dep.name }.each do |dep|
-        response << '  ' * level + "  #{dep}\n"
+      spec.dependencies.sort_by(&:name).each do |dep|
+        response << "  " * level + "  #{dep}\n"
       end
     end
     response
@@ -182,7 +181,7 @@ use with other commands.
       sp.dependencies.each do |dep|
         dep = Gem::Dependency.new(*dep) unless Gem::Dependency === dep
 
-        if spec.name == dep.name and
+        if spec.name == dep.name &&
            dep.requirement.satisfied_by?(spec.version)
           result << [sp.full_name, dep]
         end
@@ -197,7 +196,7 @@ use with other commands.
   def name_pattern(args)
     return if args.empty?
 
-    if args.length == 1 and args.first =~ /\A(.*)(i)?\z/m
+    if args.length == 1 && args.first =~ /\A(.*)(i)?\z/m
       flags = $2 ? Regexp::IGNORECASE : nil
       Regexp.new $1, flags
     else