rubygems-update 2.6.1 → 3.5.0

data/lib/rubygems/dependency.rb

@@ -1,11 +1,9 @@
 # frozen_string_literal: true
+
 ##
 # The Dependency class holds a Gem name and a Gem::Requirement.
 
-require "rubygems/requirement"
-
 class Gem::Dependency
-
   ##
   # Valid dependency types.
   #--
@@ -18,7 +16,7 @@ class Gem::Dependency
   TYPES = [
     :development,
     :runtime,
-  ]
+  ].freeze
 
   ##
   # Dependency name or regular expression.
@@ -35,7 +33,7 @@ class Gem::Dependency
   # argument can optionally be the dependency type, which defaults to
   # <tt>:runtime</tt>.
 
-  def initialize name, *requirements
+  def initialize(name, *requirements)
     case name
     when String then # ok
     when Regexp then
@@ -48,10 +46,10 @@ class Gem::Dependency
     end
 
     type         = Symbol === requirements.last ? requirements.pop : :runtime
-    requirements = requirements.first if 1 == requirements.length # unpack
+    requirements = requirements.first if requirements.length == 1 # unpack
 
     unless TYPES.include? type
-      raise ArgumentError, "Valid types are #{TYPES.inspect}, " +
+      raise ArgumentError, "Valid types are #{TYPES.inspect}, " \
                            "not #{type.inspect}"
     end
 
@@ -75,12 +73,10 @@ class Gem::Dependency
   end
 
   def inspect # :nodoc:
-    if prerelease? then
-      "<%s type=%p name=%p requirements=%p prerelease=ok>" %
-        [self.class, self.type, self.name, requirement.to_s]
+    if prerelease?
+      format("<%s type=%p name=%p requirements=%p prerelease=ok>", self.class, type, name, requirement.to_s)
     else
-      "<%s type=%p name=%p requirements=%p>" %
-        [self.class, self.type, self.name, requirement.to_s]
+      format("<%s type=%p name=%p requirements=%p>", self.class, type, name, requirement.to_s)
     end
   end
 
@@ -99,15 +95,15 @@ class Gem::Dependency
     @requirement.none?
   end
 
-  def pretty_print q # :nodoc:
-    q.group 1, 'Gem::Dependency.new(', ')' do
+  def pretty_print(q) # :nodoc:
+    q.group 1, "Gem::Dependency.new(", ")" do
       q.pp name
-      q.text ','
+      q.text ","
       q.breakable
 
       q.pp requirement
 
-      q.text ','
+      q.text ","
       q.breakable
 
       q.pp type
@@ -118,7 +114,7 @@ class Gem::Dependency
   # What does this dependency require?
 
   def requirement
-    return @requirement if defined?(@requirement) and @requirement
+    return @requirement if defined?(@requirement) && @requirement
 
     # @version_requirements and @version_requirement are legacy ivar
     # names, and supported here because older gems need to keep
@@ -139,7 +135,7 @@ class Gem::Dependency
 
     if defined?(@version_requirement) && @version_requirement
       version = @version_requirement.instance_variable_get :@version
-      @version_requirement  = nil
+      @version_requirement = nil
       @version_requirements = Gem::Requirement.new version
     end
 
@@ -151,7 +147,7 @@ class Gem::Dependency
   end
 
   def to_s # :nodoc:
-    if type != :runtime then
+    if type != :runtime
       "#{name} (#{requirement}, #{type})"
     else
       "#{name} (#{requirement})"
@@ -169,18 +165,18 @@ class Gem::Dependency
     @type == :runtime || !@type
   end
 
-  def == other # :nodoc:
+  def ==(other) # :nodoc:
     Gem::Dependency === other &&
-      self.name        == other.name &&
-      self.type        == other.type &&
-      self.requirement == other.requirement
+      name        == other.name &&
+      type        == other.type &&
+      requirement == other.requirement
   end
 
   ##
   # Dependencies are ordered by name.
 
-  def <=> other
-    self.name <=> other.name
+  def <=>(other)
+    name <=> other.name
   end
 
   ##
@@ -189,7 +185,7 @@ class Gem::Dependency
   # other has only an equal version requirement that satisfies this
   # dependency.
 
-  def =~ other
+  def =~(other)
     unless Gem::Dependency === other
       return unless other.respond_to?(:name) && other.respond_to?(:version)
       other = Gem::Dependency.new other.name, other.version
@@ -200,14 +196,14 @@ class Gem::Dependency
     reqs = other.requirement.requirements
 
     return false unless reqs.length == 1
-    return false unless reqs.first.first == '='
+    return false unless reqs.first.first == "="
 
     version = reqs.first.last
 
     requirement.satisfied_by? version
   end
 
-  alias === =~
+  alias_method :===, :=~
 
   ##
   # :call-seq:
@@ -221,7 +217,7 @@ class Gem::Dependency
   # NOTE:  Unlike #matches_spec? this method does not return true when the
   # version is a prerelease version unless this is a prerelease dependency.
 
-  def match? obj, version=nil, allow_prerelease=false
+  def match?(obj, version=nil, allow_prerelease=false)
     if !version
       name = obj.name
       version = obj.version
@@ -233,10 +229,10 @@ class Gem::Dependency
 
     version = Gem::Version.new version
 
-    return true if requirement.none? and not version.prerelease?
-    return false if version.prerelease? and
-                    not allow_prerelease and
-                    not prerelease?
+    return true if requirement.none? && !version.prerelease?
+    return false if version.prerelease? &&
+                    !allow_prerelease &&
+                    !prerelease?
 
     requirement.satisfied_by? version
   end
@@ -248,7 +244,7 @@ class Gem::Dependency
   # returns true when +spec+ is a prerelease version even if this dependency
   # is not a prerelease dependency.
 
-  def matches_spec? spec
+  def matches_spec?(spec)
     return false unless name === spec.name
     return true  if requirement.none?
 
@@ -258,14 +254,14 @@ class Gem::Dependency
   ##
   # Merges the requirements of +other+ into this dependency
 
-  def merge other
-    unless name == other.name then
+  def merge(other)
+    unless name == other.name
       raise ArgumentError,
             "#{self} and #{other} have different names"
     end
 
     default = Gem::Requirement.default
-    self_req  = self.requirement
+    self_req = requirement
     other_req = other.requirement
 
     return self.class.new name, self_req  if other_req == default
@@ -274,19 +270,24 @@ class Gem::Dependency
     self.class.new name, self_req.as_list.concat(other_req.as_list)
   end
 
-  def matching_specs platform_only = false
+  def matching_specs(platform_only = false)
     env_req = Gem.env_requirement(name)
-    matches = Gem::Specification.stubs_for(name).find_all { |spec|
+    matches = Gem::Specification.stubs_for(name).find_all do |spec|
       requirement.satisfied_by?(spec.version) && env_req.satisfied_by?(spec.version)
-    }.map(&:to_spec)
+    end.map(&:to_spec)
+
+    if prioritizes_bundler?
+      require_relative "bundler_version_finder"
+      Gem::BundlerVersionFinder.prioritize!(matches)
+    end
 
     if platform_only
-      matches.reject! { |spec|
-        spec.nil? || !Gem::Platform.match(spec.platform)
-      }
+      matches.reject! do |spec|
+        spec.nil? || !Gem::Platform.match_spec?(spec)
+      end
     end
 
-    matches.sort_by { |s| s.sort_obj } # HACK: shouldn't be needed
+    matches
   end
 
   ##
@@ -296,28 +297,23 @@ class Gem::Dependency
     @requirement.specific?
   end
 
+  def prioritizes_bundler?
+    name == "bundler" && !specific?
+  end
+
   def to_specs
     matches = matching_specs true
 
     # TODO: check Gem.activated_spec[self.name] in case matches falls outside
 
-    if matches.empty? then
-      specs = Gem::Specification.find_all { |s|
-                s.name == name
-              }.map { |x| x.full_name }
+    if matches.empty?
+      specs = Gem::Specification.stubs_for name
 
       if specs.empty?
-        total = Gem::Specification.to_a.size
-        msg   = "Could not find '#{name}' (#{requirement}) among #{total} total gem(s)\n".dup
+        raise Gem::MissingSpecError.new name, requirement
       else
-        msg   = "Could not find '#{name}' (#{requirement}) - did find: [#{specs.join ','}]\n".dup
+        raise Gem::MissingSpecVersionError.new name, requirement, specs
       end
-      msg << "Checked in 'GEM_PATH=#{Gem.path.join(File::PATH_SEPARATOR)}', execute `gem env` for more information"
-
-      error = Gem::LoadError.new(msg)
-      error.name        = self.name
-      error.requirement = self.requirement
-      raise error
     end
 
     # TODO: any other resolver validations should go here
@@ -326,14 +322,31 @@ class Gem::Dependency
   end
 
   def to_spec
-    matches = self.to_specs
-
-    active = matches.find { |spec| spec && spec.activated? }
+    matches = to_specs.compact
 
+    active = matches.find(&:activated?)
     return active if active
 
-    matches.delete_if { |spec| spec.nil? || spec.version.prerelease? } unless prerelease?
+    unless prerelease?
+      # Move prereleases to the end of the list for >= 0 requirements
+      pre, matches = matches.partition {|spec| spec.version.prerelease? }
+      matches += pre if requirement == Gem::Requirement.default
+    end
+
+    matches.first
+  end
 
-    matches.last
+  def identity
+    if prerelease?
+      if specific?
+        :complete
+      else
+        :abs_latest
+      end
+    elsif latest_version?
+      :latest
+    else
+      :released
+    end
   end
 end