Merb-ify.

Signed-off-by: Tobias Lütke <tobi@leetsoft.com>

delayed_job.gemspec

@@ -30,6 +30,7 @@ Gem::Specification.new do |s|
     lib/delayed/worker.rb
     lib/delayed_job.rb
     tasks/jobs.rake
+    tasks/merbtasks.rb
   ]
   s.test_files = %w[
     spec/database.rb

lib/delayed/worker.rb

@@ -3,7 +3,11 @@ class Worker
     SLEEP = 5
 
     cattr_accessor :logger
-    self.logger = RAILS_DEFAULT_LOGGER if const_defined?(:RAILS_DEFAULT_LOGGER)
+    self.logger = if defined?(Merb::Logger)
+                    Merb.logger
+                  elsif defined?(RAILS_DEFAULT_LOGGER)
+                    RAILS_DEFAULT_LOGGER
+                  end
 
     def initialize(options={})
       @quiet = options[:quiet]

lib/delayed_job.rb

@@ -1,6 +1,12 @@
+autoload :ActiveRecord, 'activerecord'
+
 require File.dirname(__FILE__) + '/delayed/message_sending'
 require File.dirname(__FILE__) + '/delayed/performable_method'
 require File.dirname(__FILE__) + '/delayed/job'
 require File.dirname(__FILE__) + '/delayed/worker'
 
-Object.send(:include, Delayed::MessageSending)
+Object.send(:include, Delayed::MessageSending)
+
+if defined?(Merb::Plugins)
+  Merb::Plugins.add_rakefiles File.dirname(__FILE__) / '..' / 'tasks' / 'merbtasks'
+end

tasks/merbtasks.rb

@@ -0,0 +1,11 @@
+namespace :jobs do
+  desc "Clear the delayed_job queue."
+  task :clear => :merb_env do
+    Delayed::Job.delete_all
+  end
+
+  desc "Start a delayed_job worker."
+  task :work => :merb_env do
+    Delayed::Worker.new(:min_priority => ENV['MIN_PRIORITY'], :max_priority => ENV['MAX_PRIORITY']).start
+  end
+end