rbbt-util 5.25.42 → 5.25.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c7c2171a24807d0a7e1f7d33bc6b95c4905ed4d
-  data.tar.gz: 99a0ae12b516bdf954e3128f48c1fb585efc2567
+  metadata.gz: 8c8329e1d8658643cd78a094eb7540e1655b07ba
+  data.tar.gz: af8d212a2026bee068c9bf1d1d6854e0c5a07138
 SHA512:
-  metadata.gz: 9cc824ce02d93292895424f60db1c14da44519a9e373e6064e05317b1c34e6f05efa43703dd8f38326a24d62b9c0edbc4f778866fe88bd772d6c2cd9c2cdb464
-  data.tar.gz: 4fec89ee21e2471dcf091891cada8115ec1d97cb54b689ee0fedfd7f86488379a3d5172c32b7be4305d333bcda2b859fb053ef2df4a2adefe0c2cfd924d235e1
+  metadata.gz: cc3adc891693f453bfabfc0877fbc813f12472b37bbe14fa901f4f0ce6883a0d65dcca545fb403dab5751bed842a4e1572e237b25120febbfae592a6b77f0ade
+  data.tar.gz: ad2a4d939b3e98efb39316d38a172a045da53019ef16202197265707e00767e7ed5232c8ad64490aad211ce9f734d7a420a7c45ec47ffec05333960e1ce584be

data/lib/rbbt/workflow/accessor.rb

@@ -962,6 +962,20 @@ module Workflow
     override_dependencies
   end
 
+  def setup_override_dependency(dep, workflow, task_name)
+    dep = Step === dep ? dep : Workflow.load_step(dep)
+    dep.info[:name] = dep.name
+    begin
+      workflow = Kernel.const_get workflow if String === workflow
+      dep.task = workflow.tasks[task_name] if dep.task.nil? && workflow.tasks.include?(task_name)
+    rescue
+      Log.exception $!
+    end
+    dep.task_name = task_name
+    dep.overriden = true
+    dep
+  end
+
   def real_dependencies(task, orig_jobname, inputs, dependencies)
     real_dependencies = []
     path_deps = {}
@@ -978,12 +992,7 @@ module Workflow
                    workflow, dep_task, options = dependency
 
                    if override_dependencies[workflow.to_s] && value = override_dependencies[workflow.to_s][dep_task]
-                     d_ = Step === value ? value : Workflow.load_step(value)
-                     d_.info[:name] = d_.name
-                     d_.task = workflow.tasks[dep_task] if workflow.tasks.include?(dep_task)
-                     d_.task_name = dep_task
-                     d_.overriden = true
-                     d_
+                     setup_override_dependency(value, workflow, dep_task)
                    else
 
                      compute = options[:compute] if options
@@ -1001,12 +1010,7 @@ module Workflow
                    dependency
                  when Symbol
                    if override_dependencies[self.to_s] && value = override_dependencies[self.to_s][dependency]
-                     d_ = Step === value ? value : Workflow.load_step(value)
-                     d_.task = self.tasks[dependency] if self.tasks.include?(dependency)
-                     d_.info[:name] = d_.name
-                     d_.task_name = dependency
-                     d_.overriden = true
-                     d_
+                     setup_override_dependency(value, self, dependency)
                    else
                      _job(dependency, jobname, _inputs)
                    end
@@ -1030,17 +1034,7 @@ module Workflow
                          d[:workflow] ||= wf 
                          d[:task] ||= task_name
                          if override_dependencies[d[:workflow].to_s] && value = override_dependencies[d[:workflow].to_s][d[:task]]
-                           d = (Step === value ? value : Workflow.load_step(value))
-                           d.info[:name] = d.name
-                           begin
-                             workflow = String === d[:workflow] ? Kernel.const_get(d[:workflow]) : d[:workflow]
-                             d.task = workflow.tasks[d[:task]] if workflow.tasks.include?(d[:task])
-                           rescue
-                             Log.exception $!
-                           end
-                           d.task_name = d[:task]
-                           d.overriden = true
-                           d
+                           setup_override_dependency(value, d[:workflow], d[:task])
                          else
                            task_info = d[:workflow].task_info(d[:task])
 
@@ -1058,17 +1052,7 @@ module Workflow
                      if Hash === dep
                        dep[:workflow] ||= wf || self
                        if override_dependencies[dep[:workflow].to_s] && value = override_dependencies[dep[:workflow].to_s][dep[:task]]
-                         dep = (Step === value ? value : Workflow.load_step(value))
-                         dep.info[:name] = dep.name
-                         begin
-                           workflow = String === dep[:workflow] ? Kernel.const_get(dep[:workflow]): dep[:workflow]
-                           dep.task = workflow.tasks[dep[:task]] if workflow.tasks.include?(dep[:task])
-                         rescue
-                           Log.exception $!
-                         end
-                         dep.task_name = dep[:task]
-                         dep.overriden = true
-                         dep
+                         setup_override_dependency(value, dep[:workflow], dep[:task])
                        else
                          task_info = (dep[:task] && dep[:workflow]) ? dep[:workflow].task_info(dep[:task]) : nil
                          inputs = assign_dep_inputs({}, dep[:inputs], real_dependencies, task_info)

metadata

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