rubygems-update 3.4.10 → 3.5.22

data/lib/rubygems/requirement.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "version"
 
 ##
@@ -9,11 +10,11 @@ require_relative "version"
 # together in RubyGems.
 
 class Gem::Requirement
-  OPS = { #:nodoc:
+  OPS = { # :nodoc:
     "=" => lambda {|v, r| v == r },
     "!=" => lambda {|v, r| v != r },
-    ">" => lambda {|v, r| v >  r },
-    "<" => lambda {|v, r| v <  r },
+    ">" => lambda {|v, r| v > r },
+    "<" => lambda {|v, r| v < r },
     ">=" => lambda {|v, r| v >= r },
     "<=" => lambda {|v, r| v <= r },
     "~>" => lambda {|v, r| v >= r && v.release < r.bump },
@@ -22,12 +23,12 @@ class Gem::Requirement
   SOURCE_SET_REQUIREMENT = Struct.new(:for_lockfile).new "!" # :nodoc:
 
   quoted = OPS.keys.map {|k| Regexp.quote k }.join "|"
-  PATTERN_RAW = "\\s*(#{quoted})?\\s*(#{Gem::Version::VERSION_PATTERN})\\s*" # :nodoc:
+  PATTERN_RAW = "\\s*(#{quoted})?\\s*(#{Gem::Version::VERSION_PATTERN})\\s*".freeze # :nodoc:
 
   ##
   # A regular expression that matches a requirement
 
-  PATTERN = /\A#{PATTERN_RAW}\z/.freeze
+  PATTERN = /\A#{PATTERN_RAW}\z/
 
   ##
   # The default requirement matches any non-prerelease version
@@ -119,7 +120,7 @@ class Gem::Requirement
   # An array of requirement pairs. The first element of the pair is
   # the op, and the second is the Gem::Version.
 
-  attr_reader :requirements #:nodoc:
+  attr_reader :requirements # :nodoc:
 
   ##
   # Constructs a requirement from +requirements+. Requirements can be
@@ -155,7 +156,7 @@ class Gem::Requirement
   # Formats this requirement for use in a Gem::RequestSet::Lockfile.
 
   def for_lockfile # :nodoc:
-    return if [DefaultRequirement] == @requirements
+    return if @requirements == [DefaultRequirement]
 
     list = requirements.sort_by do |_, version|
       version
@@ -163,7 +164,7 @@ class Gem::Requirement
       "#{op} #{version}"
     end.uniq
 
-    " (#{list.join ', '})"
+    " (#{list.join ", "})"
   end
 
   ##
@@ -244,8 +245,8 @@ class Gem::Requirement
     requirements.all? {|op, rv| OPS[op].call version, rv }
   end
 
-  alias :=== :satisfied_by?
-  alias :=~ :satisfied_by?
+  alias_method :===, :satisfied_by?
+  alias_method :=~, :satisfied_by?
 
   ##
   # True if the requirement will not always match the latest version.
@@ -283,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/activation_request.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 ##
 # Specifies a Specification object that should be activated.  Also contains a
 # dependency that was used to introduce this activation.
@@ -58,10 +59,8 @@ class Gem::Resolver::ActivationRequest
     if @spec.respond_to? :sources
       exception = nil
       path = @spec.sources.find do |source|
-        begin
-          source.download full_spec, path
-        rescue exception
-        end
+        source.download full_spec, path
+      rescue exception
       end
       return path      if path
       raise  exception if exception
@@ -93,9 +92,7 @@ class Gem::Resolver::ActivationRequest
   end
 
   def inspect # :nodoc:
-    "#<%s for %p from %s>" % [
-      self.class, @spec, @request
-    ]
+    format("#<%s for %p from %s>", self.class, @spec, @request)
   end
 
   ##
@@ -109,7 +106,7 @@ class Gem::Resolver::ActivationRequest
       this_spec = full_spec
 
       Gem::Specification.any? do |s|
-        s == this_spec
+        s == this_spec && s.base_dir == this_spec.base_dir
       end
     end
   end

data/lib/rubygems/resolver/api_set/gem_parser.rb

@@ -1,12 +1,15 @@
 # frozen_string_literal: true
 
 class Gem::Resolver::APISet::GemParser
+  EMPTY_ARRAY = [].freeze
+  private_constant :EMPTY_ARRAY
+
   def parse(line)
     version_and_platform, rest = line.split(" ", 2)
     version, platform = version_and_platform.split("-", 2)
-    dependencies, requirements = rest.split("|", 2).map {|s| s.split(",") } if rest
-    dependencies = dependencies ? dependencies.map {|d| parse_dependency(d) } : []
-    requirements = requirements ? requirements.map {|d| parse_dependency(d) } : []
+    dependencies, requirements = rest.split("|", 2).map! {|s| s.split(",") } if rest
+    dependencies = dependencies ? dependencies.map! {|d| parse_dependency(d) } : EMPTY_ARRAY
+    requirements = requirements ? requirements.map! {|d| parse_dependency(d) } : EMPTY_ARRAY
     [version, platform, dependencies, requirements]
   end
 
@@ -15,6 +18,7 @@ class Gem::Resolver::APISet::GemParser
   def parse_dependency(string)
     dependency = string.split(":")
     dependency[-1] = dependency[-1].split("&") if dependency.size > 1
+    dependency[0] = -dependency[0]
     dependency
   end
 end

data/lib/rubygems/resolver/api_set.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 ##
 # The global rubygems pool, available via the rubygems.org API.
 # Returns instances of APISpecification.
@@ -29,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 + ".."
@@ -75,7 +76,8 @@ class Gem::Resolver::APISet < Gem::Resolver::Set
   end
 
   def prefetch_now # :nodoc:
-    needed, @to_fetch = @to_fetch, []
+    needed = @to_fetch
+    @to_fetch = []
 
     needed.sort.each do |name|
       versions(name)
@@ -102,16 +104,21 @@ class Gem::Resolver::APISet < Gem::Resolver::Set
     end
 
     uri = @dep_uri + name
-    str = Gem::RemoteFetcher.fetcher.fetch_path uri
 
-    lines(str).each do |ver|
-      number, platform, dependencies, requirements = parse_gem(ver)
+    begin
+      str = Gem::RemoteFetcher.fetcher.fetch_path uri
+    rescue Gem::RemoteFetcher::FetchError
+      @data[name] = []
+    else
+      lines(str).each do |ver|
+        number, platform, dependencies, requirements = parse_gem(ver)
 
-      platform ||= "ruby"
-      dependencies = dependencies.map {|dep_name, reqs| [dep_name, reqs.join(", ")] }
-      requirements = requirements.map {|req_name, reqs| [req_name.to_sym, reqs] }.to_h
+        platform ||= "ruby"
+        dependencies = dependencies.map {|dep_name, reqs| [dep_name, reqs.join(", ")] }
+        requirements = requirements.map {|req_name, reqs| [req_name.to_sym, reqs] }.to_h
 
-      @data[name] << { name: name, number: number, platform: platform, dependencies: dependencies, requirements: requirements }
+        @data[name] << { name: name, number: number, platform: platform, dependencies: dependencies, requirements: requirements }
+      end
     end
 
     @data[name]

data/lib/rubygems/resolver/api_specification.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 ##
 # Represents a specification retrieved via the rubygems.org API.
 #
@@ -21,7 +22,7 @@ class Gem::Resolver::APISpecification < Gem::Resolver::Specification
   # Creates an APISpecification for the given +set+ from the rubygems.org
   # +api_data+.
   #
-  # See https://guides.rubygems.org/rubygems-org-api/#misc_methods for the
+  # See https://guides.rubygems.org/rubygems-org-api/#misc-methods for the
   # format of the +api_data+.
 
   def initialize(set, api_data)

data/lib/rubygems/resolver/best_set.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 ##
 # The BestSet chooses the best available method to query a remote index.
 #
@@ -28,10 +29,6 @@ class Gem::Resolver::BestSet < Gem::Resolver::ComposedSet
     pick_sets if @remote && @sets.empty?
 
     super
-  rescue Gem::RemoteFetcher::FetchError => e
-    replace_failed_api_set e
-
-    retry
   end
 
   def prefetch(reqs) # :nodoc:
@@ -49,28 +46,4 @@ class Gem::Resolver::BestSet < Gem::Resolver::ComposedSet
       q.pp @sets
     end
   end
-
-  ##
-  # Replaces a failed APISet for the URI in +error+ with an IndexSet.
-  #
-  # If no matching APISet can be found the original +error+ is raised.
-  #
-  # The calling method must retry the exception to repeat the lookup.
-
-  def replace_failed_api_set(error) # :nodoc:
-    uri = error.original_uri
-    uri = URI uri unless URI === uri
-    uri = uri + "."
-
-    raise error unless api_set = @sets.find do |set|
-      Gem::Resolver::APISet === set && set.dep_uri == uri
-    end
-
-    index_set = Gem::Resolver::IndexSet.new api_set.source
-
-    @sets.map! do |set|
-      next set unless set == api_set
-      index_set
-    end
-  end
 end

data/lib/rubygems/resolver/composed_set.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 ##
 # A ComposedSet allows multiple sets to be queried like a single set.
 #
@@ -43,7 +44,7 @@ class Gem::Resolver::ComposedSet < Gem::Resolver::Set
   end
 
   def errors
-    @errors + @sets.map {|set| set.errors }.flatten
+    @errors + @sets.map(&:errors).flatten
   end
 
   ##

data/lib/rubygems/resolver/conflict.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 ##
 # Used internally to indicate that a dependency conflicted
 # with a spec that would be activated.
@@ -54,7 +55,7 @@ class Gem::Resolver::Conflict
     activated   = @activated.spec.full_name
     dependency  = @failed_dep.dependency
     requirement = dependency.requirement
-    alternates  = dependency.matching_specs.map {|spec| spec.full_name }
+    alternates  = dependency.matching_specs.map(&:full_name)
 
     unless alternates.empty?
       matching = <<-MATCHING.chomp
@@ -63,10 +64,7 @@ class Gem::Resolver::Conflict
     %s
       MATCHING
 
-      matching = matching % [
-        dependency,
-        alternates.join(", "),
-      ]
+      matching = format(matching, dependency, alternates.join(", "))
     end
 
     explanation = <<-EXPLANATION
@@ -81,12 +79,7 @@ class Gem::Resolver::Conflict
 %s
     EXPLANATION
 
-    explanation % [
-      activated, requirement,
-      request_path(@activated).reverse.join(", depends on\n    "),
-      request_path(@failed_dep).reverse.join(", depends on\n    "),
-      matching
-    ]
+    format(explanation, activated, requirement, request_path(@activated).reverse.join(", depends on\n    "), request_path(@failed_dep).reverse.join(", depends on\n    "), matching)
   end
 
   ##
@@ -131,7 +124,7 @@ class Gem::Resolver::Conflict
 
         current = current.parent
       when Gem::Resolver::DependencyRequest then
-        path << "#{current.dependency}"
+        path << current.dependency.to_s
 
         current = current.requester
       else

data/lib/rubygems/resolver/current_set.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 ##
 # A set which represents the installed gems. Respects
 # all the normal settings that control where to look

data/lib/rubygems/resolver/dependency_request.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 ##
 # Used Internally. Wraps a Dependency object to also track which spec
 # contained the Dependency.

data/lib/rubygems/resolver/git_set.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 ##
 # A GitSet represents gems that are sourced from git repositories.
 #

data/lib/rubygems/resolver/git_specification.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 ##
 # A GitSpecification represents a gem that is sourced from a git repository
 # and is being loaded through a gem dependencies file through the +git:+

data/lib/rubygems/resolver/index_set.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 ##
 # The global rubygems pool represented via the traditional
 # source index.
@@ -43,10 +44,10 @@ class Gem::Resolver::IndexSet < Gem::Resolver::Set
     name = req.dependency.name
 
     @all[name].each do |uri, n|
-      if req.match? n, @prerelease
-        res << Gem::Resolver::IndexSpecification.new(
-          self, n.name, n.version, uri, n.platform)
-      end
+      next unless req.match? n, @prerelease
+      res << Gem::Resolver::IndexSpecification.new(
+        self, n.name, n.version, uri, n.platform
+      )
     end
 
     res

data/lib/rubygems/resolver/index_specification.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 ##
 # Represents a possible Specification object returned from IndexSet.  Used to
 # delay needed to download full Specification objects when only the +name+
@@ -67,7 +68,7 @@ class Gem::Resolver::IndexSpecification < Gem::Resolver::Specification
   end
 
   def inspect # :nodoc:
-    "#<%s %s source %s>" % [self.class, full_name, @source]
+    format("#<%s %s source %s>", self.class, full_name, @source)
   end
 
   def pretty_print(q) # :nodoc:
@@ -75,7 +76,7 @@ class Gem::Resolver::IndexSpecification < Gem::Resolver::Specification
       q.breakable
       q.text full_name
 
-      unless Gem::Platform::RUBY == @platform
+      unless @platform == Gem::Platform::RUBY
         q.breakable
         q.text @platform.to_s
       end

data/lib/rubygems/resolver/installed_specification.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 ##
 # An InstalledSpecification represents a gem that is already installed
 # locally.
@@ -24,7 +25,7 @@ class Gem::Resolver::InstalledSpecification < Gem::Resolver::SpecSpecification
   def installable_platform?
     # BACKCOMPAT If the file is coming out of a specified file, then we
     # ignore the platform. This code can be removed in RG 3.0.
-    return true if @source.kind_of? Gem::Source::SpecificFile
+    return true if @source.is_a? Gem::Source::SpecificFile
 
     super
   end

data/lib/rubygems/resolver/installer_set.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 ##
 # A set of gems for installation sourced from remote sources and local .gem
 # files
@@ -147,6 +148,8 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set
       res << Gem::Resolver::InstalledSpecification.new(self, gemspec)
     end unless @ignore_installed
 
+    matching_local = []
+
     if consider_local?
       matching_local = @local.values.select do |spec, _|
         req.match? spec
@@ -160,14 +163,15 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set
         if local_spec = @local_source.find_gem(name, dep.requirement)
           res << Gem::Resolver::IndexSpecification.new(
             self, local_spec.name, local_spec.version,
-            @local_source, local_spec.platform)
+            @local_source, local_spec.platform
+          )
         end
       rescue Gem::Package::FormatError
         # ignore
       end
     end
 
-    res.concat @remote_set.find_all req if consider_remote?
+    res.concat @remote_set.find_all req if consider_remote? && matching_local.empty?
 
     res
   end
@@ -183,11 +187,9 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set
   end
 
   def inspect # :nodoc:
-    always_install = @always_install.map {|s| s.full_name }
+    always_install = @always_install.map(&:full_name)
 
-    "#<%s domain: %s specs: %p always install: %p>" % [
-      self.class, @domain, @specs.keys, always_install
-    ]
+    format("#<%s domain: %s specs: %p always install: %p>", self.class, @domain, @specs.keys, always_install)
   end
 
   ##
@@ -261,7 +263,7 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set
       unless rrgv.satisfied_by? Gem.rubygems_version
         rg_version = Gem::VERSION
         raise Gem::RuntimeRequirementNotMetError,
-          "#{spec.full_name} requires RubyGems version #{rrgv}. The current RubyGems version is #{rg_version}. " +
+          "#{spec.full_name} requires RubyGems version #{rrgv}. The current RubyGems version is #{rg_version}. " \
           "Try 'gem update --system' to update RubyGems itself."
       end
     end

data/lib/rubygems/resolver/local_specification.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 ##
 # A LocalSpecification comes from a .gem file on the local filesystem.
 
@@ -7,7 +8,7 @@ class Gem::Resolver::LocalSpecification < Gem::Resolver::SpecSpecification
   # Returns +true+ if this gem is installable for the current platform.
 
   def installable_platform?
-    return true if @source.kind_of? Gem::Source::SpecificFile
+    return true if @source.is_a? Gem::Source::SpecificFile
 
     super
   end

data/lib/rubygems/resolver/lock_set.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 ##
 # A set of gems from a gem dependencies lockfile.
 
@@ -74,7 +75,7 @@ class Gem::Resolver::LockSet < Gem::Resolver::Set
       q.text "specs:"
 
       q.breakable
-      q.pp @specs.map {|spec| spec.full_name }
+      q.pp @specs.map(&:full_name)
     end
   end
 end

data/lib/rubygems/resolver/lock_specification.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 ##
 # The LockSpecification comes from a lockfile (Gem::RequestSet::Lockfile).
 #

data/lib/rubygems/resolver/requirement_list.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 ##
 # The RequirementList is used to hold the requirements being considered
 # while resolving a set of gems.

data/lib/rubygems/resolver/set.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 ##
 # Resolver sets are used to look up specifications (and their
 # dependencies) used in resolution.  This set is abstract.

data/lib/rubygems/resolver/source_set.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ##
 # The SourceSet chooses the best available method to query a remote index.
 #

data/lib/rubygems/resolver/spec_specification.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 ##
 # The Resolver::SpecSpecification contains common functionality for
 # Resolver specifications that are backed by a Gem::Specification.
@@ -65,4 +66,11 @@ class Gem::Resolver::SpecSpecification < Gem::Resolver::Specification
   def version
     spec.version
   end
+
+  ##
+  # The hash value for this specification.
+
+  def hash
+    spec.hash
+  end
 end

data/lib/rubygems/resolver/specification.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 ##
 # A Resolver::Specification contains a subset of the information
 # contained in a Gem::Specification.  Only the information necessary for

data/lib/rubygems/resolver/stats.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Gem::Resolver::Stats
   def initialize
     @max_depth = 0

data/lib/rubygems/resolver/vendor_set.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 ##
 # A VendorSet represents gems that have been unpacked into a specific
 # directory that contains a gemspec.

data/lib/rubygems/resolver/vendor_specification.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 ##
 # A VendorSpecification represents a gem that has been unpacked into a project
 # and is being loaded through a gem dependencies file through the +path:+