ensure v2 release of rubygems

Gemfile

@@ -1,5 +1,7 @@
 source 'https://rubygems.org'
 
+gem 'bundler', '>= 1.3.4'
+
 gem 'rails', '3.2.13'
 
 # Appserver

Gemfile.lock

@@ -418,6 +418,7 @@ DEPENDENCIES
   addressable (= 2.3.3)
   asset_sync (= 0.5.4)
   bootstrap-sass (= 2.2.2.0)
+  bundler (>= 1.3.4)
   capistrano (= 2.12.0)
   capistrano_colors (= 0.5.5)
   capybara (= 1.1.3)

script/ci/before_install.sh

@@ -1,5 +1,8 @@
 #!/bin/sh
 
+# Travis CI still includes 1.2.x by default
+gem install bundler --version '>= 1.3.4'
+
 # Ensure known RubyGems version
 envdir="$(readlink -e $(dirname $0))/../env"
 . "$envdir/ruby_env"

script/env/ruby_env

@@ -1,3 +1,3 @@
-rubygems_version="1.8.25"
+rubygems_version="2.0.3"
 ruby_version="1.9.3-p385"
 gemset="diaspora"