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/environment_cookbook_versions_endpoint.rb b/lib/chef_zero/endpoints/environment_cookbook_versions_endpoint.rb
index 6efa9a0..0a61c83 100644
--- a/lib/chef_zero/endpoints/environment_cookbook_versions_endpoint.rb
+++ b/lib/chef_zero/endpoints/environment_cookbook_versions_endpoint.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/rest_error_response'
 
@@ -100,15 +97,15 @@ module ChefZero
       end
 
       def sort_versions(versions)
-        result = versions.sort_by { |version| Chef::Version.new(version) }
+        result = versions.sort_by { |version| Solve::Version.new(version) }
         result.reverse
       end
 
       def filter_by_constraint(versions, cookbook_name, constraint)
         return versions if !constraint
-        constraint = Chef::VersionConstraint.new(constraint)
+        constraint = Solve::Constraint.new(constraint)
         new_versions = versions[cookbook_name]
-        new_versions = new_versions.select { |version| constraint.include?(version) }
+        new_versions = new_versions.select { |version| constraint.satisfies?(version) }
         result = versions.clone
         result[cookbook_name] = new_versions
         result