graaff 14/12/28 07:23:56 Modified: ruby-ng.eclass ruby-fakegem.eclass ChangeLog Log: Use rspec-2 wrapper for the rspec recipe.
Revision Changes Path 1.56 eclass/ruby-ng.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ruby-ng.eclass?rev=1.56&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ruby-ng.eclass?rev=1.56&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ruby-ng.eclass?r1=1.55&r2=1.56 Index: ruby-ng.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ruby-ng.eclass,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- ruby-ng.eclass 27 Dec 2014 20:04:21 -0000 1.55 +++ ruby-ng.eclass 28 Dec 2014 07:23:56 -0000 1.56 @@ -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-ng.eclass,v 1.55 2014/12/27 20:04:21 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ruby-ng.eclass,v 1.56 2014/12/28 07:23:56 graaff Exp $ # @ECLASS: ruby-ng.eclass # @MAINTAINER: @@ -647,11 +647,24 @@ esac } -# @FUNCTION: ruby-ng_rspec +# @FUNCTION: ruby-ng_rspec <arguments> # @DESCRIPTION: # This is simply a wrapper around the rspec command (executed by $RUBY}) # which also respects TEST_VERBOSE and NOCOLOR environment variables. +# Optionally takes arguments to pass on to the rspec invocation. The +# environment variable RSPEC_VERSION can be used to control the specific +# rspec version that must be executed. It defaults to 2 for historical +# compatibility. ruby-ng_rspec() { + local version=${RSPEC_VERSION-2} + local files="$@" + + # Explicitly pass the expected spec directory since the versioned + # rspec wrappers don't handle this automatically. + if [ ${#@} -eq 0 ]; then + files="spec" + fi + if [[ ${DEPEND} != *"dev-ruby/rspec"* ]]; then ewarn "Missing dev-ruby/rspec in \${DEPEND}" fi @@ -675,7 +688,7 @@ ;; esac - ${RUBY} -S rspec ${rspec_params} "$@" || die "rspec failed" + ${RUBY} -S rspec-${version} ${rspec_params} ${files} || die "rspec failed" } # @FUNCTION: ruby-ng_cucumber 1.43 eclass/ruby-fakegem.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ruby-fakegem.eclass?rev=1.43&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ruby-fakegem.eclass?rev=1.43&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ruby-fakegem.eclass?r1=1.42&r2=1.43 Index: ruby-fakegem.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ruby-fakegem.eclass,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- ruby-fakegem.eclass 7 Dec 2014 07:23:12 -0000 1.42 +++ ruby-fakegem.eclass 28 Dec 2014 07:23:56 -0000 1.43 @@ -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.42 2014/12/07 07:23:12 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ruby-fakegem.eclass,v 1.43 2014/12/28 07:23:56 graaff Exp $ # @ECLASS: ruby-fakegem.eclass # @MAINTAINER: @@ -141,7 +141,9 @@ ;; rspec) IUSE+=" test" - ruby_add_bdepend "test? ( dev-ruby/rspec:2 )" + # Also require a new enough rspec-core version that installs the + # rspec-2 wrapper. + ruby_add_bdepend "test? ( dev-ruby/rspec:2 >=dev-ruby/rspec-core-2.14.8-r2 )" ;; cucumber) IUSE+=" test" @@ -287,7 +289,7 @@ # so better taking this into consideration. local quoted_description=${DESCRIPTION//\"/\\\"} cat - > $1 <<EOF -# generated by ruby-fakegem.eclass $Revision: 1.42 $ +# generated by ruby-fakegem.eclass $Revision: 1.43 $ Gem::Specification.new do |s| s.name = "${RUBY_FAKEGEM_NAME}" s.version = "${RUBY_FAKEGEM_VERSION}" @@ -340,7 +342,7 @@ #!${rubycmd} # This is a simplified version of the RubyGems wrapper # -# Generated by ruby-fakegem.eclass $Revision: 1.42 $ +# Generated by ruby-fakegem.eclass $Revision: 1.43 $ require 'rubygems' @@ -436,7 +438,7 @@ ${RUBY} -S rake ${RUBY_FAKEGEM_TASK_TEST} || die "tests failed" ;; rspec) - ruby-ng_rspec + RSPEC_VERSION=2 ruby-ng_rspec ;; cucumber) ruby-ng_cucumber 1.1482 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1482&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1482&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1481&r2=1.1482 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1481 retrieving revision 1.1482 diff -u -r1.1481 -r1.1482 --- ChangeLog 27 Dec 2014 23:52:24 -0000 1.1481 +++ ChangeLog 28 Dec 2014 07:23:56 -0000 1.1482 @@ -1,6 +1,12 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1481 2014/12/27 23:52:24 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1482 2014/12/28 07:23:56 graaff Exp $ + + 28 Dec 2014; Hans de Graaff <[email protected]> ruby-fakegem.eclass, + ruby-ng.eclass: + Use rspec-2 wrapper for the rspec recipe. This enables us to add rspec 3.x to + the tree while still being able to run rspec 2 specs. The changes have been + made in a way that is backwards compatible with the current situation. 27 Dec 2014; Michał Górny <[email protected]> python-utils-r1.eclass: Update banned var docs.
