batchy 0.0.4 → 0.0.5

data/README.rdoc

@@ -20,9 +20,7 @@ If you're using Rails, you can generate a migration with
   $ rails generate batchy:active_record
   $ rake db:migrate
 
-== Examples
-
-=== Configuration
+== Configuration
 
 For a full list of configuration options, check the documentation.
 

data/lib/batchy.rb

@@ -54,6 +54,11 @@ module Batchy
     @configuration = nil
   end
 
+  # Get the current batch
+  def current
+    @current ||= nil
+  end
+
   # Sets the logger for batchy
   def logger
     @logger ||= Logger.new(STDOUT)
@@ -74,11 +79,35 @@ module Batchy
     batch.start!
     return false if batch.ignored?
     begin
+      # Set the proclist process name
+      previous_name = $0
+      $0 = batch.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
     rescue Exception => e
       batch.error = "{#{e.message}\n#{e.backtrace.join('\n')}"
     ensure
       batch.finish!
+
+      # Set current batch to parent (or nil if no parent)
+      @current = batch.parent
+
+      # Set proclist process name back
+      $0 = previous_name
     end
   end
+
+  class Error < StandardError
+  end 
 end

data/lib/batchy/batch.rb

@@ -10,6 +10,8 @@ module Batchy
     attr_reader :ignore_callbacks
 
     validates_presence_of :name
+    belongs_to :parent, :class_name => 'Batchy::Batch', :primary_key => :id, :foreign_key => :batch_id
+    has_many :children, :primary_key => :id, :foreign_key => :batch_id, :class_name => 'Batchy::Batch'
 
     state_machine :state, :initial => :new do
       event :start do
@@ -20,9 +22,6 @@ module Batchy
         batch.started_at = DateTime.now
         batch.pid = Process.pid
         batch.save!
-
-        # Set the proclist process name
-        $0 = batch.name if Batchy.configure.name_process
       end
       
       # Ignored
@@ -63,12 +62,16 @@ module Batchy
 
     # Is there batch with the same guid already running?
     def already_running
+      return false if guid.nil?
+
       duplicate_batches.count > 0
     end
 
     # Find all batches with the same guid that are
     # running.
     def duplicate_batches
+      raise Batchy::Error, "Can not check for duplicate batches on nil guid" if guid.nil?
+
       rel = self.class.where(:guid => guid, :state => "running")
       return rel if new_record?
 

data/lib/batchy/version.rb

@@ -1,3 +1,3 @@
 module Batchy
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -2,7 +2,7 @@
 name: batchy
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Bob Briski
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-25 00:00:00 Z
+date: 2012-03-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -166,7 +166,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -4513775981658919915
+      hash: -791703872644977809
       segments: 
       - 0
       version: "0"
@@ -175,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -4513775981658919915
+      hash: -791703872644977809
       segments: 
       - 0
       version: "0"