rubygems-update 3.4.10 → 3.5.22

data/lib/rubygems/commands/setup_command.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "../command"
 
 ##
@@ -6,19 +7,19 @@ require_relative "../command"
 # RubyGems checkout or tarball.
 
 class Gem::Commands::SetupCommand < Gem::Command
-  HISTORY_HEADER = /^#\s*[\d.a-zA-Z]+\s*\/\s*\d{4}-\d{2}-\d{2}\s*$/.freeze
-  VERSION_MATCHER = /^#\s*([\d.a-zA-Z]+)\s*\/\s*\d{4}-\d{2}-\d{2}\s*$/.freeze
+  HISTORY_HEADER = %r{^#\s*[\d.a-zA-Z]+\s*/\s*\d{4}-\d{2}-\d{2}\s*$}
+  VERSION_MATCHER = %r{^#\s*([\d.a-zA-Z]+)\s*/\s*\d{4}-\d{2}-\d{2}\s*$}
 
   ENV_PATHS = %w[/usr/bin/env /bin/env].freeze
 
   def initialize
     super "setup", "Install RubyGems",
-          :format_executable => false, :document => %w[ri],
-          :force => true,
-          :site_or_vendor => "sitelibdir",
-          :destdir => "", :prefix => "", :previous_version => "",
-          :regenerate_binstubs => true,
-          :regenerate_plugins => true
+          format_executable: false, document: %w[ri],
+          force: true,
+          site_or_vendor: "sitelibdir",
+          destdir: "", prefix: "", previous_version: "",
+          regenerate_binstubs: true,
+          regenerate_plugins: true
 
     add_option "--previous-version=VERSION",
                "Previous version of RubyGems",
@@ -54,9 +55,9 @@ class Gem::Commands::SetupCommand < Gem::Command
                "List the documentation types you wish to",
                "generate.  For example: rdoc,ri" do |value, options|
       options[:document] = case value
-      when nil   then %w[rdoc ri]
-      when false then []
-      else            value
+                           when nil   then %w[rdoc ri]
+                           when false then []
+                           else value
       end
     end
 
@@ -133,7 +134,7 @@ prefix and suffix.  If ruby was installed as `ruby18`, gem will be
 installed as `gem18`.
 
 By default, this RubyGems will install gem as:
-  #{Gem.default_exec_format % 'gem'}
+  #{Gem.default_exec_format % "gem"}
     EOF
   end
 
@@ -242,9 +243,9 @@ By default, this RubyGems will install gem as:
   end
 
   def install_executables(bin_dir)
-    prog_mode = options[:prog_mode] || 0755
+    prog_mode = options[:prog_mode] || 0o755
 
-    executables = { "gem" => "bin" }
+    executables = { "gem" => "exe" }
     executables.each do |tool, path|
       say "Installing #{tool} executable" if @verbose
 
@@ -264,7 +265,7 @@ By default, this RubyGems will install gem as:
             fp.puts bin.join
           end
 
-          install bin_tmp_file, dest_file, :mode => prog_mode
+          install bin_tmp_file, dest_file, mode: prog_mode
           bin_file_names << dest_file
         ensure
           rm bin_tmp_file
@@ -286,7 +287,7 @@ By default, this RubyGems will install gem as:
   TEXT
           end
 
-          install bin_cmd_file, "#{dest_file}.bat", :mode => prog_mode
+          install bin_cmd_file, "#{dest_file}.bat", mode: prog_mode
         ensure
           rm bin_cmd_file
         end
@@ -339,6 +340,8 @@ By default, this RubyGems will install gem as:
 
       require_relative "../rdoc"
 
+      return false unless defined?(Gem::RDoc)
+
       fake_spec = Gem::Specification.new "rubygems", Gem::VERSION
       def fake_spec.full_gem_path
         File.expand_path "../../..", __dir__
@@ -356,7 +359,7 @@ By default, this RubyGems will install gem as:
       say "Set the GEM_HOME environment variable if you want RDoc generated"
     end
 
-    return false
+    false
   end
 
   def install_default_bundler_gem(bin_dir)
@@ -368,18 +371,21 @@ By default, this RubyGems will install gem as:
       File.dirname(loaded_from)
     else
       target_specs_dir = File.join(default_dir, "specifications", "default")
-      mkdir_p target_specs_dir, :mode => 0755
+      mkdir_p target_specs_dir, mode: 0o755
       target_specs_dir
     end
 
-    bundler_spec = Dir.chdir("bundler") { Gem::Specification.load("bundler.gemspec") }
-    default_spec_path = File.join(specs_dir, "#{bundler_spec.full_name}.gemspec")
-    Gem.write_binary(default_spec_path, bundler_spec.to_ruby)
+    new_bundler_spec = Dir.chdir("bundler") { Gem::Specification.load("bundler.gemspec") }
+    full_name = new_bundler_spec.full_name
+    gemspec_path = "#{full_name}.gemspec"
+
+    default_spec_path = File.join(specs_dir, gemspec_path)
+    Gem.write_binary(default_spec_path, new_bundler_spec.to_ruby)
 
     bundler_spec = Gem::Specification.load(default_spec_path)
 
     # Remove gemspec that was same version of vendored bundler.
-    normal_gemspec = File.join(default_dir, "specifications", "bundler-#{bundler_spec.version}.gemspec")
+    normal_gemspec = File.join(default_dir, "specifications", gemspec_path)
     if File.file? normal_gemspec
       File.delete normal_gemspec
     end
@@ -387,20 +393,14 @@ By default, this RubyGems will install gem as:
     # Remove gem files that were same version of vendored bundler.
     if File.directory? bundler_spec.gems_dir
       Dir.entries(bundler_spec.gems_dir).
-        select {|default_gem| File.basename(default_gem) == "bundler-#{bundler_spec.version}" }.
+        select {|default_gem| File.basename(default_gem) == full_name }.
         each {|default_gem| rm_r File.join(bundler_spec.gems_dir, default_gem) }
     end
 
-    bundler_bin_dir = bundler_spec.bin_dir
-    mkdir_p bundler_bin_dir, :mode => 0755
-    bundler_spec.executables.each do |e|
-      cp File.join("bundler", bundler_spec.bindir, e), File.join(bundler_bin_dir, e)
-    end
-
     require_relative "../installer"
 
     Dir.chdir("bundler") do
-      built_gem = Gem::Package.build(bundler_spec)
+      built_gem = Gem::Package.build(new_bundler_spec)
       begin
         Gem::Installer.at(
           built_gem,
@@ -417,9 +417,9 @@ By default, this RubyGems will install gem as:
       end
     end
 
-    bundler_spec.executables.each {|executable| bin_file_names << target_bin_path(bin_dir, executable) }
+    new_bundler_spec.executables.each {|executable| bin_file_names << target_bin_path(bin_dir, executable) }
 
-    say "Bundler #{bundler_spec.version} installed"
+    say "Bundler #{new_bundler_spec.version} installed"
   end
 
   def make_destination_dirs
@@ -429,10 +429,10 @@ By default, this RubyGems will install gem as:
       lib_dir, bin_dir = generate_default_dirs
     end
 
-    mkdir_p lib_dir, :mode => 0755
-    mkdir_p bin_dir, :mode => 0755
+    mkdir_p lib_dir, mode: 0o755
+    mkdir_p bin_dir, mode: 0o755
 
-    return lib_dir, bin_dir
+    [lib_dir, bin_dir]
   end
 
   def generate_default_man_dir
@@ -575,8 +575,8 @@ abort "#{deprecation_message}"
   def uninstall_old_gemcutter
     require_relative "../uninstaller"
 
-    ui = Gem::Uninstaller.new("gemcutter", :all => true, :ignore => true,
-                                           :version => "< 0.4")
+    ui = Gem::Uninstaller.new("gemcutter", all: true, ignore: true,
+                                           version: "< 0.4")
     ui.uninstall
   rescue Gem::InstallError
   end
@@ -587,6 +587,8 @@ abort "#{deprecation_message}"
 
     args = %w[--all --only-executables --silent]
     args << "--bindir=#{bindir}"
+    args << "--install-dir=#{default_dir}"
+
     if options[:env_shebang]
       args << "--env-shebang"
     end
@@ -638,10 +640,10 @@ abort "#{deprecation_message}"
     dest_file = File.join dest_dir, file
     dest_dir = File.dirname dest_file
     unless File.directory? dest_dir
-      mkdir_p dest_dir, :mode => 0755
+      mkdir_p dest_dir, mode: 0o755
     end
 
-    install file, dest_file, :mode => options[:data_mode] || 0644
+    install file, dest_file, mode: options[:data_mode] || 0o644
   end
 
   def remove_file_list(files, dir)

data/lib/rubygems/commands/signin_command.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "../command"
 require_relative "../gemcutter_utilities"
 

data/lib/rubygems/commands/signout_command.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "../command"
 
 class Gem::Commands::SignoutCommand < Gem::Command

data/lib/rubygems/commands/sources_command.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "../command"
 require_relative "../remote_fetcher"
 require_relative "../spec_fetcher"
@@ -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 && uri.scheme.downcase == "http" &&
-       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,16 +99,16 @@ 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
 
@@ -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
 

data/lib/rubygems/commands/specification_command.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "../command"
 require_relative "../local_remote_options"
 require_relative "../version_option"
@@ -12,27 +13,27 @@ class Gem::Commands::SpecificationCommand < Gem::Command
     Gem.load_yaml
 
     super "specification", "Display gem specification (in yaml)",
-          :domain => :local, :version => Gem::Requirement.default,
-          :format => :yaml
+          domain: :local, version: Gem::Requirement.default,
+          format: :yaml
 
     add_version_option("examine")
     add_platform_option
     add_prerelease_option
 
     add_option("--all", "Output specifications for all versions of",
-               "the gem") do |value, options|
+               "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
 
@@ -106,7 +107,11 @@ Specific fields in the specification can be extracted in YAML format:
 
     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,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "../command"
 
 class Gem::Commands::StaleCommand < Gem::Command
@@ -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,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "../command"
 require_relative "../version_option"
 require_relative "../uninstaller"
@@ -14,12 +15,11 @@ class Gem::Commands::UninstallCommand < Gem::Command
 
   def initialize
     super "uninstall", "Uninstall gems from the local repository",
-          :version => Gem::Requirement.default, :user_install => true,
-          :check_dev => false, :vendor => false
+          version: Gem::Requirement.default, user_install: true,
+          check_dev: false, vendor: false
 
     add_option("-a", "--[no-]all",
-      "Uninstall all matching versions"
-    ) do |value, options|
+      "Uninstall all matching versions") do |value, options|
       options[:all] = value
     end
 
@@ -79,7 +79,7 @@ class Gem::Commands::UninstallCommand < Gem::Command
 
     add_option("--vendor",
                "Uninstall gem from the vendor directory.",
-               "Only for use by gem repackagers.") do |value, options|
+               "Only for use by gem repackagers.") do |_value, options|
       unless Gem.vendor_dir
         raise Gem::OptionParser::InvalidOption.new "your platform is not supported"
       end
@@ -95,7 +95,7 @@ class Gem::Commands::UninstallCommand < Gem::Command
   end
 
   def defaults_str # :nodoc:
-    "--version '#{Gem::Requirement.default}' --no-force " +
+    "--version '#{Gem::Requirement.default}' --no-force " \
       "--user-install"
   end
 
@@ -138,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
@@ -157,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
 
@@ -168,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
 
@@ -184,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,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "../command"
 require_relative "../version_option"
 require_relative "../security_option"
@@ -20,15 +21,15 @@ class Gem::Commands::UnpackCommand < Gem::Command
     require "fileutils"
 
     super "unpack", "Unpack an installed gem to the current directory",
-          :version => Gem::Requirement.default,
-          :target => Dir.pwd
+          version: Gem::Requirement.default,
+          target: Dir.pwd
 
     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,12 +96,10 @@ 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|
@@ -131,7 +130,7 @@ command help for an example.
       return this_path if File.exist? this_path
     end
 
-    return nil
+    nil
   end
 
   ##
@@ -152,16 +151,16 @@ command help for an example.
   # 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).