rubygems-update 3.5.5 → 3.5.10

data/lib/rubygems/{resolver → vendor}/molinillo/lib/molinillo/dependency_graph/vertex.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module Gem::Resolver::Molinillo
+module Gem::Molinillo
   class DependencyGraph
     # A vertex in a {DependencyGraph} that encapsulates a {#name} and a
     # {#payload}

data/lib/rubygems/{resolver → vendor}/molinillo/lib/molinillo/dependency_graph.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require_relative '../../../../tsort'
+require_relative '../../../../vendored_tsort'
 
 require_relative 'dependency_graph/log'
 require_relative 'dependency_graph/vertex'
 
-module Gem::Resolver::Molinillo
+module Gem::Molinillo
   # A directed acyclic graph that is tuned to hold named dependencies
   class DependencyGraph
     include Enumerable

data/lib/rubygems/{resolver → vendor}/molinillo/lib/molinillo/errors.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module Gem::Resolver::Molinillo
+module Gem::Molinillo
   # An error that occurred during the resolution process
   class ResolverError < StandardError; end
 

data/lib/rubygems/vendor/molinillo/lib/molinillo/gem_metadata.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+module Gem::Molinillo
+  # The version of Gem::Molinillo.
+  VERSION = '0.8.0'.freeze
+end

data/lib/rubygems/{resolver → vendor}/molinillo/lib/molinillo/modules/specification_provider.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-module Gem::Resolver::Molinillo
+module Gem::Molinillo
   # Provides information about specifications and dependencies to the resolver,
   # allowing the {Resolver} class to remain generic while still providing power
   # and flexibility.
   #
-  # This module contains the methods that users of Gem::Resolver::Molinillo must to implement,
+  # This module contains the methods that users of Gem::Molinillo must to implement,
   # using knowledge of their own model classes.
   module SpecificationProvider
     # Search for the specifications that match the given dependency.

data/lib/rubygems/{resolver → vendor}/molinillo/lib/molinillo/modules/ui.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module Gem::Resolver::Molinillo
+module Gem::Molinillo
   # Conveys information about the resolution process to a user.
   module UI
     # The {IO} object that should be used to print output. `STDOUT`, by default.

data/lib/rubygems/{resolver → vendor}/molinillo/lib/molinillo/resolution.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module Gem::Resolver::Molinillo
+module Gem::Molinillo
   class Resolver
     # A specific resolution from a given {Resolver}
     class Resolution
@@ -244,8 +244,8 @@ module Gem::Resolver::Molinillo
       require_relative 'delegates/resolution_state'
       require_relative 'delegates/specification_provider'
 
-      include Gem::Resolver::Molinillo::Delegates::ResolutionState
-      include Gem::Resolver::Molinillo::Delegates::SpecificationProvider
+      include Gem::Molinillo::Delegates::ResolutionState
+      include Gem::Molinillo::Delegates::SpecificationProvider
 
       # Processes the topmost available {RequirementState} on the stack
       # @return [void]

data/lib/rubygems/{resolver → vendor}/molinillo/lib/molinillo/resolver.rb

@@ -2,7 +2,7 @@
 
 require_relative 'dependency_graph'
 
-module Gem::Resolver::Molinillo
+module Gem::Molinillo
   # This class encapsulates a dependency resolver.
   # The resolver is responsible for determining which set of dependencies to
   # activate, with feedback from the {#specification_provider}

data/lib/rubygems/{resolver → vendor}/molinillo/lib/molinillo/state.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module Gem::Resolver::Molinillo
+module Gem::Molinillo
   # A state that a {Resolution} can be in
   # @attr [String] name the name of the current requirement
   # @attr [Array<Object>] requirements currently unsatisfied requirements

data/lib/rubygems/{resolver → vendor}/molinillo/lib/molinillo.rb

@@ -6,6 +6,6 @@ require_relative 'molinillo/resolver'
 require_relative 'molinillo/modules/ui'
 require_relative 'molinillo/modules/specification_provider'
 
-# Gem::Resolver::Molinillo is a generic dependency resolution algorithm.
-module Gem::Resolver::Molinillo
+# Gem::Molinillo is a generic dependency resolution algorithm.
+module Gem::Molinillo
 end

data/lib/rubygems/{net-http → vendor/net-http}/lib/net/http/generic_request.rb

@@ -17,10 +17,10 @@ class Gem::Net::HTTPGenericRequest
     @request_has_body = reqbody
     @response_has_body = resbody
 
-    if URI === uri_or_path then
-      raise ArgumentError, "not an HTTP URI" unless URI::HTTP === uri_or_path
+    if Gem::URI === uri_or_path then
+      raise ArgumentError, "not an HTTP Gem::URI" unless Gem::URI::HTTP === uri_or_path
       hostname = uri_or_path.hostname
-      raise ArgumentError, "no host component for URI" unless (hostname && hostname.length > 0)
+      raise ArgumentError, "no host component for Gem::URI" unless (hostname && hostname.length > 0)
       @uri = uri_or_path.dup
       host = @uri.hostname.dup
       host << ":" << @uri.port.to_s if @uri.port != @uri.default_port
@@ -71,10 +71,10 @@ class Gem::Net::HTTPGenericRequest
   #
   attr_reader :path
 
-  # Returns the URI object for the request, or +nil+ if none:
+  # Returns the Gem::URI object for the request, or +nil+ if none:
   #
   #   Gem::Net::HTTP::Get.new(uri).uri
-  #   # => #<URI::HTTPS https://jsonplaceholder.typicode.com/>
+  #   # => #<Gem::URI::HTTPS https://jsonplaceholder.typicode.com/>
   #   Gem::Net::HTTP::Get.new('example.com').uri # => nil
   #
   attr_reader :uri
@@ -213,10 +213,10 @@ class Gem::Net::HTTPGenericRequest
 
     if ssl
       scheme = 'https'
-      klass = URI::HTTPS
+      klass = Gem::URI::HTTPS
     else
       scheme = 'http'
-      klass = URI::HTTP
+      klass = Gem::URI::HTTP
     end
 
     if host = self['host']
@@ -225,7 +225,7 @@ class Gem::Net::HTTPGenericRequest
     else
      host = addr
     end
-    # convert the class of the URI
+    # convert the class of the Gem::URI
     if @uri.is_a?(klass)
       @uri.host = host
       @uri.port = port
@@ -286,7 +286,7 @@ class Gem::Net::HTTPGenericRequest
   def send_request_with_body_data(sock, ver, path, params)
     if /\Amultipart\/form-data\z/i !~ self.content_type
       self.content_type = 'application/x-www-form-urlencoded'
-      return send_request_with_body(sock, ver, path, URI.encode_www_form(params))
+      return send_request_with_body(sock, ver, path, Gem::URI.encode_www_form(params))
     end
 
     opt = @form_option.dup

data/lib/rubygems/{net-http → vendor/net-http}/lib/net/http/header.rb

@@ -782,7 +782,7 @@ module Gem::Net::HTTPHeader
   # The resulting request is suitable for HTTP request +POST+ or +PUT+.
   #
   # Argument +params+ must be suitable for use as argument +enum+ to
-  # {URI.encode_www_form}[https://docs.ruby-lang.org/en/master/URI.html#method-c-encode_www_form].
+  # {Gem::URI.encode_www_form}[https://docs.ruby-lang.org/en/master/Gem::URI.html#method-c-encode_www_form].
   #
   # With only argument +params+ given,
   # sets the body to a URL-encoded string with the default separator <tt>'&'</tt>:
@@ -810,7 +810,7 @@ module Gem::Net::HTTPHeader
   #
   # Gem::Net::HTTPHeader#form_data= is an alias for Gem::Net::HTTPHeader#set_form_data.
   def set_form_data(params, sep = '&')
-    query = URI.encode_www_form(params)
+    query = Gem::URI.encode_www_form(params)
     query.gsub!(/&/, sep) if sep != '&'
     self.body = query
     self.content_type = 'application/x-www-form-urlencoded'

data/lib/rubygems/{net-http → vendor/net-http}/lib/net/http/request.rb

@@ -6,10 +6,10 @@
 #
 # == Creating a Request
 #
-# An request object may be created with either a URI or a string hostname:
+# An request object may be created with either a Gem::URI or a string hostname:
 #
-#   require 'rubygems/net-http/lib/net/http'
-#   uri = URI('https://jsonplaceholder.typicode.com/')
+#   require 'rubygems/vendor/net-http/lib/net/http'
+#   uri = Gem::URI('https://jsonplaceholder.typicode.com/')
 #   req = Gem::Net::HTTP::Get.new(uri)          # => #<Gem::Net::HTTP::Get GET>
 #   req = Gem::Net::HTTP::Get.new(uri.hostname) # => #<Gem::Net::HTTP::Get GET>
 #

data/lib/rubygems/{net-http → vendor/net-http}/lib/net/http/requests.rb

@@ -5,8 +5,8 @@
 # \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'
-#   uri = URI('http://example.com')
+#   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) # => #<Gem::Net::HTTP::Get GET>
 #   res = Gem::Net::HTTP.start(hostname) do |http|
@@ -37,8 +37,8 @@ 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'
-#   uri = URI('http://example.com')
+#   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) # => #<Gem::Net::HTTP::Head HEAD>
 #   res = Gem::Net::HTTP.start(hostname) do |http|
@@ -68,8 +68,8 @@ 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'
-#   uri = URI('http://example.com')
+#   require 'rubygems/vendor/net-http/lib/net/http'
+#   uri = Gem::URI('http://example.com')
 #   hostname = uri.hostname # => "example.com"
 #   uri.path = '/posts'
 #   req = Gem::Net::HTTP::Post.new(uri) # => #<Gem::Net::HTTP::Post POST>
@@ -103,8 +103,8 @@ 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'
-#   uri = URI('http://example.com')
+#   require 'rubygems/vendor/net-http/lib/net/http'
+#   uri = Gem::URI('http://example.com')
 #   hostname = uri.hostname # => "example.com"
 #   uri.path = '/posts'
 #   req = Gem::Net::HTTP::Put.new(uri) # => #<Gem::Net::HTTP::Put PUT>
@@ -133,8 +133,8 @@ 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'
-#   uri = URI('http://example.com')
+#   require 'rubygems/vendor/net-http/lib/net/http'
+#   uri = Gem::URI('http://example.com')
 #   hostname = uri.hostname # => "example.com"
 #   uri.path = '/posts/1'
 #   req = Gem::Net::HTTP::Delete.new(uri) # => #<Gem::Net::HTTP::Delete DELETE>
@@ -165,8 +165,8 @@ 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'
-#   uri = URI('http://example.com')
+#   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) # => #<Gem::Net::HTTP::Options OPTIONS>
 #   res = Gem::Net::HTTP.start(hostname) do |http|
@@ -196,8 +196,8 @@ 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'
-#   uri = URI('http://example.com')
+#   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) # => #<Gem::Net::HTTP::Trace TRACE>
 #   res = Gem::Net::HTTP.start(hostname) do |http|
@@ -227,8 +227,8 @@ 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'
-#   uri = URI('http://example.com')
+#   require 'rubygems/vendor/net-http/lib/net/http'
+#   uri = Gem::URI('http://example.com')
 #   hostname = uri.hostname # => "example.com"
 #   uri.path = '/posts'
 #   req = Gem::Net::HTTP::Patch.new(uri) # => #<Gem::Net::HTTP::Patch PATCH>
@@ -265,8 +265,8 @@ end
 # \Class for representing
 # {WebDAV method PROPFIND}[http://www.webdav.org/specs/rfc4918.html#METHOD_PROPFIND]:
 #
-#   require 'rubygems/net-http/lib/net/http'
-#   uri = URI('http://example.com')
+#   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) # => #<Gem::Net::HTTP::Propfind PROPFIND>
 #   res = Gem::Net::HTTP.start(hostname) do |http|
@@ -288,8 +288,8 @@ end
 # \Class for representing
 # {WebDAV method PROPPATCH}[http://www.webdav.org/specs/rfc4918.html#METHOD_PROPPATCH]:
 #
-#   require 'rubygems/net-http/lib/net/http'
-#   uri = URI('http://example.com')
+#   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) # => #<Gem::Net::HTTP::Proppatch PROPPATCH>
 #   res = Gem::Net::HTTP.start(hostname) do |http|
@@ -311,8 +311,8 @@ end
 # \Class for representing
 # {WebDAV method MKCOL}[http://www.webdav.org/specs/rfc4918.html#METHOD_MKCOL]:
 #
-#   require 'rubygems/net-http/lib/net/http'
-#   uri = URI('http://example.com')
+#   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) # => #<Gem::Net::HTTP::Mkcol MKCOL>
 #   res = Gem::Net::HTTP.start(hostname) do |http|
@@ -334,8 +334,8 @@ end
 # \Class for representing
 # {WebDAV method COPY}[http://www.webdav.org/specs/rfc4918.html#METHOD_COPY]:
 #
-#   require 'rubygems/net-http/lib/net/http'
-#   uri = URI('http://example.com')
+#   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) # => #<Gem::Net::HTTP::Copy COPY>
 #   res = Gem::Net::HTTP.start(hostname) do |http|
@@ -357,8 +357,8 @@ end
 # \Class for representing
 # {WebDAV method MOVE}[http://www.webdav.org/specs/rfc4918.html#METHOD_MOVE]:
 #
-#   require 'rubygems/net-http/lib/net/http'
-#   uri = URI('http://example.com')
+#   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) # => #<Gem::Net::HTTP::Move MOVE>
 #   res = Gem::Net::HTTP.start(hostname) do |http|
@@ -380,8 +380,8 @@ end
 # \Class for representing
 # {WebDAV method LOCK}[http://www.webdav.org/specs/rfc4918.html#METHOD_LOCK]:
 #
-#   require 'rubygems/net-http/lib/net/http'
-#   uri = URI('http://example.com')
+#   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) # => #<Gem::Net::HTTP::Lock LOCK>
 #   res = Gem::Net::HTTP.start(hostname) do |http|
@@ -403,8 +403,8 @@ end
 # \Class for representing
 # {WebDAV method UNLOCK}[http://www.webdav.org/specs/rfc4918.html#METHOD_UNLOCK]:
 #
-#   require 'rubygems/net-http/lib/net/http'
-#   uri = URI('http://example.com')
+#   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) # => #<Gem::Net::HTTP::Unlock UNLOCK>
 #   res = Gem::Net::HTTP.start(hostname) do |http|

data/lib/rubygems/{net-http → vendor/net-http}/lib/net/http/response.rb

@@ -216,8 +216,8 @@ class Gem::Net::HTTPResponse
   attr_reader :message
   alias msg message   # :nodoc: obsolete
 
-  # The URI used to fetch this response.  The response URI is only available
-  # if a URI was used to create the request.
+  # The Gem::URI used to fetch this response.  The response Gem::URI is only available
+  # if a Gem::URI was used to create the request.
   attr_reader :uri
 
   # Set to true automatically when the request did not contain an

data/lib/rubygems/{net-http → vendor/net-http}/lib/net/http/responses.rb

@@ -379,7 +379,7 @@ module Gem::Net
 
   # Response class for <tt>See Other</tt> responses (status code 303).
   #
-  # The response to the request can be found under another URI using the GET method.
+  # The response to the request can be found under another Gem::URI using the GET method.
   #
   # :include: doc/net-http/included_getters.rdoc
   #
@@ -428,8 +428,8 @@ module Gem::Net
 
   # Response class for <tt>Temporary Redirect</tt> responses (status code 307).
   #
-  # The request should be repeated with another URI;
-  # however, future requests should still use the original URI.
+  # The request should be repeated with another Gem::URI;
+  # however, future requests should still use the original Gem::URI.
   #
   # :include: doc/net-http/included_getters.rdoc
   #
@@ -445,7 +445,7 @@ module Gem::Net
 
   # Response class for <tt>Permanent Redirect</tt> responses (status code 308).
   #
-  # This and all future requests should be directed to the given URI.
+  # This and all future requests should be directed to the given Gem::URI.
   #
   # :include: doc/net-http/included_getters.rdoc
   #
@@ -690,9 +690,9 @@ module Gem::Net
   end
   HTTPRequestEntityTooLarge = HTTPPayloadTooLarge
 
-  # Response class for <tt>URI Too Long</tt> responses (status code 414).
+  # Response class for <tt>Gem::URI Too Long</tt> responses (status code 414).
   #
-  # The URI provided was too long for the server to process.
+  # The Gem::URI provided was too long for the server to process.
   #
   # :include: doc/net-http/included_getters.rdoc
   #

data/lib/rubygems/{net-http → vendor/net-http}/lib/net/http/status.rb

@@ -11,7 +11,7 @@ if $0 == __FILE__
   puts
   puts "Gem::Net::HTTP::STATUS_CODES = {"
   url = "https://www.iana.org/assignments/http-status-codes/http-status-codes-1.csv"
-  URI(url).read.each_line do |line|
+  Gem::URI(url).read.each_line do |line|
     code, mes, = line.split(',')
     next if ['(Unused)', 'Unassigned', 'Description'].include?(mes)
     puts "  #{code} => '#{mes}',"

data/lib/rubygems/{net-http → vendor/net-http}/lib/net/http.rb

@@ -21,7 +21,7 @@
 #
 
 require_relative '../../../net-protocol/lib/net/protocol'
-require 'uri'
+require_relative '../../../uri/lib/uri'
 require_relative '../../../resolv/lib/resolv'
 autoload :OpenSSL, 'openssl'
 
@@ -106,20 +106,20 @@ module Gem::Net   #:nodoc:
   # It consists of some or all of: scheme, hostname, path, query, and fragment;
   # see {URI syntax}[https://en.wikipedia.org/wiki/Uniform_Resource_Identifier#Syntax].
   #
-  # A Ruby {URI::Generic}[https://docs.ruby-lang.org/en/master/URI/Generic.html] object
+  # A Ruby {Gem::URI::Generic}[https://docs.ruby-lang.org/en/master/Gem/URI/Generic.html] object
   # represents an internet URI.
   # It provides, among others, methods
   # +scheme+, +hostname+, +path+, +query+, and +fragment+.
   #
   # === Schemes
   #
-  # An internet \URI has
+  # An internet \Gem::URI has
   # a {scheme}[https://en.wikipedia.org/wiki/List_of_URI_schemes].
   #
   # The two schemes supported in \Gem::Net::HTTP are <tt>'https'</tt> and <tt>'http'</tt>:
   #
   #   uri.scheme                       # => "https"
-  #   URI('http://example.com').scheme # => "http"
+  #   Gem::URI('http://example.com').scheme # => "http"
   #
   # === Hostnames
   #
@@ -146,8 +146,8 @@ module Gem::Net   #:nodoc:
   #
   #   _uri = uri.dup
   #   params = {userId: 1, completed: false}
-  #   _uri.query = URI.encode_www_form(params)
-  #   _uri # => #<URI::HTTPS https://jsonplaceholder.typicode.com?userId=1&completed=false>
+  #   _uri.query = Gem::URI.encode_www_form(params)
+  #   _uri # => #<Gem::URI::HTTPS https://jsonplaceholder.typicode.com?userId=1&completed=false>
   #   Gem::Net::HTTP.get(_uri)
   #
   # === Fragments
@@ -273,7 +273,7 @@ module Gem::Net   #:nodoc:
   #     # You should choose a better exception.
   #     raise ArgumentError, 'Too many HTTP redirects' if limit == 0
   #
-  #     res = Gem::Net::HTTP.get_response(URI(uri))
+  #     res = Gem::Net::HTTP.get_response(Gem::URI(uri))
   #     case res
   #     when Gem::Net::HTTPSuccess     # Any success class.
   #       res
@@ -327,9 +327,9 @@ module Gem::Net   #:nodoc:
   #
   # Or if you simply want to make a GET request, you may pass in a URI
   # object that has an \HTTPS URL. \Gem::Net::HTTP automatically turns on TLS
-  # verification if the URI object has a 'https' URI scheme:
+  # verification if the URI object has a 'https' :URI scheme:
   #
-  #   uri # => #<URI::HTTPS https://jsonplaceholder.typicode.com/>
+  #   uri # => #<Gem::URI::HTTPS https://jsonplaceholder.typicode.com/>
   #   Gem::Net::HTTP.get(uri)
   #
   # == Proxy Server
@@ -371,9 +371,9 @@ module Gem::Net   #:nodoc:
   # === Proxy Using '<tt>ENV['http_proxy']</tt>'
   #
   # When environment variable <tt>'http_proxy'</tt>
-  # is set to a \URI string,
+  # is set to a \Gem::URI string,
   # the returned +http+ will have the server at that URI as its proxy;
-  # note that the \URI string must have a protocol
+  # note that the \Gem::URI string must have a protocol
   # such as <tt>'http'</tt> or <tt>'https'</tt>:
   #
   #   ENV['http_proxy'] = 'http://example.com'
@@ -386,7 +386,7 @@ module Gem::Net   #:nodoc:
   #   http.proxy_user      # => nil
   #   http.proxy_pass      # => nil
   #
-  # The \URI string may include proxy username, password, and port number:
+  # The \Gem::URI string may include proxy username, password, and port number:
   #
   #   ENV['http_proxy'] = 'http://pname:ppass@example.com:8000'
   #   http = Gem::Net::HTTP.new(hostname)
@@ -790,7 +790,7 @@ module Gem::Net   #:nodoc:
     #
     # With URI object +uri+ and optional hash argument +headers+:
     #
-    #   uri = URI('https://jsonplaceholder.typicode.com/todos/1')
+    #   uri = Gem::URI('https://jsonplaceholder.typicode.com/todos/1')
     #   headers = {'Content-type' => 'application/json; charset=UTF-8'}
     #   Gem::Net::HTTP.get(uri, headers)
     #
@@ -1074,7 +1074,7 @@ module Gem::Net   #:nodoc:
       elsif p_addr == :ENV then
         http.proxy_from_env = true
       else
-        if p_addr && p_no_proxy && !URI::Generic.use_proxy?(address, address, port, p_no_proxy)
+        if p_addr && p_no_proxy && !Gem::URI::Generic.use_proxy?(address, address, port, p_no_proxy)
           p_addr = nil
           p_port = nil
         end
@@ -1796,7 +1796,7 @@ module Gem::Net   #:nodoc:
     # The proxy URI determined from the environment for this connection.
     def proxy_uri # :nodoc:
       return if @proxy_uri == false
-      @proxy_uri ||= URI::HTTP.new(
+      @proxy_uri ||= Gem::URI::HTTP.new(
         "http", nil, address, port, nil, nil, nil, nil, nil
       ).find_proxy || false
       @proxy_uri || nil

data/lib/rubygems/{net-http → 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.
 

data/lib/rubygems/vendor/optparse/lib/optparse/uri.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: false
+# -*- ruby -*-
+
+require_relative '../optparse'
+require_relative '../../../uri/lib/uri'
+
+Gem::OptionParser.accept(Gem::URI) {|s,| Gem::URI.parse(s) if s}

data/lib/rubygems/{optparse → vendor/optparse}/lib/optparse.rb

@@ -73,7 +73,7 @@
 #
 # === Minimal example
 #
-#   require 'rubygems/optparse/lib/optparse'
+#   require 'rubygems/vendor/optparse/lib/optparse'
 #
 #   options = {}
 #   Gem::OptionParser.new do |parser|
@@ -92,7 +92,7 @@
 # Gem::OptionParser can be used to automatically generate help for the commands you
 # write:
 #
-#   require 'rubygems/optparse/lib/optparse'
+#   require 'rubygems/vendor/optparse/lib/optparse'
 #
 #   Options = Struct.new(:name)
 #
@@ -130,7 +130,7 @@
 # option name in all caps. If an option is used without the required argument,
 # an exception will be raised.
 #
-#   require 'rubygems/optparse/lib/optparse'
+#   require 'rubygems/vendor/optparse/lib/optparse'
 #
 #   options = {}
 #   Gem::OptionParser.new do |parser|
@@ -158,7 +158,7 @@
 # - Date  -- Anything accepted by +Date.parse+ (need to require +optparse/date+)
 # - DateTime -- Anything accepted by +DateTime.parse+ (need to require +optparse/date+)
 # - Time -- Anything accepted by +Time.httpdate+ or +Time.parse+ (need to require +optparse/time+)
-# - URI  -- Anything accepted by +URI.parse+ (need to require +optparse/uri+)
+# - URI  -- Anything accepted by +Gem::URI.parse+ (need to require +optparse/uri+)
 # - Shellwords -- Anything accepted by +Shellwords.shellwords+ (need to require +optparse/shellwords+)
 # - String -- Any non-empty string
 # - Integer -- Any integer. Will convert octal. (e.g. 124, -3, 040)
@@ -183,8 +183,8 @@
 # as a +Time+. If it succeeds, that time will be passed to the
 # handler block. Otherwise, an exception will be raised.
 #
-#   require 'rubygems/optparse/lib/optparse'
-#   require 'rubygems/optparse/lib/optparse/time'
+#   require 'rubygems/vendor/optparse/lib/optparse'
+#   require 'rubygems/vendor/optparse/lib/optparse/time'
 #   Gem::OptionParser.new do |parser|
 #     parser.on("-t", "--time [TIME]", Time, "Begin execution at given time") do |time|
 #       p time
@@ -206,7 +206,7 @@
 # It specifies which conversion block to call whenever a class is specified.
 # The example below uses it to fetch a +User+ object before the +on+ handler receives it.
 #
-#   require 'rubygems/optparse/lib/optparse'
+#   require 'rubygems/vendor/optparse/lib/optparse'
 #
 #   User = Struct.new(:id, :name)
 #
@@ -242,7 +242,7 @@
 #
 # The +into+ option of +order+, +parse+ and so on methods stores command line options into a Hash.
 #
-#   require 'rubygems/optparse/lib/optparse'
+#   require 'rubygems/vendor/optparse/lib/optparse'
 #
 #   options = {}
 #   Gem::OptionParser.new do |parser|
@@ -268,8 +268,8 @@
 # effect of specifying various options.  This is probably the best way to learn
 # the features of +optparse+.
 #
-#   require 'rubygems/optparse/lib/optparse'
-#   require 'rubygems/optparse/lib/optparse/time'
+#   require 'rubygems/vendor/optparse/lib/optparse'
+#   require 'rubygems/vendor/optparse/lib/optparse/time'
 #   require 'ostruct'
 #   require 'pp'
 #
@@ -1084,7 +1084,7 @@ XXX
     Switch::OptionalArgument.new do |pkg|
       if pkg
         begin
-          require 'rubygems/optparse/lib/optparse/version'
+          require 'rubygems/vendor/optparse/lib/optparse/version'
         rescue LoadError
         else
           show_version(*pkg.split(/,/)) or

data/lib/rubygems/{timeout → vendor/timeout}/lib/timeout.rb

@@ -3,7 +3,7 @@
 #
 # == Synopsis
 #
-#   require 'rubygems/timeout/lib/timeout'
+#   require 'rubygems/vendor/timeout/lib/timeout'
 #   status = Gem::Timeout::timeout(5) {
 #     # Something that should be interrupted if it takes more than 5 seconds...
 #   }