Merge pull request #1475 from jkeiser/jk/solve-2.0

Upgrade to solve 2.0
berkshelf · Nov 9, 2015 · 08f84e2 · martinisoft · Nov 16, 2015 · reset
2 parents 3112f37 + 98dad6d
commit 08f84e2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/berkshelf.gemspec b/berkshelf.gemspec
@@ -41,7 +41,8 @@ Gem::Specification.new do |s|
   s.add_dependency 'minitar',              '~> 0.5.4'
   s.add_dependency 'retryable',            '~> 2.0'
   s.add_dependency 'ridley',               '~> 4.3'
-  s.add_dependency 'solve',                '~> 1.1'
+  s.add_dependency 'solve',                '~> 2.0'
+  s.add_dependency 'dep_selector',         '~> 1.0'
   s.add_dependency 'thor',                 '~> 0.19'
   s.add_dependency 'octokit',              '~> 4.0'
   s.add_dependency 'celluloid',            '= 0.16.0'
@@ -50,7 +51,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'aruba',         '~> 0.6'
   s.add_development_dependency 'chef-zero',     '~> 4.0'
   s.add_development_dependency 'fuubar',        '~> 2.0'
-  s.add_development_dependency 'rake',          '~> 0.9'
+  s.add_development_dependency 'rake',          '~> 10.1'
   s.add_development_dependency 'rspec',         '~> 3.0'
   s.add_development_dependency 'spork',         '~> 0.9'
   s.add_development_dependency 'test-kitchen',  '~> 1.2'

diff --git a/lib/berkshelf/resolver.rb b/lib/berkshelf/resolver.rb
@@ -1,5 +1,7 @@
 module Berkshelf
   class Resolver
+    Solve.engine = :gecode
+
     require_relative 'resolver/graph'
 
     extend Forwardable

diff --git a/spec/unit/berkshelf/berksfile_spec.rb b/spec/unit/berkshelf/berksfile_spec.rb
@@ -238,7 +238,7 @@
   describe '#cookbooks' do
     it 'raises an exception if a cookbook is not installed' do
       subject.add_dependency('bacon', nil)
-      expect { subject.cookbooks }.to raise_error
+      expect { subject.cookbooks }.to raise_error(Berkshelf::DependencyNotFound)
     end
 
     it 'retrieves the locked (cached) cookbook for each dependency' do