rbbt-util 5.17.56 → 5.17.57
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/rbbt/workflow/accessor.rb +1 -1
- data/lib/rbbt/workflow/step/run.rb +5 -3
- data/share/rbbt_commands/workflow/info +2 -0
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 7b6d3652efed8fd7e0054efa634c13ddf13370cb
|
|
4
|
+
data.tar.gz: 8053d9cda8fd1b932907edb6602d2669c96d5914
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 782f3d879090ce75c0ae7599263e1687f67a5069af1b73ded77b044cf300b99d6aa1a86f880b16372f043a2f18e4f76ba8a9f35613943829e1cc650e6fca701a
|
|
7
|
+
data.tar.gz: bd1c28d289356c875702ccfdc3e8f76f13106f1e32fba04a472d5a3dde7486734e55d0f75477af57ad24a81fdd754b95f8bb659c3fd5f9ae49a9db6a07d18d1d
|
|
@@ -464,7 +464,7 @@ module Workflow
|
|
|
464
464
|
when String, Symbol
|
|
465
465
|
all_deps.concat rec_dependencies(dep.to_sym)
|
|
466
466
|
when DependencyBlock
|
|
467
|
-
all_deps << dep.dependency
|
|
467
|
+
all_deps << dep.dependency if dep.dependency
|
|
468
468
|
case dep.dependency
|
|
469
469
|
when Array
|
|
470
470
|
dep_wf, dep_task = dep.dependency
|
|
@@ -183,7 +183,7 @@ class Step
|
|
|
183
183
|
|
|
184
184
|
merge_info({
|
|
185
185
|
:pid => Process.pid,
|
|
186
|
-
:issued => Time.now,
|
|
186
|
+
:issued => (issue_time = Time.now),
|
|
187
187
|
:name => name,
|
|
188
188
|
:clean_name => clean_name,
|
|
189
189
|
:dependencies => dependencies.collect{|dep| [dep.task_name, dep.name, dep.path]},
|
|
@@ -240,8 +240,9 @@ class Step
|
|
|
240
240
|
if status != :done
|
|
241
241
|
Misc.insist do
|
|
242
242
|
set_info :done, (done_time = Time.now)
|
|
243
|
+
set_info :total_time_elapsed, (total_time_elapsed = done_time - issue_time)
|
|
243
244
|
set_info :time_elapsed, (time_elapsed = done_time - start_time)
|
|
244
|
-
log :done, "#{Log.color :magenta, "Completed"} #{Log.color :yellow, task.name.to_s || ""} in #{time_elapsed.to_i} sec."
|
|
245
|
+
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."
|
|
245
246
|
end
|
|
246
247
|
end
|
|
247
248
|
rescue
|
|
@@ -259,8 +260,9 @@ class Step
|
|
|
259
260
|
end
|
|
260
261
|
else
|
|
261
262
|
set_info :done, (done_time = Time.now)
|
|
263
|
+
set_info :total_time_elapsed, (total_time_elapsed = done_time - issue_time)
|
|
262
264
|
set_info :time_elapsed, (time_elapsed = done_time - start_time)
|
|
263
|
-
log :done, "#{Log.color :magenta, "Completed"} #{Log.color :yellow, task.name.to_s || ""} in #{time_elapsed.to_i} sec."
|
|
265
|
+
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."
|
|
264
266
|
end
|
|
265
267
|
|
|
266
268
|
result
|
|
@@ -61,6 +61,7 @@ dependencies = info[:dependencies]
|
|
|
61
61
|
inputs = info[:inputs]
|
|
62
62
|
status = info[:status]
|
|
63
63
|
time = info[:time_elapsed]
|
|
64
|
+
total_time = info[:total_time_elapsed]
|
|
64
65
|
messages = info[:messages]
|
|
65
66
|
backtrace = info[:backtrace]
|
|
66
67
|
pid = info[:pid]
|
|
@@ -71,6 +72,7 @@ puts Log.color(:magenta, "File") << ": " << step.path
|
|
|
71
72
|
puts Log.color(:magenta, "Status") << ": " << status_msg(status)
|
|
72
73
|
puts Log.color(:magenta, "Pid") << ": " << pid_msg(pid, status.to_s == "done")
|
|
73
74
|
puts Log.color(:magenta, "Time") << ": " << time.to_i.to_s << " sec." if time
|
|
75
|
+
puts Log.color(:magenta, "Total time") << ": " << total_time.to_i.to_s << " sec." if time
|
|
74
76
|
if inputs and inputs.any?
|
|
75
77
|
puts Log.color(:magenta, "Inputs")
|
|
76
78
|
inputs.each do |input,value|
|