Update Travis config.

* Properly generate test_server.yml * Use a secondary Gemfile instead of ENV vars.
riak-ripple · Jan 12, 2012 · 123f7b6 · 123f7b6
1 parent 5e89166
commit 123f7b6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,12 @@
-env:
-  - "RIAK_BIN_DIR=/usr/sbin"
-  - "RIAK_BIN_DIR=/usr/sbin RAILS31=true"
+gemfiles:
+  - Gemfile
+  - Gemfile.rails31
 rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
   - jruby
-before_script: ! 'echo "root: /tmp/.riaktest\nsource: $RIAK_BIN_DIR" > spec/support/test_server.yml; ulimit -n 2048'
+before_script:
+  - ! 'echo "root: /tmp/.riaktest" > spec/support/test_server.yml'
+  - ! 'echo "source: /usr/sbin" >> spec/support/test_server.yml'
+  - "ulimit -n 2048"
diff --git a/Gemfile b/Gemfile
@@ -2,12 +2,6 @@ source :rubygems
 
 gemspec
 
-if ENV['RAILS31']
-  gem 'activemodel', '~> 3.1.0'
-else
-  gem 'activemodel', '~> 3.0.10'
-end
-
 if ENV['TRAVIS']
   # Once the APIs are stable, this should be removed
   gem 'riak-client', :git => "git://github.com/basho/riak-ruby-client.git"

diff --git a/Gemfile.rails31 b/Gemfile.rails31
@@ -0,0 +1,3 @@
+gem 'activemodel', '~> 3.1.0'
+
+instance_eval File.read(File.expand_path('../Gemfile', __FILE__))