rubygems-update 3.5.5 → 3.5.6

data/lib/rubygems/specification_policy.rb

@@ -427,13 +427,13 @@ or set it to nil if you don't want to specify a license.
 
     # Make sure a homepage is valid HTTP/HTTPS URI
     if homepage && !homepage.empty?
-      require "uri"
+      require_relative "vendor/uri/lib/uri"
       begin
-        homepage_uri = URI.parse(homepage)
-        unless [URI::HTTP, URI::HTTPS].member? homepage_uri.class
+        homepage_uri = Gem::URI.parse(homepage)
+        unless [Gem::URI::HTTP, Gem::URI::HTTPS].member? homepage_uri.class
           error "\"#{homepage}\" is not a valid HTTP URI"
         end
-      rescue URI::InvalidURIError
+      rescue Gem::URI::InvalidURIError
         error "\"#{homepage}\" is not a valid HTTP URI"
       end
     end
@@ -497,10 +497,10 @@ You have specified rust based extension, but Cargo.lock is not part of the gem f
 
   def validate_rake_extensions(builder) # :nodoc:
     rake_extension = @specification.extensions.any? {|s| builder.builder_for(s) == Gem::Ext::RakeBuilder }
-    rake_dependency = @specification.dependencies.any? {|d| d.name == "rake" }
+    rake_dependency = @specification.dependencies.any? {|d| d.name == "rake" && d.type == :runtime }
 
     warning <<-WARNING if rake_extension && !rake_dependency
-You have specified rake based extension, but rake is not added as dependency. It is recommended to add rake as a dependency in gemspec since there's no guarantee rake will be already installed.
+You have specified rake based extension, but rake is not added as runtime dependency. It is recommended to add rake as a runtime dependency in gemspec since there's no guarantee rake will be already installed.
     WARNING
   end
 

data/lib/rubygems/timeout.rb

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-require_relative "timeout/lib/timeout"
+require_relative "vendor/timeout/lib/timeout"

data/lib/rubygems/tsort.rb

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-require_relative "tsort/lib/tsort"
+require_relative "vendor/tsort/lib/tsort"

data/lib/rubygems/uri.rb

@@ -16,9 +16,9 @@ class Gem::Uri
   # Parses uri, raising if it's invalid
 
   def self.parse!(uri)
-    require "uri"
+    require_relative "vendor/uri/lib/uri"
 
-    raise URI::InvalidURIError unless uri
+    raise Gem::URI::InvalidURIError unless uri
 
     return uri unless uri.is_a?(String)
 
@@ -28,9 +28,9 @@ class Gem::Uri
     # as "%7BDESede%7D". If this is escaped again the percentage
     # symbols will be escaped.
     begin
-      URI.parse(uri)
-    rescue URI::InvalidURIError
-      URI.parse(URI::DEFAULT_PARSER.escape(uri))
+      Gem::URI.parse(uri)
+    rescue Gem::URI::InvalidURIError
+      Gem::URI.parse(Gem::URI::DEFAULT_PARSER.escape(uri))
     end
   end
 
@@ -39,7 +39,7 @@ class Gem::Uri
 
   def self.parse(uri)
     parse!(uri)
-  rescue URI::InvalidURIError
+  rescue Gem::URI::InvalidURIError
     uri
   end
 

data/lib/rubygems/util.rb

@@ -105,7 +105,7 @@ module Gem::Util
   end
 
   ##
-  # Corrects +path+ (usually returned by `URI.parse().path` on Windows), that
+  # Corrects +path+ (usually returned by `Gem::URI.parse().path` on Windows), that
   # comes with a leading slash.
 
   def self.correct_for_windows_path(path)

data/lib/rubygems/vendor/molinillo/lib/molinillo/delegates/resolution_state.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+module Gem::Molinillo
+  # @!visibility private
+  module Delegates
+    # Delegates all {Gem::Molinillo::ResolutionState} methods to a `#state` property.
+    module ResolutionState
+      # (see Gem::Molinillo::ResolutionState#name)
+      def name
+        current_state = state || Gem::Molinillo::ResolutionState.empty
+        current_state.name
+      end
+
+      # (see Gem::Molinillo::ResolutionState#requirements)
+      def requirements
+        current_state = state || Gem::Molinillo::ResolutionState.empty
+        current_state.requirements
+      end
+
+      # (see Gem::Molinillo::ResolutionState#activated)
+      def activated
+        current_state = state || Gem::Molinillo::ResolutionState.empty
+        current_state.activated
+      end
+
+      # (see Gem::Molinillo::ResolutionState#requirement)
+      def requirement
+        current_state = state || Gem::Molinillo::ResolutionState.empty
+        current_state.requirement
+      end
+
+      # (see Gem::Molinillo::ResolutionState#possibilities)
+      def possibilities
+        current_state = state || Gem::Molinillo::ResolutionState.empty
+        current_state.possibilities
+      end
+
+      # (see Gem::Molinillo::ResolutionState#depth)
+      def depth
+        current_state = state || Gem::Molinillo::ResolutionState.empty
+        current_state.depth
+      end
+
+      # (see Gem::Molinillo::ResolutionState#conflicts)
+      def conflicts
+        current_state = state || Gem::Molinillo::ResolutionState.empty
+        current_state.conflicts
+      end
+
+      # (see Gem::Molinillo::ResolutionState#unused_unwind_options)
+      def unused_unwind_options
+        current_state = state || Gem::Molinillo::ResolutionState.empty
+        current_state.unused_unwind_options
+      end
+    end
+  end
+end

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

@@ -1,67 +1,67 @@
 # frozen_string_literal: true
 
-module Gem::Resolver::Molinillo
+module Gem::Molinillo
   module Delegates
-    # Delegates all {Gem::Resolver::Molinillo::SpecificationProvider} methods to a
+    # Delegates all {Gem::Molinillo::SpecificationProvider} methods to a
     # `#specification_provider` property.
     module SpecificationProvider
-      # (see Gem::Resolver::Molinillo::SpecificationProvider#search_for)
+      # (see Gem::Molinillo::SpecificationProvider#search_for)
       def search_for(dependency)
         with_no_such_dependency_error_handling do
           specification_provider.search_for(dependency)
         end
       end
 
-      # (see Gem::Resolver::Molinillo::SpecificationProvider#dependencies_for)
+      # (see Gem::Molinillo::SpecificationProvider#dependencies_for)
       def dependencies_for(specification)
         with_no_such_dependency_error_handling do
           specification_provider.dependencies_for(specification)
         end
       end
 
-      # (see Gem::Resolver::Molinillo::SpecificationProvider#requirement_satisfied_by?)
+      # (see Gem::Molinillo::SpecificationProvider#requirement_satisfied_by?)
       def requirement_satisfied_by?(requirement, activated, spec)
         with_no_such_dependency_error_handling do
           specification_provider.requirement_satisfied_by?(requirement, activated, spec)
         end
       end
 
-      # (see Gem::Resolver::Molinillo::SpecificationProvider#dependencies_equal?)
+      # (see Gem::Molinillo::SpecificationProvider#dependencies_equal?)
       def dependencies_equal?(dependencies, other_dependencies)
         with_no_such_dependency_error_handling do
           specification_provider.dependencies_equal?(dependencies, other_dependencies)
         end
       end
 
-      # (see Gem::Resolver::Molinillo::SpecificationProvider#name_for)
+      # (see Gem::Molinillo::SpecificationProvider#name_for)
       def name_for(dependency)
         with_no_such_dependency_error_handling do
           specification_provider.name_for(dependency)
         end
       end
 
-      # (see Gem::Resolver::Molinillo::SpecificationProvider#name_for_explicit_dependency_source)
+      # (see Gem::Molinillo::SpecificationProvider#name_for_explicit_dependency_source)
       def name_for_explicit_dependency_source
         with_no_such_dependency_error_handling do
           specification_provider.name_for_explicit_dependency_source
         end
       end
 
-      # (see Gem::Resolver::Molinillo::SpecificationProvider#name_for_locking_dependency_source)
+      # (see Gem::Molinillo::SpecificationProvider#name_for_locking_dependency_source)
       def name_for_locking_dependency_source
         with_no_such_dependency_error_handling do
           specification_provider.name_for_locking_dependency_source
         end
       end
 
-      # (see Gem::Resolver::Molinillo::SpecificationProvider#sort_dependencies)
+      # (see Gem::Molinillo::SpecificationProvider#sort_dependencies)
       def sort_dependencies(dependencies, activated, conflicts)
         with_no_such_dependency_error_handling do
           specification_provider.sort_dependencies(dependencies, activated, conflicts)
         end
       end
 
-      # (see Gem::Resolver::Molinillo::SpecificationProvider#allow_missing?)
+      # (see Gem::Molinillo::SpecificationProvider#allow_missing?)
       def allow_missing?(dependency)
         with_no_such_dependency_error_handling do
           specification_provider.allow_missing?(dependency)

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module Gem::Resolver::Molinillo
+module Gem::Molinillo
   class DependencyGraph
     # An action that modifies a {DependencyGraph} that is reversible.
     # @abstract

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require_relative 'action'
-module Gem::Resolver::Molinillo
+module Gem::Molinillo
   class DependencyGraph
     # @!visibility private
     # (see DependencyGraph#add_edge_no_circular)

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require_relative 'action'
-module Gem::Resolver::Molinillo
+module Gem::Molinillo
   class DependencyGraph
     # @!visibility private
     # (see DependencyGraph#add_vertex)

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require_relative 'action'
-module Gem::Resolver::Molinillo
+module Gem::Molinillo
   class DependencyGraph
     # @!visibility private
     # (see DependencyGraph#delete_edge)

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require_relative 'action'
-module Gem::Resolver::Molinillo
+module Gem::Molinillo
   class DependencyGraph
     # @!visibility private
     # @see DependencyGraph#detach_vertex_named

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

@@ -7,7 +7,7 @@ require_relative 'detach_vertex_named'
 require_relative 'set_payload'
 require_relative 'tag'
 
-module Gem::Resolver::Molinillo
+module Gem::Molinillo
   class DependencyGraph
     # A log for dependency graph actions
     class Log

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require_relative 'action'
-module Gem::Resolver::Molinillo
+module Gem::Molinillo
   class DependencyGraph
     # @!visibility private
     # @see DependencyGraph#set_payload

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require_relative 'action'
-module Gem::Resolver::Molinillo
+module Gem::Molinillo
   class DependencyGraph
     # @!visibility private
     # @see DependencyGraph#tag

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

@@ -5,7 +5,7 @@ require_relative '../../../../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>
 #