diff options
| -rw-r--r-- | Gemfile | 7 | ||||
| -rw-r--r-- | Gemfile.lock | 17 |
2 files changed, 19 insertions, 5 deletions
@@ -5,13 +5,13 @@ gem 'jquery-rails' gem 'devise' gem "ffi-proj4", :git => 'git://github.com/dryade/ffi-proj4.git' -gem "jruby-rack-worker" platforms :jruby do gem 'activerecord-jdbcpostgresql-adapter', :git => 'git://github.com/dryade/activerecord-jdbc-adapter.git' gem 'activerecord-jdbcsqlite3-adapter' gem 'jruby-openssl' gem 'warbler' + gem "jruby-rack-worker" end platforms :ruby do @@ -49,7 +49,8 @@ group :assets do gem 'coffee-rails', '~> 3.1.1' gem 'coffee-script-source' gem 'uglifier', '>= 1.0.3' - gem 'therubyrhino' + gem 'therubyrhino', :platform => :jruby + gem 'therubyracer', :platform => :ruby end group :development do @@ -70,7 +71,7 @@ end group :test do gem 'capybara' gem 'launchy' - gem 'database_cleaner' + gem 'database_cleaner', :git => 'git://github.com/dnagir/database_cleaner.git', :branch => 'postgre_jruby_issue' gem 'factory_girl_rails', '1.7' end diff --git a/Gemfile.lock b/Gemfile.lock index c7b5a62b9..ea51bb146 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -11,6 +11,13 @@ GIT rails (= 3.1.3) GIT + remote: git://github.com/dnagir/database_cleaner.git + revision: 0c0aa44f13ae392000a6f506b62d5d1602cb4e53 + branch: postgre_jruby_issue + specs: + database_cleaner (0.7.0) + +GIT remote: git://github.com/dryade/activerecord-jdbc-adapter.git revision: 0bf424bc3bcaf9f44646976cc4c1a8e9e57f11b4 specs: @@ -139,7 +146,6 @@ GEM coffee-script-source (1.3.3) composite_primary_keys (4.1.2) activerecord (~> 3.1) - database_cleaner (0.8.0) delayed_job (3.0.3) activesupport (~> 3.0) delayed_job_active_record (0.3.2) @@ -199,6 +205,7 @@ GEM addressable (~> 2.2.6) ffi (~> 1.0.9) spoon (~> 0.0.1) + libv8 (3.3.10.4) libwebsocket (0.1.3) addressable listen (0.4.5) @@ -222,6 +229,7 @@ GEM nokogiri (1.5.4) nokogiri (1.5.4-java) orm_adapter (0.0.7) + pg (0.11.0) polyamorous (0.5.0) activerecord (~> 3.0) polyglot (0.3.3) @@ -308,10 +316,13 @@ GEM hike (~> 1.2) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) + sqlite3 (1.3.6) squeel (1.0.5) activerecord (~> 3.0) activesupport (~> 3.0) polyamorous (~> 0.5.0) + therubyracer (0.10.1) + libv8 (~> 3.3.10) therubyrhino (1.73.4) thor (0.14.6) tilt (1.3.3) @@ -335,6 +346,7 @@ GEM PLATFORMS java + ruby DEPENDENCIES RedCloth @@ -351,7 +363,7 @@ DEPENDENCIES coffee-rails (~> 3.1.1) coffee-script-source composite_primary_keys (= 4.1.2) - database_cleaner + database_cleaner! delayed_job_active_record devise factory_girl_rails (= 1.7) @@ -379,6 +391,7 @@ DEPENDENCIES shoulda! sqlite3 squeel + therubyracer therubyrhino uglifier (>= 1.0.3) user_interface! |