rbbt-util 5.26.164 → 5.26.166

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5545815fabee26161b9469047d7841ee52096b6425fa2e48662cb9d153c1df9
-  data.tar.gz: 91aec09738186724755d0614470a2599725313d75996b462e5ca569a02091c7a
+  metadata.gz: e6a9b238432d51ca272a4c3422edeeaf094b29f544819f7a12c75d6ed9b4d59d
+  data.tar.gz: e3120fe617dfe1486f032289aa5a4876e222d9f5c91684312944968957d56cc4
 SHA512:
-  metadata.gz: d25784e6dbc1f970ecff71656cd13c96a0e5060905e89a2750dbef75302f13ab80adacdc25236a3f133bd8bc6bd813ef6c742c4112bf712395e4cb68925e049b
-  data.tar.gz: 070bfa93238b07ad8af67cb476831e78286c6c0aa3c541b99a5a1d52f59b1292dd5b957bd26f12c44034758e96429baa891503f44912885fb905504f5d3d4164
+  metadata.gz: 40d54d1c4185f9c03e21bb308a3ab9241e2181bfd0484346a17cd905e0c9f07bbb1a9054c24684d9d3c9cedeea39e7fc13015e30aaae86860f85f214366b1dea
+  data.tar.gz: 8d73e426780f818564e0d3ece201c25d730bfe06e9ab2ca4f1936347475fbbccba7fc95048a4e9ef9d3d2ce0813502ab67e5080ab19aa8b3d2ffabf335e18cda

data/lib/rbbt/workflow/remote_workflow.rb

@@ -29,7 +29,6 @@ class RemoteWorkflow
     input_types = IndiferentHash.setup(task_info[:input_types])
 
     inputs.each do |k,v| 
-      v = v.load if Step === v
       k = k.to_sym
       if TSV === v
         fixed_inputs[k] = v.to_s

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

@@ -93,6 +93,8 @@ class Step
         else
           Open.write(path + '.read', value.to_s)
         end
+      when Step === v
+        v = v.produce.load 
       else
         Open.write(path, value.to_s)
       end

data/lib/rbbt/workflow/usage.rb

@@ -71,8 +71,9 @@ module Workflow
     @dep_tree ||= {}
     @dep_tree[name] ||= begin
                         dep_tree = {}
-                        self.rec_dependencies(name).each do |dep|
+                        self.task_dependencies[name].reverse.each do |dep|
                           dep = dep.first if Array === dep && dep.length == 1
+                          dep = dep.dependency if Proc === dep
 
                           workflow, task = case dep
                                            when Array
@@ -195,7 +196,8 @@ module Workflow
       #dependencies = self.rec_dependencies(task_name).collect{|dep_name| Array === dep_name ? dep_name.first.tasks[dep_name[1].to_sym] : self.tasks[dep_name.to_sym]}
       task.doc(self, self.rec_dependencies(task_name))
 
-      prov_tree = prov_tree(dep_tree(task_name))
+      dep_tree = {[self, task_name] => dep_tree(task_name)}
+      prov_tree = prov_tree(dep_tree)
       if prov_tree && ! prov_tree.empty?
 
         puts Log.color :magenta, "## DEPENDENCY GRAPH (abridged)"

metadata

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