rubygems-update 3.3.18 → 3.6.2

data/lib/rubygems/commands/signout_command.rb

@@ -1,14 +1,15 @@
 # frozen_string_literal: true
-require_relative '../command'
+
+require_relative "../command"
 
 class Gem::Commands::SignoutCommand < Gem::Command
   def initialize
-    super 'signout', 'Sign out from all the current sessions.'
+    super "signout", "Sign out from all the current sessions."
   end
 
   def description # :nodoc:
-    'The `signout` command is used to sign out from all current sessions,'\
-    ' allowing you to sign in using a different set of credentials.'
+    "The `signout` command is used to sign out from all current sessions,"\
+    " allowing you to sign in using a different set of credentials."
   end
 
   def usage # :nodoc:
@@ -19,13 +20,13 @@ class Gem::Commands::SignoutCommand < Gem::Command
     credentials_path = Gem.configuration.credentials_path
 
     if !File.exist?(credentials_path)
-      alert_error 'You are not currently signed in.'
+      alert_error "You are not currently signed in."
     elsif !File.writable?(credentials_path)
       alert_error "File '#{Gem.configuration.credentials_path}' is read-only."\
-                  ' Please make sure it is writable.'
+                  " Please make sure it is writable."
     else
       Gem.configuration.unset_api_key!
-      say 'You have successfully signed out from all sessions.'
+      say "You have successfully signed out from all sessions."
     end
   end
 end

data/lib/rubygems/commands/sources_command.rb

@@ -1,40 +1,41 @@
 # frozen_string_literal: true
-require_relative '../command'
-require_relative '../remote_fetcher'
-require_relative '../spec_fetcher'
-require_relative '../local_remote_options'
+
+require_relative "../command"
+require_relative "../remote_fetcher"
+require_relative "../spec_fetcher"
+require_relative "../local_remote_options"
 
 class Gem::Commands::SourcesCommand < Gem::Command
   include Gem::LocalRemoteOptions
 
   def initialize
-    require 'fileutils'
+    require "fileutils"
 
-    super 'sources',
-          'Manage the sources and cache file RubyGems uses to search for gems'
+    super "sources",
+          "Manage the sources and cache file RubyGems uses to search for gems"
 
-    add_option '-a', '--add SOURCE_URI', 'Add source' do |value, options|
+    add_option "-a", "--add SOURCE_URI", "Add source" do |value, options|
       options[:add] = value
     end
 
-    add_option '-l', '--list', 'List sources' do |value, options|
+    add_option "-l", "--list", "List sources" do |value, options|
       options[:list] = value
     end
 
-    add_option '-r', '--remove SOURCE_URI', 'Remove source' do |value, options|
+    add_option "-r", "--remove SOURCE_URI", "Remove source" do |value, options|
       options[:remove] = value
     end
 
-    add_option '-c', '--clear-all',
-               'Remove all sources (clear the cache)' do |value, options|
+    add_option "-c", "--clear-all",
+               "Remove all sources (clear the cache)" do |value, options|
       options[:clear_all] = value
     end
 
-    add_option '-u', '--update', 'Update source cache' do |value, options|
+    add_option "-u", "--update", "Update source cache" do |value, options|
       options[:update] = value
     end
 
-    add_option '-f', '--[no-]force', "Do not show any confirmation prompts and behave as if 'yes' was always answered" do |value, options|
+    add_option "-f", "--[no-]force", "Do not show any confirmation prompts and behave as if 'yes' was always answered" do |value, options|
       options[:force] = value
     end
 
@@ -58,7 +59,7 @@ class Gem::Commands::SourcesCommand < Gem::Command
 
         say "#{source_uri} added to sources"
       end
-    rescue URI::Error, ArgumentError
+    rescue Gem::URI::Error, ArgumentError
       say "#{source_uri} is not a URI"
       terminate_interaction 1
     rescue Gem::RemoteFetcher::FetchError => e
@@ -70,7 +71,7 @@ class Gem::Commands::SourcesCommand < Gem::Command
   def check_typo_squatting(source)
     if source.typo_squatting?("rubygems.org")
       question = <<-QUESTION.chomp
-#{source.uri.to_s} is too similar to https://rubygems.org
+#{source.uri} is too similar to https://rubygems.org
 
 Do you want to add this source?
       QUESTION
@@ -80,10 +81,10 @@ Do you want to add this source?
   end
 
   def check_rubygems_https(source_uri) # :nodoc:
-    uri = URI source_uri
+    uri = Gem::URI source_uri
 
-    if uri.scheme and uri.scheme.downcase == 'http' and
-       uri.host.downcase == 'rubygems.org'
+    if uri.scheme && uri.scheme.casecmp("http").zero? &&
+       uri.host.casecmp("rubygems.org").zero?
       question = <<-QUESTION.chomp
 https://rubygems.org is recommended for security over #{uri}
 
@@ -98,21 +99,21 @@ Do you want to add this insecure source?
     path = Gem.spec_cache_dir
     FileUtils.rm_rf path
 
-    unless File.exist? path
-      say "*** Removed specs cache ***"
-    else
-      unless File.writable? path
-        say "*** Unable to remove source cache (write protected) ***"
-      else
+    if File.exist? path
+      if File.writable? path
         say "*** Unable to remove source cache ***"
+      else
+        say "*** Unable to remove source cache (write protected) ***"
       end
 
       terminate_interaction 1
+    else
+      say "*** Removed specs cache ***"
     end
   end
 
   def defaults_str # :nodoc:
-    '--list'
+    "--list"
   end
 
   def description # :nodoc:
@@ -138,8 +139,8 @@ do not recognize you should remove them.
 RubyGems has been configured to serve gems via the following URLs through
 its history:
 
-* http://gems.rubyforge.org (RubyGems 1.3.6 and earlier)
-* https://rubygems.org/       (RubyGems 1.3.7 through 1.8.25)
+* http://gems.rubyforge.org (RubyGems 1.3.5 and earlier)
+* http://rubygems.org       (RubyGems 1.3.6 through 1.8.30, and 2.0.0)
 * https://rubygems.org      (RubyGems 2.0.1 and newer)
 
 Since all of these sources point to the same set of gems you only need one
@@ -193,13 +194,13 @@ To remove a source use the --remove argument:
   end
 
   def remove_source(source_uri) # :nodoc:
-    unless Gem.sources.include? source_uri
-      say "source #{source_uri} not present in cache"
-    else
+    if Gem.sources.include? source_uri
       Gem.sources.delete source_uri
       Gem.configuration.write
 
       say "#{source_uri} removed from sources"
+    else
+      say "source #{source_uri} not present in cache"
     end
   end
 
@@ -215,9 +216,9 @@ To remove a source use the --remove argument:
   def remove_cache_file(desc, path) # :nodoc:
     FileUtils.rm_rf path
 
-    if not File.exist?(path)
+    if !File.exist?(path)
       say "*** Removed #{desc} source cache ***"
-    elsif not File.writable?(path)
+    elsif !File.writable?(path)
       say "*** Unable to remove #{desc} source cache (write protected) ***"
     else
       say "*** Unable to remove #{desc} source cache ***"

data/lib/rubygems/commands/specification_command.rb

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
-require_relative '../command'
-require_relative '../local_remote_options'
-require_relative '../version_option'
-require_relative '../package'
+
+require_relative "../command"
+require_relative "../local_remote_options"
+require_relative "../version_option"
+require_relative "../package"
 
 class Gem::Commands::SpecificationCommand < Gem::Command
   include Gem::LocalRemoteOptions
@@ -11,28 +12,28 @@ class Gem::Commands::SpecificationCommand < Gem::Command
   def initialize
     Gem.load_yaml
 
-    super 'specification', 'Display gem specification (in yaml)',
-          :domain => :local, :version => Gem::Requirement.default,
-          :format => :yaml
+    super "specification", "Display gem specification (in yaml)",
+          domain: :local, version: Gem::Requirement.default,
+          format: :yaml
 
-    add_version_option('examine')
+    add_version_option("examine")
     add_platform_option
     add_prerelease_option
 
-    add_option('--all', 'Output specifications for all versions of',
-               'the gem') do |value, options|
+    add_option("--all", "Output specifications for all versions of",
+               "the gem") do |_value, options|
       options[:all] = true
     end
 
-    add_option('--ruby', 'Output ruby format') do |value, options|
+    add_option("--ruby", "Output ruby format") do |_value, options|
       options[:format] = :ruby
     end
 
-    add_option('--yaml', 'Output YAML format') do |value, options|
+    add_option("--yaml", "Output YAML format") do |_value, options|
       options[:format] = :yaml
     end
 
-    add_option('--marshal', 'Output Marshal format') do |value, options|
+    add_option("--marshal", "Output Marshal format") do |_value, options|
       options[:format] = :marshal
     end
 
@@ -88,7 +89,7 @@ Specific fields in the specification can be extracted in YAML format:
       raise Gem::CommandLineError, "Unsupported version type: '#{v}'"
     end
 
-    if !req.none? and options[:all]
+    if !req.none? && options[:all]
       alert_error "Specify --all or -v, not both"
       terminate_interaction 1
     end
@@ -102,11 +103,15 @@ Specific fields in the specification can be extracted in YAML format:
     field = get_one_optional_argument
 
     raise Gem::CommandLineError, "--ruby and FIELD are mutually exclusive" if
-      field and options[:format] == :ruby
+      field && options[:format] == :ruby
 
     if local?
       if File.exist? gem
-        specs << Gem::Package.new(gem).spec rescue nil
+        begin
+          specs << Gem::Package.new(gem).spec
+        rescue StandardError
+          nil
+        end
       end
 
       if specs.empty?
@@ -133,16 +138,16 @@ Specific fields in the specification can be extracted in YAML format:
     end
 
     unless options[:all]
-      specs = [specs.max_by {|s| s.version }]
+      specs = [specs.max_by(&:version)]
     end
 
     specs.each do |s|
       s = s.send field if field
 
       say case options[:format]
-      when :ruby then s.to_ruby
-      when :marshal then Marshal.dump s
-      else s.to_yaml
+          when :ruby then s.to_ruby
+          when :marshal then Marshal.dump s
+          else s.to_yaml
       end
 
       say "\n"

data/lib/rubygems/commands/stale_command.rb

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
-require_relative '../command'
+
+require_relative "../command"
 
 class Gem::Commands::StaleCommand < Gem::Command
   def initialize
-    super('stale', 'List gems along with access times')
+    super("stale", "List gems along with access times")
   end
 
   def description # :nodoc:
@@ -17,7 +18,7 @@ longer using.
   end
 
   def usage # :nodoc:
-    "#{program_name}"
+    program_name.to_s
   end
 
   def execute
@@ -33,7 +34,7 @@ longer using.
     end
 
     gem_to_atime.sort_by {|_, atime| atime }.each do |name, atime|
-      say "#{name} at #{atime.strftime '%c'}"
+      say "#{name} at #{atime.strftime "%c"}"
     end
   end
 end

data/lib/rubygems/commands/uninstall_command.rb

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
-require_relative '../command'
-require_relative '../version_option'
-require_relative '../uninstaller'
-require 'fileutils'
+
+require_relative "../command"
+require_relative "../version_option"
+require_relative "../uninstaller"
+require "fileutils"
 
 ##
 # Gem uninstaller command line tool
@@ -13,78 +14,77 @@ class Gem::Commands::UninstallCommand < Gem::Command
   include Gem::VersionOption
 
   def initialize
-    super 'uninstall', 'Uninstall gems from the local repository',
-          :version => Gem::Requirement.default, :user_install => true,
-          :check_dev => false, :vendor => false
+    super "uninstall", "Uninstall gems from the local repository",
+          version: Gem::Requirement.default, user_install: true,
+          check_dev: false, vendor: false
 
-    add_option('-a', '--[no-]all',
-      'Uninstall all matching versions'
-    ) do |value, options|
+    add_option("-a", "--[no-]all",
+      "Uninstall all matching versions") do |value, options|
       options[:all] = value
     end
 
-    add_option('-I', '--[no-]ignore-dependencies',
-               'Ignore dependency requirements while',
-               'uninstalling') do |value, options|
+    add_option("-I", "--[no-]ignore-dependencies",
+               "Ignore dependency requirements while",
+               "uninstalling") do |value, options|
       options[:ignore] = value
     end
 
-    add_option('-D', '--[no-]check-development',
-               'Check development dependencies while uninstalling',
-               '(default: false)') do |value, options|
+    add_option("-D", "--[no-]check-development",
+               "Check development dependencies while uninstalling",
+               "(default: false)") do |value, options|
       options[:check_dev] = value
     end
 
-    add_option('-x', '--[no-]executables',
-                 'Uninstall applicable executables without',
-                 'confirmation') do |value, options|
+    add_option("-x", "--[no-]executables",
+                 "Uninstall applicable executables without",
+                 "confirmation") do |value, options|
       options[:executables] = value
     end
 
-    add_option('-i', '--install-dir DIR',
-               'Directory to uninstall gem from') do |value, options|
+    add_option("-i", "--install-dir DIR",
+               "Directory to uninstall gem from") do |value, options|
       options[:install_dir] = File.expand_path(value)
     end
 
-    add_option('-n', '--bindir DIR',
-               'Directory to remove executables from') do |value, options|
+    add_option("-n", "--bindir DIR",
+               "Directory to remove executables from") do |value, options|
       options[:bin_dir] = File.expand_path(value)
     end
 
-    add_option('--[no-]user-install',
-               'Uninstall from user\'s home directory',
-               'in addition to GEM_HOME.') do |value, options|
+    add_option("--[no-]user-install",
+               "Uninstall from user's home directory",
+               "in addition to GEM_HOME.") do |value, options|
       options[:user_install] = value
     end
 
-    add_option('--[no-]format-executable',
-               'Assume executable names match Ruby\'s prefix and suffix.') do |value, options|
+    add_option("--[no-]format-executable",
+               "Assume executable names match Ruby's prefix and suffix.") do |value, options|
       options[:format_executable] = value
     end
 
-    add_option('--[no-]force',
-               'Uninstall all versions of the named gems',
-               'ignoring dependencies') do |value, options|
+    add_option("--[no-]force",
+               "Uninstall all versions of the named gems",
+               "ignoring dependencies") do |value, options|
       options[:force] = value
     end
 
-    add_option('--[no-]abort-on-dependent',
-               'Prevent uninstalling gems that are',
-               'depended on by other gems.') do |value, options|
+    add_option("--[no-]abort-on-dependent",
+               "Prevent uninstalling gems that are",
+               "depended on by other gems.") do |value, options|
       options[:abort_on_dependent] = value
     end
 
     add_version_option
     add_platform_option
 
-    add_option('--vendor',
-               'Uninstall gem from the vendor directory.',
-               'Only for use by gem repackagers.') do |value, options|
+    add_option("--vendor",
+               "Uninstall gem from the vendor directory.",
+               "Only for use by gem repackagers.") do |_value, options|
       unless Gem.vendor_dir
-        raise Gem::OptionParser::InvalidOption.new 'your platform is not supported'
+        raise Gem::OptionParser::InvalidOption.new "your platform is not supported"
       end
 
-      alert_warning 'Use your OS package manager to uninstall vendor gems'
+      alert_warning "Use your OS package manager to uninstall vendor gems"
       options[:vendor] = true
       options[:install_dir] = Gem.vendor_dir
     end
@@ -95,8 +95,8 @@ class Gem::Commands::UninstallCommand < Gem::Command
   end
 
   def defaults_str # :nodoc:
-    "--version '#{Gem::Requirement.default}' --no-force " +
-    "--user-install"
+    "--version '#{Gem::Requirement.default}' --no-force " \
+      "--user-install"
   end
 
   def description # :nodoc:
@@ -114,8 +114,8 @@ that is a dependency of an existing gem.  You can use the
   end
 
   def check_version # :nodoc:
-    if options[:version] != Gem::Requirement.default and
-         get_all_gem_names.size > 1
+    if options[:version] != Gem::Requirement.default &&
+       get_all_gem_names.size > 1
       alert_error "Can't use --version with multiple gems. You can specify multiple gems with" \
                   " version requirements using `gem uninstall 'my_gem:1.0.0' 'my_other_gem:~>2.0.0'`"
       terminate_interaction 1
@@ -125,7 +125,10 @@ that is a dependency of an existing gem.  You can use the
   def execute
     check_version
 
-    if options[:all] and not options[:args].empty?
+    # Consider only gem specifications installed at `--install-dir`
+    Gem::Specification.dirs = options[:install_dir] if options[:install_dir]
+
+    if options[:all] && !options[:args].empty?
       uninstall_specific
     elsif options[:all]
       uninstall_all
@@ -135,7 +138,7 @@ that is a dependency of an existing gem.  You can use the
   end
 
   def uninstall_all
-    specs = Gem::Specification.reject {|spec| spec.default_gem? }
+    specs = Gem::Specification.reject(&:default_gem?)
 
     specs.each do |spec|
       options[:version] = spec.version
@@ -154,9 +157,14 @@ that is a dependency of an existing gem.  You can use the
 
       gem_specs = Gem::Specification.find_all_by_name(name, original_gem_version[name])
 
-      say("Gem '#{name}' is not installed") if gem_specs.empty?
-      gem_specs.each do |spec|
-        deplist.add spec
+      if gem_specs.empty?
+        say("Gem '#{name}' is not installed")
+      else
+        gem_specs.reject!(&:default_gem?) if gem_specs.size > 1
+
+        gem_specs.each do |spec|
+          deplist.add spec
+        end
       end
     end
 
@@ -165,15 +173,14 @@ that is a dependency of an existing gem.  You can use the
     gems_to_uninstall = {}
 
     deps.each do |dep|
-      unless gems_to_uninstall[dep.name]
+      if original_gem_version[dep.name] == Gem::Requirement.default
+        next if gems_to_uninstall[dep.name]
         gems_to_uninstall[dep.name] = true
-
-        unless original_gem_version[dep.name] == Gem::Requirement.default
-          options[:version] = dep.version
-        end
-
-        uninstall_gem(dep.name)
+      else
+        options[:version] = dep.version
       end
+
+      uninstall_gem(dep.name)
     end
   end
 
@@ -181,12 +188,12 @@ that is a dependency of an existing gem.  You can use the
     uninstall(gem_name)
   rescue Gem::GemNotInHomeException => e
     spec = e.spec
-    alert("In order to remove #{spec.name}, please execute:\n" +
-          "\tgem uninstall #{spec.name} --install-dir=#{spec.installation_path}")
+    alert("In order to remove #{spec.name}, please execute:\n" \
+          "\tgem uninstall #{spec.name} --install-dir=#{spec.base_dir}")
   rescue Gem::UninstallError => e
     spec = e.spec
-    alert_error("Error: unable to successfully uninstall '#{spec.name}' which is " +
-          "located at '#{spec.full_gem_path}'. This is most likely because" +
+    alert_error("Error: unable to successfully uninstall '#{spec.name}' which is " \
+          "located at '#{spec.full_gem_path}'. This is most likely because" \
           "the current user does not have the appropriate permissions")
     terminate_interaction 1
   end

data/lib/rubygems/commands/unpack_command.rb

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
-require_relative '../command'
-require_relative '../version_option'
-require_relative '../security_option'
-require_relative '../remote_fetcher'
-require_relative '../package'
+
+require_relative "../command"
+require_relative "../version_option"
+require_relative "../security_option"
+require_relative "../remote_fetcher"
+require_relative "../package"
 
 # forward-declare
 
@@ -17,18 +18,18 @@ class Gem::Commands::UnpackCommand < Gem::Command
   include Gem::SecurityOption
 
   def initialize
-    require 'fileutils'
+    require "fileutils"
 
-    super 'unpack', 'Unpack an installed gem to the current directory',
-          :version => Gem::Requirement.default,
-          :target  => Dir.pwd
+    super "unpack", "Unpack an installed gem to the current directory",
+          version: Gem::Requirement.default,
+          target: Dir.pwd
 
-    add_option('--target=DIR',
-               'target directory for unpacking') do |value, options|
+    add_option("--target=DIR",
+               "target directory for unpacking") do |value, options|
       options[:target] = value
     end
 
-    add_option('--spec', 'unpack the gem specification') do |value, options|
+    add_option("--spec", "unpack the gem specification") do |_value, options|
       options[:spec] = true
     end
 
@@ -95,19 +96,17 @@ command help for an example.
 
         FileUtils.mkdir_p @options[:target] if @options[:target]
 
-        destination = begin
-          if @options[:target]
-            File.join @options[:target], spec_file
-          else
-            spec_file
-          end
+        destination = if @options[:target]
+          File.join @options[:target], spec_file
+        else
+          spec_file
         end
 
-        File.open destination, 'w' do |io|
+        File.open destination, "w" do |io|
           io.write metadata
         end
       else
-        basename = File.basename path, '.gem'
+        basename = File.basename path, ".gem"
         target_dir = File.expand_path basename, options[:target]
 
         package = Gem::Package.new path, security_policy
@@ -131,7 +130,7 @@ command help for an example.
       return this_path if File.exist? this_path
     end
 
-    return nil
+    nil
   end
 
   ##
@@ -144,24 +143,18 @@ command help for an example.
   #   get_path 'rake', '< 0.1' # nil
   #   get_path 'rak'           # nil (exact name required)
   #--
-  # TODO: This should be refactored so that it's a general service. I don't
-  # think any of our existing classes are the right place though.  Just maybe
-  # 'Cache'?
-  #
-  # TODO: It just uses Gem.dir for now.  What's an easy way to get the list of
-  # source directories?
 
   def get_path(dependency)
-    return dependency.name if dependency.name =~ /\.gem$/i
+    return dependency.name if /\.gem$/i.match?(dependency.name)
 
     specs = dependency.matching_specs
 
-    selected = specs.max_by {|s| s.version }
+    selected = specs.max_by(&:version)
 
     return Gem::RemoteFetcher.fetcher.download_to_cache(dependency) unless
       selected
 
-    return unless dependency.name =~ /^#{selected.name}$/i
+    return unless /^#{selected.name}$/i.match?(dependency.name)
 
     # We expect to find (basename).gem in the 'cache' directory.  Furthermore,
     # the name match must be exact (ignoring case).