[DRE-commits] [ruby-foreman] 01/02: call `$ruby -S bundler` to spawn bundle in test suite

[Antonio Terceiro]

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

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

commit e25da973e88269a1d8de9ac640ad3dce4312efaa
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Fri Sep 11 09:41:36 2015 -0300

    call `$ruby -S bundler` to spawn bundle in test suite
---
 debian/changelog                                           |  8 ++++++++
 ...c_helper-misc-changes-to-run-against-Debian-packa.patch | 14 ++++++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 93d3d75..fe2251c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ruby-foreman (0.78.0-2) UNRELEASED; urgency=medium
+
+  * 0003-spec_helper-misc-changes-to-run-against-Debian-packa.patch: update to
+    call `$ruby -S bundler` where $ruby is the binary for current interpreter.
+    Should fix intermitent FTBFS.
+
+ -- Antonio Terceiro <terceiro at debian.org>  Fri, 11 Sep 2015 09:40:16 -0300
+
 ruby-foreman (0.78.0-1) unstable; urgency=medium
 
   [ Lucas Nussbaum ]
diff --git a/debian/patches/0003-spec_helper-misc-changes-to-run-against-Debian-packa.patch b/debian/patches/0003-spec_helper-misc-changes-to-run-against-Debian-packa.patch
index f11142a..9c66635 100644
--- a/debian/patches/0003-spec_helper-misc-changes-to-run-against-Debian-packa.patch
+++ b/debian/patches/0003-spec_helper-misc-changes-to-run-against-Debian-packa.patch
@@ -29,21 +29,27 @@ Subject: spec_helper: misc changes to run against Debian packages
  
  def mock_export_error(message)
    expect { yield }.to raise_error(Foreman::Export::Exception, message)
-@@ -39,7 +33,7 @@ end
+@@ -37,9 +31,13 @@ def foreman(args)
+   end
+ end
  
++def ruby
++  RbConfig::CONFIG['RUBY_INSTALL_NAME']
++end
++
  def forked_foreman(args)
    rd, wr = make_pipe
 -  Process.spawn("bundle exec bin/foreman #{args}", :out => wr, :err => wr)
-+  Process.spawn("foreman #{args}", :out => wr, :err => wr)
++  Process.spawn("#{ruby} -S foreman #{args}", :out => wr, :err => wr)
    wr.close
    rd.read
  end
-@@ -64,7 +58,7 @@ def fork_and_capture(&blk)
+@@ -64,7 +62,7 @@ def fork_and_capture(&blk)
  end
  
  def fork_and_get_exitstatus(args)
 -  pid = Process.spawn("bundle exec bin/foreman #{args}", :out => "/dev/null", :err => "/dev/null")
-+  pid = Process.spawn("foreman #{args}", :out => "/dev/null", :err => "/dev/null")
++  pid = Process.spawn("#{ruby} -S foreman #{args}", :out => "/dev/null", :err => "/dev/null")
    Process.wait(pid)
    $?.exitstatus
  end

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