tubes 0.0.0 → 0.1.0

data/lib/tubes.rb

@@ -35,6 +35,17 @@ class Tube
     @invocations = 0
 
     Dir.mkdir(@dir) unless Dir.exists?(@dir)
+
+    if @parent.nil?  # This is the top level tube.
+      class << self
+        alias_method :unlocked_run, :run
+      	def run(*args, &block)
+      	  lock
+      	  unlocked_run(*args, &block)
+	  unlock
+      	end
+      end
+    end
   end
 
 
@@ -48,26 +59,6 @@ class Tube
   end
 
 
-  def start
-    lock = File.join @dir, "lock"
-    if !@options[:force] && File.exists?(lock)
-      raise "Another instance of the tubes seems to be running.\nPlease remove #{lock} if that is not the case."
-    end
-
-    File.open(lock, "w") do |f|
-      f.write $$
-    end
-  end
-
-
-  def finish
-    lock = File.join @dir, "lock"
-    File.delete lock
-
-    @ended_at = Time.now
-  end
-
-
   def invoke(klass, *args)
     @invocations += 1
 
@@ -85,14 +76,14 @@ class Tube
       self.puts "Running: #{step}"
 
       if @type == :serial
-        run(segment, output_file, *args)
+        dispatch(segment, output_file, *args)
       elsif @type == :parallel
         thread = Thread.new(@lock) do |lock|
           Thread.current[:lock] = lock
           Thread.current.abort_on_exception = true
 
           # This clobbers the @output. Perhaps make @output an array instead of a value and append to it under a lock.
-          run(segment, output_file, *args)
+          dispatch(segment, output_file, *args)
         end
         @threads << thread
       end
@@ -143,7 +134,7 @@ class Tube
     # This should be implemented in the subclasses.
   end
 
-  def run(segment, output_file, *args)
+  def dispatch(segment, output_file, *args)
     output = if segment.method(:run).arity.abs > 0 # Optional arguments result in negative arity.
                if args.empty?
                  segment.send :run, @output
@@ -196,4 +187,22 @@ class Tube
       gsub(/([a-z\d])([A-Z])/,'\1_\2').
       tr("-", "_").downcase
   end
+
+  def lock
+    lock = File.join @dir, "lock"
+    if !@options[:force] && File.exists?(lock)
+      raise "Another instance of the tubes seems to be running.\nPlease remove #{lock} if that is not the case."
+    end
+
+    File.open(lock, "w") do |f|
+      f.write $$
+    end
+  end
+
+  def unlock
+    lock = File.join @dir, "lock"
+    File.delete lock
+
+    @ended_at = Time.now
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tubes
 version: !ruby/object:Gem::Version
-  version: 0.0.0
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-21 00:00:00.000000000 Z
+date: 2012-09-23 00:00:00.000000000 Z
 dependencies: []
 description: A simple way to build a pipeline of tasks.
 email: sujoyg@gmail.com