Merge branch 'refs/heads/workless' into delayed-job

Gemfile

@@ -37,6 +37,7 @@ gem 'activerecord-postgresql-adapter'
 gem 'pg'
 gem 'delayed_job_active_record'
 gem 'daemons'
+gem 'workless'
 
 group :production do
 	gem 'unicorn'

Gemfile.lock

@@ -55,10 +55,12 @@ GEM
       activerecord (>= 2.1.0, < 4)
       delayed_job (~> 3.0)
     erubis (2.7.0)
+    excon (0.16.10)
     execjs (1.4.0)
       multi_json (~> 1.0)
     faraday (0.8.5)
       multipart-post (~> 1.1)
+    fattr (2.2.1)
     feedzirra (0.0.31)
       activesupport (>= 3.0.8)
       builder (~> 3.0.0)
@@ -76,6 +78,8 @@ GEM
       activesupport (>= 3.1, < 4.1)
       haml (>= 3.1, < 4.1)
       railties (>= 3.1, < 4.1)
+    heroku-api (0.3.8)
+      excon (~> 0.16.10)
     hike (1.2.1)
     htmlentities (4.3.1)
     httpauth (0.2.0)
@@ -138,6 +142,8 @@ GEM
     rake (10.0.3)
     rdoc (3.12.1)
       json (~> 1.4)
+    rush (0.6.8)
+      session
     sass (3.2.5)
     sass-rails (3.2.6)
       railties (~> 3.2.0)
@@ -145,6 +151,8 @@ GEM
       tilt (~> 1.3)
     sax-machine (0.0.20)
       nokogiri (> 0.0.0)
+    session (3.1.0)
+      fattr
     sorcery (0.8.1)
       bcrypt-ruby (~> 3.0.0)
       oauth (~> 0.4.4)
@@ -168,6 +176,11 @@ GEM
       rack
       raindrops (~> 0.7)
     will_paginate (3.0.4)
+    workless (1.1.2)
+      delayed_job (>= 2.0.7)
+      heroku-api
+      rails
+      rush
 
 PLATFORMS
   ruby
@@ -191,3 +204,4 @@ DEPENDENCIES
   uglifier (>= 1.0.3)
   unicorn
   will_paginate (~> 3.0)
+  workless

config/environments/production.rb

@@ -60,5 +60,9 @@ Apollo::Application.configure do
 
   # Send deprecation notices to registered listeners
   config.active_support.deprecation = :notify
-
+  
+  # Workless
+  config.after_initialize do 
+    Delayed::Job.scaler = :heroku_cedar
+  end
 end