rubygems-update 3.1.1 → 3.2.0.rc.2

data/lib/rubygems/commands/contents_command.rb

@@ -1,10 +1,8 @@
 # frozen_string_literal: true
-require 'English'
 require 'rubygems/command'
 require 'rubygems/version_option'
 
 class Gem::Commands::ContentsCommand < Gem::Command
-
   include Gem::VersionOption
 
   def initialize
@@ -106,7 +104,8 @@ prefix or only the files that are requireable.
     spec.files.map do |file|
       case file
       when /\A#{spec.bindir}\//
-        [RbConfig::CONFIG['bindir'], $POSTMATCH]
+        # $' is POSTMATCH
+        [RbConfig::CONFIG['bindir'], $']
       when /\.so\z/
         [RbConfig::CONFIG['archdir'], file]
       else
@@ -167,7 +166,7 @@ prefix or only the files that are requireable.
   end
 
   def spec_for(name)
-    spec = Gem::Specification.find_all_by_name(name, @version).last
+    spec = Gem::Specification.find_all_by_name(name, @version).first
 
     return spec if spec
 
@@ -175,7 +174,7 @@ prefix or only the files that are requireable.
 
     if Gem.configuration.verbose
       say "\nDirectories searched:"
-      @spec_dirs.sort.each { |dir| say dir }
+      @spec_dirs.sort.each {|dir| say dir }
     end
 
     return nil
@@ -186,5 +185,4 @@ prefix or only the files that are requireable.
       [i, File.join(i, "specifications")]
     end.flatten
   end
-
 end

data/lib/rubygems/commands/dependency_command.rb

@@ -4,7 +4,6 @@ require 'rubygems/local_remote_options'
 require 'rubygems/version_option'
 
 class Gem::Commands::DependencyCommand < Gem::Command
-
   include Gem::LocalRemoteOptions
   include Gem::VersionOption
 
@@ -59,14 +58,14 @@ use with other commands.
 
     ss, = fetcher.spec_for_dependency dependency
 
-    ss.map { |spec, _| spec }
+    ss.map {|spec, _| spec }
   end
 
   def fetch_specs(name_pattern, dependency) # :nodoc:
     specs = []
 
     if local?
-      specs.concat Gem::Specification.stubs.find_all { |spec|
+      specs.concat Gem::Specification.stubs.find_all {|spec|
         name_pattern =~ spec.name and
           dependency.requirement.satisfied_by? spec.version
       }.map(&:to_spec)
@@ -92,7 +91,7 @@ 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|
+        spec.dependencies.sort_by {|dep| dep.name }.each do |dep|
           say "#{dep.name} --version '#{dep.requirement}'"
         end
       end
@@ -156,7 +155,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 {|dep| dep.name }.each do |dep|
         response << '  ' * level + "  #{dep}\n"
       end
     end
@@ -168,11 +167,11 @@ use with other commands.
 
     ss, _ = fetcher.spec_for_dependency dependency
 
-    ss.map { |s,o| s }
+    ss.map {|s,o| s }
   end
 
   def reverse_dependencies(specs) # :nodoc:
-    reverse = Hash.new { |h, k| h[k] = [] }
+    reverse = Hash.new {|h, k| h[k] = [] }
 
     return reverse unless options[:reverse_dependencies]
 
@@ -215,5 +214,4 @@ use with other commands.
       /\A#{Regexp.union(*args)}/
     end
   end
-
 end

data/lib/rubygems/commands/environment_command.rb

@@ -2,7 +2,6 @@
 require 'rubygems/command'
 
 class Gem::Commands::EnvironmentCommand < Gem::Command
-
   def initialize
     super 'environment', 'Display information about the RubyGems environment'
   end
@@ -127,7 +126,7 @@ lib/rubygems/defaults/operating_system.rb
 
     out << "  - RUBYGEMS PLATFORMS:\n"
     Gem.platforms.each do |platform|
-      out << "    - #{platform}\n"
+      out << "     - #{platform}\n"
     end
 
     out << "  - GEM PATHS:\n"
@@ -172,5 +171,4 @@ lib/rubygems/defaults/operating_system.rb
 
     return nil
   end
-
 end

data/lib/rubygems/commands/fetch_command.rb

@@ -4,7 +4,6 @@ require 'rubygems/local_remote_options'
 require 'rubygems/version_option'
 
 class Gem::Commands::FetchCommand < Gem::Command
-
   include Gem::LocalRemoteOptions
   include Gem::VersionOption
 
@@ -57,11 +56,11 @@ then repackaging it.
         Gem::SpecFetcher.fetcher.spec_for_dependency dep
 
       if platform
-        filtered = specs_and_sources.select { |s,| s.platform == platform }
+        filtered = specs_and_sources.select {|s,| s.platform == platform }
         specs_and_sources = filtered unless filtered.empty?
       end
 
-      spec, source = specs_and_sources.max_by { |s,| s.version }
+      spec, source = specs_and_sources.max_by {|s,| s.version }
 
       if spec.nil?
         show_lookup_failure gem_name, version, errors, options[:domain]
@@ -73,5 +72,4 @@ then repackaging it.
       say "Downloaded #{spec.full_name}"
     end
   end
-
 end

data/lib/rubygems/commands/generate_index_command.rb

@@ -8,7 +8,6 @@ require 'rubygems/indexer'
 # 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',
@@ -83,5 +82,4 @@ Marshal::MINOR_VERSION constants.  It is used to ensure compatibility.
       end
     end
   end
-
 end

data/lib/rubygems/commands/help_command.rb

@@ -2,7 +2,6 @@
 require 'rubygems/command'
 
 class Gem::Commands::HelpCommand < Gem::Command
-
   # :stopdoc:
   EXAMPLES = <<-EOF.freeze
 Some examples of 'gem' usage.
@@ -38,7 +37,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:
 
@@ -324,7 +323,7 @@ platform.
 
     margin_width = 4
 
-    desc_width = @command_manager.command_names.map { |n| n.size }.max + 4
+    desc_width = @command_manager.command_names.map {|n| n.size }.max + 4
 
     summary_width = 80 - margin_width - desc_width
     wrap_indent = ' ' * (margin_width + desc_width)
@@ -370,5 +369,4 @@ platform.
       alert_warning "Unknown command #{command_name}. Try: gem help commands"
     end
   end
-
 end

data/lib/rubygems/commands/info_command.rb

@@ -1,14 +1,18 @@
 # frozen_string_literal: true
 
 require 'rubygems/command'
-require 'rubygems/commands/query_command'
+require 'rubygems/query_utils'
 
-class Gem::Commands::InfoCommand < Gem::Commands::QueryCommand
+class Gem::Commands::InfoCommand < Gem::Command
+  include Gem::QueryUtils
 
   def initialize
-    super "info", "Show information for the given gem"
+    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('--name-matches')
     remove_option('-d')
 
     defaults[:details] = true
@@ -31,5 +35,4 @@ class Gem::Commands::InfoCommand < Gem::Commands::QueryCommand
   def defaults_str
     "--local"
   end
-
 end

data/lib/rubygems/commands/install_command.rb

@@ -12,7 +12,6 @@ require 'rubygems/version_option'
 # See `gem help install`
 
 class Gem::Commands::InstallCommand < Gem::Command
-
   attr_reader :installed_specs # :nodoc:
 
   include Gem::VersionOption
@@ -218,7 +217,7 @@ You can use `i` command instead of `install`.
       gem_version ||= options[:version]
       domain = options[:domain]
       domain = :local unless options[:suggest_alternate]
-      supress_suggestions = (domain == :local)
+      suppress_suggestions = (domain == :local)
 
       begin
         install_gem gem_name, gem_version
@@ -226,11 +225,11 @@ You can use `i` command instead of `install`.
         alert_error "Error installing #{gem_name}:\n\t#{e.message}"
         exit_code |= 1
       rescue Gem::GemNotFoundException => e
-        show_lookup_failure e.name, e.version, e.errors, supress_suggestions
+        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, supress_suggestions,
+        show_lookup_failure e.name, e.version, e.errors, suppress_suggestions,
                             "'#{gem_name}' (#{gem_version})"
 
         exit_code |= 2
@@ -270,5 +269,4 @@ You can use `i` command instead of `install`.
     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,19 @@
 # frozen_string_literal: true
 require 'rubygems/command'
-require 'rubygems/commands/query_command'
+require 'rubygems/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',
+         :name => //, :domain => :local, :details => false, :versions => true,
+         :installed => nil, :version => Gem::Requirement.default
 
-    remove_option('--name-matches')
+    add_query_options
   end
 
   def arguments # :nodoc:
@@ -36,5 +38,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

@@ -2,7 +2,6 @@
 require 'rubygems/command'
 
 class Gem::Commands::LockCommand < Gem::Command
-
   def initialize
     super 'lock', 'Generate a lockdown list of gems',
           :strict => false
@@ -104,7 +103,6 @@ lock it down to the exact version.
       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

@@ -3,7 +3,6 @@ require 'rubygems/command'
 
 unless defined? Gem::Commands::MirrorCommand
   class Gem::Commands::MirrorCommand < Gem::Command
-
     def initialize
       super('mirror', 'Mirror all gem files (requires rubygems-mirror)')
       begin
@@ -22,6 +21,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

data/lib/rubygems/commands/open_command.rb

@@ -1,11 +1,8 @@
 # frozen_string_literal: true
-require 'English'
 require 'rubygems/command'
 require 'rubygems/version_option'
-require 'rubygems/util'
 
 class Gem::Commands::OpenCommand < Gem::Command
-
   include Gem::VersionOption
 
   def initialize
@@ -84,5 +81,4 @@ class Gem::Commands::OpenCommand < Gem::Command
 
     say "Unable to find gem '#{name}'"
   end
-
 end

data/lib/rubygems/commands/outdated_command.rb

@@ -5,7 +5,6 @@ require 'rubygems/spec_fetcher'
 require 'rubygems/version_option'
 
 class Gem::Commands::OutdatedCommand < Gem::Command
-
   include Gem::LocalRemoteOptions
   include Gem::VersionOption
 
@@ -30,5 +29,4 @@ update the gems with the update or install commands.
       say "#{spec.name} (#{spec.version} < #{remote_version})"
     end
   end
-
 end

data/lib/rubygems/commands/owner_command.rb

@@ -5,7 +5,6 @@ require 'rubygems/gemcutter_utilities'
 require 'rubygems/text'
 
 class Gem::Commands::OwnerCommand < Gem::Command
-
   include Gem::Text
   include Gem::LocalRemoteOptions
   include Gem::GemcutterUtilities
@@ -109,5 +108,4 @@ permission to.
       request.add_field "OTP", options[:otp] if options[:otp]
     end
   end
-
 end

data/lib/rubygems/commands/pristine_command.rb

@@ -5,7 +5,6 @@ require 'rubygems/installer'
 require 'rubygems/version_option'
 
 class Gem::Commands::PristineCommand < Gem::Command
-
   include Gem::VersionOption
 
   def initialize
@@ -40,6 +39,11 @@ class Gem::Commands::PristineCommand < Gem::Command
       options[:only_executables] = value
     end
 
+    add_option('--only-plugins',
+               'Only restore plugins') do |value, options|
+      options[:only_plugins] = value
+    end
+
     add_option('-E', '--[no-]env-shebang',
                'Rewrite executables with a shebang',
                'of /usr/bin/env') do |value, options|
@@ -126,14 +130,14 @@ extensions will be restored.
         end
       end
 
-      unless spec.extensions.empty? or options[:extensions] or options[:only_executables]
+      unless spec.extensions.empty? or options[:extensions] or options[:only_executables] or options[:only_plugins]
         say "Skipped #{spec.full_name}, it needs to compile an extension"
         next
       end
 
       gem = spec.cache_file
 
-      unless File.exist? gem or options[:only_executables]
+      unless File.exist? gem or options[:only_executables] or options[:only_plugins]
         require 'rubygems/remote_fetcher'
 
         say "Cached gem for #{spec.full_name} not found, attempting to fetch..."
@@ -172,6 +176,9 @@ extensions will be restored.
       if options[:only_executables]
         installer = Gem::Installer.for_spec(spec, installer_options)
         installer.generate_bin
+      elsif options[:only_plugins]
+        installer = Gem::Installer.for_spec(spec)
+        installer.generate_plugins
       else
         installer = Gem::Installer.at(gem, installer_options)
         installer.install
@@ -180,5 +187,4 @@ extensions will be restored.
       say "Restored #{spec.full_name}"
     end
   end
-
 end

data/lib/rubygems/commands/push_command.rb

@@ -5,7 +5,6 @@ require 'rubygems/gemcutter_utilities'
 require 'rubygems/package'
 
 class Gem::Commands::PushCommand < Gem::Command
-
   include Gem::LocalRemoteOptions
   include Gem::GemcutterUtilities
 
@@ -52,23 +51,14 @@ The push command will use ~/.gem/credentials to authenticate to a server, but yo
     gem_name = get_one_gem_name
     default_gem_server, push_host = get_hosts_for(gem_name)
 
-    default_host = nil
-    user_defined_host = nil
-
-    if @user_defined_host
-      user_defined_host = options[:host]
-    else
-      default_host = options[:host]
-    end
-
-    @host = if user_defined_host
-              user_defined_host
+    @host = if @user_defined_host
+              options[:host]
             elsif default_gem_server
               default_gem_server
             elsif push_host
               push_host
             else
-              default_host
+              options[:host]
             end
 
     sign_in @host
@@ -79,36 +69,7 @@ The push command will use ~/.gem/credentials to authenticate to a server, but yo
   def send_gem(name)
     args = [:post, "api/v1/gems"]
 
-    latest_rubygems_version = Gem.latest_rubygems_version
-
-    if latest_rubygems_version < Gem.rubygems_version and
-         Gem.rubygems_version.prerelease? and
-         Gem::Version.new('2.0.0.rc.2') != Gem.rubygems_version
-      alert_error <<-ERROR
-You are using a beta release of RubyGems (#{Gem::VERSION}) which is not
-allowed to push gems.  Please downgrade or upgrade to a release version.
-
-The latest released RubyGems version is #{latest_rubygems_version}
-
-You can upgrade or downgrade to the latest release version with:
-
-  gem update --system=#{latest_rubygems_version}
-
-      ERROR
-      terminate_interaction 1
-    end
-
-    gem_data = Gem::Package.new(name)
-
-    unless @host
-      @host = gem_data.spec.metadata['default_gem_server']
-    end
-
-    push_host = nil
-
-    if gem_data.spec.metadata.has_key?('allowed_push_host')
-      push_host = gem_data.spec.metadata['allowed_push_host']
-    end
+    _, push_host = get_hosts_for(name)
 
     @host ||= push_host
 
@@ -142,5 +103,4 @@ You can upgrade or downgrade to the latest release version with:
       gem_metadata["allowed_push_host"]
     ]
   end
-
 end