[DRE-commits] [ruby-redis-activesupport] 01/01: Fix patch issues

[Balasankar C]

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

balasankarc-guest pushed a commit to branch master
in repository ruby-redis-activesupport.

commit 4bdfbbc913cd861419cc480e7ef20e9a4fb49681
Author: Balasankar C <balasankarc at autistici.org>
Date:   Sat Jan 17 16:02:43 2015 +0530

    Fix patch issues
---
 debian/changelog                         |  8 ++++++++
 debian/patches/Requiring-version         | 13 +++++--------
 debian/ruby-tests.rake                   | 29 +++++++++++++++++++++++++++--
 debian/rules                             | 12 ------------
 debian/start-redis-server.sh             |  7 -------
 debian/stop-redis-server.sh              |  5 -----
 test/redis/activesupport/version_test.rb |  3 +--
 test/test_helper.rb                      |  2 +-
 8 files changed, 42 insertions(+), 37 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b41aa11..9187d41 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ruby-redis-activesupport (4.0.0-2) experimental; urgency=medium
+
+  * Debian update
+  * Move starting of redis-server to ruby-tests.rake for DebCI
+  * Fix path of library file 
+
+ -- Balasankar C <balasankarc at autistici.org>  Sat, 17 Jan 2015 16:02:02 +0530
+
 ruby-redis-activesupport (4.0.0-1) unstable; urgency=medium
 
   * Initial release (Closes: #771398)
diff --git a/debian/patches/Requiring-version b/debian/patches/Requiring-version
index 7b1f6b8..5f9534a 100644
--- a/debian/patches/Requiring-version
+++ b/debian/patches/Requiring-version
@@ -7,15 +7,12 @@ Description: Update tests
 Author: Balasankar C <balasankarc at autistici.org>
 
 
---- ruby-redis-activesupport-4.0.0.orig/test/redis/activesupport/version_test.rb
-+++ ruby-redis-activesupport-4.0.0/test/redis/activesupport/version_test.rb
-@@ -1,7 +1,8 @@
+--- a/test/redis/activesupport/version_test.rb
++++ b/test/redis/activesupport/version_test.rb
+@@ -1,5 +1,6 @@
  require 'test_helper'
  
-+require 'version'
++require 'redis/activesupport/version'
  describe Redis::ActiveSupport::VERSION do
    it 'returns current version' do
--    Redis::ActiveSupport::VERSION.must_equal '4.0.0'
-+ #   Redis::ActiveSupport::VERSION.must_equal '4.0.0'
-   end
- end
+     Redis::ActiveSupport::VERSION.must_equal '4.0.0'
diff --git a/debian/ruby-tests.rake b/debian/ruby-tests.rake
index 2e12c11..30fb816 100644
--- a/debian/ruby-tests.rake
+++ b/debian/ruby-tests.rake
@@ -1,6 +1,31 @@
+
 require 'gem2deb/rake/testtask'
-Gem2Deb::Rake::TestTask.new do |t|
-    Dir["lib/*/*"].each { |f| t.libs << f }
+task :default do
+  Rake::Task[:start_redis].invoke
+  failed = false
+  begin
+    Rake::Task[:test].invoke
+  rescue
+    failed = true
+  end
+  Rake::Task[:stop_redis].invoke
+  if failed
+    fail 'Tests failed'
+  end
+end
+
+task :start_redis do
+    sh 'redis-server --daemonize yes --port 6379&'
+    sh 'redis-server --daemonize yes --port 6380&'
+    sh 'redis-server --daemonize yes --port 6381&'
+end
+
+Rake::TestTask.new do |t|
     t.libs << 'test'
     t.test_files = FileList['test/*/*/*_test.rb']
 end
+
+task :stop_redis do
+    sh 'pkill redis-server'
+end
+
diff --git a/debian/rules b/debian/rules
index c4e9118..d81794d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,15 +13,3 @@
 
 %:
 	dh $@ --buildsystem=ruby --with ruby
-
-override_dh_auto_clean:
-	dh_auto_clean -O--buildsystem=ruby
-	# kill redis server for tests, don't fail if not started
-	debian/stop-redis-server.sh || true
-
-override_dh_auto_install:
-	# start redis server for tests
-	debian/start-redis-server.sh
-	dh_auto_install -O--buildsystem=ruby
-	# kill redis server used for tests
-	debian/stop-redis-server.sh
diff --git a/debian/start-redis-server.sh b/debian/start-redis-server.sh
deleted file mode 100755
index 19f1af7..0000000
--- a/debian/start-redis-server.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-set -e
-
-redis-server --daemonize yes --port 6379
-redis-server --daemonize yes --port 6380
-redis-server --daemonize yes --port 6381
diff --git a/debian/stop-redis-server.sh b/debian/stop-redis-server.sh
deleted file mode 100755
index 4174aee..0000000
--- a/debian/stop-redis-server.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-set -e
-
-pkill redis-server
diff --git a/test/redis/activesupport/version_test.rb b/test/redis/activesupport/version_test.rb
index a4487c9..11b106c 100644
--- a/test/redis/activesupport/version_test.rb
+++ b/test/redis/activesupport/version_test.rb
@@ -1,8 +1,7 @@
 require 'test_helper'
 
-require 'version'
 describe Redis::ActiveSupport::VERSION do
   it 'returns current version' do
- #   Redis::ActiveSupport::VERSION.must_equal '4.0.0'
+    Redis::ActiveSupport::VERSION.must_equal '4.0.0'
   end
 end
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 41628b6..9d56a73 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,4 +1,4 @@
-#require 'bundler/setup'
+require 'bundler/setup'
 require 'minitest/autorun'
 require 'mocha/setup'
 require 'active_support'

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