resque-multi-step 1.0.0 → 1.0.1

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Peter Williams
+Copyright (c) OpenLogic, Peter Williams
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -111,6 +111,13 @@ Note on Patches/Pull Requests
   (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
 * Send me a pull request. Bonus points for topic branches.
 
+Mailing List
+----
+
+To join the list simply send an email to <mailto:resquemultistep@librelist.com>. This will subscribe you and send you information about your subscription, including unsubscribe information.
+
+The archive can be found at <http://librelist.com/browser/resquemultistep/>.
+
 Copyright
 -----
 

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1

data/lib/resque/plugins/multi_step_task.rb

@@ -82,6 +82,11 @@ module Resque
 
         # Handle job invocation
         def perform(task_id, job_module_name, *args)
+          task = perform_without_maybe_finalize(task_id, job_module_name, *args)
+          task.maybe_finalize
+        end
+
+        def perform_without_maybe_finalize(task_id, job_module_name, *args)
           task = MultiStepTask.find(task_id)
           begin
             constantize(job_module_name).perform(*args)
@@ -89,9 +94,12 @@ module Resque
             task.increment_failed_count
             raise
           end
-
           task.increment_completed_count
-          task.maybe_finalize
+          task
+        end
+
+        def perform_finalization(task_id, job_module_name, *args)
+          perform_without_maybe_finalize(task_id, job_module_name, *args)
         end
 
         # Normally jobs that are part of a multi-step task are run
@@ -219,7 +227,6 @@ module Resque
         
         if synchronous?
           sync_finalize!
-
         else
           if fin_job_info = redis.lpop('finalize_jobs')
             fin_job_info = Yajl::Parser.parse(fin_job_info)
@@ -234,16 +241,15 @@ module Resque
       def sync_finalize!
         while fin_job_info = redis.lpop('finalize_jobs')
           job_class_name, *args = Yajl::Parser.parse(fin_job_info)
-          self.class.perform(task_id, job_class_name, *args)
+          self.class.perform_finalization(task_id, job_class_name, *args)
         end
+        nuke
       end
 
       # Execute finalization sequence if it is time.
       def maybe_finalize
-        return unless ready_for_finalization?
+        return unless ready_for_finalization? && !incomplete_because_of_errors?
         finalize!
-      rescue Exception
-        # just eat the exception
       end
 
       # Is this task at the point where finalization can occur.
@@ -262,6 +268,11 @@ module Resque
       def incomplete_because_of_errors?
         failed_count > 0 && completed_count < normal_job_count
       end
+      
+      def unfinalized_because_of_errors?
+        failed_count > 0 && completed_count < (normal_job_count + finalize_job_count)
+      end
+
     end
   end
 end

data/resque-multi-step.gemspec

@@ -1,66 +1,63 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{resque-multi-step}
-  s.version = "1.0.0"
+  s.version = "1.0.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{2010-10-04}
+  s.date = %q{2011-01-31}
   s.description = %q{Provides multi-step tasks with finalization and progress tracking}
   s.email = %q{pezra@barelyenough.org}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.md"
+    "README.md"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.md",
-     "Rakefile",
-     "VERSION",
-     "lib/resque-multi-step.rb",
-     "lib/resque/plugins/multi_step_task.rb",
-     "lib/resque/plugins/multi_step_task/assure_finalization.rb",
-     "lib/resque/plugins/multi_step_task/atomic_counters.rb",
-     "lib/resque/plugins/multi_step_task/constantization.rb",
-     "lib/resque/plugins/multi_step_task/finalization_job.rb",
-     "lib/resque_mutli_step.rb",
-     "resque-multi-step-task.gemspec",
-     "resque-multi-step.gemspec",
-     "spec/acceptance/acceptance_jobs.rb",
-     "spec/acceptance/job_handling_spec.rb",
-     "spec/acceptance/spec_helper.rb",
-     "spec/resque-multi-step_spec.rb",
-     "spec/resque/plugins/multi_step_task/finalization_job_spec.rb",
-     "spec/resque/plugins/multi_step_task_spec.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb"
+    "LICENSE",
+    "README.md",
+    "Rakefile",
+    "VERSION",
+    "lib/resque-multi-step.rb",
+    "lib/resque/plugins/multi_step_task.rb",
+    "lib/resque/plugins/multi_step_task/assure_finalization.rb",
+    "lib/resque/plugins/multi_step_task/atomic_counters.rb",
+    "lib/resque/plugins/multi_step_task/constantization.rb",
+    "lib/resque/plugins/multi_step_task/finalization_job.rb",
+    "lib/resque_mutli_step.rb",
+    "resque-multi-step.gemspec",
+    "spec/acceptance/acceptance_jobs.rb",
+    "spec/acceptance/job_handling_spec.rb",
+    "spec/acceptance/spec_helper.rb",
+    "spec/resque-multi-step_spec.rb",
+    "spec/resque/plugins/multi_step_task/finalization_job_spec.rb",
+    "spec/resque/plugins/multi_step_task_spec.rb",
+    "spec/spec.opts",
+    "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/pezra/resque-multi-step}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Provides multi-step tasks with finalization and progress tracking}
   s.test_files = [
     "spec/acceptance/acceptance_jobs.rb",
-     "spec/acceptance/job_handling_spec.rb",
-     "spec/acceptance/spec_helper.rb",
-     "spec/resque/plugins/multi_step_task/finalization_job_spec.rb",
-     "spec/resque/plugins/multi_step_task_spec.rb",
-     "spec/resque-multi-step_spec.rb",
-     "spec/spec_helper.rb"
+    "spec/acceptance/job_handling_spec.rb",
+    "spec/acceptance/spec_helper.rb",
+    "spec/resque-multi-step_spec.rb",
+    "spec/resque/plugins/multi_step_task/finalization_job_spec.rb",
+    "spec/resque/plugins/multi_step_task_spec.rb",
+    "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    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<resque>, ["~> 1.10"])

data/spec/resque/plugins/multi_step_task_spec.rb

@@ -115,6 +115,28 @@ module  Resque::Plugins
       task.add_job(TestJob, "my", "args")
       task.finalizable!
     end
+
+    it "knows it has failed if a normal job raises an exception" do
+      TestJob.should_receive(:perform).with("my", "args").ordered.and_raise('boo')
+      MyFinalJob.should_not_receive(:perform)
+      
+      task.add_finalization_job(MyFinalJob, "final", "args")
+      task.add_job(TestJob, "my", "args") rescue nil
+      task.finalizable!
+      task.should be_incomplete_because_of_errors
+    end
+
+    it "knows it has failed if a finalized job raises an exception" do
+      MyFinalJob.should_receive(:perform).with("final", "args").ordered.and_raise('boo')
+
+      task.add_finalization_job(MyFinalJob, "final", "args")
+
+      lambda{
+        task.finalizable!
+      }.should raise_error
+
+      task.should be_unfinalized_because_of_errors
+    end
   end
   
   describe MultiStepTask, "finalization" do 

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: resque-multi-step
 version: !ruby/object:Gem::Version 
+  hash: 21
   prerelease: false
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Peter Williams
@@ -15,16 +16,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-04 00:00:00 -06:00
+date: 2011-01-31 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 1
         - 2
@@ -36,9 +39,11 @@ dependencies:
   name: redis-namespace
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 63
         segments: 
         - 0
         - 8
@@ -50,9 +55,11 @@ dependencies:
   name: resque
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
         - 1
         - 10
@@ -63,9 +70,11 @@ dependencies:
   name: resque-fairly
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 1
         - 0
@@ -83,7 +92,6 @@ extra_rdoc_files:
 - README.md
 files: 
 - .document
-- .gitignore
 - LICENSE
 - README.md
 - Rakefile
@@ -95,7 +103,6 @@ files:
 - lib/resque/plugins/multi_step_task/constantization.rb
 - lib/resque/plugins/multi_step_task/finalization_job.rb
 - lib/resque_mutli_step.rb
-- resque-multi-step-task.gemspec
 - resque-multi-step.gemspec
 - spec/acceptance/acceptance_jobs.rb
 - spec/acceptance/job_handling_spec.rb
@@ -110,28 +117,32 @@ homepage: http://github.com/pezra/resque-multi-step
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Provides multi-step tasks with finalization and progress tracking
@@ -139,7 +150,7 @@ test_files:
 - spec/acceptance/acceptance_jobs.rb
 - spec/acceptance/job_handling_spec.rb
 - spec/acceptance/spec_helper.rb
+- spec/resque-multi-step_spec.rb
 - spec/resque/plugins/multi_step_task/finalization_job_spec.rb
 - spec/resque/plugins/multi_step_task_spec.rb
-- spec/resque-multi-step_spec.rb
 - spec/spec_helper.rb

data/.gitignore

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC

data/resque-multi-step-task.gemspec

@@ -1,67 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{resque-multi-step-task}
-  s.version = "0.0.0"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Peter Williams"]
-  s.date = %q{2010-09-20}
-  s.description = %q{Provides multi-step tasks with finalization and progress tracking}
-  s.email = %q{pezra@barelyenough.org}
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.md"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.md",
-     "Rakefile",
-     "VERSION",
-     "lib/resque-multi-step-task.rb",
-     "lib/resque/plugins/multi_step_task.rb",
-     "lib/resque/plugins/multi_step_task/assure_finalization.rb",
-     "lib/resque/plugins/multi_step_task/atomic_counters.rb",
-     "lib/resque/plugins/multi_step_task/constantization.rb",
-     "lib/resque_mutli_step_task.rb",
-     "spec/resque-multi-step-task_spec.rb",
-     "spec/resque/plugins/multi_step_task_spec.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/pezra/resque-multi-step-task}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{Provides multi-step tasks with finalization and progress tracking}
-  s.test_files = [
-    "spec/resque/plugins/multi_step_task_spec.rb",
-     "spec/resque-multi-step-task_spec.rb",
-     "spec/spec_helper.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_runtime_dependency(%q<resque>, ["~> 1.10"])
-      s.add_runtime_dependency(%q<redis-namespace>, ["~> 0.8.0"])
-    else
-      s.add_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_dependency(%q<resque>, ["~> 1.10"])
-      s.add_dependency(%q<redis-namespace>, ["~> 0.8.0"])
-    end
-  else
-    s.add_dependency(%q<rspec>, [">= 1.2.9"])
-    s.add_dependency(%q<resque>, ["~> 1.10"])
-    s.add_dependency(%q<redis-namespace>, ["~> 0.8.0"])
-  end
-end
-