[DRE-commits] [ruby-redis] 01/07: use upstream rake task to start and stop redis

[Praveen Arimbrathodiyil]

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

praveen pushed a commit to branch master
in repository ruby-redis.

commit f9131da07a8730c2bac609814fc20b2fc3bc01e0
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sun Aug 2 10:52:02 2015 +0530

    use upstream rake task to start and stop redis
---
 debian/changelog                       |  1 +
 debian/patches/series                  |  1 +
 debian/patches/use-system-redis.patch  | 23 +++++++++++++++++++++++
 debian/start_redis_and_auto_install.sh |  9 ++++-----
 4 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 19544c7..52912de 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ ruby-redis (3.2.1-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * Remove patch test_internal_random_port.patch (merged upstream).
+  * Use upstream rake task to start and stop redis.
 
  -- Pirate Praveen <praveen at debian.org>  Fri, 31 Jul 2015 11:24:52 +0530
 
diff --git a/debian/patches/series b/debian/patches/series
index 08c516e..3727ed3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+use-system-redis.patch
 disable-encoding-check.patch
diff --git a/debian/patches/use-system-redis.patch b/debian/patches/use-system-redis.patch
new file mode 100644
index 0000000..45d8f51
--- /dev/null
+++ b/debian/patches/use-system-redis.patch
@@ -0,0 +1,23 @@
+Index: ruby-redis/Rakefile
+===================================================================
+--- ruby-redis.orig/Rakefile
++++ ruby-redis/Rakefile
+@@ -8,7 +8,8 @@ REDIS_CNF_TEMPLATE = File.join(REDIS_DIR
+ REDIS_PID = File.join(REDIS_DIR, "db", "redis.pid")
+ REDIS_LOG = File.join(REDIS_DIR, "db", "redis.log")
+ REDIS_SOCKET = File.join(REDIS_DIR, "db", "redis.sock")
+-BINARY = "tmp/redis-#{ENV["REDIS_BRANCH"]}/src/redis-server"
++#BINARY = "tmp/redis-#{ENV["REDIS_BRANCH"]}/src/redis-server"
++BINARY = "/usr/bin/redis-server"
+ 
+ task :default => :run
+ 
+@@ -48,7 +49,7 @@ end
+ 
+ desc "Clean up testing artifacts"
+ task :clean do
+-  FileUtils.rm_f(BINARY)
++#  FileUtils.rm_f(BINARY)
+   FileUtils.rm_f(REDIS_CNF)
+ end
+ 
diff --git a/debian/start_redis_and_auto_install.sh b/debian/start_redis_and_auto_install.sh
index 421d2a0..01d1686 100755
--- a/debian/start_redis_and_auto_install.sh
+++ b/debian/start_redis_and_auto_install.sh
@@ -17,14 +17,13 @@ DO_MYSQL_PASS=
 DO_MYSQL_DBNAME=test
 DO_MYSQL_DATABASE=/${DO_MYSQL_DBNAME}
 
-redis-server test/test.conf
+# Use upstream rake task to start redis 
+rake start
 
 echo "waiting 5 seconds for redis server to start..."
 sleep 5
 
 dh_auto_install
 
-kill -9 `cat test/db/redis.pid`
-rm -rf test/db/redis.sock test/db/redis.pid test/db/stdout
-
-
+# Use upstream rake task to stop redis
+rake stop

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