[DRE-commits] [ruby-em-hiredis] 05/06: Switch to rakefile for tests

[Per Andersson]

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

avtobiff-guest pushed a commit to branch master
in repository ruby-em-hiredis.

commit fa2629c1727209d3c073bfa41a7ae931fb9aad9f
Author: Per Andersson <avtobiff at gmail.com>
Date:   Thu Apr 10 02:27:09 2014 +0200

    Switch to rakefile for tests
    
    Run redis-server instance during tests.
---
 debian/changelog             | 2 ++
 debian/ruby-tests.rake       | 4 ++++
 debian/ruby-tests.rb         | 2 --
 debian/rules                 | 8 +++++++-
 debian/start-redis-server.sh | 5 +++++
 debian/stop-redis-server.sh  | 5 +++++
 6 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 87c8e9e..7ef7663 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ ruby-em-hiredis (0.2.1-2) unstable; urgency=low
   * Add ruby-eventmachine as dependency
   * Bump Standards-Version to 3.9.5, no changes
   * Remove unused bundler build dependency
+  * Switch to rakefile for tests
+    - Run redis-server instance during tests
 
  -- Per Andersson <avtobiff at gmail.com>  Thu, 10 Apr 2014 02:18:38 +0200
 
diff --git a/debian/ruby-tests.rake b/debian/ruby-tests.rake
new file mode 100644
index 0000000..ae0a251
--- /dev/null
+++ b/debian/ruby-tests.rake
@@ -0,0 +1,4 @@
+require 'rspec/core/rake_task'
+task :default => :spec
+RSpec::Core::RakeTask.new do |t|
+end
diff --git a/debian/ruby-tests.rb b/debian/ruby-tests.rb
deleted file mode 100644
index 0e7d53b..0000000
--- a/debian/ruby-tests.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-# start redis-server and daemonize, run tests, kill redis-server
-exec("redis-server & rake ; pkill -KILL redis-server")
diff --git a/debian/rules b/debian/rules
index 2378d7e..55d2978 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,6 +19,7 @@ BINARY_PKG := ruby-em-hiredis
 override_dh_auto_clean:
 	dh_auto_clean
 	rm -rf doc
+	debian/stop-redis-server.sh || true
 
 override_dh_auto_build:
 	dh_auto_build
@@ -27,8 +28,13 @@ override_dh_auto_build:
 	rm -f doc/js/jquery.js
 
 override_dh_auto_install:
+	# start redis server for tests
+	debian/start-redis-server.sh
 	# use utf-8 locale so test cases work
-	LC_ALL=C.UTF-8 dh_auto_install
+	LC_ALL=C.UTF-8 dh_auto_install -O--buildsystem=ruby
+	# kill redis server used for tests
+	debian/stop-redis-server.sh
+	# upstream changelog
 	dh_installchangelogs CHANGELOG.md
 
 override_dh_install:
diff --git a/debian/start-redis-server.sh b/debian/start-redis-server.sh
new file mode 100755
index 0000000..9f95a6c
--- /dev/null
+++ b/debian/start-redis-server.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+set -e
+
+redis-server --daemonize yes
diff --git a/debian/stop-redis-server.sh b/debian/stop-redis-server.sh
new file mode 100755
index 0000000..4174aee
--- /dev/null
+++ b/debian/stop-redis-server.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+set -e
+
+pkill redis-server

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