Merge pull request #8332 from rubygems/deivid-rodriguez/update-vendored-gems

Update vendored timeout and securerandom

(cherry picked from commit 089b236)

Author: deivid-rodriguez

bundler/lib/bundler/vendor/securerandom/lib/securerandom.rb

@@ -41,7 +41,7 @@
 module Bundler::SecureRandom
 
   # The version
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 
   class << self
     # Returns a random binary string containing +size+ bytes.
@@ -51,6 +51,12 @@ def bytes(n)
       return gen_random(n)
     end
 
+    # Compatibility methods for Ruby 3.2, we can remove this after dropping to support Ruby 3.2
+    def alphanumeric(n = nil, chars: ALPHANUMERIC)
+      n = 16 if n.nil?
+      choose(chars, n)
+    end if RUBY_VERSION < '3.3'
+
     private
 
     # :stopdoc:

lib/rubygems/vendor/securerandom/lib/securerandom.rb

@@ -41,7 +41,7 @@
 module Gem::SecureRandom
 
   # The version
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 
   class << self
     # Returns a random binary string containing +size+ bytes.
@@ -51,6 +51,12 @@ def bytes(n)
       return gen_random(n)
     end
 
+    # Compatibility methods for Ruby 3.2, we can remove this after dropping to support Ruby 3.2
+    def alphanumeric(n = nil, chars: ALPHANUMERIC)
+      n = 16 if n.nil?
+      choose(chars, n)
+    end if RUBY_VERSION < '3.3'
+
     private
 
     # :stopdoc:

lib/rubygems/vendor/timeout/lib/timeout.rb

@@ -20,7 +20,7 @@
 
 module Gem::Timeout
   # The version
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 
   # Internal error raised to when a timeout is triggered.
   class ExitException < Exception
@@ -141,9 +141,10 @@ def self.ensure_timeout_thread_created
   # Perform an operation in a block, raising an error if it takes longer than
   # +sec+ seconds to complete.
   #
-  # +sec+:: Number of seconds to wait for the block to terminate. Any number
-  #         may be used, including Floats to specify fractional seconds. A
+  # +sec+:: Number of seconds to wait for the block to terminate. Any non-negative number
+  #         or nil may be used, including Floats to specify fractional seconds. A
   #         value of 0 or +nil+ will execute the block without any timeout.
+  #         Any negative number will raise an ArgumentError.
   # +klass+:: Exception Class to raise if the block fails to terminate
   #           in +sec+ seconds.  Omitting will use the default, Gem::Timeout::Error
   # +message+:: Error message to raise with Exception Class.
@@ -165,6 +166,7 @@ def self.ensure_timeout_thread_created
   # a module method, so you can call it directly as Gem::Timeout.timeout().
   def timeout(sec, klass = nil, message = nil, &block)   #:yield: +sec+
     return yield(sec) if sec == nil or sec.zero?
+    raise ArgumentError, "Timeout sec must be a non-negative number" if 0 > sec
 
     message ||= "execution expired"
 

tool/automatiek/timeout-v0.4.1.patch

@@ -0,0 +1,20 @@
+diff --git a/lib/rubygems/vendor/timeout/lib/timeout.rb b/lib/rubygems/vendor/timeout/lib/timeout.rb
+index cc5d05ce670..455c504f470 100644
+--- a/lib/rubygems/vendor/timeout/lib/timeout.rb
++++ b/lib/rubygems/vendor/timeout/lib/timeout.rb
+@@ -1,5 +1,5 @@
+ # frozen_string_literal: true
+-# Gem::Timeout long-running blocks
++# Timeout long-running blocks
+ #
+ # == Synopsis
+ #
+@@ -166,7 +166,7 @@ def self.ensure_timeout_thread_created
+   # a module method, so you can call it directly as Gem::Timeout.timeout().
+   def timeout(sec, klass = nil, message = nil, &block)   #:yield: +sec+
+     return yield(sec) if sec == nil or sec.zero?
+-    raise ArgumentError, "Gem::Timeout sec must be a non-negative number" if 0 > sec
++    raise ArgumentError, "Timeout sec must be a non-negative number" if 0 > sec
+ 
+     message ||= "execution expired"
+ 

tool/automatiek/timeout-v0.4.3.patch

@@ -89,7 +89,7 @@ def require_target
   VendoredGem.new(name: "optparse", namespace: "OptionParser", prefix: "Gem", vendor_lib: "lib/rubygems/vendor/optparse", license_path: "COPYING", extra_dependencies: %w[uri/lib/rubygems/vendor/uri], patch_name: "optparse-v0.4.0.patch"),
   VendoredGem.new(name: "resolv", namespace: "Resolv", prefix: "Gem", vendor_lib: "lib/rubygems/vendor/resolv", license_path: "COPYING", extra_dependencies: %w[securerandom/lib/rubygems/vendor/securerandom timeout], patch_name: "resolv-v0.6.0.patch"),
   VendoredGem.new(name: "securerandom", namespace: "SecureRandom", prefix: "Gem", vendor_lib: "lib/rubygems/vendor/securerandom", license_path: "COPYING"),
-  VendoredGem.new(name: "timeout", namespace: "Timeout", prefix: "Gem", vendor_lib: "lib/rubygems/vendor/timeout", license_path: "COPYING", patch_name: "timeout-v0.4.1.patch"),
+  VendoredGem.new(name: "timeout", namespace: "Timeout", prefix: "Gem", vendor_lib: "lib/rubygems/vendor/timeout", license_path: "COPYING", patch_name: "timeout-v0.4.3.patch"),
   VendoredGem.new(name: "tsort", namespace: "TSort", prefix: "Gem", vendor_lib: "lib/rubygems/vendor/tsort", license_path: "LICENSE.txt"),
   VendoredGem.new(name: "uri", namespace: "URI", prefix: "Gem", vendor_lib: "lib/rubygems/vendor/uri", license_path: "COPYING"),
   # Bundler

tool/automatiek/vendor.rb

@@ -10,8 +10,8 @@
 gem "optparse", "0.6.0"
 gem "pub_grub", github: "jhawthorn/pub_grub"
 gem "resolv", "0.6.0"
-gem "securerandom", "0.4.0"
-gem "timeout", "0.4.2"
+gem "securerandom", "0.4.1"
+gem "timeout", "0.4.3"
 gem "thor", "1.3.2"
 gem "tsort", "0.2.0"
 gem "uri", "1.0.2"

tool/bundler/vendor_gems.rb

@@ -23,9 +23,9 @@ GEM
       timeout
     optparse (0.6.0)
     resolv (0.6.0)
-    securerandom (0.4.0)
+    securerandom (0.4.1)
     thor (1.3.2)
-    timeout (0.4.2)
+    timeout (0.4.3)
     tsort (0.2.0)
     uri (1.0.2)
 
@@ -46,9 +46,9 @@ DEPENDENCIES
   optparse (= 0.6.0)
   pub_grub!
   resolv (= 0.6.0)
-  securerandom (= 0.4.0)
+  securerandom (= 0.4.1)
   thor (= 1.3.2)
-  timeout (= 0.4.2)
+  timeout (= 0.4.3)
   tsort (= 0.2.0)
   uri (= 1.0.2)
 
@@ -62,9 +62,9 @@ CHECKSUMS
   optparse (0.6.0) sha256=25e90469c1cd44048a89dc01c1dde9d5f0bdf717851055fb18237780779b068c
   pub_grub (0.5.0)
   resolv (0.6.0) sha256=b8b73f7734d4102ef9f75bad281d8fd1c434f8588b6aba17832ddc16fe679fab
-  securerandom (0.4.0) sha256=37a844aa4fe4dac8e47c5bc35f91531d4dc636ccee54a1ba1629087dda0a53a8
+  securerandom (0.4.1) sha256=cc5193d414a4341b6e225f0cb4446aceca8e50d5e1888743fac16987638ea0b1
   thor (1.3.2) sha256=eef0293b9e24158ccad7ab383ae83534b7ad4ed99c09f96f1a6b036550abbeda
-  timeout (0.4.2) sha256=8aca2d5ff98eb2f7a501c03f8c3622065932cc58bc58f725cd50a09e63b4cc19
+  timeout (0.4.3) sha256=9509f079b2b55fe4236d79633bd75e34c1c1e7e3fb4b56cb5fda61f80a0fe30e
   tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f
   uri (1.0.2) sha256=b303504ceb7e5905771fa7fa14b649652fa949df18b5880d69cfb12494791e27