rubygems-update 3.5.4 → 3.5.6

data/lib/rubygems/request.rb

@@ -18,11 +18,11 @@ class Gem::Request
   end
 
   def self.proxy_uri(proxy) # :nodoc:
-    require "uri"
+    require_relative "vendor/uri/lib/uri"
     case proxy
     when :no_proxy then nil
-    when URI::HTTP then proxy
-    else URI.parse(proxy)
+    when Gem::URI::HTTP then proxy
+    else Gem::URI.parse(proxy)
     end
   end
 
@@ -176,7 +176,7 @@ class Gem::Request
     end
 
     require "uri"
-    uri = URI(Gem::UriFormatter.new(env_proxy).normalize)
+    uri = Gem::URI(Gem::UriFormatter.new(env_proxy).normalize)
 
     if uri && uri.user.nil? && uri.password.nil?
       user     = ENV["#{downcase_scheme}_proxy_user"] || ENV["#{upcase_scheme}_PROXY_USER"]

data/lib/rubygems/requirement.rb

@@ -284,6 +284,11 @@ class Gem::Requirement
   def _tilde_requirements
     @_tilde_requirements ||= _sorted_requirements.select {|r| r.first == "~>" }
   end
+
+  def initialize_copy(other) # :nodoc:
+    @requirements = other.requirements.dup
+    super
+  end
 end
 
 class Gem::Version

data/lib/rubygems/resolver/api_set.rb

@@ -30,7 +30,7 @@ class Gem::Resolver::APISet < Gem::Resolver::Set
   def initialize(dep_uri = "https://index.rubygems.org/info/")
     super()
 
-    dep_uri = URI dep_uri unless URI === dep_uri
+    dep_uri = Gem::URI dep_uri unless Gem::URI === dep_uri
 
     @dep_uri = dep_uri
     @uri     = dep_uri + ".."

data/lib/rubygems/resolver/best_set.rb

@@ -60,7 +60,7 @@ class Gem::Resolver::BestSet < Gem::Resolver::ComposedSet
 
   def replace_failed_api_set(error) # :nodoc:
     uri = error.original_uri
-    uri = URI uri unless URI === uri
+    uri = Gem::URI uri unless Gem::URI === uri
     uri += "."
 
     raise error unless api_set = @sets.find do |set|

data/lib/rubygems/resolver.rb

@@ -11,7 +11,7 @@ require_relative "util/list"
 # all the requirements.
 
 class Gem::Resolver
-  require_relative "resolver/molinillo"
+  require_relative "vendored_molinillo"
 
   ##
   # If the DEBUG_RESOLVER environment variable is set then debugging mode is
@@ -167,7 +167,7 @@ class Gem::Resolver
     reqs
   end
 
-  include Molinillo::UI
+  include Gem::Molinillo::UI
 
   def output
     @output ||= debug? ? $stdout : File.open(IO::NULL, "w")
@@ -177,14 +177,14 @@ class Gem::Resolver
     DEBUG_RESOLVER
   end
 
-  include Molinillo::SpecificationProvider
+  include Gem::Molinillo::SpecificationProvider
 
   ##
   # Proceed with resolution! Returns an array of ActivationRequest objects.
 
   def resolve
-    Molinillo::Resolver.new(self, self).resolve(@needed.map {|d| DependencyRequest.new d, nil }).tsort.map(&:payload).compact
-  rescue Molinillo::VersionConflict => e
+    Gem::Molinillo::Resolver.new(self, self).resolve(@needed.map {|d| DependencyRequest.new d, nil }).tsort.map(&:payload).compact
+  rescue Gem::Molinillo::VersionConflict => e
     conflict = e.conflicts.values.first
     raise Gem::DependencyResolutionError, Conflict.new(conflict.requirement_trees.first.first, conflict.existing, conflict.requirement)
   ensure

data/lib/rubygems/s3_uri_signer.rb

@@ -49,7 +49,7 @@ class Gem::S3URISigner
     string_to_sign = generate_string_to_sign(date_time, credential_info, canonical_request)
     signature = generate_signature(s3_config, date, string_to_sign)
 
-    URI.parse("https://#{canonical_host}#{uri.path}?#{query_params}&X-Amz-Signature=#{signature}")
+    Gem::URI.parse("https://#{canonical_host}#{uri.path}?#{query_params}&X-Amz-Signature=#{signature}")
   end
 
   private
@@ -152,7 +152,7 @@ class Gem::S3URISigner
   end
 
   def ec2_metadata_request(url)
-    uri = URI(url)
+    uri = Gem::URI(url)
     @request_pool ||= create_request_pool(uri)
     request = Gem::Request.new(uri, Gem::Net::HTTP::Get, nil, @request_pool)
     response = request.fetch

data/lib/rubygems/source/git.rb

@@ -221,14 +221,14 @@ class Gem::Source::Git < Gem::Source
   end
 
   ##
-  # A hash for the git gem based on the git repository URI.
+  # A hash for the git gem based on the git repository Gem::URI.
 
   def uri_hash # :nodoc:
     require_relative "../openssl"
 
     normalized =
       if @repository.match?(%r{^\w+://(\w+@)?})
-        uri = URI(@repository).normalize.to_s.sub %r{/$},""
+        uri = Gem::URI(@repository).normalize.to_s.sub %r{/$},""
         uri.sub(/\A(\w+)/) { $1.downcase }
       else
         @repository

data/lib/rubygems/source_list.rb

@@ -44,7 +44,7 @@ class Gem::SourceList
   end
 
   ##
-  # Appends +obj+ to the source list which may be a Gem::Source, URI or URI
+  # Appends +obj+ to the source list which may be a Gem::Source, Gem::URI or URI
   # String.
 
   def <<(obj)

data/lib/rubygems/specification.rb

@@ -301,7 +301,7 @@ class Gem::Specification < Gem::BasicSpecification
   #
   # Usage:
   #
-  #   spec.description = <<-EOF
+  #   spec.description = <<~EOF
   #     Rake is a Make-like program implemented in Ruby. Tasks and
   #     dependencies are specified in standard Ruby syntax.
   #   EOF
@@ -1003,8 +1003,6 @@ class Gem::Specification < Gem::BasicSpecification
   def self.find_all_by_name(name, *requirements)
     requirements = Gem::Requirement.default if requirements.empty?
 
-    # TODO: maybe try: find_all { |s| spec === dep }
-
     Gem::Dependency.new(name, *requirements).matching_specs
   end
 
@@ -1022,8 +1020,6 @@ class Gem::Specification < Gem::BasicSpecification
   def self.find_by_name(name, *requirements)
     requirements = Gem::Requirement.default if requirements.empty?
 
-    # TODO: maybe try: find { |s| spec === dep }
-
     Gem::Dependency.new(name, *requirements).to_spec
   end
 
@@ -2079,7 +2075,8 @@ class Gem::Specification < Gem::BasicSpecification
   end
 
   ##
-  # Duplicates array_attributes from +other_spec+ so state isn't shared.
+  # Duplicates Array and Gem::Requirement attributes from +other_spec+ so state isn't shared.
+  #
 
   def initialize_copy(other_spec)
     self.class.array_attributes.each do |name|
@@ -2101,6 +2098,9 @@ class Gem::Specification < Gem::BasicSpecification
         raise e
       end
     end
+
+    @required_ruby_version = other_spec.required_ruby_version.dup
+    @required_rubygems_version = other_spec.required_rubygems_version.dup
   end
 
   def base_dir

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