pub_grub 0.4.3 → 0.5.0.alpha

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fb8a4eb75ab624c0460ae89a756058d8fc98747296d5b0422b63c0d915756e3
-  data.tar.gz: 99a4e76956dd0368acb67f87afe5f36357496fe1504bc4eb6f9670e10095cbf7
+  metadata.gz: 77a0d3a900e165738c32a45c4f6218118fdb4d2789a8ada9488ae75036a16bd2
+  data.tar.gz: df30c5a36123db7bb05da53e04e1380076bdeb547e66bc0beb270cbb376d7467
 SHA512:
-  metadata.gz: d9977b304c9ca7f483d95cbc1c3a385a6bb553d780600f07b7669368afdb3d07cd86e5021df4e5f63f1e31dd2fb607ff9d8f427024828b26a82af38248e4cd37
-  data.tar.gz: 1545a55656626c8b0575dc4b058f6eed4bf63c40f58f8cf25268bcdd1623e72e6ea7df9914727ab262783579ff154463146da0cddf2ceafd3a719390ebab9ea4
+  metadata.gz: c324be012eb25169bc76cc77ffda085fd4cb87c2e5bf142bb3c34476164e3b21e4957e161ae4352f77269ba5885051a359f5fcd41b002fea033e36235de8aaab
+  data.tar.gz: 6d3ea95559f7088d7ed58620f64bc0c3123642563267ac2bc483fddc57c606a6ca284869e25986293dcd60f5d71c82f17356a6a48ff6f5519bf01832f002c9e0

data/lib/pub_grub.rb

@@ -8,6 +8,7 @@ require "pub_grub/version_solver"
 require "pub_grub/incompatibility"
 require 'pub_grub/solve_failure'
 require 'pub_grub/failure_writer'
+require 'pub_grub/version'
 
 require "logger"
 

data/lib/pub_grub/package.rb

@@ -29,7 +29,7 @@ module PubGrub
     end
 
     def to_s
-      name
+      name.to_s
     end
   end
 end

data/lib/pub_grub/version.rb

@@ -1,3 +1,3 @@
 module PubGrub
-  VERSION = "0.4.3"
+  VERSION = "0.5.0.alpha"
 end

data/lib/pub_grub/version_solver.rb

@@ -18,6 +18,8 @@ module PubGrub
 
       @solution = PartialSolution.new
 
+      @package_depth = { root => 0 }
+
       add_incompatibility Incompatibility.new([
         Term.new(VersionConstraint.any(root), false)
       ], cause: :root)
@@ -100,24 +102,24 @@ module PubGrub
       unsatisfied.package
     end
 
-    def choose_package_version
-      unsatisfied = solution.unsatisfied
+    def next_package_to_try
+      solution.unsatisfied.min_by do |term|
+        package = term.package
+        versions = source.versions_for(package, term.constraint.range)
 
-      if unsatisfied.empty?
+        [@package_depth[package], versions.count]
+      end.package
+    end
+
+    def choose_package_version
+      if solution.unsatisfied.empty?
         logger.info "No packages unsatisfied. Solving complete!"
         return nil
       end
 
-      unsatisfied_term, versions =
-        unsatisfied.map do |term|
-          range = term.constraint.range
-          [term, source.versions_for(term.package, range)]
-        end.min_by do |(_, v)|
-          v.count
-        end
-
-      package = unsatisfied_term.package
-      version = versions.first
+      package = next_package_to_try
+      unsatisfied_term = solution.unsatisfied.find { |t| t.package == package }
+      version = source.versions_for(package, unsatisfied_term.constraint.range).first
 
       if version.nil?
         cause = Incompatibility::NoVersions.new(unsatisfied_term)
@@ -133,6 +135,12 @@ module PubGrub
         conflict ||= incompatibility.terms.all? do |term|
           term.package == package || solution.satisfies?(term)
         end
+
+        # Update depths of new packages
+        depth = @package_depth[package] + 1
+        incompatibility.terms.each do |term|
+          @package_depth[term.package] ||= depth
+        end
       end
 
       unless conflict

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pub_grub
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.0.alpha
 platform: ruby
 authors:
 - John Hawthorn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-30 00:00:00.000000000 Z
+date: 2019-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -130,9 +130,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.7