[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog ruby-ng.eclass

[Diego Petteno (flameeyes)]

flameeyes    12/07/08 12:38:10

  Modified:             ChangeLog ruby-ng.eclass
  Log:
  Add a function to wrap around testrb-2 as well.

Revision  Changes    Path
1.337                eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.337&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.337&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.336&r2=1.337

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.336
retrieving revision 1.337
diff -u -r1.336 -r1.337
--- ChangeLog	5 Jul 2012 21:23:01 -0000	1.336
+++ ChangeLog	8 Jul 2012 12:38:10 -0000	1.337
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.336 2012/07/05 21:23:01 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.337 2012/07/08 12:38:10 flameeyes Exp $
+
+  08 Jul 2012; Diego E. Pettenò <flameeyes@g.o> ruby-ng.eclass:
+  Add a function to wrap around testrb-2 as well.
 
   05 Jul 2012; Diego E. Pettenò <flameeyes@g.o> ruby-fakegem.eclass,
   ruby-ng.eclass:



1.48                 eclass/ruby-ng.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ruby-ng.eclass?rev=1.48&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ruby-ng.eclass?rev=1.48&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ruby-ng.eclass?r1=1.47&r2=1.48

Index: ruby-ng.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ruby-ng.eclass,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- ruby-ng.eclass	5 Jul 2012 21:23:01 -0000	1.47
+++ ruby-ng.eclass	8 Jul 2012 12:38:10 -0000	1.48
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ruby-ng.eclass,v 1.47 2012/07/05 21:23:01 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ruby-ng.eclass,v 1.48 2012/07/08 12:38:10 flameeyes Exp $
 
 # @ECLASS: ruby-ng.eclass
 # @MAINTAINER:
@@ -658,3 +658,37 @@
 
 	${RUBY} -S rspec ${rspec_params} "$@" || die "rspec failed"
 }
+
+# @FUNCTION: ruby-ng_testrb-2
+# @DESCRIPTION:
+# This is simply a replacement for the testrb command that load the test
+# files and execute them, with test-unit 2.x. This actually requires
+# either an old test-unit-2 version or 2.5.1-r1 or later, as they remove
+# their script and we installed a broken wrapper for a while.
+# This also respects TEST_VERBOSE and NOCOLOR environment variables.
+ruby-ng_testrb-2() {
+	if [[ ${DEPEND} != *"dev-ruby/test-unit"* ]]; then
+		ewarn "Missing dev-ruby/test-unit in \${DEPEND}"
+	fi
+
+	local testrb_params=
+	case ${NOCOLOR} in
+		1|yes|true)
+			testrb_params+=" --no-use-color"
+			;;
+		*)
+			testrb_params+=" --use-color=auto"
+			;;
+	esac
+
+	case ${TEST_VERBOSE} in
+		1|yes|true)
+			testrb_params+=" --verbose=verbose"
+			;;
+		*)
+			testrb_params+=" --verbose=normal"
+			;;
+	esac
+
+	${RUBY} -S testrb-2 ${testrb_params} "$@" || die "testrb-2 failed"
+}