Use global Gemfile in travis-ci

.travis.yml

@@ -7,7 +7,7 @@ rvm:
   - rbx-18mode
 gemfile:
   - gemfiles/Gemfile.rails-3.1.x
-  - gemfiles/Gemfile.rails-3.2.x
+  - Gemfile
 notifications:
   recipients:
     - jose.valim@plataformatec.com.br

Gemfile

@@ -2,7 +2,7 @@ source "http://rubygems.org"
 
 gemspec
 
-gem "rails", "~> 3.1.0"
+gem "rails", ">= 3.2.0.rc", "< 4.0"
 gem "omniauth", "~> 1.0.0"
 gem "omniauth-oauth2", "~> 1.0.0"
 gem "rdoc"

Gemfile.lock

@@ -10,36 +10,35 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.1.3)
+    actionmailer (3.2.0.rc2)
-      actionpack (= 3.1.3)
+      actionpack (= 3.2.0.rc2)
       mail (~> 2.3.0)
-    actionpack (3.1.3)
+    actionpack (3.2.0.rc2)
-      activemodel (= 3.1.3)
+      activemodel (= 3.2.0.rc2)
-      activesupport (= 3.1.3)
+      activesupport (= 3.2.0.rc2)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      i18n (~> 0.6)
+      journey (~> 1.0.0.rc1)
-      rack (~> 1.3.5)
+      rack (~> 1.4.0)
       rack-cache (~> 1.1)
-      rack-mount (~> 0.8.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.0.3)
+      sprockets (~> 2.1.2)
-    activemodel (3.1.3)
+    activemodel (3.2.0.rc2)
-      activesupport (= 3.1.3)
+      activesupport (= 3.2.0.rc2)
       builder (~> 3.0.0)
-      i18n (~> 0.6)
+    activerecord (3.2.0.rc2)
-    activerecord (3.1.3)
+      activemodel (= 3.2.0.rc2)
-      activemodel (= 3.1.3)
+      activesupport (= 3.2.0.rc2)
-      activesupport (= 3.1.3)
+      arel (~> 3.0.0.rc1)
-      arel (~> 2.2.1)
       tzinfo (~> 0.3.29)
-    activeresource (3.1.3)
+    activeresource (3.2.0.rc2)
-      activemodel (= 3.1.3)
+      activemodel (= 3.2.0.rc2)
-      activesupport (= 3.1.3)
+      activesupport (= 3.2.0.rc2)
-    activesupport (3.1.3)
+    activesupport (3.2.0.rc2)
+      i18n (~> 0.6)
       multi_json (~> 1.0)
     addressable (2.2.6)
-    arel (2.2.1)
+    arel (3.0.0.rc1)
     bcrypt-ruby (3.0.1)
     bson (1.5.1)
     bson_ext (1.3.1)
@@ -53,7 +52,8 @@ GEM
     hashie (1.2.0)
     hike (1.2.1)
     i18n (0.6.0)
-    json (1.6.3)
+    journey (1.0.0.rc4)
+    json (1.6.4)
     linecache (0.46)
       rbx-require-relative (> 0.0.4)
     mail (2.3.0)
@@ -89,11 +89,9 @@ GEM
       rack-openid (~> 1.3.1)
     orm_adapter (0.0.5)
     polyglot (0.3.3)
-    rack (1.3.5)
+    rack (1.4.0)
     rack-cache (1.1)
       rack (>= 0.4)
-    rack-mount (0.8.3)
-      rack (>= 1.0.0)
     rack-openid (1.3.1)
       rack (>= 1.1.0)
       ruby-openid (>= 2.1.8)
@@ -101,24 +99,24 @@ GEM
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.1.3)
+    rails (3.2.0.rc2)
-      actionmailer (= 3.1.3)
+      actionmailer (= 3.2.0.rc2)
-      actionpack (= 3.1.3)
+      actionpack (= 3.2.0.rc2)
-      activerecord (= 3.1.3)
+      activerecord (= 3.2.0.rc2)
-      activeresource (= 3.1.3)
+      activeresource (= 3.2.0.rc2)
-      activesupport (= 3.1.3)
+      activesupport (= 3.2.0.rc2)
       bundler (~> 1.0)
-      railties (= 3.1.3)
+      railties (= 3.2.0.rc2)
-    railties (3.1.3)
+    railties (3.2.0.rc2)
-      actionpack (= 3.1.3)
+      actionpack (= 3.2.0.rc2)
-      activesupport (= 3.1.3)
+      activesupport (= 3.2.0.rc2)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.6)
     rake (0.9.2.2)
     rbx-require-relative (0.0.5)
-    rdoc (3.11)
+    rdoc (3.12)
       json (~> 1.4)
     ruby-debug (0.10.4)
       columnize (>= 0.1)
@@ -126,7 +124,7 @@ GEM
     ruby-debug-base (0.10.4)
       linecache (>= 0.3)
     ruby-openid (2.1.8)
-    sprockets (2.0.3)
+    sprockets (2.1.2)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
@@ -162,7 +160,7 @@ DEPENDENCIES
   omniauth-facebook
   omniauth-oauth2 (~> 1.0.0)
   omniauth-openid (~> 1.0.1)
-  rails (~> 3.1.0)
+  rails (>= 3.2.0.rc, < 4.0)
   rdoc
   ruby-debug (>= 0.10.3)
   sqlite3-ruby

gemfiles/Gemfile.rails-3.2.x

@@ -1,35 +0,0 @@
-source "http://rubygems.org"
-
-gem "devise", :path => ".."
-
-gem "rails", ">= 3.2.0.rc", "< 4.0"
-gem "omniauth", "~> 1.0.0"
-gem "omniauth-oauth2", "~> 1.0.0"
-gem "rdoc"
-
-group :test do
-  gem "omniauth-facebook"
-  gem "omniauth-openid", "~> 1.0.1"
-  gem "webrat", "0.7.2", :require => false
-  gem "mocha", :require => false
-
-  platforms :mri_18 do
-    gem "ruby-debug", ">= 0.10.3"
-  end
-end
-
-platforms :jruby do
-  gem "activerecord-jdbc-adapter"
-  gem "activerecord-jdbcsqlite3-adapter"
-  gem "jruby-openssl"
-end
-
-platforms :ruby do
-  gem "sqlite3-ruby"
-
-  group :mongoid do
-    gem "mongo", "~> 1.3.0"
-    gem "mongoid", "~> 2.0"
-    gem "bson_ext", "~> 1.3.0"
-  end
-end