[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog ruby-fakegem.eclass
graaff 15/07/05 09:10:53
Modified: ChangeLog ruby-fakegem.eclass
Log:
Document that some variables must be set before inheriting the eclass.
Revision ChangesPath
1.1700 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1700view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1700content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1699r2=1.1700
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1699
retrieving revision 1.1700
diff -u -r1.1699 -r1.1700
--- ChangeLog 4 Jul 2015 15:26:17 - 1.1699
+++ ChangeLog 5 Jul 2015 09:10:53 - 1.1700
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1699 2015/07/04
15:26:17 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1700 2015/07/05
09:10:53 graaff Exp $
+
+ 05 Jul 2015; Hans de Graaff gra...@gentoo.org ruby-fakegem.eclass:
+ Document that some variables must be set before inheriting the eclass.
04 Jul 2015; Mike Gilbert flop...@gentoo.org distutils-r1.eclass,
python-any-r1.eclass, python-r1.eclass, python-single-r1.eclass,
1.45 eclass/ruby-fakegem.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ruby-fakegem.eclass?rev=1.45view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ruby-fakegem.eclass?rev=1.45content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ruby-fakegem.eclass?r1=1.44r2=1.45
Index: ruby-fakegem.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ruby-fakegem.eclass,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- ruby-fakegem.eclass 28 Dec 2014 10:13:18 - 1.44
+++ ruby-fakegem.eclass 5 Jul 2015 09:10:53 - 1.45
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ruby-fakegem.eclass,v 1.44
2014/12/28 10:13:18 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ruby-fakegem.eclass,v 1.45
2015/07/05 09:10:53 graaff Exp $
# @ECLASS: ruby-fakegem.eclass
# @MAINTAINER:
@@ -18,11 +18,13 @@
# @ECLASS-VARIABLE: RUBY_FAKEGEM_NAME
# @DESCRIPTION:
# Sets the Gem name for the generated fake gemspec.
+# This variable MUST be set before inheriting the eclass.
# RUBY_FAKEGEM_NAME=${PN}
# @ECLASS-VARIABLE: RUBY_FAKEGEM_VERSION
# @DESCRIPTION:
# Sets the Gem version for the generated fake gemspec.
+# This variable MUST be set before inheriting the eclass.
# RUBY_FAKEGEM_VERSION=${PV}
# @ECLASS-VARIABLE: RUBY_FAKEGEM_TASK_DOC
@@ -294,7 +296,7 @@
# so better taking this into consideration.
local quoted_description=${DESCRIPTION//\/\\\}
cat - $1 EOF
-# generated by ruby-fakegem.eclass $Revision: 1.44 $
+# generated by ruby-fakegem.eclass $Revision: 1.45 $
Gem::Specification.new do |s|
s.name = ${RUBY_FAKEGEM_NAME}
s.version = ${RUBY_FAKEGEM_VERSION}
@@ -347,7 +349,7 @@
#!${rubycmd}
# This is a simplified version of the RubyGems wrapper
#
-# Generated by ruby-fakegem.eclass $Revision: 1.44 $
+# Generated by ruby-fakegem.eclass $Revision: 1.45 $
require 'rubygems'
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog ruby-fakegem.eclass
graaff 14/12/28 10:13:18
Modified: ChangeLog ruby-fakegem.eclass
Log:
Add test recipe for rspec:3 slot.
Revision ChangesPath
1.1483 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1483view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1483content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1482r2=1.1483
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1482
retrieving revision 1.1483
diff -u -r1.1482 -r1.1483
--- ChangeLog 28 Dec 2014 07:23:56 - 1.1482
+++ ChangeLog 28 Dec 2014 10:13:18 - 1.1483
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1482 2014/12/28
07:23:56 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1483 2014/12/28
10:13:18 graaff Exp $
+
+ 28 Dec 2014; Hans de Graaff gra...@gentoo.org ruby-fakegem.eclass:
+ Add test recipe for rspec:3 slot.
28 Dec 2014; Hans de Graaff gra...@gentoo.org ruby-fakegem.eclass,
ruby-ng.eclass:
1.44 eclass/ruby-fakegem.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ruby-fakegem.eclass?rev=1.44view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ruby-fakegem.eclass?rev=1.44content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ruby-fakegem.eclass?r1=1.43r2=1.44
Index: ruby-fakegem.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ruby-fakegem.eclass,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- ruby-fakegem.eclass 28 Dec 2014 07:23:56 - 1.43
+++ ruby-fakegem.eclass 28 Dec 2014 10:13:18 - 1.44
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ruby-fakegem.eclass,v 1.43
2014/12/28 07:23:56 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ruby-fakegem.eclass,v 1.44
2014/12/28 10:13:18 graaff Exp $
# @ECLASS: ruby-fakegem.eclass
# @MAINTAINER:
@@ -35,6 +35,7 @@
# Specify one of the default testing function for ruby-fakegem:
# - rake (default; see also RUBY_FAKEGEM_TASK_TEST)
# - rspec (calls ruby-ng_rspec, adds dev-ruby/rspec:2 to the dependencies)
+# - rspec3 (calls ruby-ng_rspec, adds dev-ruby/rspec:3 to the dependencies)
# - cucumber (calls ruby-ng_cucumber, adds dev-util/cucumber to the
#dependencies; does not work on JRuby).
# - none
@@ -145,6 +146,10 @@
# rspec-2 wrapper.
ruby_add_bdepend test? ( dev-ruby/rspec:2
=dev-ruby/rspec-core-2.14.8-r2 )
;;
+ rspec3)
+ IUSE+= test
+ ruby_add_bdepend test? ( dev-ruby/rspec:3 )
+ ;;
cucumber)
IUSE+= test
# Unfortunately as of August 2012, cucumber is not supported on
@@ -289,7 +294,7 @@
# so better taking this into consideration.
local quoted_description=${DESCRIPTION//\/\\\}
cat - $1 EOF
-# generated by ruby-fakegem.eclass $Revision: 1.43 $
+# generated by ruby-fakegem.eclass $Revision: 1.44 $
Gem::Specification.new do |s|
s.name = ${RUBY_FAKEGEM_NAME}
s.version = ${RUBY_FAKEGEM_VERSION}
@@ -342,7 +347,7 @@
#!${rubycmd}
# This is a simplified version of the RubyGems wrapper
#
-# Generated by ruby-fakegem.eclass $Revision: 1.43 $
+# Generated by ruby-fakegem.eclass $Revision: 1.44 $
require 'rubygems'
@@ -440,6 +445,9 @@
rspec)
RSPEC_VERSION=2 ruby-ng_rspec
;;
+ rspec3)
+ RSPEC_VERSION=3 ruby-ng_rspec
+ ;;
cucumber)
ruby-ng_cucumber
;;
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog ruby-fakegem.eclass
graaff 14/12/07 07:23:12
Modified: ChangeLog ruby-fakegem.eclass
Log:
Allow additional content to be injected in the ruby bin wrapper.
Revision ChangesPath
1.1454 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1454view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1454content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1453r2=1.1454
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1453
retrieving revision 1.1454
diff -u -r1.1453 -r1.1454
--- ChangeLog 4 Dec 2014 10:32:10 - 1.1453
+++ ChangeLog 7 Dec 2014 07:23:12 - 1.1454
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1453 2014/12/04
10:32:10 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1454 2014/12/07
07:23:12 graaff Exp $
+
+ 07 Dec 2014; Hans de Graaff gra...@gentoo.org ruby-fakegem.eclass:
+ Allow additional content to be injected in the ruby bin wrapper.
04 Dec 2014; Manuel Rüger mr...@gentoo.org kde4-base.eclass:
Sync kde4-base.eclass with overlay.
1.42 eclass/ruby-fakegem.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ruby-fakegem.eclass?rev=1.42view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ruby-fakegem.eclass?rev=1.42content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ruby-fakegem.eclass?r1=1.41r2=1.42
Index: ruby-fakegem.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ruby-fakegem.eclass,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- ruby-fakegem.eclass 21 Apr 2014 07:35:43 - 1.41
+++ ruby-fakegem.eclass 7 Dec 2014 07:23:12 - 1.42
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ruby-fakegem.eclass,v 1.41
2014/04/21 07:35:43 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ruby-fakegem.eclass,v 1.42
2014/12/07 07:23:12 graaff Exp $
# @ECLASS: ruby-fakegem.eclass
# @MAINTAINER:
@@ -287,7 +287,7 @@
# so better taking this into consideration.
local quoted_description=${DESCRIPTION//\/\\\}
cat - $1 EOF
-# generated by ruby-fakegem.eclass $Revision: 1.41 $
+# generated by ruby-fakegem.eclass $Revision: 1.42 $
Gem::Specification.new do |s|
s.name = ${RUBY_FAKEGEM_NAME}
s.version = ${RUBY_FAKEGEM_VERSION}
@@ -299,14 +299,17 @@
}
# @FUNCTION: ruby_fakegem_binwrapper
-# @USAGE: command [path]
+# @USAGE: command [path] [content]
# @DESCRIPTION:
# Creates a new binary wrapper for a command installed by the RubyGem.
-# path defaults to /usr/bin/$command
+# path defaults to /usr/bin/$command content is optional and can be used
+# to inject additional ruby code into the wrapper. This may be useful to
+# e.g. force a specific version using the gem command.
ruby_fakegem_binwrapper() {
(
local gembinary=$1
local newbinary=${2:-/usr/bin/$gembinary}
+ local content=$3
local
relativegembinary=${RUBY_FAKEGEM_NAME}-${RUBY_FAKEGEM_VERSION}/bin/${gembinary}
local binpath=$(dirname $newbinary)
[[ ${binpath} = . ]] binpath=/usr/bin
@@ -337,10 +340,11 @@
#!${rubycmd}
# This is a simplified version of the RubyGems wrapper
#
-# Generated by ruby-fakegem.eclass $Revision: 1.41 $
+# Generated by ruby-fakegem.eclass $Revision: 1.42 $
require 'rubygems'
+${content}
load Gem::default_path[-1] + /gems/${relativegembinary}
EOF
