remove dependency on Chef::Version and Chef::VersionConstraint

use Solve for version comparison and constraint satisfication

1 files changed, 3 insertions, 6 deletions

diff --git a/lib/chef_zero/endpoints/cookbooks_base.rb b/lib/chef_zero/endpoints/cookbooks_base.rb
index 53f7945..143a695 100644
--- a/lib/chef_zero/endpoints/cookbooks_base.rb
+++ b/lib/chef_zero/endpoints/cookbooks_base.rb
@@ -1,7 +1,4 @@
 require 'json'
-require 'chef/exceptions' # Needed so Chef::Version/VersionConstraint load
-require 'chef/version_class'
-require 'chef/version_constraint'
 require 'chef_zero/rest_base'
 require 'chef_zero/data_normalizer'
 
@@ -28,11 +25,11 @@ module ChefZero
 
       def filter_cookbooks(cookbooks_list, constraints = {}, num_versions = nil)
         cookbooks_list.keys.sort.each do |name|
-          constraint = Chef::VersionConstraint.new(constraints[name])
+          constraint = Solve::Constraint.new(constraints[name])
           versions = []
-          cookbooks_list[name].keys.sort_by { |version| Chef::Version.new(version) }.reverse.each do |version|
+          cookbooks_list[name].keys.sort_by { |version| Solve::Version.new(version) }.reverse.each do |version|
             break if num_versions && versions.size >= num_versions
-            if constraint.include?(version)
+            if constraint.satisfies?(version)
               versions << version
             end
           end