1 |
graaff 14/01/21 19:05:09 |
2 |
|
3 |
Added: redis-3.0.6-local-redis-server.patch |
4 |
Log: |
5 |
Version bump by Peter Wilmott in the ruby overlay. |
6 |
|
7 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x8883FA56A308A8D7!) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 dev-ruby/redis/files/redis-3.0.6-local-redis-server.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/redis/files/redis-3.0.6-local-redis-server.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/redis/files/redis-3.0.6-local-redis-server.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: redis-3.0.6-local-redis-server.patch |
16 |
=================================================================== |
17 |
--- a/Rakefile 1970-01-01 01:00:00.000000000 +0100 |
18 |
+++ b/Rakefile 2014-01-04 00:19:25.206135726 +0000 |
19 |
@@ -2,15 +2,12 @@ |
20 |
require 'rubygems/package_task' |
21 |
require 'rake/testtask' |
22 |
|
23 |
-ENV["REDIS_BRANCH"] ||= "unstable" |
24 |
- |
25 |
$:.unshift File.join(File.dirname(__FILE__), 'lib') |
26 |
require 'redis/version' |
27 |
|
28 |
REDIS_DIR = File.expand_path(File.join("..", "test"), __FILE__) |
29 |
REDIS_CNF = File.join(REDIS_DIR, "test.conf") |
30 |
REDIS_PID = File.join(REDIS_DIR, "db", "redis.pid") |
31 |
-BINARY = "tmp/redis-#{ENV["REDIS_BRANCH"]}/src/redis-server" |
32 |
|
33 |
task :default => :run |
34 |
|
35 |
@@ -18,9 +15,7 @@ |
36 |
task :run => [:start, :test, :stop] |
37 |
|
38 |
desc "Start the Redis server" |
39 |
-task :start => BINARY do |
40 |
- sh "#{BINARY} --version" |
41 |
- |
42 |
+task :start do |
43 |
redis_running = \ |
44 |
begin |
45 |
File.exists?(REDIS_PID) && Process.kill(0, File.read(REDIS_PID).to_i) |
46 |
@@ -30,8 +25,14 @@ |
47 |
end |
48 |
|
49 |
unless redis_running |
50 |
- unless system("#{BINARY} #{REDIS_CNF}") |
51 |
- abort "could not start redis-server" |
52 |
+ unless system("which redis-server") |
53 |
+ STDERR.puts "redis-server not in PATH" |
54 |
+ exit 1 |
55 |
+ end |
56 |
+ |
57 |
+ unless system("redis-server #{REDIS_CNF}") |
58 |
+ STDERR.puts "could not start redis-server" |
59 |
+ exit 1 |
60 |
end |
61 |
end |
62 |
end |
63 |
@@ -44,21 +45,9 @@ |
64 |
end |
65 |
end |
66 |
|
67 |
-file BINARY do |
68 |
- branch = ENV.fetch("REDIS_BRANCH") |
69 |
- |
70 |
- sh <<-SH |
71 |
- mkdir -p tmp; |
72 |
- cd tmp; |
73 |
- wget https://github.com/antirez/redis/archive/#{branch}.tar.gz -O #{branch}.tar.gz; |
74 |
- tar xf #{branch}.tar.gz; |
75 |
- cd redis-#{branch}; |
76 |
- make |
77 |
- SH |
78 |
-end |
79 |
- |
80 |
Rake::TestTask.new do |t| |
81 |
t.options = "-v" |
82 |
+ t.libs << "test" |
83 |
t.test_files = FileList["test/*_test.rb"] |
84 |
end |