rbbt-util 5.21.83 → 5.21.84

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a9203165804c6c7d43397d02aada2d6b9c99649
-  data.tar.gz: f8e2c8ed913e3a01cb27bbc8d2d9751a213ca78e
+  metadata.gz: a49d93fb2f43d54bb645860d3cebbe8b963a49ef
+  data.tar.gz: cdadbfaa80ca05d96d2bea551d46778baa22adf8
 SHA512:
-  metadata.gz: 54ab5caf41e7e0b8e3b6d98cd0016f043161e137c3cf78596cc94239797a41d09fdb23fc41d0851e42c250c0422560c850b2c6b18679ad7cb859cfc2441bd20c
-  data.tar.gz: 0057b7bf24c1506791b26b071ea94f5366f242b405464a6fc24c3c4e0307650fbb71fee4c3534f68c383a5bb8b942fc22db9cad929834df63937207a7b5630d3
+  metadata.gz: 513419ec73b7769efd06ee338e8630cb811ee1640c43108d3d5b961e97057de8855109389696c432363eaaabe1982ae6d4e0d1b103f91865f5656dcb08b34d7e
+  data.tar.gz: 1d7329702b78feaa162d9d457f266afb4d5f48727987ebeb38ee1ac3156068d846e019bd48692cd5e9a00239722726bd48340995fbcf5beacd2c1d09bfcf138d

data/lib/rbbt/workflow.rb

@@ -350,6 +350,15 @@ module Workflow
     job
   end
 
+  def set_step_dependencies(step)
+    if step.info.include? :dependencies
+      step.dependencies = step.info[:dependencies].collect do |task, job, path|
+        next if job.nil?
+        load_step(path) 
+      end
+    end
+  end
+
   def get_job_step(step_path, task = nil, input_values = nil, dependencies = nil)
     step_path = step_path.call if Proc === step_path
     persist = input_values.nil? ? false : true
@@ -357,13 +366,14 @@ module Workflow
     key = Path === step_path ? step_path.find : step_path
     step = Step.new step_path, task, input_values, dependencies
 
-
     step.extend step_module
 
     step.task ||= task
     step.inputs ||= input_values
     step.dependencies = dependencies if dependencies and (step.dependencies.nil? or step.dependencies.length < dependencies.length)
 
+    set_step_dependencies(step)
+
     step
   end
 
@@ -372,13 +382,7 @@ module Workflow
     task = task_for path
     return remote_tasks[task].load_id(id) if remote_tasks and remote_tasks.include? task
     step = Step.new path, tasks[task.to_sym]
-    step.info
-    if step.info.include? :dependencies
-      step.dependencies = step.info[:dependencies].collect do |task, job, path|
-        next if job.nil?
-        load_step(path) 
-      end
-    end
+    set_step_dependencies(step)
     step
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.21.83
+  version: 5.21.84
 platform: ruby
 authors:
 - Miguel Vazquez