rbbt-util 5.17.13 → 5.17.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 899623e0f5927a7d4f7464374483875dfc1f0df7
-  data.tar.gz: 3ad22d09d6d094fbea8fa89280973b5fced6c5a8
+  metadata.gz: 9c959e8346b7a77f693defdc98a73cf2f207ab01
+  data.tar.gz: 0a87e53388037ba0b25c201b000724d2bd563ae5
 SHA512:
-  metadata.gz: 09c486addcb8a341d9fe352412cdacd225960647904479a0c7250565aa0a42c463ee81ca57d99fcc07bb1a48045f63be69b3d83acb5de52a7fb0f6ddf83d41fe
-  data.tar.gz: 4429c44655f3ee70112b544d907c44a2cc768036c402e1aa41b4c386c2f1c172fe73e579297b8648ce5fd486f37f3e80d3c3927c38f4d6f42d7180a5ea3bdaa3
+  metadata.gz: 763c0a93980d04bd6830fb0b7ded1df3d23c6a49520b4a5fae20b98423ea90621567f11c05af8324eeb1cbc6d8afd71a3881a24e9e82d75a29fbf4ce3ae55e52
+  data.tar.gz: 9949e64201682a64fbeede2cfdd18093915de32d91f868f872ff83cc054ee2bbcd8979d4343cdddba7e071e56d4e985e6a688a8cdc70abed5f12b4ac0084168f

data/bin/rbbt

@@ -44,7 +44,7 @@ $ rbbt <command> <subcommand> ... -a --arg1 --arg2='value' --arg3 'another-value
 --nostream              #{Log.color :yellow, "Disable persistance/job streaming"}
 --locate_file           #{Log.color :yellow, "Report the location of the script instead of executing it"}
 --dump_mem*             #{Log.color :yellow, "Dump strings in memory each second into file"}
---no_lock_id            #{Log.color :yellow, "Do not track lockfiles with ids (for high-througput and high-concurrency"}
+--no_lock_id            #{Log.color :yellow, "Do not track lockfiles with ids (prevent stale file handlers for high-througput and high-concurrency)"}
 EOF
 
 

data/lib/rbbt/workflow/accessor.rb

@@ -513,24 +513,28 @@ module Workflow
     dependencies.each do |dependency|
       real_dependencies << case dependency
       when Array
-        inputs = inputs.dup
         workflow, task, options = dependency
+
         options = dependency.last if Hash === dependency.last
+        _inputs = inputs.dup
         options.each{|i,v|
           case v
           when Symbol
-            rec_dependency = real_dependencies.collect{|d| [d, d.rec_dependencies].compact.flatten}.flatten.select{|d| d.task.name == v }.first
-            input_options = dependency.first.task_info(dependency[1])[:input_options][i] || {}
+            rec_dependency = (real_dependencies + real_dependencies.collect{|d| d.rec_dependencies}).flatten.compact.uniq.select{|d| d.task.name.to_sym == v }.first
+            raise "Dependency for parameter #{i} not found: #{v}" if rec_dependency.nil?
+            input_options = workflow.task_info(task)[:input_options][i] || {}
             if input_options[:stream]
-              inputs[i] = rec_dependency.run(true).grace.join.path 
+              rec_dependency.run(true).grace unless rec_dependency.done? or rec_dependency.running?
+              _inputs[i] = rec_dependency
             else
-              inputs[i] = rec_dependency.run
+              _inputs[i] = rec_dependency.run
             end
           else
-            inputs[i] = v
+            _inputs[i] = v
           end
         } if options
-        res = dependency.first.job(dependency[1], jobname, inputs)
+
+        res = dependency.first.job(dependency[1], jobname, _inputs)
         res
       when Step
         dependency

data/lib/rbbt/workflow/step/run.rb

@@ -157,7 +157,7 @@ class Step
       next unless dependencies.include? dependency
       Log.info "#{Log.color :cyan, "dependency"} #{Log.color :yellow, task.name.to_s || ""} => #{Log.color :yellow, dependency.task_name.to_s || ""} -- #{Log.color :blue, dependency.path}"
       begin
-        dependency.run(true) unless dependency.started? 
+        dependency.run(true) unless dependency.done? or dependency.started? 
       rescue Aborted
         Log.error "Aborted dep. #{Log.color :red, dependency.task.name.to_s}"
         raise $!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.17.13
+  version: 5.17.14
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-07 00:00:00.000000000 Z
+date: 2015-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake