rubygems-update 2.6.0 → 3.5.4

data/lib/rubygems/resolver/activation_request.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
+
 ##
 # Specifies a Specification object that should be activated.  Also contains a
 # dependency that was used to introduce this activation.
 
 class Gem::Resolver::ActivationRequest
-
   ##
   # The parent request for this activation request.
 
@@ -18,27 +18,31 @@ class Gem::Resolver::ActivationRequest
   ##
   # Creates a new ActivationRequest that will activate +spec+.  The parent
   # +request+ is used to provide diagnostics in case of conflicts.
-  #
-  # +others_possible+ indicates that other specifications may also match this
-  # activation request.
 
-  def initialize spec, request, others_possible = true
+  def initialize(spec, request)
     @spec = spec
     @request = request
-    @others_possible = others_possible
   end
 
-  def == other # :nodoc:
+  def ==(other) # :nodoc:
     case other
     when Gem::Specification
       @spec == other
     when Gem::Resolver::ActivationRequest
-      @spec == other.spec && @request == other.request
+      @spec == other.spec
     else
       false
     end
   end
 
+  def eql?(other)
+    self == other
+  end
+
+  def hash
+    @spec.hash
+  end
+
   ##
   # Is this activation request for a development dependency?
 
@@ -49,17 +53,15 @@ class Gem::Resolver::ActivationRequest
   ##
   # Downloads a gem at +path+ and returns the file path.
 
-  def download path
+  def download(path)
     Gem.ensure_gem_subdirectories path
 
     if @spec.respond_to? :sources
       exception = nil
-      path = @spec.sources.find{ |source|
-        begin
-          source.download full_spec, path
-        rescue exception
-        end
-      }
+      path = @spec.sources.find do |source|
+        source.download full_spec, path
+      rescue exception
+      end
       return path      if path
       raise  exception if exception
 
@@ -77,7 +79,7 @@ class Gem::Resolver::ActivationRequest
   # The full name of the specification to be activated.
 
   def full_name
-    @spec.full_name
+    name_tuple.full_name
   end
 
   alias_method :to_s, :full_name
@@ -90,22 +92,7 @@ class Gem::Resolver::ActivationRequest
   end
 
   def inspect # :nodoc:
-    others =
-      case @others_possible
-      when true then # TODO remove at RubyGems 3
-        ' (others possible)'
-      when false then # TODO remove at RubyGems 3
-        nil
-      else
-        unless @others_possible.empty? then
-          others = @others_possible.map { |s| s.full_name }
-          " (others possible: #{others.join ', '})"
-        end
-      end
-
-    '#<%s for %p from %s%s>' % [
-      self.class, @spec, @request, others
-    ]
+    format("#<%s for %p from %s>", self.class, @spec, @request)
   end
 
   ##
@@ -131,19 +118,6 @@ class Gem::Resolver::ActivationRequest
     @spec.name
   end
 
-  ##
-  # Indicate if this activation is one of a set of possible
-  # requests for the same Dependency request.
-
-  def others_possible?
-    case @others_possible
-    when true, false then
-      @others_possible
-    else
-      not @others_possible.empty?
-    end
-  end
-
   ##
   # Return the ActivationRequest that contained the dependency
   # that we were activated for.
@@ -152,27 +126,14 @@ class Gem::Resolver::ActivationRequest
     @request.requester
   end
 
-  def pretty_print q # :nodoc:
-    q.group 2, '[Activation request', ']' do
+  def pretty_print(q) # :nodoc:
+    q.group 2, "[Activation request", "]" do
       q.breakable
       q.pp @spec
 
       q.breakable
-      q.text ' for '
+      q.text " for "
       q.pp @request
-
-      case @others_possible
-      when false then
-      when true then
-        q.breakable
-        q.text 'others possible'
-      else
-        unless @others_possible.empty? then
-          q.breakable
-          q.text 'others '
-          q.pp @others_possible.map { |s| s.full_name }
-        end
-      end
     end
   end
 
@@ -183,4 +144,16 @@ class Gem::Resolver::ActivationRequest
     @spec.version
   end
 
+  ##
+  # The platform of this activation request's specification
+
+  def platform
+    @spec.platform
+  end
+
+  private
+
+  def name_tuple
+    @name_tuple ||= Gem::NameTuple.new(name, version, platform)
+  end
 end

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

@@ -0,0 +1,24 @@
+# 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) } : EMPTY_ARRAY
+    requirements = requirements ? requirements.map! {|d| parse_dependency(d) } : EMPTY_ARRAY
+    [version, platform, dependencies, requirements]
+  end
+
+  private
+
+  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,9 +1,11 @@
 # frozen_string_literal: true
+
 ##
 # The global rubygems pool, available via the rubygems.org API.
 # Returns instances of APISpecification.
 
 class Gem::Resolver::APISet < Gem::Resolver::Set
+  autoload :GemParser, File.expand_path("api_set/gem_parser", __dir__)
 
   ##
   # The URI for the dependency API this APISet uses.
@@ -23,17 +25,17 @@ class Gem::Resolver::APISet < Gem::Resolver::Set
   ##
   # Creates a new APISet that will retrieve gems from +uri+ using the RubyGems
   # API URL +dep_uri+ which is described at
-  # http://guides.rubygems.org/rubygems-org-api
+  # https://guides.rubygems.org/rubygems-org-api
 
-  def initialize dep_uri = 'https://rubygems.org/api/v1/dependencies'
+  def initialize(dep_uri = "https://index.rubygems.org/info/")
     super()
 
-    dep_uri = URI dep_uri unless URI === dep_uri # for ruby 1.8
+    dep_uri = URI dep_uri unless URI === dep_uri
 
     @dep_uri = dep_uri
-    @uri     = dep_uri + '../..'
+    @uri     = dep_uri + ".."
 
-    @data   = Hash.new { |h,k| h[k] = [] }
+    @data   = Hash.new {|h,k| h[k] = [] }
     @source = Gem::Source.new @uri
 
     @to_fetch = []
@@ -43,7 +45,7 @@ class Gem::Resolver::APISet < Gem::Resolver::Set
   # Return an array of APISpecification objects matching
   # DependencyRequest +req+.
 
-  def find_all req
+  def find_all(req)
     res = []
 
     return res unless @remote
@@ -53,7 +55,7 @@ class Gem::Resolver::APISet < Gem::Resolver::Set
     end
 
     versions(req.name).each do |ver|
-      if req.dependency.match? req.name, ver[:number]
+      if req.dependency.match? req.name, ver[:number], @prerelease
         res << Gem::Resolver::APISpecification.new(self, ver)
       end
     end
@@ -65,41 +67,30 @@ class Gem::Resolver::APISet < Gem::Resolver::Set
   # A hint run by the resolver to allow the Set to fetch
   # data for DependencyRequests +reqs+.
 
-  def prefetch reqs
+  def prefetch(reqs)
     return unless @remote
-    names = reqs.map { |r| r.dependency.name }
+    names = reqs.map {|r| r.dependency.name }
     needed = names - @data.keys - @to_fetch
 
     @to_fetch += needed
   end
 
   def prefetch_now # :nodoc:
-    needed, @to_fetch = @to_fetch, []
-
-    uri = @dep_uri + "?gems=#{needed.sort.join ','}"
-    str = Gem::RemoteFetcher.fetcher.fetch_path uri
-
-    loaded = []
-
-    Marshal.load(str).each do |ver|
-      name = ver[:name]
-
-      @data[name] << ver
-      loaded << name
-    end
+    needed = @to_fetch
+    @to_fetch = []
 
-    (needed - loaded).each do |missing|
-      @data[missing] = []
+    needed.sort.each do |name|
+      versions(name)
     end
   end
 
-  def pretty_print q # :nodoc:
-    q.group 2, '[APISet', ']' do
+  def pretty_print(q) # :nodoc:
+    q.group 2, "[APISet", "]" do
       q.breakable
       q.text "URI: #{@dep_uri}"
 
       q.breakable
-      q.text 'gem names:'
+      q.text "gem names:"
       q.pp @data.keys
     end
   end
@@ -107,20 +98,37 @@ class Gem::Resolver::APISet < Gem::Resolver::Set
   ##
   # Return data for all versions of the gem +name+.
 
-  def versions name # :nodoc:
+  def versions(name) # :nodoc:
     if @data.key?(name)
       return @data[name]
     end
 
-    uri = @dep_uri + "?gems=#{name}"
+    uri = @dep_uri + name
     str = Gem::RemoteFetcher.fetcher.fetch_path uri
 
-    Marshal.load(str).each do |ver|
-      @data[ver[:name]] << ver
+    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
+
+      @data[name] << { name: name, number: number, platform: platform, dependencies: dependencies, requirements: requirements }
     end
 
     @data[name]
   end
 
-end
+  private
 
+  def lines(str)
+    lines = str.split("\n")
+    header = lines.index("---")
+    header ? lines[header + 1..-1] : lines
+  end
+
+  def parse_gem(string)
+    @gem_parser ||= GemParser.new
+    @gem_parser.parse(string)
+  end
+end

data/lib/rubygems/resolver/api_specification.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 ##
 # Represents a specification retrieved via the rubygems.org API.
 #
@@ -6,12 +7,22 @@
 # is the name, version, and dependencies.
 
 class Gem::Resolver::APISpecification < Gem::Resolver::Specification
+  ##
+  # We assume that all instances of this class are immutable;
+  # so avoid duplicated generation for performance.
+  @@cache = {}
+  def self.new(set, api_data)
+    cache_key = [set, api_data]
+    cache = @@cache[cache_key]
+    return cache if cache
+    @@cache[cache_key] = super
+  end
 
   ##
   # Creates an APISpecification for the given +set+ from the rubygems.org
   # +api_data+.
   #
-  # See http://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)
@@ -19,20 +30,26 @@ class Gem::Resolver::APISpecification < Gem::Resolver::Specification
 
     @set = set
     @name = api_data[:name]
-    @version = Gem::Version.new api_data[:number]
-    @platform = Gem::Platform.new api_data[:platform]
+    @version = Gem::Version.new(api_data[:number]).freeze
+    @platform = Gem::Platform.new(api_data[:platform]).freeze
+    @original_platform = api_data[:platform].freeze
     @dependencies = api_data[:dependencies].map do |name, ver|
-      Gem::Dependency.new name, ver.split(/\s*,\s*/)
-    end
+      Gem::Dependency.new(name, ver.split(/\s*,\s*/)).freeze
+    end.freeze
+    @required_ruby_version = Gem::Requirement.new(api_data.dig(:requirements, :ruby)).freeze
+    @required_rubygems_version = Gem::Requirement.new(api_data.dig(:requirements, :rubygems)).freeze
   end
 
-  def == other # :nodoc:
-    self.class === other and
-      @set          == other.set and
-      @name         == other.name and
-      @version      == other.version and
-      @platform     == other.platform and
-      @dependencies == other.dependencies
+  def ==(other) # :nodoc:
+    self.class === other &&
+      @set          == other.set &&
+      @name         == other.name &&
+      @version      == other.version &&
+      @platform     == other.platform
+  end
+
+  def hash
+    @set.hash ^ @name.hash ^ @version.hash ^ @platform.hash
   end
 
   def fetch_development_dependencies # :nodoc:
@@ -42,11 +59,11 @@ class Gem::Resolver::APISpecification < Gem::Resolver::Specification
   end
 
   def installable_platform? # :nodoc:
-    Gem::Platform.match @platform
+    Gem::Platform.match_gem? @platform, @name
   end
 
-  def pretty_print q # :nodoc:
-    q.group 2, '[APISpecification', ']' do
+  def pretty_print(q) # :nodoc:
+    q.group 2, "[APISpecification", "]" do
       q.breakable
       q.text "name: #{name}"
 
@@ -57,7 +74,7 @@ class Gem::Resolver::APISpecification < Gem::Resolver::Specification
       q.text "platform: #{platform}"
 
       q.breakable
-      q.text 'dependencies:'
+      q.text "dependencies:"
       q.breakable
       q.pp @dependencies
 
@@ -73,7 +90,11 @@ class Gem::Resolver::APISpecification < Gem::Resolver::Specification
     @spec ||=
       begin
         tuple = Gem::NameTuple.new @name, @version, @platform
+        source.fetch_spec tuple
+      rescue Gem::RemoteFetcher::FetchError
+        raise if @original_platform == @platform
 
+        tuple = Gem::NameTuple.new @name, @version, @original_platform
         source.fetch_spec tuple
       end
   end
@@ -81,6 +102,4 @@ class Gem::Resolver::APISpecification < Gem::Resolver::Specification
   def source # :nodoc:
     @set.source
   end
-
 end
-

data/lib/rubygems/resolver/best_set.rb

@@ -1,16 +1,16 @@
 # frozen_string_literal: true
+
 ##
 # The BestSet chooses the best available method to query a remote index.
 #
 # It combines IndexSet and APISet
 
 class Gem::Resolver::BestSet < Gem::Resolver::ComposedSet
-
   ##
   # Creates a BestSet for the given +sources+ or Gem::sources if none are
   # specified.  +sources+ must be a Gem::SourceList.
 
-  def initialize sources = Gem.sources
+  def initialize(sources = Gem.sources)
     super()
 
     @sources = sources
@@ -25,8 +25,8 @@ class Gem::Resolver::BestSet < Gem::Resolver::ComposedSet
     end
   end
 
-  def find_all req # :nodoc:
-    pick_sets if @remote and @sets.empty?
+  def find_all(req) # :nodoc:
+    pick_sets if @remote && @sets.empty?
 
     super
   rescue Gem::RemoteFetcher::FetchError => e
@@ -35,16 +35,16 @@ class Gem::Resolver::BestSet < Gem::Resolver::ComposedSet
     retry
   end
 
-  def prefetch reqs # :nodoc:
-    pick_sets if @remote and @sets.empty?
+  def prefetch(reqs) # :nodoc:
+    pick_sets if @remote && @sets.empty?
 
     super
   end
 
-  def pretty_print q # :nodoc:
-    q.group 2, '[BestSet', ']' do
+  def pretty_print(q) # :nodoc:
+    q.group 2, "[BestSet", "]" do
       q.breakable
-      q.text 'sets:'
+      q.text "sets:"
 
       q.breakable
       q.pp @sets
@@ -58,14 +58,14 @@ class Gem::Resolver::BestSet < Gem::Resolver::ComposedSet
   #
   # The calling method must retry the exception to repeat the lookup.
 
-  def replace_failed_api_set error # :nodoc:
-    uri = error.uri
+  def replace_failed_api_set(error) # :nodoc:
+    uri = error.original_uri
     uri = URI uri unless URI === uri
-    uri.query = nil
+    uri += "."
 
-    raise error unless api_set = @sets.find { |set|
-      Gem::Resolver::APISet === set and set.dep_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
 
@@ -74,6 +74,4 @@ class Gem::Resolver::BestSet < Gem::Resolver::ComposedSet
       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.
 #
@@ -9,14 +10,13 @@
 # This method will eliminate nesting of composed sets.
 
 class Gem::Resolver::ComposedSet < Gem::Resolver::Set
-
   attr_reader :sets # :nodoc:
 
   ##
   # Creates a new ComposedSet containing +sets+.  Use
   # Gem::Resolver::compose_sets instead.
 
-  def initialize *sets
+  def initialize(*sets)
     super()
 
     @sets = sets
@@ -26,7 +26,7 @@ class Gem::Resolver::ComposedSet < Gem::Resolver::Set
   # When +allow_prerelease+ is set to +true+ prereleases gems are allowed to
   # match dependencies.
 
-  def prerelease= allow_prerelease
+  def prerelease=(allow_prerelease)
     super
 
     sets.each do |set|
@@ -37,20 +37,20 @@ class Gem::Resolver::ComposedSet < Gem::Resolver::Set
   ##
   # Sets the remote network access for all composed sets.
 
-  def remote= remote
+  def remote=(remote)
     super
 
-    @sets.each { |set| set.remote = remote }
+    @sets.each {|set| set.remote = remote }
   end
 
   def errors
-    @errors + @sets.map { |set| set.errors }.flatten
+    @errors + @sets.map(&:errors).flatten
   end
 
   ##
   # Finds all specs matching +req+ in all sets.
 
-  def find_all req
+  def find_all(req)
     @sets.map do |s|
       s.find_all req
     end.flatten
@@ -59,9 +59,7 @@ class Gem::Resolver::ComposedSet < Gem::Resolver::Set
   ##
   # Prefetches +reqs+ in all sets.
 
-  def prefetch reqs
-    @sets.each { |s| s.prefetch(reqs) }
+  def prefetch(reqs)
+    @sets.each {|s| s.prefetch(reqs) }
   end
-
 end
-