rubygems-update 2.6.1 → 3.5.0

data/lib/rubygems/commands/help_command.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
-require 'rubygems/command'
 
-class Gem::Commands::HelpCommand < Gem::Command
+require_relative "../command"
 
+class Gem::Commands::HelpCommand < Gem::Command
   # :stopdoc:
   EXAMPLES = <<-EOF
 Some examples of 'gem' usage.
@@ -38,7 +38,7 @@ Some examples of 'gem' usage.
 
 * Create a gem:
 
-    See http://guides.rubygems.org/make-your-own-gem/
+    See https://guides.rubygems.org/make-your-own-gem/
 
 * See information about RubyGems:
 
@@ -269,7 +269,7 @@ Gem::Platform::CURRENT.  This will correctly mark the gem with your ruby's
 platform.
   EOF
 
-  # NOTE when updating also update Gem::Command::HELP
+  # NOTE: when updating also update Gem::Command::HELP
 
   SUBCOMMANDS = [
     ["commands",         :show_commands],
@@ -277,11 +277,11 @@ platform.
     ["examples",         EXAMPLES],
     ["gem_dependencies", GEM_DEPENDENCIES],
     ["platforms",        PLATFORMS],
-  ]
+  ].freeze
   # :startdoc:
 
   def initialize
-    super 'help', "Provide help on the 'gem' command"
+    super "help", "Provide help on the 'gem' command"
 
     @command_manager = Gem::CommandManager.instance
   end
@@ -297,8 +297,8 @@ platform.
       begins? command, arg
     end
 
-    if help then
-      if Symbol === help then
+    if help
+      if Symbol === help
         send help
       else
         say help
@@ -306,10 +306,10 @@ platform.
       return
     end
 
-    if options[:help] then
+    if options[:help]
       show_help
 
-    elsif arg then
+    elsif arg
       show_command_help arg
 
     else
@@ -324,24 +324,26 @@ 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)
-    format = "#{' ' * margin_width}%-#{desc_width}s%s"
+    wrap_indent = " " * (margin_width + desc_width)
+    format = "#{" " * margin_width}%-#{desc_width}s%s"
 
     @command_manager.command_names.each do |cmd_name|
       command = @command_manager[cmd_name]
 
+      next if command&.deprecated?
+
       summary =
-        if command then
+        if command
           command.summary
         else
           "[No command found for #{cmd_name}]"
         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
@@ -356,20 +358,18 @@ platform.
     say out.join("\n")
   end
 
-  def show_command_help command_name # :nodoc:
+  def show_command_help(command_name) # :nodoc:
     command_name = command_name.downcase
 
     possibilities = @command_manager.find_command_possibilities command_name
 
-    if possibilities.size == 1 then
+    if possibilities.size == 1
       command = @command_manager[possibilities.first]
       command.invoke("--help")
-    elsif possibilities.size > 1 then
-      alert_warning "Ambiguous command #{command_name} (#{possibilities.join(', ')})"
+    elsif possibilities.size > 1
+      alert_warning "Ambiguous command #{command_name} (#{possibilities.join(", ")})"
     else
-      alert_warning "Unknown command #{command_name}.  Try: gem help commands"
+      alert_warning "Unknown command #{command_name}. Try: gem help commands"
     end
   end
-
 end
-

data/lib/rubygems/commands/info_command.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require_relative "../command"
+require_relative "../query_utils"
+
+class Gem::Commands::InfoCommand < Gem::Command
+  include Gem::QueryUtils
+
+  def initialize
+    super "info", "Show information for the given gem",
+         name: //, domain: :local, details: false, versions: true,
+         installed: nil, version: Gem::Requirement.default
+
+    add_query_options
+
+    remove_option("-d")
+
+    defaults[:details] = true
+    defaults[:exact] = true
+  end
+
+  def description # :nodoc:
+    "Info prints information about the gem such as name,"\
+    " description, website, license and installed paths"
+  end
+
+  def usage # :nodoc:
+    "#{program_name} GEMNAME"
+  end
+
+  def arguments # :nodoc:
+    "GEMNAME        name of the gem to print information about"
+  end
+
+  def defaults_str
+    "--local"
+  end
+end

data/lib/rubygems/commands/install_command.rb

@@ -1,10 +1,12 @@
 # frozen_string_literal: true
-require 'rubygems/command'
-require 'rubygems/install_update_options'
-require 'rubygems/dependency_installer'
-require 'rubygems/local_remote_options'
-require 'rubygems/validator'
-require 'rubygems/version_option'
+
+require_relative "../command"
+require_relative "../install_update_options"
+require_relative "../dependency_installer"
+require_relative "../local_remote_options"
+require_relative "../validator"
+require_relative "../version_option"
+require_relative "../update_suggestion"
 
 ##
 # Gem installer command line tool
@@ -12,23 +14,25 @@ require 'rubygems/version_option'
 # See `gem help install`
 
 class Gem::Commands::InstallCommand < Gem::Command
-
   attr_reader :installed_specs # :nodoc:
 
   include Gem::VersionOption
   include Gem::LocalRemoteOptions
   include Gem::InstallUpdateOptions
+  include Gem::UpdateSuggestion
 
   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: [],
     })
 
-    super 'install', 'Install a gem into the local repository', defaults
+    defaults.merge!(install_update_options)
+
+    super "install", "Install a gem into the local repository", defaults
 
     add_install_update_options
     add_local_remote_options
@@ -36,52 +40,6 @@ class Gem::Commands::InstallCommand < Gem::Command
     add_version_option
     add_prerelease_option "to be installed. (Only for listed gems)"
 
-    add_option(:"Install/Update", '-g', '--file [FILE]',
-               'Read from a gem dependencies API file and',
-               'install the listed gems') do |v,o|
-      v = Gem::GEM_DEP_FILES.find do |file|
-        File.exist? file
-      end unless v
-
-      unless v then
-        message = v ? v : "(tried #{Gem::GEM_DEP_FILES.join ', '})"
-
-        raise OptionParser::InvalidArgument,
-                "cannot find gem dependencies file #{message}"
-      end
-
-      o[:gemdeps] = v
-    end
-
-    add_option(:"Install/Update", '--without GROUPS', Array,
-               'Omit the named groups (comma separated)',
-               'when installing from a gem dependencies',
-               'file') do |v,o|
-      o[:without_groups].concat v.map { |without| without.intern }
-    end
-
-    add_option(:"Install/Update", '--default',
-               'Add the gem\'s full specification to',
-               'specifications/default and extract only its bin') do |v,o|
-      o[:install_as_default] = v
-    end
-
-    add_option(:"Install/Update", '--explain',
-               'Rather than install the gems, indicate which would',
-               'be installed') do |v,o|
-      o[:explain] = v
-    end
-
-    add_option(:"Install/Update", '--[no-]lock',
-               'Create a lock file (when used with -g/--file)') do |v,o|
-      o[:lock] = v
-    end
-
-    add_option(:"Install/Update", '--[no-]suggestions',
-               'Suggest alternates when gems are not found') do |v,o|
-      o[:suggest_alternate] = v
-    end
-
     @installed_specs = []
   end
 
@@ -90,8 +48,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"
+    "--both --version '#{Gem::Requirement.default}' --no-force\n" \
+      "--install-dir #{Gem.dir} --lock\n" +
+      install_update_defaults_str
   end
 
   def description # :nodoc:
@@ -163,40 +122,39 @@ to write the specification by hand.  For example:
   some_extension_gem (1.0)
   $
 
+Command Alias
+==========================
+
+You can use `i` command instead of `install`.
+
+  $ gem i GEMNAME
+
     EOF
   end
 
   def usage # :nodoc:
-    "#{program_name} GEMNAME [GEMNAME ...] [options] -- --build-flags"
-  end
-
-  def check_install_dir # :nodoc:
-    if options[:install_dir] and options[:user_install] then
-      alert_error "Use --install-dir or --user-install but not both"
-      terminate_interaction 1
-    end
+    "#{program_name} [options] GEMNAME [GEMNAME ...] -- --build-flags"
   end
 
   def check_version # :nodoc:
-    if options[:version] != Gem::Requirement.default and
-         get_all_gem_names.size > 1 then
-      alert_error "Can't use --version w/ multiple gems. Use name:ver instead."
+    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 install 'my_gem:1.0.0' 'my_other_gem:~>2.0.0'`"
       terminate_interaction 1
     end
   end
 
   def execute
-
-    if options.include? :gemdeps then
+    if options.include? :gemdeps
       install_from_gemdeps
       return # not reached
     end
 
     @installed_specs = []
 
-    ENV.delete 'GEM_PATH' if options[:install_dir].nil? and RUBY_VERSION > '1.9'
+    ENV.delete "GEM_PATH" if options[:install_dir].nil?
 
-    check_install_dir
     check_version
 
     load_hooks
@@ -205,11 +163,13 @@ to write the specification by hand.  For example:
 
     show_installed
 
+    say update_suggestion if eligible_for_update?
+
     terminate_interaction exit_code
   end
 
   def install_from_gemdeps # :nodoc:
-    require 'rubygems/request_set'
+    require_relative "../request_set"
     rs = Gem::RequestSet.new
 
     specs = rs.install_from_gemdeps options do |req, inst|
@@ -227,68 +187,27 @@ to write the specification by hand.  For example:
     terminate_interaction
   end
 
-  def install_gem name, version # :nodoc:
-    return if options[:conservative] and
-      not Gem::Dependency.new(name, version).matching_specs.empty?
+  def install_gem(name, version) # :nodoc:
+    return if options[:conservative] &&
+              !Gem::Dependency.new(name, version).matching_specs.empty?
 
     req = Gem::Requirement.create(version)
 
-    if options[:ignore_dependencies] then
-      install_gem_without_dependencies name, req
-    else
-      inst = Gem::DependencyInstaller.new options
-      request_set = inst.resolve_dependencies name, req
-
-      if options[:explain]
-        puts "Gems to install:"
-
-        request_set.sorted_requests.each do |s|
-          puts "  #{s.full_name}"
-        end
-
-        return
-      else
-        @installed_specs.concat request_set.install options
-      end
+    dinst = Gem::DependencyInstaller.new options
 
-      show_install_errors inst.errors
-    end
-  end
+    request_set = dinst.resolve_dependencies name, req
 
-  def install_gem_without_dependencies name, req # :nodoc:
-    gem = nil
+    if options[:explain]
+      say "Gems to install:"
 
-    if local? then
-      if name =~ /\.gem$/ and File.file? name then
-        source = Gem::Source::SpecificFile.new name
-        spec = source.spec
-      else
-        source = Gem::Source::Local.new
-        spec = source.find_gem name, req
+      request_set.sorted_requests.each do |activation_request|
+        say "  #{activation_request.full_name}"
       end
-      gem = source.download spec if spec
-    end
-
-    if remote? and not gem then
-      dependency = Gem::Dependency.new name, req
-      dependency.prerelease = options[:prerelease]
-
-      fetcher = Gem::RemoteFetcher.fetcher
-      gem = fetcher.download_to_cache dependency
+    else
+      @installed_specs.concat request_set.install options
     end
 
-    inst = Gem::Installer.at gem, options
-    inst.install
-
-    require 'rubygems/dependency_installer'
-    dinst = Gem::DependencyInstaller.new options
-    dinst.installed_gems.replace [inst.spec]
-
-    Gem.done_installing_hooks.each do |hook|
-      hook.call dinst, [inst.spec]
-    end unless Gem.done_installing_hooks.empty?
-
-    @installed_specs.push(inst.spec)
+    show_install_errors dinst.errors
   end
 
   def install_gems # :nodoc:
@@ -296,16 +215,22 @@ to write the specification by hand.  For example:
 
     get_all_gem_names_and_versions.each do |gem_name, gem_version|
       gem_version ||= options[:version]
+      domain = options[:domain]
+      domain = :local unless options[:suggest_alternate]
+      suppress_suggestions = (domain == :local)
 
       begin
         install_gem gem_name, gem_version
       rescue Gem::InstallError => e
         alert_error "Error installing #{gem_name}:\n\t#{e.message}"
         exit_code |= 1
-      rescue Gem::GemNotFoundException, Gem::UnsatisfiableDependencyError => e
-        domain = options[:domain]
-        domain = :local unless options[:suggest_alternate]
-        show_lookup_failure e.name, e.version, e.errors, domain
+      rescue Gem::GemNotFoundException => e
+        show_lookup_failure e.name, e.version, e.errors, suppress_suggestions
+
+        exit_code |= 2
+      rescue Gem::UnsatisfiableDependencyError => e
+        show_lookup_failure e.name, e.version, e.errors, suppress_suggestions,
+                            "'#{gem_name}' (#{gem_version})"
 
         exit_code |= 2
       end
@@ -319,20 +244,21 @@ to write the specification by hand.  For example:
 
   def load_hooks # :nodoc:
     if options[:install_as_default]
-      require 'rubygems/install_default_message'
+      require_relative "../install_default_message"
     else
-      require 'rubygems/install_message'
+      require_relative "../install_message"
     end
-    require 'rubygems/rdoc'
+    require_relative "../rdoc"
   end
 
-  def show_install_errors errors # :nodoc:
+  def show_install_errors(errors) # :nodoc:
     return unless errors
 
     errors.each do |x|
-      return unless Gem::SourceFetchProblem === x
+      next unless Gem::SourceFetchProblem === x
 
-      msg = "Unable to pull data from '#{x.source.uri}': #{x.error.message}"
+      require_relative "../uri"
+      msg = "Unable to pull data from '#{Gem::Uri.redact(x.source.uri)}': #{x.error.message}"
 
       alert_warning msg
     end
@@ -341,9 +267,7 @@ to write the specification by hand.  For example:
   def show_installed # :nodoc:
     return if @installed_specs.empty?
 
-    gems = @installed_specs.length == 1 ? 'gem' : 'gems'
+    gems = @installed_specs.length == 1 ? "gem" : "gems"
     say "#{@installed_specs.length} #{gems} installed"
   end
-
 end
-

data/lib/rubygems/commands/list_command.rb

@@ -1,17 +1,20 @@
 # frozen_string_literal: true
-require 'rubygems/command'
-require 'rubygems/commands/query_command'
+
+require_relative "../command"
+require_relative "../query_utils"
 
 ##
-# An alternate to Gem::Commands::QueryCommand that searches for gems starting
-# with the supplied argument.
+# Searches for gems starting with the supplied argument.
 
-class Gem::Commands::ListCommand < Gem::Commands::QueryCommand
+class Gem::Commands::ListCommand < Gem::Command
+  include Gem::QueryUtils
 
   def initialize
-    super 'list', 'Display local gems whose name matches REGEXP'
+    super "list", "Display local gems whose name matches REGEXP",
+         domain: :local, details: false, versions: true,
+         installed: nil, version: Gem::Requirement.default
 
-    remove_option('--name-matches')
+    add_query_options
   end
 
   def arguments # :nodoc:
@@ -36,6 +39,4 @@ To search for remote gems use the search command.
   def usage # :nodoc:
     "#{program_name} [REGEXP ...]"
   end
-
 end
-

data/lib/rubygems/commands/lock_command.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
-require 'rubygems/command'
 
-class Gem::Commands::LockCommand < Gem::Command
+require_relative "../command"
 
+class Gem::Commands::LockCommand < Gem::Command
   def initialize
-    super 'lock', 'Generate a lockdown list of gems',
-          :strict => false
+    super "lock", "Generate a lockdown list of gems",
+          strict: false
 
-    add_option '-s', '--[no-]strict',
-               'fail if unable to satisfy a dependency' do |strict, options|
+    add_option "-s", "--[no-]strict",
+               "fail if unable to satisfy a dependency" do |strict, options|
       options[:strict] = strict
     end
   end
@@ -59,7 +59,7 @@ lock it down to the exact version.
   end
 
   def complain(message)
-    if options[:strict] then
+    if options[:strict]
       raise Gem::Exception, message
     else
       say "# #{message}"
@@ -78,7 +78,7 @@ lock it down to the exact version.
 
       spec = Gem::Specification.load spec_path(full_name)
 
-      if spec.nil? then
+      if spec.nil?
         complain "Could not find gem #{full_name}, try using the full name"
         next
       end
@@ -90,7 +90,7 @@ lock it down to the exact version.
         next if locked[dep.name]
         candidates = dep.matching_specs
 
-        if candidates.empty? then
+        if candidates.empty?
           complain "Unable to satisfy '#{dep}' from currently installed gems"
         else
           pending << candidates.last.full_name
@@ -100,12 +100,10 @@ lock it down to the exact version.
   end
 
   def spec_path(gem_full_name)
-    gemspecs = Gem.path.map { |path|
+    gemspecs = Gem.path.map do |path|
       File.join path, "specifications", "#{gem_full_name}.gemspec"
-    }
+    end
 
-    gemspecs.find { |path| File.exist? path }
+    gemspecs.find {|path| File.exist? path }
   end
-
 end
-

data/lib/rubygems/commands/mirror_command.rb

@@ -1,12 +1,13 @@
 # frozen_string_literal: true
-require 'rubygems/command'
+
+require_relative "../command"
 
 unless defined? Gem::Commands::MirrorCommand
   class Gem::Commands::MirrorCommand < Gem::Command
     def initialize
-      super('mirror', 'Mirror all gem files (requires rubygems-mirror)')
+      super("mirror", "Mirror all gem files (requires rubygems-mirror)")
       begin
-        Gem::Specification.find_by_name('rubygems-mirror').activate
+        Gem::Specification.find_by_name("rubygems-mirror").activate
       rescue Gem::LoadError
         # no-op
       end
@@ -21,6 +22,5 @@ The mirror command has been moved to the rubygems-mirror gem.
     def execute
       alert_error "Install the rubygems-mirror gem for the mirror command"
     end
-
   end
 end