bundler 2.6.6 → 2.6.8

data/lib/bundler/vendor/pub_grub/lib/pub_grub/version_solver.rb

@@ -2,17 +2,20 @@ require_relative 'partial_solution'
 require_relative 'term'
 require_relative 'incompatibility'
 require_relative 'solve_failure'
+require_relative 'strategy'
 
 module Bundler::PubGrub
   class VersionSolver
     attr_reader :logger
     attr_reader :source
     attr_reader :solution
+    attr_reader :strategy
 
-    def initialize(source:, root: Package.root, logger: Bundler::PubGrub.logger)
+    def initialize(source:, root: Package.root, strategy: Strategy.new(source), logger: Bundler::PubGrub.logger)
       @logger = logger
 
       @source = source
+      @strategy = strategy
 
       # { package => [incompatibility, ...]}
       @incompatibilities = Hash.new do |h, k|
@@ -36,26 +39,25 @@ module Bundler::PubGrub
 
     # Returns true if there is more work to be done, false otherwise
     def work
-      return false if solved?
-
-      next_package = choose_package_version
-      propagate(next_package)
-
-      if solved?
+      unsatisfied_terms = solution.unsatisfied
+      if unsatisfied_terms.empty?
         logger.info { "Solution found after #{solution.attempted_solutions} attempts:" }
         solution.decisions.each do |package, version|
           next if Package.root?(package)
           logger.info { "* #{package} #{version}" }
         end
 
-        false
-      else
-        true
+        return false
       end
+
+      next_package = choose_package_version_from(unsatisfied_terms)
+      propagate(next_package)
+
+      true
     end
 
     def solve
-      work until solved?
+      while work; end
 
       solution.decisions
     end
@@ -105,29 +107,15 @@ module Bundler::PubGrub
       unsatisfied.package
     end
 
-    def next_package_to_try
-      solution.unsatisfied.min_by do |term|
-        package = term.package
-        range = term.constraint.range
-        matching_versions = source.versions_for(package, range)
-        higher_versions = source.versions_for(package, range.upper_invert)
+    def choose_package_version_from(unsatisfied_terms)
+      remaining = unsatisfied_terms.map { |t| [t.package, t.constraint.range] }.to_h
 
-        [matching_versions.count <= 1 ? 0 : 1, higher_versions.count]
-      end.package
-    end
-
-    def choose_package_version
-      if solution.unsatisfied.empty?
-        logger.info "No packages unsatisfied. Solving complete!"
-        return nil
-      end
+      package, version = strategy.next_package_and_version(remaining)
 
-      package = next_package_to_try
-      unsatisfied_term = solution.unsatisfied.find { |t| t.package == package }
-      version = source.versions_for(package, unsatisfied_term.constraint.range).first
       logger.debug { "attempting #{package} #{version}" }
 
       if version.nil?
+        unsatisfied_term = unsatisfied_terms.find { |t| t.package == package }
         add_incompatibility source.no_versions_incompatibility_for(package, unsatisfied_term)
         return package
       end

data/lib/bundler/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: false
 
 module Bundler
-  VERSION = "2.6.6".freeze
+  VERSION = "2.6.8".freeze
 
   def self.bundler_major_version
     @bundler_major_version ||= VERSION.split(".").first.to_i

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler
 version: !ruby/object:Gem::Version
-  version: 2.6.6
+  version: 2.6.8
 platform: ruby
 authors:
 - André Arko
@@ -21,7 +21,7 @@ authors:
 - Yehuda Katz
 bindir: exe
 cert_chain: []
-date: 2025-03-13 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies: []
 description: Bundler manages an application's dependencies through its entire life,
   across many machines, systematically and repeatably
@@ -77,7 +77,6 @@ files:
 - lib/bundler/compact_index_client.rb
 - lib/bundler/compact_index_client/cache.rb
 - lib/bundler/compact_index_client/cache_file.rb
-- lib/bundler/compact_index_client/gem_parser.rb
 - lib/bundler/compact_index_client/parser.rb
 - lib/bundler/compact_index_client/updater.rb
 - lib/bundler/constants.rb
@@ -210,6 +209,7 @@ files:
 - lib/bundler/resolver/package.rb
 - lib/bundler/resolver/root.rb
 - lib/bundler/resolver/spec_group.rb
+- lib/bundler/resolver/strategy.rb
 - lib/bundler/retry.rb
 - lib/bundler/ruby_dsl.rb
 - lib/bundler/ruby_version.rb
@@ -310,6 +310,7 @@ files:
 - lib/bundler/vendor/pub_grub/lib/pub_grub/rubygems.rb
 - lib/bundler/vendor/pub_grub/lib/pub_grub/solve_failure.rb
 - lib/bundler/vendor/pub_grub/lib/pub_grub/static_package_source.rb
+- lib/bundler/vendor/pub_grub/lib/pub_grub/strategy.rb
 - lib/bundler/vendor/pub_grub/lib/pub_grub/term.rb
 - lib/bundler/vendor/pub_grub/lib/pub_grub/version.rb
 - lib/bundler/vendor/pub_grub/lib/pub_grub/version_constraint.rb
@@ -411,7 +412,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 3.3.3
 requirements: []
-rubygems_version: 3.6.6
+rubygems_version: 3.6.8
 specification_version: 4
 summary: The best way to manage your application's dependencies
 test_files: []

data/lib/bundler/compact_index_client/gem_parser.rb

@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-
-module Bundler
-  class CompactIndexClient
-    if defined?(Gem::Resolver::APISet::GemParser)
-      GemParser = Gem::Resolver::APISet::GemParser
-    else
-      class 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
-    end
-  end
-end