[rubygems/rubygems] Rename wrapper files for vendored libraries with 'vendored_' prefix
https://github.com/rubygems/rubygems/commit/cfc908c8c1
This commit is contained in:
parent
b8572c3f16
commit
d2da774f87
@ -6,7 +6,7 @@
|
||||
# See LICENSE.txt for permissions.
|
||||
#++
|
||||
|
||||
require_relative "optparse"
|
||||
require_relative "vendored_optparse"
|
||||
require_relative "requirement"
|
||||
require_relative "user_interaction"
|
||||
|
||||
|
@ -106,7 +106,7 @@ class Gem::CommandManager
|
||||
# Register all the subcommands supported by the gem command.
|
||||
|
||||
def initialize
|
||||
require_relative "timeout"
|
||||
require_relative "vendored_timeout"
|
||||
@commands = {}
|
||||
|
||||
BUILTIN_COMMANDS.each do |name|
|
||||
|
@ -6,7 +6,7 @@
|
||||
# See LICENSE.txt for permissions.
|
||||
#++
|
||||
|
||||
require_relative "tsort"
|
||||
require_relative "vendored_tsort"
|
||||
require_relative "deprecate"
|
||||
|
||||
##
|
||||
|
@ -85,7 +85,7 @@ module Gem::GemcutterUtilities
|
||||
# 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
|
||||
|
@ -1,3 +0,0 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
require_relative "../vendor/net-http/lib/net/http"
|
@ -74,7 +74,7 @@ class Gem::RemoteFetcher
|
||||
|
||||
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"
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
require_relative "net/http"
|
||||
require_relative "vendored_net_http"
|
||||
require_relative "user_interaction"
|
||||
|
||||
class Gem::Request
|
||||
|
@ -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.
|
||||
|
@ -140,7 +140,7 @@ class Gem::S3URISigner
|
||||
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"
|
||||
|
@ -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'
|
||||
|
3
lib/rubygems/vendored_net_http.rb
Normal file
3
lib/rubygems/vendored_net_http.rb
Normal file
@ -0,0 +1,3 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
require_relative "vendor/net-http/lib/net/http"
|
@ -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
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
require_relative "helper"
|
||||
require "rubygems/request"
|
||||
require "rubygems/timeout"
|
||||
require "rubygems/vendored_timeout"
|
||||
|
||||
class TestGemRequestConnectionPool < Gem::TestCase
|
||||
class FakeHttp
|
||||
|
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user