rbbt-util 5.17.56 → 5.17.57

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f19b263699fee9f9c4a3457fc5a5ce52cc31f3e
-  data.tar.gz: 07d8a21299dcdba62b42417ac8441053ad798b34
+  metadata.gz: 7b6d3652efed8fd7e0054efa634c13ddf13370cb
+  data.tar.gz: 8053d9cda8fd1b932907edb6602d2669c96d5914
 SHA512:
-  metadata.gz: 2833843af1acc35f46c6f94cd33320fbab757e05dbc3782f4d6f21d64314d0d6cf54146d07e82539168ec4942628c6974bba5778b60fdd05e8585a737e93e38e
-  data.tar.gz: 8efa91cd581a0919814166e4f384a121f5541308c416b118ab05ade8ffd0710c31a6e1b8c4eef7851a4e89a5e61c581ff6780089118597aee81d15d1f8d25553
+  metadata.gz: 782f3d879090ce75c0ae7599263e1687f67a5069af1b73ded77b044cf300b99d6aa1a86f880b16372f043a2f18e4f76ba8a9f35613943829e1cc650e6fca701a
+  data.tar.gz: bd1c28d289356c875702ccfdc3e8f76f13106f1e32fba04a472d5a3dde7486734e55d0f75477af57ad24a81fdd754b95f8bb659c3fd5f9ae49a9db6a07d18d1d

data/lib/rbbt/workflow/accessor.rb

@@ -464,7 +464,7 @@ module Workflow
                                 when String, Symbol
                                   all_deps.concat rec_dependencies(dep.to_sym)
                                 when DependencyBlock
-                                  all_deps << dep.dependency
+                                  all_deps << dep.dependency if dep.dependency
                                   case dep.dependency
                                   when Array
                                     dep_wf, dep_task = dep.dependency

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

@@ -183,7 +183,7 @@ class Step
 
           merge_info({
             :pid => Process.pid,
-            :issued => Time.now,
+            :issued => (issue_time = Time.now),
             :name => name,
             :clean_name => clean_name,
             :dependencies => dependencies.collect{|dep| [dep.task_name, dep.name, dep.path]},
@@ -240,8 +240,9 @@ class Step
                 if status != :done
                   Misc.insist do
                     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, "#{Log.color :magenta, "Completed"} #{Log.color :yellow, task.name.to_s || ""} in #{time_elapsed.to_i} sec."
+                    log :done, "#{Log.color :magenta, "Completed"} #{Log.color :yellow, task.name.to_s || ""} in #{time_elapsed.to_i}+#{(total_time_elapsed - time_elapsed).to_i} sec."
                   end
                 end
               rescue
@@ -259,8 +260,9 @@ class Step
             end
           else
             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, "#{Log.color :magenta, "Completed"} #{Log.color :yellow, task.name.to_s || ""} in #{time_elapsed.to_i} sec."
+            log :done, "#{Log.color :magenta, "Completed"} #{Log.color :yellow, task.name.to_s || ""} in #{time_elapsed.to_i}+#{(total_time_elapsed - time_elapsed).to_i} sec."
           end
 
           result

data/share/rbbt_commands/workflow/info

@@ -61,6 +61,7 @@ dependencies = info[:dependencies]
 inputs = info[:inputs]
 status = info[:status]
 time = info[:time_elapsed]
+total_time = info[:total_time_elapsed]
 messages = info[:messages]
 backtrace = info[:backtrace]
 pid = info[:pid]
@@ -71,6 +72,7 @@ puts Log.color(:magenta, "File") << ": " << step.path
 puts Log.color(:magenta, "Status") << ": " << status_msg(status)
 puts Log.color(:magenta, "Pid") << ": " << pid_msg(pid, status.to_s == "done")
 puts Log.color(:magenta, "Time") << ": " << time.to_i.to_s << " sec." if time
+puts Log.color(:magenta, "Total time") << ": " << total_time.to_i.to_s << " sec." if time
 if inputs and inputs.any?
   puts Log.color(:magenta, "Inputs")
   inputs.each do |input,value|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.17.56
+  version: 5.17.57
 platform: ruby
 authors:
 - Miguel Vazquez