1 |
flameeyes 12/07/05 21:23:01 |
2 |
|
3 |
Modified: ChangeLog ruby-fakegem.eclass ruby-ng.eclass |
4 |
Log: |
5 |
Add support for running rspec while respecting some common variables (TEST_VERBOSE and NOCOLOR) in ruby-ng; then use this with a new variable in ruby-fakegem. |
6 |
|
7 |
Revision Changes Path |
8 |
1.336 eclass/ChangeLog |
9 |
|
10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.336&view=markup |
11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.336&content-type=text/plain |
12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.335&r2=1.336 |
13 |
|
14 |
Index: ChangeLog |
15 |
=================================================================== |
16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
17 |
retrieving revision 1.335 |
18 |
retrieving revision 1.336 |
19 |
diff -u -r1.335 -r1.336 |
20 |
--- ChangeLog 5 Jul 2012 20:07:47 -0000 1.335 |
21 |
+++ ChangeLog 5 Jul 2012 21:23:01 -0000 1.336 |
22 |
@@ -1,6 +1,12 @@ |
23 |
# ChangeLog for eclass directory |
24 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.335 2012/07/05 20:07:47 sera Exp $ |
26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.336 2012/07/05 21:23:01 flameeyes Exp $ |
27 |
+ |
28 |
+ 05 Jul 2012; Diego E. Pettenò <flameeyes@g.o> ruby-fakegem.eclass, |
29 |
+ ruby-ng.eclass: |
30 |
+ Add support for running rspec while respecting some common variables |
31 |
+ (TEST_VERBOSE and NOCOLOR) in ruby-ng; then use this with a new variable in |
32 |
+ ruby-fakegem. |
33 |
|
34 |
05 Jul 2012; Ralph Sennhauser <sera@g.o> java-utils-2.eclass: |
35 |
Remove java-pkg_ensure-gcj and java-pkg_ensure-test. #261562 #278965 |
36 |
|
37 |
|
38 |
|
39 |
1.33 eclass/ruby-fakegem.eclass |
40 |
|
41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ruby-fakegem.eclass?rev=1.33&view=markup |
42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ruby-fakegem.eclass?rev=1.33&content-type=text/plain |
43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ruby-fakegem.eclass?r1=1.32&r2=1.33 |
44 |
|
45 |
Index: ruby-fakegem.eclass |
46 |
=================================================================== |
47 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ruby-fakegem.eclass,v |
48 |
retrieving revision 1.32 |
49 |
retrieving revision 1.33 |
50 |
diff -u -r1.32 -r1.33 |
51 |
--- ruby-fakegem.eclass 5 Dec 2011 12:24:33 -0000 1.32 |
52 |
+++ ruby-fakegem.eclass 5 Jul 2012 21:23:01 -0000 1.33 |
53 |
@@ -1,6 +1,6 @@ |
54 |
-# Copyright 1999-2011 Gentoo Foundation |
55 |
+# Copyright 1999-2012 Gentoo Foundation |
56 |
# Distributed under the terms of the GNU General Public License v2 |
57 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ruby-fakegem.eclass,v 1.32 2011/12/05 12:24:33 graaff Exp $ |
58 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ruby-fakegem.eclass,v 1.33 2012/07/05 21:23:01 flameeyes Exp $ |
59 |
|
60 |
# @ECLASS: ruby-fakegem.eclass |
61 |
# @MAINTAINER: |
62 |
@@ -30,9 +30,18 @@ |
63 |
# Specify the rake(1) task to run to generate documentation. |
64 |
# RUBY_FAKEGEM_TASK_DOC="rdoc" |
65 |
|
66 |
+# @ECLASS-VARIABLE: RUBY_FAKEGEM_RECIPE_TEST |
67 |
+# @DESCRIPTION: |
68 |
+# Specify one of the default testing function for ruby-fakegem: |
69 |
+# - rake (default; see also RUBY_FAKEGEM_TASK_TEST) |
70 |
+# - rspec (calls ruby-ng_rspec, adds dev-ruby/rspec:2 to the dependencies) |
71 |
+# - none |
72 |
+# RUBY_FAKEGEM_RECIPE_TEST="rake" |
73 |
+ |
74 |
# @ECLASS-VARIABLE: RUBY_FAKEGEM_TASK_TEST |
75 |
# @DESCRIPTION: |
76 |
-# Specify the rake(1) task used for executing tests. |
77 |
+# Specify the rake(1) task used for executing tests. Only valid |
78 |
+# if RUBY_FAKEGEM_RECIPE_TEST is set to "rake" (the default). |
79 |
# RUBY_FAKEGEM_TASK_TEST="test" |
80 |
|
81 |
# @ECLASS-VARIABLE: RUBY_FAKEGEM_DOCDIR |
82 |
@@ -73,6 +82,7 @@ |
83 |
RUBY_FAKEGEM_SUFFIX="${RUBY_FAKEGEM_SUFFIX:-}" |
84 |
|
85 |
RUBY_FAKEGEM_TASK_DOC="${RUBY_FAKEGEM_TASK_DOC-rdoc}" |
86 |
+RUBY_FAKEGEM_RECIPE_TEST="${RUBY_FAKEGEM_RECIPE_TEST-rake}" |
87 |
RUBY_FAKEGEM_TASK_TEST="${RUBY_FAKEGEM_TASK_TEST-test}" |
88 |
|
89 |
RUBY_FAKEGEM_BINWRAP="${RUBY_FAKEGEM_BINWRAP-*}" |
90 |
@@ -86,10 +96,21 @@ |
91 |
IUSE="$IUSE doc" |
92 |
fi |
93 |
|
94 |
-if [[ ${RUBY_FAKEGEM_TASK_TEST} != "" ]]; then |
95 |
- IUSE="$IUSE test" |
96 |
- ruby_add_bdepend "test? ( dev-ruby/rake )" |
97 |
-fi |
98 |
+[[ ${RUBY_FAKEGEM_TASK_TEST} == "" ]] && RUBY_FAKEGEM_RECIPE_TEST="none" |
99 |
+ |
100 |
+case ${RUBY_FAKEGEM_RECIPE_TEST} in |
101 |
+ rake) |
102 |
+ IUSE+=" test" |
103 |
+ ruby_add_bdepend "test? ( dev-ruby/rake )" |
104 |
+ ;; |
105 |
+ rspec) |
106 |
+ IUSE+=" test" |
107 |
+ ruby_add_bdepend "test? ( dev-ruby/rspec:2 )" |
108 |
+ ;; |
109 |
+ *) |
110 |
+ RUBY_FAKEGEM_RECIPE_TEST="none" |
111 |
+ ;; |
112 |
+esac |
113 |
|
114 |
SRC_URI="mirror://rubygems/${RUBY_FAKEGEM_NAME}-${RUBY_FAKEGEM_VERSION}${RUBY_FAKEGEM_SUFFIX:+-${RUBY_FAKEGEM_SUFFIX}}.gem" |
115 |
|
116 |
@@ -216,7 +237,7 @@ |
117 |
# so better taking this into consideration. |
118 |
local quoted_description=${DESCRIPTION//\"/\\\"} |
119 |
cat - > $1 <<EOF |
120 |
-# generated by ruby-fakegem.eclass $Revision: 1.32 $ |
121 |
+# generated by ruby-fakegem.eclass $Revision: 1.33 $ |
122 |
Gem::Specification.new do |s| |
123 |
s.name = "${RUBY_FAKEGEM_NAME}" |
124 |
s.version = "${RUBY_FAKEGEM_VERSION}" |
125 |
@@ -266,7 +287,7 @@ |
126 |
#!${rubycmd} |
127 |
# This is a simplified version of the RubyGems wrapper |
128 |
# |
129 |
-# Generated by ruby-fakegem.eclass $Revision: 1.32 $ |
130 |
+# Generated by ruby-fakegem.eclass $Revision: 1.33 $ |
131 |
|
132 |
require 'rubygems' |
133 |
|
134 |
@@ -346,17 +367,26 @@ |
135 |
# @DESCRIPTION: |
136 |
# Run tests for the package for each ruby target if the test task is defined. |
137 |
each_fakegem_test() { |
138 |
- local rubyflags= |
139 |
- ${RUBY} ${rubyflags} -S rake ${RUBY_FAKEGEM_TASK_TEST} || die "tests failed" |
140 |
-} |
141 |
- |
142 |
-if [[ ${RUBY_FAKEGEM_TASK_TEST} != "" ]]; then |
143 |
- # @FUNCTION: each_ruby_test |
144 |
- # @DESCRIPTION: |
145 |
- # Run the tests for this package. |
146 |
- each_ruby_test() { |
147 |
- each_fakegem_test |
148 |
- } |
149 |
+ case ${RUBY_FAKEGEM_RECIPE_TEST} in |
150 |
+ rake) |
151 |
+ ${RUBY} -S rake ${RUBY_FAKEGEM_TASK_TEST} || die "tests failed" |
152 |
+ ;; |
153 |
+ rspec) |
154 |
+ ruby-ng_rspec |
155 |
+ ;; |
156 |
+ none) |
157 |
+ ewarn "each_fakegem_test called, but \${RUBY_FAKEGEM_RECIPE_TEST} is 'none'" |
158 |
+ ;; |
159 |
+ esac |
160 |
+} |
161 |
+ |
162 |
+if [[ ${RUBY_FAKEGEM_RECIPE_TEST} != none ]]; then |
163 |
+ # @FUNCTION: each_ruby_test |
164 |
+ # @DESCRIPTION: |
165 |
+ # Run the tests for this package. |
166 |
+ each_ruby_test() { |
167 |
+ each_fakegem_test |
168 |
+ } |
169 |
fi |
170 |
|
171 |
# @FUNCTION: each_fakegem_install |
172 |
|
173 |
|
174 |
|
175 |
1.47 eclass/ruby-ng.eclass |
176 |
|
177 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ruby-ng.eclass?rev=1.47&view=markup |
178 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ruby-ng.eclass?rev=1.47&content-type=text/plain |
179 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ruby-ng.eclass?r1=1.46&r2=1.47 |
180 |
|
181 |
Index: ruby-ng.eclass |
182 |
=================================================================== |
183 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ruby-ng.eclass,v |
184 |
retrieving revision 1.46 |
185 |
retrieving revision 1.47 |
186 |
diff -u -r1.46 -r1.47 |
187 |
--- ruby-ng.eclass 2 Jun 2012 19:16:31 -0000 1.46 |
188 |
+++ ruby-ng.eclass 5 Jul 2012 21:23:01 -0000 1.47 |
189 |
@@ -1,6 +1,6 @@ |
190 |
# Copyright 1999-2012 Gentoo Foundation |
191 |
# Distributed under the terms of the GNU General Public License v2 |
192 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ruby-ng.eclass,v 1.46 2012/06/02 19:16:31 zmedico Exp $ |
193 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ruby-ng.eclass,v 1.47 2012/07/05 21:23:01 flameeyes Exp $ |
194 |
|
195 |
# @ECLASS: ruby-ng.eclass |
196 |
# @MAINTAINER: |
197 |
@@ -627,3 +627,34 @@ |
198 |
;; |
199 |
esac |
200 |
} |
201 |
+ |
202 |
+# @FUNCTION: ruby-ng_rspec |
203 |
+# @DESCRIPTION: |
204 |
+# This is simply a wrapper around the rspec command (executed by $RUBY}) |
205 |
+# which also respects TEST_VERBOSE and NOCOLOR environment variables. |
206 |
+ruby-ng_rspec() { |
207 |
+ if [[ ${DEPEND} != *"dev-ruby/rspec"* ]]; then |
208 |
+ ewarn "Missing dev-ruby/rspec in \${DEPEND}" |
209 |
+ fi |
210 |
+ |
211 |
+ local rspec_params= |
212 |
+ case ${NOCOLOR} in |
213 |
+ 1|yes|true) |
214 |
+ rspec_params+=" --no-color" |
215 |
+ ;; |
216 |
+ *) |
217 |
+ rspec_params+=" --color" |
218 |
+ ;; |
219 |
+ esac |
220 |
+ |
221 |
+ case ${TEST_VERBOSE} in |
222 |
+ 1|yes|true) |
223 |
+ rspec_params+=" --format documentation" |
224 |
+ ;; |
225 |
+ *) |
226 |
+ rspec_params+=" --format progress" |
227 |
+ ;; |
228 |
+ esac |
229 |
+ |
230 |
+ ${RUBY} -S rspec ${rspec_params} "$@" || die "rspec failed" |
231 |
+} |