rbbt-util 5.23.12 → 5.23.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6ae6631eb6e9bb1a1b31eb427c4245072253f4f
-  data.tar.gz: 333e8a20a8a3aa7d631a879d35ff808fb2c51946
+  metadata.gz: d331a9915b98d988c11b4e718eb0c64d7a6b13a4
+  data.tar.gz: 5b873c2bce7542067b6705d55d56fb67bdba4cdb
 SHA512:
-  metadata.gz: 9328bfdbc4c55e3e567edaaed2e11e0ea4c2b160d88d6bb0eef86b2bb785ec597c57008427b044ea106b288e4956148eedc65bc2f798dda1a3a5c6cdbbfaa944
-  data.tar.gz: fb7291ccdf11019b1f1053f0867775ed0d6434e81a8c51344cc40d705a1a14922a71d96812d8c4452ee9fbf0be3549c2f284a6e1e9e7ff92d4fb346985952637
+  metadata.gz: bf3b8e7ce0c50d243076eb11480195773c9be0f7ead539e886c4ca82b5fc981f3fa748ae5dabbea99679a77eeaef7c5ff7cbb9f538d4db481ceacab7f5efa051
+  data.tar.gz: 5ef29858babd3973b740aaaccd389b9f0f4c0800108974e19f6fce56ea314684df17f139a010ab677f3f6e22d7dbc692ef3ce7d19257ddaf943e0c8937c4c8a5

data/lib/rbbt/util/misc/pipes.rb

@@ -91,6 +91,7 @@ module Misc
 
 
       ConcurrentStream.setup sin, :pair => sout
+      ConcurrentStream.setup out, :pair => sin
 
       thread = Thread.new do 
         begin
@@ -101,17 +102,21 @@ module Misc
 
         rescue Aborted
           Log.medium "Aborted open_pipe: #{$!.message}"
+          raise $!
         rescue Exception
           Log.medium "Exception in open_pipe: #{$!.message}"
           Log.exception $!
-          sin.raise($!) if sin.respond_to? :raise
-          raise $!
+          begin
+            sin.raise($!) if sin.respond_to? :raise
+            sin.join if sin.respond_to? :join
+          ensure
+            raise $!
+          end
         end
       end
 
-
       sin.threads = [thread]
-      ConcurrentStream.setup sout, :threads => [thread], :pair => sin
+      sout.threads = [thread]
     end
 
     sout

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

@@ -158,7 +158,7 @@ class Step
       end
 
     rescue TryAgain
-      Log.low "Retrying dep. #{Log.color :yellow, dependency.task_name.to_s} -- [#{dependency.status}] #{dependency.messages.last}"
+      Log.low "Retrying dep. #{Log.color :yellow, dependency.task_name.to_s} -- [#{dependency.status}] #{(dependency.messages || ["No message"]).last}"
       retry
     rescue Aborted, Interrupt
       Log.error "Aborted dep. #{Log.color :red, dependency.task_name.to_s}"
@@ -414,12 +414,11 @@ class Step
       run_compute_dependencies(type, list, dep_step)
     end
 
-    Log.medium "Aborting waiting dangling dependencies"
-    all_deps.each do |dep|
-      next if dep.done?
-      next unless canfail_paths.include? dep.path
-      dep.abort if dep.waiting?
-    end
+    dangling_deps = all_deps.reject{|dep| dep.done? || canfail_paths.include?(dep.path) }.
+      select{|dep| dep.waiting? }
+
+    Log.medium "Aborting waiting dangling dependencies #{Misc.fingerprint dangling_deps}" if dangling_deps.any?
+    dangling_deps.each{|dep| dep.abort }
 
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.23.12
+  version: 5.23.13
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-10 00:00:00.000000000 Z
+date: 2018-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake