resque-multi-step 2.0.1 → 2.0.2

data/Rakefile

@@ -31,7 +31,7 @@ RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec
 
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 

data/VERSION

@@ -1 +1 @@
-2.0.1
+2.0.2

data/lib/resque/plugins/multi_step_task/atomic_counters.rb

@@ -6,6 +6,7 @@ module Resque
           class_eval <<-INCR
             def increment_#{name}
               redis.incrby('#{name}', 1)
+              logger.info("[Resque Multi-Step-Task] Incremented #{name}")
             end
             INCR
 

data/lib/resque/plugins/multi_step_task/finalization_job.rb

@@ -17,10 +17,11 @@ module Resque
             klass.singleton_class.class_eval "def multi_step_task_id; @@task_id ||= '#{task_id}'; end"
             klass.perform(*args)
           rescue Exception
+            logger.info("[Resque Multi-Step-Task] Incrementing failed_count: Finalization job #{job_module_name} failed for task id #{task_id} at #{Time.now} (args: #{args})")
             task.increment_failed_count
             raise
           end
-          
+          logger.info("[Resque Multi-Step-Task] Incrementing completed_count: Finalization job #{job_module_name} completed for task id #{task_id} at #{Time.now} (args: #{args})")          
           task.increment_completed_count
 
           if fin_job_info = task.redis.lpop('finalize_jobs')
@@ -33,6 +34,10 @@ module Resque
           end
 
         end
+        
+        def self.logger
+          Resque::Plugins::MultiStepTask.logger
+        end
       end
     end
   end

data/lib/resque/plugins/multi_step_task.rb

@@ -115,9 +115,11 @@ module Resque
             logger.debug("[Resque Multi-Step-Task] Finished executing #{job_module_name} job for #{task_id} at #{Time.now}, taking #{(Time.now - start_time)} seconds.")
           rescue Exception => e
             logger.error("[Resque Multi-Step-Task] #{job_module_name} job failed for #{task_id} at #{Time.now} (args: #{args})")
+            logger.info("[Resque Multi-Step-Task] Incrementing failed_count: #{job_module_name} job failed for task id #{task_id} at #{Time.now} (args: #{args})")
             task.increment_failed_count
             raise
           end
+          logger.info("[Resque Multi-Step-Task] Incrementing completed_count: #{job_module_name} job completed for task id #{task_id} at #{Time.now} (args: #{args})")
           task.increment_completed_count
           task
         end
@@ -149,6 +151,7 @@ module Resque
           @@synchronous
         end
         @@synchronous = false
+
       end
 
       def synchronous?
@@ -210,6 +213,8 @@ module Resque
       #
       # @param [Class,Module] job_type The type of the job to be performed.
       def add_job(job_type, *args)
+        logger.info("[Resque Multi-Step-Task] Incrementing normal_job_count: #{job_type} job added to task id #{task_id} at #{Time.now} (args: #{args})")
+        
         increment_normal_job_count
         logger.debug("[Resque Multi-Step-Task] Adding #{job_type} job for #{task_id} (args: #{args})")
 
@@ -226,6 +231,7 @@ module Resque
       #
       # @param [Class,Module] job_type The type of job to be performed.
       def add_finalization_job(job_type, *args)
+        logger.info("[Resque Multi-Step-Task] Incrementing finalize_job_count: Finalization job #{job_type} for task id #{task_id} at #{Time.now} (args: #{args})")
         increment_finalize_job_count
         logger.debug("[Resque Multi-Step-Task] Adding #{job_type} finalization job for #{task_id} (args: #{args})")
 

data/resque-multi-step.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "resque-multi-step"
-  s.version = "2.0.1"
+  s.version = "2.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Peter Williams", "Morgan Whitney"]
-  s.date = "2012-09-13"
+  s.date = "2013-04-03"
   s.description = "Provides multi-step tasks with finalization and progress tracking"
   s.email = "pezra@barelyenough.org"
   s.extra_rdoc_files = [
@@ -42,19 +42,21 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/pezra/resque-multi-step"
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.16"
+  s.rubygems_version = "1.8.24"
   s.summary = "Provides multi-step tasks with finalization and progress tracking"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<resque-multi-step>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_runtime_dependency(%q<redis-namespace>, [">= 0"])
       s.add_runtime_dependency(%q<yajl-ruby>, [">= 0"])
       s.add_runtime_dependency(%q<resque>, [">= 0"])
       s.add_runtime_dependency(%q<resque-fairly>, [">= 0"])
     else
+      s.add_dependency(%q<resque-multi-step>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<redis-namespace>, [">= 0"])
       s.add_dependency(%q<yajl-ruby>, [">= 0"])
@@ -62,6 +64,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<resque-fairly>, [">= 0"])
     end
   else
+    s.add_dependency(%q<resque-multi-step>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<redis-namespace>, [">= 0"])
     s.add_dependency(%q<yajl-ruby>, [">= 0"])

data/spec/acceptance/job_handling_spec.rb

@@ -143,6 +143,7 @@ describe "Acceptance: Task needing to reference the original Multi-Step-Task" do
   end
 
   it "completes successfully and removes the queue" do 
+    5.times {sleep 1 if Resque::Failure.count < 1}
     Resque.queues.should_not include(task.queue_name)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque-multi-step
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,27 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-13 00:00:00.000000000Z
+date: 2013-04-03 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: resque-multi-step
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2151907460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +38,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151907460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: redis-namespace
-  requirement: &2151904820 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +54,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151904820
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &2151902620 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +70,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151902620
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: &2151899640 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +86,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151899640
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: resque-fairly
-  requirement: &2151897360 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,7 +102,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151897360
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Provides multi-step tasks with finalization and progress tracking
 email: pezra@barelyenough.org
 executables: []
@@ -117,8 +158,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.16
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Provides multi-step tasks with finalization and progress tracking
 test_files: []
+has_rdoc: