rbbt-util 5.32.20 → 5.32.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 576b7bc079d39a3054c5bdaa3c0b3af5573a26aacd6181fe65e8d450fd3ed148
-  data.tar.gz: 2dc53972fc0e8504ca327de2f680d29ac5c3df63362359528b25ec21f2c10e9b
+  metadata.gz: 14fc2236d4c0852a44d9db76c43aa19c32619cede05e03801a830ec4a996420a
+  data.tar.gz: ceed6fe15817c5fd4635b5b96a557ae010d9aa50ccfdb774a03f959d3e93314d
 SHA512:
-  metadata.gz: 3cd48cedd0a1957996b59ac51bc56b2b3c8ce8aef54454b1ff10f8f86a08c9df63a60a1d1bad7c29a0741bf687c215f36b628e614b70aa9b8181d687a075364e
-  data.tar.gz: 8955e34256095ea4c2e66cc6937845f6b13cb4c87e2bc13f5f7bb4844135886407e50e31114c94e0bdba157f63aab4027c7d94add60f85f31e0646aab3bf124f
+  metadata.gz: 0f327628991f8906fc353776ee2d887cd79edfa5cb07def1f8dec207ab2d922c3e4b40a141a8fa128904a28bd5b6d84887f3518bd095d98427e14710567f5495
+  data.tar.gz: a53a644a91737b2cb0e76c7eb641daeace94537da7c3ded5b993fb936f524522f81b7f06ddd458ba72a3672279e7f66bf670553c8683f21de7d7cff66bac9400

data/lib/rbbt/workflow/definition.rb

@@ -98,11 +98,12 @@ module Workflow
         when 'true'
           dep.clean
         when 'recursive'
-          dep.rec_dependencies.each do |d|
+          (dep.dependencies + dep.rec_dependencies).uniq.each do |d|
+            next if d.overriden
             d.clean unless config(:remove_dep, d.task_signature, d.task_name, d.workflow.to_s, :default => true).to_s == 'false'
           end
           dep.clean unless config(:remove_dep, dep.task_signature, dep.task_name, dep.workflow.to_s, :default => true).to_s == 'false'
-        end
+        end unless dep.overriden
       else
         if Open.exists?(dep.files_dir)
           Open.rm_rf self.files_dir 

data/lib/rbbt/workflow/dependencies.rb

@@ -71,7 +71,7 @@ module Workflow
 
   def setup_override_dependency(dep, workflow, task_name)
     return [] if dep == :skip || dep == 'skip'
-    dep = Step === dep ? dep : Workflow.load_step(dep)
+    dep = Step === dep ? dep.dup : Workflow.load_step(dep)
     dep.workflow = workflow
     dep.info[:name] = dep.name
     dep.original_task_name ||= dep.task_name if dep.workflow
@@ -83,8 +83,9 @@ module Workflow
     rescue
       Log.exception $!
     end
+
     dep.task_name = task_name
-    dep.overriden = dep.original_task_name.to_sym
+    dep.overriden = dep.original_task_name.to_sym if dep.original_task_name
 
     dep.extend step_module
 

data/lib/rbbt/workflow/step.rb

@@ -351,38 +351,6 @@ class Step
     end
   end
 
-  #connected = true means that dependency searching ends when a result is done
-  #but dependencies are absent, meanining that the file could have been dropped
-  #in
-  def rec_dependencies(connected = false, seen = [])
-
-    # A step result with no info_file means that it was manually
-    # placed. In that case, do not consider its dependencies
-    return [] if ! (defined? WorkflowRemoteClient && WorkflowRemoteClient::RemoteStep === self) && ! Open.exists?(self.info_file) && Open.exists?(self.path.to_s) 
-
-    return [] if dependencies.nil? or dependencies.empty?
-
-    new_dependencies = []
-    if self.overriden?
-      archived_deps = []
-    else
-      archived_deps = self.info[:archived_info] ? self.info[:archived_info].keys : []
-    end
-
-    dependencies.each{|step| 
-      #next if self.done? && Open.exists?(info_file) && info[:dependencies] && info[:dependencies].select{|task,name,path| path == step.path }.empty?
-      next if archived_deps.include? step.path
-      next if seen.include? step.path
-      next if self.done? && connected && ! updatable?
-
-      r = step.rec_dependencies(connected, new_dependencies.collect{|d| d.path})
-      new_dependencies.concat r
-      new_dependencies << step
-    }
-
-    new_dependencies.uniq
-  end
-
   def writable?
     Open.writable?(self.path) && Open.writable?(self.info_file)
   end

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

@@ -206,7 +206,7 @@ class Step
     if dup and step.streaming? and not step.result.nil?
       if dep_step[step.path] and dep_step[step.path].length > 1
         stream = step.result
-        other_steps = dep_step[step.path].uniq
+        other_steps = dep_step[step.path].uniq.reject{|d| d.overriden }
         return unless other_steps.length > 1
         log_dependency_exec(step, "duplicating #{other_steps.length}") 
         copies = Misc.tee_stream_thread_multiple(stream, other_steps.length)
@@ -523,4 +523,36 @@ class Step
     set_info :dependencies, dependencies.collect{|dep| [dep.task_name, dep.name, dep.path]} if dependencies
   end
 
+  #connected = true means that dependency searching ends when a result is done
+  #but dependencies are absent, meanining that the file could have been dropped
+  #in
+  def rec_dependencies(connected = false, seen = [])
+
+    # A step result with no info_file means that it was manually
+    # placed. In that case, do not consider its dependencies
+    return [] if ! (defined? WorkflowRemoteClient && WorkflowRemoteClient::RemoteStep === self) && ! Open.exists?(self.info_file) && Open.exists?(self.path.to_s) 
+
+    return [] if dependencies.nil? or dependencies.empty?
+
+    new_dependencies = []
+    if self.overriden?
+      archived_deps = []
+    else
+      archived_deps = self.info[:archived_info] ? self.info[:archived_info].keys : []
+    end
+
+    dependencies.each{|step| 
+      #next if self.done? && Open.exists?(info_file) && info[:dependencies] && info[:dependencies].select{|task,name,path| path == step.path }.empty?
+      next if archived_deps.include? step.path
+      next if seen.include? step.path
+      next if self.done? && connected && ! updatable?
+
+      r = step.rec_dependencies(connected, new_dependencies.collect{|d| d.path})
+      new_dependencies.concat r
+      new_dependencies << step
+    }
+
+    new_dependencies.uniq
+  end
+
 end

metadata

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