rbbt-rest 1.6.20 → 1.6.21
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/rest/workflow.rb +2 -1
- data/lib/rbbt/rest/workflow/jobs.rb +2 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 29af4a586ecd7cf0a2283f030cdf2de22fcee9e9
|
|
4
|
+
data.tar.gz: 93ea26c456fe9126fef2e6ff5e29f2ecde4a82cf
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 044f6ee1833c243e12514bcd414f063e61096d557677a745342cc2d25fa835e7f2b71f8026ec6020f645b0a7dfc262ca47924261173f75c5fc209a5103fbc101
|
|
7
|
+
data.tar.gz: 75e4553a068d80f8e5fbce2c60eb53117b31b53e023d8246a6c1cfad1a0e061dfe9f97c8db76636f2af3bc3e8a484afebb5199e840c1f3fb14a91cb1309c512f
|
data/lib/rbbt/rest/workflow.rb
CHANGED
|
@@ -146,10 +146,11 @@ module Sinatra
|
|
|
146
146
|
show_result job, workflow, task
|
|
147
147
|
else
|
|
148
148
|
if started
|
|
149
|
+
exec_type = execution_type(workflow, task)
|
|
149
150
|
case
|
|
150
151
|
when error
|
|
151
152
|
error_for job
|
|
152
|
-
when
|
|
153
|
+
when (exec_type == :asynchronous or exec_type == :async)
|
|
153
154
|
wait_on job
|
|
154
155
|
else
|
|
155
156
|
job.join
|
|
@@ -43,7 +43,7 @@ module WorkflowRESTHelpers
|
|
|
43
43
|
return cache_type if cache_type
|
|
44
44
|
return :sync if export == :exec and format == :html
|
|
45
45
|
return export if export == :exec
|
|
46
|
-
return :
|
|
46
|
+
return :asynchronous
|
|
47
47
|
end
|
|
48
48
|
|
|
49
49
|
def prepare_job_inputs(workflow, task, params)
|
|
@@ -150,6 +150,7 @@ module WorkflowRESTHelpers
|
|
|
150
150
|
job.recursive_clean if update == :recursive_clean
|
|
151
151
|
|
|
152
152
|
execution_type = execution_type(workflow, task)
|
|
153
|
+
|
|
153
154
|
case execution_type.to_sym
|
|
154
155
|
when :exec
|
|
155
156
|
show_exec_result job.exec, workflow, task
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: rbbt-rest
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.6.
|
|
4
|
+
version: 1.6.21
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Miguel Vazquez
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2015-07-
|
|
11
|
+
date: 2015-07-31 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: rake
|