RIP Merb

lib/delayed/tasks.rb

@@ -1,15 +1,11 @@
-# Re-definitions are appended to existing tasks
-task :environment
-task :merb_env
-
 namespace :jobs do
   desc "Clear the delayed_job queue."
-  task :clear => [:merb_env, :environment] do
+  task :clear => :environment do
     Delayed::Job.delete_all
   end
 
   desc "Start a delayed_job worker."
-  task :work => [:merb_env, :environment] do
+  task :work => :environment do
     Delayed::Worker.new(:min_priority => ENV['MIN_PRIORITY'], :max_priority => ENV['MAX_PRIORITY']).start
   end
 end

lib/delayed/worker.rb

@@ -16,9 +16,7 @@ class Worker
     cattr_accessor :destroy_failed_jobs
     self.destroy_failed_jobs = true
 
-    self.logger = if defined?(Merb::Logger)
-      Merb.logger
-    elsif defined?(Rails)
+    self.logger = if defined?(Rails)
       Rails.logger
     elsif defined?(RAILS_DEFAULT_LOGGER)
       RAILS_DEFAULT_LOGGER

lib/delayed_job.rb

@@ -9,7 +9,3 @@
 
 Object.send(:include, Delayed::MessageSending)   
 Module.send(:include, Delayed::MessageSending::ClassMethods)
-
-if defined?(Merb::Plugins)
-  Merb::Plugins.add_rakefiles File.dirname(__FILE__) / 'delayed' / 'tasks'
-end