solve 3.1.1 → 4.0.0

data/spec/acceptance/ruby_solver_solutions_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe "Solutions when using the ruby solver" do
 
@@ -12,7 +12,7 @@ describe "Solutions when using the ruby solver" do
     graph.artifact("mysql", "1.2.0")
     graph.artifact("nginx", "1.0.0").depends("mysql", "= 1.2.0")
 
-    result = Solve.it!(graph, [['nginx', '= 1.0.0'], ['mysql']])
+    result = Solve.it!(graph, [["nginx", "= 1.0.0"], ["mysql"]])
 
     result.should eql("nginx" => "1.0.0", "mysql" => "1.2.0")
   end
@@ -23,7 +23,7 @@ describe "Solutions when using the ruby solver" do
     graph.artifact("mysql", "1.2.0")
     graph.artifact("nginx", "1.0.0").depends("mysql", ">= 1.2.0")
 
-    result = Solve.it!(graph, [['nginx', '= 1.0.0'], ['mysql']])
+    result = Solve.it!(graph, [["nginx", "= 1.0.0"], ["mysql"]])
 
     result.should eql("nginx" => "1.0.0", "mysql" => "2.0.0")
   end
@@ -33,7 +33,7 @@ describe "Solutions when using the ruby solver" do
     graph.artifact("mysql", "1.2.0")
 
     lambda {
-      Solve.it!(graph, ['mysql', '>= 2.0.0'])
+      Solve.it!(graph, ["mysql", ">= 2.0.0"])
     }.should raise_error(Solve::Errors::NoSolutionError)
   end
 
@@ -62,8 +62,7 @@ describe "Solutions when using the ruby solver" do
     graph.artifact("A", "1.0.2").depends("B", "> 1.0.0")
     graph.artifact("A", "1.0.2").depends("C", "= 2.0.0")
 
-    result = Solve.it!(graph, [['A', '~> 1.0.0'], ['D', ">= 2.0.0"]])
-
+    result = Solve.it!(graph, [["A", "~> 1.0.0"], ["D", ">= 2.0.0"]])
 
     result.should eql("A" => "1.0.1",
                       "B" => "2.1.0",
@@ -151,9 +150,9 @@ describe "Solutions when using the ruby solver" do
     graph.artifact("bottom", "1.0.0")
     graph.artifact("middle", "1.0.0").depends("top", "= 1.0.0").depends("middle")
 
-    demands = [["bottom", "1.0.0"],["middle", "1.0.0"]]
+    demands = [["bottom", "1.0.0"], ["middle", "1.0.0"]]
 
-    expect { Solve.it!(graph, demands, { :sorted => true  } ) }.to raise_error { |error|
+    expect { Solve.it!(graph, demands, { :sorted => true } ) }.to raise_error { |error|
       error.should be_a(Solve::Errors::NoSolutionError)
     }
   end
@@ -203,7 +202,7 @@ describe "Solutions when using the ruby solver" do
     result.should eql({ "A" => "0.0.0",
                         "B" => "0.0.0",
                         "C" => "0.0.0",
-                        "D" => "0.0.0"})
+                        "D" => "0.0.0" })
 
   end
 
@@ -243,7 +242,7 @@ describe "Solutions when using the ruby solver" do
       "get-the-old-one" => "1.0.0",
       "locked-mid-1" => "2.0.0",
       "locked-mid-2" => "1.0.0",
-      "old-bottom" => "2.0.0"
+      "old-bottom" => "2.0.0",
     })
   end
 
@@ -263,7 +262,7 @@ describe "Solutions when using the ruby solver" do
         result.should eql([
           ["C", "1.0.0"],
           ["B", "1.0.0"],
-          ["A", "1.0.0"]
+          ["A", "1.0.0"],
         ])
       end
     end
@@ -278,14 +277,14 @@ describe "Solutions when using the ruby solver" do
         graph.artifact("A", "1.0.0").depends("C", "= 1.0.0")
         graph.artifact("C", "1.0.0")
 
-        demands = [["A"],["B"]]
+        demands = [["A"], ["B"]]
 
-        result = Solve.it!(graph, demands, { :sorted => true  } )
+        result = Solve.it!(graph, demands, { :sorted => true } )
 
         result.should eql([
           ["C", "1.0.0"],
           ["A", "1.0.0"],
-          ["B", "1.0.0"]
+          ["B", "1.0.0"],
         ])
       end
     end
@@ -300,7 +299,7 @@ describe "Solutions when using the ruby solver" do
 
         demands = [["A"]]
 
-        expect { Solve.it!(graph, demands, { :sorted => true  } ) }.to raise_error(Solve::Errors::NoSolutionError)
+        expect { Solve.it!(graph, demands, { :sorted => true } ) }.to raise_error(Solve::Errors::NoSolutionError)
       end
     end
   end

data/spec/acceptance/solutions_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe "Solutions", :gecode do
 
@@ -12,7 +12,7 @@ describe "Solutions", :gecode do
     graph.artifact("mysql", "1.2.0")
     graph.artifact("nginx", "1.0.0").depends("mysql", "= 1.2.0")
 
-    result = Solve.it!(graph, [['nginx', '= 1.0.0'], ['mysql']])
+    result = Solve.it!(graph, [["nginx", "= 1.0.0"], ["mysql"]])
 
     result.should eql("nginx" => "1.0.0", "mysql" => "1.2.0")
   end
@@ -23,7 +23,7 @@ describe "Solutions", :gecode do
     graph.artifact("mysql", "1.2.0")
     graph.artifact("nginx", "1.0.0").depends("mysql", ">= 1.2.0")
 
-    result = Solve.it!(graph, [['nginx', '= 1.0.0'], ['mysql']])
+    result = Solve.it!(graph, [["nginx", "= 1.0.0"], ["mysql"]])
 
     result.should eql("nginx" => "1.0.0", "mysql" => "2.0.0")
   end
@@ -33,7 +33,7 @@ describe "Solutions", :gecode do
     graph.artifact("mysql", "1.2.0")
 
     lambda {
-      Solve.it!(graph, ['mysql', '>= 2.0.0'])
+      Solve.it!(graph, ["mysql", ">= 2.0.0"])
     }.should raise_error(Solve::Errors::NoSolutionError)
   end
 
@@ -62,8 +62,7 @@ describe "Solutions", :gecode do
     graph.artifact("A", "1.0.2").depends("B", "> 1.0.0")
     graph.artifact("A", "1.0.2").depends("C", "= 2.0.0")
 
-    result = Solve.it!(graph, [['A', '~> 1.0.0'], ['D', ">= 2.0.0"]])
-
+    result = Solve.it!(graph, [["A", "~> 1.0.0"], ["D", ">= 2.0.0"]])
 
     result.should eql("A" => "1.0.1",
                       "B" => "2.1.0",
@@ -159,9 +158,9 @@ describe "Solutions", :gecode do
     graph.artifact("bottom", "1.0.0")
     graph.artifact("middle", "1.0.0").depends("top", "= 1.0.0").depends("middle")
 
-    demands = [["bottom", "1.0.0"],["middle", "1.0.0"]]
+    demands = [["bottom", "1.0.0"], ["middle", "1.0.0"]]
 
-    expect { Solve.it!(graph, demands, { :sorted => true  } ) }.to raise_error { |error|
+    expect { Solve.it!(graph, demands, { :sorted => true } ) }.to raise_error { |error|
       error.should be_a(Solve::Errors::NoSolutionError)
     }
   end
@@ -206,7 +205,7 @@ describe "Solutions", :gecode do
     result.should eql({ "A" => "0.0.0",
                         "B" => "0.0.0",
                         "C" => "0.0.0",
-                        "D" => "0.0.0"})
+                        "D" => "0.0.0" })
 
   end
 
@@ -246,7 +245,7 @@ describe "Solutions", :gecode do
       "get-the-old-one" => "1.0.0",
       "locked-mid-1" => "1.0.0",
       "locked-mid-2" => "2.0.0",
-      "old-bottom" => "2.1.0"
+      "old-bottom" => "2.1.0",
     })
   end
 
@@ -266,7 +265,7 @@ describe "Solutions", :gecode do
         result.should eql([
           ["C", "1.0.0"],
           ["B", "1.0.0"],
-          ["A", "1.0.0"]
+          ["A", "1.0.0"],
         ])
       end
     end
@@ -281,14 +280,14 @@ describe "Solutions", :gecode do
         graph.artifact("A", "1.0.0").depends("C", "= 1.0.0")
         graph.artifact("C", "1.0.0")
 
-        demands = [["A"],["B"]]
+        demands = [["A"], ["B"]]
 
-        result = Solve.it!(graph, demands, { :sorted => true  } )
+        result = Solve.it!(graph, demands, { :sorted => true } )
 
         result.should eql([
           ["C", "1.0.0"],
           ["A", "1.0.0"],
-          ["B", "1.0.0"]
+          ["B", "1.0.0"],
         ])
       end
     end
@@ -303,7 +302,7 @@ describe "Solutions", :gecode do
 
         demands = [["A"]]
 
-        expect { Solve.it!(graph, demands, { :sorted => true  } ) }.to raise_error { |error|
+        expect { Solve.it!(graph, demands, { :sorted => true } ) }.to raise_error { |error|
           error.should be_a(Solve::Errors::UnsortableSolutionError)
           error.unsorted_solution.should eql({
             "A" => "1.0.0",

data/spec/spec_helper.rb

@@ -1,17 +1,16 @@
-require 'rubygems'
-require 'bundler'
-require 'spork'
+require "rubygems"
+require "bundler"
+require "spork"
 
 Spork.prefork do
-  require 'rspec'
+  require "rspec"
 
-  APP_ROOT = File.expand_path('../../', __FILE__)
+  APP_ROOT = File.expand_path("../../", __FILE__)
 
-  Dir[File.join(APP_ROOT, "spec/support/**/*.rb")].each {|f| require f}
+  Dir[File.join(APP_ROOT, "spec/support/**/*.rb")].each { |f| require f }
 
   RSpec.configure do |config|
     config.mock_with :rspec
-    config.treat_symbols_as_metadata_keys_with_true_values = true
     config.filter_run focus: true
     config.run_all_when_everything_filtered = true
 
@@ -21,5 +20,13 @@ Spork.prefork do
 end
 
 Spork.each_run do
-  require 'solve'
+  require "solve"
+end
+
+# Useful for debugging the solver - simply add `ui: TestUI` to a resolver call
+class TestUI
+  def self.say(message = "")
+    $stdout.print(message + "\n")
+    $stdout.flush
+  end
 end

data/spec/unit/solve/artifact_spec.rb

@@ -1,12 +1,12 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Solve::Artifact do
   let(:graph) do
-    package = double('package')
-    package_version = double('package_version')
+    package = double("package")
+    package_version = double("package_version")
     package_version.stub(:dependencies).and_return([])
     package.stub(:add_version).and_return(package_version)
-    double('graph', dep_graph: double('dep_graph', package: package))
+    double("graph", dep_graph: double("dep_graph", package: package))
   end
 
   let(:name) { "league" }
@@ -51,7 +51,7 @@ describe Solve::Artifact do
       [
         one,
         two,
-        three
+        three,
       ].shuffle
     end
 

data/spec/unit/solve/demand_spec.rb

@@ -1,7 +1,7 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Solve::Demand do
-  let(:solver) { double('solver') }
+  let(:solver) { double("solver") }
   let(:name) { "league" }
 
   describe "#initialize" do

data/spec/unit/solve/dependency_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Solve::Dependency do
   describe "#initialize" do
@@ -10,8 +10,8 @@ describe Solve::Dependency do
     end
   end
 
-  let(:artifact) { double('artifact') }
-  let(:name) { 'nginx' }
+  let(:artifact) { double("artifact") }
+  let(:name) { "nginx" }
   let(:constraint) { "~> 0.0.1" }
 
   subject { Solve::Dependency.new(artifact, name, constraint) }

data/spec/unit/solve/gecode_solver_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require "spec_helper"
 
-require 'solve/gecode_solver'
+require "solve/gecode_solver"
 
 describe Solve::GecodeSolver, :gecode do
 
@@ -59,7 +59,7 @@ describe Solve::GecodeSolver, :gecode do
   it "has a list of demands as model objects" do
     expected = [
       Solve::Demand.new(solver, "mysql"),
-      Solve::Demand.new(solver, "nginx")
+      Solve::Demand.new(solver, "nginx"),
     ]
     solver.demands.should == expected
   end
@@ -79,7 +79,7 @@ describe Solve::GecodeSolver, :gecode do
     let(:demands) { [["A"], ["B"]] }
 
     it "gives the solution as a Hash" do
-      solver.resolve.should == {"A"=>"1.0.0", "B"=>"1.0.0"}
+      solver.resolve.should == { "A" => "1.0.0", "B" => "1.0.0" }
     end
 
     it "gives the solution in sorted form" do
@@ -195,12 +195,11 @@ describe Solve::GecodeSolver, :gecode do
       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"}
+        { "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/graph_spec.rb

@@ -72,12 +72,12 @@ describe Solve::Graph do
 
   describe "#versions" do
     before do
-      subject.artifact('nginx', '1.0.0')
-      subject.artifact('nginx', '2.0.0')
-      subject.artifact('nginx', '3.0.0')
-      subject.artifact('nginx', '4.0.0')
+      subject.artifact("nginx", "1.0.0")
+      subject.artifact("nginx", "2.0.0")
+      subject.artifact("nginx", "3.0.0")
+      subject.artifact("nginx", "4.0.0")
 
-      subject.artifact('other', '1.0.0')
+      subject.artifact("other", "1.0.0")
     end
 
     it "returns all the artifacts matching the given name" do
@@ -98,8 +98,8 @@ describe Solve::Graph do
   describe "==" do
     def make_graph
       graph = Solve::Graph.new
-      graph.artifact("A" ,"1.0.0").depends("B", "1.0.0")
-      graph.artifact("A" ,"2.0.0").depends("C", "1.0.0")
+      graph.artifact("A" , "1.0.0").depends("B", "1.0.0")
+      graph.artifact("A" , "2.0.0").depends("C", "1.0.0")
       graph
     end
 

data/spec/unit/solve/ruby_solver_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Solve::RubySolver do
   describe "ClassMethods" do
@@ -38,7 +38,7 @@ describe Solve::RubySolver do
   it "has a list of demands as model objects" do
     expected = [
       Solve::Demand.new(solver, "mysql"),
-      Solve::Demand.new(solver, "nginx")
+      Solve::Demand.new(solver, "nginx"),
     ]
     solver.demands.should == expected
   end
@@ -58,7 +58,7 @@ describe Solve::RubySolver do
     let(:demands) { [["A"], ["B"]] }
 
     it "gives the solution as a Hash" do
-      solver.resolve.should == {"A"=>"1.0.0", "B"=>"1.0.0"}
+      solver.resolve.should == { "A" => "1.0.0", "B" => "1.0.0" }
     end
 
     it "gives the solution in sorted form" do
@@ -155,12 +155,11 @@ ERROR_MESSAGE
       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"}
+        { "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,5 +1,5 @@
-require 'spec_helper'
-require 'solve/ruby_solver'
+require "spec_helper"
+require "solve/ruby_solver"
 
 describe Solve::Solver::Serializer do
 

data/spec/unit/solve_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Solve do
   describe "ClassMethods" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solve
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 4.0.0
 platform: ruby
 authors:
 - Jamie Winsor
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-01 00:00:00.000000000 Z
+date: 2017-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: semverse
@@ -36,16 +36,16 @@ dependencies:
   name: molinillo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement