[DRE-commits] [chef-zero] 01/03: remove implicit dependency on chef

[Antonio Terceiro]

This is an automated email from the git hooks/post-receive script.

terceiro pushed a commit to branch master
in repository chef-zero.

commit f91c93e0a23cddad8663d5363013091f07f7d563
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sun Jun 14 17:05:55 2015 -0300

    remove implicit dependency on chef
---
 debian/changelog                                   |  2 ++
 .../0001-Remove-implicit-dependency-on-chef.patch  | 41 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 44 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index a6d8122..50acb14 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ chef-zero (4.2.2-1) UNRELEASED; urgency=medium
   * Update packaging with a new dh-make-ruby run
   * Refresh patches
   * debian/tests: remove, use standard autopkgtest mechanism for Ruby packages
+  * 0001-Remove-implicit-dependency-on-chef.patch: remove implicit dependency
+    on chef
   * 0002-Add-missing-require-statement.patch: add missing require statement in
     test file
 
diff --git a/debian/patches/0001-Remove-implicit-dependency-on-chef.patch b/debian/patches/0001-Remove-implicit-dependency-on-chef.patch
new file mode 100644
index 0000000..483ecaa
--- /dev/null
+++ b/debian/patches/0001-Remove-implicit-dependency-on-chef.patch
@@ -0,0 +1,41 @@
+From eb78e23269692086421b35c23857064df8535b34 Mon Sep 17 00:00:00 2001
+From: Antonio Terceiro <terceiro at debian.org>
+Date: Sun, 14 Jun 2015 15:57:45 -0300
+Subject: [PATCH 1/2] 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
+ 
+-- 
+2.1.4
+
diff --git a/debian/patches/series b/debian/patches/series
index 135ed0d..8aaac19 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-Remove-requires-of-rubygems-and-bundler.patch
 0002-Add-missing-require-statement.patch
+0001-Remove-implicit-dependency-on-chef.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/chef-zero.git