solve 0.4.0.rc1 → 0.4.0

data/Gemfile

@@ -27,7 +27,7 @@ group :development do
     end rescue Errno::ENOENT
 
   elsif RbConfig::CONFIG['target_os'] =~ /linux/i
-    gem 'libnotify',  '~> 0.7.1', require: false
+    gem 'libnotify',  '~> 0.8.0', require: false
     gem 'rb-inotify', require: false
 
   elsif RbConfig::CONFIG['target_os'] =~ /mswin|mingw/i

data/lib/solve/gem_version.rb

@@ -1,3 +1,3 @@
 module Solve
-  VERSION = "0.4.0.rc1"
+  VERSION = "0.4.0"
 end

data/lib/solve/solver.rb

@@ -96,6 +96,10 @@ module Solve
       while unbound_variable = variable_table.first_unbound
         possible_values_for_unbound = possible_values_for(unbound_variable)
         trace("Searching for a value for #{unbound_variable.artifact}")
+        trace("Constraints are")
+        constraint_table.constraints_on_artifact(unbound_variable.artifact).each do |constraint|
+          trace("\t#{constraint}")
+        end
         trace("Possible values are #{possible_values_for_unbound}")
         
         while possible_value = possible_values_for_unbound.shift
@@ -233,15 +237,29 @@ module Solve
           constraint_table.add(dependency, source)
           dependency_domain = graph.versions(dependency.name, dependency.constraint)
           domain[dependency.name] = [(domain[dependency.name] || []), dependency_domain]
-            .flatten
-            .uniq
-            .sort { |left, right| right.version <=> left.version }
+          .flatten
+          .uniq
+          .sort { |left, right| right.version <=> left.version }
+
+          #if the variable we are constraining is still unbound, we want to filter
+          #its possible values, if its already bound, we know its ok to add this constraint because
+          #we can never change a previously bound value without removing this constraint and we check above
+          #whether or not its ok to add this constraint given the current value
+
+          variable = variable_table.find_artifact(dependency.name)
+          if variable.value.nil?
+            reset_possible_values_for(variable)
+          end
+
         end
       end
 
       def reset_possible_values_for(variable)
+        trace("Resetting possible values for #{variable.artifact}")
         possible_values[variable.artifact] = nil
-        possible_values_for(variable)
+        x = possible_values_for(variable)
+        trace("Possible values are #{x}")
+        x
       end
 
       def backtrack(unbound_variable)

data/spec/acceptance/solutions_spec.rb

@@ -158,4 +158,37 @@ describe "Solutions" do
                         "D" => "0.0.0"})
 
   end
+
+  it "correctly resolves when a resolution exists but it is not the latest" do
+    graph = Solve::Graph.new
+
+    graph.artifacts("get-the-old-one", "1.0.0")
+      .depends("locked-mid-1", ">= 0.0.0")
+      .depends("locked-mid-2", ">= 0.0.0")
+    graph.artifacts("get-the-old-one", "0.5.0")
+
+    graph.artifacts("locked-mid-1", "2.0.0").depends("old-bottom", "= 2.0.0")
+    graph.artifacts("locked-mid-1", "1.3.0").depends("old-bottom", "= 0.5.0")
+    graph.artifacts("locked-mid-1", "1.0.0")
+
+    graph.artifacts("locked-mid-2", "2.0.0").depends("old-bottom", "= 2.1.0")
+    graph.artifacts("locked-mid-2", "1.4.0").depends("old-bottom", "= 0.5.0")
+    graph.artifacts("locked-mid-2", "1.0.0")
+
+    graph.artifacts("old-bottom", "2.1.0")
+    graph.artifacts("old-bottom", "2.0.0")
+    graph.artifacts("old-bottom", "1.0.0")
+    graph.artifacts("old-bottom", "0.5.0")
+
+    demands = [["get-the-old-one"]]
+
+    result = Solve.it!(graph, demands)
+
+    result.should eql({
+      "get-the-old-one" => "1.0.0",
+      "locked-mid-1" => "2.0.0",
+      "locked-mid-2" => "1.0.0",
+      "old-bottom" => "2.0.0"
+    })
+  end
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: solve
 version: !ruby/object:Gem::Version
-  version: 0.4.0.rc1
-  prerelease: 6
+  version: 0.4.0
+  prerelease: 
 platform: ruby
 authors:
 - Jamie Winsor
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-16 00:00:00.000000000 Z
+date: 2012-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -88,9 +88,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: 1956860020299401788
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23