diff options
author | Seth Vargo <sethvargo@gmail.com> | 2013-05-19 22:19:24 -0500 |
---|---|---|
committer | Seth Vargo <sethvargo@gmail.com> | 2013-05-19 22:19:24 -0500 |
commit | 74cff8b1198dccd18c99bacc4aec3f597375a8db (patch) | |
tree | b17b65e25baa8fcfad9cc5230958d4fc7b5b2b97 /lib/chef_zero/endpoints/environment_cookbook_versions_endpoint.rb | |
parent | 3963e1b0a3fd322a5a94a9257a8e5af03eebf3c4 (diff) | |
download | chef-zero-74cff8b1198dccd18c99bacc4aec3f597375a8db.tar.gz |
Remove dep on solve
Diffstat (limited to 'lib/chef_zero/endpoints/environment_cookbook_versions_endpoint.rb')
-rw-r--r-- | lib/chef_zero/endpoints/environment_cookbook_versions_endpoint.rb | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/chef_zero/endpoints/environment_cookbook_versions_endpoint.rb b/lib/chef_zero/endpoints/environment_cookbook_versions_endpoint.rb index 1a9999b..61c63a0 100644 --- a/lib/chef_zero/endpoints/environment_cookbook_versions_endpoint.rb +++ b/lib/chef_zero/endpoints/environment_cookbook_versions_endpoint.rb @@ -1,7 +1,6 @@ require 'json' require 'chef_zero/rest_base' require 'chef_zero/rest_error_response' -require 'solve' module ChefZero module Endpoints @@ -98,15 +97,15 @@ module ChefZero end def sort_versions(versions) - result = versions.sort_by { |version| Solve::Version.new(version) } + result = versions.sort_by { |version| Gem::Version.new(version.dup) } result.reverse end def filter_by_constraint(versions, cookbook_name, constraint) return versions if !constraint - constraint = Solve::Constraint.new(constraint) + constraint = Gem::Requirement.new(constraint) new_versions = versions[cookbook_name] - new_versions = new_versions.select { |version| constraint.satisfies?(version) } + new_versions = new_versions.select { |version| constraint.satisfied_by?(Gem::Version.new(version)) } result = versions.clone result[cookbook_name] = new_versions result |