Version bump; tests are now finally enabled, at least partially.

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

3 files changed, 24 insertions, 25 deletions

diff --git a/dev-ruby/mongoid/ChangeLog b/dev-ruby/mongoid/ChangeLog
index 8bd352ce86aa..d2520e3c686e 100644
--- a/dev-ruby/mongoid/ChangeLog
+++ b/dev-ruby/mongoid/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ruby/mongoid
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mongoid/ChangeLog,v 1.3 2012/01/19 22:08:15 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mongoid/ChangeLog,v 1.4 2012/01/23 02:32:13 flameeyes Exp $
+
+*mongoid-2.4.2 (23 Jan 2012)
+
+  23 Jan 2012; Diego E. Pettenò <flameeyes@gentoo.org> +mongoid-2.4.2.ebuild,
+  -mongoid-2.4.1.ebuild:
+  Version bump; tests are now finally enabled, at least partially.
 
   19 Jan 2012; Diego E. Pettenò <flameeyes@gentoo.org> mongoid-2.4.1.ebuild:
   Add support for testing with a custom mongd instance, but keep it disabled for
diff --git a/dev-ruby/mongoid/Manifest b/dev-ruby/mongoid/Manifest
index d39d55d7cacd..57391dfc6b30 100644
--- a/dev-ruby/mongoid/Manifest
+++ b/dev-ruby/mongoid/Manifest
@@ -1,14 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST mongoid-2.4.1.tar.gz 349062 RMD160 ae21401d8dea344a855d1d2fee96f959e9f24fb6 SHA1 70f9dadabb98dc6aadb1c2a46e8e7f1dd7b9bd0f SHA256 c16387c79cd058382f08c5cf127716cad7b7905d88b3bcfb5f211223ea9716e4
-EBUILD mongoid-2.4.1.ebuild 2331 RMD160 0070cd6b5a6655c27d03047a1e6d0e3bceef8f08 SHA1 e5052c2260ccca7c79641c6c6dff4916890020d7 SHA256 df3b419df12f9e62c7c3475ec6eb8d5f9e34e3f432a2a3b5b1df0f526fafac9a
-MISC ChangeLog 757 RMD160 53e3deab66138f0c88eb96903288547e31281607 SHA1 613dd075e5f8a5206306ef2cd95ad0ded2043468 SHA256 92559e8a09804df5a769418c6fcfd1a784d7159fac3b7df545bc7a9520114578
+DIST mongoid-2.4.2.tar.gz 351249 RMD160 17911217d521e25e399bb97b1c354f31d888831c SHA1 7b329185af27586e5410a3a5b55d40cf555ba453 SHA256 30aa3408361cf4bb98e43bdfdf43d59848d450b0526b4eb87464cab976dc2252
+EBUILD mongoid-2.4.2.ebuild 1990 RMD160 38400a634f765c31e46002051eb8ee1433e36b29 SHA1 565eeb2cb7d18ae8e0d26be1898cdae3f28050a8 SHA256 e48f1ccc888a389c428275a4631dcf04a6b5d56114afc17d4cbf71343eec93a1
+MISC ChangeLog 959 RMD160 5634c2167befdd28a24982bb2b724863a157471b SHA1 1a67b8fb846cb75fd0dd26faeae450d5dd92c14d SHA256 252d4da11f484e9281f26d28dcbb99dcb1ab958f1d28c0648f97d145d6582154
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk8YlDYACgkQAiZjviIA2XjWWACgrbcfCElDfIQLhKt+WWlGGXlL
-j7kAn03H13deuCTP6sFJKpdENwhJwYHJ
-=878K
+iEYEARECAAYFAk8cxosACgkQAiZjviIA2XjOiwCgr2Neo/o4w1cNlgwUnrNppOoo
+OLYAoMxm3QHPCcI0HJucyEjxDDe2x/4S
+=KFNu
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/mongoid/mongoid-2.4.1.ebuild b/dev-ruby/mongoid/mongoid-2.4.2.ebuild
index 467069d2f6fd..c6720c4a27e8 100644
--- a/dev-ruby/mongoid/mongoid-2.4.1.ebuild
+++ b/dev-ruby/mongoid/mongoid-2.4.2.ebuild
@@ -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/dev-ruby/mongoid/mongoid-2.4.1.ebuild,v 1.3 2012/01/19 22:08:15 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mongoid/mongoid-2.4.2.ebuild,v 1.1 2012/01/23 02:32:13 flameeyes Exp $
 
 EAPI=4
 USE_RUBY="ruby18"
@@ -29,7 +29,7 @@ IUSE="test"
 
 # there is support to create a custom mongodb instance now but there are
 # still issues to be fixed.
-RESTRICT="test"
+#RESTRICT="test"
 
 ruby_add_rdepend "
 	>=dev-ruby/activemodel-3.1
@@ -54,20 +54,6 @@ all_ruby_prepare() {
 	sed -i -e '/[bB]undler/d' Rakefile || die
 	# remove the Gemfile as well or it'll try to load it during testing
 	rm Gemfile || die
-
-	# the specsuite requires to connect to a mongodb instance; since we
-	# _really_ don't want to connect to the system-configured mongodb
-	# instance we replace the localhost address with another loopback
-	# address (127.0.0.0/8 is all local), which we'll use later.
-	find spec -type f -exec \
-		sed -i \
-		-e 's:localhost:127.255.255.254:g' \
-		-e '/Mongo::Connection/s:\.new\.:.new("127.255.255.254").:g' \
-		{} + || die
-
-	# and fix a few references that should have been from `localhost`
-	sed -i -e '139,$ s:127\.255\.255\.254:localhost:g' \
-		spec/functional/mongoid/config/database_spec.rb || die
 }
 
 each_ruby_test() {
@@ -76,11 +62,18 @@ each_ruby_test() {
 		--noprealloc --noauth --nohttpinterface --nounixsocket --nojournal \
 		--bind_ip 127.255.255.254 &
 	mongod_pid=$!
+	failed=0
 
 	sleep 2
 
-	${RUBY} -S rake spec || failed=1
+	export MONGOID_SPEC_HOST="127.255.255.254"
+	export MONGOID_SPEC_PORT="27017"
+
+	# functional testing crashes Ruby from within Portage, but works
+	# outside of it, needs to be investigated thoroughly, but at least
+	# unit testing works.
+	${RUBY} -S rake spec:unit || failed=1
 	kill "${mongod_pid}"
 
-	[ -n ${failed} ] && die "tests failed"
+	[[ "${failed}" == "1" ]] && die "tests failed"
 }