From 83dc11df14744cf1953546c3cc30e145fccd2b4f Mon Sep 17 00:00:00 2001 From: Stephen Bannasch Date: Mon, 26 Jul 2010 17:22:24 -0400 Subject: [PATCH] Gemfile works with JRuby 1.5.1, tests run The :mongoid group does not work in JRuby so the group is only defined for the platform: 'ruby'. In addition installing ruby-debug in JRuby is a manual process so only include the dependency if we are using the platform: 'ruby' Here are the steps necessary to run the devise tests in JRuby using rvm: rvm install jruby rvm use jruby@devise --create gem install bundler --pre gem install jeweler bundle install rake test --- Gemfile | 27 ++++++++++++++++----------- Gemfile.lock | 15 +++++++++++++-- 2 files changed, 29 insertions(+), 13 deletions(-) diff --git a/Gemfile b/Gemfile index 887a8aef..e65510d7 100644 --- a/Gemfile +++ b/Gemfile @@ -6,18 +6,23 @@ else gem "rails", :git => "git://github.com/rails/rails.git" end +platforms :jruby do + gem 'activerecord-jdbcsqlite3-adapter' +end + +platforms :ruby do + gem "sqlite3-ruby" + if RUBY_VERSION < '1.9' + gem "ruby-debug", ">= 0.10.3" + end + group :mongoid do + gem "mongo" + gem "mongoid", :git => "git://github.com/durran/mongoid.git" + gem "bson_ext" + end +end + gem "warden", "0.10.7" -gem "sqlite3-ruby" gem "webrat", "0.7.0" gem "mocha", :require => false gem "bcrypt-ruby", :require => "bcrypt" - -if RUBY_VERSION < '1.9' - gem "ruby-debug", ">= 0.10.3" -end - -group :mongoid do - gem "mongo" - gem "mongoid", :git => "git://github.com/durran/mongoid.git" - gem "bson_ext" -end \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index 09dbae25..852e2cb6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,8 +9,9 @@ GIT tzinfo (~> 0.3.22) will_paginate (~> 3.0.pre) -PATH - remote: /Users/jose/Work/github/rails +GIT + remote: git://github.com/rails/rails.git + revision: dd61a81 specs: actionmailer (3.0.0.beta4) actionpack (= 3.0.0.beta4) @@ -56,6 +57,10 @@ GEM remote: http://rubygems.org/ specs: abstract (1.0.0) + activerecord-jdbc-adapter (0.9.7-java) + activerecord-jdbcsqlite3-adapter (0.9.7-java) + activerecord-jdbc-adapter (= 0.9.7) + jdbc-sqlite3 (>= 3.6.3.054) arel (0.4.0) activesupport (>= 3.0.0.beta) bcrypt-ruby (2.1.2) @@ -66,6 +71,7 @@ GEM erubis (2.6.6) abstract (>= 1.0.0) i18n (0.4.1) + jdbc-sqlite3 (3.6.3.054) linecache (0.43) mail (2.2.5) activesupport (>= 2.3.6) @@ -76,6 +82,8 @@ GEM rake mongo (1.0.5) bson (>= 1.0.4) + nokogiri (1.4.2-java) + weakling (>= 0.0.3) nokogiri (1.4.2) polyglot (0.3.1) rack (1.2.1) @@ -96,6 +104,7 @@ GEM tzinfo (0.3.22) warden (0.10.7) rack (>= 1.0.0) + weakling (0.0.4-java) webrat (0.7.0) nokogiri (>= 1.2.0) rack (>= 1.0) @@ -103,9 +112,11 @@ GEM will_paginate (3.0.pre) PLATFORMS + java ruby DEPENDENCIES + activerecord-jdbcsqlite3-adapter bcrypt-ruby bson_ext mocha