rubygems-update 3.4.10 → 3.5.22

data/bundler/lib/bundler/vendor/connection_pool/lib/connection_pool.rb

@@ -1,4 +1,4 @@
-require "timeout"
+require_relative "../../../vendored_timeout"
 require_relative "connection_pool/version"
 
 class Bundler::ConnectionPool
@@ -6,7 +6,7 @@ class Bundler::ConnectionPool
 
   class PoolShuttingDownError < ::Bundler::ConnectionPool::Error; end
 
-  class TimeoutError < ::Timeout::Error; end
+  class TimeoutError < ::Gem::Timeout::Error; end
 end
 
 # Generic connection pool class for sharing a limited number of objects or network connections
@@ -36,14 +36,57 @@ end
 # Accepts the following options:
 # - :size - number of connections to pool, defaults to 5
 # - :timeout - amount of time to wait for a connection if none currently available, defaults to 5 seconds
+# - :auto_reload_after_fork - automatically drop all connections after fork, defaults to true
 #
 class Bundler::ConnectionPool
-  DEFAULTS = {size: 5, timeout: 5}
+  DEFAULTS = {size: 5, timeout: 5, auto_reload_after_fork: true}
 
   def self.wrap(options, &block)
     Wrapper.new(options, &block)
   end
 
+  if Process.respond_to?(:fork)
+    INSTANCES = ObjectSpace::WeakMap.new
+    private_constant :INSTANCES
+
+    def self.after_fork
+      INSTANCES.values.each do |pool|
+        next unless pool.auto_reload_after_fork
+
+        # We're on after fork, so we know all other threads are dead.
+        # All we need to do is to ensure the main thread doesn't have a
+        # checked out connection
+        pool.checkin(force: true)
+        pool.reload do |connection|
+          # Unfortunately we don't know what method to call to close the connection,
+          # so we try the most common one.
+          connection.close if connection.respond_to?(:close)
+        end
+      end
+      nil
+    end
+
+    if ::Process.respond_to?(:_fork) # MRI 3.1+
+      module ForkTracker
+        def _fork
+          pid = super
+          if pid == 0
+            Bundler::ConnectionPool.after_fork
+          end
+          pid
+        end
+      end
+      Process.singleton_class.prepend(ForkTracker)
+    end
+  else
+    INSTANCES = nil
+    private_constant :INSTANCES
+
+    def self.after_fork
+      # noop
+    end
+  end
+
   def initialize(options = {}, &block)
     raise ArgumentError, "Connection pool requires a block" unless block
 
@@ -51,10 +94,12 @@ class Bundler::ConnectionPool
 
     @size = Integer(options.fetch(:size))
     @timeout = options.fetch(:timeout)
+    @auto_reload_after_fork = options.fetch(:auto_reload_after_fork)
 
     @available = TimedStack.new(@size, &block)
     @key = :"pool-#{@available.object_id}"
     @key_count = :"pool-#{@available.object_id}-count"
+    INSTANCES[self] = self if INSTANCES
   end
 
   def with(options = {})
@@ -81,16 +126,16 @@ class Bundler::ConnectionPool
     end
   end
 
-  def checkin
+  def checkin(force: false)
     if ::Thread.current[@key]
-      if ::Thread.current[@key_count] == 1
+      if ::Thread.current[@key_count] == 1 || force
         @available.push(::Thread.current[@key])
         ::Thread.current[@key] = nil
         ::Thread.current[@key_count] = nil
       else
         ::Thread.current[@key_count] -= 1
       end
-    else
+    elsif !force
       raise Bundler::ConnectionPool::Error, "no connections are checked out"
     end
 
@@ -117,6 +162,8 @@ class Bundler::ConnectionPool
 
   # Size of this connection pool
   attr_reader :size
+  # Automatically drop all connections after fork
+  attr_reader :auto_reload_after_fork
 
   # Number of pool entries available for checkout at this instant.
   def available

data/bundler/lib/bundler/vendor/fileutils/lib/fileutils.rb

@@ -3,7 +3,7 @@
 begin
   require 'rbconfig'
 rescue LoadError
-  # for make mjit-headers
+  # for make rjit-headers
 end
 
 # Namespace for file utility methods for copying, moving, removing, etc.
@@ -180,7 +180,7 @@ end
 # - {CVE-2004-0452}[https://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2004-0452].
 #
 module Bundler::FileUtils
-  VERSION = "1.7.0"
+  VERSION = "1.7.2"
 
   def self.private_module_function(name)   #:nodoc:
     module_function name
@@ -192,8 +192,6 @@ module Bundler::FileUtils
   #
   #   Bundler::FileUtils.pwd # => "/rdoc/fileutils"
   #
-  # Bundler::FileUtils.getwd is an alias for Bundler::FileUtils.pwd.
-  #
   # Related: Bundler::FileUtils.cd.
   #
   def pwd
@@ -235,8 +233,6 @@ module Bundler::FileUtils
   #     cd ..
   #     cd fileutils
   #
-  # Bundler::FileUtils.chdir is an alias for Bundler::FileUtils.cd.
-  #
   # Related: Bundler::FileUtils.pwd.
   #
   def cd(dir, verbose: nil, &block) # :yield: dir
@@ -515,8 +511,6 @@ module Bundler::FileUtils
   # Raises an exception if +dest+ is the path to an existing file
   # and keyword argument +force+ is not +true+.
   #
-  # Bundler::FileUtils#link is an alias for Bundler::FileUtils#ln.
-  #
   # Related: Bundler::FileUtils.link_entry (has different options).
   #
   def ln(src, dest, force: nil, noop: nil, verbose: nil)
@@ -707,8 +701,6 @@ module Bundler::FileUtils
   #     ln -sf src2.txt dest2.txt
   #     ln -s srcdir3/src0.txt srcdir3/src1.txt destdir3
   #
-  # Bundler::FileUtils.symlink is an alias for Bundler::FileUtils.ln_s.
-  #
   # Related: Bundler::FileUtils.ln_sf.
   #
   def ln_s(src, dest, force: nil, relative: false, target_directory: true, noop: nil, verbose: nil)
@@ -876,8 +868,6 @@ module Bundler::FileUtils
   #
   # Raises an exception if +src+ is a directory.
   #
-  # Bundler::FileUtils.copy is an alias for Bundler::FileUtils.cp.
-  #
   # Related: {methods for copying}[rdoc-ref:FileUtils@Copying].
   #
   def cp(src, dest, preserve: nil, noop: nil, verbose: nil)
@@ -1164,8 +1154,6 @@ module Bundler::FileUtils
   #     mv src0 dest0
   #     mv src1.txt src1 dest1
   #
-  # Bundler::FileUtils.move is an alias for Bundler::FileUtils.mv.
-  #
   def mv(src, dest, force: nil, noop: nil, verbose: nil, secure: nil)
     fu_output_message "mv#{force ? ' -f' : ''} #{[src,dest].flatten.join ' '}" if verbose
     return if noop
@@ -1223,8 +1211,6 @@ module Bundler::FileUtils
   #
   #     rm src0.dat src0.txt
   #
-  # Bundler::FileUtils.remove is an alias for Bundler::FileUtils.rm.
-  #
   # Related: {methods for deleting}[rdoc-ref:FileUtils@Deleting].
   #
   def rm(list, force: nil, noop: nil, verbose: nil)
@@ -1250,8 +1236,6 @@ module Bundler::FileUtils
   #
   # See Bundler::FileUtils.rm for keyword arguments.
   #
-  # Bundler::FileUtils.safe_unlink is an alias for Bundler::FileUtils.rm_f.
-  #
   # Related: {methods for deleting}[rdoc-ref:FileUtils@Deleting].
   #
   def rm_f(list, noop: nil, verbose: nil)
@@ -1339,8 +1323,6 @@ module Bundler::FileUtils
   #
   # See Bundler::FileUtils.rm_r for keyword arguments.
   #
-  # Bundler::FileUtils.rmtree is an alias for Bundler::FileUtils.rm_rf.
-  #
   # Related: {methods for deleting}[rdoc-ref:FileUtils@Deleting].
   #
   def rm_rf(list, noop: nil, verbose: nil, secure: nil)
@@ -1642,7 +1624,13 @@ module Bundler::FileUtils
       st = File.stat(s)
       unless File.exist?(d) and compare_file(s, d)
         remove_file d, true
-        copy_file s, d
+        if d.end_with?('/')
+          mkdir_p d
+          copy_file s, d + File.basename(s)
+        else
+          mkdir_p File.expand_path('..', d)
+          copy_file s, d
+        end
         File.utime st.atime, st.mtime, d if preserve
         File.chmod fu_mode(mode, st), d if mode
         File.chown uid, gid, d if uid or gid

data/bundler/lib/bundler/vendor/net-http-persistent/.document

@@ -0,0 +1 @@
+# Vendored files do not need to be documented

data/bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/connection.rb

@@ -1,8 +1,8 @@
 ##
-# A Net::HTTP connection wrapper that holds extra information for managing the
+# A Gem::Net::HTTP connection wrapper that holds extra information for managing the
 # connection's lifetime.
 
-class Bundler::Persistent::Net::HTTP::Persistent::Connection # :nodoc:
+class Gem::Net::HTTP::Persistent::Connection # :nodoc:
 
   attr_accessor :http
 
@@ -25,9 +25,10 @@ class Bundler::Persistent::Net::HTTP::Persistent::Connection # :nodoc:
   ensure
     reset
   end
+  alias_method :close, :finish
 
   def reset
-    @last_use = Bundler::Persistent::Net::HTTP::Persistent::EPOCH
+    @last_use = Gem::Net::HTTP::Persistent::EPOCH
     @requests = 0
   end
 

data/bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/pool.rb

@@ -1,4 +1,4 @@
-class Bundler::Persistent::Net::HTTP::Persistent::Pool < Bundler::ConnectionPool # :nodoc:
+class Gem::Net::HTTP::Persistent::Pool < Bundler::ConnectionPool # :nodoc:
 
   attr_reader :available # :nodoc:
   attr_reader :key # :nodoc:
@@ -6,25 +6,37 @@ class Bundler::Persistent::Net::HTTP::Persistent::Pool < Bundler::ConnectionPool
   def initialize(options = {}, &block)
     super
 
-    @available = Bundler::Persistent::Net::HTTP::Persistent::TimedStackMulti.new(@size, &block)
+    @available = Gem::Net::HTTP::Persistent::TimedStackMulti.new(@size, &block)
     @key = "current-#{@available.object_id}"
   end
 
   def checkin net_http_args
-    stack = Thread.current[@key][net_http_args] ||= []
+    if net_http_args.is_a?(Hash) && net_http_args.size == 1 && net_http_args[:force]
+      # Bundler::ConnectionPool 2.4+ calls `checkin(force: true)` after fork.
+      # When this happens, we should remove all connections from Thread.current
+      if stacks = Thread.current[@key]
+        stacks.each do |http_args, connections|
+          connections.each do |conn|
+            @available.push conn, connection_args: http_args
+          end
+          connections.clear
+        end
+      end
+    else
+      stack = Thread.current[@key][net_http_args] ||= []
 
-    raise Bundler::ConnectionPool::Error, 'no connections are checked out' if
-      stack.empty?
+      raise Bundler::ConnectionPool::Error, 'no connections are checked out' if
+        stack.empty?
 
-    conn = stack.pop
+      conn = stack.pop
 
-    if stack.empty?
-      @available.push conn, connection_args: net_http_args
+      if stack.empty?
+        @available.push conn, connection_args: net_http_args
 
-      Thread.current[@key].delete(net_http_args)
-      Thread.current[@key] = nil if Thread.current[@key].empty?
+        Thread.current[@key].delete(net_http_args)
+        Thread.current[@key] = nil if Thread.current[@key].empty?
+      end
     end
-
     nil
   end
 

data/bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/timed_stack_multi.rb

@@ -1,4 +1,4 @@
-class Bundler::Persistent::Net::HTTP::Persistent::TimedStackMulti < Bundler::ConnectionPool::TimedStack # :nodoc:
+class Gem::Net::HTTP::Persistent::TimedStackMulti < Bundler::ConnectionPool::TimedStack # :nodoc:
 
   ##
   # Returns a new hash that has arrays for keys