Merge branch 'master' into push-karma-inbox-140

Conflicts:
	.travis.yml
	Gemfile

.travis.yml

@@ -1,17 +1,26 @@
 services:
   - memcache
+bundler_args: --path=~/.bundle
 before_install:
-  - "export DISPLAY=:99.0"
-  - "sh -e /etc/init.d/xvfb start"
+  - "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
   - 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

Gemfile

@@ -42,7 +42,7 @@ gem 'andand'
 # (because Rails' #pluck breaks a lot with joins)
 gem 'valium'
 
-# Property API for plain classes
+# Property API for plain classes (used for form objects)
 gem 'virtus'
 
 # activerecord extensions
@@ -87,6 +87,9 @@ gem 'jquery-turbolinks'
 # push / websocket events
 gem 'pusher'
 
+# speeds up Travis builds by caching the bundle
+gem 'bundle_cache'
+
 # Gems used only for assets and not required
 # in production environments by default.
 group :assets do

Gemfile.lock

@@ -34,6 +34,10 @@ GEM
       compass (>= 0.12.0)
       sass (>= 3.2.0.alpha.95)
     arel (3.0.2)
+    aws-sdk (1.11.1)
+      json (~> 1.4)
+      nokogiri (>= 1.4.4)
+      uuidtools (~> 2.1)
     backports (3.3.3)
     bcrypt-ruby (3.1.1)
     better_errors (0.9.0)
@@ -44,6 +48,10 @@ GEM
     bootstrap-sass (2.3.2.1)
       sass (~> 3.2)
     builder (3.0.4)
+    bundle_cache (0.0.5)
+      aws-sdk (>= 1.0.0)
+      bundler
+      bundler
     cancan (1.6.10)
     capybara (2.0.3)
       mime-types (>= 1.16)
@@ -421,6 +429,7 @@ DEPENDENCIES
   better_errors
   binding_of_caller
   bootstrap-sass
+  bundle_cache
   cancan
   capybara (~> 2.0.3)
   coffee-rails