resque-multi-step 2.0.6 → 2.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a265877ea8a413f7070d24539c08d7cd63eab3f
-  data.tar.gz: a132e3e4e8cef3b95b57ba84d000536f7cb003c7
+  metadata.gz: df39997beea740b98549e87d7405f1a17c95dd3b
+  data.tar.gz: 72cc72d49e4efc972b766c8666396c4f8cece360
 SHA512:
-  metadata.gz: 32a9bd6de76fc719fdb5eeab19cd0b6c65ae8c88e11b07815e52cf258a3210eedc4354abf6e55fd8b6ad100b613ee6071a5ab069934a85b8ea9d3cdf565d0c84
-  data.tar.gz: 198d5a3711bd30ad8986c196bd7ef9e165daa0743fcce09356487ffec67da78f2e36b210f16f0b5521e6a7188352a85623a745c3502b9cfb3b17fc290819d9d2
+  metadata.gz: 97523b06a455bebe45719e257107cc135d795cc3cee846646d4ae32038671dfff9b330ad96901117e6949de89e2b796e3c8a49aec9314a5843c9526eaa509e64
+  data.tar.gz: 89f819793f82d9eb02cadc2007fde22a9736c336c24dad5b06386ebcd9eba46a35032c8e603eae65aadb10e411c210e8d02e33c6194a695fb9c9941953fa4933

data/VERSION

@@ -1 +1 @@
-2.0.6
+2.0.8

data/lib/resque/plugins/multi_step_task.rb

@@ -69,7 +69,7 @@ module Resque
             mst.finalizable!
           end
           
-          mst.start
+          mst
         end
 
         # Prevent calling MultiStepTask.new
@@ -160,7 +160,6 @@ module Resque
       include Constantization
 
       attr_reader :task_id
-      attr_reader :started
       attr_accessor :logger
 
       extend AtomicCounters
@@ -179,8 +178,7 @@ module Resque
       # @param [String] task_id The UUID of the group of interest.
       def initialize(task_id)
         @task_id = task_id
-        @started = @@synchronous
-        redis.set 'start-time', Time.now.to_i
+        redis.setnx 'start-time', Time.now.to_i
       end
 
       def logger
@@ -217,8 +215,11 @@ module Resque
         increment_normal_job_count
         logger.debug("[Resque Multi-Step-Task] Adding #{job_type} job for #{task_id} (args: #{args})")
 
-        redis.rpush 'normal_jobs', Yajl::Encoder.encode([job_type.to_s, *args])
-        run_job job_type, *args if started
+        if synchronous?
+          self.class.perform(task_id, job_type.to_s, *args)
+        else
+          Resque::Job.create(queue_name, self.class, task_id, job_type.to_s, *args)
+        end
       end
 
       # Finalization jobs are performed after all the normal jobs
@@ -234,25 +235,6 @@ module Resque
         redis.rpush 'finalize_jobs', Yajl::Encoder.encode([job_type.to_s, *args])
       end
 
-      def start
-        unless started
-          while nrm_job_info = redis.lpop('normal_jobs')
-            job_class, *args = Yajl::Parser.parse(nrm_job_info)
-            run_job(job_class, *args)
-          end
-          @started = true
-        end
-        self
-      end
-
-      def run_job(job_type, *args)
-        if synchronous?
-          self.class.perform(task_id, job_type.to_s, *args)
-        else
-          Resque::Job.create(queue_name, self.class, task_id, job_type.to_s, *args)
-        end
-      end
-
       # A multi-step task is finalizable when all the normal jobs (see
       # #add_job) have been registered.  Finalization jobs will not be
       # executed until the task becomes finalizable regardless of the
@@ -270,7 +252,9 @@ module Resque
           # finalization happens after normal jobs, but in the wierd case where 
           # there are only finalization jobs, we need to add a fake normal job
           # that just kicks off the finalization process
-          assure_finalization if normal_job_count == 0
+          #
+          # due to race conditions, always assure finalization - DCM
+          assure_finalization #if normal_job_count == 0
         end
       end
       

data/resque-multi-step.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "resque-multi-step"
-  s.version = "2.0.6"
+  s.version = "2.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Peter Williams", "Morgan Whitney", "Cameron Mauch"]
-  s.date = "2014-09-10"
+  s.date = "2014-09-18"
   s.description = "Provides multi-step tasks with finalization and progress tracking"
   s.email = "pezra@barelyenough.org"
   s.extra_rdoc_files = [

data/spec/acceptance/job_handling_spec.rb

@@ -168,3 +168,46 @@ describe "Acceptance: Finalization always runs" do
     Resque.redis.get("testing counter").to_i.should == 3
   end
 end
+
+describe "Acceptance: Finalization always runs without block" do
+  let(:task) do
+    Resque::Plugins::MultiStepTask.create("testing")
+  end
+
+  before do
+    Resque.redis.del "testing"
+    task
+    task.add_job MultiStepAcceptance::CounterJob, "testing counter"
+    task.add_job MultiStepAcceptance::CounterJob, "testing counter"
+    task.add_finalization_job MultiStepAcceptance::CounterJob, "testing counter"
+    sleep 1
+    task.finalizable!
+    sleep 1
+  end
+
+  it 'should run normal jobs and finalization job' do
+    Resque.redis.get("testing counter").to_i.should == 3
+  end
+end
+
+describe "Acceptance: add job to multi step task via find" do
+  let(:task) do
+    Resque::Plugins::MultiStepTask.create("testing") do |task|
+      task.add_job MultiStepAcceptance::CounterJob, "testing add job"
+      task.add_job MultiStepAcceptance::WaitJob, 2
+    end
+  end
+
+  before do
+    Resque.redis.del "testing"
+    task
+    sleep 1
+    task2 = Resque::Plugins::MultiStepTask.find(task.task_id)
+    task2.add_job MultiStepAcceptance::CounterJob, "testing add job"
+    sleep 1
+  end
+
+  it 'should run added jobs' do
+    Resque.redis.get("testing add job").to_i.should == 2
+  end
+end

data/spec/resque/plugins/multi_step_task_spec.rb

@@ -44,7 +44,7 @@ module  Resque::Plugins
   end
 
   describe MultiStepTask do 
-    let(:task) {MultiStepTask.create("some-task").start}
+    let(:task) {MultiStepTask.create("some-task")}
 
     it "allows jobs to be added to task" do 
       lambda {
@@ -57,6 +57,11 @@ module  Resque::Plugins
       task.add_job(TestJob)
     end
 
+    it "queues job when added to async task obtained via find" do
+      Resque::Job.should_receive(:create).with(task.queue_name, Resque::Plugins::MultiStepTask, task.task_id, 'TestJob')
+      Resque::Plugins::MultiStepTask.find(task.task_id).add_job(TestJob)
+    end
+
     it "allows finalization jobs to be added" do 
       task.add_finalization_job(TestJob)
     end
@@ -86,7 +91,7 @@ module  Resque::Plugins
   end
 
   describe MultiStepTask, "synchronous mode" do 
-    let(:task){MultiStepTask.create("some-task").start}
+    let(:task){MultiStepTask.create("some-task")}
 
     before do 
       MultiStepTask.mode = :sync

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque-multi-step
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.0.8
 platform: ruby
 authors:
 - Peter Williams
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-10 00:00:00.000000000 Z
+date: 2014-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque-multi-step