[DRE-commits] [ruby-jbuilder] 04/06: Add debian/patches/dont-use-bundler-in-tests.patch

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository ruby-jbuilder.

commit 1da65973895db0a211b3bf2a222d0a46331ae414
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sun Jul 27 12:55:53 2014 -0300

    Add debian/patches/dont-use-bundler-in-tests.patch
    
    ... to avoid loading bundler during tests, which would force loading
    jbuilder.gemspec, which uses git to get a list of files for the gem.
---
 debian/changelog                               |  3 +++
 debian/patches/dont-use-bundler-in-tests.patch | 15 +++++++++++++++
 debian/patches/series                          |  1 +
 3 files changed, 19 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 969c6d1..2a3c85a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ ruby-jbuilder (2.1.3-1) UNRELEASED; urgency=medium
 
   * New upstream release
   * Run tests with rake now
+  * Add debian/patches/dont-use-bundler-in-tests.patch to avoid loading
+    bundler during tests, which would force loading jbuilder.gemspec, which
+    uses git to get a list of files for the gem.
 
  -- Antonio Terceiro <terceiro at debian.org>  Sun, 27 Jul 2014 12:39:03 -0300
 
diff --git a/debian/patches/dont-use-bundler-in-tests.patch b/debian/patches/dont-use-bundler-in-tests.patch
new file mode 100644
index 0000000..0b5cde7
--- /dev/null
+++ b/debian/patches/dont-use-bundler-in-tests.patch
@@ -0,0 +1,15 @@
+Description: do not use bundler in tests
+ This will force jbuilder.gemspec to be loaded, which will try to call git to
+ get the list of files in the gem; we don't want that.
+ .
+ This patch is Debian-specific
+Author: Antonio Terceiro <terceiro at debian.org>
+Forwarded: not-needed
+
+--- ruby-jbuilder-2.1.3.orig/test/test_helper.rb
++++ ruby-jbuilder-2.1.3/test/test_helper.rb
+@@ -1,4 +1,3 @@
+-require "bundler/setup"
+ require "rails/version"
+ 
+ if Rails::VERSION::STRING > "4.0"
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..4e408c5
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+dont-use-bundler-in-tests.patch

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