From 04dbdc81d1a3625bf653c7c4110412cc6246b5d6 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Mon, 29 Jan 2024 15:49:23 +0900 Subject: [PATCH] Move net-http under the vendor directory --- lib/rubygems/net/http.rb | 2 +- lib/rubygems/{ => vendor}/net-http/.document | 0 .../{ => vendor}/net-http/lib/net/http.rb | 6 ++-- .../net-http/lib/net/http/backward.rb | 0 .../net-http/lib/net/http/exceptions.rb | 0 .../net-http/lib/net/http/generic_request.rb | 0 .../net-http/lib/net/http/header.rb | 0 .../net-http/lib/net/http/proxy_delta.rb | 0 .../net-http/lib/net/http/request.rb | 2 +- .../net-http/lib/net/http/requests.rb | 30 +++++++++---------- .../net-http/lib/net/http/response.rb | 0 .../net-http/lib/net/http/responses.rb | 0 .../net-http/lib/net/http/status.rb | 0 .../{ => vendor}/net-http/lib/net/https.rb | 2 +- 14 files changed, 21 insertions(+), 21 deletions(-) rename lib/rubygems/{ => vendor}/net-http/.document (100%) rename lib/rubygems/{ => vendor}/net-http/lib/net/http.rb (99%) rename lib/rubygems/{ => vendor}/net-http/lib/net/http/backward.rb (100%) rename lib/rubygems/{ => vendor}/net-http/lib/net/http/exceptions.rb (100%) rename lib/rubygems/{ => vendor}/net-http/lib/net/http/generic_request.rb (100%) rename lib/rubygems/{ => vendor}/net-http/lib/net/http/header.rb (100%) rename lib/rubygems/{ => vendor}/net-http/lib/net/http/proxy_delta.rb (100%) rename lib/rubygems/{ => vendor}/net-http/lib/net/http/request.rb (98%) rename lib/rubygems/{ => vendor}/net-http/lib/net/http/requests.rb (94%) rename lib/rubygems/{ => vendor}/net-http/lib/net/http/response.rb (100%) rename lib/rubygems/{ => vendor}/net-http/lib/net/http/responses.rb (100%) rename lib/rubygems/{ => vendor}/net-http/lib/net/http/status.rb (100%) rename lib/rubygems/{ => vendor}/net-http/lib/net/https.rb (88%) diff --git a/lib/rubygems/net/http.rb b/lib/rubygems/net/http.rb index 1a21c05191..e2973ac24a 100644 --- a/lib/rubygems/net/http.rb +++ b/lib/rubygems/net/http.rb @@ -1,3 +1,3 @@ # frozen_string_literal: true -require_relative "../net-http/lib/net/http" +require_relative "../vendor/net-http/lib/net/http" diff --git a/lib/rubygems/net-http/.document b/lib/rubygems/vendor/net-http/.document similarity index 100% rename from lib/rubygems/net-http/.document rename to lib/rubygems/vendor/net-http/.document diff --git a/lib/rubygems/net-http/lib/net/http.rb b/lib/rubygems/vendor/net-http/lib/net/http.rb similarity index 99% rename from lib/rubygems/net-http/lib/net/http.rb rename to lib/rubygems/vendor/net-http/lib/net/http.rb index a82ef828a4..3b931c25f5 100644 --- a/lib/rubygems/net-http/lib/net/http.rb +++ b/lib/rubygems/vendor/net-http/lib/net/http.rb @@ -20,9 +20,9 @@ # See Gem::Net::HTTP for an overview and examples. # -require_relative '../../../vendor/net-protocol/lib/net/protocol' -require_relative '../../../vendor/uri/lib/uri' -require_relative '../../../vendor/resolv/lib/resolv' +require_relative '../../../net-protocol/lib/net/protocol' +require_relative '../../../uri/lib/uri' +require_relative '../../../resolv/lib/resolv' autoload :OpenSSL, 'openssl' module Gem::Net #:nodoc: diff --git a/lib/rubygems/net-http/lib/net/http/backward.rb b/lib/rubygems/vendor/net-http/lib/net/http/backward.rb similarity index 100% rename from lib/rubygems/net-http/lib/net/http/backward.rb rename to lib/rubygems/vendor/net-http/lib/net/http/backward.rb diff --git a/lib/rubygems/net-http/lib/net/http/exceptions.rb b/lib/rubygems/vendor/net-http/lib/net/http/exceptions.rb similarity index 100% rename from lib/rubygems/net-http/lib/net/http/exceptions.rb rename to lib/rubygems/vendor/net-http/lib/net/http/exceptions.rb diff --git a/lib/rubygems/net-http/lib/net/http/generic_request.rb b/lib/rubygems/vendor/net-http/lib/net/http/generic_request.rb similarity index 100% rename from lib/rubygems/net-http/lib/net/http/generic_request.rb rename to lib/rubygems/vendor/net-http/lib/net/http/generic_request.rb diff --git a/lib/rubygems/net-http/lib/net/http/header.rb b/lib/rubygems/vendor/net-http/lib/net/http/header.rb similarity index 100% rename from lib/rubygems/net-http/lib/net/http/header.rb rename to lib/rubygems/vendor/net-http/lib/net/http/header.rb diff --git a/lib/rubygems/net-http/lib/net/http/proxy_delta.rb b/lib/rubygems/vendor/net-http/lib/net/http/proxy_delta.rb similarity index 100% rename from lib/rubygems/net-http/lib/net/http/proxy_delta.rb rename to lib/rubygems/vendor/net-http/lib/net/http/proxy_delta.rb diff --git a/lib/rubygems/net-http/lib/net/http/request.rb b/lib/rubygems/vendor/net-http/lib/net/http/request.rb similarity index 98% rename from lib/rubygems/net-http/lib/net/http/request.rb rename to lib/rubygems/vendor/net-http/lib/net/http/request.rb index 53bddc420a..495ec9be54 100644 --- a/lib/rubygems/net-http/lib/net/http/request.rb +++ b/lib/rubygems/vendor/net-http/lib/net/http/request.rb @@ -8,7 +8,7 @@ # # An request object may be created with either a Gem::URI or a string hostname: # -# require 'rubygems/net-http/lib/net/http' +# require 'rubygems/vendor/net-http/lib/net/http' # uri = Gem::URI('https://jsonplaceholder.typicode.com/') # req = Gem::Net::HTTP::Get.new(uri) # => # # req = Gem::Net::HTTP::Get.new(uri.hostname) # => # diff --git a/lib/rubygems/net-http/lib/net/http/requests.rb b/lib/rubygems/vendor/net-http/lib/net/http/requests.rb similarity index 94% rename from lib/rubygems/net-http/lib/net/http/requests.rb rename to lib/rubygems/vendor/net-http/lib/net/http/requests.rb index fade3a3e86..1a57ddc7c2 100644 --- a/lib/rubygems/net-http/lib/net/http/requests.rb +++ b/lib/rubygems/vendor/net-http/lib/net/http/requests.rb @@ -5,7 +5,7 @@ # \Class for representing # {HTTP method GET}[https://en.wikipedia.org/w/index.php?title=Hypertext_Transfer_Protocol#GET_method]: # -# require 'rubygems/net-http/lib/net/http' +# require 'rubygems/vendor/net-http/lib/net/http' # uri = Gem::URI('http://example.com') # hostname = uri.hostname # => "example.com" # req = Gem::Net::HTTP::Get.new(uri) # => # @@ -37,7 +37,7 @@ end # \Class for representing # {HTTP method HEAD}[https://en.wikipedia.org/w/index.php?title=Hypertext_Transfer_Protocol#HEAD_method]: # -# require 'rubygems/net-http/lib/net/http' +# require 'rubygems/vendor/net-http/lib/net/http' # uri = Gem::URI('http://example.com') # hostname = uri.hostname # => "example.com" # req = Gem::Net::HTTP::Head.new(uri) # => # @@ -68,7 +68,7 @@ end # \Class for representing # {HTTP method POST}[https://en.wikipedia.org/w/index.php?title=Hypertext_Transfer_Protocol#POST_method]: # -# require 'rubygems/net-http/lib/net/http' +# require 'rubygems/vendor/net-http/lib/net/http' # uri = Gem::URI('http://example.com') # hostname = uri.hostname # => "example.com" # uri.path = '/posts' @@ -103,7 +103,7 @@ end # \Class for representing # {HTTP method PUT}[https://en.wikipedia.org/w/index.php?title=Hypertext_Transfer_Protocol#PUT_method]: # -# require 'rubygems/net-http/lib/net/http' +# require 'rubygems/vendor/net-http/lib/net/http' # uri = Gem::URI('http://example.com') # hostname = uri.hostname # => "example.com" # uri.path = '/posts' @@ -133,7 +133,7 @@ end # \Class for representing # {HTTP method DELETE}[https://en.wikipedia.org/w/index.php?title=Hypertext_Transfer_Protocol#DELETE_method]: # -# require 'rubygems/net-http/lib/net/http' +# require 'rubygems/vendor/net-http/lib/net/http' # uri = Gem::URI('http://example.com') # hostname = uri.hostname # => "example.com" # uri.path = '/posts/1' @@ -165,7 +165,7 @@ end # \Class for representing # {HTTP method OPTIONS}[https://en.wikipedia.org/w/index.php?title=Hypertext_Transfer_Protocol#OPTIONS_method]: # -# require 'rubygems/net-http/lib/net/http' +# require 'rubygems/vendor/net-http/lib/net/http' # uri = Gem::URI('http://example.com') # hostname = uri.hostname # => "example.com" # req = Gem::Net::HTTP::Options.new(uri) # => # @@ -196,7 +196,7 @@ end # \Class for representing # {HTTP method TRACE}[https://en.wikipedia.org/w/index.php?title=Hypertext_Transfer_Protocol#TRACE_method]: # -# require 'rubygems/net-http/lib/net/http' +# require 'rubygems/vendor/net-http/lib/net/http' # uri = Gem::URI('http://example.com') # hostname = uri.hostname # => "example.com" # req = Gem::Net::HTTP::Trace.new(uri) # => # @@ -227,7 +227,7 @@ end # \Class for representing # {HTTP method PATCH}[https://en.wikipedia.org/w/index.php?title=Hypertext_Transfer_Protocol#PATCH_method]: # -# require 'rubygems/net-http/lib/net/http' +# require 'rubygems/vendor/net-http/lib/net/http' # uri = Gem::URI('http://example.com') # hostname = uri.hostname # => "example.com" # uri.path = '/posts' @@ -265,7 +265,7 @@ end # \Class for representing # {WebDAV method PROPFIND}[http://www.webdav.org/specs/rfc4918.html#METHOD_PROPFIND]: # -# require 'rubygems/net-http/lib/net/http' +# require 'rubygems/vendor/net-http/lib/net/http' # uri = Gem::URI('http://example.com') # hostname = uri.hostname # => "example.com" # req = Gem::Net::HTTP::Propfind.new(uri) # => # @@ -288,7 +288,7 @@ end # \Class for representing # {WebDAV method PROPPATCH}[http://www.webdav.org/specs/rfc4918.html#METHOD_PROPPATCH]: # -# require 'rubygems/net-http/lib/net/http' +# require 'rubygems/vendor/net-http/lib/net/http' # uri = Gem::URI('http://example.com') # hostname = uri.hostname # => "example.com" # req = Gem::Net::HTTP::Proppatch.new(uri) # => # @@ -311,7 +311,7 @@ end # \Class for representing # {WebDAV method MKCOL}[http://www.webdav.org/specs/rfc4918.html#METHOD_MKCOL]: # -# require 'rubygems/net-http/lib/net/http' +# require 'rubygems/vendor/net-http/lib/net/http' # uri = Gem::URI('http://example.com') # hostname = uri.hostname # => "example.com" # req = Gem::Net::HTTP::Mkcol.new(uri) # => # @@ -334,7 +334,7 @@ end # \Class for representing # {WebDAV method COPY}[http://www.webdav.org/specs/rfc4918.html#METHOD_COPY]: # -# require 'rubygems/net-http/lib/net/http' +# require 'rubygems/vendor/net-http/lib/net/http' # uri = Gem::URI('http://example.com') # hostname = uri.hostname # => "example.com" # req = Gem::Net::HTTP::Copy.new(uri) # => # @@ -357,7 +357,7 @@ end # \Class for representing # {WebDAV method MOVE}[http://www.webdav.org/specs/rfc4918.html#METHOD_MOVE]: # -# require 'rubygems/net-http/lib/net/http' +# require 'rubygems/vendor/net-http/lib/net/http' # uri = Gem::URI('http://example.com') # hostname = uri.hostname # => "example.com" # req = Gem::Net::HTTP::Move.new(uri) # => # @@ -380,7 +380,7 @@ end # \Class for representing # {WebDAV method LOCK}[http://www.webdav.org/specs/rfc4918.html#METHOD_LOCK]: # -# require 'rubygems/net-http/lib/net/http' +# require 'rubygems/vendor/net-http/lib/net/http' # uri = Gem::URI('http://example.com') # hostname = uri.hostname # => "example.com" # req = Gem::Net::HTTP::Lock.new(uri) # => # @@ -403,7 +403,7 @@ end # \Class for representing # {WebDAV method UNLOCK}[http://www.webdav.org/specs/rfc4918.html#METHOD_UNLOCK]: # -# require 'rubygems/net-http/lib/net/http' +# require 'rubygems/vendor/net-http/lib/net/http' # uri = Gem::URI('http://example.com') # hostname = uri.hostname # => "example.com" # req = Gem::Net::HTTP::Unlock.new(uri) # => # diff --git a/lib/rubygems/net-http/lib/net/http/response.rb b/lib/rubygems/vendor/net-http/lib/net/http/response.rb similarity index 100% rename from lib/rubygems/net-http/lib/net/http/response.rb rename to lib/rubygems/vendor/net-http/lib/net/http/response.rb diff --git a/lib/rubygems/net-http/lib/net/http/responses.rb b/lib/rubygems/vendor/net-http/lib/net/http/responses.rb similarity index 100% rename from lib/rubygems/net-http/lib/net/http/responses.rb rename to lib/rubygems/vendor/net-http/lib/net/http/responses.rb diff --git a/lib/rubygems/net-http/lib/net/http/status.rb b/lib/rubygems/vendor/net-http/lib/net/http/status.rb similarity index 100% rename from lib/rubygems/net-http/lib/net/http/status.rb rename to lib/rubygems/vendor/net-http/lib/net/http/status.rb diff --git a/lib/rubygems/net-http/lib/net/https.rb b/lib/rubygems/vendor/net-http/lib/net/https.rb similarity index 88% rename from lib/rubygems/net-http/lib/net/https.rb rename to lib/rubygems/vendor/net-http/lib/net/https.rb index 401d64a87c..d2784f0be0 100644 --- a/lib/rubygems/net-http/lib/net/https.rb +++ b/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/net-http/lib/net/https' to use HTTPS. + require 'rubygems/vendor/net-http/lib/net/https' to use HTTPS. See Gem::Net::HTTP for details on how to make HTTPS connections.