rbbt-util 5.21.107 → 5.21.109

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b175ea3910c3d5cf2fc2167e7f87cdb5661de0c8
-  data.tar.gz: 379089aea07b9e8351f8d9b2b92c69da8f796f3f
+  metadata.gz: 75212596904098b73851ec84788f599725a8cdf4
+  data.tar.gz: c353b207e28eaca9646f9102118c2bdeca997040
 SHA512:
-  metadata.gz: 819d0cbb8955515cafe46354dc77a095353f1588ec08da00a3bd5f0d38553cb2cb3cb97db281960c254127fd62ff41b6d34748019f9de9acedec7faaac1c80de
-  data.tar.gz: 4c8f311f4e9cc10ce591ebb7aff8eab47b450c1715a2329eee865b678354192be542b9697750a0e8d11deb83cb23ba970f626a3a6cd682a1b5357dd73ff1cb8c
+  metadata.gz: 6edbc878612e5727dbbd263e069f1e88330559b899ff90619c780fec660ce7ac1724f8f79722eb617158b479b3202ca28a116a8dd5cadbd517c016faed975356
+  data.tar.gz: 451774f390d7dbffa6a0f1ecd62b8cfac200129c31399f4ac9997297a58f2ee3c93192c16b15eee027349def00216f3c5c4cc5feef600f54b1f8b6c21b3501b1

data/lib/rbbt/monitor.rb

@@ -52,7 +52,7 @@ module Rbbt
   def self.locks(dirs = LOCK_DIRS)
     dirs.collect do |dir|
       next unless Open.exists? dir
-      `find "#{ dir }" -name "*.lock" 2>/dev/null`.split "\n"
+      `find -L "#{ dir }" -name "*.lock" 2>/dev/null`.split "\n"
     end.compact.flatten
   end
 
@@ -82,7 +82,7 @@ module Rbbt
   def self.sensiblewrites(dirs = SENSIBLE_WRITE_DIRS)
     dirs.collect do |dir|
       next unless Open.exists? dir
-      `find "#{ dir }" -not -name "*.lock" -not -type d 2>/dev/null`.split "\n"
+      `find -L "#{ dir }" -not -name "*.lock" -not -type d 2>/dev/null`.split "\n"
     end.compact.flatten
   end
 
@@ -104,7 +104,7 @@ module Rbbt
   def self.persists(dirs = PERSIST_DIRS)
     dirs.collect do |dir|
       next unless Open.exists? dir
-      `find "#{ dir }" -name "*.persist" 2>/dev/null`.split "\n"
+      `find -L "#{ dir }" -name "*.persist" 2>/dev/null`.split "\n"
     end.compact.flatten
   end
 
@@ -146,7 +146,7 @@ module Rbbt
           task = File.basename(taskdir)
           next if tasks and not tasks.include? task
 
-          cmd = "find '#{ taskdir }/' -not -type d -not -path '*/*.files/*' -not -path '*/*.pid' 2>/dev/null"
+          cmd = "find -L '#{ taskdir }/' -not -type d -not -path '*/*.files/*' -not -path '*/*.pid' 2>/dev/null"
           files = CMD.cmd(cmd, :pipe => true)
           TSV.traverse files, :type => :array, :into => jobs, :_bar => "Finding jobs in #{ taskdir }" do |file|
             _files << file

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

@@ -133,7 +133,8 @@ class WorkflowRESTClient
         info = begin
                  WorkflowRESTClient.get_json(File.join(@url, 'info'))
                rescue
-                 {}
+                 clean
+                 raise $!
                end
         info = WorkflowRESTClient.fix_hash(info)
         info[:status] = info[:status].to_sym if String === info[:status]

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

@@ -110,11 +110,11 @@ module Misc
     when TSV === obj
       remove_long_items((obj.all_fields || []) + obj.keys.sort)
     when (Array === obj and obj.length > ARRAY_MAX_LENGTH)
-      remove_long_items(obj[0..ARRAY_MAX_LENGTH-2] << "TRUNCATED at #{ ARRAY_MAX_LENGTH } (#{obj.length})")
+      remove_long_items(obj[0..ARRAY_MAX_LENGTH-2] << "TRUNCATED at #{ ARRAY_MAX_LENGTH }/#{obj.length}")
     when (Hash === obj and obj.length > ARRAY_MAX_LENGTH)
-      remove_long_items(obj.collect.compact[0..ARRAY_MAX_LENGTH-2] << ["TRUNCATED", "at #{ ARRAY_MAX_LENGTH } (#{obj.length})"])
+      remove_long_items(obj.collect.compact[0..ARRAY_MAX_LENGTH-2] << ["TRUNCATED", "at #{ ARRAY_MAX_LENGTH }/#{obj.length}"])
     when (String === obj and obj.length > STRING_MAX_LENGTH)
-      obj[0..STRING_MAX_LENGTH-1] << " TRUNCATED at #{STRING_MAX_LENGTH} (#{obj.length})"
+      obj[0..STRING_MAX_LENGTH-1] << " TRUNCATED at #{STRING_MAX_LENGTH}/#{obj.length}"
     when Hash === obj
       new = {}
       obj.each do |k,v|

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

@@ -128,7 +128,8 @@ class Step
     result = nil
 
     begin
-      @mutex.synchronize do
+      time_elapsed = total_time_elapsed = nil
+      res = @mutex.synchronize do
         no_load = :stream if no_load
 
         Open.write(pid_file, Process.pid.to_s) unless Open.exists?(path) or Open.exists?(pid_file)
@@ -312,7 +313,7 @@ class Step
             set_info :done, (done_time = Time.now)
             set_info :total_time_elapsed, (total_time_elapsed = done_time - issue_time)
             set_info :time_elapsed, (time_elapsed = done_time - start_time)
-            log :done, "Completed step #{Log.color :yellow, task.name.to_s || ""} in #{time_elapsed.to_i}+#{(total_time_elapsed - time_elapsed).to_i} sec."
+            log :ending
             Step.purge_stream_cache
             FileUtils.rm pid_file if File.exist?(pid_file)
           end
@@ -330,6 +331,8 @@ class Step
           @result = prepare_result result, @task.result_description
         end
       end
+      log :done, "Completed step #{Log.color :yellow, task.name.to_s || ""} in #{time_elapsed.to_i}+#{(total_time_elapsed - time_elapsed).to_i} sec." unless stream or time_elapsed.nil?
+      res
     rescue Aborted, Interrupt
       abort
       stop_dependencies

data/lib/rbbt/workflow/step.rb

@@ -276,7 +276,7 @@ class Step
 
   def update
     if dirty?
-      dependencies.collect{|d| d.update}
+      dependencies.collect{|d| d.update} if dependencies
       clean
     end
   end

data/share/rbbt_commands/workflow/task

@@ -325,7 +325,10 @@ begin
 
   if do_exec or (job.respond_to?(:is_exec) and job.is_exec)
     res = job.exec(:stream)
-    #res = JSON.parse(res.read) if (defined?(WorkflowRESTClient) and WorkflowRESTClient::RemoteStep === job)
+
+    result_type = job.result_type
+
+    res = JSON.parse(res.read) if (defined?(WorkflowRESTClient) and WorkflowRESTClient::RemoteStep === job) && %w(array float integer boolean).include?(result_type.to_s)
 
     case
     when res.respond_to?(:gets)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.21.107
+  version: 5.21.109
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-20 00:00:00.000000000 Z
+date: 2017-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake