Fix delayed_job usage in Rakefile; switched to the 4.0 stable branch of Arel until they have a release that fixes the yaml dumping bug

dwaite · dwaite · commit 0ac32b70092a · 2013-12-27T18:08:25.000-05:00
diff --git a/Gemfile b/Gemfile
@@ -29,7 +29,10 @@ group :heroku do
 end
 
 gem "activerecord", "~> 4.0"
+# need to work around bug in 4.0.1 https://github.com/rails/arel/pull/216
+gem 'arel', git: 'git://github.com/rails/arel.git', branch: '4-0-stable'
 gem "bcrypt-ruby", "~> 3.1.2"
+gem "delayed_job", "~> 4.0"
 gem "delayed_job_active_record", "~> 4.0"
 gem "feedbag", "~> 0.9.2"
 gem "feedzirra"
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,3 +1,10 @@
+GIT
+  remote: git://github.com/rails/arel.git
+  revision: 454a25f18c95cdfba5520a6fc5bdb6d476e20a85
+  branch: 4-0-stable
+  specs:
+    arel (4.0.1.20131022201058)
+
 GIT
   remote: git://github.com/swanson/loofah.git
   revision: 825d715e6f1281501882d886cf34e82aebabb356
@@ -23,7 +30,6 @@ GEM
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
-    arel (4.0.1)
     atomic (1.1.14)
     backports (3.3.5)
     bcrypt-ruby (3.1.2)
@@ -160,8 +166,10 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord (~> 4.0)
+  arel!
   bcrypt-ruby (~> 3.1.2)
   coveralls (~> 0.7)
+  delayed_job (~> 4.0)
   delayed_job_active_record (~> 4.0)
   excon (~> 0.31.0)
   faker (~> 1.2)
diff --git a/Rakefile b/Rakefile
@@ -5,6 +5,7 @@ require "rubygems"
 require "net/http"
 require 'active_record'
 require 'delayed_job'
+require 'delayed_job_active_record'
 
 require "sinatra/activerecord/rake"
 
