diff options
| -rw-r--r-- | chef-zero.gemspec | 2 | ||||
| -rw-r--r-- | lib/chef_zero/endpoints/cookbook_endpoint.rb | 3 | ||||
| -rw-r--r-- | lib/chef_zero/endpoints/cookbook_version_endpoint.rb | 3 | ||||
| -rw-r--r-- | lib/chef_zero/endpoints/cookbooks_base.rb | 7 | ||||
| -rw-r--r-- | lib/chef_zero/endpoints/environment_cookbook_versions_endpoint.rb | 7 |
5 files changed, 8 insertions, 14 deletions
diff --git a/chef-zero.gemspec b/chef-zero.gemspec index 4cfd07c..8d61edf 100644 --- a/chef-zero.gemspec +++ b/chef-zero.gemspec @@ -13,10 +13,8 @@ Gem::Specification.new do |s| s.add_dependency 'puma', '~> 2.0' s.add_dependency 'mixlib-log', '~> 1.3' - s.add_dependency 'solve', '~> 0.4' s.add_dependency 'hashie', '~> 2.0' - # s.add_development_dependency 'chef-pdeant' s.add_development_dependency 'rake' s.bindir = 'bin' diff --git a/lib/chef_zero/endpoints/cookbook_endpoint.rb b/lib/chef_zero/endpoints/cookbook_endpoint.rb index 72f70a5..d910e9c 100644 --- a/lib/chef_zero/endpoints/cookbook_endpoint.rb +++ b/lib/chef_zero/endpoints/cookbook_endpoint.rb @@ -1,5 +1,4 @@ require 'chef_zero/endpoints/cookbooks_base' -require 'solve' module ChefZero module Endpoints @@ -32,7 +31,7 @@ module ChefZero end def latest_version(versions) - sorted = versions.sort_by { |version| Solve::Version.new(version) } + sorted = versions.sort_by { |version| Gem::Version.new(version.dup) } sorted[-1] end end diff --git a/lib/chef_zero/endpoints/cookbook_version_endpoint.rb b/lib/chef_zero/endpoints/cookbook_version_endpoint.rb index 9d93b81..0cde0ec 100644 --- a/lib/chef_zero/endpoints/cookbook_version_endpoint.rb +++ b/lib/chef_zero/endpoints/cookbook_version_endpoint.rb @@ -2,7 +2,6 @@ require 'json' require 'chef_zero/endpoints/rest_object_endpoint' require 'chef_zero/rest_error_response' require 'chef_zero/data_normalizer' -require 'solve' module ChefZero module Endpoints @@ -99,7 +98,7 @@ module ChefZero end def latest_version(versions) - sorted = versions.sort_by { |version| Solve::Version.new(version) } + sorted = versions.sort_by { |version| Gem::Version.new(version.dup) } sorted[-1] end end diff --git a/lib/chef_zero/endpoints/cookbooks_base.rb b/lib/chef_zero/endpoints/cookbooks_base.rb index f94aad8..68db3a1 100644 --- a/lib/chef_zero/endpoints/cookbooks_base.rb +++ b/lib/chef_zero/endpoints/cookbooks_base.rb @@ -1,7 +1,6 @@ require 'json' require 'chef_zero/rest_base' require 'chef_zero/data_normalizer' -require 'solve' module ChefZero module Endpoints @@ -26,11 +25,11 @@ module ChefZero def filter_cookbooks(cookbooks_list, constraints = {}, num_versions = nil) cookbooks_list.keys.sort.each do |name| - constraint = Solve::Constraint.new(constraints[name]) + constraint = Gem::Requirement.new(constraints[name]) versions = [] - cookbooks_list[name].keys.sort_by { |version| Solve::Version.new(version) }.reverse.each do |version| + cookbooks_list[name].keys.sort_by { |version| Gem::Version.new(version.dup) }.reverse.each do |version| break if num_versions && versions.size >= num_versions - if constraint.satisfies?(version) + if constraint.satisfied_by?(Gem::Version.new(version.dup)) versions << version end end 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 |