From 66eba879ca88ac713bfdec2c02cbaabc3660d358 Mon Sep 17 00:00:00 2001 From: Thomas Schank Date: Wed, 30 May 2012 22:35:49 +0200 Subject: [PATCH 1/3] Adjusted Gemfile for jruby (optional) all specs green, tested with jruby 1.6.7 in 1.9 compat mode, and with postgresql 9.1 --- Gemfile | 23 ++++++++++++++++++----- Gemfile.lock | 16 ++++++++++++++++ 2 files changed, 34 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index ed0f618b4..5b02b3306 100644 --- a/Gemfile +++ b/Gemfile @@ -21,14 +21,27 @@ gem 'fastercsv', '1.5.3', :platforms => :ruby_18 # (using standard csv lib if ruby version is 1.9) group :production do - gem 'pg' + platforms :ruby do + gem 'pg' + end + platforms :jruby do + gem 'activerecord-jdbcpostgresql-adapter' + end end group :development, :test do - gem 'sqlite3' - gem 'rspec-rails' - gem 'factory_girl_rails' - gem 'jasmine', '1.1.0' + + platforms :ruby do + gem 'sqlite3' + end + platforms :jruby do + gem 'activerecord-jdbcsqlite3-adapter' + gem 'activerecord-jdbcpostgresql-adapter' + end + gem 'capybara' gem 'database_cleaner' + gem 'factory_girl_rails' + gem 'jasmine', '1.1.0' + gem 'rspec-rails' end diff --git a/Gemfile.lock b/Gemfile.lock index 69d1c9717..5f8cdfc52 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -22,6 +22,13 @@ GEM activesupport (= 3.2.2) arel (~> 3.0.2) tzinfo (~> 0.3.29) + activerecord-jdbc-adapter (1.2.2) + activerecord-jdbcpostgresql-adapter (1.2.2) + activerecord-jdbc-adapter (~> 1.2.2) + jdbc-postgres (>= 9.0, < 9.2) + activerecord-jdbcsqlite3-adapter (1.2.2) + activerecord-jdbc-adapter (~> 1.2.2) + jdbc-sqlite3 (~> 3.7.2) activeresource (3.2.2) activemodel (= 3.2.2) activesupport (= 3.2.2) @@ -30,6 +37,7 @@ GEM multi_json (~> 1.0) arel (3.0.2) bcrypt-ruby (3.0.1) + bcrypt-ruby (3.0.1-java) builder (3.0.0) cancan (1.6.7) capybara (1.1.2) @@ -66,6 +74,7 @@ GEM railties (>= 3.0.0) fastercsv (1.5.3) ffi (1.0.11) + ffi (1.0.11-java) fssm (0.2.8.1) hike (1.2.1) i18n (0.6.0) @@ -75,11 +84,14 @@ GEM rspec (>= 1.3.1) selenium-webdriver (>= 0.1.3) jasmine-core (1.1.0) + jdbc-postgres (9.1.901) + jdbc-sqlite3 (3.7.2) journey (1.0.3) jquery-rails (2.0.1) railties (>= 3.2.0, < 5.0) thor (~> 0.14) json (1.6.5) + json (1.6.5-java) mail (2.4.4) i18n (>= 0.4.0) mime-types (~> 1.16) @@ -87,6 +99,7 @@ GEM mime-types (1.17.2) multi_json (1.1.0) nokogiri (1.5.2) + nokogiri (1.5.2-java) orm_adapter (0.0.6) pg (0.13.2) polyglot (0.3.3) @@ -160,9 +173,12 @@ GEM nokogiri (~> 1.3) PLATFORMS + java ruby DEPENDENCIES + activerecord-jdbcpostgresql-adapter + activerecord-jdbcsqlite3-adapter cancan capybara compass-rails From bc1d7d83cb9dcf7cf2c9ed5f4ea13df486371af2 Mon Sep 17 00:00:00 2001 From: Thomas Schank Date: Thu, 31 May 2012 09:26:28 +0200 Subject: [PATCH 2/3] Enabled travis-ci testing for jruby in 1.9 mode --- .travis.yml | 1 + Gemfile.lock | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/.travis.yml b/.travis.yml index d28808c01..5f46b34e7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,7 @@ rvm: - 1.8.7 - 1.9.2 - 1.9.3 + - jruby-19mode script: - "bundle exec rspec spec" - "bundle exec rake --trace jasmine:ci" diff --git a/Gemfile.lock b/Gemfile.lock index 5f8cdfc52..e6c1f16aa 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -50,6 +50,7 @@ GEM childprocess (0.3.1) ffi (~> 1.0.6) chunky_png (1.2.5) + coderay (1.0.6) compass (0.12.1) chunky_png (~> 1.2) fssm (>= 0.2.7) @@ -96,6 +97,7 @@ GEM i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) + method_source (0.7.1) mime-types (1.17.2) multi_json (1.1.0) nokogiri (1.5.2) @@ -103,6 +105,11 @@ GEM orm_adapter (0.0.6) pg (0.13.2) polyglot (0.3.3) + pry (0.9.9.6-java) + coderay (~> 1.0.5) + method_source (~> 0.7.1) + slop (>= 2.4.4, < 3) + spoon (~> 0.0) rack (1.4.1) rack-cache (1.2) rack (>= 0.4) @@ -152,6 +159,8 @@ GEM ffi (~> 1.0) multi_json (~> 1.0) rubyzip + slop (2.4.4) + spoon (0.0.1) sprockets (2.1.2) hike (~> 1.2) rack (~> 1.0) @@ -190,6 +199,7 @@ DEPENDENCIES jasmine (= 1.1.0) jquery-rails pg + pry rails (~> 3.2.2) rspec-rails sass-rails (~> 3.2.0) From 5e14b391eb215bf7c923f2aa320fed321b5a960d Mon Sep 17 00:00:00 2001 From: Thomas Schank Date: Fri, 1 Jun 2012 09:24:16 +0200 Subject: [PATCH 3/3] Called bundle to clean Gemfile.lock --- Gemfile.lock | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index e6c1f16aa..5f8cdfc52 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -50,7 +50,6 @@ GEM childprocess (0.3.1) ffi (~> 1.0.6) chunky_png (1.2.5) - coderay (1.0.6) compass (0.12.1) chunky_png (~> 1.2) fssm (>= 0.2.7) @@ -97,7 +96,6 @@ GEM i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) - method_source (0.7.1) mime-types (1.17.2) multi_json (1.1.0) nokogiri (1.5.2) @@ -105,11 +103,6 @@ GEM orm_adapter (0.0.6) pg (0.13.2) polyglot (0.3.3) - pry (0.9.9.6-java) - coderay (~> 1.0.5) - method_source (~> 0.7.1) - slop (>= 2.4.4, < 3) - spoon (~> 0.0) rack (1.4.1) rack-cache (1.2) rack (>= 0.4) @@ -159,8 +152,6 @@ GEM ffi (~> 1.0) multi_json (~> 1.0) rubyzip - slop (2.4.4) - spoon (0.0.1) sprockets (2.1.2) hike (~> 1.2) rack (~> 1.0) @@ -199,7 +190,6 @@ DEPENDENCIES jasmine (= 1.1.0) jquery-rails pg - pry rails (~> 3.2.2) rspec-rails sass-rails (~> 3.2.0)