[gentoo-commits] proj/ruby-overlay:master commit in: dev-ruby/redis/files/, dev-ruby/redis/

[Peter Wilmott]

commit:     eb463141584073658fd40bf3e54a8f22dd7432e2
Author:     Peter Wilmott <p <AT> p8952 <DOT> info>
AuthorDate: Sat Jan  4 00:44:48 2014 +0000
Commit:     Peter Wilmott <p <AT> p8952 <DOT> info>
CommitDate: Sat Jan  4 00:44:48 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/ruby-overlay.git;a=commit;h=eb463141

dev-ruby/redis: version bump, patch to use local redis server for tests

Package-Manager: portage-2.2.7

---
 dev-ruby/redis/ChangeLog                           | 16 +++++
 .../files/redis-3.0.6-local-redis-server.patch     | 69 ++++++++++++++++++++++
 dev-ruby/redis/metadata.xml                        |  5 ++
 dev-ruby/redis/redis-3.0.6.ebuild                  | 40 +++++++++++++
 4 files changed, 130 insertions(+)

diff --git a/dev-ruby/redis/ChangeLog b/dev-ruby/redis/ChangeLog
new file mode 100644
index 0000000..84b88bc
--- /dev/null
+++ b/dev-ruby/redis/ChangeLog
@@ -0,0 +1,16 @@
+# ChangeLog for dev-ruby/redis
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/redis/ChangeLog,v 1.1 2013/12/26 21:59:46 mrueg Exp $
+
+*redis-3.0.6 (04 Jan 2014)
+
+  04 Jan 2014; Peter Wilmott <p@×××××.info>
+  +files/redis-3.0.6-local-redis-server.patch, +metadata.xml,
+  +redis-3.0.6.ebuild:
+  dev-ruby/redis: version bump, patch to use local redis server for tests
+
+*redis-3.0.5 (26 Dec 2013)
+
+  26 Dec 2013; Manuel Rüger <mrueg@g.o> +metadata.xml,
+  +redis-3.0.5.ebuild:
+  Import from dev-zero's overlay. Added small changes.

diff --git a/dev-ruby/redis/files/redis-3.0.6-local-redis-server.patch b/dev-ruby/redis/files/redis-3.0.6-local-redis-server.patch
new file mode 100644
index 0000000..243cb6c
--- /dev/null
+++ b/dev-ruby/redis/files/redis-3.0.6-local-redis-server.patch
@@ -0,0 +1,69 @@
+--- a/Rakefile	1970-01-01 01:00:00.000000000 +0100
++++ b/Rakefile	2014-01-04 00:19:25.206135726 +0000
+@@ -2,15 +2,12 @@
+ require 'rubygems/package_task'
+ require 'rake/testtask'
+ 
+-ENV["REDIS_BRANCH"] ||= "unstable"
+-
+ $:.unshift File.join(File.dirname(__FILE__), 'lib')
+ require 'redis/version'
+ 
+ REDIS_DIR = File.expand_path(File.join("..", "test"), __FILE__)
+ REDIS_CNF = File.join(REDIS_DIR, "test.conf")
+ REDIS_PID = File.join(REDIS_DIR, "db", "redis.pid")
+-BINARY = "tmp/redis-#{ENV["REDIS_BRANCH"]}/src/redis-server"
+ 
+ task :default => :run
+ 
+@@ -18,9 +15,7 @@
+ task :run => [:start, :test, :stop]
+ 
+ desc "Start the Redis server"
+-task :start => BINARY do
+-  sh "#{BINARY} --version"
+-
++task :start do
+   redis_running = \
+   begin
+     File.exists?(REDIS_PID) && Process.kill(0, File.read(REDIS_PID).to_i)
+@@ -30,8 +25,14 @@
+   end
+ 
+   unless redis_running
+-    unless system("#{BINARY} #{REDIS_CNF}")
+-      abort "could not start redis-server"
++    unless system("which redis-server")
++      STDERR.puts "redis-server not in PATH"
++      exit 1
++    end
++
++    unless system("redis-server #{REDIS_CNF}")
++      STDERR.puts "could not start redis-server"
++      exit 1
+     end
+   end
+ end
+@@ -44,21 +45,9 @@
+   end
+ end
+ 
+-file BINARY do
+-  branch = ENV.fetch("REDIS_BRANCH")
+-
+-  sh <<-SH
+-  mkdir -p tmp;
+-  cd tmp;
+-  wget https://github.com/antirez/redis/archive/#{branch}.tar.gz -O #{branch}.tar.gz;
+-  tar xf #{branch}.tar.gz;
+-  cd redis-#{branch};
+-  make
+-  SH
+-end
+-
+ Rake::TestTask.new do |t|
+   t.options = "-v"
++  t.libs << "test"
+   t.test_files = FileList["test/*_test.rb"]
+ end
+ 

diff --git a/dev-ruby/redis/metadata.xml b/dev-ruby/redis/metadata.xml
new file mode 100644
index 0000000..8521361
--- /dev/null
+++ b/dev-ruby/redis/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ruby</herd>
+</pkgmetadata>

diff --git a/dev-ruby/redis/redis-3.0.6.ebuild b/dev-ruby/redis/redis-3.0.6.ebuild
new file mode 100644
index 0000000..a40988b
--- /dev/null
+++ b/dev-ruby/redis/redis-3.0.6.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/redis/redis-3.0.5.ebuild,v 1.1 2013/12/26 21:59:46 mrueg Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20"
+
+MY_P="redis-rb-${PV}"
+RUBY_FAKEGEM_RECIPE_TEST="rake"
+RUBY_FAKEGEM_TASK_TEST="run"
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+RUBY_FAKEGEM_DOCDIR="doc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Ruby client library for Redis"
+HOMEPAGE="https://github.com/redis/redis-rb"
+SRC_URI="https://github.com/redis/redis-rb/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc test"
+
+DEPEND="test? ( dev-db/redis )"
+
+RUBY_S="${MY_P}"
+
+all_ruby_prepare() {
+	# call me impatient, but this way we don't need netcat
+	sed -i \
+		-e '/test_subscribe_past_a_timeout/,+18d' \
+		test/publish_subscribe_test.rb || die "sed failed"
+
+	# Version 3.0.6 downloads and compiles redis-server to test against.
+	# This patch reverts it to the way 3.0.5 does it, using the local server.
+	# https://github.com/redis/redis-rb/commit/351a1294fe33f79c23495b7568045e9f484918f2
+	epatch "${FILESDIR}/${P}-local-redis-server.patch"
+}