rbbt-util 5.26.168 → 5.26.169

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e40fba857594d4e21bb57da16268f22032c6d101ebaac110de8094cba38b12a7
-  data.tar.gz: 33b4251a885bb44b1ec45aab8e2aa2f96c4066c024e5133f3d28786c9b11aaa3
+  metadata.gz: 9518793ebcf5bad66987d7d3c57627708a5821eb6b9680b3e26be2c7ef210360
+  data.tar.gz: 8fabc19346ad08c78f898d1e377c652b38b71edfe51a81f831fc14f114cb78a4
 SHA512:
-  metadata.gz: 0aa7e9832fae143d5cb01fb728aa47d2cc9a78617791202681499bb7d90a6f3c76bb41d8d314c424c144d0ed2ac801acc42e1797d6f2f16781c43589f2e724a9
-  data.tar.gz: '084fd15a2fc4cb3513d41d1f5e51623073c713a92970869d0970e232af7ed5c110aab88521451c0706d2b723f0e1a51f4e1fcfdce34dcea6ef3acf9e6e434c5e'
+  metadata.gz: 7c5b12556e4c8b4b844982378c7478916b2f6cef846c9f0f864405c1753440688593b9c0ce767ae01c32c0f5708df6fe09f0e8eb147037d098f3d029220fe972
+  data.tar.gz: 8be6d8482a4a1ce953f9fe9a73d66318a7dd0e2e7c03d665a1ccfaf43165239ea37c0823eace9448051d646cd2d493219aefbaf404633c5edbd2271d132cace7

data/lib/rbbt/tsv/parallel/traverse.rb

@@ -80,7 +80,7 @@ module TSV
           begin
             callback.call yield(k,v,fields)
           rescue Exception
-            Log.exception $!
+            Log.warn "Traverse exception on element: #{Misc.fingerprint([k, v, fields])}"
             raise $!
           ensure
             bar.tick if bar
@@ -125,6 +125,9 @@ module TSV
         hash.each do |k,v|
           begin
             yield k,v 
+          rescue Exception
+            Log.warn "Traverse exception on element: #{Misc.fingerprint([k, v])}"
+            raise $!
           ensure
             bar.tick if bar
           end
@@ -149,6 +152,9 @@ module TSV
         array.each do |e|
           begin
             callback.call yield(e)
+          rescue Exception
+            Log.warn "Traverse exception on element: #{Misc.fingerprint(e)}"
+            raise $!
           ensure
             bar.tick if bar
           end
@@ -159,7 +165,7 @@ module TSV
           begin
             yield e
           rescue Exception
-            Log.exception $!
+            Log.warn "Traverse exception on element: #{Misc.fingerprint(e)}"
             raise $!
           ensure
             bar.tick if bar
@@ -187,6 +193,9 @@ module TSV
           e = queue.pop
           begin
             callback.call yield(e)
+          rescue Exception
+            Log.warn "Traverse exception on element: #{Misc.fingerprint(e)}"
+            raise $!
           ensure
             bar.tick if bar
           end
@@ -198,7 +207,7 @@ module TSV
           begin
             yield e
           rescue Exception
-            Log.exception $!
+            Log.warn "Traverse exception on element: #{Misc.fingerprint(e)}"
             raise $!
           ensure
             bar.tick if bar
@@ -214,6 +223,7 @@ module TSV
       join.call(error) if join
     end
   end
+
   def self.traverse_io_array(io, options = {}, &block)
     callback, bar, join = Misc.process_options options, :callback, :bar, :join
     begin
@@ -239,6 +249,9 @@ module TSV
           end
           begin
             callback.call yield line.chomp
+          rescue Exception
+            Log.warn "Traverse exception on element: #{Misc.fingerprint(line)}"
+            raise $!
           ensure
             bar.tick if bar
           end
@@ -248,6 +261,9 @@ module TSV
         while line = io.gets
           begin
             yield line.chomp
+          rescue Exception
+            Log.warn "Traverse exception on element: #{Misc.fingerprint(line)}"
+            raise $!
           ensure
             bar.tick if bar
           end
@@ -284,9 +300,10 @@ module TSV
         begin
           TSV::Parser.traverse(io, options) do |k,v,f|
             begin
-              callback.call yield k, v,f
+              callback.call yield k, v, f
             rescue Exception
               exception = $!
+              Log.warn "Traverse exception on element: #{Misc.fingerprint([k, v, f])}"
               raise $!
             end
             bar.tick if bar
@@ -413,9 +430,9 @@ module TSV
     q = RbbtThreadQueue.new num
 
     if callback
-      block = Proc.new do |k,v,mutex|
-        v, mutex = nil, v if mutex.nil?
-        res = yield k, v, mutex
+      block = Proc.new do |*args|
+        mutex = args.pop
+        res = yield *args
         mutex.synchronize do
           callback.call res 
         end

data/lib/rbbt/workflow/usage.rb

@@ -73,7 +73,7 @@ module Workflow
                         dep_tree = {}
                         self.task_dependencies[name].reverse.each do |dep|
                           dep = dep.first if Array === dep && dep.length == 1
-                          dep = dep.dependency if Proc === dep
+                          dep = dep.dependency if DependencyBlock === dep
 
                           workflow, task = case dep
                                            when Array

metadata

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