rbbt-util 5.21.84 → 5.21.85

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a49d93fb2f43d54bb645860d3cebbe8b963a49ef
-  data.tar.gz: cdadbfaa80ca05d96d2bea551d46778baa22adf8
+  metadata.gz: 9b0026548f0fd257ee1c8034c380bc81421e6b43
+  data.tar.gz: 3d71f163382164f5403f405c22f46f810dc94fff
 SHA512:
-  metadata.gz: 513419ec73b7769efd06ee338e8630cb811ee1640c43108d3d5b961e97057de8855109389696c432363eaaabe1982ae6d4e0d1b103f91865f5656dcb08b34d7e
-  data.tar.gz: 1d7329702b78feaa162d9d457f266afb4d5f48727987ebeb38ee1ac3156068d846e019bd48692cd5e9a00239722726bd48340995fbcf5beacd2c1d09bfcf138d
+  metadata.gz: 1cbbdfe188342713c7656ddd3f0dca2e85b8dfcf920aad550e66128d5c57151553c1ec213c5bfd0f09646ed2bc1e2dde4e6a55d3a4844481d2016eec0595464d
+  data.tar.gz: 3164ac445b99c1a05e6741bde5c59bb8352ae7ff9c7bae7fef99bf0aad523f54291f14d59f4d4b9e71daa1dccf2f12f5e6926cb33ada09d104ca212a6743731c

data/lib/rbbt/workflow.rb

@@ -359,20 +359,24 @@ module Workflow
     end
   end
 
+  #{{{ LOAD FROM FILE
+
   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
     persist = false
     key = Path === step_path ? step_path.find : step_path
+
     step = Step.new step_path, task, input_values, dependencies
 
+    set_step_dependencies(step) unless 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
@@ -402,6 +406,8 @@ module Workflow
     get_job_step path, task
   end
 
+  #}}} LOAD FROM FILE
+  
   def jobs(taskname, query = nil)
     task_dir = File.join(File.expand_path(workdir.find), taskname.to_s)
     pattern = File.join(File.expand_path(task_dir), '**/*')

data/lib/rbbt/workflow/accessor.rb

@@ -70,7 +70,7 @@ class Step
   end
 
   def name
-    path.sub(/.*\/#{Regexp.quote task.name.to_s}\/(.*)/, '\1')
+    path.sub(/.*\/#{Regexp.quote task_name.to_s}\/(.*)/, '\1')
   end
 
   def short_path
@@ -768,8 +768,10 @@ module Workflow
 
                      new_=[]
                      dep.each{|d| 
-                       inputs = assign_dep_inputs({}, options.merge(d[:inputs]), real_dependencies, d[:workflow].task_info(d[:task]))
-                       d = d[:workflow].job(d[:task], d[:jobname], inputs) if Hash === d
+                       if Hash === d
+                         inputs = assign_dep_inputs({}, options.merge(d[:inputs]), real_dependencies, d[:workflow].task_info(d[:task])) 
+                         d = d[:workflow].job(d[:task], d[:jobname], inputs) 
+                       end
                        ComputeDependency.setup(d, compute) if compute
                        new_ << d
                      }

data/lib/rbbt/workflow/step.rb

@@ -80,6 +80,7 @@ class Step
   end
 
   def task_name
+    return @path.split("/")[-2] if @task.nil?
     @task.name
   end
 

metadata

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