This contains quite a few related and interdependent ruby regress related changes:
1) Split the devel/ruby-rspec port into subdirs for rspec 1 and rspec 2.
While they use very similar DSL syntax, they use completely different
class names and a different binary, so they are not compatible. Many
current ports use rspec 1, but most new ones will be using rspec 2.
I'm attaching a tarball for this.
2) Cleanup regress section of ruby.port.mk. This simplifies the
handling of regress stuff, and makes it handle more types of regress
tests without having to manually write do-regress targets in port
Makefiles. MODRUBY_REGRESS now supports rspec2, ruby, and testrb
entries, using the appropriate binary. You can set a specific
environment using MODRUBY_REGRESS_ENV. Instead of RAKE_REGRESS_TARGET
and RSPEC_REGRESS_TARGET, just use MODRUBY_REGRESS_TARGET. You can also
pick a specific directory to run the regress in using
MODRUBY_REGRESS_DIR. Additionally, if an unrecognized entry is used in
MODRUBY_REGRESS, an error is now raised instead of silently being
ignored.
3) Tweaking of the regress actions in many ruby ports using the new
features in ruby.port.mk. Some of these depend on the new ports I sent
earlier.
4) Version updates/patches to bundler (1.0.7 -> 1.0.21) and mocha (0.9.7
-> 0.9.12), and a patch to isolate to fix usage with gems with C
extensions.
Tested on i386.
Jeremy
Index: lang/ruby/ruby.port.mk
===================================================================
RCS file: /cvs/ports/lang/ruby/ruby.port.mk,v
retrieving revision 1.47
diff -u -p -r1.47 ruby.port.mk
--- lang/ruby/ruby.port.mk 9 Nov 2011 00:03:31 -0000 1.47
+++ lang/ruby/ruby.port.mk 14 Nov 2011 13:20:53 -0000
@@ -117,7 +117,8 @@ MODRUBY_FLAVOR = rbx
.endif
MODRUBY_RAKE_DEPENDS =
-MODRUBY_RSPEC_DEPENDS = devel/ruby-rspec,${MODRUBY_FLAVOR}
+MODRUBY_RSPEC_DEPENDS = devel/ruby-rspec/1,${MODRUBY_FLAVOR}<2.0
+MODRUBY_RSPEC2_DEPENDS = devel/ruby-rspec/rspec,${MODRUBY_FLAVOR}>=2.0
# Set the path for the ruby interpreter and the rake and rspec
# commands used by MODRUBY_REGRESS and manually in some port
@@ -126,6 +127,7 @@ MODRUBY_RSPEC_DEPENDS = devel/ruby-rspec
RUBY= ${LOCALBASE}/jruby/bin/jruby
RAKE= ${RUBY} -S rake
RSPEC= ${RUBY} -S spec
+MODRUBY_BIN_RSPEC = ${RUBY} -S rspec
MODRUBY_BIN_TESTRB = ${RUBY} -S testrb
# Without this, JRuby often fails with a memory error.
@@ -134,6 +136,7 @@ MAKE_ENV+= JAVA_MEM='-Xms256m -Xmx256m'
RUBY= ${LOCALBASE}/bin/rbx
RAKE= ${RUBY} -S rake
RSPEC= ${RUBY} -S spec
+MODRUBY_BIN_RSPEC = ${RUBY} -S rspec
MODRUBY_BIN_TESTRB = ${RUBY} -S testrb
.else
RUBY= ${LOCALBASE}/bin/ruby${MODRUBY_BINREV}
@@ -142,12 +145,21 @@ MODRUBY_BIN_TESTRB = ${LOCALBASE}/bin/te
. if ${MODRUBY_REV} == 1.8
MODRUBY_RAKE_DEPENDS = devel/ruby-rake
RSPEC= ${LOCALBASE}/bin/spec
+MODRUBY_BIN_RSPEC = ${LOCALBASE}/bin/rspec
. else
RSPEC= ${LOCALBASE}/bin/spec${MODRUBY_BINREV}
+MODRUBY_BIN_RSPEC = ${LOCALBASE}/bin/rspec${MODRUBY_BINREV}
. endif
.endif
+.if defined(MODRUBY_REGRESS) && !${MODRUBY_REGRESS:L:Mrspec} && \
+ !${MODRUBY_REGRESS:L:Mrspec2} && !${MODRUBY_REGRESS:L:Mrake} && \
+ !${MODRUBY_REGRESS:L:Mruby} && !${MODRUBY_REGRESS:L:Mtestrb}
+ERRORS += "Fatal: MODRUBY_REGRESS must contain one of: ruby, " \
+ "rake, rspec, rspec2, testrb (contains ${MODRUBY_REGRESS})"
+.else
MODRUBY_REGRESS?=
+.endif
.if ${MODRUBY_REV} == jruby
. if ${CONFIGURE_STYLE:L:Mext} || ${CONFIGURE_STYLE:L:Mextconf}
@@ -221,6 +233,9 @@ REGRESS_DEPENDS+= ${MODRUBY_RAKE_DEPENDS
.if ${MODRUBY_REGRESS:L:Mrspec}
REGRESS_DEPENDS+= ${MODRUBY_RSPEC_DEPENDS}
.endif
+.if ${MODRUBY_REGRESS:L:Mrspec2}
+REGRESS_DEPENDS+= ${MODRUBY_RSPEC2_DEPENDS}
+.endif
MODRUBY_RUBY_ADJ= perl -pi -e 's,/usr/bin/env ruby,${RUBY},'
MODRUBY_ADJ_FILES?=
@@ -411,22 +426,32 @@ SUBST_VARS+= ^MODRUBY_SITEARCHDIR ^MODR
# regression stuff
-.if !target(do-regress)
-. if ${MODRUBY_REGRESS:L:Mrspec}
+.if !empty(MODRUBY_REGRESS)
+. if !target(do-regress)
+
. if ${MODRUBY_REGRESS:L:Mrake}
-RAKE_REGRESS_TARGET?= ${RSPEC_REGRESS_TARGET}
+MODRUBY_REGRESS_BIN ?= ${RAKE} --trace
+. elif ${MODRUBY_REGRESS:L:Mrspec}
+MODRUBY_REGRESS_BIN ?= ${RSPEC}
+. elif ${MODRUBY_REGRESS:L:Mrspec2}
+MODRUBY_REGRESS_BIN ?= ${MODRUBY_BIN_RSPEC}
+. elif ${MODRUBY_REGRESS:L:Mtestrb}
+MODRUBY_REGRESS_BIN ?= ${MODRUBY_BIN_TESTRB}
+. elif ${MODRUBY_REGRESS:L:Mruby}
+MODRUBY_REGRESS_BIN ?= ${RUBY}
+. endif
+
+. if ${MODRUBY_REGRESS:L:Mrspec} || ${MODRUBY_REGRESS:L:Mrspec2}
+MODRUBY_REGRESS_TARGET ?= spec
. else
-RSPEC_REGRESS_TARGET?= spec
-do-regress:
- cd ${WRKSRC} && ${RSPEC} ${RSPEC_REGRESS_TARGET}
+MODRUBY_REGRESS_TARGET ?= test
. endif
-. endif
-. if ${MODRUBY_REGRESS:L:Mrake}
-RAKE_REGRESS_TARGET?= test
+
+MODRUBY_REGRESS_ENV ?=
+MODRUBY_REGRESS_DIR ?= ${WRKSRC}
do-regress:
- cd ${WRKSRC} && ${RAKE} ${RAKE_REGRESS_TARGET}
-. endif
-. if !${MODRUBY_REGRESS:L:Mrspec} && !${MODRUBY_REGRESS:L:Mrake}
-NO_REGRESS=YES
+ cd ${MODRUBY_REGRESS_DIR} && ${SETENV} ${MAKE_ENV} HOME=${WRKBUILD} \
+ ${MODRUBY_REGRESS_ENV} ${MODRUBY_REGRESS_BIN} \
+ ${MODRUBY_REGRESS_TARGET}
. endif
.endif
Index: audio/ruby-vorbis_comment/Makefile
===================================================================
RCS file: /cvs/ports/audio/ruby-vorbis_comment/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- audio/ruby-vorbis_comment/Makefile 9 Nov 2011 00:17:37 -0000 1.5
+++ audio/ruby-vorbis_comment/Makefile 14 Nov 2011 13:21:15 -0000
@@ -26,10 +26,7 @@ LIB_DEPENDS = audio/libvorbis
CONFIGURE_STYLE = ruby gem ext
REGRESS_DEPENDS = ${FULLPKGNAME}:${BUILD_PKGPATH}
-MODRUBY_REGRESS = rake
-RAKE_REGRESS_TARGET = default
-
-do-regress:
- cd ${WRKSRC} && ${RUBY} test/test_vorbis_comment.rb
+MODRUBY_REGRESS = ruby
+MODRUBY_REGRESS_TARGET = test/test_vorbis_comment.rb
.include <bsd.port.mk>
Index: databases/ruby-amalgalite/Makefile
===================================================================
RCS file: /cvs/ports/databases/ruby-amalgalite/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- databases/ruby-amalgalite/Makefile 16 Sep 2011 08:48:04 -0000 1.6
+++ databases/ruby-amalgalite/Makefile 14 Nov 2011 13:21:15 -0000
@@ -30,10 +30,8 @@ AMALGALITE_SO_DIR = amalgalite/${MODRUBY
SUBST_VARS += AMALGALITE_SO_DIR
# distfile doesn't include configuration directory necessary for testing.
-# Also requires RSpec2, no yet ported.
-NO_REGRESS = Yes
REGRESS_DEPENDS = ${FULLPKGNAME}:${BUILD_PKGPATH}
-MODRUBY_REGRESS = rspec
-RSPEC_REGRESS_TARGET = spec/*_spec.rb
+MODRUBY_REGRESS = rspec2
+MODRUBY_REGRESS_TARGET = spec/*_spec.rb
.include <bsd.port.mk>
Index: databases/ruby-data_objects/Makefile
===================================================================
RCS file: /cvs/ports/databases/ruby-data_objects/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- databases/ruby-data_objects/Makefile 9 Nov 2011 00:05:40 -0000
1.10
+++ databases/ruby-data_objects/Makefile 14 Nov 2011 13:21:15 -0000
@@ -19,9 +19,9 @@ RUN_DEPENDS = www/ruby-addressable,${MO
CONFIGURE_STYLE = ruby gem
-MODRUBY_REGRESS = rake rspec
-RAKE_REGRESS_TARGET= -R tasks spec
+MODRUBY_REGRESS = rake rspec2
REGRESS_DEPENDS = devel/ruby-mocha,${MODRUBY_FLAVOR} \
- devel/ruby-bacon,${MODRUBY_FLAVOR}
+ devel/ruby-bacon,${MODRUBY_FLAVOR} \
+ devel/ruby-bundler,${MODRUBY_FLAVOR}
.include <bsd.port.mk>
Index: databases/ruby-sequel/Makefile
===================================================================
RCS file: /cvs/ports/databases/ruby-sequel/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- databases/ruby-sequel/Makefile 12 Nov 2011 17:02:17 -0000 1.18
+++ databases/ruby-sequel/Makefile 14 Nov 2011 13:21:15 -0000
@@ -21,6 +21,6 @@ CONFIGURE_STYLE = ruby gem
REGRESS_DEPENDS = databases/ruby-sqlite3,${MODRUBY_FLAVOR}
MODRUBY_REGRESS = rake rspec
-RAKE_REGRESS_TARGET = spec spec_plugin spec_sqlite
+MODRUBY_REGRESS_TARGET = spec spec_plugin spec_sqlite
.include <bsd.port.mk>
Index: devel/ruby-cucumber/Makefile
===================================================================
RCS file: /cvs/ports/devel/ruby-cucumber/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- devel/ruby-cucumber/Makefile 16 Sep 2011 09:24:57 -0000 1.9
+++ devel/ruby-cucumber/Makefile 14 Nov 2011 13:21:15 -0000
@@ -29,6 +29,4 @@ REGRESS_DEPENDS = ${FULLPKGNAME}:${BUILD
MODRUBY_REGRESS = rake rspec
-RAKE_REGRESS_TARGET = features
-
.include <bsd.port.mk>
Index: devel/ruby-extlib/Makefile
===================================================================
RCS file: /cvs/ports/devel/ruby-extlib/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- devel/ruby-extlib/Makefile 16 Sep 2011 09:24:57 -0000 1.11
+++ devel/ruby-extlib/Makefile 14 Nov 2011 13:21:15 -0000
@@ -17,7 +17,7 @@ MODULES = lang/ruby
CONFIGURE_STYLE = ruby gem
MODRUBY_REGRESS = rake rspec
-RAKE_REGRESS_TARGET = spec
-REGRESS_DEPENDS = converters/ruby-json,${MODRUBY_FLAVOR}
+REGRESS_DEPENDS = converters/ruby-json,${MODRUBY_FLAVOR} \
+ devel/ruby-jeweler,${MODRUBY_FLAVOR}
.include <bsd.port.mk>
Index: devel/ruby-extlib/patches/patch-Rakefile
===================================================================
RCS file: devel/ruby-extlib/patches/patch-Rakefile
diff -N devel/ruby-extlib/patches/patch-Rakefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ devel/ruby-extlib/patches/patch-Rakefile 14 Nov 2011 13:21:15 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Fudge package dependency to allow running regress.
+
+--- Rakefile.orig Sun Nov 13 19:51:21 2011
++++ Rakefile Sun Nov 13 19:51:30 2011
+@@ -15,7 +15,7 @@ begin
+
+ gem.rubyforge_project = 'extlib'
+
+- gem.add_development_dependency 'json_pure', '~> 1.4'
++ gem.add_development_dependency 'json', '~> 1.4'
+ gem.add_development_dependency 'rspec', '~> 1.3'
+ end
+
Index: devel/ruby-ffi/Makefile
===================================================================
RCS file: /cvs/ports/devel/ruby-ffi/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- devel/ruby-ffi/Makefile 9 Nov 2011 00:17:38 -0000 1.7
+++ devel/ruby-ffi/Makefile 14 Nov 2011 13:21:15 -0000
@@ -30,11 +30,13 @@ CONFIGURE_STYLE = ruby gem ext
post-install:
rm -r ${GEM_ABS_PATH}/gems/${DISTNAME}/ext
-# Regress currently broken, libtest directory needed and not
-# included in the gem
-NO_REGRESS = yes
-REGRESS_DEPENDS = devel/ruby-rake-compiler,${MODRUBY_FLAVOR}
-MODRUBY_REGRESS = rake rspec
-RAKE_REGRESS_TARGET = specs
+# Doesn't ship with libtest directory, which is necessary for
+# regress
+NO_REGRESS = Yes
+#REGRESS_DEPENDS = ${FULLPKGNAME}:${BUILD_PKGPATH}
+#MODRUBY_REGRESS = rspec2
+#MODRUBY_REGRESS_ENV = RUBYLIB=$$(dirname `${GEM} which ffi.rb`) \
+# RUBYOPT=-rffi
+#MODRUBY_REGRESS_TARGET = spec/ffi/*_spec.rb
.include <bsd.port.mk>
Index: devel/ruby-ffi-inliner/Makefile
===================================================================
RCS file: /cvs/ports/devel/ruby-ffi-inliner/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- devel/ruby-ffi-inliner/Makefile 16 Sep 2011 09:24:57 -0000 1.2
+++ devel/ruby-ffi-inliner/Makefile 14 Nov 2011 13:21:15 -0000
@@ -4,7 +4,7 @@ COMMENT = embed C code in your ruby scri
DISTNAME = ffi-inliner-0.2.4
CATEGORIES = devel
-REVISION= 0
+REVISION = 0
HOMEPAGE = http://github.com/remogatto/ffi-inliner
@@ -21,8 +21,10 @@ CONFIGURE_STYLE = ruby gem
BUILD_DEPENDS = ${RUN_DEPENDS}
RUN_DEPENDS = devel/ruby-ffi,${MODRUBY_FLAVOR}
+# 1 failure because we don't support the optional tcc dependency
REGRESS_DEPENDS = ${FULLPKGNAME}:${BUILD_PKGPATH}
MODRUBY_REGRESS = rspec
-RSPEC_REGRESS_TARGET= spec/ffi-inliner/inliner_spec.rb
+MODRUBY_REGRESS_ENV = LD_PRELOAD=/usr/lib/libpthread.so
+MODRUBY_REGRESS_TARGET= spec/ffi-inliner/inliner_spec.rb
.include <bsd.port.mk>
Index: devel/ruby-flexmock/Makefile
===================================================================
RCS file: /cvs/ports/devel/ruby-flexmock/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- devel/ruby-flexmock/Makefile 16 Sep 2011 09:24:57 -0000 1.14
+++ devel/ruby-flexmock/Makefile 14 Nov 2011 13:21:15 -0000
@@ -17,6 +17,6 @@ MODULES= lang/ruby
CONFIGURE_STYLE=ruby gem
MODRUBY_REGRESS= rake
-RAKE_REGRESS_TARGET= test_all
+MODRUBY_REGRESS_TARGET= test_all
.include <bsd.port.mk>
Index: devel/ruby-mspec/Makefile
===================================================================
RCS file: /cvs/ports/devel/ruby-mspec/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- devel/ruby-mspec/Makefile 16 Sep 2011 09:24:57 -0000 1.2
+++ devel/ruby-mspec/Makefile 14 Nov 2011 13:21:15 -0000
@@ -18,6 +18,10 @@ PERMIT_DISTFILES_FTP = Yes
MODULES = lang/ruby
CONFIGURE_STYLE = ruby gem
+
+# 1 expected failure on ruby 1.8
+# 20 failures on ruby 1.9
MODRUBY_REGRESS = rake rspec
+MODRUBY_REGRESS_ENV = RUBYLIB=.
.include <bsd.port.mk>
Index: devel/ruby-prof/Makefile
===================================================================
RCS file: /cvs/ports/devel/ruby-prof/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- devel/ruby-prof/Makefile 16 Sep 2011 09:24:58 -0000 1.4
+++ devel/ruby-prof/Makefile 14 Nov 2011 13:21:15 -0000
@@ -4,7 +4,7 @@ COMMENT = fast code profiler for Ruby
DISTNAME = ruby-${PKGNAME}
PKGNAME = prof-0.10.6
-REVISION= 0
+REVISION= 0
CATEGORIES = devel
HOMEPAGE = http://ruby-prof.rubyforge.org/
@@ -21,8 +21,8 @@ MODULES = lang/ruby
CONFIGURE_STYLE = ruby gem ext
-# A few regress failures
+# 4 failures
MODRUBY_REGRESS = rake
-RAKE_REGRESS_TARGET = build test
+MODRUBY_REGRESS_TARGET = build test
.include <bsd.port.mk>
Index: devel/ruby-prof/patches/patch-Rakefile
===================================================================
RCS file: devel/ruby-prof/patches/patch-Rakefile
diff -N devel/ruby-prof/patches/patch-Rakefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ devel/ruby-prof/patches/patch-Rakefile 14 Nov 2011 13:21:15 -0000
@@ -0,0 +1,24 @@
+$OpenBSD$
+
+The gem doesn't ship with it's gemspec, which breaks the Rakefile
+when used from the gem. Work around it so the regress tests can run.
+
+--- Rakefile.orig Sun Nov 13 22:29:39 2011
++++ Rakefile Sun Nov 13 22:29:54 2011
+@@ -10,7 +10,6 @@ require 'date'
+ # rake cleanr default
+ # gem push pkg/ruby-prof-0.10.1.gem
+
+-default_spec = eval File.read(File.expand_path('../ruby-prof.gemspec',
__FILE__))
+
+ desc 'deprecated--build native .gem files -- use like "native_gems clobber
cross native gem"--for non native gem creation use "native_gems clobber" then
"clean gem"'
+ task :native_gems do
+@@ -27,7 +26,7 @@ end
+ Rake::GemPackageTask.new(default_spec) do |pkg|
+ pkg.need_tar = true
+ #pkg.need_zip = true
+-end
++end if false
+
+
+ # --------- RDoc Documentation ------
Index: devel/ruby-rake/Makefile
===================================================================
RCS file: /cvs/ports/devel/ruby-rake/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- devel/ruby-rake/Makefile 9 Nov 2011 00:08:50 -0000 1.21
+++ devel/ruby-rake/Makefile 14 Nov 2011 13:21:15 -0000
@@ -21,6 +21,5 @@ REGRESS_DEPENDS=${FULLPKGNAME}:${BUILD_P
devel/ruby-rcov \
devel/ruby-flexmock
MODRUBY_REGRESS=rake
-RAKE_REGRESS_TARGET=test_all
.include <bsd.port.mk>
Index: devel/ruby-subset_sum/Makefile
===================================================================
RCS file: /cvs/ports/devel/ruby-subset_sum/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- devel/ruby-subset_sum/Makefile 9 Nov 2011 00:17:38 -0000 1.3
+++ devel/ruby-subset_sum/Makefile 14 Nov 2011 13:21:15 -0000
@@ -20,6 +20,6 @@ MODULES = lang/ruby
CONFIGURE_STYLE = ruby gem ext
MODRUBY_REGRESS = rspec
-RSPEC_REGRESS_TARGET = spec/*_spec.rb
+MODRUBY_REGRESS_TARGET = spec/*_spec.rb
.include <bsd.port.mk>
Index: devel/ruby-uuidtools/Makefile
===================================================================
RCS file: /cvs/ports/devel/ruby-uuidtools/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- devel/ruby-uuidtools/Makefile 16 Sep 2011 09:24:58 -0000 1.11
+++ devel/ruby-uuidtools/Makefile 14 Nov 2011 13:21:15 -0000
@@ -16,7 +16,7 @@ MODULES= lang/ruby
CONFIGURE_STYLE=ruby gem
-MODRUBY_REGRESS=rake
-RAKE_REGRESS_TARGET=test_all
+MODRUBY_REGRESS=rake rspec
+MODRUBY_REGRESS_TARGET=spec:normal
.include <bsd.port.mk>
Index: net/ruby-amqp/Makefile
===================================================================
RCS file: /cvs/ports/net/ruby-amqp/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- net/ruby-amqp/Makefile 16 Sep 2011 11:13:40 -0000 1.9
+++ net/ruby-amqp/Makefile 14 Nov 2011 13:21:15 -0000
@@ -22,6 +22,6 @@ RUN_DEPENDS = net/ruby-eventmachine,${MO
REGRESS_DEPENDS = ${FULLPKGNAME}:${BUILD_PKGPATH} \
devel/ruby-bacon,${MODRUBY_FLAVOR}
MODRUBY_REGRESS = rake
-RAKE_REGRESS_TARGET = spec
+MODRUBY_REGRESS_TARGET = spec
.include <bsd.port.mk>
Index: net/ruby-bunny/Makefile
===================================================================
RCS file: /cvs/ports/net/ruby-bunny/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- net/ruby-bunny/Makefile 16 Sep 2011 11:13:40 -0000 1.7
+++ net/ruby-bunny/Makefile 14 Nov 2011 13:21:15 -0000
@@ -20,6 +20,6 @@ CONFIGURE_STYLE = ruby gem
REGRESS_IS_INTERACTIVE = Yes
MODRUBY_REGRESS = rake rspec
-RSPEC_REGRESS_TARGET = all
+MODRUBY_REGRESS_TARGET = all
.include <bsd.port.mk>
Index: security/ruby-bcrypt/Makefile
===================================================================
RCS file: /cvs/ports/security/ruby-bcrypt/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- security/ruby-bcrypt/Makefile 16 Sep 2011 11:41:39 -0000 1.13
+++ security/ruby-bcrypt/Makefile 14 Nov 2011 13:21:15 -0000
@@ -5,7 +5,7 @@ COMMENT = Ruby binding for the bcrypt()
VERSION = 3.0.0
DISTNAME = bcrypt-ruby-${VERSION}
PKGNAME = bcrypt-${VERSION}
-REVISION= 0
+REVISION= 0
CATEGORIES = security
MAINTAINER = Jeremy Evans <[email protected]>
@@ -21,5 +21,8 @@ PERMIT_DISTFILES_FTP = Yes
MODULES = lang/ruby
CONFIGURE_STYLE = ruby gem ext
+
+REGRESS_DEPENDS = devel/ruby-rake-compiler,${MODRUBY_FLAVOR}
+MODRUBY_REGRESS = rake rspec2
.include <bsd.port.mk>
Index: sysutils/ruby-facter/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/ruby-facter/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- sysutils/ruby-facter/Makefile 16 Sep 2011 11:41:40 -0000 1.19
+++ sysutils/ruby-facter/Makefile 14 Nov 2011 13:21:15 -0000
@@ -34,9 +34,7 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/etc/facter.conf \
${MODRUBY_EXAMPLEDIR}/facter
-MODRUBY_REGRESS= rake rspec
-do-regress:
- @cd ${WRKSRC}/spec && ${RAKE} all
+MODRUBY_REGRESS = rake rspec2
.include <bsd.port.mk>
Index: textproc/ruby-builder/Makefile
===================================================================
RCS file: /cvs/ports/textproc/ruby-builder/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- textproc/ruby-builder/Makefile 16 Sep 2011 11:41:41 -0000 1.12
+++ textproc/ruby-builder/Makefile 14 Nov 2011 13:21:15 -0000
@@ -17,6 +17,6 @@ MODULES= lang/ruby
CONFIGURE_STYLE=ruby gem
MODRUBY_REGRESS= rake
-RAKE_REGRESS_TARGET= test_all
+MODRUBY_REGRESS_TARGET= test_all
.include <bsd.port.mk>
Index: textproc/ruby-rdiscount/Makefile
===================================================================
RCS file: /cvs/ports/textproc/ruby-rdiscount/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- textproc/ruby-rdiscount/Makefile 16 Sep 2011 11:41:42 -0000 1.2
+++ textproc/ruby-rdiscount/Makefile 14 Nov 2011 13:21:15 -0000
@@ -18,6 +18,6 @@ CONFIGURE_STYLE = ruby gem ext
MODRUBY_REGRESS = rake
-RAKE_REGRESS_TARGET = test:unit
+MODRUBY_REGRESS_TARGET = test:unit
.include <bsd.port.mk>
Index: textproc/ruby-rdiscount/patches/patch-Rakefile
===================================================================
RCS file: textproc/ruby-rdiscount/patches/patch-Rakefile
diff -N textproc/ruby-rdiscount/patches/patch-Rakefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ textproc/ruby-rdiscount/patches/patch-Rakefile 14 Nov 2011 13:21:15
-0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Fix regress with rake 0.9, which no longer defines ::RUBY.
+
+--- Rakefile.orig Sun Nov 13 22:47:48 2011
++++ Rakefile Sun Nov 13 22:47:59 2011
+@@ -9,6 +9,7 @@ task :default => :test
+ # ==========================================================
+
+ DLEXT = Config::CONFIG['DLEXT']
++RUBY = FileUtils::RUBY
+ RUBYDIGEST = Digest::MD5.hexdigest(`#{RUBY} --version`)
+
+ file "ext/ruby-#{RUBYDIGEST}" do |f|
Index: textproc/ruby-templater/patches/patch-Rakefile
===================================================================
RCS file: textproc/ruby-templater/patches/patch-Rakefile
diff -N textproc/ruby-templater/patches/patch-Rakefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ textproc/ruby-templater/patches/patch-Rakefile 14 Nov 2011 13:21:15
-0000
@@ -0,0 +1,23 @@
+$OpenBSD$
+
+Comment out requiring newgem hoe plugin, as it is not needed for
+building and breaks regress.
+
+--- Rakefile.orig Sun Nov 13 00:22:57 2011
++++ Rakefile Sun Nov 13 00:23:10 2011
+@@ -4,7 +4,7 @@ require 'hoe'
+ require 'fileutils'
+ require './lib/templater'
+
+-Hoe.plugin :newgem
++# Hoe.plugin :newgem
+ # Hoe.plugin :website
+ # Hoe.plugin :cucumberfeatures
+
+@@ -19,5 +19,5 @@ $hoe = Hoe.spec 'templater' do
+ self.extra_dev_deps << ['rspec', '>= 1.2.8']
+ end
+
+-require 'newgem/tasks'
++# require 'newgem/tasks'
+ Dir['tasks/**/*.rake'].each { |t| load t }
Index: devel/ruby-bundler/Makefile
===================================================================
RCS file: /cvs/ports/devel/ruby-bundler/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- devel/ruby-bundler/Makefile 16 Sep 2011 09:24:57 -0000 1.3
+++ devel/ruby-bundler/Makefile 14 Nov 2011 13:22:57 -0000
@@ -2,8 +2,7 @@
COMMENT= ruby application dependency manager
-DISTNAME= bundler-1.0.7
-REVISION = 1
+DISTNAME= bundler-1.0.21
CATEGORIES= devel
HOMEPAGE= http://gembundler.com/
@@ -18,7 +17,8 @@ MODULES= lang/ruby
CONFIGURE_STYLE= ruby gem
-# Currently requires a git checkout to run the specs
-MODRUBY_REGRESS= rake rspec
+# 3 expected failures
+REGRESS_DEPENDS = textproc/ruby-ronn,${MODRUBY_FLAVOR}
+MODRUBY_REGRESS= rake rspec2
.include <bsd.port.mk>
Index: devel/ruby-bundler/distinfo
===================================================================
RCS file: /cvs/ports/devel/ruby-bundler/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- devel/ruby-bundler/distinfo 8 Dec 2010 21:24:41 -0000 1.1.1.1
+++ devel/ruby-bundler/distinfo 14 Nov 2011 13:22:57 -0000
@@ -1,5 +1,5 @@
-MD5 (bundler-1.0.7.gem) = bKT4MtXFJxoe5Bt4jGhoxA==
-RMD160 (bundler-1.0.7.gem) = nDzcuhMAS93+im8pPKbrpgsSyWY=
-SHA1 (bundler-1.0.7.gem) = KmOomHjG5oxUrhA93zzF003cFlU=
-SHA256 (bundler-1.0.7.gem) = dhwLlX95SkQtE4V1UpKrsbpjaWBjKkhevwbAqZII9so=
-SIZE (bundler-1.0.7.gem) = 158208
+MD5 (bundler-1.0.21.gem) = OHhHPLqhNVy8My8rjvRN5w==
+RMD160 (bundler-1.0.21.gem) = A0ps+ADOY6vJFSOKaOt0IZtWeIc=
+SHA1 (bundler-1.0.21.gem) = M2AohcApJayr6U2IS4UEOGPB4lY=
+SHA256 (bundler-1.0.21.gem) = RgPLBEoaf3gEJpLoZmFfpxWNgwBm/84HWRG/vcv5nVE=
+SIZE (bundler-1.0.21.gem) = 172544
Index: devel/ruby-bundler/pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/ruby-bundler/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- devel/ruby-bundler/pkg/PLIST 8 Dec 2010 21:24:41 -0000 1.1.1.1
+++ devel/ruby-bundler/pkg/PLIST 14 Nov 2011 13:22:57 -0000
@@ -3,6 +3,7 @@ ${GEM_BIN}/bundle${GEM_BIN_SUFFIX}
${GEM_LIB}/cache/${DISTNAME}.gem
${GEM_LIB}/gems/${DISTNAME}/
${GEM_LIB}/gems/${DISTNAME}/.gitignore
+${GEM_LIB}/gems/${DISTNAME}/.travis.yml
${GEM_LIB}/gems/${DISTNAME}/CHANGELOG.md
${GEM_LIB}/gems/${DISTNAME}/ISSUES.md
${GEM_LIB}/gems/${DISTNAME}/LICENSE
@@ -23,6 +24,8 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/bundler/
${GEM_LIB}/gems/${DISTNAME}/lib/bundler/dsl.rb
${GEM_LIB}/gems/${DISTNAME}/lib/bundler/environment.rb
${GEM_LIB}/gems/${DISTNAME}/lib/bundler/gem_helper.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/bundler/gem_installer.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/bundler/gem_tasks.rb
${GEM_LIB}/gems/${DISTNAME}/lib/bundler/graph.rb
${GEM_LIB}/gems/${DISTNAME}/lib/bundler/index.rb
${GEM_LIB}/gems/${DISTNAME}/lib/bundler/installer.rb
@@ -46,6 +49,7 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/bundler/
${GEM_LIB}/gems/${DISTNAME}/lib/bundler/remote_specification.rb
${GEM_LIB}/gems/${DISTNAME}/lib/bundler/resolver.rb
${GEM_LIB}/gems/${DISTNAME}/lib/bundler/rubygems_ext.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/bundler/rubygems_integration.rb
${GEM_LIB}/gems/${DISTNAME}/lib/bundler/runtime.rb
${GEM_LIB}/gems/${DISTNAME}/lib/bundler/settings.rb
${GEM_LIB}/gems/${DISTNAME}/lib/bundler/setup.rb
@@ -73,6 +77,7 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/bundler/
${GEM_LIB}/gems/${DISTNAME}/lib/bundler/vendor/thor/actions/
${GEM_LIB}/gems/${DISTNAME}/lib/bundler/vendor/thor/actions.rb
${GEM_LIB}/gems/${DISTNAME}/lib/bundler/vendor/thor/actions/create_file.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/bundler/vendor/thor/actions/create_link.rb
${GEM_LIB}/gems/${DISTNAME}/lib/bundler/vendor/thor/actions/directory.rb
${GEM_LIB}/gems/${DISTNAME}/lib/bundler/vendor/thor/actions/empty_directory.rb
${GEM_LIB}/gems/${DISTNAME}/lib/bundler/vendor/thor/actions/file_manipulation.rb
@@ -83,6 +88,7 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/bundler/
${GEM_LIB}/gems/${DISTNAME}/lib/bundler/vendor/thor/core_ext/hash_with_indifferent_access.rb
${GEM_LIB}/gems/${DISTNAME}/lib/bundler/vendor/thor/core_ext/ordered_hash.rb
${GEM_LIB}/gems/${DISTNAME}/lib/bundler/vendor/thor/error.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/bundler/vendor/thor/group.rb
${GEM_LIB}/gems/${DISTNAME}/lib/bundler/vendor/thor/invocation.rb
${GEM_LIB}/gems/${DISTNAME}/lib/bundler/vendor/thor/parser/
${GEM_LIB}/gems/${DISTNAME}/lib/bundler/vendor/thor/parser.rb
@@ -90,6 +96,8 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/bundler/
${GEM_LIB}/gems/${DISTNAME}/lib/bundler/vendor/thor/parser/arguments.rb
${GEM_LIB}/gems/${DISTNAME}/lib/bundler/vendor/thor/parser/option.rb
${GEM_LIB}/gems/${DISTNAME}/lib/bundler/vendor/thor/parser/options.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/bundler/vendor/thor/rake_compat.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/bundler/vendor/thor/runner.rb
${GEM_LIB}/gems/${DISTNAME}/lib/bundler/vendor/thor/shell/
${GEM_LIB}/gems/${DISTNAME}/lib/bundler/vendor/thor/shell.rb
${GEM_LIB}/gems/${DISTNAME}/lib/bundler/vendor/thor/shell/basic.rb
@@ -98,6 +106,7 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/bundler/
${GEM_LIB}/gems/${DISTNAME}/lib/bundler/vendor/thor/task.rb
${GEM_LIB}/gems/${DISTNAME}/lib/bundler/vendor/thor/util.rb
${GEM_LIB}/gems/${DISTNAME}/lib/bundler/vendor/thor/version.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/bundler/vendored_thor.rb
${GEM_LIB}/gems/${DISTNAME}/lib/bundler/version.rb
${GEM_LIB}/gems/${DISTNAME}/lib/bundler/vlad.rb
${GEM_LIB}/gems/${DISTNAME}/man/
@@ -110,6 +119,8 @@ ${GEM_LIB}/gems/${DISTNAME}/man/bundle.r
${GEM_LIB}/gems/${DISTNAME}/man/gemfile.5.ronn
${GEM_LIB}/gems/${DISTNAME}/man/index.txt
${GEM_LIB}/gems/${DISTNAME}/spec/
+${GEM_LIB}/gems/${DISTNAME}/spec/bundler/
+${GEM_LIB}/gems/${DISTNAME}/spec/bundler/gem_helper_spec.rb
${GEM_LIB}/gems/${DISTNAME}/spec/cache/
${GEM_LIB}/gems/${DISTNAME}/spec/cache/gems_spec.rb
${GEM_LIB}/gems/${DISTNAME}/spec/cache/git_spec.rb
@@ -143,14 +154,11 @@ ${GEM_LIB}/gems/${DISTNAME}/spec/other/c
${GEM_LIB}/gems/${DISTNAME}/spec/other/console_spec.rb
${GEM_LIB}/gems/${DISTNAME}/spec/other/exec_spec.rb
${GEM_LIB}/gems/${DISTNAME}/spec/other/ext_spec.rb
-${GEM_LIB}/gems/${DISTNAME}/spec/other/gem_helper_spec.rb
${GEM_LIB}/gems/${DISTNAME}/spec/other/help_spec.rb
${GEM_LIB}/gems/${DISTNAME}/spec/other/init_spec.rb
${GEM_LIB}/gems/${DISTNAME}/spec/other/newgem_spec.rb
${GEM_LIB}/gems/${DISTNAME}/spec/other/open_spec.rb
${GEM_LIB}/gems/${DISTNAME}/spec/other/show_spec.rb
-${GEM_LIB}/gems/${DISTNAME}/spec/pack/
-${GEM_LIB}/gems/${DISTNAME}/spec/pack/gems_spec.rb
${GEM_LIB}/gems/${DISTNAME}/spec/quality_spec.rb
${GEM_LIB}/gems/${DISTNAME}/spec/resolver/
${GEM_LIB}/gems/${DISTNAME}/spec/resolver/basic_spec.rb
@@ -173,7 +181,7 @@ ${GEM_LIB}/gems/${DISTNAME}/spec/support
${GEM_LIB}/gems/${DISTNAME}/spec/support/ruby_ext.rb
${GEM_LIB}/gems/${DISTNAME}/spec/support/rubygems_ext.rb
${GEM_LIB}/gems/${DISTNAME}/spec/support/rubygems_hax/
-${GEM_LIB}/gems/${DISTNAME}/spec/support/rubygems_hax/rubygems_plugin.rb
+${GEM_LIB}/gems/${DISTNAME}/spec/support/rubygems_hax/platform.rb
${GEM_LIB}/gems/${DISTNAME}/spec/support/sudo.rb
${GEM_LIB}/gems/${DISTNAME}/spec/update/
${GEM_LIB}/gems/${DISTNAME}/spec/update/gems_spec.rb
Index: devel/ruby-mocha/Makefile
===================================================================
RCS file: /cvs/ports/devel/ruby-mocha/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- devel/ruby-mocha/Makefile 16 Sep 2011 09:24:57 -0000 1.13
+++ devel/ruby-mocha/Makefile 14 Nov 2011 13:23:23 -0000
@@ -2,8 +2,7 @@
COMMENT = Ruby library for mocking and stubbing
-DISTNAME = mocha-0.9.7
-REVISION = 4
+DISTNAME = mocha-0.9.12
CATEGORIES = devel
HOMEPAGE = http://mocha.rubyforge.org/
@@ -21,7 +20,8 @@ RUN_DEPENDS = ${MODRUBY_RAKE_DEPENDS}
CONFIGURE_STYLE = ruby gem
+# 7 failures
MODRUBY_REGRESS = rake
-RAKE_REGRESS_TARGET = test:acceptance test:units
+MODRUBY_REGRESS_TARGET = test:acceptance test:units
.include <bsd.port.mk>
Index: devel/ruby-mocha/distinfo
===================================================================
RCS file: /cvs/ports/devel/ruby-mocha/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- devel/ruby-mocha/distinfo 20 Aug 2009 22:02:53 -0000 1.6
+++ devel/ruby-mocha/distinfo 14 Nov 2011 13:23:23 -0000
@@ -1,5 +1,5 @@
-MD5 (mocha-0.9.7.gem) = EgHWMNX0svnfyO8OzACNMw==
-RMD160 (mocha-0.9.7.gem) = XBrAtQibS/bPVZrDCOFDt8473ew=
-SHA1 (mocha-0.9.7.gem) = 94X8RgX6TI5vehXgvmQkA58ZngA=
-SHA256 (mocha-0.9.7.gem) = 42Pxwiw2JiBJwp11du0SwAcpn1NvobagD6OHFUDoMto=
-SIZE (mocha-0.9.7.gem) = 59906
+MD5 (mocha-0.9.12.gem) = HfjMod/DsVpE7DyESXyshQ==
+RMD160 (mocha-0.9.12.gem) = 4VYXxwdNHn/qJPU0Q0GoBbu7w98=
+SHA1 (mocha-0.9.12.gem) = lgjxQ68gUUvpWsQ4X2k/n+hlrLY=
+SHA256 (mocha-0.9.12.gem) = L8fj4A6SB3K1pcuhaAm1Z/b2I/YuXDyV9cUdCTVXX48=
+SIZE (mocha-0.9.12.gem) = 67584
Index: devel/ruby-mocha/pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/ruby-mocha/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -r1.8 PLIST
--- devel/ruby-mocha/pkg/PLIST 8 Nov 2010 23:24:40 -0000 1.8
+++ devel/ruby-mocha/pkg/PLIST 14 Nov 2011 13:23:23 -0000
@@ -1,10 +1,11 @@
@comment $OpenBSD: PLIST,v 1.8 2010/11/08 23:24:40 jeremy Exp $
${GEM_LIB}/cache/${DISTNAME}.gem
${GEM_LIB}/gems/${DISTNAME}/
-${GEM_LIB}/gems/${DISTNAME}/COPYING
-${GEM_LIB}/gems/${DISTNAME}/MIT-LICENSE
-${GEM_LIB}/gems/${DISTNAME}/README
-${GEM_LIB}/gems/${DISTNAME}/RELEASE
+${GEM_LIB}/gems/${DISTNAME}/.gemtest
+${GEM_LIB}/gems/${DISTNAME}/COPYING.rdoc
+${GEM_LIB}/gems/${DISTNAME}/MIT-LICENSE.rdoc
+${GEM_LIB}/gems/${DISTNAME}/README.rdoc
+${GEM_LIB}/gems/${DISTNAME}/RELEASE.rdoc
${GEM_LIB}/gems/${DISTNAME}/Rakefile
${GEM_LIB}/gems/${DISTNAME}/examples/
${GEM_LIB}/gems/${DISTNAME}/examples/misc.rb
@@ -35,12 +36,19 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/mocha/in
${GEM_LIB}/gems/${DISTNAME}/lib/mocha/integration/mini_test/
${GEM_LIB}/gems/${DISTNAME}/lib/mocha/integration/mini_test.rb
${GEM_LIB}/gems/${DISTNAME}/lib/mocha/integration/mini_test/assertion_counter.rb
-${GEM_LIB}/gems/${DISTNAME}/lib/mocha/integration/mini_test/version_131_and_above.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/mocha/integration/mini_test/exception_translation.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/mocha/integration/mini_test/version_13.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/mocha/integration/mini_test/version_140.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/mocha/integration/mini_test/version_141.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/mocha/integration/mini_test/version_142_to_172.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/mocha/integration/mini_test/version_200.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/mocha/integration/mini_test/version_201_to_202.rb
${GEM_LIB}/gems/${DISTNAME}/lib/mocha/integration/test_unit/
${GEM_LIB}/gems/${DISTNAME}/lib/mocha/integration/test_unit.rb
${GEM_LIB}/gems/${DISTNAME}/lib/mocha/integration/test_unit/assertion_counter.rb
${GEM_LIB}/gems/${DISTNAME}/lib/mocha/integration/test_unit/gem_version_200.rb
-${GEM_LIB}/gems/${DISTNAME}/lib/mocha/integration/test_unit/gem_version_201_and_above.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/mocha/integration/test_unit/gem_version_201_to_202.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/mocha/integration/test_unit/gem_version_203_to_209.rb
${GEM_LIB}/gems/${DISTNAME}/lib/mocha/integration/test_unit/ruby_version_185_and_below.rb
${GEM_LIB}/gems/${DISTNAME}/lib/mocha/integration/test_unit/ruby_version_186_and_above.rb
${GEM_LIB}/gems/${DISTNAME}/lib/mocha/is_a.rb
@@ -54,6 +62,7 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/mocha/mu
${GEM_LIB}/gems/${DISTNAME}/lib/mocha/names.rb
${GEM_LIB}/gems/${DISTNAME}/lib/mocha/no_yields.rb
${GEM_LIB}/gems/${DISTNAME}/lib/mocha/object.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/mocha/options.rb
${GEM_LIB}/gems/${DISTNAME}/lib/mocha/parameter_matchers/
${GEM_LIB}/gems/${DISTNAME}/lib/mocha/parameter_matchers.rb
${GEM_LIB}/gems/${DISTNAME}/lib/mocha/parameter_matchers/all_of.rb
@@ -73,6 +82,7 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/mocha/pa
${GEM_LIB}/gems/${DISTNAME}/lib/mocha/parameter_matchers/not.rb
${GEM_LIB}/gems/${DISTNAME}/lib/mocha/parameter_matchers/object.rb
${GEM_LIB}/gems/${DISTNAME}/lib/mocha/parameter_matchers/optionally.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/mocha/parameter_matchers/query_string.rb
${GEM_LIB}/gems/${DISTNAME}/lib/mocha/parameter_matchers/regexp_matches.rb
${GEM_LIB}/gems/${DISTNAME}/lib/mocha/parameter_matchers/responds_with.rb
${GEM_LIB}/gems/${DISTNAME}/lib/mocha/parameter_matchers/yaml_equivalent.rb
@@ -96,6 +106,7 @@ ${GEM_LIB}/gems/${DISTNAME}/test/accepta
${GEM_LIB}/gems/${DISTNAME}/test/acceptance/bug_18914_test.rb
${GEM_LIB}/gems/${DISTNAME}/test/acceptance/bug_21465_test.rb
${GEM_LIB}/gems/${DISTNAME}/test/acceptance/bug_21563_test.rb
+${GEM_LIB}/gems/${DISTNAME}/test/acceptance/exception_rescue_test.rb
${GEM_LIB}/gems/${DISTNAME}/test/acceptance/expected_invocation_count_test.rb
${GEM_LIB}/gems/${DISTNAME}/test/acceptance/failure_messages_test.rb
${GEM_LIB}/gems/${DISTNAME}/test/acceptance/minitest_test.rb
@@ -104,6 +115,7 @@ ${GEM_LIB}/gems/${DISTNAME}/test/accepta
${GEM_LIB}/gems/${DISTNAME}/test/acceptance/mock_test.rb
${GEM_LIB}/gems/${DISTNAME}/test/acceptance/mock_with_initializer_block_test.rb
${GEM_LIB}/gems/${DISTNAME}/test/acceptance/mocked_methods_dispatch_test.rb
+${GEM_LIB}/gems/${DISTNAME}/test/acceptance/multiple_expectations_failure_message_test.rb
${GEM_LIB}/gems/${DISTNAME}/test/acceptance/optional_parameters_test.rb
${GEM_LIB}/gems/${DISTNAME}/test/acceptance/parameter_matcher_test.rb
${GEM_LIB}/gems/${DISTNAME}/test/acceptance/partial_mocks_test.rb
@@ -128,9 +140,11 @@ ${GEM_LIB}/gems/${DISTNAME}/test/accepta
${GEM_LIB}/gems/${DISTNAME}/test/acceptance/stubbing_non_public_class_method_test.rb
${GEM_LIB}/gems/${DISTNAME}/test/acceptance/stubbing_non_public_instance_method_test.rb
${GEM_LIB}/gems/${DISTNAME}/test/acceptance/stubbing_on_non_mock_object_test.rb
+${GEM_LIB}/gems/${DISTNAME}/test/acceptance/unstubbing_test.rb
${GEM_LIB}/gems/${DISTNAME}/test/deprecation_disabler.rb
${GEM_LIB}/gems/${DISTNAME}/test/execution_point.rb
${GEM_LIB}/gems/${DISTNAME}/test/method_definer.rb
+${GEM_LIB}/gems/${DISTNAME}/test/mini_test_result.rb
${GEM_LIB}/gems/${DISTNAME}/test/simple_counter.rb
${GEM_LIB}/gems/${DISTNAME}/test/test_helper.rb
${GEM_LIB}/gems/${DISTNAME}/test/test_runner.rb
@@ -142,6 +156,7 @@ ${GEM_LIB}/gems/${DISTNAME}/test/unit/ca
${GEM_LIB}/gems/${DISTNAME}/test/unit/central_test.rb
${GEM_LIB}/gems/${DISTNAME}/test/unit/change_state_side_effect_test.rb
${GEM_LIB}/gems/${DISTNAME}/test/unit/class_method_test.rb
+${GEM_LIB}/gems/${DISTNAME}/test/unit/configuration_test.rb
${GEM_LIB}/gems/${DISTNAME}/test/unit/date_time_inspect_test.rb
${GEM_LIB}/gems/${DISTNAME}/test/unit/exception_raiser_test.rb
${GEM_LIB}/gems/${DISTNAME}/test/unit/expectation_list_test.rb
Index: devel/ruby-isolate/Makefile
===================================================================
RCS file: /cvs/ports/devel/ruby-isolate/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- devel/ruby-isolate/Makefile 16 Sep 2011 09:24:57 -0000 1.3
+++ devel/ruby-isolate/Makefile 14 Nov 2011 13:23:13 -0000
@@ -3,7 +3,7 @@
COMMENT = very simple RubyGems sandbox
DISTNAME = isolate-3.0.0
-REVISION = 1
+REVISION = 2
CATEGORIES = devel
HOMEPAGE= http://github.com/jbarnette/isolate
@@ -19,10 +19,10 @@ PERMIT_DISTFILES_FTP = Yes
MODULES = lang/ruby
CONFIGURE_STYLE = ruby gem
-# Regress tests don't work
REGRESS_DEPENDS = devel/ruby-minitest,${MODRUBY_FLAVOR} \
devel/ruby-hoe,${MODRUBY_FLAVOR}
+# 1 failure and tons of warnings
do-regress:
cd ${WRKSRC}/test && ${RUBY} -rubygems -I . -I ../lib test_isolate.rb
Index: devel/ruby-isolate/patches/patch-lib_isolate_entry_rb
===================================================================
RCS file: devel/ruby-isolate/patches/patch-lib_isolate_entry_rb
diff -N devel/ruby-isolate/patches/patch-lib_isolate_entry_rb
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ devel/ruby-isolate/patches/patch-lib_isolate_entry_rb 14 Nov 2011
13:23:13 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Add user-install option so that you don't need to have root access
+to use isolate with gems with C extensions.
+
+--- lib/isolate/entry.rb.orig Sat Nov 12 23:33:15 2011
++++ lib/isolate/entry.rb Sat Nov 12 23:33:25 2011
+@@ -81,7 +81,7 @@ module Isolate
+ fire :installing, :installed do
+ installer = Gem::DependencyInstaller.new :development => false,
+ :generate_rdoc => false, :generate_ri => false,
+- :install_dir => @sandbox.path
++ :install_dir => @sandbox.path, :user_install => true
+
+ Gem.sources += Array(options[:source]) if options[:source]
+ Gem::Command.build_args = Array(options[:args]) if options[:args]
ruby-rspec.tar.gz
Description: application/tar-gz
