rbbt-util 5.26.67 → 5.26.68

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11c74222080257b01d844657b7800d09bb86508356dd9637dbbbd5f9c7d3b03e
-  data.tar.gz: b5bd41b357c8ca36ef360e193f9b7ad9129a4716f461e9abb1ed5355ce25175d
+  metadata.gz: 8b8ed0fc568f3cb1688d21b40a222d37b6e301c56c1eb18d6fb46838f880f4b5
+  data.tar.gz: dc964179d48405b167b03490cf1fa57d44e94c2811921473475ec51d762cd901
 SHA512:
-  metadata.gz: cd2405dfb9555645f3dfcf6b08c5d3d73436b12956176e09e4f6f3a706e7d43c3facf0742fbf5e13234c226a0e3bc4d79062c36c60ea26fa4a09ae63e38c837a
-  data.tar.gz: 612da5e0dc0e3e9396e59256a496aab6a35f9cf9929617843b8b869203d1de6456670c4a919f85ce8d14b1ae30babfaf27a0df7bbb1a96c0ec692243cbec8f28
+  metadata.gz: 61db65a33fe163ea64638de873211e5ebb63c56e0aa502e9e50cbe2ebdba8aba691b624802cc1b2abe22bafeaae2b50942f392a0e352c2d6eda854d478d6989e
+  data.tar.gz: 83bb4b7b4a7f19f3a815da2d57035a4cd25ec6a2998eccc9a8ce0b9f59bb47baecee28d30b7266178b1842cad3dd86b135ca1e5359e0ad3724f9208e210a55e0

data/lib/rbbt/rest/client/get.rb

@@ -34,15 +34,31 @@ class WorkflowRESTClient
     fixed
   end
 
+  def self.parse_exception(text)
+    klass, message = text.split " => "
+    begin
+      klass = Kernel.const_get klass
+      return klass.new message
+    rescue
+      message
+    end
+  end
+
   def self.capture_exception
     begin
       yield
     rescue Exception => e
       raise e unless e.respond_to? :response
       begin
-        klass, message = e.response.to_s.split " => "
-        klass = Kernel.const_get klass
-        raise klass.new message
+        ne = parse_exception e.response.to_s
+        case ne
+        when String
+          raise e.class, ne
+        when Exception
+          raise ne
+        else
+          raise
+        end
       rescue
         raise e
       end

data/lib/rbbt/rest/client/run.rb

@@ -58,7 +58,22 @@ class WorkflowRESTClient::RemoteStep
             end
             sin.close
           else
-            parent.raise "Error in RestClient: " << rok.message
+            err = StringIO.new
+            rok.read_body do |c,_a, _b|
+              err.write c
+            end
+            err.rewind
+            reader = Zlib::GzipReader.new(err)
+            text =  reader.read
+            ne = WorkflowRESTClient.parse_exception text
+            case ne
+            when String
+              parent.raise e.class, ne
+            when Exception
+              parent.raise ne
+            else
+              parent.raise "Error in RestClient: " << rok.message
+            end
           end
         end
 

data/lib/rbbt/util/cmd.rb

@@ -144,6 +144,10 @@ module CMD
     all_args = *args
 
     all_args << {} unless Hash === all_args.last
+
+    level = all_args.last[:log] || 0
+    level = level.to_i
+
     all_args.last[:log] = true
     all_args.last[:pipe] = true
 
@@ -151,12 +155,12 @@ module CMD
     pid = io.pids.first
 
     while c = io.getc
-      STDERR << c if Log.severity == 0
+      STDERR << c if Log.severity <= level
       if c == "\n"
         if pid
-          Log.logn "STDOUT [#{pid}]: ", 0
+          Log.logn "STDOUT [#{pid}]: ", level
         else
-          Log.logn "STDOUT: ", 0
+          Log.logn "STDOUT: ", level
         end
       end
     end 

data/lib/rbbt/workflow/provenance.rb

@@ -9,7 +9,7 @@ class Step
               :green
             when :dependencies, :waiting, :setup
               :yellow
-            when :notfound
+            when :notfound, :cleaned
               :blue
             else
               if status.to_s.index ">"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.26.67
+  version: 5.26.68
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-02 00:00:00.000000000 Z
+date: 2019-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake