Merge ddef458 into 835affb

.travis.yml

@@ -1,27 +1,23 @@
+language: ruby
+cache: bundler
+
 services:
   - memcache
-bundler_args: --path=~/.bundle
 before_install:
-  - "echo 'gem: --no-ri --no-rdoc' > ~/.gemrc"
-  - gem install bundler bundle_cache
-  - bundle_cache_install
   - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start
 before_script:
   - psql -c 'create database appfab_test;' -U postgres
   - cp config/database-travis.yml config/database.yml
   - bundle exec rake db:migrate
-after_script:
-  - bundle_cache
 rvm:
   - 2.0.0
 env:
   global:
     - RAILS_ENV=test
-    - AWS_S3_BUCKET=bundle-cache-us
-    - BUNDLE_ARCHIVE=appfab
-    - secure: HdqU0O47txQMZhQy2aXEQ514g7Bh01XRgOvINI+8+rCK+176rARzux0NIzVUaPYODcEvsAK/7PV6PQvFpLJ6GaA9QngASWWbNCF3Za/wZDjbUSyP73FSszfXzQK1QfHvs/vH1nPt8Ul7L4nnU2Z2dpoXXPvtB/HCnszpB6mlNdw=
   matrix:
     - BUILD_TARGET=spec
     - BUILD_TARGET=cucumber
-script: bundle exec rake $BUILD_TARGET
+script:
+  - bundle exec rake $BUILD_TARGET
+

Gemfile

@@ -83,9 +83,6 @@ gem 'jquery-turbolinks'
 # push / websocket events
 gem 'pusher'
 
-# speeds up Travis builds by caching the bundle
-gem 'bundle_cache'
-
 # makes the app (more) 12-factor compliant
 gem 'rails_12factor', group: :production
 

Gemfile.lock

@@ -40,10 +40,6 @@ GEM
       sass (>= 3.2.0.alpha.95)
     arel (4.0.1)
     atomic (1.1.14)
-    aws-sdk (1.27.0)
-      json (~> 1.4)
-      nokogiri (>= 1.4.4)
-      uuidtools (~> 2.1)
     axiom-types (0.0.5)
       descendants_tracker (~> 0.0.1)
       ice_nine (~> 0.9)
@@ -56,9 +52,6 @@ GEM
     bootstrap-sass (2.3.2.2)
       sass (~> 3.2)
     builder (3.1.4)
-    bundle_cache (0.2.1)
-      aws-sdk (>= 1.0.0)
-      bundler
     cancan (1.6.10)
     capybara (2.0.3)
       mime-types (>= 1.16)
@@ -206,7 +199,6 @@ GEM
     jquery-turbolinks (2.0.1)
       railties (>= 3.1.0)
       turbolinks
-    json (1.8.1)
     jwt (0.1.8)
       multi_json (>= 1.5)
     kgio (2.8.1)
@@ -448,7 +440,6 @@ DEPENDENCIES
   better_errors
   binding_of_caller
   bootstrap-sass
-  bundle_cache
   cancan
   capybara (~> 2.0.3)
   coffee-rails