rbbt-util 5.26.3 → 5.26.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b582ba7448ba5e3ffcb0eac59efa4ef6a41cb90
-  data.tar.gz: 0e7144d18cc60fa26718b84949dc18bc61e318ad
+  metadata.gz: 9e4dda2ba8718e44af7064ac562b5535cb4271bf
+  data.tar.gz: 87e7d84660913247bae2b99da8728c9b22edba12
 SHA512:
-  metadata.gz: 12fbafe3468d6d0fbe5822875e7e8a1500e16b46b89e487a87392d756d7b0dc353c66a15fd9e006f5a494393dbe4bf857d101223a7e926e786abcf63be4ab557
-  data.tar.gz: 35e831ae16fe9fa4bb082186224bff54086c2e5ed6f126468b0e407a833bf833106789a23e67bf8feaa29870ca39332f2437f371eaaab0159b77c4f417e8d9df
+  metadata.gz: e7439eb5f1aab09428f79bca41ce43545e18c52ff5361ef43d35ae3394d6cc4655d3761dc6223c4e03617236927f2588a8e5e02d661a30959cbdc6e8fb88027f
+  data.tar.gz: 31c6f48ab66ac09fd20c6ba164623f2a33cab3ee7a0b968ec3fc26f9349706bbbd3824945b8021eebd4a60d02d216b6a3c8d11e8f9c450e9b8f56d0a49c3b347

data/lib/rbbt/resource.rb

@@ -64,9 +64,11 @@ module Resource
 
       if type == :install
         Log.debug "Preparing software: #{path}"
+        $set_software_env = false unless path.exists?
         path.produce
         software_dir = path.resource.root.software
-        set_software_env(software_dir)
+        set_software_env(software_dir) unless $set_software_env
+        $set_software_env = true
       end
     end
   end

data/lib/rbbt/tsv/stream.rb

@@ -56,7 +56,7 @@ module TSV
       preambles     = []
 
       streams = streams.collect do |stream|
-        parser = TSV::Parser.new stream, options
+        parser = TSV::Parser.new stream, options.dup
 
         lines         << parser.first_line
         empty         << stream               if parser.first_line.nil?
@@ -178,7 +178,7 @@ module TSV
               if values.nil?
                 values = _p.collect{|v| [v]}
               else
-                _p.each_with_index{|v,i| values[i] << v}
+                _p.each_with_index{|v,i| values[i] ||= []; values[i] << v}
               end
             end
 

data/lib/rbbt/util/log.rb

@@ -353,39 +353,39 @@ def mmm(obj, file = $stdout)
   Log.log_obj_inspect(obj, :medium, file)
 end
 
-def iii(obj, file = $stdout)
+def iii(obj=nil, file = $stdout)
   Log.log_obj_inspect(obj, :info, file)
 end
 
-def wwww(obj, file = $stdout)
+def wwww(obj=nil, file = $stdout)
   Log.log_obj_inspect(obj, :warn, file)
 end
 
-def eee(obj, file = $stdout)
+def eee(obj=nil, file = $stdout)
   Log.log_obj_inspect(obj, :error, file)
 end
 
-def ddf(obj, file = $stdout)
+def ddf(obj=nil, file = $stdout)
   Log.log_obj_fingerprint(obj, :debug, file)
 end
 
-def llf(obj, file = $stdout)
+def llf(obj=nil, file = $stdout)
   Log.log_obj_fingerprint(obj, :low, file)
 end
 
-def mmf(obj, file = $stdout)
+def mmf(obj=nil, file = $stdout)
   Log.log_obj_fingerprint(obj, :medium, file)
 end
 
-def iif(obj, file = $stdout)
+def iif(obj=nil, file = $stdout)
   Log.log_obj_fingerprint(obj, :info, file)
 end
 
-def wwwf(obj, file = $stdout)
+def wwwf(obj=nil, file = $stdout)
   Log.log_obj_fingerprint(obj, :warn, file)
 end
 
-def eef(obj, file = $stdout)
+def eef(obj=nil, file = $stdout)
   Log.log_obj_fingerprint(obj, :error, file)
 end
 

data/lib/rbbt/workflow/prepare.rb

@@ -9,15 +9,17 @@ class Step
     jobs.each do |job|
       job.rec_dependencies.each do |dep|
         next if dep.done?
+        dep.clean if dep.error? && dep.recoverable_error?
         deps << dep if tasks.include?(dep.task_name.to_s) or tasks.include?([dep.workflow.to_s, dep.task_name] * "#")
       end
     end
 
     cpus = jobs.length if cpus.to_s == "max"
     cpus = cpus.to_i if String === cpus
-    TSV.traverse deps.collect{|dep| dep.path}, :type => :array, :cpus => cpus, :bar => "Prepare dependencies #{Misc.fingerprint tasks} for #{Misc.fingerprint job}" do |path|
+    TSV.traverse deps.collect{|dep| dep.path}, :type => :array, :cpus => cpus, :bar => "Prepare dependencies #{Misc.fingerprint tasks} for #{Misc.fingerprint jobs}" do |path|
       dep = deps.select{|dep| dep.path == path}.first
       dep.produce
+      nil
     end
   end
 end

metadata

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