rubygems-update 3.0.3 → 3.4.7

data/lib/rubygems/commands/signin_command.rb

@@ -1,15 +1,15 @@
 # frozen_string_literal: true
-require 'rubygems/command'
-require 'rubygems/gemcutter_utilities'
+require_relative "../command"
+require_relative "../gemcutter_utilities"
 
 class Gem::Commands::SigninCommand < Gem::Command
   include Gem::GemcutterUtilities
 
   def initialize
-    super 'signin', 'Sign in to any gemcutter-compatible host. '\
-          'It defaults to https://rubygems.org'
+    super "signin", "Sign in to any gemcutter-compatible host. "\
+          "It defaults to https://rubygems.org"
 
-    add_option('--host HOST', 'Push to another gemcutter-compatible host') do |value, options|
+    add_option("--host HOST", "Push to another gemcutter-compatible host") do |value, options|
       options[:host] = value
     end
 
@@ -17,10 +17,10 @@ class Gem::Commands::SigninCommand < Gem::Command
   end
 
   def description # :nodoc:
-    'The signin command executes host sign in for a push server (the default is'\
-    ' https://rubygems.org). The host can be provided with the host flag or can'\
-    ' be inferred from the provided gem. Host resolution matches the resolution'\
-    ' strategy for the push command.'
+    "The signin command executes host sign in for a push server (the default is"\
+    " https://rubygems.org). The host can be provided with the host flag or can"\
+    " be inferred from the provided gem. Host resolution matches the resolution"\
+    " strategy for the push command."
   end
 
   def usage # :nodoc:
@@ -30,5 +30,4 @@ class Gem::Commands::SigninCommand < Gem::Command
   def execute
     sign_in options[:host]
   end
-
 end

data/lib/rubygems/commands/signout_command.rb

@@ -1,15 +1,14 @@
 # frozen_string_literal: true
-require 'rubygems/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:
@@ -20,14 +19,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,43 @@
 # frozen_string_literal: true
-require 'rubygems/command'
-require 'rubygems/remote_fetcher'
-require 'rubygems/spec_fetcher'
-require 'rubygems/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|
+      options[:force] = value
+    end
+
     add_proxy_option
   end
 
@@ -43,6 +46,8 @@ class Gem::Commands::SourcesCommand < Gem::Command
 
     source = Gem::Source.new source_uri
 
+    check_typo_squatting(source)
+
     begin
       if Gem.sources.include? source
         say "source #{source_uri} already present in the cache"
@@ -57,23 +62,35 @@ class Gem::Commands::SourcesCommand < Gem::Command
       say "#{source_uri} is not a URI"
       terminate_interaction 1
     rescue Gem::RemoteFetcher::FetchError => e
-      say "Error fetching #{source_uri}:\n\t#{e.message}"
+      say "Error fetching #{Gem::Uri.redact(source.uri)}:\n\t#{e.message}"
       terminate_interaction 1
     end
   end
 
+  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
+
+Do you want to add this source?
+      QUESTION
+
+      terminate_interaction 1 unless options[:force] || ask_yes_no(question)
+    end
+  end
+
   def check_rubygems_https(source_uri) # :nodoc:
     uri = URI source_uri
 
-    if uri.scheme and uri.scheme.downcase == 'http' and
-       uri.host.downcase == 'rubygems.org'
+    if uri.scheme && uri.scheme.downcase == "http" &&
+       uri.host.downcase == "rubygems.org"
       question = <<-QUESTION.chomp
 https://rubygems.org is recommended for security over #{uri}
 
 Do you want to add this insecure source?
       QUESTION
 
-      terminate_interaction 1 unless ask_yes_no question
+      terminate_interaction 1 unless options[:force] || ask_yes_no(question)
     end
   end
 
@@ -95,7 +112,7 @@ Do you want to add this insecure source?
   end
 
   def defaults_str # :nodoc:
-    '--list'
+    "--list"
   end
 
   def description # :nodoc:
@@ -121,8 +138,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)
-* http://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
@@ -139,8 +156,8 @@ before it is added.
 
 To remove a source use the --remove argument:
 
-    $ gem sources --remove http://rubygems.org
-    http://rubygems.org removed from sources
+    $ gem sources --remove https://rubygems.org/
+    https://rubygems.org/ removed from sources
 
     EOF
   end
@@ -198,13 +215,12 @@ 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 ***"
     end
   end
-
 end

data/lib/rubygems/commands/specification_command.rb

@@ -1,39 +1,38 @@
 # frozen_string_literal: true
-require 'rubygems/command'
-require 'rubygems/local_remote_options'
-require 'rubygems/version_option'
-require 'rubygems/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
   include Gem::VersionOption
 
   def initialize
     Gem.load_yaml
 
-    super 'specification', 'Display gem specification (in 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
 
@@ -89,7 +88,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
@@ -103,7 +102,7 @@ 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
@@ -119,7 +118,7 @@ Specific fields in the specification can be extracted in YAML format:
       dep.prerelease = options[:prerelease]
       found, _ = Gem::SpecFetcher.fetcher.spec_for_dependency dep
 
-      specs.push(*found.map { |spec,| spec })
+      specs.push(*found.map {|spec,| spec })
     end
 
     if specs.empty?
@@ -127,18 +126,24 @@ Specific fields in the specification can be extracted in YAML format:
       terminate_interaction 1
     end
 
+    platform = get_platform_from_requirements(options)
+
+    if platform
+      specs = specs.select {|s| s.platform.to_s == platform }
+    end
+
     unless options[:all]
-      specs = [specs.max_by { |s| s.version }]
+      specs = [specs.max_by {|s| s.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
-          end
+      when :ruby then s.to_ruby
+      when :marshal then Marshal.dump s
+      else s.to_yaml
+      end
 
       say "\n"
     end

data/lib/rubygems/commands/stale_command.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
-require 'rubygems/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:
@@ -32,7 +32,7 @@ longer using.
       end
     end
 
-    gem_to_atime.sort_by { |_, atime| atime }.each do |name, atime|
+    gem_to_atime.sort_by {|_, atime| atime }.each do |name, atime|
       say "#{name} at #{atime.strftime '%c'}"
     end
   end

data/lib/rubygems/commands/uninstall_command.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
-require 'rubygems/command'
-require 'rubygems/version_option'
-require 'rubygems/uninstaller'
-require 'fileutils'
+require_relative "../command"
+require_relative "../version_option"
+require_relative "../uninstaller"
+require "fileutils"
 
 ##
 # Gem uninstaller command line tool
@@ -10,82 +10,81 @@ require 'fileutils'
 # See `gem help uninstall`
 
 class Gem::Commands::UninstallCommand < Gem::Command
-
   include Gem::VersionOption
 
   def initialize
-    super 'uninstall', 'Uninstall gems from the local repository',
+    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'
+    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 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
@@ -97,7 +96,7 @@ class Gem::Commands::UninstallCommand < Gem::Command
 
   def defaults_str # :nodoc:
     "--version '#{Gem::Requirement.default}' --no-force " +
-    "--user-install"
+      "--user-install"
   end
 
   def description # :nodoc:
@@ -115,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
@@ -126,7 +125,7 @@ that is a dependency of an existing gem.  You can use the
   def execute
     check_version
 
-    if options[:all] and not options[:args].empty?
+    if options[:all] && !options[:args].empty?
       uninstall_specific
     elsif options[:all]
       uninstall_all
@@ -136,22 +135,25 @@ 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 {|spec| spec.default_gem? }
 
     specs.each do |spec|
       options[:version] = spec.version
       uninstall_gem spec.name
     end
 
-    alert "Uninstalled all gems in #{options[:install_dir]}"
+    alert "Uninstalled all gems in #{options[:install_dir] || Gem.dir}"
   end
 
   def uninstall_specific
     deplist = Gem::DependencyList.new
+    original_gem_version = {}
 
     get_all_gem_names_and_versions.each do |name, version|
-      requirement = Array(version || options[:version])
-      gem_specs = Gem::Specification.find_all_by_name(name, *requirement)
+      original_gem_version[name] = version || options[:version]
+
+      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
@@ -160,16 +162,23 @@ that is a dependency of an existing gem.  You can use the
 
     deps = deplist.strongly_connected_components.flatten.reverse
 
+    gems_to_uninstall = {}
+
     deps.each do |dep|
-      options[:version] = dep.version
-      uninstall_gem(dep.name)
+      unless 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)
+      end
     end
   end
 
   def uninstall_gem(gem_name)
     uninstall(gem_name)
-  rescue Gem::InstallError
-    nil
   rescue Gem::GemNotInHomeException => e
     spec = e.spec
     alert("In order to remove #{spec.name}, please execute:\n" +