[DRE-commits] [chef] 08/13: avoid explicitly requiring code from source tree

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository chef.

commit 7be758dcab53c7638d466967b913e9ad6152c680
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sat Jun 4 13:49:15 2016 -0300

    avoid explicitly requiring code from source tree
---
 debian/changelog                                   |  2 ++
 .../0003-spec-remove-absolute-require-path.patch   | 37 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 40 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 2a94460..335d6c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,8 @@ chef (12.7.2-1) UNRELEASED; urgency=medium
     regression tests.
   * 0002-remove-deprecated-Thread.exclusive.patch: apply upstream patch to
     remove warnings under Ruby 2.3
+  * 0003-spec-remove-absolute-require-path.patch: avoid explicitly requiring
+    code from source tree.
 
  -- Lucas Kanashiro <kanashiro.duarte at gmail.com>  Thu, 03 Mar 2016 15:18:38 -0300
 
diff --git a/debian/patches/0003-spec-remove-absolute-require-path.patch b/debian/patches/0003-spec-remove-absolute-require-path.patch
new file mode 100644
index 0000000..73f57b7
--- /dev/null
+++ b/debian/patches/0003-spec-remove-absolute-require-path.patch
@@ -0,0 +1,37 @@
+From: Antonio Terceiro <terceiro at debian.org>
+Date: Sat, 4 Jun 2016 13:47:47 -0300
+Subject: spec: remove absolute require path
+
+This is not necessary; we should just trust the testing framework to
+setup the $LOAD_PATH
+---
+ spec/unit/chef_fs/config_spec.rb                     | 2 +-
+ spec/unit/chef_fs/data_handler/group_handler_spec.rb | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/spec/unit/chef_fs/config_spec.rb b/spec/unit/chef_fs/config_spec.rb
+index 2f65b6d..4b5bbbf 100644
+--- a/spec/unit/chef_fs/config_spec.rb
++++ b/spec/unit/chef_fs/config_spec.rb
+@@ -18,7 +18,7 @@
+ 
+ require "spec_helper"
+ require "chef/exceptions"
+-require "lib/chef/chef_fs/config.rb"
++require "chef/chef_fs/config.rb"
+ 
+ describe Chef::ChefFS::Config do
+   describe "initialize" do
+diff --git a/spec/unit/chef_fs/data_handler/group_handler_spec.rb b/spec/unit/chef_fs/data_handler/group_handler_spec.rb
+index 849bc84..2fd4a02 100644
+--- a/spec/unit/chef_fs/data_handler/group_handler_spec.rb
++++ b/spec/unit/chef_fs/data_handler/group_handler_spec.rb
+@@ -17,7 +17,7 @@
+ #
+ 
+ require "spec_helper"
+-require "lib/chef/chef_fs/data_handler/group_data_handler"
++require "chef/chef_fs/data_handler/group_data_handler"
+ 
+ class TestEntry < Mash
+   attr_accessor :name, :org
diff --git a/debian/patches/series b/debian/patches/series
index 47a3bae..bcbfe79 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-Update-gemspec-file.patch
 0002-remove-deprecated-Thread.exclusive.patch
+0003-spec-remove-absolute-require-path.patch

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