solve 0.3.0 → 0.3.1

data/lib/solve.rb

@@ -1,3 +1,5 @@
+require 'forwardable'
+require 'json'
 require 'solve/errors'
 
 # @author Jamie Winsor <jamie@vialstudios.com>
@@ -15,14 +17,17 @@ module Solve
     # requirements (demands) which must be met. Return me the best solution of
     # artifacts and verisons that I should use.
     #
+    # If a ui object is passed in, the resolution will be traced
+    #
     # @param [Solve::Graph] graph
     # @param [Array<Solve::Demand>, Array<String, String>] demands
+    # @param [#say, nil] ui
     #
     # @raise [NoSolutionError]
     #
     # @return [Hash]
-    def it!(graph, demands)
-      Solver.new(graph, demands).resolve
+    def it!(graph, demands, ui=nil)
+      Solver.new(graph, demands, ui).resolve
     end
   end
 end

data/lib/solve/constraint.rb

@@ -145,9 +145,7 @@ module Solve
     def ==(other)
       other.is_a?(self.class) &&
         self.operator == other.operator &&
-        self.major == other.minor &&
-        self.minor == other.minor &&
-        self.patch == other.patch
+        self.version == other.version 
     end
     alias_method :eql?, :==
 

data/lib/solve/demand.rb

@@ -43,5 +43,12 @@ module Solve
     def to_s
       "#{name} (#{constraint})"
     end
+
+    def ==(other)
+      other.is_a?(self.class) &&
+        self.name == other.name &&
+        self.constraint == other.constraint
+    end
+    alias_method :eql?, :==
   end
 end

data/lib/solve/gem_version.rb

@@ -1,3 +1,3 @@
 module Solve
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/lib/solve/graph.rb

@@ -134,11 +134,35 @@ module Solve
       !get_artifact(name, version).nil?
     end
 
-    private
+    # @param [Object] other
+    #
+    # @return [Boolean]
+    def ==(other)
+      return false unless other.is_a?(self.class)
 
-      # @return [Array<Solve::Artifact>]
-      def artifact_collection
-        @artifacts.collect { |name, artifact| artifact }
-      end
+      self_artifacts = self.artifacts
+      other_artifacts = other.artifacts
+
+      self_dependencies = self_artifacts.inject([]) do |list, artifact|
+        list << artifact.dependencies
+      end.flatten
+
+      other_dependencies = other_artifacts.inject([]) do |list, artifact|
+        list << artifact.dependencies
+      end.flatten
+
+      self_artifacts.size == other_artifacts.size &&
+        self_dependencies.size == other_dependencies.size &&
+        self_artifacts.all? { |artifact| other_artifacts.include?(artifact) } &&
+        self_dependencies.all? { |dependency| other_dependencies.include?(dependency) }
+    end
+    alias_method :eql?, :==
+
+      private
+
+        # @return [Array<Solve::Artifact>]
+        def artifact_collection
+          @artifacts.collect { |name, artifact| artifact }
+        end
   end
 end

data/lib/solve/solver.rb

@@ -2,9 +2,10 @@ module Solve
   # @author Jamie Winsor <jamie@vialstudios.com>
   class Solver
     autoload :VariableTable, 'solve/solver/variable_table'
-    autoload :Variable, 'solve/solver/variable'
+    autoload :VariableRow, 'solve/solver/variable_row'
     autoload :ConstraintTable, 'solve/solver/constraint_table'
     autoload :ConstraintRow, 'solve/solver/constraint_row'
+    autoload :Serializer, 'solve/solver/serializer'
 
     class << self
       # Create a key to identify a demand on a Solver.
@@ -61,6 +62,8 @@ module Solve
     #
     # @return [Solve::Graph]
     attr_reader :graph
+    attr_reader :demands
+    attr_reader :ui
 
     attr_reader :domain
     attr_reader :variable_table
@@ -69,10 +72,13 @@ module Solve
 
     # @param [Solve::Graph] graph
     # @param [Array<String>, Array<Array<String, String>>] demands
-    def initialize(graph, demands = Array.new)
+    # @param [#say] ui
+    def initialize(graph, demands = Array.new, ui=nil) 
       @graph = graph
-      @domain = Hash.new
       @demands = Hash.new
+      @ui = ui.respond_to?(:say) ? ui : nil
+
+      @domain = Hash.new
       @possible_values = Hash.new
       @constraint_table = ConstraintTable.new
       @variable_table = VariableTable.new
@@ -84,16 +90,20 @@ module Solve
 
     # @return [Hash]
     def resolve
+      trace("Attempting to find a solution")
       seed_demand_dependencies
 
       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("Possible values are #{possible_values_for_unbound}")
         
         while possible_value = possible_values_for_unbound.shift
-          possible_artifact = graph.get_artifact(unbound_variable.package, possible_value.version)
+          possible_artifact = graph.get_artifact(unbound_variable.artifact, possible_value.version)
           possible_dependencies = possible_artifact.dependencies
           all_ok = possible_dependencies.all? { |dependency| can_add_new_constraint?(dependency) }
           if all_ok
+            trace("Attempting to use #{possible_artifact}")
             add_dependencies(possible_dependencies, possible_artifact) 
             unbound_variable.bind(possible_value)
             break
@@ -101,15 +111,21 @@ module Solve
         end
 
         unless unbound_variable.bound?
+          trace("Could not find an acceptable value for #{unbound_variable.artifact}")
           backtrack(unbound_variable) 
         end
       end
 
-      {}.tap do |solution|
+      solution = {}.tap do |solution|
         variable_table.rows.each do |variable|
-          solution[variable.package] = variable.value.version.to_s
+          solution[variable.artifact] = variable.value.version.to_s
         end
       end
+
+      trace("Found Solution")
+      trace(solution)
+
+      solution
     end
 
     # @overload demands(name, constraint)
@@ -192,28 +208,29 @@ module Solve
       end
 
       def can_add_new_constraint?(dependency)
-        current_binding = variable_table.find_package(dependency.name)
+        current_binding = variable_table.find_artifact(dependency.name)
         #haven't seen it before, haven't bound it yet or the binding is ok
         current_binding.nil? || current_binding.value.nil? || dependency.constraint.satisfies?(current_binding.value.version)
       end
 
       def possible_values_for(variable)
-        possible_values_for_variable = possible_values[variable.package]
+        possible_values_for_variable = possible_values[variable.artifact]
         if possible_values_for_variable.nil?
-          constraints_for_variable = constraint_table.constraints_on_package(variable.package)
-          all_values_for_variable = domain[variable.package]
+          constraints_for_variable = constraint_table.constraints_on_artifact(variable.artifact)
+          all_values_for_variable = domain[variable.artifact]
           possible_values_for_variable = constraints_for_variable.inject(all_values_for_variable) do |remaining_values, constraint|
             remaining_values.reject { |value| !constraint.satisfies?(value.version) }
           end
-          possible_values[variable.package] = possible_values_for_variable
+          possible_values[variable.artifact] = possible_values_for_variable
         end
         possible_values_for_variable
       end
 
       def add_dependencies(dependencies, source)
         dependencies.each do |dependency|
+          trace("Adding constraint #{dependency.name} #{dependency.constraint} from #{source}")
           variable_table.add(dependency.name, source)
-          constraint_table.add(dependency.name, dependency.constraint, source)
+          constraint_table.add(dependency, source)
           dependency_domain = graph.versions(dependency.name, dependency.constraint)
           domain[dependency.name] = [(domain[dependency.name] || []), dependency_domain]
             .flatten
@@ -223,24 +240,38 @@ module Solve
       end
 
       def reset_possible_values_for(variable)
-        possible_values[variable.package] = nil
+        possible_values[variable.artifact] = nil
         possible_values_for(variable)
       end
 
       def backtrack(unbound_variable)
-        previous_variable = variable_table.before(unbound_variable.package)
+        previous_variable = variable_table.before(unbound_variable.artifact)
 
         if previous_variable.nil?
+          trace("Cannot backtrack any further")
           raise Errors::NoSolutionError
         end
 
+        trace("Unbinding #{previous_variable.artifact}")
+
         source = previous_variable.value
-        variable_table.remove_all_with_only_this_source!(source)
-        constraint_table.remove_constraints_from_source!(source)
+        removed_variables = variable_table.remove_all_with_only_this_source!(source)
+        removed_variables.each do |removed_variable|
+          possible_values[removed_variable.artifact] = nil
+          trace("Removed variable #{removed_variable.artifact}")
+        end
+        removed_constraints = constraint_table.remove_constraints_from_source!(source)
+        removed_constraints.each do |removed_constraint|
+          trace("Removed constraint #{removed_constraint.name} #{removed_constraint.constraint}")
+        end
         previous_variable.unbind
-        variable_table.all_after(previous_variable.package).each do |variable| 
+        variable_table.all_after(previous_variable.artifact).each do |variable| 
           new_possibles = reset_possible_values_for(variable)
         end
       end
+
+      def trace(message)
+        ui.say(message) unless ui.nil?
+      end
   end
 end

data/lib/solve/solver/constraint_row.rb

@@ -3,15 +3,23 @@ module Solve
     # @author Andrew Garson <andrew.garson@gmail.com>
     # @author Jamie Winsor <jamie@vialstudios.com>
     class ConstraintRow
-      attr_reader :package
-      attr_reader :constraint
+      extend Forwardable
+
       attr_reader :source
 
-      def initialize(package, constraint, source)
-        @package = package
-        @constraint = constraint
+      def_delegator :dependency, :name
+      def_delegator :dependency, :constraint
+
+      # @param [Solve::Dependency] dependency
+      # @param [String, Symbol] source
+      def initialize(dependency, source)
+        @dependency = dependency
         @source = source
       end
+
+      private
+
+        attr_reader :dependency
     end
   end
 end

data/lib/solve/solver/constraint_table.rb

@@ -9,18 +9,24 @@ module Solve
         @rows = Array.new
       end
 
-      def add(package, constraint, source)
-        @rows << ConstraintRow.new(package, constraint, source)
+      # @param [Solve::Dependency] dependency
+      # @param [String, Symbol] source
+      #
+      # @return [Array<ConstraintRow>]
+      def add(dependency, source)
+        @rows << ConstraintRow.new(dependency, source)
       end
 
-      def constraints_on_package(package)
+      def constraints_on_artifact(name)
         @rows.select do |row|
-          row.package == package
+          row.name == name
         end.map { |row| row.constraint }
       end
 
       def remove_constraints_from_source!(source)
-        @rows.reject! { |row| row.source == source }
+        from_source, others = @rows.partition { |row| row.source == source }
+        @rows = others
+        from_source
       end
     end
   end

data/lib/solve/solver/serializer.rb

@@ -0,0 +1,104 @@
+module Solve
+  class Solver
+    class Serializer
+      # @param [Solve::Solver] solver
+      #
+      # @return [String]
+      def serialize(solver)
+        graph = solver.graph
+        demands = solver.demands
+
+        graph_hash = format_graph(graph)
+        demands_hash = format_demands(demands)
+
+        problem = graph_hash.merge(demands_hash)
+        problem.to_json
+      end
+
+      # @param [Hash, #to_s] solver a json string or a hash representing a solver
+      #
+      # @return [Solve::Solver]
+      def deserialize(solver)
+        unless solver.is_a?(Hash)
+          solver = JSON.parse(solver.to_s)
+        end
+
+        graph_spec = solver["graph"]
+        demands_spec = solver["demands"]
+
+        graph = load_graph(graph_spec)
+        demands = load_demands(demands_spec)
+
+        Solve::Solver.new(graph, demands)
+      end
+
+      private
+
+        def format_graph(graph)
+          artifacts = graph.artifacts.inject([]) do |list, artifact|
+            list << format_artifact(artifact)
+          end
+          { "graph" => artifacts }
+        end
+
+        def format_artifact(artifact)
+          dependencies = artifact.dependencies.inject([]) do |list, dependency|
+            list << format_dependency(dependency)
+          end
+
+          { 
+            "name" => artifact.name,
+            "version" => artifact.version.to_s,
+            "dependencies" => dependencies
+          }
+        end
+
+        def format_dependency(dependency)
+          { 
+            "name" => dependency.name, 
+            "constraint" => dependency.constraint.to_s
+          }
+        end
+
+        def format_demands(demands)
+          demands_list = demands.inject([]) do |list, demand| 
+            list << format_demand(demand) 
+          end
+          { "demands" => demands_list }
+        end
+
+        def format_demand(demand)
+          { 
+            "name" => demand.name,
+            "constraint" => demand.constraint.to_s
+          }
+        end
+
+        def load_graph(artifacts_list)
+          graph = Solve::Graph.new
+          artifacts_list.each do |artifact_spec|
+            load_artifact(graph, artifact_spec)
+          end
+          graph
+        end
+
+        def load_artifact(graph, artifact_spec)
+          artifact = graph.artifacts(artifact_spec["name"], artifact_spec["version"])
+          artifact_spec["dependencies"].each do |dependency_spec|
+            load_dependency(artifact, dependency_spec)
+          end
+          artifact
+        end
+
+        def load_dependency(artifact, dependency_spec)
+          artifact.depends(dependency_spec["name"], dependency_spec["constraint"])
+        end
+
+        def load_demands(demand_specs)
+          demand_specs.inject([]) do |list, demand_spec|
+            list << [demand_spec["name"], demand_spec["constraint"]]
+          end
+        end
+    end
+  end
+end

data/lib/solve/solver/{variable.rb → variable_row.rb}

@@ -2,17 +2,20 @@ module Solve
   class Solver
     # @author Andrew Garson <andrew.garson@gmail.com>
     # @author Jamie Winsor <jamie@vialstudios.com>
-    class Variable
-      attr_reader :package
+    class VariableRow
+      attr_reader :artifact
       attr_reader :value
       attr_reader :sources
 
-      def initialize(package, source)
-        @package = package
+      # @param [String] artifact
+      # @param [String, Symbol] source
+      def initialize(artifact, source)
+        @artifact = artifact
         @value = nil
         @sources = Array(source)
       end
 
+      # @param [String, Symbol] source
       def add_source(source)
         @sources << source
       end
@@ -33,6 +36,7 @@ module Solve
         !@value.nil?
       end
 
+      # @param [String, Symbol] source
       def remove_source(source)
         @sources.delete(source)
       end

data/lib/solve/solver/variable_table.rb

@@ -9,10 +9,12 @@ module Solve
         @rows = Array.new
       end
 
-      def add(package, source)
-        row = rows.detect { |row| row.package == package }
+      # @param [String] artifact
+      # @param [String] source
+      def add(artifact, source)
+        row = rows.detect { |row| row.artifact == artifact }
         if row.nil?
-          @rows << Variable.new(package, source)
+          @rows << VariableRow.new(artifact, source)
         else
           row.add_source(source)
         end
@@ -22,28 +24,33 @@ module Solve
         @rows.detect { |row| row.bound? == false }
       end
 
-      def find_package(package)
-        @rows.detect { |row| row.package == package }
+      # @param [String] artifact
+      def find_artifact(artifact)
+        @rows.detect { |row| row.artifact == artifact }
       end
 
+      # @param [String] source
       def remove_all_with_only_this_source!(source)
         with_only_this_source, others = @rows.partition { |row| row.sources == [source] }
         @rows = others
         with_only_this_source
       end
 
+      # @param [String] source
       def all_from_source(source)
         @rows.select { |row| row.sources.include?(source) }
       end
 
-      def before(package)
-        package_index = @rows.index { |row| row.package == package }
-        (package_index == 0) ? nil : @rows[package_index - 1]
+      # @param [String] artifact
+      def before(artifact)
+        artifact_index = @rows.index { |row| row.artifact == artifact }
+        (artifact_index == 0) ? nil : @rows[artifact_index - 1]
       end
 
-      def all_after(package)
-        package_index = @rows.index { |row| row.package == package }
-        @rows[(package_index+1)..-1]
+      # @param [String] artifact
+      def all_after(artifact)
+        artifact_index = @rows.index { |row| row.artifact == artifact }
+        @rows[(artifact_index+1)..-1]
       end
     end
   end

data/solve.gemspec

@@ -2,8 +2,8 @@
 require File.expand_path('../lib/solve/gem_version', __FILE__)
 
 Gem::Specification.new do |s|
-  s.authors               = ["Jamie Winsor"]
-  s.email                 = ["jamie@vialstudios.com"]
+  s.authors               = ["Jamie Winsor", "Andrew Garson"]
+  s.email                 = ["jamie@vialstudios.com", "andrew.garson@gmail.com"]
   s.description           = %q{A Ruby constraint solver}
   s.summary               = s.description
   s.homepage              = "https://github.com/reset/solve"
@@ -16,8 +16,11 @@ Gem::Specification.new do |s|
   s.version               = Solve::VERSION
   s.required_ruby_version = ">= 1.9.1"
 
+  s.add_dependency 'json'
+
   s.add_development_dependency 'thor', '>= 0.16.0'
   s.add_development_dependency 'rake', '>= 0.9.2.2'
+  s.add_development_dependency 'pry'
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'fuubar'
   s.add_development_dependency 'spork'

data/spec/acceptance/solutions_spec.rb

@@ -51,17 +51,17 @@ describe "Solutions" do
     graph.artifacts("B", "2.0.0").depends("D", ">= 1.3.0")
     graph.artifacts("B", "2.1.0").depends("D", ">= 2.0.0")
 
-    graph.artifacts("A", "1.0.0").depends("B", "> 1.0.0")
-    graph.artifacts("A", "1.0.0").depends("C", "= 2.0.0")
+    graph.artifacts("A", "1.0.0").depends("B", "> 2.0.0")
+    graph.artifacts("A", "1.0.0").depends("C", "= 2.1.0")
     graph.artifacts("A", "1.0.1").depends("B", "> 1.0.0")
     graph.artifacts("A", "1.0.1").depends("C", "= 2.1.0")
-    graph.artifacts("A", "1.0.2").depends("B", "> 2.0.0")
-    graph.artifacts("A", "1.0.2").depends("C", "= 2.1.0")
+    graph.artifacts("A", "1.0.2").depends("B", "> 1.0.0")
+    graph.artifacts("A", "1.0.2").depends("C", "= 2.0.0")
 
     result = Solve.it!(graph, [['A', '~> 1.0.0'], ['D', ">= 2.0.0"]])
 
 
-    result.should eql("A" => "1.0.2",
+    result.should eql("A" => "1.0.1",
                       "B" => "2.1.0",
                       "C" => "2.1.0",
                       "D" => "2.1.0")
@@ -95,4 +95,67 @@ describe "Solutions" do
                       "C" => "1.0.0")
   end
 
+  it "finds the correct solution when there is a diamond shaped dependency" do
+    graph = Solve::Graph.new
+
+    graph.artifacts("A", "1.0.0")
+      .depends("B", "1.0.0")
+      .depends("C", "1.0.0")
+    graph.artifacts("B", "1.0.0")
+      .depends("D", "1.0.0")
+    graph.artifacts("C", "1.0.0")
+      .depends("D", "1.0.0")
+    graph.artifacts("D", "1.0.0")
+
+    result = Solve.it!(graph, [["A", "1.0.0"]])
+
+    result.should eql("A" => "1.0.0",
+                      "B" => "1.0.0",
+                      "C" => "1.0.0",
+                      "D" => "1.0.0")
+  end
+
+  it "gives an empty solution when there are no demands" do
+    graph = Solve::Graph.new
+    result = Solve.it!(graph, [])
+    result.should eql({})
+  end
+
+  it "tries all combinations until it finds a solution" do
+
+    graph = Solve::Graph.new
+
+    graph.artifacts("A", "1.0.0").depends("B", "~> 1.0.0")
+    graph.artifacts("A", "1.0.1").depends("B", "~> 1.0.0")
+    graph.artifacts("A", "1.0.2").depends("B", "~> 1.0.0")
+
+    graph.artifacts("B", "1.0.0").depends("C", "~> 1.0.0")
+    graph.artifacts("B", "1.0.1").depends("C", "~> 1.0.0")
+    graph.artifacts("B", "1.0.2").depends("C", "~> 1.0.0")
+
+    graph.artifacts("C", "1.0.0").depends("D", "1.0.0")
+    graph.artifacts("C", "1.0.1").depends("D", "1.0.0")
+    graph.artifacts("C", "1.0.2").depends("D", "1.0.0")
+
+    # ensure we can't find a solution in the above
+    graph.artifacts("D", "1.0.0").depends("A", "< 0.0.0")
+
+    # Add a solution to the graph that should be reached only after
+    #   all of the others have been tried 
+    #   it must be circular to ensure that no other branch can find it
+    graph.artifacts("A", "0.0.0").depends("B", "0.0.0")
+    graph.artifacts("B", "0.0.0").depends("C", "0.0.0")
+    graph.artifacts("C", "0.0.0").depends("D", "0.0.0")
+    graph.artifacts("D", "0.0.0").depends("A", "0.0.0")
+
+    demands = [["A"]]
+
+    result = Solve.it!(graph, demands)
+    
+    result.should eql({ "A" => "0.0.0",
+                        "B" => "0.0.0",
+                        "C" => "0.0.0",
+                        "D" => "0.0.0"})
+
+  end
 end

data/spec/unit/solve/constraint_spec.rb

@@ -204,4 +204,29 @@ describe Solve::Constraint do
       end
     end
   end
+
+  describe "#eql?" do
+
+    subject { Solve::Constraint.new("= 1.0.0") }
+
+    it "returns true if the other object is a Solve::Constraint with the same operator and version" do
+      other = Solve::Constraint.new("= 1.0.0")
+      subject.should eql(other)
+    end
+
+    it "returns false if the other object is a Solve::Constraint with the same operator and different version" do
+      other = Solve::Constraint.new("= 9.9.9")
+      subject.should_not eql(other)
+    end
+
+    it "returns false if the other object is a Solve::Constraint with the same version and different operator" do
+      other = Solve::Constraint.new("> 1.0.0")
+      subject.should_not eql(other)
+    end
+
+    it "returns false if the other object is not a Solve::Constraint" do
+      other = "chicken"
+      subject.should_not eql(other)
+    end
+  end
 end

data/spec/unit/solve/demand_spec.rb

@@ -63,4 +63,28 @@ describe Solve::Demand do
       end
     end
   end
+
+  describe "equality" do
+    it "returns true when other is a Solve::Demand with the same name and constriant" do
+      other = Solve::Demand.new(solver, name, constraint)
+
+      subject.should eql(other)
+    end
+
+    it "returns false when other isn't a Solve::Demand" do
+      subject.should_not eql("chicken")
+    end
+
+    it "returns false when other is a Solve::Demand with the same name but a different constraint" do
+      other = Solve::Demand.new(solver, name, "< 3.4.5")
+
+      subject.should_not eql(other)
+    end
+    
+    it "returns false when other is a Solve::Demand with the same constraint but a different name" do
+      other = Solve::Demand.new(solver, "chicken", constraint)
+
+      subject.should_not eql(other)
+    end
+  end
 end

data/spec/unit/solve/graph_spec.rb

@@ -226,4 +226,42 @@ describe Solve::Graph do
       subject.has_artifact?(artifact.name, artifact.version).should be_false
     end
   end
+
+  describe "eql?" do
+    subject do
+      graph = Solve::Graph.new
+      graph.artifacts("A", "1.0.0").depends("B", "1.0.0")
+      graph.artifacts("A", "2.0.0").depends("C", "1.0.0")
+      graph
+    end
+
+    it "returns false if other isn't a Solve::Graph" do
+      subject.should_not be_eql("chicken")
+    end
+
+    it "returns true if other is a Solve::Graph with the same artifacts and dependencies" do
+      other = Solve::Graph.new
+      other.artifacts("A", "1.0.0").depends("B", "1.0.0")
+      other.artifacts("A", "2.0.0").depends("C", "1.0.0")
+
+      subject.should eql(other)
+    end
+
+    it "returns false if the other is a Solve::Graph with the same artifacts but different dependencies" do
+      other = Solve::Graph.new
+      other.artifacts("A", "1.0.0")
+      other.artifacts("A", "2.0.0")
+
+      subject.should_not eql(other)
+    end
+
+    it "returns false if the other is a Solve::Graph with the same dependencies but different artifacts" do
+      other = Solve::Graph.new
+      other.artifacts("A", "1.0.0").depends("B", "1.0.0")
+      other.artifacts("A", "2.0.0").depends("C", "1.0.0")
+      other.artifacts("B", "1.0.0")
+
+      subject.should_not eql(other)
+    end
+  end
 end

data/spec/unit/solve/solver/serializer_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+describe Solve::Solver::Serializer do
+  it "deserializes a serialized solver to an equivalent solver" do
+
+    graph = Solve::Graph.new
+
+    graph.artifacts("A", "1.0.0").depends("B", "1.0.0")
+    graph.artifacts("B", "1.0.0").depends("C", "1.0.0")
+    graph.artifacts("C", "1.0.0")
+
+    demands = [["A", "1.0.0"]]
+
+    solver = Solve::Solver.new(graph, demands)
+    serializer = Solve::Solver::Serializer.new
+    serialized = serializer.serialize(solver)
+    deserialized = serializer.deserialize(serialized)
+
+    solver.graph.should eql(deserialized.graph)
+    solver.demands.should eql(deserialized.demands)
+    
+    result = solver.resolve
+    deserialized_result = deserialized.resolve
+    result.should eql(deserialized_result)
+  end
+end

metadata

@@ -1,19 +1,36 @@
 --- !ruby/object:Gem::Specification
 name: solve
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
 - Jamie Winsor
+- Andrew Garson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-25 00:00:00.000000000Z
+date: 2012-09-29 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70233888694760 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +38,15 @@ dependencies:
         version: 0.16.0
   type: :development
   prerelease: false
-  version_requirements: *70233888694760
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70233888694060 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +54,31 @@ dependencies:
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *70233888694060
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.2.2
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70233888692060 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +86,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70233888692060
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fuubar
-  requirement: &70233888691380 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +102,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70233888691380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: spork
-  requirement: &70233888690880 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +118,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70233888690880
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70233888683680 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +134,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70233888683680
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &70233888683020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +150,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70233888683020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70233888682320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +166,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70233888682320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70233888681480 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +182,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70233888681480
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-spork
-  requirement: &70233888681000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +198,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70233888681000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-yard
-  requirement: &70233888680540 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +214,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70233888680540
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: coolline
-  requirement: &70233888680000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +230,16 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70233888680000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A Ruby constraint solver
 email:
 - jamie@vialstudios.com
+- andrew.garson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -169,7 +263,8 @@ files:
 - lib/solve/solver.rb
 - lib/solve/solver/constraint_row.rb
 - lib/solve/solver/constraint_table.rb
-- lib/solve/solver/variable.rb
+- lib/solve/solver/serializer.rb
+- lib/solve/solver/variable_row.rb
 - lib/solve/solver/variable_table.rb
 - lib/solve/version.rb
 - solve.gemspec
@@ -180,6 +275,7 @@ files:
 - spec/unit/solve/demand_spec.rb
 - spec/unit/solve/dependency_spec.rb
 - spec/unit/solve/graph_spec.rb
+- spec/unit/solve/solver/serializer_spec.rb
 - spec/unit/solve/solver_spec.rb
 - spec/unit/solve/version_spec.rb
 - spec/unit/solve_spec.rb
@@ -203,10 +299,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4081621273929848192
+      hash: -267791564304481347
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A Ruby constraint solver
@@ -218,6 +314,7 @@ test_files:
 - spec/unit/solve/demand_spec.rb
 - spec/unit/solve/dependency_spec.rb
 - spec/unit/solve/graph_spec.rb
+- spec/unit/solve/solver/serializer_spec.rb
 - spec/unit/solve/solver_spec.rb
 - spec/unit/solve/version_spec.rb
 - spec/unit/solve_spec.rb