From 1fbba260326439ed4d3fe41c5aa7a2958398c6b1 Mon Sep 17 00:00:00 2001
From: Erik Michaels-Ober <sferik@gmail.com>
Date: Thu, 11 Aug 2011 17:14:58 -0700
Subject: [PATCH] Use mustang for testing, therubyracer in production

---
 .travis.yml  | 1 +
 Gemfile      | 8 ++++++--
 Gemfile.lock | 2 ++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 715abad..137f2e5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,4 @@
+bundler_args: "--without assets:development:production"
 script: "bundle exec rake db:migrate test"
 rvm:
   - 1.8.7
diff --git a/Gemfile b/Gemfile
index c379c40..11bbb05 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,10 +3,9 @@ source 'http://rubygems.org'
 gem 'rails', '3.1.0.rc5'
 gem 'arel'
 gem 'devise'
-gem 'rails_admin', :git => 'git://github.com/sferik/rails_admin.git'
 gem 'geokit'
 gem 'haml', '~> 3.2.0.alpha'
-gem 'therubyracer', :platforms => :ruby
+gem 'rails_admin', :git => 'git://github.com/sferik/rails_admin.git'
 
 platforms :jruby do
   gem 'jruby-openssl'
@@ -25,8 +24,13 @@ group :development, :production do
   gem 'pg'
 end
 
+group :production do
+  gem 'therubyracer', :platforms => :ruby
+end
+
 group :test do
   gem 'ZenTest'
+  gem 'mustang', :platforms => :ruby
   gem 'simplecov'
   gem 'sqlite3'
   gem 'webmock'
diff --git a/Gemfile.lock b/Gemfile.lock
index 16c1f4d..d21526f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -68,6 +68,7 @@ GEM
       treetop (~> 1.4.8)
     mime-types (1.16)
     multi_json (1.0.3)
+    mustang (0.2.2)
     orm_adapter (0.0.5)
     pg (0.11.0)
     polyglot (0.3.2)
@@ -135,6 +136,7 @@ DEPENDENCIES
   geokit
   haml (~> 3.2.0.alpha)
   jruby-openssl
+  mustang
   pg
   rails (= 3.1.0.rc5)
   rails_admin!