rbbt-util 5.23.39 → 5.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32c23558db95c8f8705eb13a20976b239298f57c
-  data.tar.gz: 0ddc962a3b40fdb2833b45e214a5184a823d0c90
+  metadata.gz: d5f2a21fe3779a6324ef059971dd4493da25a2f7
+  data.tar.gz: b937c979d3515e7a923f2f229c64dd734f5ae2c6
 SHA512:
-  metadata.gz: '088916661e196d378f49cd12001cba1dfca3b7c1b0930b2a751c8562395f82a1f35cb0bafaead17c4bda032628ae00d109f382c93043790e69fa8fbe64c7ede7'
-  data.tar.gz: 957b85fc91e9fdd5cc4913eda388cdb60b22c55424b55e9d304726769ba277bf88b2e926a5ebbceb46ea834923457591ecfc178f0ae2e4b71959c6656b60986a
+  metadata.gz: cdeeaa01c20aa1cb86abe7b6c9061c9fabc5f84906994d6c6afbea1f9be50f923a4dbb6d777ad05e43ecdb93c5bdb6aceada2334a1004820cde6076948c31dc9
+  data.tar.gz: e538ce30a9a640baf4210df4e044fadeb213d396b02a9b1c8f0663e75dd4cde0a7b24a11ea0d06068bd9307368db510cd860f09184151de8aa67cd1b63ac7e0c

data/lib/rbbt/persist.rb

@@ -350,7 +350,10 @@ module Persist
     type ||= :marshal
 
     persist_options ||= {}
-    if type ==:memory and persist_options[:file] and persist_options[:persist] and persist_options[:persist] != :update and not persist_options[:update]
+    if type == :memory and persist_options[:file] and persist_options[:persist] 
+      if persist_options[:persist] == :update || persist_options[:update]
+        (persist_options[:repo] || Persist::MEMORY).delete persist_options[:file]
+      end
       return (persist_options[:repo] || Persist::MEMORY)[persist_options[:file]] ||= yield 
     end
 

data/lib/rbbt/workflow.rb

@@ -343,8 +343,10 @@ module Workflow
     end
 
     real_inputs = {}
+    has_overriden_inputs = false
 
     inputs.each do |k,v|
+      has_overriden_inputs = true if String === k and k.include? "#"
       next unless (task_inputs.include?(k.to_sym) or task_inputs.include?(k.to_s))
       default = all_defaults[k]
       next if default == v 
@@ -361,7 +363,7 @@ module Workflow
     jobname = DEFAULT_NAME if jobname.nil? or jobname.empty?
 
     dependencies = real_dependencies(task, jobname, defaults.merge(inputs), task_dependencies[taskname] || [])
-    overriden = dependencies.select{|dep| dep.overriden }.any?
+    overriden = has_overriden_inputs && dependencies.select{|dep| dep.overriden }.any?
 
     if real_inputs.empty? and not Workflow::TAG == :inputs and not overriden 
       step_path = step_path taskname, jobname, [], [], task.extension

data/lib/rbbt/workflow/accessor.rb

@@ -944,8 +944,6 @@ module Workflow
                    if override_dependencies[workflow.to_s] && value = override_dependencies[workflow.to_s][dep_task]
                      d_ = Step === value ? value : Workflow.load_step(value)
                      d_.task_name = dep_task
-                     #d_.task = workflow.tasks[dep_task]
-                     #d_.workflow = workflow
                      d_.overriden = true
                      d_
                    else
@@ -967,8 +965,6 @@ module Workflow
                    if override_dependencies[self.to_s] && value = override_dependencies[self.to_s][dependency]
                      d_ = Step === value ? value : Workflow.load_step(value)
                      d_.task_name = dependency
-                     #d_.task = self.tasks[dependency]
-                     #d_.workflow = self
                      d_.overriden = true
                      d_
                    else
@@ -996,8 +992,6 @@ module Workflow
                          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.task_name = d[:task]
-                           #d.task = d[:workflow].tasks[d[:task]]
-                           #d.workflow = self
                            d.overriden = true
                            d
                          else
@@ -1019,8 +1013,6 @@ module Workflow
                        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.task_name = d[:task]
-                         #dep.task = d[:workflow].tasks[d[:task]]
-                         #dep.workflow = self
                          dep.overriden = true
                          dep
                        else

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

@@ -354,9 +354,18 @@ class Step
       end
       next unless step.dependencies and step.dependencies.any?
       step.dependencies.each do |step_dep|
-        next if step_dep.done? or step_dep.running? or (ComputeDependency === step_dep and step_dep.compute == :nodup)
+        next if step_dep.done? or step_dep.running? or (ComputeDependency === step_dep and (step_dep.compute == :nodup or step_dep.compute == :ignore))
         dep_step[step_dep.path] ||= []
-        dep_step[step_dep.path] << step_dep
+        dep_step[step_dep.path] << step
+      end
+      step.inputs.each do |inputs|
+        inputs = [inputs] unless Array === inputs
+        inputs.each do |step_dep|
+          next unless Step === step_dep
+          next if step_dep.done? or step_dep.running? or (ComputeDependency === step_dep and (step_dep.compute == :nodup or step_dep.compute == :ignore))
+          dep_step[step_dep.path] ||= []
+          dep_step[step_dep.path] << step
+        end
       end
     end
 
@@ -378,7 +387,6 @@ class Step
 
     required_dep_paths.concat dependencies.collect{|dep| dep.path }
 
-
     log :dependencies, "Dependencies for step #{Log.color :yellow, task.name.to_s || ""}"
 
     pre_deps = []

metadata

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