Commit 29226203

mo <mokha@cisco.com>
2017-08-31 20:55:11
upgrade
1 parent 31b7af8
app/controllers/cakes_controller.rb
@@ -13,6 +13,6 @@ class CakesController < ApplicationController
 
   def show
     @creation = Creation.find(params[:id])
-    @primary_image = params[:photo_id].present? ?  @creation.photos.find(params[:photo_id]) : @creation.primary_image
+    @primary_image = params[:photo_id].present? ? @creation.photos.find(params[:photo_id]) : @creation.primary_image
   end
 end
app/controllers/sessions_controller.rb
@@ -6,6 +6,7 @@ class SessionsController < ApplicationController
 
   def create
     if @session = User.login(session_params[:username], session_params[:password])
+      reset_session
       session[:raphael] = @session.access(request)
       redirect_to my_dashboard_path
     else
app/models/user_session.rb
@@ -1,4 +1,5 @@
 class UserSession < ActiveRecord::Base
+  include Queryable
   belongs_to :user
   has_one :location, as: :locatable
   before_create :set_unique_key
@@ -26,10 +27,6 @@ class UserSession < ActiveRecord::Base
     def authenticate(key)
       self.active.find_by(key: key)
     end
-
-    def filter_by(filters)
-      filters.inject(all) { |chain, filter| filter.call(chain) }
-    end
   end
 
   private
app/services/infrastructure/exif_parser.rb
@@ -1,3 +1,5 @@
+require 'exifr/jpeg'
+
 class ExifParser
   def parse_geolocation_from(file)
     exif = EXIFR::JPEG.new(file)
config/initializers/exifr.rb
@@ -0,0 +1,1 @@
+EXIFR.logger = Rails.logger
config/nginx.conf
@@ -48,11 +48,11 @@ http {
     add_header X-Frame-Options "DENY";
 
     try_files $uri/index.html $uri @application;
-    location ^~ /assets/ {
-      gzip_static on;
-      expires max;
-      add_header Cache-Control public;
-    }
+#    location ^~ /assets/ {
+#      gzip_static on;
+#      expires max;
+#      add_header Cache-Control public;
+#    }
     location /cable {
       proxy_pass https://backend;
       proxy_set_header X_FORWARDED_PROTO https;
db/migrate/20170831205233_change_collation_for_tag_names.acts_as_taggable_on_engine.rb
@@ -0,0 +1,15 @@
+# This migration comes from acts_as_taggable_on_engine (originally 5)
+# This migration is added to circumvent issue #623 and have special characters
+# work properly
+if ActiveRecord.gem_version >= Gem::Version.new('5.0')
+  class ChangeCollationForTagNames < ActiveRecord::Migration[4.2]; end
+else
+  class ChangeCollationForTagNames < ActiveRecord::Migration; end
+end
+ChangeCollationForTagNames.class_eval do
+  def up
+    if ActsAsTaggableOn::Utils.using_mysql?
+      execute("ALTER TABLE tags MODIFY name varchar(255) CHARACTER SET utf8 COLLATE utf8_bin;")
+    end
+  end
+end
db/migrate/20170831205234_add_missing_indexes_on_taggings.acts_as_taggable_on_engine.rb
@@ -0,0 +1,23 @@
+# This migration comes from acts_as_taggable_on_engine (originally 6)
+if ActiveRecord.gem_version >= Gem::Version.new('5.0')
+  class AddMissingIndexesOnTaggings < ActiveRecord::Migration[4.2]; end
+else
+  class AddMissingIndexesOnTaggings < ActiveRecord::Migration; end
+end
+AddMissingIndexesOnTaggings.class_eval do
+  def change
+    add_index :taggings, :tag_id unless index_exists? :taggings, :tag_id
+    add_index :taggings, :taggable_id unless index_exists? :taggings, :taggable_id
+    add_index :taggings, :taggable_type unless index_exists? :taggings, :taggable_type
+    add_index :taggings, :tagger_id unless index_exists? :taggings, :tagger_id
+    add_index :taggings, :context unless index_exists? :taggings, :context
+
+    unless index_exists? :taggings, [:tagger_id, :tagger_type]
+      add_index :taggings, [:tagger_id, :tagger_type]
+    end
+
+    unless index_exists? :taggings, [:taggable_id, :taggable_type, :tagger_id, :context], name: 'taggings_idy'
+      add_index :taggings, [:taggable_id, :taggable_type, :tagger_id, :context], name: 'taggings_idy'
+    end
+  end
+end
db/schema.rb
@@ -11,18 +11,18 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150111153140) do
+ActiveRecord::Schema.define(version: 20170831205234) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
   enable_extension "uuid-ossp"
 
   create_table "activities", force: :cascade do |t|
-    t.integer  "subject_id",   null: false
-    t.string   "subject_type", null: false
-    t.integer  "user_id",      null: false
-    t.datetime "created_at",   null: false
-    t.datetime "updated_at",   null: false
+    t.integer  "subject_id",               null: false
+    t.string   "subject_type", limit: 255, null: false
+    t.integer  "user_id",                  null: false
+    t.datetime "created_at",               null: false
+    t.datetime "updated_at",               null: false
   end
 
   add_index "activities", ["subject_id"], name: "index_activities_on_subject_id", using: :btree
@@ -31,20 +31,20 @@ ActiveRecord::Schema.define(version: 20150111153140) do
 
   create_table "avatars", force: :cascade do |t|
     t.integer  "user_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.string   "avatar"
+    t.datetime "created_at",                    null: false
+    t.datetime "updated_at",                    null: false
+    t.string   "avatar",            limit: 255
     t.boolean  "avatar_processing"
-    t.string   "avatar_tmp"
+    t.string   "avatar_tmp",        limit: 255
   end
 
   add_index "avatars", ["user_id"], name: "index_avatars_on_user_id", using: :btree
 
   create_table "categories", force: :cascade do |t|
-    t.string   "name"
+    t.string   "name",       limit: 255
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "slug"
+    t.string   "slug",       limit: 255
   end
 
   add_index "categories", ["slug"], name: "index_categories_on_slug", using: :btree
@@ -52,7 +52,7 @@ ActiveRecord::Schema.define(version: 20150111153140) do
   create_table "comments", force: :cascade do |t|
     t.integer  "user_id"
     t.integer  "creation_id"
-    t.string   "text"
+    t.string   "text",        limit: 255
     t.integer  "disqus_id"
     t.datetime "created_at"
     t.datetime "updated_at"
@@ -62,15 +62,15 @@ ActiveRecord::Schema.define(version: 20150111153140) do
   add_index "comments", ["user_id"], name: "index_comments_on_user_id", using: :btree
 
   create_table "creations", force: :cascade do |t|
-    t.string   "name"
+    t.string   "name",            limit: 255
     t.text     "story"
     t.datetime "created_at"
     t.datetime "updated_at"
     t.integer  "user_id"
-    t.string   "image"
-    t.string   "watermark"
-    t.integer  "photos_count",    default: 0
-    t.integer  "favorites_count", default: 0
+    t.string   "image",           limit: 255
+    t.string   "watermark",       limit: 255
+    t.integer  "photos_count",                default: 0
+    t.integer  "favorites_count",             default: 0
     t.integer  "category_id"
   end
 
@@ -79,17 +79,17 @@ ActiveRecord::Schema.define(version: 20150111153140) do
   add_index "creations", ["user_id"], name: "index_creations_on_user_id", using: :btree
 
   create_table "delayed_jobs", force: :cascade do |t|
-    t.integer  "priority",   default: 0
-    t.integer  "attempts",   default: 0
+    t.integer  "priority",               default: 0
+    t.integer  "attempts",               default: 0
     t.text     "handler"
     t.text     "last_error"
     t.datetime "run_at"
     t.datetime "locked_at"
     t.datetime "failed_at"
-    t.string   "locked_by"
-    t.string   "queue"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.string   "locked_by",  limit: 255
+    t.string   "queue",      limit: 255
+    t.datetime "created_at",                         null: false
+    t.datetime "updated_at",                         null: false
   end
 
   add_index "delayed_jobs", ["priority", "run_at"], name: "delayed_jobs_priority", using: :btree
@@ -105,18 +105,18 @@ ActiveRecord::Schema.define(version: 20150111153140) do
   add_index "favorites", ["user_id"], name: "index_favorites_on_user_id", using: :btree
 
   create_table "interests", force: :cascade do |t|
-    t.string   "name"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.string   "name",       limit: 255
+    t.datetime "created_at",             null: false
+    t.datetime "updated_at",             null: false
   end
 
   create_table "locations", id: :uuid, default: "uuid_generate_v4()", force: :cascade do |t|
     t.uuid     "locatable_id"
-    t.string   "locatable_type"
-    t.string   "latitude"
-    t.string   "longitude"
-    t.string   "city"
-    t.string   "country"
+    t.string   "locatable_type", limit: 255
+    t.string   "latitude",       limit: 255
+    t.string   "longitude",      limit: 255
+    t.string   "city",           limit: 255
+    t.string   "country",        limit: 255
     t.datetime "created_at"
     t.datetime "updated_at"
   end
@@ -125,18 +125,18 @@ ActiveRecord::Schema.define(version: 20150111153140) do
 
   create_table "photos", force: :cascade do |t|
     t.integer  "imageable_id"
-    t.string   "image"
+    t.string   "image",             limit: 255
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "image_tmp"
+    t.string   "image_tmp",         limit: 255
     t.boolean  "image_processing"
-    t.string   "content_type"
-    t.string   "original_filename"
+    t.string   "content_type",      limit: 255
+    t.string   "original_filename", limit: 255
     t.float    "latitude"
     t.float    "longitude"
-    t.string   "sha256"
-    t.string   "watermark"
-    t.string   "imageable_type"
+    t.string   "sha256",            limit: 255
+    t.string   "watermark",         limit: 255
+    t.string   "imageable_type",    limit: 255
   end
 
   add_index "photos", ["imageable_id", "imageable_type"], name: "index_photos_on_imageable_id_and_imageable_type", using: :btree
@@ -145,22 +145,27 @@ ActiveRecord::Schema.define(version: 20150111153140) do
   create_table "taggings", force: :cascade do |t|
     t.integer  "tag_id"
     t.integer  "taggable_id"
-    t.string   "taggable_type"
+    t.string   "taggable_type", limit: 255
     t.integer  "tagger_id"
-    t.string   "tagger_type"
+    t.string   "tagger_type",   limit: 255
     t.string   "context",       limit: 128
     t.datetime "created_at"
   end
 
+  add_index "taggings", ["context"], name: "index_taggings_on_context", using: :btree
   add_index "taggings", ["tag_id", "taggable_id", "taggable_type", "context", "tagger_id", "tagger_type"], name: "taggings_idx", unique: true, using: :btree
+  add_index "taggings", ["tag_id"], name: "index_taggings_on_tag_id", using: :btree
   add_index "taggings", ["taggable_id", "taggable_type", "context"], name: "index_taggings_on_taggable_id_and_taggable_type_and_context", using: :btree
+  add_index "taggings", ["taggable_id", "taggable_type", "tagger_id", "context"], name: "taggings_idy", using: :btree
+  add_index "taggings", ["taggable_id"], name: "index_taggings_on_taggable_id", using: :btree
   add_index "taggings", ["taggable_type"], name: "index_taggings_on_taggable_type", using: :btree
+  add_index "taggings", ["tagger_id", "tagger_type"], name: "index_taggings_on_tagger_id_and_tagger_type", using: :btree
   add_index "taggings", ["tagger_id"], name: "index_taggings_on_tagger_id", using: :btree
   add_index "taggings", ["tagger_type"], name: "index_taggings_on_tagger_type", using: :btree
 
   create_table "tags", force: :cascade do |t|
-    t.string  "name"
-    t.integer "taggings_count", default: 0
+    t.string  "name",           limit: 255
+    t.integer "taggings_count",             default: 0
   end
 
   add_index "tags", ["name"], name: "index_tags_on_name", unique: true, using: :btree
@@ -177,15 +182,15 @@ ActiveRecord::Schema.define(version: 20150111153140) do
   add_index "tools", ["name"], name: "index_tools_on_name", unique: true, using: :btree
 
   create_table "tutorials", force: :cascade do |t|
-    t.string   "heading"
+    t.string   "heading",     limit: 255
     t.text     "description"
-    t.string   "url"
+    t.string   "url",         limit: 255
     t.integer  "user_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.string   "image_url"
-    t.string   "author"
-    t.string   "author_url"
+    t.datetime "created_at",              null: false
+    t.datetime "updated_at",              null: false
+    t.string   "image_url",   limit: 255
+    t.string   "author",      limit: 255
+    t.string   "author_url",  limit: 255
   end
 
   add_index "tutorials", ["user_id"], name: "index_tutorials_on_user_id", using: :btree
@@ -194,8 +199,8 @@ ActiveRecord::Schema.define(version: 20150111153140) do
     t.integer  "user_id"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "key"
-    t.string   "ip"
+    t.string   "key",         limit: 255
+    t.string   "ip",          limit: 255
     t.text     "user_agent"
     t.datetime "accessed_at"
     t.datetime "revoked_at"
@@ -207,20 +212,20 @@ ActiveRecord::Schema.define(version: 20150111153140) do
   add_index "user_sessions", ["user_id"], name: "index_user_sessions_on_user_id", using: :btree
 
   create_table "users", force: :cascade do |t|
-    t.string   "email",                  default: "", null: false
-    t.string   "password_digest",        default: "", null: false
-    t.string   "reset_password_token"
+    t.string   "email",                  limit: 255, default: "", null: false
+    t.string   "password_digest",        limit: 128, default: "", null: false
+    t.string   "reset_password_token",   limit: 255
     t.datetime "reset_password_sent_at"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "name"
-    t.string   "website"
-    t.string   "twitter"
-    t.string   "facebook"
-    t.string   "city"
-    t.string   "authentication_token"
-    t.string   "full_address"
-    t.integer  "creations_count",        default: 0
+    t.string   "name",                   limit: 255
+    t.string   "website",                limit: 255
+    t.string   "twitter",                limit: 255
+    t.string   "facebook",               limit: 255
+    t.string   "city",                   limit: 255
+    t.string   "authentication_token",   limit: 255
+    t.string   "full_address",           limit: 255
+    t.integer  "creations_count",                    default: 0
     t.boolean  "admin"
   end
 
lib/capistrano/tasks/db.rake
@@ -10,7 +10,7 @@ namespace :db do
       execute "mkdir -p #{shared_path}/backups"
       execute "PGPASSWORD='#{fetch(:postgresql_password)}' pg_dump -Fc --no-acl --no-owner -h #{fetch(:postgresql_host)} -U deployer cakeside > #{backup_path}/#{filename}"
       download!("#{backup_path}/#{filename}", "db/backups/", :via => :scp)
-      execute "s3cmd sync #{shared_path}/backups/*.dump s3://#{ENV['AWS_S3_BACKUPS_BUCKET']}/#{fetch(:rails_env)}/pg/"
+      #execute "s3cmd sync #{shared_path}/backups/*.dump s3://#{ENV['AWS_S3_BACKUPS_BUCKET']}/#{fetch(:rails_env)}/pg/"
     end
   end
 end
lib/tasks/database.rake
@@ -2,7 +2,7 @@ namespace :db do
   task :restore do
     config = Rails.configuration.database_configuration
     destination_db = config[Rails.env]["database"]
-    host = config[Rails.env]["host"]
+    host = config[Rails.env].fetch("host", "localhost")
 
     newest_backup = Dir['db/backups/*.dump'].max_by { |file| File.mtime(file) }
     sh "PGPASSWORD=#{config[Rails.env]["password"]} pg_restore --verbose --clean --no-acl --no-owner -h #{host} -U #{config[Rails.env]["username"]} -d #{destination_db} #{newest_backup}"
Gemfile
@@ -17,9 +17,7 @@ gem 'jquery-ui-rails', '~> 4.0.0'
 gem 'jquery-turbolinks'
 gem 'mini_magick'
 gem "kaminari"
-gem 'delayed_job'
 gem 'delayed_job_active_record'
-gem 'daemons'
 gem 'dotenv-rails'
 gem 'pg'
 gem 'asset_sync', '~> 2.0.0'
Gemfile.lock
@@ -35,10 +35,10 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    acts-as-taggable-on (4.0.0)
-      activerecord (>= 4.0)
-    addressable (2.5.1)
-      public_suffix (~> 2.0, >= 2.0.2)
+    acts-as-taggable-on (5.0.0)
+      activerecord (>= 4.2.8)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
     arel (6.0.4)
     asin (2.0.2)
       confiture (>= 0.1)
@@ -52,30 +52,449 @@ GEM
       mime-types
       unf
     ast (2.3.0)
-    aws-sdk (2.9.15)
-      aws-sdk-resources (= 2.9.15)
-    aws-sdk-core (2.9.15)
+    aws-partitions (1.16.0)
+    aws-sdk (3.0.0)
+      aws-sdk-resources (~> 3)
+    aws-sdk-acm (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-apigateway (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-applicationautoscaling (1.1.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-applicationdiscoveryservice (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-appstream (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-athena (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-autoscaling (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-batch (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-budgets (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-clouddirectory (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-cloudformation (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-cloudfront (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-cloudhsm (1.1.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-cloudhsmv2 (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-cloudsearch (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-cloudsearchdomain (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-cloudtrail (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-cloudwatch (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-cloudwatchevents (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-cloudwatchlogs (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-codebuild (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-codecommit (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-codedeploy (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-codepipeline (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-codestar (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-cognitoidentity (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-cognitoidentityprovider (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-cognitosync (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-configservice (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-core (3.1.0)
+      aws-partitions (~> 1.0)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.9.15)
-      aws-sdk-core (= 2.9.15)
-    aws-sigv4 (1.0.0)
+    aws-sdk-costandusagereportservice (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-databasemigrationservice (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-datapipeline (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-dax (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-devicefarm (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-directconnect (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-directoryservice (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-dynamodb (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-dynamodbstreams (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-ec2 (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-ecr (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-ecs (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-efs (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-elasticache (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-elasticbeanstalk (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-elasticloadbalancing (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-elasticloadbalancingv2 (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-elasticsearchservice (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-elastictranscoder (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-emr (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-firehose (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-gamelift (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-glacier (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-glue (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-greengrass (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-health (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-iam (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-importexport (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv2 (~> 1.0)
+    aws-sdk-inspector (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-iot (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-iotdataplane (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-kinesis (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-kinesisanalytics (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-kms (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-lambda (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-lambdapreview (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-lex (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-lexmodelbuildingservice (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-lightsail (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-machinelearning (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-marketplacecommerceanalytics (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-marketplaceentitlementservice (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-marketplacemetering (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-migrationhub (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-mturk (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-opsworks (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-opsworkscm (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-organizations (1.1.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-pinpoint (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-polly (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-rds (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-redshift (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-rekognition (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-resourcegroupstaggingapi (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-resources (3.0.1)
+      aws-sdk-acm (~> 1)
+      aws-sdk-apigateway (~> 1)
+      aws-sdk-applicationautoscaling (~> 1)
+      aws-sdk-applicationdiscoveryservice (~> 1)
+      aws-sdk-appstream (~> 1)
+      aws-sdk-athena (~> 1)
+      aws-sdk-autoscaling (~> 1)
+      aws-sdk-batch (~> 1)
+      aws-sdk-budgets (~> 1)
+      aws-sdk-clouddirectory (~> 1)
+      aws-sdk-cloudformation (~> 1)
+      aws-sdk-cloudfront (~> 1)
+      aws-sdk-cloudhsm (~> 1)
+      aws-sdk-cloudhsmv2 (~> 1)
+      aws-sdk-cloudsearch (~> 1)
+      aws-sdk-cloudsearchdomain (~> 1)
+      aws-sdk-cloudtrail (~> 1)
+      aws-sdk-cloudwatch (~> 1)
+      aws-sdk-cloudwatchevents (~> 1)
+      aws-sdk-cloudwatchlogs (~> 1)
+      aws-sdk-codebuild (~> 1)
+      aws-sdk-codecommit (~> 1)
+      aws-sdk-codedeploy (~> 1)
+      aws-sdk-codepipeline (~> 1)
+      aws-sdk-codestar (~> 1)
+      aws-sdk-cognitoidentity (~> 1)
+      aws-sdk-cognitoidentityprovider (~> 1)
+      aws-sdk-cognitosync (~> 1)
+      aws-sdk-configservice (~> 1)
+      aws-sdk-costandusagereportservice (~> 1)
+      aws-sdk-databasemigrationservice (~> 1)
+      aws-sdk-datapipeline (~> 1)
+      aws-sdk-dax (~> 1)
+      aws-sdk-devicefarm (~> 1)
+      aws-sdk-directconnect (~> 1)
+      aws-sdk-directoryservice (~> 1)
+      aws-sdk-dynamodb (~> 1)
+      aws-sdk-dynamodbstreams (~> 1)
+      aws-sdk-ec2 (~> 1)
+      aws-sdk-ecr (~> 1)
+      aws-sdk-ecs (~> 1)
+      aws-sdk-efs (~> 1)
+      aws-sdk-elasticache (~> 1)
+      aws-sdk-elasticbeanstalk (~> 1)
+      aws-sdk-elasticloadbalancing (~> 1)
+      aws-sdk-elasticloadbalancingv2 (~> 1)
+      aws-sdk-elasticsearchservice (~> 1)
+      aws-sdk-elastictranscoder (~> 1)
+      aws-sdk-emr (~> 1)
+      aws-sdk-firehose (~> 1)
+      aws-sdk-gamelift (~> 1)
+      aws-sdk-glacier (~> 1)
+      aws-sdk-glue (~> 1)
+      aws-sdk-greengrass (~> 1)
+      aws-sdk-health (~> 1)
+      aws-sdk-iam (~> 1)
+      aws-sdk-importexport (~> 1)
+      aws-sdk-inspector (~> 1)
+      aws-sdk-iot (~> 1)
+      aws-sdk-iotdataplane (~> 1)
+      aws-sdk-kinesis (~> 1)
+      aws-sdk-kinesisanalytics (~> 1)
+      aws-sdk-kms (~> 1)
+      aws-sdk-lambda (~> 1)
+      aws-sdk-lambdapreview (~> 1)
+      aws-sdk-lex (~> 1)
+      aws-sdk-lexmodelbuildingservice (~> 1)
+      aws-sdk-lightsail (~> 1)
+      aws-sdk-machinelearning (~> 1)
+      aws-sdk-marketplacecommerceanalytics (~> 1)
+      aws-sdk-marketplaceentitlementservice (~> 1)
+      aws-sdk-marketplacemetering (~> 1)
+      aws-sdk-migrationhub (~> 1)
+      aws-sdk-mturk (~> 1)
+      aws-sdk-opsworks (~> 1)
+      aws-sdk-opsworkscm (~> 1)
+      aws-sdk-organizations (~> 1)
+      aws-sdk-pinpoint (~> 1)
+      aws-sdk-polly (~> 1)
+      aws-sdk-rds (~> 1)
+      aws-sdk-redshift (~> 1)
+      aws-sdk-rekognition (~> 1)
+      aws-sdk-resourcegroupstaggingapi (~> 1)
+      aws-sdk-route53 (~> 1)
+      aws-sdk-route53domains (~> 1)
+      aws-sdk-s3 (~> 1)
+      aws-sdk-servicecatalog (~> 1)
+      aws-sdk-ses (~> 1)
+      aws-sdk-shield (~> 1)
+      aws-sdk-simpledb (~> 1)
+      aws-sdk-sms (~> 1)
+      aws-sdk-snowball (~> 1)
+      aws-sdk-sns (~> 1)
+      aws-sdk-sqs (~> 1)
+      aws-sdk-ssm (~> 1)
+      aws-sdk-states (~> 1)
+      aws-sdk-storagegateway (~> 1)
+      aws-sdk-support (~> 1)
+      aws-sdk-swf (~> 1)
+      aws-sdk-waf (~> 1)
+      aws-sdk-wafregional (~> 1)
+      aws-sdk-workdocs (~> 1)
+      aws-sdk-workspaces (~> 1)
+      aws-sdk-xray (~> 1)
+    aws-sdk-route53 (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-route53domains (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-s3 (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sdk-kms (~> 1)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-servicecatalog (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-ses (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-shield (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-simpledb (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv2 (~> 1.0)
+    aws-sdk-sms (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-snowball (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-sns (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-sqs (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-ssm (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-states (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-storagegateway (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-support (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-swf (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-waf (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-wafregional (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-workdocs (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-workspaces (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-xray (1.0.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sigv2 (1.0.0)
+    aws-sigv4 (1.0.1)
     bcrypt (3.1.11)
-    better_errors (2.1.1)
+    better_errors (2.3.0)
       coderay (>= 1.0.0)
-      erubis (>= 2.6.6)
+      erubi (>= 1.0.0)
       rack (>= 0.9.0)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
     bootstrap-sass (2.3.2.2)
       sass (~> 3.2)
-    browser_sniffer (1.0.12)
+    browser_sniffer (1.0.13)
     buftok (0.2.0)
     builder (3.2.3)
-    bullet (5.5.1)
+    bullet (5.6.1)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.10.0)
-    byebug (9.0.6)
+    byebug (9.1.0)
     capistrano (3.3.5)
       capistrano-stats (~> 1.1.0)
       i18n
@@ -84,26 +503,26 @@ GEM
     capistrano-bundler (1.2.0)
       capistrano (~> 3.1)
       sshkit (~> 1.2)
-    capistrano-rails (1.2.3)
+    capistrano-rails (1.3.0)
       capistrano (~> 3.1)
       capistrano-bundler (~> 1.1)
     capistrano-rbenv (2.1.1)
       capistrano (~> 3.1)
       sshkit (~> 1.3)
     capistrano-stats (1.1.1)
-    capybara (2.14.0)
+    capybara (2.15.1)
       addressable
-      mime-types (>= 1.16)
+      mini_mime (>= 0.1.3)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    chartkick (2.2.3)
-    chef (12.20.3)
+    chartkick (2.2.4)
+    chef (12.21.4)
       addressable
       bundler (>= 1.10)
-      chef-config (= 12.20.3)
-      chef-zero (>= 4.8)
+      chef-config (= 12.21.4)
+      chef-zero (>= 4.8, < 13)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
       ffi-yajl (~> 2.2)
@@ -128,7 +547,7 @@ GEM
       specinfra (~> 2.10)
       syslog-logger (~> 1.6)
       uuidtools (~> 2.1.5)
-    chef-config (12.20.3)
+    chef-config (12.21.4)
       addressable
       fuzzyurl
       mixlib-config (~> 2.0)
@@ -152,15 +571,14 @@ GEM
     confiture (0.1.4)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
-    curb (0.9.3)
-    daemons (1.2.4)
+    curb (0.9.4)
     dalli (2.7.6)
-    database_cleaner (1.6.0)
-    debug_inspector (0.0.2)
-    delayed_job (4.1.2)
-      activesupport (>= 3.0, < 5.1)
-    delayed_job_active_record (4.1.1)
-      activerecord (>= 3.0, < 5.1)
+    database_cleaner (1.6.1)
+    debug_inspector (0.0.3)
+    delayed_job (4.1.3)
+      activesupport (>= 3.0, < 5.2)
+    delayed_job_active_record (4.1.2)
+      activerecord (>= 3.0, < 5.2)
       delayed_job (>= 3.0, < 5)
     diff-lcs (1.3)
     docile (1.1.5)
@@ -179,13 +597,14 @@ GEM
     email_validator (1.6.0)
       activemodel
     equalizer (0.0.11)
+    erubi (1.6.1)
     erubis (2.7.0)
-    exception_notification (4.2.1)
+    exception_notification (4.2.2)
       actionmailer (>= 4.0, < 6)
       activesupport (>= 4.0, < 6)
-    excon (0.55.0)
+    excon (0.58.0)
     execjs (2.7.0)
-    exifr (1.2.5)
+    exifr (1.3.1)
     factory_girl (4.8.0)
       activesupport (>= 3.0.0)
     factory_girl_rails (4.8.0)
@@ -193,18 +612,18 @@ GEM
       railties (>= 3.0.0)
     faraday (0.11.0)
       multipart-post (>= 1.2, < 3)
-    ffaker (2.5.0)
+    ffaker (2.6.0)
     ffi (1.9.18)
-    ffi-yajl (2.3.0)
+    ffi-yajl (2.3.1)
       libyajl2 (~> 1.2)
-    fog-aws (1.3.0)
+    fog-aws (1.4.1)
       fog-core (~> 1.38)
       fog-json (~> 1.0)
       fog-xml (~> 0.1)
       ipaddress (~> 0.8)
-    fog-core (1.44.1)
+    fog-core (1.45.0)
       builder
-      excon (~> 0.49)
+      excon (~> 0.58)
       formatador (~> 0.2)
     fog-json (1.0.2)
       fog-core (~> 1.0)
@@ -219,7 +638,7 @@ GEM
     formatador (0.2.5)
     fuzzyurl (0.9.0)
     geoip (1.6.3)
-    gibbon (3.0.1)
+    gibbon (3.1.0)
       faraday (>= 0.9.1)
       multi_json (>= 1.11.0)
     github-markdown (0.6.9)
@@ -227,7 +646,7 @@ GEM
       activesupport (>= 4.2.0)
     groupdate (3.2.0)
       activesupport (>= 3)
-    hashie (3.5.5)
+    hashie (3.5.6)
     highline (1.7.8)
     http (2.2.2)
       addressable (~> 2.3)
@@ -236,27 +655,27 @@ GEM
       http_parser.rb (~> 0.6.0)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
-    http-form_data (1.0.1)
+    http-form_data (1.0.3)
     http_parser.rb (0.6.0)
     httpi (2.4.2)
       rack
       socksify
-    i18n (0.8.1)
-    i18n-tasks (0.9.15)
+    i18n (0.8.6)
+    i18n-tasks (0.9.18)
       activesupport (>= 4.0.2)
       ast (>= 2.1.0)
       easy_translate (>= 0.5.0)
-      erubis
+      erubi
       highline (>= 1.7.3)
       i18n
       parser (>= 2.2.3.0)
       rainbow (~> 2.2)
       terminal-table (>= 1.5.1)
-    iniparse (1.4.2)
+    iniparse (1.4.4)
     ipaddress (0.8.3)
-    jbuilder (2.6.3)
-      activesupport (>= 3.0.0, < 5.2)
-      multi_json (~> 1.2)
+    jbuilder (2.7.0)
+      activesupport (>= 4.2.0)
+      multi_json (>= 1.2)
     jmespath (1.3.1)
     jquery-rails (4.3.1)
       rails-dom-testing (>= 1, < 3)
@@ -267,7 +686,7 @@ GEM
       turbolinks
     jquery-ui-rails (4.0.5)
       railties (>= 3.1.0)
-    js-routes (1.3.3)
+    js-routes (1.4.0)
       railties (>= 3.2)
       sprockets-rails
     json (2.1.0)
@@ -285,13 +704,13 @@ GEM
     kaminari-core (1.0.1)
     kgio (2.11.0)
     libyajl2 (1.2.0)
-    lol_dba (2.1.2)
+    lol_dba (2.1.4)
       actionpack (>= 3.0)
       activerecord (>= 3.0)
       railties (>= 3.0)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
-    mail (2.6.5)
+    mail (2.6.6)
       mime-types (>= 1.16, < 4)
     memoizable (0.4.2)
       thread_safe (~> 0.3, >= 0.3.1)
@@ -299,17 +718,17 @@ GEM
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
-    mini_magick (4.7.0)
-    mini_portile2 (2.1.0)
-    minitest (5.10.1)
+    mini_magick (4.8.0)
+    mini_mime (0.1.4)
+    mini_portile2 (2.2.0)
+    minitest (5.10.3)
     mixlib-archive (0.4.1)
       mixlib-log
-    mixlib-authentication (1.4.1)
-      mixlib-log
+    mixlib-authentication (1.4.2)
     mixlib-cli (1.7.0)
     mixlib-config (2.2.4)
     mixlib-log (1.7.1)
-    mixlib-shellout (2.2.7)
+    mixlib-shellout (2.3.2)
     multi_json (1.12.1)
     multipart-post (2.0.0)
     naught (1.1.0)
@@ -324,10 +743,10 @@ GEM
       net-ssh (>= 2.6.5)
       net-ssh-gateway (>= 1.2.0)
     net-telnet (0.1.1)
-    nokogiri (1.7.1)
-      mini_portile2 (~> 2.1.0)
-    ohai (8.23.0)
-      chef-config (>= 12.5.0.alpha.1, < 13)
+    nokogiri (1.8.0)
+      mini_portile2 (~> 2.2.0)
+    ohai (8.24.1)
+      chef-config (>= 12.5.0.alpha.1, < 14)
       ffi (~> 1.9)
       ffi-yajl (~> 2.2)
       ipaddress
@@ -340,10 +759,10 @@ GEM
       wmi-lite (~> 1.0)
     parser (2.4.0.0)
       ast (~> 2.2)
-    pg (0.20.0)
+    pg (0.21.0)
     phantomjs (2.1.1.0)
     plist (3.3.0)
-    poltergeist (1.15.0)
+    poltergeist (1.16.0)
       capybara (~> 2.1)
       cliver (~> 0.3.1)
       websocket-driver (>= 0.2.0)
@@ -354,12 +773,12 @@ GEM
       slop (~> 3.4)
     pry-rails (0.3.6)
       pry (>= 0.10.4)
-    public_suffix (2.0.5)
-    puma (3.8.2)
-    rack (1.6.5)
+    public_suffix (3.0.0)
+    puma (3.10.0)
+    rack (1.6.8)
     rack-attack (5.0.1)
       rack
-    rack-cors (0.4.1)
+    rack-cors (1.0.1)
     rack-test (0.6.3)
       rack (>= 1.0)
     rails (4.2.8)
@@ -388,66 +807,73 @@ GEM
       thor (>= 0.18.1, < 2.0)
     rainbow (2.2.2)
       rake
-    raindrops (0.18.0)
+    raindrops (0.19.0)
     rake (12.0.0)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
+    rb-fsevent (0.10.2)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
+    rspec (3.6.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
+      rspec-support (~> 3.6.0)
     rspec-its (1.2.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.5.0)
+    rspec-mocks (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-rails (3.5.2)
+      rspec-support (~> 3.6.0)
+    rspec-rails (3.6.1)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
     rspec_junit_formatter (0.2.3)
       builder (< 4)
       rspec-core (>= 2, < 4, != 2.12.0)
     safe_yaml (1.0.4)
-    sass (3.4.23)
+    sass (3.5.1)
+      sass-listen (~> 4.0.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
     sass-rails (5.0.6)
       railties (>= 4.0.0, < 6)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
-    serverspec (2.38.0)
+    serverspec (2.40.0)
       multi_json
       rspec (~> 3.0)
       rspec-its
-      specinfra (~> 2.53)
+      specinfra (~> 2.68)
     sfl (2.3)
     simple_oauth (0.3.1)
-    simplecov (0.14.1)
+    simplecov (0.15.0)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
+    simplecov-html (0.10.2)
     slop (3.6.0)
     snake_case_hash (1.0.4)
       hashie (~> 3.0)
     socksify (1.7.1)
     spank (1.0.1441140881)
-    specinfra (2.67.9)
+    specinfra (2.71.1)
       net-scp
       net-ssh (>= 2.7, < 5.0)
       net-telnet
       sfl
-    spring (2.0.1)
+    spring (2.0.2)
       activesupport (>= 4.2)
     spring-commands-rspec (1.0.4)
       spring (>= 0.9.1)
@@ -458,7 +884,7 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    sshkit (1.13.1)
+    sshkit (1.14.0)
       net-scp (>= 1.1.2)
       net-ssh (>= 2.8.0)
     syslog-logger (1.6.8)
@@ -467,12 +893,12 @@ GEM
       railties (>= 3.2.5, < 6)
     teaspoon-jasmine (2.3.4)
       teaspoon (>= 1.0.0)
-    terminal-table (1.7.3)
-      unicode-display_width (~> 1.1.1)
+    terminal-table (1.8.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
     thor (0.19.4)
     thread (0.2.2)
     thread_safe (0.3.6)
-    tilt (2.0.7)
+    tilt (2.0.8)
     turbolinks (5.0.1)
       turbolinks-source (~> 5)
     turbolinks-source (5.0.3)
@@ -493,7 +919,7 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.4)
-    unicode-display_width (1.1.3)
+    unicode-display_width (1.3.0)
     unicorn (5.3.0)
       kgio (~> 2.6)
       raindrops (~> 0.7)
@@ -508,7 +934,7 @@ GEM
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
     wmi-lite (1.0.0)
-    xpath (2.0.0)
+    xpath (2.1.0)
       nokogiri (~> 1.3)
 
 PLATFORMS
@@ -534,10 +960,8 @@ DEPENDENCIES
   chef
   coffee-rails (~> 4.1.0)
   curb
-  daemons
   dalli
   database_cleaner
-  delayed_job
   delayed_job_active_record
   dotenv-deployment
   dotenv-rails
Vagrantfile
@@ -5,12 +5,10 @@ Vagrant.configure("2") do |config|
   config.vm.box = "phusion/ubuntu-14.04-amd64"
   config.vm.provision :shell, path: 'script/bootstrap.sh'
   config.vm.network :private_network, ip: "192.168.33.10"
+  config.vm.synced_folder ".", "/vagrant", type: "nfs"
 
-  # config.vm.provider :virtualbox do |vb|
-  #   # Don't boot with headless mode
-  #   vb.gui = true
-  #
-  #   # Use VBoxManage to customize the VM. For example to change memory:
-  #   vb.customize ["modifyvm", :id, "--memory", "1024"]
-  # end
+  config.vm.provider :virtualbox do |vb|
+    vb.memory = 8192
+    vb.cpus = 4
+  end
 end