Skip to content
This repository has been archived by the owner on Jul 22, 2022. It is now read-only.

Adjusted Gemfile for jruby (optional) #114

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
23 changes: 18 additions & 5 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
16 changes: 16 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand All @@ -75,18 +84,22 @@ 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)
treetop (~> 1.4.8)
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)
Expand Down Expand Up @@ -160,9 +173,12 @@ GEM
nokogiri (~> 1.3)

PLATFORMS
java
ruby

DEPENDENCIES
activerecord-jdbcpostgresql-adapter
activerecord-jdbcsqlite3-adapter
cancan
capybara
compass-rails
Expand Down