Merge pull request #7960 from rubygems/deivid-rodriguez/vendor-securerandom

Fix `gem exec rails new project` failing on Ruby 3.2

(cherry picked from commit 7de3224)

Author: deivid-rodriguez

.github/workflows/install-rubygems.yml

@@ -85,9 +85,9 @@ jobs:
       - name: Check bundler install didn't hit the network
         run: if grep -q 'GET http' output.txt; then false; else true; fi
         working-directory: ./bundler
-      - name: Workaround bad nio4r release on JRuby, so that Rails can be installed below
-        run: gem install nio4r --version 2.7.1
-        if: matrix.ruby.name == 'jruby'
+      - name: Check gem exec can create a rails project
+        run: gem exec rails new app --minimal
+        if: matrix.ruby.name != 'truffleruby' && matrix.ruby.name != 'jruby'
       - name: Check rails can be installed
         run: gem install rails --verbose --backtrace
     timeout-minutes: 10

Manifest.txt

@@ -585,6 +585,10 @@ lib/rubygems/vendor/optparse/lib/optparse/version.rb
 lib/rubygems/vendor/resolv/.document
 lib/rubygems/vendor/resolv/LICENSE.txt
 lib/rubygems/vendor/resolv/lib/resolv.rb
+lib/rubygems/vendor/securerandom/.document
+lib/rubygems/vendor/securerandom/LICENSE.txt
+lib/rubygems/vendor/securerandom/lib/random/formatter.rb
+lib/rubygems/vendor/securerandom/lib/securerandom.rb
 lib/rubygems/vendor/timeout/.document
 lib/rubygems/vendor/timeout/LICENSE.txt
 lib/rubygems/vendor/timeout/lib/timeout.rb

lib/rubygems/vendor/net-http/lib/net/https.rb

@@ -4,7 +4,7 @@
 = net/https -- SSL/TLS enhancement for Gem::Net::HTTP.
 
   This file has been merged with net/http.  There is no longer any need to
-  require 'rubygems/vendor/net-http/lib/net/https' to use HTTPS.
+  require_relative 'https' to use HTTPS.
 
   See Gem::Net::HTTP for details on how to make HTTPS connections.
 

lib/rubygems/vendor/optparse/lib/optparse.rb

@@ -1084,7 +1084,7 @@ def compsys(to, name = File.basename($0)) # :nodoc:
     Switch::OptionalArgument.new do |pkg|
       if pkg
         begin
-          require 'rubygems/vendor/optparse/lib/optparse/version'
+          require_relative 'optparse/version'
         rescue LoadError
         else
           show_version(*pkg.split(/,/)) or

lib/rubygems/vendor/resolv/lib/resolv.rb

@@ -5,7 +5,7 @@
 require 'io/wait'
 
 begin
-  require 'securerandom'
+  require_relative '../../securerandom/lib/securerandom'
 rescue LoadError
 end
 
@@ -602,10 +602,10 @@ def extract_resources(msg, name, typeclass) # :nodoc:
       }
     end
 
-    if defined? SecureRandom
+    if defined? Gem::SecureRandom
       def self.random(arg) # :nodoc:
         begin
-          SecureRandom.random_number(arg)
+          Gem::SecureRandom.random_number(arg)
         rescue NotImplementedError
           rand(arg)
         end

lib/rubygems/vendor/securerandom/.document

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

lib/rubygems/vendor/securerandom/LICENSE.txt

@@ -0,0 +1,22 @@
+Copyright (C) 1993-2013 Yukihiro Matsumoto. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.