upgrade rescue and resque-scheduler and bundle update

Author: Austin Schneider

Gemfile

@@ -6,8 +6,8 @@ gem 'haml-rails', '0.3.5'
 gem 'jquery-rails', '1.0.16'
 gem 'httparty', '0.8.1'
 gem 'squeel', '0.9.3'
-gem 'resque', '1.20.0'
-gem 'resque-scheduler', '1.9.9'
+gem 'resque', '1.24.1'
+gem 'resque-scheduler', '2.0.1'
 gem 'kaminari', '0.12.4'
 # gem 'twitter', '2.0.1'
 

Gemfile.lock

@@ -31,53 +31,49 @@ GEM
     activesupport (3.2.14)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
-    addressable (2.2.6)
+    addressable (2.2.8)
     arel (3.0.2)
     artifice (0.6)
       rack-test
     builder (3.0.4)
-    capybara (1.1.1)
+    capybara (2.1.0)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
-      selenium-webdriver (~> 2.0)
-      xpath (~> 0.1.4)
-    childprocess (0.2.2)
-      ffi (~> 1.0.6)
+      xpath (~> 2.0)
     coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
       railties (~> 3.2.0)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
     coffee-script-source (1.6.3)
-    crack (0.3.1)
-    cucumber (1.1.1)
+    crack (0.4.1)
+      safe_yaml (~> 0.9.0)
+    cucumber (1.3.7)
       builder (>= 2.1.2)
-      diff-lcs (>= 1.1.2)
-      gherkin (~> 2.6.0)
-      json (>= 1.4.6)
-      term-ansicolor (>= 1.0.6)
-    cucumber-rails (1.2.0)
-      capybara (>= 1.1.1)
-      cucumber (>= 1.1.1)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.12.1)
+      multi_json (~> 1.7.5)
+      multi_test (>= 0.0.2)
+    cucumber-rails (1.2.1)
+      capybara (>= 1.1.2)
+      cucumber (>= 1.1.3)
       nokogiri (>= 1.5.0)
     database_cleaner (0.6.7)
     diff-lcs (1.2.4)
     erubis (2.7.0)
-    execjs (1.2.9)
-      multi_json (~> 1.0)
+    execjs (2.0.1)
     factory_girl (2.2.0)
       activesupport
     factory_girl_rails (1.3.0)
       factory_girl (~> 2.2.0)
       railties (>= 3.0.0)
     faker (1.0.1)
       i18n (~> 0.4)
-    ffi (1.0.9)
-    gherkin (2.6.2)
-      json (>= 1.4.6)
+    gherkin (2.12.1)
+      multi_json (~> 1.3)
     haml (3.1.8)
     haml-rails (0.3.5)
       actionpack (>= 3.1, < 4.1)
@@ -94,7 +90,6 @@ GEM
       railties (~> 3.0)
       thor (~> 0.14)
     json (1.8.0)
-    json_pure (1.6.1)
     kaminari (0.12.4)
       rails (>= 3.0.0)
     launchy (2.0.5)
@@ -103,9 +98,13 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.25)
-    multi_json (1.8.0)
-    multi_xml (0.4.1)
-    nokogiri (1.5.0)
+    mini_portile (0.5.1)
+    mono_logger (1.1.0)
+    multi_json (1.7.9)
+    multi_test (0.0.2)
+    multi_xml (0.5.5)
+    nokogiri (1.6.0)
+      mini_portile (~> 0.5.0)
     pg (0.11.0)
     polyamorous (0.5.0)
       activerecord (~> 3.0)
@@ -137,17 +136,18 @@ GEM
     rake (10.1.0)
     rdoc (3.12.2)
       json (~> 1.4)
-    redis (2.2.2)
-    redis-namespace (1.0.4)
-      redis (< 3.0.0)
-    resque (1.20.0)
+    redis (3.0.4)
+    redis-namespace (1.3.1)
+      redis (~> 3.0.0)
+    resque (1.24.1)
+      mono_logger (~> 1.0)
       multi_json (~> 1.0)
-      redis-namespace (~> 1.0.2)
+      redis-namespace (~> 1.2)
       sinatra (>= 0.9.2)
       vegas (~> 0.1.2)
-    resque-scheduler (1.9.9)
+    resque-scheduler (2.0.1)
       redis (>= 2.0.1)
-      resque (>= 1.8.0)
+      resque (>= 1.20.0)
       rufus-scheduler
     resque_spec (0.7.0)
       resque (>= 1.15.0)
@@ -167,26 +167,18 @@ GEM
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
-    rubyzip (0.9.4)
-    rufus-scheduler (2.0.12)
-      tzinfo (>= 0.3.23)
+    rufus-scheduler (2.0.24)
+      tzinfo (>= 0.3.22)
+    safe_yaml (0.9.5)
     sass (3.2.10)
     sass-rails (3.2.6)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-    selenium-webdriver (2.10.0)
-      childprocess (>= 0.2.1)
-      ffi (= 1.0.9)
-      json_pure
-      rubyzip
-    sinatra (1.3.1)
-      rack (~> 1.3, >= 1.3.4)
-      rack (~> 1.3, >= 1.3.4)
-      rack-protection (~> 1.1, >= 1.1.2)
-      rack-protection (~> 1.1, >= 1.1.2)
-      tilt (~> 1.3, >= 1.3.3)
-      tilt (~> 1.3, >= 1.3.3)
+    sinatra (1.4.3)
+      rack (~> 1.4)
+      rack-protection (~> 1.4)
+      tilt (~> 1.3, >= 1.3.4)
     sprockets (2.2.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -196,23 +188,22 @@ GEM
       activerecord (~> 3.0)
       activesupport (~> 3.0)
       polyamorous (~> 0.5.0)
-    term-ansicolor (1.0.7)
     thor (0.18.1)
     tilt (1.4.1)
     timecop (0.3.5)
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.37)
-    uglifier (1.0.4)
+    uglifier (2.2.1)
       execjs (>= 0.3.0)
-      multi_json (>= 1.0.2)
+      multi_json (~> 1.0, >= 1.0.2)
     vegas (0.1.11)
       rack (>= 1.0.0)
-    webmock (1.7.7)
+    webmock (1.7.10)
       addressable (~> 2.2, > 2.2.5)
       crack (>= 0.1.7)
-    xpath (0.1.4)
+    xpath (2.0.0)
       nokogiri (~> 1.3)
 
 PLATFORMS
@@ -233,8 +224,8 @@ DEPENDENCIES
   launchy (~> 2.0.5)
   pg (= 0.11.0)
   rails (= 3.2.14)
-  resque (= 1.20.0)
-  resque-scheduler (= 1.9.9)
+  resque (= 1.24.1)
+  resque-scheduler (= 2.0.1)
   resque_spec (~> 0.7.0)
   rspec-rails (~> 2.14)
   sass-rails (~> 3.2.6)

config/initializers/resque.rb

@@ -1,4 +1,5 @@
 require 'resque_scheduler'
+require 'resque/server'
 
 Resque.redis = Redis.new(
   host: CONFIG[:redis][:host],