From eb78e23269692086421b35c23857064df8535b34 Mon Sep 17 00:00:00 2001 From: Antonio Terceiro Date: Sun, 14 Jun 2015 15:57:45 -0300 Subject: Remove implicit dependency on chef You don't want chef-zero depending on chef, since chef already depends on chef-zero and circular dependencies are a pain to deal with. This closes issue #136 --- lib/chef_zero/endpoints/policies_endpoint.rb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/lib/chef_zero/endpoints/policies_endpoint.rb b/lib/chef_zero/endpoints/policies_endpoint.rb index 83d503c..ddb2e9b 100644 --- a/lib/chef_zero/endpoints/policies_endpoint.rb +++ b/lib/chef_zero/endpoints/policies_endpoint.rb @@ -1,8 +1,5 @@ require 'ffi_yajl' -require 'chef/version_class' -require 'chef/exceptions' - require 'chef_zero/endpoints/rest_object_endpoint' require 'chef_zero/chef_data/data_normalizer' @@ -142,9 +139,9 @@ module ChefZero end def valid_version?(version_string) - Chef::Version.new(version_string) + Gem::Version.new(version_string) true - rescue Chef::Exceptions::InvalidCookbookVersion + rescue ArgumentError false end -- cgit v1.2.1 From 08bc88af9d9482ef28c06e6e89d335604a99493f Mon Sep 17 00:00:00 2001 From: Antonio Terceiro Date: Sun, 14 Jun 2015 15:58:58 -0300 Subject: server_spec: add missing require on net/http Otherwise several examples crash when being run directly with `rake spec`. --- spec/server_spec.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/spec/server_spec.rb b/spec/server_spec.rb index 558ef35..d46084f 100644 --- a/spec/server_spec.rb +++ b/spec/server_spec.rb @@ -1,4 +1,5 @@ require 'chef_zero/server' +require 'net/http' require 'uri' describe ChefZero::Server do -- cgit v1.2.1