Use mustang for testing, therubyracer in production

This commit is contained in:
Erik Michaels-Ober 2011-08-11 17:14:58 -07:00
parent 9992a59a9c
commit 1fbba26032
3 changed files with 9 additions and 2 deletions

View File

@ -1,3 +1,4 @@
bundler_args: "--without assets:development:production"
script: "bundle exec rake db:migrate test" script: "bundle exec rake db:migrate test"
rvm: rvm:
- 1.8.7 - 1.8.7

View File

@ -3,10 +3,9 @@ source 'http://rubygems.org'
gem 'rails', '3.1.0.rc5' gem 'rails', '3.1.0.rc5'
gem 'arel' gem 'arel'
gem 'devise' gem 'devise'
gem 'rails_admin', :git => 'git://github.com/sferik/rails_admin.git'
gem 'geokit' gem 'geokit'
gem 'haml', '~> 3.2.0.alpha' gem 'haml', '~> 3.2.0.alpha'
gem 'therubyracer', :platforms => :ruby gem 'rails_admin', :git => 'git://github.com/sferik/rails_admin.git'
platforms :jruby do platforms :jruby do
gem 'jruby-openssl' gem 'jruby-openssl'
@ -25,8 +24,13 @@ group :development, :production do
gem 'pg' gem 'pg'
end end
group :production do
gem 'therubyracer', :platforms => :ruby
end
group :test do group :test do
gem 'ZenTest' gem 'ZenTest'
gem 'mustang', :platforms => :ruby
gem 'simplecov' gem 'simplecov'
gem 'sqlite3' gem 'sqlite3'
gem 'webmock' gem 'webmock'

View File

@ -68,6 +68,7 @@ GEM
treetop (~> 1.4.8) treetop (~> 1.4.8)
mime-types (1.16) mime-types (1.16)
multi_json (1.0.3) multi_json (1.0.3)
mustang (0.2.2)
orm_adapter (0.0.5) orm_adapter (0.0.5)
pg (0.11.0) pg (0.11.0)
polyglot (0.3.2) polyglot (0.3.2)
@ -135,6 +136,7 @@ DEPENDENCIES
geokit geokit
haml (~> 3.2.0.alpha) haml (~> 3.2.0.alpha)
jruby-openssl jruby-openssl
mustang
pg pg
rails (= 3.1.0.rc5) rails (= 3.1.0.rc5)
rails_admin! rails_admin!