[DRE-commits] [gem2deb] 04/05: gem2deb-test-runner: simplify the command line that runs rake.

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository gem2deb.

commit 39b624c58a3ebbf75c4b7e71c03316dc6a48e020
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Tue Jul 21 20:33:56 2015 -0300

    gem2deb-test-runner: simplify the command line that runs rake.
---
 debian/changelog           | 6 ++++--
 debian/control             | 3 ++-
 lib/gem2deb/test_runner.rb | 6 +-----
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4009cdc..f037223 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,9 @@
 gem2deb (0.20) UNRELEASED; urgency=medium
 
-  * gem2deb-test-runner: when checking dependencies, don't add
-    rubygems-integration paths from different Ruby versions to GEM_PATH.
+  * gem2deb-test-runner:
+    - when checking dependencies, don't add rubygems-integration paths from
+      different Ruby versions to GEM_PATH.
+    - add dependency on rake, and simplify the command line that runs rake.
   * gem2deb/rake/testtask: Use options to make all test runs verbose by
     default
   * gem2deb/rake/spectask: add a utility task for running tests with rspec
diff --git a/debian/control b/debian/control
index 65b9c44..a277f42 100644
--- a/debian/control
+++ b/debian/control
@@ -49,7 +49,8 @@ Description: Debian Ruby packaging suite
 
 Package: gem2deb-test-runner
 Architecture: all
-Depends: ruby | ruby-interpreter,
+Depends: rake,
+         ruby | ruby-interpreter,
          ruby-minitest,
          ruby-test-unit,
          ${misc:Depends},
diff --git a/lib/gem2deb/test_runner.rb b/lib/gem2deb/test_runner.rb
index 454d3a1..2b8f9de 100644
--- a/lib/gem2deb/test_runner.rb
+++ b/lib/gem2deb/test_runner.rb
@@ -173,11 +173,7 @@ module Gem2Deb
       end
       def do_run_tests
         puts "Running tests for #{rubyver} using debian/ruby-tests.rake ..."
-        run_ruby(
-          '-rrake',
-          '-e',
-          'ARGV.unshift("-f", "debian/ruby-tests.rake"); Rake.application.run'
-        )
+        run_ruby('-S', 'rake', '-f', 'debian/ruby-tests.rake')
       end
     end
 

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