rubygems-update 2.6.0 → 3.5.4

data/lib/rubygems/resolver/installer_set.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
+
 ##
 # A set of gems for installation sourced from remote sources and local .gem
 # files
 
 class Gem::Resolver::InstallerSet < Gem::Resolver::Set
-
   ##
   # List of Gem::Specification objects that must always be installed.
 
@@ -26,14 +26,19 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set
 
   attr_reader :remote_set # :nodoc:
 
+  ##
+  # Ignore ruby & rubygems specification constraints.
+  #
+
+  attr_accessor :force # :nodoc:
+
   ##
   # Creates a new InstallerSet that will look for gems in +domain+.
 
-  def initialize domain
+  def initialize(domain)
     super()
 
     @domain = domain
-    @remote = consider_remote?
 
     @f = Gem::SpecFetcher.fetcher
 
@@ -41,7 +46,9 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set
     @ignore_dependencies = false
     @ignore_installed    = false
     @local               = {}
+    @local_source        = Gem::Source::Local.new
     @remote_set          = Gem::Resolver::BestSet.new
+    @force               = false
     @specs               = {}
   end
 
@@ -49,30 +56,44 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set
   # Looks up the latest specification for +dependency+ and adds it to the
   # always_install list.
 
-  def add_always_install dependency
+  def add_always_install(dependency)
     request = Gem::Resolver::DependencyRequest.new dependency, nil
 
     found = find_all request
 
-    found.delete_if { |s|
-      s.version.prerelease? and not s.local?
-    } unless dependency.prerelease?
+    found.delete_if do |s|
+      s.version.prerelease? && !s.local?
+    end unless dependency.prerelease?
 
     found = found.select do |s|
-      Gem::Source::SpecificFile === s.source or
-        Gem::Platform::RUBY == s.platform or
-        Gem::Platform.local === s.platform
+      Gem::Source::SpecificFile === s.source ||
+        Gem::Platform.match_spec?(s)
+    end
+
+    found = found.sort_by do |s|
+      [s.version, Gem::Platform.sort_priority(s.platform)]
     end
 
-    if found.empty? then
+    newest = found.last
+
+    unless newest
       exc = Gem::UnsatisfiableDependencyError.new request
       exc.errors = errors
 
       raise exc
     end
 
-    newest = found.max_by do |s|
-      [s.version, s.platform == Gem::Platform::RUBY ? -1 : 1]
+    unless @force
+      found_matching_metadata = found.reverse.find do |spec|
+        metadata_satisfied?(spec)
+      end
+
+      if found_matching_metadata.nil?
+        ensure_required_ruby_version_met(newest.spec)
+        ensure_required_rubygems_version_met(newest.spec)
+      else
+        newest = found_matching_metadata
+      end
     end
 
     @always_install << newest.spec
@@ -82,7 +103,7 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set
   # Adds a local gem requested using +dep_name+ with the given +spec+ that can
   # be loaded and installed using the +source+.
 
-  def add_local dep_name, spec, source
+  def add_local(dep_name, spec, source)
     @local[dep_name] = [spec, source]
   end
 
@@ -90,14 +111,14 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set
   # Should local gems should be considered?
 
   def consider_local? # :nodoc:
-    @domain == :both or @domain == :local
+    @domain == :both || @domain == :local
   end
 
   ##
   # Should remote gems should be considered?
 
   def consider_remote? # :nodoc:
-    @domain == :both or @domain == :remote
+    @domain == :both || @domain == :remote
   end
 
   ##
@@ -111,23 +132,25 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set
   # Returns an array of IndexSpecification objects matching DependencyRequest
   # +req+.
 
-  def find_all req
+  def find_all(req)
     res = []
 
-    dep  = req.dependency
+    dep = req.dependency
 
-    return res if @ignore_dependencies and
-              @always_install.none? { |spec| dep.match? spec }
+    return res if @ignore_dependencies &&
+                  @always_install.none? {|spec| dep.match? spec }
 
     name = dep.name
 
     dep.matching_specs.each do |gemspec|
-      next if @always_install.any? { |spec| spec.name == gemspec.name }
+      next if @always_install.any? {|spec| spec.name == gemspec.name }
 
       res << Gem::Resolver::InstalledSpecification.new(self, gemspec)
     end unless @ignore_installed
 
-    if consider_local? then
+    matching_local = []
+
+    if consider_local?
       matching_local = @local.values.select do |spec, _|
         req.match? spec
       end.map do |spec, source|
@@ -136,20 +159,19 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set
 
       res.concat matching_local
 
-      local_source = Gem::Source::Local.new
-
-      if local_spec = local_source.find_gem(name, dep.requirement) then
-        res << Gem::Resolver::IndexSpecification.new(
-          self, local_spec.name, local_spec.version,
-          local_source, local_spec.platform)
+      begin
+        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
+          )
+        end
+      rescue Gem::Package::FormatError
+        # ignore
       end
     end
 
-    res.delete_if do |spec|
-      spec.version.prerelease? and not dep.prerelease?
-    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
@@ -158,25 +180,23 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set
     @remote_set.prefetch(reqs) if consider_remote?
   end
 
-  def prerelease= allow_prerelease
+  def prerelease=(allow_prerelease)
     super
 
     @remote_set.prerelease = allow_prerelease
   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
 
   ##
   # Called from IndexSpecification to get a true Specification
   # object.
 
-  def load_spec name, ver, platform, source # :nodoc:
+  def load_spec(name, ver, platform, source) # :nodoc:
     key = "#{name}-#{ver}-#{platform}"
 
     @specs.fetch key do
@@ -189,28 +209,28 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set
   ##
   # Has a local gem for +dep_name+ been added to this set?
 
-  def local? dep_name # :nodoc:
-    spec, = @local[dep_name]
+  def local?(dep_name) # :nodoc:
+    spec, _ = @local[dep_name]
 
     spec
   end
 
-  def pretty_print q # :nodoc:
-    q.group 2, '[InstallerSet', ']' do
+  def pretty_print(q) # :nodoc:
+    q.group 2, "[InstallerSet", "]" do
       q.breakable
       q.text "domain: #{@domain}"
 
       q.breakable
-      q.text 'specs: '
+      q.text "specs: "
       q.pp @specs.keys
 
       q.breakable
-      q.text 'always install: '
+      q.text "always install: "
       q.pp @always_install
     end
   end
 
-  def remote= remote # :nodoc:
+  def remote=(remote) # :nodoc:
     case @domain
     when :local then
       @domain = :both if remote
@@ -221,5 +241,31 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set
     end
   end
 
-end
+  private
 
+  def metadata_satisfied?(spec)
+    spec.required_ruby_version.satisfied_by?(Gem.ruby_version) &&
+      spec.required_rubygems_version.satisfied_by?(Gem.rubygems_version)
+  end
+
+  def ensure_required_ruby_version_met(spec) # :nodoc:
+    if rrv = spec.required_ruby_version
+      ruby_version = Gem.ruby_version
+      unless rrv.satisfied_by? ruby_version
+        raise Gem::RuntimeRequirementNotMetError,
+          "#{spec.full_name} requires Ruby version #{rrv}. The current ruby version is #{ruby_version}."
+      end
+    end
+  end
+
+  def ensure_required_rubygems_version_met(spec) # :nodoc:
+    if rrgv = spec.required_rubygems_version
+      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}. " \
+          "Try 'gem update --system' to update RubyGems itself."
+      end
+    end
+  end
+end

data/lib/rubygems/resolver/local_specification.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
+
 ##
 # A LocalSpecification comes from a .gem file on the local filesystem.
 
 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
@@ -17,8 +17,8 @@ class Gem::Resolver::LocalSpecification < Gem::Resolver::SpecSpecification
     true
   end
 
-  def pretty_print q # :nodoc:
-    q.group 2, '[LocalSpecification', ']' do
+  def pretty_print(q) # :nodoc:
+    q.group 2, "[LocalSpecification", "]" do
       q.breakable
       q.text "name: #{name}"
 
@@ -29,7 +29,7 @@ class Gem::Resolver::LocalSpecification < Gem::Resolver::SpecSpecification
       q.text "platform: #{platform}"
 
       q.breakable
-      q.text 'dependencies:'
+      q.text "dependencies:"
       q.breakable
       q.pp dependencies
 
@@ -37,6 +37,4 @@ class Gem::Resolver::LocalSpecification < Gem::Resolver::SpecSpecification
       q.text "source: #{@source.path}"
     end
   end
-
 end
-

data/lib/rubygems/resolver/lock_set.rb

@@ -1,22 +1,22 @@
 # frozen_string_literal: true
+
 ##
 # A set of gems from a gem dependencies lockfile.
 
 class Gem::Resolver::LockSet < Gem::Resolver::Set
-
   attr_reader :specs # :nodoc:
 
   ##
   # Creates a new LockSet from the given +sources+
 
-  def initialize sources
+  def initialize(sources)
     super()
 
     @sources = sources.map do |source|
       Gem::Source::Lock.new source
     end
 
-    @specs   = []
+    @specs = []
   end
 
   ##
@@ -26,10 +26,10 @@ class Gem::Resolver::LockSet < Gem::Resolver::Set
   # The specification's set will be the current set, and the source will be
   # the current set's source.
 
-  def add name, version, platform # :nodoc:
+  def add(name, version, platform) # :nodoc:
     version = Gem::Version.new version
     specs = [
-      Gem::Resolver::LockSpecification.new(self, name, version, @sources, platform)
+      Gem::Resolver::LockSpecification.new(self, name, version, @sources, platform),
     ]
 
     @specs.concat specs
@@ -41,7 +41,7 @@ class Gem::Resolver::LockSet < Gem::Resolver::Set
   # Returns an Array of IndexSpecification objects matching the
   # DependencyRequest +req+.
 
-  def find_all req
+  def find_all(req)
     @specs.select do |spec|
       req.match? spec
     end
@@ -51,11 +51,11 @@ class Gem::Resolver::LockSet < Gem::Resolver::Set
   # Loads a Gem::Specification with the given +name+, +version+ and
   # +platform+.  +source+ is ignored.
 
-  def load_spec name, version, platform, source # :nodoc:
+  def load_spec(name, version, platform, source) # :nodoc:
     dep = Gem::Dependency.new name, version
 
     found = @specs.find do |spec|
-      dep.matches_spec? spec and spec.platform == platform
+      dep.matches_spec?(spec) && spec.platform == platform
     end
 
     tuple = Gem::NameTuple.new found.name, found.version, found.platform
@@ -63,21 +63,19 @@ class Gem::Resolver::LockSet < Gem::Resolver::Set
     found.source.fetch_spec tuple
   end
 
-  def pretty_print q # :nodoc:
-    q.group 2, '[LockSet', ']' do
+  def pretty_print(q) # :nodoc:
+    q.group 2, "[LockSet", "]" do
       q.breakable
-      q.text 'source:'
+      q.text "source:"
 
       q.breakable
       q.pp @source
 
       q.breakable
-      q.text 'specs:'
+      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).
 #
@@ -6,10 +7,9 @@
 # lockfile.
 
 class Gem::Resolver::LockSpecification < Gem::Resolver::Specification
-
   attr_reader :sources
 
-  def initialize set, name, version, sources, platform
+  def initialize(set, name, version, sources, platform)
     super()
 
     @name     = name
@@ -27,10 +27,10 @@ class Gem::Resolver::LockSpecification < Gem::Resolver::Specification
   # This is a null install as a locked specification is considered installed.
   # +options+ are ignored.
 
-  def install options = {}
+  def install(options = {})
     destination = options[:install_dir] || Gem.dir
 
-    if File.exist? File.join(destination, 'specifications', spec.spec_name) then
+    if File.exist? File.join(destination, "specifications", spec.spec_name)
       yield nil
       return
     end
@@ -41,26 +41,26 @@ class Gem::Resolver::LockSpecification < Gem::Resolver::Specification
   ##
   # Adds +dependency+ from the lockfile to this specification
 
-  def add_dependency dependency # :nodoc:
+  def add_dependency(dependency) # :nodoc:
     @dependencies << dependency
   end
 
-  def pretty_print q # :nodoc:
-    q.group 2, '[LockSpecification', ']' do
+  def pretty_print(q) # :nodoc:
+    q.group 2, "[LockSpecification", "]" do
       q.breakable
       q.text "name: #{@name}"
 
       q.breakable
       q.text "version: #{@version}"
 
-      unless @platform == Gem::Platform::RUBY then
+      unless @platform == Gem::Platform::RUBY
         q.breakable
         q.text "platform: #{@platform}"
       end
 
-      unless @dependencies.empty? then
+      unless @dependencies.empty?
         q.breakable
-        q.text 'dependencies:'
+        q.text "dependencies:"
         q.breakable
         q.pp @dependencies
       end
@@ -71,9 +71,9 @@ class Gem::Resolver::LockSpecification < Gem::Resolver::Specification
   # A specification constructed from the lockfile is returned
 
   def spec
-    @spec ||= Gem::Specification.find { |spec|
-      spec.name == @name and spec.version == @version
-    }
+    @spec ||= Gem::Specification.find do |spec|
+      spec.name == @name && spec.version == @version
+    end
 
     @spec ||= Gem::Specification.new do |s|
       s.name     = @name
@@ -83,6 +83,4 @@ class Gem::Resolver::LockSpecification < Gem::Resolver::Specification
       s.dependencies.concat @dependencies
     end
   end
-
 end
-

data/lib/rubygems/resolver/molinillo/.document

@@ -0,0 +1 @@
+# Vendored files do not need to be documented

data/lib/rubygems/resolver/molinillo/LICENSE

@@ -0,0 +1,9 @@
+This project is licensed under the MIT license.
+
+Copyright (c) 2014 Samuel E. Giddins segiddins@segiddins.me
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

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

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

data/lib/rubygems/resolver/molinillo/lib/molinillo/delegates/specification_provider.rb

@@ -0,0 +1,88 @@
+# frozen_string_literal: true
+
+module Gem::Resolver::Molinillo
+  module Delegates
+    # Delegates all {Gem::Resolver::Molinillo::SpecificationProvider} methods to a
+    # `#specification_provider` property.
+    module SpecificationProvider
+      # (see Gem::Resolver::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)
+      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?)
+      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?)
+      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)
+      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)
+      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)
+      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)
+      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?)
+      def allow_missing?(dependency)
+        with_no_such_dependency_error_handling do
+          specification_provider.allow_missing?(dependency)
+        end
+      end
+
+      private
+
+      # Ensures any raised {NoSuchDependencyError} has its
+      # {NoSuchDependencyError#required_by} set.
+      # @yield
+      def with_no_such_dependency_error_handling
+        yield
+      rescue NoSuchDependencyError => error
+        if state
+          vertex = activated.vertex_named(name_for(error.dependency))
+          error.required_by += vertex.incoming_edges.map { |e| e.origin.name }
+          error.required_by << name_for_explicit_dependency_source unless vertex.explicit_requirements.empty?
+        end
+        raise
+      end
+    end
+  end
+end