lib/solve.rb in solve-0.2.1 vs lib/solve.rb in solve-0.3.0

@@ -1,47 +1,28 @@
 require 'solve/errors'
-require 'solve/core_ext'
-require 'dep_selector'
 
+# @author Jamie Winsor <[e-mail]>
 module Solve
   autoload :Version, 'solve/version'
   autoload :Artifact, 'solve/artifact'
   autoload :Constraint, 'solve/constraint'
   autoload :Dependency, 'solve/dependency'
   autoload :Graph, 'solve/graph'
   autoload :Demand, 'solve/demand'
+  autoload :Solver, 'solve/solver'
 
   class << self
-    include DepSelector
-
-    # @param [Solve::Graph] graph
+    # A quick solve. Given the "world" as we know it (the graph) and a list of
+    # requirements (demands) which must be met. Return me the best solution of
+    # artifacts and verisons that I should use.
     #
-    # @return [Hash]
-    def it(graph)
-      it!(graph)
-    rescue NoSolutionError
-      nil
-    end
-
     # @param [Solve::Graph] graph
+    # @param [Array<Solve::Demand>, Array<String, String>] demands
     #
+    # @raise [NoSolutionError]
+    #
     # @return [Hash]
-    def it!(graph)
-      dep_graph = graph.send(:dep_graph)
-      selector = Selector.new(dep_graph)
-
-      solution_constraints = graph.demands.collect do |demand|
-        SolutionConstraint.new(dep_graph.package(demand.name), DepSelector::VersionConstraint.new(demand.constraint.to_s))
-      end
-
-      solution = quietly { selector.find_solution(solution_constraints) }
-
-      {}.tap do |artifacts|
-        solution.each do |name, constraint|
-          artifacts[name] = constraint.to_s
-        end
-      end
-    rescue DepSelector::Exceptions::InvalidSolutionConstraints
-      raise NoSolutionError
+    def it!(graph, demands)
+      Solver.new(graph, demands).resolve
     end
   end
 end