resque-director 1.1.0 → 2.0.0

data/README.rdoc

@@ -10,12 +10,12 @@ resque-director does not operate on workers that serve multiple queues, and does
 
 == Usage
 
-When creating your jobs you should include (make sure to include not extend) Resque::Plugins::Director and add direction options. 
+When creating your jobs you should extend Resque::Plugins::Director and add direction options. 
 
 For Example:
 	
   class Job
-    include Resque::Plugins::Director
+    extend Resque::Plugins::Director
     direct :min_workers => 2, :max_workers => 4, :max_time => 60, :max_queue => 10, :wait_time => 30
     @queue = :test
     
@@ -37,15 +37,18 @@ For Example:
 
 === Worker Options
 
-<b>start_override</b>:: This will run exactly what you put in the command override as a system command to start A SINGLE worker, allowing you to customize the starting of a worker fully. The system command "QUEUE=queue_name rake resque:work" is run by default, where queue_name is whatever queue the job is running.
+<b>start_override</b>:: This option takes a lambda closure that accepts the queue as an argument, the block you pass in will be responsible for starting a SINGLE worker allowing you to fully customize the starting of a worker. By default the system command "QUEUE=queue_name rake resque:work &" is run, where queue_name is whatever queue the job is running.
 
-<b>stop_override</b>:: This will run exactly what you put in the command override as a system command to stop A SINGLE worker, allowing you to customize the stoping of a worker fully. Process.kill("QUIT", worker_pid) is used to stop the worker by default, where worker_pid is the PID of a worker.
+<b>stop_override</b>:: This option takes a lambda closure that accepts the queue as an argument, the block you pass in will be responsible for stopping a SINGLE worker allowing you to fully customize the stopping of a worker. Process.kill("QUIT", worker_pid) is used to stop the worker by default, where worker_pid is the process id of a worker.
 
 ===	Starting/Stopping Workers Example
 
   class Job
-    include Resque::Plugins::Director
-    direct :start_override => "./start_command_to_run", :stop_override => "./stop_command_to_run"
+    extend Resque::Plugins::Director
+
+	start_block = lambda{|queue| system("start_#{queue}")}
+	stop_block = lambda{|queue| system("stop_#{queue}")}
+    direct :start_override => start_block, :stop_override => stop_block
     @queue = :test
     
     #rest of your Job class here
@@ -70,6 +73,11 @@ To add director logging you can pass a logger as an option. It will prepend all
 * If a max_worker is less than min_worker then the default for max_worker will be used (there will be no maximum). 
 * If a min_workers is set to anything less than 1 then it will be treated as 0.
 
+=== Requirements
+
+* resque-director requires resque ~> 1.14.0. 
+* resque-director may be incompatible with gems that modify resque's push/pop functionality. 
+
 
 == Contributing to resque-reconnect
  

data/VERSION

@@ -1 +1 @@
-1.1.0
+2.0.0

data/lib/resque/plugins/director/extra_hooks.rb

@@ -0,0 +1,41 @@
+module Resque
+  module Plugins
+    module Director
+      module ExtraHooks
+
+        def self.included(base) #:nodoc:
+          base.class_eval do
+            alias_method :original_pop, :pop
+            alias_method :original_push, :push
+            extend ClassMethods
+          end
+        end
+
+        module ClassMethods 
+          def push(queue, item)
+            item[:created_at] = Time.now.utc.to_i if item.respond_to?(:[]=)
+            original_push queue, item
+          end
+          
+          def pop(queue)
+            job = original_pop(queue)
+            begin 
+              timestamp = job['created_at']
+              start_time = timestamp.nil? ? Time.now.utc : Time.at(timestamp.to_i).utc
+              job_class = constantize(job['class'])
+              if job_class && job_class.respond_to?(:after_pop_direct_workers) && job_class.respond_to?(:direct)
+                job_class.after_pop_direct_workers(start_time)
+              end
+            rescue
+            end
+            job
+          end
+        end
+      end
+    end
+  end
+end
+
+module Resque
+  include Resque::Plugins::Director::ExtraHooks
+end

data/lib/resque/plugins/director/scaler.rb

@@ -53,14 +53,17 @@ module Resque
           
           def start(number_of_workers)
             Config.log("starting #{number_of_workers} workers on queue:#{Config.queue}") if number_of_workers > 0
-            default_command = "QUEUE=#{Config.queue} rake resque:work &"
-            number_of_workers.times { system(Config.start_override || default_command) }
+            if Config.start_override
+              number_of_workers.times { Config.start_override.call(Config.queue) }
+            else
+              number_of_workers.times { system("QUEUE=#{Config.queue} rake resque:work &") }
+            end
           end
           
           def stop(tracker, number_of_workers)
             Config.log("stopping #{number_of_workers} workers on queue:#{Config.queue}") if number_of_workers > 0
             if Config.stop_override
-              number_of_workers.times { system(Config.stop_override) }
+              number_of_workers.times {Config.stop_override.call(Config.queue) }
             else
               valid_workers = tracker.workers.select{|w| w.hostname == `hostname`.chomp}
               worker_pids = valid_workers[0...number_of_workers].map(&:pid)

data/lib/resque/plugins/director.rb

@@ -1,95 +1,56 @@
 module Resque
   module Plugins
     module Director
-      
-      def self.included(base)
-        base.extend ClassMethods
-        base.overwrite_perform
-        base.instance_eval do
-          def singleton_method_added(name)
-            return if name != :perform
-            overwrite_perform
-          end
-        end
+      def direct(options={})
+        Config.setup(options)
       end
-      
-      module ClassMethods
-        def direct(options={})
-          Config.setup(options)
-        end
-        
-        def overwrite_perform
-          class_eval do |klass|
-            if klass.respond_to?('perform') && !klass.respond_to?('custom_perform')
-              klass.instance_eval do
-                def custom_perform(*args)
-                  args.pop unless retrieve_timestamp(args.last).nil?
-                  original_perform(*args)
-                end
-              end
-
-              class << klass
-                alias_method :original_perform, :perform
-                alias_method :perform, :custom_perform
-              end
-            end
-          end
-        end
-      
-        def after_enqueue_scale_workers(*args)
-          Config.queue = @queue.to_s
-          Scaler.scale_within_requirements
-        end
-      
-        def before_perform_direct_workers(*args)
-          return unless scaling_config_set?
-          Config.queue = @queue.to_s
-          time_stamp = retrieve_timestamp(args.pop)
-          start_time = time_stamp.nil? ? Time.now.utc : Time.at(time_stamp.to_i).utc 
-        
-          time_through_queue = Time.now.utc - start_time
-          jobs_in_queue = Resque.size(@queue.to_s)
-        
-          if scale_up?(time_through_queue, jobs_in_queue)
-            Scaler.scale_up
-          elsif scale_down?(time_through_queue, jobs_in_queue)
-            Scaler.scale_down
-          end
-        end
-      
-        def after_perform_direct_workers(*args)
-          jobs_in_queue = Resque.size(@queue.to_s)
-          Scaler.scale_down_to_minimum if jobs_in_queue == 0
-        end
-      
-        def on_failure_direct_workers(*args)
-          jobs_in_queue = Resque.size(@queue.to_s)
-          Scaler.scale_down_to_minimum if jobs_in_queue == 0
-        end
-      
-        private
+    
+      def after_enqueue_scale_workers(*args)
+        Config.queue = @queue.to_s
+        Scaler.scale_within_requirements
+      end
+    
+      def after_pop_direct_workers(start_time=Time.now.utc)
+        return unless scaling_config_set?
+        Config.queue = @queue.to_s
         
-        def retrieve_timestamp(timestamp)
-          return nil unless timestamp.class.to_s == "Hash"
-          timestamp['resdirecttime'] || timestamp[:resdirecttime]
-        end
-      
-        def scaling_config_set?
-          Config.max_time > 0 || Config.max_queue > 0
-        end
+        time_through_queue = Time.now.utc - start_time
+        jobs_in_queue = Resque.size(@queue.to_s)
       
-        def scale_up?(time_through_queue, jobs_in_queue)
-          time_limits =  Config.max_time > 0 && time_through_queue > Config.max_time 
-          queue_limits = Config.max_queue > 0 && jobs_in_queue > Config.max_queue
-          time_limits || queue_limits
-        end
-      
-        def scale_down?(time_through_queue, jobs_in_queue)
-          time_limits =  Config.max_time > 0 && time_through_queue < (Config.max_time/2)
-          queue_limits = Config.max_queue > 0 && jobs_in_queue < (Config.max_queue/2) 
-          (Config.max_time <= 0 || time_limits) && (Config.max_queue <= 0 || queue_limits)
+        if scale_up?(time_through_queue, jobs_in_queue)
+          Scaler.scale_up
+        elsif scale_down?(time_through_queue, jobs_in_queue)
+          Scaler.scale_down
         end
       end
+    
+      def after_perform_direct_workers(*args)
+        jobs_in_queue = Resque.size(@queue.to_s)
+        Scaler.scale_down_to_minimum if jobs_in_queue == 0
+      end
+    
+      def on_failure_direct_workers(*args)
+        jobs_in_queue = Resque.size(@queue.to_s)
+        Scaler.scale_down_to_minimum if jobs_in_queue == 0
+      end
+    
+      private
+    
+      def scaling_config_set?
+        Config.max_time > 0 || Config.max_queue > 0
+      end
+    
+      def scale_up?(time_through_queue, jobs_in_queue)
+        time_limits =  Config.max_time > 0 && time_through_queue > Config.max_time 
+        queue_limits = Config.max_queue > 0 && jobs_in_queue > Config.max_queue
+        time_limits || queue_limits
+      end
+    
+      def scale_down?(time_through_queue, jobs_in_queue)
+        time_limits =  Config.max_time > 0 && time_through_queue < (Config.max_time/2)
+        queue_limits = Config.max_queue > 0 && jobs_in_queue < (Config.max_queue/2) 
+        (Config.max_time <= 0 || time_limits) && (Config.max_queue <= 0 || queue_limits)
+      end
     end
   end
 end

data/lib/resque-director.rb

@@ -4,4 +4,4 @@ require 'resque/plugins/director'
 require 'resque/plugins/director/worker_tracker'
 require 'resque/plugins/director/config'
 require 'resque/plugins/director/scaler'
-require 'resque/plugins/director/lifecycle'
+require 'resque/plugins/director/extra_hooks'

data/resque-director.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{resque-director}
-  s.version = "1.1.0"
+  s.version = "2.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Nolan Frausto}]
-  s.date = %q{2011-08-23}
+  s.date = %q{2011-08-24}
   s.description = %q{resque plugin for dynamically adding/removing workers to a queue}
   s.email = %q{nrfrausto@gmail.com}
   s.extra_rdoc_files = [
@@ -27,18 +27,18 @@ Gem::Specification.new do |s|
     "lib/resque-director.rb",
     "lib/resque/plugins/director.rb",
     "lib/resque/plugins/director/config.rb",
-    "lib/resque/plugins/director/lifecycle.rb",
+    "lib/resque/plugins/director/extra_hooks.rb",
     "lib/resque/plugins/director/scaler.rb",
     "lib/resque/plugins/director/worker_tracker.rb",
     "resque-director.gemspec",
     "spec/redis-test.conf",
     "spec/resque/plugins/director/config_spec.rb",
-    "spec/resque/plugins/director/lifecycle_spec.rb",
+    "spec/resque/plugins/director/extra_hooks_spec.rb",
     "spec/resque/plugins/director/scaler_spec.rb",
     "spec/resque/plugins/director/worker_tracker_spec.rb",
     "spec/resque/plugins/director_spec.rb",
     "spec/spec_helper.rb",
-    "spec/support/test_job.rb"
+    "spec/support/jobs.rb"
   ]
   s.homepage = %q{http://github.com/frausto/resque-director}
   s.licenses = [%q{MIT}]

data/spec/resque/plugins/director/extra_hooks_spec.rb

@@ -0,0 +1,46 @@
+require 'spec_helper'
+
+describe Resque::Plugins::Director::ExtraHooks do
+  subject { Resque::Plugins::Director::ExtraHooks }
+  
+  before do
+    Resque::Plugins::Director::Config.queue = "test"
+    @now = Time.now
+    Time.stub(:now => @now)
+    @timestamp = @now.utc.to_i
+  end
+  
+  describe "#push" do
+    it "should add the start timestamp to the end of the job" do
+      Resque.enqueue(TestJob, "arg1")
+      Resque.redis.lindex("queue:test",0).should =~ /^\{.*\"created_at\":#{@timestamp}/
+    end
+  end
+  
+  describe "#pop" do
+    it "should direct workers using the timestamp" do
+      Resque.enqueue(TestJob, "arg1")
+      expected_time = Time.at(@timestamp).utc
+      TestJob.should_receive(:after_pop_direct_workers).with(expected_time)
+      Resque.pop("test").should == {"args"=>["arg1"], "class"=>"TestJob", "created_at"=>@timestamp}
+    end
+    
+    it "should direct workers with current time if no start time" do
+      Resque.should_receive(:original_pop).and_return({'args' => [], 'class' => 'TestJob'})
+      TestJob.should_receive(:after_pop_direct_workers).with(@now)
+      Resque.pop("test").should == {"args"=>[], "class"=>"TestJob"}
+    end
+    
+    it "should not direct workers if the job is not directed" do
+      Resque.enqueue(NonDirectedTestJob, "arg1")
+      NonDirectedTestJob.should_not_receive(:after_pop_direct_workers)
+      Resque.pop("non_directed").should include({"args"=>["arg1"], "class"=>"NonDirectedTestJob"})
+    end
+    
+    it "should return the job properly if an exception is thrown in the direction logic" do
+      Resque.enqueue(TestJob, "arg1")
+      TestJob.should_receive(:after_pop_direct_workers).and_throw(:Exception)
+      Resque.pop("test").should include({"args"=>["arg1"], "class"=>"TestJob"})
+    end
+  end
+end

data/spec/resque/plugins/director/scaler_spec.rb

@@ -25,8 +25,9 @@ describe Resque::Plugins::Director::Scaler do
     end
     
     it "should override the entire comand" do
-      Resque::Plugins::Director::Config.setup(:start_override => "run this")
-      subject.should_receive(:system).with("run this")
+      test_block = lambda {|queue| }
+      Resque::Plugins::Director::Config.setup :start_override => test_block
+      test_block.should_receive(:call).with("test")
       subject.scale_up
     end
   end
@@ -135,12 +136,14 @@ describe Resque::Plugins::Director::Scaler do
       subject.send(:stop, tracker, 1)
     end
     
-    it "should use the stop command to stop a worker if set" do
-      Resque::Plugins::Director::Config.setup :stop_override => "run this", :min_workers => 0
+    it "should use the stop block to stop a worker if set" do
+      test_block = lambda {|queue| }
+      Resque::Plugins::Director::Config.setup :stop_override => test_block, :min_workers => 0
+      
       Resque.should_receive(:workers).and_return [@worker]
       tracker = Resque::Plugins::Director::WorkerTracker.new
       
-      subject.should_receive(:system).with("run this")
+      test_block.should_receive(:call).with("test")
       Process.should_not_receive(:kill)
       subject.send(:stop, tracker, 1)
     end
@@ -174,12 +177,14 @@ describe Resque::Plugins::Director::Scaler do
     end
     
     it "ignores hostname if using custom stop script" do
-      Resque::Plugins::Director::Config.setup :stop_override => "run this", :min_workers => 0
+      test_block = lambda {|queue| }
+      Resque::Plugins::Director::Config.setup :stop_override => test_block, :min_workers => 0
+      
       @worker.stub!(:hostname => "different_machine")
       Resque.should_receive(:workers).and_return [@worker]
       tracker = Resque::Plugins::Director::WorkerTracker.new
       
-      subject.should_receive(:system).with("run this")
+      test_block.should_receive(:call).with("test")
       Process.should_not_receive(:kill)
       subject.send(:stop, tracker, 1)
     end

data/spec/resque/plugins/director_spec.rb

@@ -48,50 +48,50 @@ describe Resque::Plugins::Director do
     end
   end
   
-  describe "#before_perform_direct_workers" do
+  describe "#after_pop_direct_workers" do
     describe "with time" do
       before do
-        @start_time = {:resdirecttime => (Time.now - 10).utc.to_i}
+        @start_time = (Time.now - 10).utc
       end
       
       it "should set the queue if not set" do
         TestJob.direct :max_time => 20
         Resque::Plugins::Director::Config.queue = nil
-        TestJob.before_perform_direct_workers(@start_time)
+        TestJob.after_pop_direct_workers(@start_time)
         Resque::Plugins::Director::Config.queue.should == "test"
       end
     
       it "should not start workers if max_time is not set" do
         Resque::Plugins::Director::Scaler.should_not_receive(:scale_up)
-        TestJob.before_perform_direct_workers(@start_time)
+        TestJob.after_pop_direct_workers(@start_time)
       end 
     
       it "should not start a worker if the time since it took is less than max_time" do
         TestJob.direct :max_time => 20
       
         Resque::Plugins::Director::Scaler.should_not_receive(:scale_up)
-        TestJob.before_perform_direct_workers(@start_time)
+        TestJob.after_pop_direct_workers(@start_time)
       end
     
       it "should add a worker if the time it takes the job to go through the queue is too long" do
         TestJob.direct :max_time => 5
         Resque::Plugins::Director::Scaler.should_receive(:scale_up)
       
-        TestJob.before_perform_direct_workers(@start_time)
+        TestJob.after_pop_direct_workers(@start_time)
       end
       
       it "should remove a worker if the queue time is below half the max" do
         TestJob.direct :max_time => 25
         
         Resque::Plugins::Director::Scaler.should_receive(:scale_down)
-        TestJob.before_perform_direct_workers(@start_time)
+        TestJob.after_pop_direct_workers(@start_time)
       end
     end
     
     describe "with queue length" do
       it "should not start workers if max_queue is not set" do
         Resque::Plugins::Director::Scaler.should_not_receive(:scale_up)
-        TestJob.before_perform_direct_workers
+        TestJob.after_pop_direct_workers
       end
       
       it "should not start worker if the queue length is less than max_queue" do
@@ -99,7 +99,7 @@ describe Resque::Plugins::Director do
         Resque.enqueue(TestJob)
       
         Resque::Plugins::Director::Scaler.should_not_receive(:scale_up)
-        TestJob.before_perform_direct_workers
+        TestJob.after_pop_direct_workers
       end
       
       it "should start worker if the queue length is greater than max_queue" do
@@ -107,7 +107,7 @@ describe Resque::Plugins::Director do
         2.times { Resque.enqueue(TestJob) }
       
         Resque::Plugins::Director::Scaler.should_receive(:scale_up)
-        TestJob.before_perform_direct_workers
+        TestJob.after_pop_direct_workers
       end
       
       it "should remove a worker if the queue length is below half the max" do
@@ -115,13 +115,13 @@ describe Resque::Plugins::Director do
         1.times { Resque.enqueue(TestJob) }
         
         Resque::Plugins::Director::Scaler.should_receive(:scale_down)
-        TestJob.before_perform_direct_workers
+        TestJob.after_pop_direct_workers
       end
     end
     
     describe "with length and time" do
       before do
-        @start_time = {:resdirecttime => (Time.now - 10).utc.to_i}
+        @start_time = (Time.now - 10).utc
       end
       
       it "should add worker if only time constraint fails" do
@@ -129,7 +129,7 @@ describe Resque::Plugins::Director do
         Resque.enqueue(TestJob)
         Resque::Plugins::Director::Scaler.should_receive(:scale_up)
       
-        TestJob.before_perform_direct_workers(@start_time)
+        TestJob.after_pop_direct_workers(@start_time)
       end
       
       it "should add worker if only queue length constraint fails" do
@@ -137,7 +137,7 @@ describe Resque::Plugins::Director do
         2.times { Resque.enqueue(TestJob) }
       
         Resque::Plugins::Director::Scaler.should_receive(:scale_up)
-        TestJob.before_perform_direct_workers
+        TestJob.after_pop_direct_workers
       end
       
       it "should not scale down if a worker is being scaled up due to time" do
@@ -146,7 +146,7 @@ describe Resque::Plugins::Director do
 
         Resque::Plugins::Director::Scaler.should_receive(:scale_up)
         Resque::Plugins::Director::Scaler.should_not_receive(:scale_down)
-        TestJob.before_perform_direct_workers(@start_time)
+        TestJob.after_pop_direct_workers(@start_time)
       end
       
       it "should not scale down if a worker is being scaled up due to queue" do
@@ -155,7 +155,7 @@ describe Resque::Plugins::Director do
 
         Resque::Plugins::Director::Scaler.should_receive(:scale_up)
         Resque::Plugins::Director::Scaler.should_not_receive(:scale_down)
-        TestJob.before_perform_direct_workers
+        TestJob.after_pop_direct_workers
       end
       
       it "should not scale if only one limit is met" do
@@ -164,35 +164,13 @@ describe Resque::Plugins::Director do
 
         Resque::Plugins::Director::Scaler.should_not_receive(:scale_up)
         Resque::Plugins::Director::Scaler.should_not_receive(:scale_down)
-        TestJob.before_perform_direct_workers(@start_time)
+        TestJob.after_pop_direct_workers(@start_time)
       end
       
       it "should not scale if no configuration options are set" do
         Resque::Plugins::Director::Scaler.should_not_receive(:scale_up)
         Resque::Plugins::Director::Scaler.should_not_receive(:scale_down)
-        TestJob.before_perform_direct_workers
-      end
-    end
-    
-    describe "crazy meta custom_perform" do      
-      it "should strip out the timestamp from the args before calling the original perform" do
-        TestJob.should_receive(:original_perform).with("arg")
-        TestJob.perform("arg", {:resdirecttime => 1234})
-      end
-      
-      it "should strip out timestamp if it is not a symbol" do
-        TestJob.should_receive(:original_perform).with("arg")
-        TestJob.perform("arg", {'resdirecttime' => 1234})
-      end
-      
-      it "should not strip out any args if timestamp does not exist" do
-        TestJob.should_receive(:original_perform).with("arg", {:test => 123})
-        TestJob.perform("arg", {:test => 123})
-      end
-      
-      it "should  not strip out any args if timestamp does not exist" do
-        TestJob.should_receive(:original_perform).with("arg")
-        TestJob.perform("arg")
+        TestJob.after_pop_direct_workers
       end
     end
   end

data/spec/support/jobs.rb

@@ -0,0 +1,14 @@
+class TestJob
+  extend Resque::Plugins::Director
+  @queue = :test
+
+  def self.perform
+  end
+end
+
+class NonDirectedTestJob
+  @queue = :non_directed
+
+  def self.perform
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: resque-director
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 15
   prerelease: 
   segments: 
-  - 1
-  - 1
+  - 2
   - 0
-  version: 1.1.0
+  - 0
+  version: 2.0.0
 platform: ruby
 authors: 
 - Nolan Frausto
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-23 00:00:00 Z
+date: 2011-08-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement 
@@ -115,18 +115,18 @@ files:
 - lib/resque-director.rb
 - lib/resque/plugins/director.rb
 - lib/resque/plugins/director/config.rb
-- lib/resque/plugins/director/lifecycle.rb
+- lib/resque/plugins/director/extra_hooks.rb
 - lib/resque/plugins/director/scaler.rb
 - lib/resque/plugins/director/worker_tracker.rb
 - resque-director.gemspec
 - spec/redis-test.conf
 - spec/resque/plugins/director/config_spec.rb
-- spec/resque/plugins/director/lifecycle_spec.rb
+- spec/resque/plugins/director/extra_hooks_spec.rb
 - spec/resque/plugins/director/scaler_spec.rb
 - spec/resque/plugins/director/worker_tracker_spec.rb
 - spec/resque/plugins/director_spec.rb
 - spec/spec_helper.rb
-- spec/support/test_job.rb
+- spec/support/jobs.rb
 homepage: http://github.com/frausto/resque-director
 licenses: 
 - MIT

data/lib/resque/plugins/director/lifecycle.rb

@@ -1,35 +0,0 @@
-module Resque
-  module Plugins
-    module Director
-      module Lifecycle
-
-        def self.included(base) #:nodoc:
-          base.class_eval do
-            alias_method :push_without_lifecycle, :push
-            extend ClassMethods
-          end
-        end
-
-        module ClassMethods 
-          def push(queue, item)
-            begin
-              if item.respond_to?(:[]=)
-                job_class =  constantize(item[:class] || item['class'])
-                if job_class && job_class.ancestors.include?(Resque::Plugins::Director)
-                  timestamp = {'resdirecttime' => Time.now.utc.to_i}
-                  item[:args] = item[:args].push(timestamp)
-                end
-              end
-            rescue
-            end
-            push_without_lifecycle queue, item
-          end
-        end
-      end
-    end
-  end
-end
-
-module Resque
-  include Resque::Plugins::Director::Lifecycle
-end

data/spec/resque/plugins/director/lifecycle_spec.rb

@@ -1,38 +0,0 @@
-require 'spec_helper'
-
-class TestNonDirectedJob
-  @queue = :non_direct
-  def self.perform
-  end
-end
-
-describe Resque::Plugins::Director::Lifecycle do
-  subject { Resque::Plugins::Director::Lifecycle }
-  
-  before do
-    Resque::Plugins::Director::Config.queue = "test"
-  end
-  
-  describe "#lifecycle" do
-    it "should add the jobs timestamp at the end of the job args" do
-      now = Time.now
-      Time.stub(:now => now)
-      time_stamp = now.utc.to_i
-      
-      Resque.enqueue(TestJob, "arg1")
-      Resque.pop("test").should == {"args"=>["arg1", {'resdirecttime' => time_stamp}], "class"=>"TestJob"}
-    end
-    
-    it "should not add job timestamps to non directed jobs" do
-      Resque.enqueue(TestNonDirectedJob, "arg1")
-      Resque.pop("non_direct").should == {"args"=>["arg1"], "class"=>"TestNonDirectedJob"}
-    end
-    
-    it "should not add job timestamps that throw exceptions to direction logic" do
-      TestNonDirectedJob.stub(:ancestors).and_throw(:Exception)
-      Resque.enqueue(TestNonDirectedJob, "arg1")
-      
-      Resque.pop("non_direct").should == {"args"=>["arg1"], "class"=>"TestNonDirectedJob"}
-    end
-  end
-end

data/spec/support/test_job.rb

@@ -1,7 +0,0 @@
-class TestJob
-  include Resque::Plugins::Director
-  @queue = :test
-
-  def self.perform
-  end
-end