batchy 0.2.2 → 0.2.3

data/lib/batchy.rb

@@ -69,55 +69,68 @@ module Batchy
     @logger = logger
   end
 
+  def create_batch options
+    ignore_block = options[:on_ignore] ? options[:on_ignore] : nil
+    ensure_block = options[:on_ensure] ? options[:on_ensure] : nil
+    options.delete(:on_ignore) if options[:on_ignore]
+    options.delete(:on_ensure) if options[:on_ensure]
+
+    batch = Batch.create options
+    batch.on_ignore ignore_block unless ignore_block.nil?    
+    batch.on_ensure ensure_block unless ensure_block.nil?    
+    return batch
+  end
+
   # The main entry point for batchy.  It wraps code in a batchy
   # block.  Batchy handles errors, logging and allows for
   # callbacks.
   def run *args
     options = args.extract_options!
+    batch = create_batch options
 
-    batch = Batch.create options
     batch.clear_zombies unless batch.guid.nil?
-
     batch.start!
-    return false if batch.ignored?
-    begin
-      # Set the proclist process name
-      previous_name = $0
-      process_name = [Batchy.configure.process_name_prefix, batch.name].join(" ")
-      $0 = process_name if Batchy.configure.name_process
-
-      # Set parent if there is an outer batch
-      if Batchy.current
-        batch.parent = Batchy.current
-      end
 
-      # Set current batch
-      @current = batch
-
-      # Save everything before yielding
-      batch.save!
-      
-      yield batch
-
-      batch.run_success_callbacks
-    rescue Exception => e
-      batch.error = e
-
-      batch.run_failure_callbacks
-    ensure
-      batch.finished_at = DateTime.now
-      batch.finish!
-
-      batch.run_ensure_callbacks
-
-      # Set current batch to parent (or nil if no parent)
-      @current = batch.parent
-
-      # Set proclist process name back
-      $0 = previous_name
+    unless batch.ignored?
+      begin
+        # Set the proclist process name
+        previous_name = $0
+        process_name = [Batchy.configure.process_name_prefix, batch.name].join(" ")
+        $0 = process_name if Batchy.configure.name_process
+        
+        # Set parent if there is an outer batch
+        if Batchy.current
+          batch.parent = Batchy.current
+        end
+        
+        # Set current batch
+        @current = batch
+        
+        # Save everything before yielding
+        batch.save!
+        
+        yield batch
+        
+        batch.run_success_callbacks
+      rescue Exception => e
+        batch.error = e
+        
+        batch.run_failure_callbacks
+      ensure
+        batch.finished_at = DateTime.now
+        batch.finish!
+        
+        batch.run_ensure_callbacks
+        
+        # Set current batch to parent (or nil if no parent)
+        @current = batch.parent
+        
+        # Set proclist process name back
+        $0 = previous_name
+      end
     end
   end
 
   class Error < StandardError
   end 
-end
+end

data/lib/batchy/batch.rb

@@ -93,7 +93,6 @@ module Batchy
       options.reverse_merge! :limit_to_current_host => false
 
       raise Batchy::Error, "Can not check for duplicate batches on nil guid" if guid.nil?
-
       rel = self.class.where(:guid => guid, :state => "running")
 
       if options[:limit_to_current_host]
@@ -252,4 +251,4 @@ module Batchy
       @ignore_callbacks = []
     end
   end
-end
+end

data/lib/batchy/version.rb

@@ -1,3 +1,3 @@
 module Batchy
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

metadata

@@ -2,7 +2,7 @@
 name: batchy
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - Bob Briski
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-30 00:00:00 Z
+date: 2012-05-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -168,7 +168,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1782560018282016053
+      hash: -707801613138086114
       segments: 
       - 0
       version: "0"
@@ -177,7 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1782560018282016053
+      hash: -707801613138086114
       segments: 
       - 0
       version: "0"