[DRE-commits] [ruby-sdoc] 02/08: Fix running tests during build

[Antonio Terceiro]

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

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

commit c3f6df0953b92ed740ecc914004c98d4ccaaaac3
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sat Aug 2 16:13:42 2014 -0300

    Fix running tests during build
---
 debian/changelog                           |  3 +++
 debian/control                             |  2 +-
 debian/patches/series                      |  1 +
 debian/patches/skip-bundler-in-tests.patch | 17 +++++++++++++++++
 4 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 2cad658..c2c124c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,5 +5,8 @@ ruby-sdoc (0.4.0-1) UNRELEASED; urgency=medium
 
   [ Antonio Terceiro ]
   * Ignore failure on require-rubygems dh_ruby test
+  * Fix running tests during build
+    - debian/patches/skip-bundler-in-tests.patch: do not load bundler during
+      the build
 
  -- Christian Hofstaedtler <zeha at debian.org>  Thu, 16 Jan 2014 16:55:26 +0100
diff --git a/debian/control b/debian/control
index 39e5b49..77a6be4 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ XS-Ruby-Versions: all
 Package: ruby-sdoc
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter
+Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter, ruby-json
 # rdoc (< 5.0, ~> 4.0), json (~> 1.8), bundler (~> 1.3, development), rake (>= 0, development), minitest (~> 4.0, development)
 Description: rdoc html with javascript search index.
  rdoc generator html with javascript search index.
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..e1bc362
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+skip-bundler-in-tests.patch
diff --git a/debian/patches/skip-bundler-in-tests.patch b/debian/patches/skip-bundler-in-tests.patch
new file mode 100644
index 0000000..f226e98
--- /dev/null
+++ b/debian/patches/skip-bundler-in-tests.patch
@@ -0,0 +1,17 @@
+Description: don't load bundler during tests
+ This will avoid bundler trying to load sdoc.gemspec, which would try to use
+ git to compile a list of files in the gem.
+ .
+ This patch is Debian-specific
+Author: Antonio Terceiro <terceiro at debian.org>
+Forwarded: not-needed
+
+--- ruby-sdoc-0.4.0.orig/spec/spec_helper.rb
++++ ruby-sdoc-0.4.0/spec/spec_helper.rb
+@@ -1,6 +1,3 @@
+-require 'rubygems'
+-require 'bundler/setup'
+-
+ require 'sdoc'
+ 
+ require 'rdoc/test_case'

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