[DRE-commits] [ruby-varia-model] 03/04: Drop spork usage

[zeha at debian.org]

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

zeha pushed a commit to branch master
in repository ruby-varia-model.

commit dfb9018be393e1d27ffd097bfe252417cdde1bbc
Author: Christian Hofstaedtler <zeha at debian.org>
Date:   Thu Mar 3 18:49:39 2016 +0100

    Drop spork usage
---
 debian/control                    |  3 +--
 debian/patches/remove-spork.patch | 16 ++++++++++++++++
 debian/patches/series             |  1 +
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 314bba7..b82f612 100644
--- a/debian/control
+++ b/debian/control
@@ -10,8 +10,7 @@ Build-Depends: debhelper (>= 9~),
                ruby-buff-ruby-engine (>= 0.1),
                ruby-hashie (<< 4.0.0),
                ruby-hashie (>= 2.0.2),
-               ruby-rspec,
-               spork
+               ruby-rspec
 Standards-Version: 3.9.7
 Vcs-Git: https://anonscm.debian.org/git/pkg-ruby-extras/ruby-varia-model.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-ruby-extras/ruby-varia-model.git
diff --git a/debian/patches/remove-spork.patch b/debian/patches/remove-spork.patch
new file mode 100644
index 0000000..1bb8a66
--- /dev/null
+++ b/debian/patches/remove-spork.patch
@@ -0,0 +1,16 @@
+Don't use spork in the specs, as it's pointless for our oneshot
+test runs.
+
+Index: ruby-varia-model/spec/spec_helper.rb
+===================================================================
+--- ruby-varia-model.orig/spec/spec_helper.rb
++++ ruby-varia-model/spec/spec_helper.rb
+@@ -15,7 +15,7 @@ def setup_rspec
+   end
+ end
+ 
+-if Buff::RubyEngine.jruby?
++if true
+   require 'varia_model'
+   setup_rspec
+ else
diff --git a/debian/patches/series b/debian/patches/series
index 1c9f4a9..28a7110 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0002-Don-t-change-LOAD_PATH-in-tests.patch
+remove-spork.patch

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