rbbt-util 5.2.2 → 5.2.3
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.
- data/lib/rbbt/util/misc.rb +1 -1
- data/lib/rbbt/workflow/accessor.rb +1 -1
- data/share/rbbt_commands/workflow/task +15 -3
- metadata +1 -1
data/lib/rbbt/util/misc.rb
CHANGED
@@ -11,10 +11,12 @@ def usage(workflow = nil, task = nil)
|
|
11
11
|
end
|
12
12
|
|
13
13
|
if task.nil?
|
14
|
+
workflow.load_tasks if workflow.respond_to? :load_tasks
|
14
15
|
workflow.doc
|
15
16
|
else
|
16
17
|
workflow.doc(task)
|
17
18
|
end
|
19
|
+
|
18
20
|
exit 0
|
19
21
|
end
|
20
22
|
|
@@ -146,14 +148,24 @@ name = options.delete(:name) || "Default"
|
|
146
148
|
# get job args
|
147
149
|
sopt_option_string = SOPT_options(workflow, task)
|
148
150
|
job_options = SOPT.get sopt_option_string
|
149
|
-
job_options = fix_options(workflow,task, job_options)
|
151
|
+
job_options = fix_options(workflow, task, job_options)
|
150
152
|
|
151
153
|
#- get job
|
154
|
+
|
152
155
|
job = workflow.job(task.name, name, job_options)
|
153
156
|
|
154
157
|
# clean job
|
155
|
-
|
156
|
-
job.
|
158
|
+
if clean and job.done?
|
159
|
+
job.clean
|
160
|
+
sleep 1
|
161
|
+
job = workflow.job(task.name, name, job_options)
|
162
|
+
end
|
163
|
+
|
164
|
+
if recursive_clean and job.done?
|
165
|
+
job.recursive_clean
|
166
|
+
sleep 1
|
167
|
+
job = workflow.job(task.name, name, job_options)
|
168
|
+
end
|
157
169
|
|
158
170
|
# run
|
159
171
|
if do_fork
|