solve 1.2.1 → 2.0.0

data/spec/acceptance/solutions_spec.rb

@@ -1,6 +1,11 @@
 require 'spec_helper'
 
-describe "Solutions" do
+describe "Solutions", :gecode do
+
+  before do
+    Solve.engine = :gecode
+  end
+
   it "chooses the correct artifact for the demands" do
     graph = Solve::Graph.new
     graph.artifact("mysql", "2.0.0")

data/spec/unit/solve/{solver_spec.rb → gecode_solver_spec.rb}

@@ -1,12 +1,19 @@
 require 'spec_helper'
 
-describe Solve::Solver do
+require 'solve/gecode_solver'
+
+describe Solve::GecodeSolver, :gecode do
+
+  before(:all) do
+    described_class.activate
+  end
+
   describe "ClassMethods" do
     describe "::timeout" do
       subject { described_class.timeout }
 
-      it "returns 10,000 by default" do
-        expect(subject).to eql(10_000)
+      it "returns 30,000 by default" do
+        expect(subject).to eql(30_000)
       end
 
       context "when the SOLVE_TIMEOUT env variable is set" do
@@ -17,6 +24,28 @@ describe Solve::Solver do
         end
       end
     end
+
+    describe "::activate" do
+
+      context "when dep_selector is not installed" do
+
+        it "raises EngineNotAvailable" do
+          exception = LoadError.new("cannot load such file -- dep_selector")
+          allow(described_class).to receive(:require).with("dep_selector").and_raise(exception)
+          expect { described_class.activate }.to raise_error(Solve::Errors::EngineNotAvailable)
+        end
+
+      end
+
+      context "when dep_selector is installed" do
+
+        it "requires dep_selector" do
+          expect(described_class).to receive(:require).with("dep_selector").and_call_original
+          described_class.activate
+        end
+      end
+
+    end
   end
 
   let(:graph) { double(Solve::Graph) }
@@ -162,7 +191,8 @@ describe Solve::Solver do
     end
 
     it "implements the required interface" do
-      json_string = serializer.serialize(solver)
+      problem = Solve::Problem.from_solver(solver)
+      json_string = serializer.serialize(problem)
       problem_data = JSON.parse(json_string)
       expected_demands = [
         {"name" => "mysql", "constraint" => ">= 0.0.0"},

data/spec/unit/solve/ruby_solver_spec.rb

@@ -0,0 +1,166 @@
+require 'spec_helper'
+
+describe Solve::RubySolver do
+  describe "ClassMethods" do
+    describe "::timeout" do
+      subject { described_class.timeout }
+
+      it "returns 30,000 by default" do
+        expect(subject).to eql(30_000)
+      end
+
+      context "when the SOLVE_TIMEOUT env variable is set" do
+        before { ENV.stub(:[]).with("SOLVE_TIMEOUT") { "30" } }
+
+        it "returns the value multiplied by a thousand" do
+          expect(subject).to eql(30_000)
+        end
+      end
+    end
+
+    describe "::activate" do
+
+      it "is a no-op" do
+        described_class.activate
+      end
+
+    end
+  end
+
+  let(:graph) { double(Solve::Graph) }
+  let(:demands) { [["mysql"], ["nginx"]] }
+  subject(:solver) { described_class.new(graph, demands, dependency_source: "Berksfile") }
+
+  it "has a list of demands as ruby literals" do
+    solver.demands_array.should == demands
+  end
+
+  it "has a list of demands as model objects" do
+    expected = [
+      Solve::Demand.new(solver, "mysql"),
+      Solve::Demand.new(solver, "nginx")
+    ]
+    solver.demands.should == expected
+  end
+
+  it "has a graph" do
+    solver.graph.should == graph
+  end
+
+  describe "when the constraints are solvable" do
+    let(:graph) do
+      graph = Solve::Graph.new
+      graph.artifact("A", "1.0.0")
+      graph.artifact("B", "1.0.0").depends("A")
+      graph
+    end
+
+    let(:demands) { [["A"], ["B"]] }
+
+    it "gives the solution as a Hash" do
+      solver.resolve.should == {"A"=>"1.0.0", "B"=>"1.0.0"}
+    end
+
+    it "gives the solution in sorted form" do
+      solver.resolve(sorted: true).should == [["A", "1.0.0"], ["B", "1.0.0"]]
+    end
+  end
+
+  describe "when the constraints are not solvable" do
+    let(:error) do
+      begin
+        solver.resolve
+      rescue => e
+        e
+      else
+        raise "Expected resolve to cause an error"
+      end
+    end
+
+    context "and molinillo identifies missing artifacts" do
+      let(:graph) do
+        graph = Solve::Graph.new
+        graph.artifact("A", "1.0.0")
+        graph
+      end
+
+      let(:demands) { [ ["Z"] ] }
+
+      it "raises an error detailing the missing artifacts" do
+        expect(error).to be_a_kind_of(Solve::Errors::NoSolutionError)
+        expected_error = <<-ERROR_MESSAGE
+Unable to satisfy the following requirements:
+
+- `Z (>= 0.0.0)` required by `Berksfile`
+ERROR_MESSAGE
+        expect(error.to_s).to eq(expected_error)
+      end
+    end
+
+    context "and molinillo identifies constraints that exclude all known versions" do
+      let(:graph) do
+        graph = Solve::Graph.new
+        graph.artifact("A", "1.0.0")
+        graph
+      end
+
+      let(:demands) { [ ["A", "> 1.0.0"] ] }
+
+      it "raises an error detailing the missing artifacts" do
+        expect(error).to be_a_kind_of(Solve::Errors::NoSolutionError)
+        expected_error = <<-ERROR_MESSAGE
+Unable to satisfy the following requirements:
+
+- `A (> 1.0.0)` required by `Berksfile`
+ERROR_MESSAGE
+        expect(error.to_s).to eq(expected_error)
+      end
+    end
+
+    context "and molinillo identifies dependency conflicts" do
+      let(:graph) do
+        graph = Solve::Graph.new
+        graph.artifact("A", "1.0.0").depends("B").depends("C")
+        graph.artifact("B", "1.0.0").depends("D", "= 1.0.0")
+        graph.artifact("C", "1.0.0").depends("D", "= 2.0.0")
+        graph.artifact("D", "1.0.0")
+        graph.artifact("D", "2.0.0")
+        graph
+      end
+
+      let(:demands) { [ [ "A" ] ] }
+
+      it "raises an error detailing the missing artifacts" do
+        expect(error).to be_a_kind_of(Solve::Errors::NoSolutionError)
+        expected_error = <<-ERROR_MESSAGE
+Unable to satisfy the following requirements:
+
+- `D (= 1.0.0)` required by `B-1.0.0`
+- `D (= 2.0.0)` required by `C-1.0.0`
+ERROR_MESSAGE
+        expect(error.to_s).to eq(expected_error)
+      end
+    end
+  end
+
+  describe "supporting Serializer interface" do
+    let(:serializer) { Solve::Solver::Serializer.new }
+
+    before do
+      graph.stub(:artifacts).and_return([])
+    end
+
+    it "implements the required interface" do
+      problem = Solve::Problem.from_solver(solver)
+      json_string = serializer.serialize(problem)
+      problem_data = JSON.parse(json_string)
+      expected_demands = [
+        {"name" => "mysql", "constraint" => ">= 0.0.0"},
+        {"name" => "nginx", "constraint" => ">= 0.0.0"}
+      ]
+
+      problem_data["demands"].should =~ expected_demands
+    end
+  end
+end
+

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

@@ -1,25 +1,33 @@
 require 'spec_helper'
+require 'solve/ruby_solver'
 
 describe Solve::Solver::Serializer do
-  it "deserializes a serialized solver to an equivalent solver" do
-    graph = Solve::Graph.new
 
-    graph.artifact("A", "1.0.0").depends("B", "1.0.0")
-    graph.artifact("B", "1.0.0").depends("C", "1.0.0")
-    graph.artifact("C", "1.0.0")
+  let(:graph) do
+    Solve::Graph.new.tap do |g|
+      g.artifact("A", "1.0.0").depends("B", "1.0.0")
+      g.artifact("B", "1.0.0").depends("C", "1.0.0")
+      g.artifact("C", "1.0.0")
+    end
+  end
+
+  let(:demands) { [["A", "1.0.0"]] }
 
-    demands = [["A", "1.0.0"]]
+  let(:serializer) { Solve::Solver::Serializer.new }
 
-    solver = Solve::Solver.new(graph, demands)
-    serializer = Solve::Solver::Serializer.new
-    serialized = serializer.serialize(solver)
+  it "deserializes a serialized problem to an equivalent problem" do
+    problem = Solve::Problem.new(graph, demands)
+    serialized = serializer.serialize(problem)
     deserialized = serializer.deserialize(serialized)
 
-    solver.graph.should eql(deserialized.graph)
-    solver.demands.should eql(deserialized.demands)
+    problem.graph.should eql(deserialized.graph)
+    problem.demands.should eql(deserialized.demands)
+  end
 
-    result = solver.resolve
-    deserialized_result = deserialized.resolve
-    result.should eql(deserialized_result)
+  it "creates a problem from a solver" do
+    solver = Solve::RubySolver.new(graph, demands)
+    problem = Solve::Problem.from_solver(solver)
+    expect(problem.demands).to eq([["A", "= 1.0.0"]])
+    expect(problem.graph).to eq(graph)
   end
 end

data/spec/unit/solve_spec.rb

@@ -6,13 +6,13 @@ describe Solve do
 
     describe "#it" do
       it "returns nil if a solution does not exist" do
-        pending
+        skip
       end
     end
 
     describe "#it!" do
       it "raises NoSolutionError if a solution does not exist" do
-        pending
+        skip
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solve
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Jamie Winsor
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-18 00:00:00.000000000 Z
+date: 2015-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: semverse
@@ -27,19 +27,75 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: dep_selector
+  name: molinillo
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 0.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 0.2.3
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.16.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.16.0
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.2.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.2.2
+- !ruby/object:Gem::Dependency
+  name: spork
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: A Ruby version constraint solver
 email:
 - jamie@vialstudios.com
@@ -54,7 +110,9 @@ files:
 - Gemfile
 - Guardfile
 - LICENSE
+- NoGecode.gemfile
 - README.md
+- Rakefile
 - Thorfile
 - lib/solve.rb
 - lib/solve/artifact.rb
@@ -62,22 +120,25 @@ files:
 - lib/solve/demand.rb
 - lib/solve/dependency.rb
 - lib/solve/errors.rb
+- lib/solve/gecode_solver.rb
 - lib/solve/graph.rb
-- lib/solve/solver.rb
+- lib/solve/ruby_solver.rb
 - lib/solve/solver/serializer.rb
 - lib/solve/version.rb
 - solve.gemspec
 - spec/acceptance/benchmark.rb
 - spec/acceptance/large_graph_no_solution.rb
 - spec/acceptance/opscode_ci_graph.rb
+- spec/acceptance/ruby_solver_solutions_spec.rb
 - spec/acceptance/solutions_spec.rb
 - spec/spec_helper.rb
 - spec/unit/solve/artifact_spec.rb
 - spec/unit/solve/demand_spec.rb
 - spec/unit/solve/dependency_spec.rb
+- spec/unit/solve/gecode_solver_spec.rb
 - spec/unit/solve/graph_spec.rb
+- spec/unit/solve/ruby_solver_spec.rb
 - spec/unit/solve/solver/serializer_spec.rb
-- spec/unit/solve/solver_spec.rb
 - spec/unit/solve_spec.rb
 homepage: https://github.com/berkshelf/solve
 licenses:
@@ -107,13 +168,15 @@ test_files:
 - spec/acceptance/benchmark.rb
 - spec/acceptance/large_graph_no_solution.rb
 - spec/acceptance/opscode_ci_graph.rb
+- spec/acceptance/ruby_solver_solutions_spec.rb
 - spec/acceptance/solutions_spec.rb
 - spec/spec_helper.rb
 - spec/unit/solve/artifact_spec.rb
 - spec/unit/solve/demand_spec.rb
 - spec/unit/solve/dependency_spec.rb
+- spec/unit/solve/gecode_solver_spec.rb
 - spec/unit/solve/graph_spec.rb
+- spec/unit/solve/ruby_solver_spec.rb
 - spec/unit/solve/solver/serializer_spec.rb
-- spec/unit/solve/solver_spec.rb
 - spec/unit/solve_spec.rb
 has_rdoc: