Version bump; workaround testing with recent childprocess versions (issue open upstream); fix rspec dependency for use with bundler.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

4 files changed, 101 insertions, 8 deletions

diff --git a/dev-util/aruba/ChangeLog b/dev-util/aruba/ChangeLog
index 335645974cf6..3f590356d6c2 100644
--- a/dev-util/aruba/ChangeLog
+++ b/dev-util/aruba/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/aruba
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/aruba/ChangeLog,v 1.10 2011/12/25 11:00:43 graaff Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/aruba/ChangeLog,v 1.11 2012/01/15 17:43:55 flameeyes Exp $
+
+*aruba-0.4.11 (15 Jan 2012)
+
+  15 Jan 2012; Diego E. Pettenò <flameeyes@gentoo.org> +aruba-0.4.11.ebuild,
+  +files/aruba-0.4.11+childprocess-0.2.4.patch:
+  Version bump; workaround testing with recent childprocess versions (issue open
+  upstream); fix rspec dependency for use with bundler.
 
 *aruba-0.4.10 (25 Dec 2011)
 
diff --git a/dev-util/aruba/Manifest b/dev-util/aruba/Manifest
index d208f891aefc..48483b81bfaa 100644
--- a/dev-util/aruba/Manifest
+++ b/dev-util/aruba/Manifest
@@ -1,16 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
+AUX aruba-0.4.11+childprocess-0.2.4.patch 1243 RMD160 b8017ec16b413ecf8a9f26dd4a13bb480e697690 SHA1 8e6b676778914ff24fa38927c99df6d756cdee6f SHA256 e516b449cf6da1cdbefe398f86e476d9317e0c19711fcb6bfd01ee9f1f162d90
 DIST aruba-0.4.10.gem 61440 RMD160 c186b853c21bcf4b8c87bc392ef0fa80729ffde6 SHA1 66a6f1f64c9c0368bdee2d1b16afaccc255b37c4 SHA256 9994e8bade0810eaff82cbe8554ae22bbef0f9863dd0b50dc54a57991b86f21b
+DIST aruba-0.4.11.gem 62464 RMD160 2e87cbb25d864057ad874f67f3ba0ec69dbff5d7 SHA1 3c5f0181bbadf760f1677eca85151baa547eeafe SHA256 d5629b0d48b3e9e3cc8636d5f6aee752dd57005eee88c9f2b1c6f9749c105204
 DIST aruba-0.4.6.gem 59392 RMD160 1d3e5f9f6f9501f7a83c9befafe3363c5b0935c1 SHA1 9f27b02460732da523b578b429e4bd1e3aa1ef68 SHA256 7ee5fa864168f175187473ffba4e55b5be35c088e240fa3844a035493ea70430
 EBUILD aruba-0.4.10.ebuild 954 RMD160 9a3799295ef3324f6ed0021d83fb8ee636f271ba SHA1 a49a063b75648ab70097c9b479815f2dea946f24 SHA256 e4797e00bdc8269a1f5a8be57f199d4506d52737a08055397d4e74df5278dce1
+EBUILD aruba-0.4.11.ebuild 1198 RMD160 8f1f7dabc9d29e020fc0a2a31a555b223687e99f SHA1 6ee3e3c73c8c8ac68efebf43b8e8fe3646a2497b SHA256 03efb70d201dce8b220419cb2c37f8e54a68529bb703050533d0b407bb658752
 EBUILD aruba-0.4.6.ebuild 981 RMD160 ff4c752de0c12168d686ffabcefa980ec0a3a51b SHA1 9ac8be5ba562a612786527a80640d113e07adcb6 SHA256 0045e84d88047556d6af2943aa6fcb4278543afc08cd9424c47a83c57a629563
-MISC ChangeLog 1362 RMD160 f52cc26d4639864c391b7804c361c1836a24c588 SHA1 0f9d84c1bf392774354408597bff094c996d088e SHA256 0dcfdd06c63d2c8869935179d7b5818711b86c381afd1949b9efcd0d356b1a93
+MISC ChangeLog 1658 RMD160 4b987f6f5b797ddf5c52fe8705af9400980c50b0 SHA1 362919cafde5437d03d5ea430897ddea64a7507c SHA256 c6826a1b528347ea9f29f41a038cd8f5b1f007fca8010998937f1856597be580
 MISC metadata.xml 201 RMD160 bbf7920d9809941fb024d20016dbe2fb9f15ff97 SHA1 e629d21795e99a77bd0a6aded1a153fd12d5b2c5 SHA256 c90b12c6600840878686d4544dbc51d97b0715add76b40d9400415cdef6324ad
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk73AmAACgkQiIP6VqMIqNd3jgEAlPzfx2YTH5uuiPd2VgiNYwLs
-gaDE+7ggFp3fHWHDqb0A/3uJanpLVfoP7+Ye0WVUrTgMJtURRSVHavrqRhhMWYbg
-=MmDU
+iEYEARECAAYFAk8TEE0ACgkQAiZjviIA2Xjl6ACcCJ7v0dItfVhzUMUgBO9ts/EN
+AyAAn1kHcEODUGG8D5fE77YhNVK34+Hz
+=w+T2
 -----END PGP SIGNATURE-----
diff --git a/dev-util/aruba/aruba-0.4.11.ebuild b/dev-util/aruba/aruba-0.4.11.ebuild
new file mode 100644
index 000000000000..b593d8be8856
--- /dev/null
+++ b/dev-util/aruba/aruba-0.4.11.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/aruba/aruba-0.4.11.ebuild,v 1.1 2012/01/15 17:43:55 flameeyes Exp $
+
+EAPI=4
+USE_RUBY="ruby18 ree18"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST="cucumber"
+RUBY_FAKEGEM_EXTRADOC="History.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="aruba.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Cucumber steps for driving out command line applications."
+HOMEPAGE="https://github.com/aslakhellesoy/aruba"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE=""
+
+DEPEND="${DEPEND} test? ( sys-devel/bc )"
+RDEPEND="${RDEPEND}"
+
+ruby_add_rdepend "
+	>=dev-ruby/bcat-0.6.1
+	>=dev-ruby/childprocess-0.2.3
+	>=dev-ruby/rspec-2.6
+	>=dev-util/cucumber-1.1.1"
+
+all_ruby_prepare() {
+	# Remove bundler-related code.
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+	rm Gemfile || die
+
+	# fix dependency over rspec for bundler to pick this up properly;
+	# also remove references to git ls-files.
+	sed -i -e '/rspec/s:2\.7\.0:2.6.0:' \
+		-e '/git ls-files/d' \
+		aruba.gemspec || die
+
+	# see https://github.com/cucumber/aruba/issues/106
+	epatch "${FILESDIR}"/${P}+childprocess-0.2.4.patch
+}
diff --git a/dev-util/aruba/files/aruba-0.4.11+childprocess-0.2.4.patch b/dev-util/aruba/files/aruba-0.4.11+childprocess-0.2.4.patch
new file mode 100644
index 000000000000..f5408aaeec1a
--- /dev/null
+++ b/dev-util/aruba/files/aruba-0.4.11+childprocess-0.2.4.patch
@@ -0,0 +1,37 @@
+diff --git a/features/exit_statuses.feature b/features/exit_statuses.feature
+index 5c5dffe..b971152 100644
+--- a/features/exit_statuses.feature
++++ b/features/exit_statuses.feature
+@@ -30,13 +30,3 @@ Feature: exit statuses
+   Scenario: Unsuccessfully run something
+     When I do aruba I successfully run `ruby -e 'exit 10'`
+     Then aruba should fail with "Exit status was 10"
+-
+-  @posix
+-  Scenario: Try to run something that doesn't exist
+-    When I run `does_not_exist`
+-    Then the exit status should be 1
+-
+-  @posix
+-  Scenario: Try to run something that doesn't exist with `
+-    When I run `does_not_exist`
+-    Then the exit status should be 1
+diff --git a/features/output.feature b/features/output.feature
+index 8af06ca..7eea5a5 100644
+--- a/features/output.feature
++++ b/features/output.feature
+@@ -5,14 +5,6 @@ Feature: Output
+   I want to use the "the output should contain" step
+ 
+   @posix
+-  Scenario: Run unknown command
+-    When I run `neverever gonna work`
+-    Then the output should contain:
+-      """
+-      No such file or directory - neverever
+-      """
+-
+-  @posix
+   Scenario: Detect subset of one-line output
+     When I run `ruby -e 'puts \"hello world\"'`
+     Then the output should contain "hello world"