rubygems-update 3.0.3 → 3.4.7

data/lib/rubygems/config_file.rb

@@ -5,8 +5,8 @@
 # See LICENSE.txt for permissions.
 #++
 
-require 'rubygems/user_interaction'
-require 'rbconfig'
+require_relative "user_interaction"
+require "rbconfig"
 
 ##
 # Gem::ConfigFile RubyGems options and gem command options from gemrc.
@@ -37,15 +37,15 @@ require 'rbconfig'
 # - per environment (gemrc files listed in the GEMRC environment variable)
 
 class Gem::ConfigFile
-
   include Gem::UserInteraction
 
-  DEFAULT_BACKTRACE = false
+  DEFAULT_BACKTRACE = true
   DEFAULT_BULK_THRESHOLD = 1000
   DEFAULT_VERBOSITY = true
   DEFAULT_UPDATE_SOURCES = true
   DEFAULT_CONCURRENT_DOWNLOADS = 8
   DEFAULT_CERT_EXPIRATION_LENGTH_DAYS = 365
+  DEFAULT_IPV4_FALLBACK_ENABLED = false
 
   ##
   # For Ruby packagers to set configuration defaults.  Set in
@@ -71,7 +71,7 @@ class Gem::ConfigFile
 
   # :startdoc:
 
-  SYSTEM_WIDE_CONFIG_FILE = File.join SYSTEM_CONFIG_PATH, 'gemrc'
+  SYSTEM_WIDE_CONFIG_FILE = File.join SYSTEM_CONFIG_PATH, "gemrc"
 
   ##
   # List of arguments supplied to the config file object.
@@ -141,6 +141,12 @@ class Gem::ConfigFile
 
   attr_accessor :cert_expiration_length_days
 
+  ##
+  # == Experimental ==
+  # Fallback to IPv4 when IPv6 is not reachable or slow (default: false)
+
+  attr_accessor :ipv4_fallback_enabled
+
   ##
   # Path name of directory or file of openssl client certificate, used for remote https connection with client authentication
 
@@ -168,23 +174,7 @@ class Gem::ConfigFile
   # TODO: parse options upstream, pass in options directly
 
   def initialize(args)
-    @config_file_name = nil
-    need_config_file_name = false
-
-    arg_list = []
-
-    args.each do |arg|
-      if need_config_file_name
-        @config_file_name = arg
-        need_config_file_name = false
-      elsif arg =~ /^--config-file=(.*)/
-        @config_file_name = $1
-      elsif arg =~ /^--config-file$/
-        need_config_file_name = true
-      else
-        arg_list << arg
-      end
-    end
+    set_config_file_name(args)
 
     @backtrace = DEFAULT_BACKTRACE
     @bulk_threshold = DEFAULT_BULK_THRESHOLD
@@ -192,17 +182,20 @@ class Gem::ConfigFile
     @update_sources = DEFAULT_UPDATE_SOURCES
     @concurrent_downloads = DEFAULT_CONCURRENT_DOWNLOADS
     @cert_expiration_length_days = DEFAULT_CERT_EXPIRATION_LENGTH_DAYS
+    @ipv4_fallback_enabled = ENV["IPV4_FALLBACK_ENABLED"] == "true" || DEFAULT_IPV4_FALLBACK_ENABLED
 
     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.untaint
-    environment_config = (ENV['GEMRC'] || '').split(/[:;]/).inject({}) do |result, file|
-      result.merge load_file file
-    end
+    user_config = load_file config_file_name.dup.tap(&Gem::UNTAINT)
+
+    environment_config = (ENV["GEMRC"] || "")
+      .split(File::PATH_SEPARATOR).inject({}) do |result, file|
+        result.merge load_file file
+      end
 
     @hash = operating_system_config.merge platform_config
-    unless arg_list.index '--norc'
+    unless args.index "--norc"
       @hash = @hash.merge system_config
       @hash = @hash.merge user_config
       @hash = @hash.merge environment_config
@@ -218,6 +211,7 @@ class Gem::ConfigFile
     @disable_default_gem_server  = @hash[:disable_default_gem_server]  if @hash.key? :disable_default_gem_server
     @sources                     = @hash[:sources]                     if @hash.key? :sources
     @cert_expiration_length_days = @hash[:cert_expiration_length_days] if @hash.key? :cert_expiration_length_days
+    @ipv4_fallback_enabled       = @hash[:ipv4_fallback_enabled]       if @hash.key? :ipv4_fallback_enabled
 
     @ssl_verify_mode  = @hash[:ssl_verify_mode]  if @hash.key? :ssl_verify_mode
     @ssl_ca_cert      = @hash[:ssl_ca_cert]      if @hash.key? :ssl_ca_cert
@@ -226,7 +220,7 @@ class Gem::ConfigFile
     @api_keys         = nil
     @rubygems_api_key = nil
 
-    handle_arguments arg_list
+    handle_arguments args
   end
 
   ##
@@ -275,17 +269,22 @@ if you believe they were disclosed to a third party.
   # Location of RubyGems.org credentials
 
   def credentials_path
-    File.join Gem.user_home, '.gem', 'credentials'
+    credentials = File.join Gem.user_home, ".gem", "credentials"
+    if File.exist? credentials
+      credentials
+    else
+      File.join Gem.data_home, "gem", "credentials"
+    end
   end
 
   def load_api_keys
     check_credentials_permissions
 
     @api_keys = if File.exist? credentials_path
-                  load_file(credentials_path)
-                else
-                  @hash
-                end
+      load_file(credentials_path)
+    else
+      @hash
+    end
 
     if @api_keys.key? :rubygems_api_key
       @rubygems_api_key    = @api_keys[:rubygems_api_key]
@@ -321,12 +320,13 @@ if you believe they were disclosed to a third party.
     config = load_file(credentials_path).merge(host => api_key)
 
     dirname = File.dirname credentials_path
-    Dir.mkdir(dirname) unless File.exist? dirname
+    require "fileutils"
+    FileUtils.mkdir_p(dirname)
 
     Gem.load_yaml
 
     permissions = 0600 & (~File.umask)
-    File.open(credentials_path, 'w', permissions) do |f|
+    File.open(credentials_path, "w", permissions) do |f|
       f.write config.to_yaml
     end
 
@@ -348,7 +348,7 @@ if you believe they were disclosed to a third party.
     yaml_errors = [ArgumentError]
     yaml_errors << Psych::SyntaxError if defined?(Psych::SyntaxError)
 
-    return {} unless filename and File.exist? filename
+    return {} unless filename && !filename.empty? && File.exist?(filename)
 
     begin
       content = Gem::SafeYAML.load(File.read(filename))
@@ -368,7 +368,21 @@ if you believe they were disclosed to a third party.
 
   # True if the backtrace option has been specified, or debug is on.
   def backtrace
-    @backtrace or $DEBUG
+    @backtrace || $DEBUG
+  end
+
+  # Check state file is writable. Creates empty file if not present to ensure we can write to it.
+  def state_file_writable?
+    if File.exist?(state_file_name)
+      File.writable?(state_file_name)
+    else
+      require "fileutils"
+      FileUtils.mkdir_p File.dirname(state_file_name)
+      File.open(state_file_name, "w") {}
+      true
+    end
+  rescue Errno::EACCES
+    false
   end
 
   # The name of the configuration file.
@@ -376,6 +390,25 @@ if you believe they were disclosed to a third party.
     @config_file_name || Gem.config_file
   end
 
+  # The name of the state file.
+  def state_file_name
+    Gem.state_file
+  end
+
+  # Reads time of last update check from state file
+  def last_update_check
+    if File.readable?(state_file_name)
+      File.read(state_file_name).to_i
+    else
+      0
+    end
+  end
+
+  # Writes time of last update check to state file
+  def last_update_check=(timestamp)
+    File.write(state_file_name, timestamp.to_s) if state_file_writable?
+  end
+
   # Delegates to @hash
   def each(&block)
     hash = @hash.dup
@@ -389,7 +422,7 @@ if you believe they were disclosed to a third party.
     yield :backtrace, @backtrace
     yield :bulk_threshold, @bulk_threshold
 
-    yield 'config_file_name', @config_file_name if @config_file_name
+    yield "config_file_name", @config_file_name if @config_file_name
 
     hash.each(&block)
   end
@@ -405,7 +438,7 @@ if you believe they were disclosed to a third party.
       when /^--debug$/ then
         $DEBUG = true
 
-        warn 'NOTE:  Debugging mode prints all exceptions even when rescued'
+        warn "NOTE:  Debugging mode prints all exceptions even when rescued"
       else
         @args << arg
       end
@@ -443,8 +476,8 @@ 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 << 'debug'
+    keys = yaml_hash.keys.map {|key| key.to_s }
+    keys << "debug"
     re = Regexp.union(*keys)
 
     @hash.each do |key, value|
@@ -458,7 +491,10 @@ if you believe they were disclosed to a third party.
 
   # Writes out this config file, replacing its source.
   def write
-    File.open config_file_name, 'w' do |io|
+    require "fileutils"
+    FileUtils.mkdir_p File.dirname(config_file_name)
+
+    File.open config_file_name, "w" do |io|
       io.write to_yaml
     end
   end
@@ -474,14 +510,32 @@ if you believe they were disclosed to a third party.
   end
 
   def ==(other) # :nodoc:
-    self.class === other and
-      @backtrace == other.backtrace and
-      @bulk_threshold == other.bulk_threshold and
-      @verbose == other.verbose and
-      @update_sources == other.update_sources and
+    self.class === other &&
+      @backtrace == other.backtrace &&
+      @bulk_threshold == other.bulk_threshold &&
+      @verbose == other.verbose &&
+      @update_sources == other.update_sources &&
       @hash == other.hash
   end
 
   attr_reader :hash
   protected :hash
+
+  private
+
+  def set_config_file_name(args)
+    @config_file_name = ENV["GEMRC"]
+    need_config_file_name = false
+
+    args.each do |arg|
+      if need_config_file_name
+        @config_file_name = arg
+        need_config_file_name = false
+      elsif arg =~ /^--config-file=(.*)/
+        @config_file_name = $1
+      elsif arg =~ /^--config-file$/
+        need_config_file_name = true
+      end
+    end
+  end
 end

data/lib/rubygems/core_ext/kernel_gem.rb

@@ -1,15 +1,7 @@
 # frozen_string_literal: true
-##
-# RubyGems adds the #gem method to allow activation of specific gem versions
-# and overrides the #require method on Kernel to make gems appear as if they
-# live on the <code>$LOAD_PATH</code>.  See the documentation of these methods
-# for further detail.
 
 module Kernel
 
-  # REFACTOR: This should be pulled out into some kind of hacks file.
-  remove_method :gem if 'method' == defined? gem # from gem_prelude.rb on 1.9
-
   ##
   # Use Kernel#gem to activate a specific version of +gem_name+.
   #
@@ -42,7 +34,7 @@ module Kernel
   #   GEM_SKIP=libA:libB ruby -I../libA -I../libB ./mycode.rb
 
   def gem(gem_name, *requirements) # :doc:
-    skip_list = (ENV['GEM_SKIP'] || "").split(/:/)
+    skip_list = (ENV["GEM_SKIP"] || "").split(/:/)
     raise Gem::LoadError, "skipping #{gem_name}" if skip_list.include? gem_name
 
     if gem_name.kind_of? Gem::Dependency
@@ -64,9 +56,13 @@ module Kernel
 
     spec = dep.to_spec
 
-    Gem::LOADED_SPECS_MUTEX.synchronize {
-      spec.activate
-    } if spec
+    if spec
+      if Gem::LOADED_SPECS_MUTEX.owned?
+        spec.activate
+      else
+        Gem::LOADED_SPECS_MUTEX.synchronize { spec.activate }
+      end
+    end
   end
 
   private :gem

data/lib/rubygems/core_ext/kernel_require.rb

@@ -5,7 +5,7 @@
 # See LICENSE.txt for permissions.
 #++
 
-require 'monitor'
+require "monitor"
 
 module Kernel
 
@@ -13,8 +13,10 @@ module Kernel
 
   # Make sure we have a reference to Ruby's original Kernel#require
   unless defined?(gem_original_require)
+    # :stopdoc:
     alias gem_original_require require
     private :gem_original_require
+    # :startdoc:
   end
 
   ##
@@ -31,105 +33,144 @@ module Kernel
   # The normal <tt>require</tt> functionality of returning false if
   # that file has already been loaded is preserved.
 
-  def require(path)
-    RUBYGEMS_ACTIVATION_MONITOR.enter
+  def require(path) # :doc:
+    return gem_original_require(path) unless Gem.discover_gems_on_require
 
-    path = path.to_path if path.respond_to? :to_path
-
-    if spec = Gem.find_unresolved_default_spec(path)
-      Gem.remove_unresolved_default_spec(spec)
-      begin
-        Kernel.send(:gem, spec.name)
-      rescue Exception
-        RUBYGEMS_ACTIVATION_MONITOR.exit
-        raise
+    begin
+      if RUBYGEMS_ACTIVATION_MONITOR.respond_to?(:mon_owned?)
+        monitor_owned = RUBYGEMS_ACTIVATION_MONITOR.mon_owned?
       end
-    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)
-    end
-
-    # If +path+ is for a gem that has already been loaded, don't
-    # bother trying to find it in an unresolved gem, just go straight
-    # to normal require.
-    #--
-    # 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)
-    end
-
-    # Attempt to find +path+ in any unresolved gems...
-
-    found_specs = Gem::Specification.find_in_unresolved path
-
-    # If there are no directly unresolved gems, then try and find +path+
-    # in any gems that are available via the currently unresolved gems.
-    # For example, given:
-    #
-    #   a => b => c => d
-    #
-    # If a and b are currently active with c being unresolved and d.rb is
-    # requested, then find_in_unresolved_tree will find d.rb in d because
-    # it's a dependency of c.
-    #
-    if found_specs.empty?
-      found_specs = Gem::Specification.find_in_unresolved_tree path
-
-      found_specs.each do |found_spec|
-        found_spec.activate
+      RUBYGEMS_ACTIVATION_MONITOR.enter
+
+      path = path.to_path if path.respond_to? :to_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
+              end
+
+              full_path = File.expand_path(File.join(safe_lp, "#{path}#{s}"))
+              if File.file?(full_path)
+                rp = full_path
+                break
+              end
+            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
       end
 
-    # We found +path+ directly in an unresolved gem. Now we figure out, of
-    # the possible found specs, which one we should activate.
-    else
-
-      # Check that all the found specs are just different
-      # versions of the same gem
-      names = found_specs.map(&:name).uniq
+      # If there are no unresolved deps, then we can use just try
+      # normal require handle loading a gem from the rescue below.
 
-      if names.size > 1
+      if Gem::Specification.unresolved_deps.empty?
         RUBYGEMS_ACTIVATION_MONITOR.exit
-        raise Gem::LoadError, "#{path} found in multiple gems: #{names.join ', '}"
+        return gem_original_require(path)
       end
 
-      # Ok, now find a gem that has no conflicts, starting
-      # at the highest version.
-      valid = found_specs.find { |s| !s.has_conflicts? }
+      # If +path+ is for a gem that has already been loaded, don't
+      # bother trying to find it in an unresolved gem, just go straight
+      # to normal require.
+      #--
+      # TODO request access to the C implementation of this to speed up RubyGems
 
-      unless valid
-        le = Gem::LoadError.new "unable to find a version of '#{names.first}' to activate"
-        le.name = names.first
+      if Gem::Specification.find_active_stub_by_path(path)
         RUBYGEMS_ACTIVATION_MONITOR.exit
-        raise le
+        return gem_original_require(path)
       end
 
-      valid.activate
-    end
+      # Attempt to find +path+ in any unresolved gems...
+
+      found_specs = Gem::Specification.find_in_unresolved path
+
+      # If there are no directly unresolved gems, then try and find +path+
+      # in any gems that are available via the currently unresolved gems.
+      # For example, given:
+      #
+      #   a => b => c => d
+      #
+      # If a and b are currently active with c being unresolved and d.rb is
+      # requested, then find_in_unresolved_tree will find d.rb in d because
+      # it's a dependency of c.
+      #
+      if found_specs.empty?
+        found_specs = Gem::Specification.find_in_unresolved_tree path
+
+        found_specs.each do |found_spec|
+          found_spec.activate
+        end
+
+      # We found +path+ directly in an unresolved gem. Now we figure out, of
+      # the possible found specs, which one we should activate.
+      else
+
+        # Check that all the found specs are just different
+        # versions of the same gem
+        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
+
+        # Ok, now find a gem that has no conflicts, starting
+        # at the highest version.
+        valid = found_specs.find {|s| !s.has_conflicts? }
+
+        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
 
-    RUBYGEMS_ACTIVATION_MONITOR.exit
-    return gem_original_require(path)
-  rescue LoadError => load_error
-    RUBYGEMS_ACTIVATION_MONITOR.enter
+      RUBYGEMS_ACTIVATION_MONITOR.exit
+      return gem_original_require(path)
+    rescue LoadError => load_error
+      if load_error.path == path
+        RUBYGEMS_ACTIVATION_MONITOR.enter
 
-    begin
-      if load_error.message.start_with?("Could not find") or
-          (load_error.message.end_with?(path) and Gem.try_activate(path))
-        require_again = true
+        begin
+          require_again = Gem.try_activate(path)
+        ensure
+          RUBYGEMS_ACTIVATION_MONITOR.exit
+        end
+
+        return gem_original_require(path) if require_again
       end
+
+      raise load_error
     ensure
-      RUBYGEMS_ACTIVATION_MONITOR.exit
+      if RUBYGEMS_ACTIVATION_MONITOR.respond_to?(:mon_owned?)
+        if monitor_owned != (ow = RUBYGEMS_ACTIVATION_MONITOR.mon_owned?)
+          STDERR.puts [$$, Thread.current, $!, $!.backtrace].inspect if $!
+          raise "CRITICAL: RUBYGEMS_ACTIVATION_MONITOR.owned?: before #{monitor_owned} -> after #{ow}"
+        end
+      end
     end
-
-    return gem_original_require(path) if require_again
-
-    raise load_error
   end
 
   private :require

data/lib/rubygems/core_ext/kernel_warn.rb

@@ -1,45 +1,50 @@
 # frozen_string_literal: true
 
-# `uplevel` keyword argument of Kernel#warn is available since ruby 2.5.
-if RUBY_VERSION >= "2.5"
+module Kernel
+  rubygems_path = "#{__dir__}/" # Frames to be skipped start with this path.
 
-  module Kernel
-    path = "#{__dir__}/" # Frames to be skipped start with this path.
+  original_warn = instance_method(:warn)
 
-    # Suppress "method redefined" warning
-    original_warn = instance_method(:warn)
-    Module.new {define_method(:warn, original_warn)}
+  remove_method :warn
 
-    original_warn = method(:warn)
+  class << self
+    remove_method :warn
+  end
 
-    module_function define_method(:warn) {|*messages, uplevel: nil|
-      unless uplevel
-        return original_warn.call(*messages)
+  module_function define_method(:warn) {|*messages, **kw|
+    unless uplevel = kw[:uplevel]
+      if Gem.java_platform? && RUBY_VERSION < "3.1"
+        return original_warn.bind(self).call(*messages)
+      else
+        return original_warn.bind(self).call(*messages, **kw)
       end
+    end
+
+    # Ensure `uplevel` fits a `long`
+    uplevel, = [uplevel].pack("l!").unpack("l!")
+
+    if uplevel >= 0
+      start = 0
+      while uplevel >= 0
+        loc, = caller_locations(start, 1)
+        unless loc
+          # No more backtrace
+          start += uplevel
+          break
+        end
 
-      # Ensure `uplevel` fits a `long`
-      uplevel, = [uplevel].pack("l!").unpack("l!")
-
-      if uplevel >= 0
-        start = 0
-        while uplevel >= 0
-          loc, = caller_locations(start, 1)
-          unless loc
-            # No more backtrace
-            start += uplevel
-            break
-          end
-
-          start += 1
+        start += 1
 
-          unless loc.path.start_with?(path)
+        if path = loc.path
+          unless path.start_with?(rubygems_path) || path.start_with?("<internal:")
             # Non-rubygems frames
             uplevel -= 1
           end
         end
-        uplevel = start
       end
-      original_warn.call(*messages, uplevel: uplevel)
-    }
-  end
+      kw[:uplevel] = start
+    end
+
+    original_warn.bind(self).call(*messages, **kw)
+  }
 end