resque-multi-step 1.1.0 → 1.1.1

data/Rakefile

@@ -13,7 +13,8 @@ begin
 
     gem.add_development_dependency "rspec", ">= 1.2.9"
 
-    gem.add_dependency 'redis-namespace', '~> 0.8.0'
+    gem.add_dependency 'redis-namespace', '>= 0.8.0', '<= 0.10.0'
+    gem.add_dependency 'yajl-ruby'
     gem.add_dependency 'resque', '~> 1.10'
     gem.add_dependency 'resque-fairly', '~> 1.0'
 

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.1.1

data/lib/resque/plugins/multi_step_task.rb

@@ -4,18 +4,19 @@ require 'resque/plugins/multi_step_task/assure_finalization'
 require 'resque/plugins/multi_step_task/finalization_job'
 require 'resque/plugins/multi_step_task/constantization'
 require 'resque/plugins/multi_step_task/atomic_counters'
+require 'logger'
+require 'yajl'
 
 module Resque
   module Plugins
+    # @attr_reader normal_job_count
+    # @attr_reader finalize_job_count
+    # @attr_reader completed_count
+    # @attr_reader failed_count
     class MultiStepTask
       class NoSuchMultiStepTask < StandardError; end
       class NotReadyForFinalization < StandardError; end
       class FinalizationAlreadyBegun < StandardError; end
-      class StdOutLogger
-        def warn(*args); puts args; end
-        def info(*args); puts args; end
-        def debug(*args); puts args; end
-      end
 
       class << self
         include Constantization
@@ -62,7 +63,7 @@ module Resque
           redis.sadd("active-tasks", task_id)
           redis.sismember("active-tasks", task_id)
           if block_given?
-            yield pjg
+            yield mst
             mst.finalizable!
           end
           
@@ -94,14 +95,13 @@ module Resque
         def perform_without_maybe_finalize(task_id, job_module_name, *args)
           task = MultiStepTask.find(task_id)
           begin
-            job_start_key = "#{task_id}_#{job_module_name}_#{args}-start-time-#{nonce}"
-            task.redis.set(job_start_key, Time.now.to_i)
-            logger.debug("[Resque Multi-Step-Task] Executing #{job_module_name} job for #{task_id} at #{Time.now} (args: #{args})")
+            start_time = Time.now
+            logger.debug("[Resque Multi-Step-Task] Executing #{job_module_name} job for #{task_id} at #{start_time} (args: #{args})")
 
             # perform the task
             constantize(job_module_name).perform(*args)
 
-            logger.debug("[Resque Multi-Step-Task] Finished executing #{job_module_name} job for #{task_id} at #{Time.now}, taking #{(Time.now - task.redis.get(job_start_key).to_i).to_i} seconds.")
+            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})")
             task.increment_failed_count
@@ -120,7 +120,7 @@ module Resque
         end
 
         def logger
-          @@logger ||= RAILS_DEFAULT_LOGGER || StdOutLogger.new
+          @@logger ||= Logger.new(STDERR)
         end
 
         # Normally jobs that are part of a multi-step task are run
@@ -154,9 +154,11 @@ module Resque
       extend AtomicCounters
 
       counter :normal_job_count
+
       counter :finalize_job_count
 
       counter :completed_count
+
       counter :failed_count
 
 

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

@@ -9,7 +9,6 @@ module Resque
 
         # Handle job invocation
         def self.perform(task_id, job_module_name, *args)
-#          puts "finalizationjob#perform(#{task_id.inspect}, #{job_module_name.inspect}, #{args.inspect})"
           task = MultiStepTask.find(task_id)
           
           begin

data/resque-multi-step.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{resque-multi-step}
-  s.version = "1.1.0"
+  s.version = "1.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Peter Williams", "Morgan Whitney"]
-  s.date = %q{2011-02-18}
+  s.date = %q{2011-02-28}
   s.description = %q{Provides multi-step tasks with finalization and progress tracking}
   s.email = %q{pezra@barelyenough.org}
   s.extra_rdoc_files = [
@@ -59,18 +59,21 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_runtime_dependency(%q<redis-namespace>, ["~> 0.8.0"])
+      s.add_runtime_dependency(%q<redis-namespace>, [">= 0.8.0", "<= 0.10.0"])
+      s.add_runtime_dependency(%q<yajl-ruby>, [">= 0"])
       s.add_runtime_dependency(%q<resque>, ["~> 1.10"])
       s.add_runtime_dependency(%q<resque-fairly>, ["~> 1.0"])
     else
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_dependency(%q<redis-namespace>, ["~> 0.8.0"])
+      s.add_dependency(%q<redis-namespace>, [">= 0.8.0", "<= 0.10.0"])
+      s.add_dependency(%q<yajl-ruby>, [">= 0"])
       s.add_dependency(%q<resque>, ["~> 1.10"])
       s.add_dependency(%q<resque-fairly>, ["~> 1.0"])
     end
   else
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
-    s.add_dependency(%q<redis-namespace>, ["~> 0.8.0"])
+    s.add_dependency(%q<redis-namespace>, [">= 0.8.0", "<= 0.10.0"])
+    s.add_dependency(%q<yajl-ruby>, [">= 0"])
     s.add_dependency(%q<resque>, ["~> 1.10"])
     s.add_dependency(%q<resque-fairly>, ["~> 1.0"])
   end

data/spec/acceptance/job_handling_spec.rb

@@ -89,22 +89,24 @@ end
 
 describe "Acceptance: Task with retried finalization failure" do 
   let(:task) {
-    Resque.redis.del "testing counter"
+    @counter_key = "testing-counter-#{Time.now.to_i}"
+    @fin_key = "fin-key-#{Time.now.to_i}"
+    Resque.redis.del @counter_key
+    Resque.redis.del @fin_key
     Resque::Plugins::MultiStepTask.create("testing") do |task|
-      task.add_finalization_job MultiStepAcceptance::FailOnceJob, "fin-job"
-      task.add_finalization_job MultiStepAcceptance::CounterJob,"testing counter"
+      task.add_finalization_job MultiStepAcceptance::FailOnceJob, @fin_key
+      task.add_finalization_job MultiStepAcceptance::CounterJob, @counter_key
     end
   }
 
   before do
     Resque::Failure.clear
-    Resque.redis.del "testing counter"
-    
+
     task
-    sleep 1
-    
+    sleep 5
+
     Resque::Failure.requeue 0
-    sleep 1
+    sleep 5
   end
 
   it "completes task" do 
@@ -115,7 +117,7 @@ describe "Acceptance: Task with retried finalization failure" do
 
 
   it "runs following finalization jobs" do 
-    Resque.redis.get("testing counter").to_i.should == 1
+    Resque.redis.get(@counter_key).should == "1"
   end
   
 end

data/spec/resque/plugins/multi_step_task_spec.rb

@@ -123,7 +123,8 @@ module  Resque::Plugins
       task.add_finalization_job(MyFinalJob, "final", "args")
       task.add_job(TestJob, "my", "args") rescue nil
       task.finalizable!
-      task.should be_incomplete_because_of_errors
+
+      task.should be_incomplete_because_of_error
     end
 
     it "knows it has failed if a finalized job raises an exception" do

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: resque-multi-step
 version: !ruby/object:Gem::Version 
-  hash: 19
   prerelease: false
   segments: 
   - 1
   - 1
-  - 0
-  version: 1.1.0
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - Peter Williams
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-18 00:00:00 -07:00
+date: 2011-02-28 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,7 +26,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 13
         segments: 
         - 1
         - 2
@@ -41,46 +39,63 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 63
         segments: 
         - 0
         - 8
         - 0
         version: 0.8.0
+    - - <=
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 10
+        - 0
+        version: 0.10.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: resque
+  name: yajl-ruby
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: resque
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
         segments: 
         - 1
         - 10
         version: "1.10"
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: resque-fairly
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
         - 1
         - 0
         version: "1.0"
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id005
 description: Provides multi-step tasks with finalization and progress tracking
 email: pezra@barelyenough.org
 executables: []
@@ -126,7 +141,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -135,7 +149,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"