tubes 0.1.14 → 0.1.15

data/lib/tubes.rb

@@ -74,12 +74,13 @@ class Tube
 
   def invoke(klass, *args)
     @invocations += 1
-    dir = File.join(@dir, "#{@order}-#{underscore(klass.name.split('::')[-1])}")
+   
+    dir = File.join(@dir, "#{description(klass)}")
     segment = klass.new dir, :order => @order, :parent => self
 
-    output_file = segment_cache self, segment.name
+    output_file = segment_cache segment
     if output_file && File.exists?(output_file)
-      self.puts "Skipping: #{step}"
+      self.puts "Skipping: #{@order}-#{@invocations}-#{segment.name}"
       output = JSON.load(File.read(output_file))["data"]
 
       if serial?
@@ -106,6 +107,14 @@ class Tube
   end
 
 
+  def description(klass)
+    if @order.present?
+      "#{@order}-#{@invocations}-#{underscore(klass.name.split('::')[-1])}"
+    else
+      "#{@invocations}-#{underscore(klass.name.split('::')[-1])}"
+    end
+  end
+
   def puts(string='')
     @thread_lock.synchronize do
       unlocked_puts(string)
@@ -185,7 +194,11 @@ class Tube
         end
       end
     else
-      segment.send :run, *args, options
+      if options.present?
+      	segment.send :run, *args, options
+      else
+        segment.send :run, *args
+      end
     end
   end
 
@@ -197,11 +210,7 @@ class Tube
              elsif segment.method(:run).arity < 0
                run_with_args(segment, args, options)
              else
-               if options.present?
-                 segment.send :run, options
-               else
-                 segment.send :run
-               end
+               segment.send :run
              end
 
     if output_file
@@ -220,8 +229,8 @@ class Tube
   end
 
 
-  def segment_cache(tube, segment)
-    File.join(tube.dir, "#{tube.order}-#{@invocations}-#{segment}.json") if tube.dir
+  def segment_cache(segment)
+    File.join(@dir, "#{description(segment.class)}.json") if segment.dir
   end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tubes
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-13 00:00:00.000000000 Z
+date: 2012-11-16 00:00:00.000000000 Z
 dependencies: []
 description: A simple way to build a pipeline of tasks. These tasks can be configured
   to run in serial, parallel or any combination thereof.