Don't force cucumber presence and add ruby19 support.

(Portage version: 2.2.0_alpha19/cvs/Linux x86_64)

3 files changed, 103 insertions, 4 deletions

diff --git a/dev-ruby/rspec-mocks/ChangeLog b/dev-ruby/rspec-mocks/ChangeLog
index c93c28d1bf89..ed9e33867132 100644
--- a/dev-ruby/rspec-mocks/ChangeLog
+++ b/dev-ruby/rspec-mocks/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/rspec-mocks
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-mocks/ChangeLog,v 1.6 2011/01/15 17:02:08 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-mocks/ChangeLog,v 1.7 2011/02/02 14:13:26 flameeyes Exp $
+
+  02 Feb 2011; Diego E. Pettenò <flameeyes@gentoo.org>
+  rspec-mocks-2.4.0.ebuild, +files/rspec-mocks-2.4.0-no-cucumber.patch:
+  Don't force cucumber presence and add ruby19 support.
 
 *rspec-mocks-2.4.0 (15 Jan 2011)
 
diff --git a/dev-ruby/rspec-mocks/files/rspec-mocks-2.4.0-no-cucumber.patch b/dev-ruby/rspec-mocks/files/rspec-mocks-2.4.0-no-cucumber.patch
new file mode 100644
index 000000000000..be4894ee5894
--- /dev/null
+++ b/dev-ruby/rspec-mocks/files/rspec-mocks-2.4.0-no-cucumber.patch
@@ -0,0 +1,94 @@
+From 3bb79545449eda5361af6b6d1902e70833659445 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@gmail.com>
+Date: Wed, 2 Feb 2011 15:02:26 +0100
+Subject: [PATCH] Don't force cucumber presence on Rakefile.
+
+Only define the cucumber tasks if cucumber is available, allowing for the
+Rakefile to work without Cucumber installed.
+---
+ Rakefile |   49 +++++++++++++++++++++++++++----------------------
+ 1 files changed, 27 insertions(+), 22 deletions(-)
+
+diff --git a/Rakefile b/Rakefile
+index 8171c40..7197927 100644
+--- a/Rakefile
++++ b/Rakefile
+@@ -5,15 +5,6 @@ Bundler::GemHelper.install_tasks
+ require 'rake'
+ require 'rspec/core/rake_task'
+ require 'rspec/mocks/version'
+-require 'cucumber/rake/task'
+-
+-class Cucumber::Rake::Task::ForkedCucumberRunner
+-  # When cucumber shells out, we still need it to run in the context of our
+-  # bundle.
+-  def run
+-    sh "bundle exec #{RUBY} " + args.join(" ")
+-  end
+-end
+ 
+ task :cleanup_rcov_files do
+   rm_rf 'coverage.data'
+@@ -24,8 +15,6 @@ RSpec::Core::RakeTask.new(:spec) do |t|
+   t.rspec_opts = %w[--color]
+ end
+ 
+-Cucumber::Rake::Task.new(:cucumber)
+-
+ namespace :spec do
+   desc "Run all examples using rcov"
+   RSpec::Core::RakeTask.new :rcov => :cleanup_rcov_files do |t|
+@@ -35,17 +24,35 @@ namespace :spec do
+   end
+ end
+ 
+-namespace :cucumber do
+-  desc "Run cucumber features using rcov"
+-  Cucumber::Rake::Task.new :rcov => :cleanup_rcov_files do |t|
+-    t.cucumber_opts = %w{--format progress}
+-    t.rcov = true
+-    t.rcov_opts =  %[-Ilib -Ispec --exclude "gems/*,features"]
+-    t.rcov_opts << %[--text-report --sort coverage --aggregate coverage.data]
++task :default => :spec
++
++begin
++  require 'cucumber/rake/task'
++
++  class Cucumber::Rake::Task::ForkedCucumberRunner
++    # When cucumber shells out, we still need it to run in the context of our
++    # bundle.
++    def run
++      sh "bundle exec #{RUBY} " + args.join(" ")
++    end
+   end
+-end
+ 
+-task :default => [:spec, :cucumber]
++  Cucumber::Rake::Task.new(:cucumber)
++
++  namespace :cucumber do
++    desc "Run cucumber features using rcov"
++    Cucumber::Rake::Task.new :rcov => :cleanup_rcov_files do |t|
++      t.cucumber_opts = %w{--format progress}
++      t.rcov = true
++      t.rcov_opts =  %[-Ilib -Ispec --exclude "gems/*,features"]
++      t.rcov_opts << %[--text-report --sort coverage --aggregate coverage.data]
++    end
++  end
++
++  task :default => :cucumber
++rescue LoadError
++  $stderr.puts "unable to load cucumber, some tasks unavailable"
++end
+ 
+ task :clobber do
+   rm_rf 'pkg'
+@@ -66,5 +73,3 @@ task :relish, :version do |t, args|
+   raise "rake relish[VERSION]" unless args[:version]
+   sh "relish push rspec/rspec-mocks:#{args[:version]}"
+ end
+-
+-task :default => [:spec, :cucumber]
+-- 
+1.7.4
+
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-2.4.0.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-2.4.0.ebuild
index adabe165f56d..48172464f37b 100644
--- a/dev-ruby/rspec-mocks/rspec-mocks-2.4.0.ebuild
+++ b/dev-ruby/rspec-mocks/rspec-mocks-2.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-mocks/rspec-mocks-2.4.0.ebuild,v 1.1 2011/01/15 17:02:08 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-mocks/rspec-mocks-2.4.0.ebuild,v 1.2 2011/02/02 14:13:26 flameeyes Exp $
 
 EAPI=2
 USE_RUBY="ruby18 ree18 ruby19"
@@ -25,9 +25,8 @@ IUSE=""
 ruby_add_bdepend "test? (
 		dev-ruby/rspec-core:2
 		dev-ruby/rspec-expectations:2
-		dev-util/cucumber
 	)
-	doc? ( dev-ruby/rspec-core:2 dev-util/cucumber )"
+	doc? ( dev-ruby/rspec-core:2 )"
 
 # Not clear yet to what extend we need those (now)
 #	>=dev-ruby/cucumber-0.6.2
@@ -39,6 +38,8 @@ all_ruby_prepare() {
 
 	# Remove the Gemfile to avoid running through 'bundle exec'
 	rm Gemfile || die
+
+	epatch "${FILESDIR}"/${P}-no-cucumber.patch
 }
 
 all_ruby_compile() {