rubygems-update 3.1.6 → 3.3.22

data/lib/rubygems/resolver/dependency_request.rb

@@ -4,7 +4,6 @@
 # contained the Dependency.
 
 class Gem::Resolver::DependencyRequest
-
   ##
   # The wrapped Gem::Dependency
 
@@ -29,7 +28,7 @@ class Gem::Resolver::DependencyRequest
     when Gem::Dependency
       @dependency == other
     when Gem::Resolver::DependencyRequest
-      @dependency == other.dependency && @requester == other.requester
+      @dependency == other.dependency
     else
       false
     end
@@ -96,12 +95,12 @@ class Gem::Resolver::DependencyRequest
   end
 
   def pretty_print(q) # :nodoc:
-    q.group 2, '[Dependency request ', ']' do
+    q.group 2, "[Dependency request ", "]" do
       q.breakable
       q.text @dependency.to_s
 
       q.breakable
-      q.text ' requested by '
+      q.text " requested by "
       q.pp @requester
     end
   end
@@ -116,5 +115,4 @@ class Gem::Resolver::DependencyRequest
   def to_s # :nodoc:
     @dependency.to_s
   end
-
 end

data/lib/rubygems/resolver/git_set.rb

@@ -10,7 +10,6 @@
 #   set.add_git_gem 'rake', 'git://example/rake.git', tag: 'rake-10.1.0'
 
 class Gem::Resolver::GitSet < Gem::Resolver::Set
-
   ##
   # The root directory for git gems in this set.  This is usually Gem.dir, the
   # installation directory for regular gems.
@@ -36,7 +35,7 @@ class Gem::Resolver::GitSet < Gem::Resolver::Set
   def initialize # :nodoc:
     super()
 
-    @git             = ENV['git'] || 'git'
+    @git             = ENV["git"] || "git"
     @need_submodules = {}
     @repositories    = {}
     @root_dir        = Gem.dir
@@ -105,7 +104,7 @@ class Gem::Resolver::GitSet < Gem::Resolver::Set
   end
 
   def pretty_print(q) # :nodoc:
-    q.group 2, '[GitSet', ']' do
+    q.group 2, "[GitSet", "]" do
       next if @repositories.empty?
       q.breakable
 
@@ -118,5 +117,4 @@ class Gem::Resolver::GitSet < Gem::Resolver::Set
       end
     end
   end
-
 end

data/lib/rubygems/resolver/git_specification.rb

@@ -5,11 +5,10 @@
 # option.
 
 class Gem::Resolver::GitSpecification < Gem::Resolver::SpecSpecification
-
   def ==(other) # :nodoc:
-    self.class === other and
-      @set  == other.set and
-      @spec == other.spec and
+    self.class === other &&
+      @set  == other.set &&
+      @spec == other.spec &&
       @source == other.source
   end
 
@@ -22,7 +21,7 @@ class Gem::Resolver::GitSpecification < Gem::Resolver::SpecSpecification
   # the executables.
 
   def install(options = {})
-    require 'rubygems/installer'
+    require_relative "../installer"
 
     installer = Gem::Installer.for_spec spec, options
 
@@ -36,7 +35,7 @@ class Gem::Resolver::GitSpecification < Gem::Resolver::SpecSpecification
   end
 
   def pretty_print(q) # :nodoc:
-    q.group 2, '[GitSpecification', ']' do
+    q.group 2, "[GitSpecification", "]" do
       q.breakable
       q.text "name: #{name}"
 
@@ -44,7 +43,7 @@ class Gem::Resolver::GitSpecification < Gem::Resolver::SpecSpecification
       q.text "version: #{version}"
 
       q.breakable
-      q.text 'dependencies:'
+      q.text "dependencies:"
       q.breakable
       q.pp dependencies
 
@@ -54,5 +53,4 @@ class Gem::Resolver::GitSpecification < Gem::Resolver::SpecSpecification
       q.pp @source
     end
   end
-
 end

data/lib/rubygems/resolver/index_set.rb

@@ -4,7 +4,6 @@
 # source index.
 
 class Gem::Resolver::IndexSet < Gem::Resolver::Set
-
   def initialize(source = nil) # :nodoc:
     super()
 
@@ -17,7 +16,7 @@ class Gem::Resolver::IndexSet < Gem::Resolver::Set
         Gem::SpecFetcher.fetcher
       end
 
-    @all = Hash.new { |h,k| h[k] = [] }
+    @all = Hash.new {|h,k| h[k] = [] }
 
     list, errors = @f.available_specs :complete
 
@@ -54,14 +53,14 @@ class Gem::Resolver::IndexSet < Gem::Resolver::Set
   end
 
   def pretty_print(q) # :nodoc:
-    q.group 2, '[IndexSet', ']' do
+    q.group 2, "[IndexSet", "]" do
       q.breakable
-      q.text 'sources:'
+      q.text "sources:"
       q.breakable
       q.pp @f.sources
 
       q.breakable
-      q.text 'specs:'
+      q.text "specs:"
 
       q.breakable
 
@@ -76,5 +75,4 @@ class Gem::Resolver::IndexSet < Gem::Resolver::Set
       end
     end
   end
-
 end

data/lib/rubygems/resolver/index_specification.rb

@@ -5,7 +5,6 @@
 # and +version+ are needed.
 
 class Gem::Resolver::IndexSpecification < Gem::Resolver::Specification
-
   ##
   # An IndexSpecification is created from the index format described in `gem
   # help generate_index`.
@@ -22,7 +21,8 @@ class Gem::Resolver::IndexSpecification < Gem::Resolver::Specification
     @name = name
     @version = version
     @source = source
-    @platform = platform.to_s
+    @platform = Gem::Platform.new(platform.to_s)
+    @original_platform = platform.to_s
 
     @spec = nil
   end
@@ -34,12 +34,44 @@ class Gem::Resolver::IndexSpecification < Gem::Resolver::Specification
     spec.dependencies
   end
 
+  ##
+  # The required_ruby_version constraint for this specification
+  #
+  # A fallback is included because when generated, some marshalled specs have it
+  # set to +nil+.
+
+  def required_ruby_version
+    spec.required_ruby_version || Gem::Requirement.default
+  end
+
+  ##
+  # The required_rubygems_version constraint for this specification
+  #
+  # A fallback is included because the original version of the specification
+  # API didn't include that field, so some marshalled specs in the index have it
+  # set to +nil+.
+
+  def required_rubygems_version
+    spec.required_rubygems_version || Gem::Requirement.default
+  end
+
+  def ==(other)
+    self.class === other &&
+      @name == other.name &&
+      @version == other.version &&
+      @platform == other.platform
+  end
+
+  def hash
+    @name.hash ^ @version.hash ^ @platform.hash
+  end
+
   def inspect # :nodoc:
-    '#<%s %s source %s>' % [self.class, full_name, @source]
+    "#<%s %s source %s>" % [self.class, full_name, @source]
   end
 
   def pretty_print(q) # :nodoc:
-    q.group 2, '[Index specification', ']' do
+    q.group 2, "[Index specification", "]" do
       q.breakable
       q.text full_name
 
@@ -49,7 +81,7 @@ class Gem::Resolver::IndexSpecification < Gem::Resolver::Specification
       end
 
       q.breakable
-      q.text 'source '
+      q.text "source "
       q.pp @source
     end
   end
@@ -60,10 +92,9 @@ class Gem::Resolver::IndexSpecification < Gem::Resolver::Specification
   def spec # :nodoc:
     @spec ||=
       begin
-        tuple = Gem::NameTuple.new @name, @version, @platform
+        tuple = Gem::NameTuple.new @name, @version, @original_platform
 
         @source.fetch_spec tuple
       end
   end
-
 end

data/lib/rubygems/resolver/installed_specification.rb

@@ -4,10 +4,9 @@
 # locally.
 
 class Gem::Resolver::InstalledSpecification < Gem::Resolver::SpecSpecification
-
   def ==(other) # :nodoc:
-    self.class === other and
-      @set  == other.set and
+    self.class === other &&
+      @set  == other.set &&
       @spec == other.spec
   end
 
@@ -31,7 +30,7 @@ class Gem::Resolver::InstalledSpecification < Gem::Resolver::SpecSpecification
   end
 
   def pretty_print(q) # :nodoc:
-    q.group 2, '[InstalledSpecification', ']' do
+    q.group 2, "[InstalledSpecification", "]" do
       q.breakable
       q.text "name: #{name}"
 
@@ -42,7 +41,7 @@ class Gem::Resolver::InstalledSpecification < Gem::Resolver::SpecSpecification
       q.text "platform: #{platform}"
 
       q.breakable
-      q.text 'dependencies:'
+      q.text "dependencies:"
       q.breakable
       q.pp spec.dependencies
     end
@@ -54,5 +53,4 @@ class Gem::Resolver::InstalledSpecification < Gem::Resolver::SpecSpecification
   def source
     @source ||= Gem::Source::Installed.new
   end
-
 end

data/lib/rubygems/resolver/installer_set.rb

@@ -4,7 +4,6 @@
 # files
 
 class Gem::Resolver::InstallerSet < Gem::Resolver::Set
-
   ##
   # List of Gem::Specification objects that must always be installed.
 
@@ -26,6 +25,12 @@ 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+.
 
@@ -33,7 +38,6 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set
     super()
 
     @domain = domain
-    @remote = consider_remote?
 
     @f = Gem::SpecFetcher.fetcher
 
@@ -43,6 +47,7 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set
     @local               = {}
     @local_source        = Gem::Source::Local.new
     @remote_set          = Gem::Resolver::BestSet.new
+    @force               = false
     @specs               = {}
   end
 
@@ -56,24 +61,38 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set
     found = find_all request
 
     found.delete_if do |s|
-      s.version.prerelease? and not s.local?
+      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(s.platform)
+    end
+
+    found = found.sort_by do |s|
+      [s.version, Gem::Platform.sort_priority(s.platform)]
     end
 
-    if found.empty?
+    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
@@ -91,14 +110,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
 
   ##
@@ -117,13 +136,13 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set
 
     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
@@ -148,10 +167,6 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set
       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
@@ -168,10 +183,10 @@ 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 {|s| s.full_name }
 
-    '#<%s domain: %s specs: %p always install: %p>' % [
-      self.class, @domain, @specs.keys, always_install,
+    "#<%s domain: %s specs: %p always install: %p>" % [
+      self.class, @domain, @specs.keys, always_install
     ]
   end
 
@@ -199,16 +214,16 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set
   end
 
   def pretty_print(q) # :nodoc:
-    q.group 2, '[InstallerSet', ']' do
+    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
@@ -224,4 +239,31 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set
     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

@@ -3,7 +3,6 @@
 # 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.
 
@@ -18,7 +17,7 @@ class Gem::Resolver::LocalSpecification < Gem::Resolver::SpecSpecification
   end
 
   def pretty_print(q) # :nodoc:
-    q.group 2, '[LocalSpecification', ']' do
+    q.group 2, "[LocalSpecification", "]" do
       q.breakable
       q.text "name: #{name}"
 
@@ -29,7 +28,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,5 +36,4 @@ class Gem::Resolver::LocalSpecification < Gem::Resolver::SpecSpecification
       q.text "source: #{@source.path}"
     end
   end
-
 end

data/lib/rubygems/resolver/lock_set.rb

@@ -3,7 +3,6 @@
 # A set of gems from a gem dependencies lockfile.
 
 class Gem::Resolver::LockSet < Gem::Resolver::Set
-
   attr_reader :specs # :nodoc:
 
   ##
@@ -29,7 +28,7 @@ class Gem::Resolver::LockSet < Gem::Resolver::Set
   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
@@ -55,7 +54,7 @@ class Gem::Resolver::LockSet < Gem::Resolver::Set
     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
@@ -64,19 +63,18 @@ class Gem::Resolver::LockSet < Gem::Resolver::Set
   end
 
   def pretty_print(q) # :nodoc:
-    q.group 2, '[LockSet', ']' do
+    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 {|spec| spec.full_name }
     end
   end
-
 end

data/lib/rubygems/resolver/lock_specification.rb

@@ -6,7 +6,6 @@
 # lockfile.
 
 class Gem::Resolver::LockSpecification < Gem::Resolver::Specification
-
   attr_reader :sources
 
   def initialize(set, name, version, sources, platform)
@@ -30,7 +29,7 @@ class Gem::Resolver::LockSpecification < Gem::Resolver::Specification
   def install(options = {})
     destination = options[:install_dir] || Gem.dir
 
-    if File.exist? File.join(destination, 'specifications', spec.spec_name)
+    if File.exist? File.join(destination, "specifications", spec.spec_name)
       yield nil
       return
     end
@@ -46,7 +45,7 @@ class Gem::Resolver::LockSpecification < Gem::Resolver::Specification
   end
 
   def pretty_print(q) # :nodoc:
-    q.group 2, '[LockSpecification', ']' do
+    q.group 2, "[LockSpecification", "]" do
       q.breakable
       q.text "name: #{@name}"
 
@@ -60,7 +59,7 @@ class Gem::Resolver::LockSpecification < Gem::Resolver::Specification
 
       unless @dependencies.empty?
         q.breakable
-        q.text 'dependencies:'
+        q.text "dependencies:"
         q.breakable
         q.pp @dependencies
       end
@@ -72,7 +71,7 @@ class Gem::Resolver::LockSpecification < Gem::Resolver::Specification
 
   def spec
     @spec ||= Gem::Specification.find do |spec|
-      spec.name == @name and spec.version == @version
+      spec.name == @name && spec.version == @version
     end
 
     @spec ||= Gem::Specification.new do |s|
@@ -83,5 +82,4 @@ class Gem::Resolver::LockSpecification < Gem::Resolver::Specification
       s.dependencies.concat @dependencies
     end
   end
-
 end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Gem::Resolver::Molinillo
   # @!visibility private
   module Delegates
@@ -45,6 +46,12 @@ module Gem::Resolver::Molinillo
         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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Gem::Resolver::Molinillo
   module Delegates
     # Delegates all {Gem::Resolver::Molinillo::SpecificationProvider} methods to a
@@ -25,6 +26,13 @@ module Gem::Resolver::Molinillo
         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

data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/action.rb

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

data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/add_edge_no_circular.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
-require 'rubygems/resolver/molinillo/lib/molinillo/dependency_graph/action'
+
+require_relative 'action'
 module Gem::Resolver::Molinillo
   class DependencyGraph
     # @!visibility private

data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/add_vertex.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
-require 'rubygems/resolver/molinillo/lib/molinillo/dependency_graph/action'
+
+require_relative 'action'
 module Gem::Resolver::Molinillo
   class DependencyGraph
     # @!visibility private

data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/delete_edge.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
-require 'rubygems/resolver/molinillo/lib/molinillo/dependency_graph/action'
+
+require_relative 'action'
 module Gem::Resolver::Molinillo
   class DependencyGraph
     # @!visibility private