[rubygems/rubygems] Rename wrapper files for vendored libraries with …

…'vendored_' prefix rubygems/rubygems@cfc908c8c1
ruby · Feb 26, 2024 · d2da774 · d2da774
1 parent b8572c3
commit d2da774
Show file tree

Hide file tree

Showing 17 changed files with 15 additions and 15 deletions.
diff --git a/lib/rubygems/command.rb b/lib/rubygems/command.rb
@@ -6,7 +6,7 @@
 # See LICENSE.txt for permissions.
 #++
 
-require_relative "optparse"
+require_relative "vendored_optparse"
 require_relative "requirement"
 require_relative "user_interaction"
 

diff --git a/lib/rubygems/command_manager.rb b/lib/rubygems/command_manager.rb
@@ -106,7 +106,7 @@ def self.reset
   # Register all the subcommands supported by the gem command.
 
   def initialize
-    require_relative "timeout"
+    require_relative "vendored_timeout"
     @commands = {}
 
     BUILTIN_COMMANDS.each do |name|

diff --git a/lib/rubygems/dependency_list.rb b/lib/rubygems/dependency_list.rb
@@ -6,7 +6,7 @@
 # See LICENSE.txt for permissions.
 #++
 
-require_relative "tsort"
+require_relative "vendored_tsort"
 require_relative "deprecate"
 
 ##

diff --git a/lib/rubygems/gemcutter_utilities.rb b/lib/rubygems/gemcutter_utilities.rb
@@ -85,7 +85,7 @@ def host
   # If +allowed_push_host+ metadata is present, then it will only allow that host.
 
   def rubygems_api_request(method, path, host = nil, allowed_push_host = nil, scope: nil, credentials: {}, &block)
-    require_relative "net/http"
+    require_relative "vendored_net_http"
 
     self.host = host if host
     unless self.host

diff --git a/lib/rubygems/net/http.rb b/lib/rubygems/net/http.rb
diff --git a/lib/rubygems/remote_fetcher.rb b/lib/rubygems/remote_fetcher.rb
@@ -74,7 +74,7 @@ def self.fetcher
 
   def initialize(proxy=nil, dns=nil, headers={})
     require_relative "core_ext/tcpsocket_init" if Gem.configuration.ipv4_fallback_enabled
-    require_relative "net/http"
+    require_relative "vendored_net_http"
     require "stringio"
     require_relative "vendor/uri/lib/uri"
 

diff --git a/lib/rubygems/request.rb b/lib/rubygems/request.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "net/http"
+require_relative "vendored_net_http"
 require_relative "user_interaction"
 
 class Gem::Request

diff --git a/lib/rubygems/request_set.rb b/lib/rubygems/request_set.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "tsort"
+require_relative "vendored_tsort"
 
 ##
 # A RequestSet groups a request to activate a set of dependencies.

diff --git a/lib/rubygems/s3_uri_signer.rb b/lib/rubygems/s3_uri_signer.rb
@@ -140,7 +140,7 @@ def base64_uri_escape(str)
   end
 
   def ec2_metadata_credentials_json
-    require_relative "net/http"
+    require_relative "vendored_net_http"
     require_relative "request"
     require_relative "request/connection_pools"
     require "json"

diff --git a/lib/rubygems/vendor/molinillo/lib/molinillo/dependency_graph.rb b/lib/rubygems/vendor/molinillo/lib/molinillo/dependency_graph.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative '../../../../tsort'
+require_relative '../../../tsort/lib/tsort'
 
 require_relative 'dependency_graph/log'
 require_relative 'dependency_graph/vertex'

diff --git a/lib/rubygems/vendored_net_http.rb b/lib/rubygems/vendored_net_http.rb
@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+require_relative "vendor/net-http/lib/net/http"
diff --git a/lib/rubygems/optparse.rb → lib/rubygems/vendored_optparse.rb b/lib/rubygems/optparse.rb → lib/rubygems/vendored_optparse.rb
diff --git a/lib/rubygems/timeout.rb → lib/rubygems/vendored_timeout.rb b/lib/rubygems/timeout.rb → lib/rubygems/vendored_timeout.rb
diff --git a/lib/rubygems/tsort.rb → lib/rubygems/vendored_tsort.rb b/lib/rubygems/tsort.rb → lib/rubygems/vendored_tsort.rb
diff --git a/test/rubygems/test_bundled_ca.rb b/test/rubygems/test_bundled_ca.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require_relative "helper"
-require "rubygems/net/http"
+require "rubygems/vendored_net_http"
 require "rubygems/openssl"
 
 unless Gem::HAVE_OPENSSL

diff --git a/test/rubygems/test_gem_request_connection_pools.rb b/test/rubygems/test_gem_request_connection_pools.rb
@@ -2,7 +2,7 @@
 
 require_relative "helper"
 require "rubygems/request"
-require "rubygems/timeout"
+require "rubygems/vendored_timeout"
 
 class TestGemRequestConnectionPool < Gem::TestCase
   class FakeHttp

diff --git a/test/rubygems/test_gem_stream_ui.rb b/test/rubygems/test_gem_stream_ui.rb
@@ -2,7 +2,7 @@
 
 require_relative "helper"
 require "rubygems/user_interaction"
-require "rubygems/timeout"
+require "rubygems/vendored_timeout"
 
 class TestGemStreamUI < Gem::TestCase
   # increase timeout with RJIT for --jit-wait testing