rubygems-update 3.4.21 → 3.5.0

data/lib/rubygems/commands/update_command.rb

@@ -21,7 +21,7 @@ class Gem::Commands::UpdateCommand < Gem::Command
 
   def initialize
     options = {
-      :force => false,
+      force: false,
     }
 
     options.merge!(install_update_options)
@@ -37,10 +37,10 @@ class Gem::Commands::UpdateCommand < Gem::Command
     end
 
     add_option("--system [VERSION]", Gem::Version,
-               "Update the RubyGems system software") do |value, options|
-      value = true unless value
+               "Update the RubyGems system software") do |value, opts|
+      value ||= true
 
-      options[:system] = value
+      opts[:system] = value
     end
 
     add_local_remote_options
@@ -120,7 +120,7 @@ command to remove old versions.
     updated = update_gems gems_to_update
 
     installed_names = highest_installed_gems.keys
-    updated_names = updated.map {|spec| spec.name }
+    updated_names = updated.map(&:name)
     not_updated_names = options[:args].uniq - updated_names
     not_installed_names = not_updated_names - installed_names
     up_to_date_names = not_updated_names - not_installed_names
@@ -186,7 +186,9 @@ command to remove old versions.
         system Gem.ruby, "--disable-gems", "setup.rb", *args
       end
 
-      say "RubyGems system software updated" if installed unless options[:silent]
+      unless options[:silent]
+        say "RubyGems system software updated" if installed
+      end
     end
   end
 
@@ -231,7 +233,7 @@ command to remove old versions.
     highest_remote_tup = highest_remote_name_tuple(rubygems_update)
     target = highest_remote_tup ? highest_remote_tup.version : version
 
-    return target, requirement
+    [target, requirement]
   end
 
   def update_gem(name, version = Gem::Requirement.default)
@@ -301,7 +303,7 @@ command to remove old versions.
   def which_to_update(highest_installed_gems, gem_names)
     result = []
 
-    highest_installed_gems.each do |l_name, l_spec|
+    highest_installed_gems.each do |_l_name, l_spec|
       next if !gem_names.empty? &&
               gem_names.none? {|name| name == l_spec.name }
 
@@ -326,12 +328,8 @@ command to remove old versions.
     @oldest_supported_version ||=
       if Gem.ruby_version > Gem::Version.new("3.1.a")
         Gem::Version.new("3.3.3")
-      elsif Gem.ruby_version > Gem::Version.new("3.0.a")
-        Gem::Version.new("3.2.3")
-      elsif Gem.ruby_version > Gem::Version.new("2.7.a")
-        Gem::Version.new("3.1.2")
       else
-        Gem::Version.new("3.0.1")
+        Gem::Version.new("3.2.3")
       end
   end
 end

data/lib/rubygems/commands/which_command.rb

@@ -5,7 +5,7 @@ require_relative "../command"
 class Gem::Commands::WhichCommand < Gem::Command
   def initialize
     super "which", "Find the location of a library file you can require",
-          :search_gems_first => false, :show_all => false
+          search_gems_first: false, show_all: false
 
     add_option "-a", "--[no-]all", "show all matching files" do |show_all, options|
       options[:show_all] = show_all

data/lib/rubygems/commands/yank_command.rb

@@ -62,7 +62,7 @@ data you will need to change them immediately and yank your gem.
   end
 
   def yank_gem(version, platform)
-    say "Yanking gem from #{self.host}..."
+    say "Yanking gem from #{host}..."
     args = [:delete, version, platform, "api/v1/gems/yank"]
     response = yank_api_request(*args)
 

data/lib/rubygems/compatibility.rb

@@ -26,17 +26,16 @@ module Gem
     rubylibdir
   ].freeze
 
-  unless defined?(ConfigMap)
+  if defined?(ConfigMap)
+    RbConfigPriorities.each do |key|
+      ConfigMap[key.to_sym] = RbConfig::CONFIG[key]
+    end
+  else
     ##
     # Configuration settings from ::RbConfig
     ConfigMap = Hash.new do |cm, key|
       cm[key] = RbConfig::CONFIG[key.to_s]
     end
     deprecate_constant(:ConfigMap)
-  else
-    RbConfigPriorities.each do |key|
-      ConfigMap[key.to_sym] = RbConfig::CONFIG[key]
-    end
   end
-
 end

data/lib/rubygems/config_file.rb

@@ -188,10 +188,10 @@ class Gem::ConfigFile
     operating_system_config = Marshal.load Marshal.dump(OPERATING_SYSTEM_DEFAULTS)
     platform_config = Marshal.load Marshal.dump(PLATFORM_DEFAULTS)
     system_config = load_file SYSTEM_WIDE_CONFIG_FILE
-    user_config = load_file config_file_name.dup.tap(&Gem::UNTAINT)
+    user_config = load_file config_file_name
 
-    environment_config = (ENV["GEMRC"] || "")
-      .split(File::PATH_SEPARATOR).inject({}) do |result, file|
+    environment_config = (ENV["GEMRC"] || "").
+      split(File::PATH_SEPARATOR).inject({}) do |result, file|
         result.merge load_file file
       end
 
@@ -202,7 +202,7 @@ class Gem::ConfigFile
       @hash = @hash.merge environment_config
     end
 
-    # HACK these override command-line args, which is bad
+    # HACK: these override command-line args, which is bad
     @backtrace                   = @hash[:backtrace]                   if @hash.key? :backtrace
     @bulk_threshold              = @hash[:bulk_threshold]              if @hash.key? :bulk_threshold
     @home                        = @hash[:gemhome]                     if @hash.key? :gemhome
@@ -473,13 +473,13 @@ if you believe they were disclosed to a third party.
     yaml_hash[:ssl_client_cert] =
       @hash[:ssl_client_cert] if @hash.key? :ssl_client_cert
 
-    keys = yaml_hash.keys.map {|key| key.to_s }
+    keys = yaml_hash.keys.map(&:to_s)
     keys << "debug"
     re = Regexp.union(*keys)
 
     @hash.each do |key, value|
       key = key.to_s
-      next if key =~ re
+      next if key&.match?(re)
       yaml_hash[key.to_s] = value
     end
 
@@ -581,7 +581,7 @@ if you believe they were disclosed to a third party.
         need_config_file_name = false
       elsif arg =~ /^--config-file=(.*)/
         @config_file_name = $1
-      elsif arg =~ /^--config-file$/
+      elsif /^--config-file$/.match?(arg)
         need_config_file_name = true
       end
     end

data/lib/rubygems/core_ext/kernel_gem.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 module Kernel
-
   ##
   # Use Kernel#gem to activate a specific version of +gem_name+.
   #
@@ -66,5 +65,4 @@ module Kernel
   end
 
   private :gem
-
 end

data/lib/rubygems/core_ext/kernel_require.rb

@@ -9,13 +9,12 @@
 require "monitor"
 
 module Kernel
-
   RUBYGEMS_ACTIVATION_MONITOR = Monitor.new # :nodoc:
 
   # Make sure we have a reference to Ruby's original Kernel#require
   unless defined?(gem_original_require)
     # :stopdoc:
-    alias gem_original_require require
+    alias_method :gem_original_require, :require
     private :gem_original_require
     # :startdoc:
   end
@@ -37,53 +36,36 @@ module Kernel
   def require(path) # :doc:
     return gem_original_require(path) unless Gem.discover_gems_on_require
 
-    begin
-      RUBYGEMS_ACTIVATION_MONITOR.enter
-
-      path = path.to_path if path.respond_to? :to_path
+    RUBYGEMS_ACTIVATION_MONITOR.synchronize do
+      path = File.path(path)
 
       if spec = Gem.find_unresolved_default_spec(path)
         # Ensure -I beats a default gem
         resolved_path = begin
           rp = nil
           load_path_check_index = Gem.load_path_insert_index - Gem.activated_gem_paths
-          Gem.suffixes.each do |s|
-            $LOAD_PATH[0...load_path_check_index].each do |lp|
-              safe_lp = lp.dup.tap(&Gem::UNTAINT)
-              begin
-                if File.symlink? safe_lp # for backward compatibility
-                  next
-                end
-              rescue SecurityError
-                RUBYGEMS_ACTIVATION_MONITOR.exit
-                raise
+          Gem.suffixes.find do |s|
+            $LOAD_PATH[0...load_path_check_index].find do |lp|
+              if File.symlink? lp # for backward compatibility
+                next
               end
 
-              full_path = File.expand_path(File.join(safe_lp, "#{path}#{s}"))
-              if File.file?(full_path)
-                rp = full_path
-                break
-              end
+              full_path = File.expand_path(File.join(lp, "#{path}#{s}"))
+              rp = full_path if File.file?(full_path)
             end
-            break if rp
           end
           rp
         end
 
-        begin
-          Kernel.send(:gem, spec.name, Gem::Requirement.default_prerelease)
-        rescue Exception
-          RUBYGEMS_ACTIVATION_MONITOR.exit
-          raise
-        end unless resolved_path
+        Kernel.send(:gem, spec.name, Gem::Requirement.default_prerelease) unless
+          resolved_path
       end
 
       # If there are no unresolved deps, then we can use just try
       # normal require handle loading a gem from the rescue below.
 
       if Gem::Specification.unresolved_deps.empty?
-        RUBYGEMS_ACTIVATION_MONITOR.exit
-        return gem_original_require(path)
+        next
       end
 
       # If +path+ is for a gem that has already been loaded, don't
@@ -93,8 +75,7 @@ module Kernel
       # TODO request access to the C implementation of this to speed up RubyGems
 
       if Gem::Specification.find_active_stub_by_path(path)
-        RUBYGEMS_ACTIVATION_MONITOR.exit
-        return gem_original_require(path)
+        next
       end
 
       # Attempt to find +path+ in any unresolved gems...
@@ -114,9 +95,7 @@ module Kernel
       if found_specs.empty?
         found_specs = Gem::Specification.find_in_unresolved_tree path
 
-        found_specs.each do |found_spec|
-          found_spec.activate
-        end
+        found_specs.each(&:activate)
 
       # We found +path+ directly in an unresolved gem. Now we figure out, of
       # the possible found specs, which one we should activate.
@@ -127,7 +106,6 @@ module Kernel
         names = found_specs.map(&:name).uniq
 
         if names.size > 1
-          RUBYGEMS_ACTIVATION_MONITOR.exit
           raise Gem::LoadError, "#{path} found in multiple gems: #{names.join ", "}"
         end
 
@@ -138,26 +116,20 @@ module Kernel
         unless valid
           le = Gem::LoadError.new "unable to find a version of '#{names.first}' to activate"
           le.name = names.first
-          RUBYGEMS_ACTIVATION_MONITOR.exit
           raise le
         end
 
         valid.activate
       end
+    end
 
-      RUBYGEMS_ACTIVATION_MONITOR.exit
-      return gem_original_require(path)
+    begin
+      gem_original_require(path)
     rescue LoadError => load_error
-      if load_error.path == path
-        RUBYGEMS_ACTIVATION_MONITOR.enter
-
-        begin
-          require_again = Gem.try_activate(path)
-        ensure
-          RUBYGEMS_ACTIVATION_MONITOR.exit
-        end
+      if load_error.path == path &&
+         RUBYGEMS_ACTIVATION_MONITOR.synchronize { Gem.try_activate(path) }
 
-        return gem_original_require(path) if require_again
+        return gem_original_require(path)
       end
 
       raise load_error
@@ -165,5 +137,4 @@ module Kernel
   end
 
   private :require
-
 end

data/lib/rubygems/core_ext/kernel_warn.rb

@@ -36,7 +36,7 @@ module Kernel
         start += 1
 
         next unless path = loc.path
-        unless path.start_with?(rubygems_path) || path.start_with?("<internal:")
+        unless path.start_with?(rubygems_path, "<internal:")
           # Non-rubygems frames
           uplevel -= 1
         end

data/lib/rubygems/core_ext/tcpsocket_init.rb

@@ -19,7 +19,7 @@ module CoreExtensions
         cond_var = Thread::ConditionVariable.new
 
         Addrinfo.foreach(host, serv, nil, :STREAM) do |addr|
-          Thread.report_on_exception = false if defined? Thread.report_on_exception = ()
+          Thread.report_on_exception = false
 
           threads << Thread.new(addr) do
             # give head start to ipv6 addresses

data/lib/rubygems/defaults.rb

@@ -94,7 +94,7 @@ module Gem
   # The home directory for the user.
 
   def self.user_home
-    @user_home ||= find_home.tap(&Gem::UNTAINT)
+    @user_home ||= find_home
   end
 
   ##
@@ -131,14 +131,14 @@ module Gem
   # The path to standard location of the user's .gemrc file.
 
   def self.config_file
-    @config_file ||= find_config_file.tap(&Gem::UNTAINT)
+    @config_file ||= find_config_file
   end
 
   ##
   # The path to standard location of the user's state file.
 
   def self.state_file
-    @state_file ||= File.join(Gem.state_home, "gem", "last_update_check").tap(&Gem::UNTAINT)
+    @state_file ||= File.join(Gem.state_home, "gem", "last_update_check")
   end
 
   ##
@@ -235,6 +235,18 @@ module Gem
     default_cert_path
   end
 
+  ##
+  # Enables automatic installation into user directory
+
+  def self.default_user_install # :nodoc:
+    if !ENV.key?("GEM_HOME") && (File.exist?(Gem.dir) && !File.writable?(Gem.dir))
+      Gem.ui.say "Defaulting to user installation because default installation directory (#{Gem.dir}) is not writable."
+      return true
+    end
+
+    false
+  end
+
   ##
   # Install extensions into lib as well as into the extension directory.
 

data/lib/rubygems/dependency.rb

@@ -46,10 +46,10 @@ class Gem::Dependency
     end
 
     type         = Symbol === requirements.last ? requirements.pop : :runtime
-    requirements = requirements.first if 1 == requirements.length # unpack
+    requirements = requirements.first if requirements.length == 1 # unpack
 
     unless TYPES.include? type
-      raise ArgumentError, "Valid types are #{TYPES.inspect}, " +
+      raise ArgumentError, "Valid types are #{TYPES.inspect}, " \
                            "not #{type.inspect}"
     end
 
@@ -74,11 +74,9 @@ class Gem::Dependency
 
   def inspect # :nodoc:
     if prerelease?
-      "<%s type=%p name=%p requirements=%p prerelease=ok>" %
-        [self.class, self.type, self.name, requirement.to_s]
+      format("<%s type=%p name=%p requirements=%p prerelease=ok>", self.class, type, name, requirement.to_s)
     else
-      "<%s type=%p name=%p requirements=%p>" %
-        [self.class, self.type, self.name, requirement.to_s]
+      format("<%s type=%p name=%p requirements=%p>", self.class, type, name, requirement.to_s)
     end
   end
 
@@ -169,16 +167,16 @@ class Gem::Dependency
 
   def ==(other) # :nodoc:
     Gem::Dependency === other &&
-      self.name        == other.name &&
-      self.type        == other.type &&
-      self.requirement == other.requirement
+      name        == other.name &&
+      type        == other.type &&
+      requirement == other.requirement
   end
 
   ##
   # Dependencies are ordered by name.
 
   def <=>(other)
-    self.name <=> other.name
+    name <=> other.name
   end
 
   ##
@@ -205,7 +203,7 @@ class Gem::Dependency
     requirement.satisfied_by? version
   end
 
-  alias === =~
+  alias_method :===, :=~
 
   ##
   # :call-seq:
@@ -263,7 +261,7 @@ class Gem::Dependency
     end
 
     default = Gem::Requirement.default
-    self_req = self.requirement
+    self_req = requirement
     other_req = other.requirement
 
     return self.class.new name, self_req  if other_req == default
@@ -324,9 +322,9 @@ class Gem::Dependency
   end
 
   def to_spec
-    matches = self.to_specs.compact
+    matches = to_specs.compact
 
-    active = matches.find {|spec| spec.activated? }
+    active = matches.find(&:activated?)
     return active if active
 
     unless prerelease?

data/lib/rubygems/dependency_installer.rb

@@ -17,18 +17,18 @@ class Gem::DependencyInstaller
   extend Gem::Deprecate
 
   DEFAULT_OPTIONS = { # :nodoc:
-    :env_shebang => false,
-    :document => %w[ri],
-    :domain => :both, # HACK dup
-    :force => false,
-    :format_executable => false, # HACK dup
-    :ignore_dependencies => false,
-    :prerelease => false,
-    :security_policy => nil, # HACK NoSecurity requires OpenSSL. AlmostNo? Low?
-    :wrappers => true,
-    :build_args => nil,
-    :build_docs_in_background => false,
-    :install_as_default => false,
+    env_shebang: false,
+    document: %w[ri],
+    domain: :both, # HACK: dup
+    force: false,
+    format_executable: false, # HACK: dup
+    ignore_dependencies: false,
+    prerelease: false,
+    security_policy: nil, # HACK: NoSecurity requires OpenSSL. AlmostNo? Low?
+    wrappers: true,
+    build_args: nil,
+    build_docs_in_background: false,
+    install_as_default: false,
   }.freeze
 
   ##
@@ -66,7 +66,7 @@ class Gem::DependencyInstaller
   # :build_args:: See Gem::Installer::new
 
   def initialize(options = {})
-    @only_install_dir = !!options[:install_dir]
+    @only_install_dir = !options[:install_dir].nil?
     @install_dir = options[:install_dir] || Gem.dir
     @build_root = options[:build_root]
 
@@ -177,7 +177,6 @@ class Gem::DependencyInstaller
         end
 
         set << specs
-
       rescue Gem::RemoteFetcher::FetchError => e
         # FIX if there is a problem talking to the network, we either need to always tell
         # the user (no really_verbose) or fail hard, not silently tell them that we just
@@ -229,22 +228,22 @@ class Gem::DependencyInstaller
     @installed_gems = []
 
     options = {
-      :bin_dir => @bin_dir,
-      :build_args => @build_args,
-      :document => @document,
-      :env_shebang => @env_shebang,
-      :force => @force,
-      :format_executable => @format_executable,
-      :ignore_dependencies => @ignore_dependencies,
-      :prerelease => @prerelease,
-      :security_policy => @security_policy,
-      :user_install => @user_install,
-      :wrappers => @wrappers,
-      :build_root => @build_root,
-      :install_as_default => @install_as_default,
-      :dir_mode => @dir_mode,
-      :data_mode => @data_mode,
-      :prog_mode => @prog_mode,
+      bin_dir: @bin_dir,
+      build_args: @build_args,
+      document: @document,
+      env_shebang: @env_shebang,
+      force: @force,
+      format_executable: @format_executable,
+      ignore_dependencies: @ignore_dependencies,
+      prerelease: @prerelease,
+      security_policy: @security_policy,
+      user_install: @user_install,
+      wrappers: @wrappers,
+      build_root: @build_root,
+      install_as_default: @install_as_default,
+      dir_mode: @dir_mode,
+      data_mode: @data_mode,
+      prog_mode: @prog_mode,
     }
     options[:install_dir] = @install_dir if @only_install_dir
 
@@ -292,7 +291,7 @@ class Gem::DependencyInstaller
         src = Gem::Source::SpecificFile.new dep_or_name
         installer_set.add_local dep_or_name, src.spec, src
         version = src.spec.version if version == Gem::Requirement.default
-      elsif dep_or_name =~ /\.gem$/
+      elsif dep_or_name =~ /\.gem$/ # rubocop:disable Performance/RegexpMatch
         Dir[dep_or_name].each do |name|
           src = Gem::Source::SpecificFile.new name
           installer_set.add_local dep_or_name, src.spec, src

data/lib/rubygems/dependency_list.rb

@@ -105,7 +105,7 @@ class Gem::DependencyList
   end
 
   def inspect # :nodoc:
-    "%s %p>" % [super[0..-2], map {|s| s.full_name }]
+    format("%s %p>", super[0..-2], map(&:full_name))
   end
 
   ##

data/lib/rubygems/deprecate.rb

@@ -70,7 +70,6 @@
 #     end
 
 module Gem::Deprecate
-
   def self.skip # :nodoc:
     @skip ||= false
   end
@@ -105,12 +104,13 @@ module Gem::Deprecate
       old = "_deprecated_#{name}"
       alias_method old, name
       define_method name do |*args, &block|
-        klass = self.is_a? Module
+        klass = is_a? Module
         target = klass ? "#{self}." : "#{self.class}#"
-        msg = [ "NOTE: #{target}#{name} is deprecated",
-                repl == :none ? " with no replacement" : "; use #{repl} instead",
-                ". It will be removed on or after %4d-%02d." % [year, month],
-                "\n#{target}#{name} called from #{Gem.location_of_caller.join(":")}",
+        msg = [
+          "NOTE: #{target}#{name} is deprecated",
+          repl == :none ? " with no replacement" : "; use #{repl} instead",
+          format(". It will be removed on or after %4d-%02d.", year, month),
+          "\n#{target}#{name} called from #{Gem.location_of_caller.join(":")}",
         ]
         warn "#{msg.join}." unless Gem::Deprecate.skip
         send old, *args, &block
@@ -130,12 +130,13 @@ module Gem::Deprecate
       old = "_deprecated_#{name}"
       alias_method old, name
       define_method name do |*args, &block|
-        klass = self.is_a? Module
+        klass = is_a? Module
         target = klass ? "#{self}." : "#{self.class}#"
-        msg = [ "NOTE: #{target}#{name} is deprecated",
-                replacement == :none ? " with no replacement" : "; use #{replacement} instead",
-                ". It will be removed in Rubygems #{Gem::Deprecate.next_rubygems_major_version}",
-                "\n#{target}#{name} called from #{Gem.location_of_caller.join(":")}",
+        msg = [
+          "NOTE: #{target}#{name} is deprecated",
+          replacement == :none ? " with no replacement" : "; use #{replacement} instead",
+          ". It will be removed in Rubygems #{Gem::Deprecate.next_rubygems_major_version}",
+          "\n#{target}#{name} called from #{Gem.location_of_caller.join(":")}",
         ]
         warn "#{msg.join}." unless Gem::Deprecate.skip
         send old, *args, &block
@@ -152,15 +153,15 @@ module Gem::Deprecate
       end
 
       define_method "deprecation_warning" do
-        msg = [ "#{self.command} command is deprecated",
-                ". It will be removed in Rubygems #{version}.\n",
+        msg = [
+          "#{command} command is deprecated",
+          ". It will be removed in Rubygems #{version}.\n",
         ]
 
-        alert_warning "#{msg.join}" unless Gem::Deprecate.skip
+        alert_warning msg.join.to_s unless Gem::Deprecate.skip
       end
     end
   end
 
   module_function :rubygems_deprecate, :rubygems_deprecate_command, :skip_during
-
 end