graaff 15/05/25 05:14:26 Modified: ChangeLog faraday_middleware-0.9.1.ebuild Log: Fix broken tests. Install documentation. Fix broken dependencies. Remove code that modifies the scripts since we don't use or install them. (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0x8883FA56A308A8D7!)
Revision Changes Path 1.2 dev-ruby/faraday_middleware/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/faraday_middleware/ChangeLog?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/faraday_middleware/ChangeLog?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/faraday_middleware/ChangeLog?r1=1.1&r2=1.2 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-ruby/faraday_middleware/ChangeLog,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ChangeLog 24 May 2015 22:56:46 -0000 1.1 +++ ChangeLog 25 May 2015 05:14:26 -0000 1.2 @@ -1,6 +1,11 @@ # ChangeLog for dev-ruby/faraday_middleware # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/faraday_middleware/ChangeLog,v 1.1 2015/05/24 22:56:46 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/faraday_middleware/ChangeLog,v 1.2 2015/05/25 05:14:26 graaff Exp $ + + 25 May 2015; Hans de Graaff <[email protected]> + faraday_middleware-0.9.1.ebuild: + Fix broken tests. Install documentation. Fix broken dependencies. Remove code + that modifies the scripts since we don't use or install them. *faraday_middleware-0.9.1 (24 May 2015) 1.2 dev-ruby/faraday_middleware/faraday_middleware-0.9.1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/faraday_middleware/faraday_middleware-0.9.1.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/faraday_middleware/faraday_middleware-0.9.1.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/faraday_middleware/faraday_middleware-0.9.1.ebuild?r1=1.1&r2=1.2 Index: faraday_middleware-0.9.1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-ruby/faraday_middleware/faraday_middleware-0.9.1.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- faraday_middleware-0.9.1.ebuild 24 May 2015 22:56:46 -0000 1.1 +++ faraday_middleware-0.9.1.ebuild 25 May 2015 05:14:26 -0000 1.2 @@ -1,14 +1,18 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/faraday_middleware/faraday_middleware-0.9.1.ebuild,v 1.1 2015/05/24 22:56:46 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/faraday_middleware/faraday_middleware-0.9.1.ebuild,v 1.2 2015/05/25 05:14:26 graaff Exp $ EAPI=5 + USE_RUBY="ruby19 ruby20 ruby21" -RUBY_FAKEGEM_TASK_TEST="test" -RUBY_FAKEGEM_TASK_DOC="" -RUBY_FAKEGEM_EXTRADOC="README.md" +RUBY_FAKEGEM_RECIPE_TEST="rspec" + +RUBY_FAKEGEM_RECIPE_DOC="rdoc" +RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md" + RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec" + inherit ruby-fakegem eutils DESCRIPTION="Various middleware for Faraday" @@ -21,19 +25,26 @@ IUSE="+parsexml +oauth +mashify +rashify" ruby_add_rdepend " - >=dev-ruby/faraday-0.7.4 + >=dev-ruby/faraday-0.7.4 <dev-ruby/faraday-0.10 parsexml? ( >=dev-ruby/multi_xml-0.5.3 ) oauth? ( >=dev-ruby/simple_oauth-0.1 ) - mashify? ( >=dev-ruby/hashie-1.2 ) + mashify? ( >=dev-ruby/hashie-1.2:* ) rashify? ( >=dev-ruby/rash-0.3 )" +# Bundler must be used because the optional dependencies have different +# version requirements that must be resolved. +ruby_add_bdepend "test? ( + dev-ruby/bundler + >=dev-ruby/multi_xml-0.5.3 + >=dev-ruby/simple_oauth-0.1 + >=dev-ruby/hashie-1.2 + >=dev-ruby/rash-0.3 )" + all_ruby_prepare() { - # Remove bundler support. - rm Gemfile || die - sed -i -e '/[Bb]undler/d' Rakefile || die + sed -i -e '/\(cane\|simplecov\)/ s:^:#:' \ + -e '/rspec/ s/>=/~>/' Gemfile || die } -each_ruby_prepare() { - # Make sure the test scripts use the right ruby interpreter - sed -i -e 's:ruby:'${RUBY}':' script/* || die +each_ruby_test() { + ${RUBY} -S bundle exec rspec-2 spec || die }
