[DRE-commits] [SCM] ruby-foreman.git branch, master, updated. upstream/0.63.0-8-g5bac8d5

[Per Andersson]

The following commit has been merged in the master branch:
commit a9ab196de32d05b43906f951ad5e7a9ddbefc03a
Author: Per Andersson <avtobiff at gmail.com>
Date:   Sun Jun 23 17:56:41 2013 +0200

    Don't use bundler or simplecov when running tests

diff --git a/debian/patches/0002-Don-t-use-bundler-when-running-tests.patch b/debian/patches/0002-Don-t-use-bundler-when-running-tests.patch
new file mode 100644
index 0000000..1da5d86
--- /dev/null
+++ b/debian/patches/0002-Don-t-use-bundler-when-running-tests.patch
@@ -0,0 +1,44 @@
+From: Per Andersson <avtobiff at gmail.com>
+Date: Sun, 23 Jun 2013 17:49:17 +0200
+Subject: Don't use bundler when running tests
+
+---
+ Rakefile            | 2 +-
+ spec/spec_helper.rb | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Rakefile b/Rakefile
+index 8f70115..3e11856 100644
+--- a/Rakefile
++++ b/Rakefile
+@@ -1,7 +1,7 @@
+ $:.unshift File.expand_path("../lib", __FILE__)
+ require "foreman"
+ 
+-require "bundler/setup"
++#require "bundler/setup"
+ 
+ Dir[File.expand_path("../tasks/*.rake", __FILE__)].each do |task|
+   load task
+diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
+index 70536cd..9336452 100644
+--- a/spec/spec_helper.rb
++++ b/spec/spec_helper.rb
+@@ -32,7 +32,7 @@ end
+ 
+ def forked_foreman(args)
+   rd, wr = IO.pipe("BINARY")
+-  Process.spawn("bundle exec bin/foreman #{args}", :out => wr, :err => wr)
++  Process.spawn("bin/foreman #{args}", :out => wr, :err => wr)
+   wr.close
+   rd.read
+ end
+@@ -57,7 +57,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("bin/foreman #{args}", :out => "/dev/null", :err => "/dev/null")
+   Process.wait(pid)
+   $?.exitstatus
+ end
diff --git a/debian/patches/0003-Don-t-use-simplecov-when-running-tests.patch b/debian/patches/0003-Don-t-use-simplecov-when-running-tests.patch
new file mode 100644
index 0000000..04b174a
--- /dev/null
+++ b/debian/patches/0003-Don-t-use-simplecov-when-running-tests.patch
@@ -0,0 +1,24 @@
+From: Per Andersson <avtobiff at gmail.com>
+Date: Sun, 23 Jun 2013 17:49:28 +0200
+Subject: Don't use simplecov when running tests
+
+---
+ spec/spec_helper.rb | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
+index 9336452..b9df554 100644
+--- a/spec/spec_helper.rb
++++ b/spec/spec_helper.rb
+@@ -1,7 +1,7 @@
+-require "simplecov"
+-SimpleCov.start do
+-  add_filter "/spec/"
+-end
++#require "simplecov"
++#SimpleCov.start do
++#  add_filter "/spec/"
++#end
+ 
+ require "rspec"
+ require "timecop"
diff --git a/debian/patches/series b/debian/patches/series
index 28f1908..c676454 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
 0001-Remove-taskman-script.patch
+0002-Don-t-use-bundler-when-running-tests.patch
+0003-Don-t-use-simplecov-when-running-tests.patch

-- 
ruby-foreman.git