rbbt-rest 1.3.13 → 1.3.14

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 67dce81d38feaadc05aaf7a687e1b2a404e3d8d2
4
- data.tar.gz: 9afbe5fb579fa2312d2265b4120e3334403b3c95
3
+ metadata.gz: a408afc2c389ab8d792cfc8da6447eb15392d18d
4
+ data.tar.gz: 182bcd9287fbd791df683500c0c8b529530b0007
5
5
  SHA512:
6
- metadata.gz: dc9822583807cf4072c9b653dea7ab6c5e01db1b01ca2c895b4982968861c6299ba493e09c50e7a2f040426d3515c88ee9dab9efe758e5fbdebc0108fb7d7fa8
7
- data.tar.gz: 572b0a098081e53db8bbd431d2c76c2a025f60c3fa8d1915d5e726a03227bc8908ea2533bd5ac0c9e832d940e45d431a01ec70f2d491a94be9246e1347bdae13
6
+ metadata.gz: 29b5143526794fb9a99f35c74ea1b0cf8324f96cb2026ffa1825142416fa48f4fee0bf7c0a5d4483f9bdc9070ca1eaeaf68a998dff6fe7bdf3e0e7a783d01a93
7
+ data.tar.gz: 6abadd9366fcc0e1e6b4111a9dae83ce78c92831acd7cda810062378ec78ba4164602c66086e3cc825845b04a783c36a5ce86e44f43b04f93f9f760ca0561e64
@@ -128,7 +128,6 @@ class WorkflowRESTClient
128
128
  exec_job
129
129
  else
130
130
  init_job(:synchronous)
131
- iii url
132
131
  self.load
133
132
  end
134
133
  end
@@ -162,17 +162,20 @@ module WorkflowRESTHelpers
162
162
  end
163
163
 
164
164
  begin
165
- job.run unless Open.exists? job.info_file
166
165
  job_url = to(File.join("/", workflow.to_s, task, job.name))
167
166
  job_url += "?_format=#{@format}" if @format
168
- begin
169
- Misc.insist [0.1, 0.2, 0.5, 1, 3] do
170
- raise unless Open.exists? job.info_file
171
- end
172
- rescue
167
+
168
+ if not job.started?
169
+ job.run true
170
+ job.join
171
+ end
172
+
173
+ #halt 200, job.name if format == :jobname
174
+ if format == :jobname
175
+ job.name
176
+ else
177
+ redirect job_url
173
178
  end
174
- halt 200, job.name if format == :jobname
175
- redirect job_url
176
179
  rescue
177
180
  Log.exception $!
178
181
  halt 500, $!.message
@@ -184,8 +187,6 @@ module WorkflowRESTHelpers
184
187
  end
185
188
 
186
189
  begin
187
- iii :fork
188
-
189
190
  job.fork
190
191
 
191
192
  job_url = to(File.join("/", workflow.to_s, task, job.name))
@@ -142,17 +142,16 @@ module Sinatra
142
142
  recursive_clean_job(workflow, job) if update == :recursive_clean
143
143
 
144
144
  begin
145
- started = job.info.any?
145
+ started = job.started?
146
146
  done = job.done?
147
- error = job.error?
147
+ error = job.error? || job.aborted?
148
148
 
149
- iii [:get, job.path, started, done, error]
150
149
  if done
151
150
  show_result job, workflow, task
152
151
  else
153
152
  if started
154
153
  case
155
- when job.status == :error
154
+ when error
156
155
  error_for job
157
156
  when execution_type(workflow, task) == :asynchronous
158
157
  wait_on job
@@ -2,9 +2,9 @@
2
2
  @import "_rbbt"
3
3
 
4
4
  @import "user"
5
+ @import "entity_card"
5
6
  @import "workflow"
6
7
  @import "finder"
7
- @import "entity_card"
8
8
  @import "favourites"
9
9
  @import "actions"
10
10
  @import "top_menu"
@@ -31,9 +31,15 @@ table
31
31
  .action_parameters
32
32
  +action_parameters
33
33
 
34
- .entity_card, .entity_list_card, .entity_map_card, .action_card
34
+ .entity_card, .entity_list_card, .entity_map_card, .action_card, .workflow_task
35
35
  +card
36
36
 
37
+ & > .card > .sidebar
38
+ h1, h2, h3, h4, h5, h6
39
+ margin: $indent
40
+ p
41
+ margin: $indent
42
+
37
43
  & > .card > .sidebar dl
38
44
  margin: $vindent $indent
39
45
  +indented_dl
@@ -41,6 +47,7 @@ table
41
47
  &.rbbt_accordion
42
48
  margin: 0 0
43
49
 
50
+
44
51
  & > dt, dd
45
52
  border-left: 0
46
53
  border-right: 0
@@ -18,7 +18,7 @@
18
18
  color: $color_alt2 !important
19
19
 
20
20
 
21
- =rbbt_menu_item($color_bg: $color_menu_item_bg, $color_text: $color_menu_item_text)
21
+ =rbbt_menu_item($color_bg: $color_menu_item_bg, $color_text: $color_menu_item_text, $color_menu_border: $color_menu_border)
22
22
  +_rbbt_menu_item($color_bg, $color_text)
23
23
 
24
24
  height: $size_menu_item
@@ -34,7 +34,7 @@
34
34
  height: $size_menu_item
35
35
  white-space: nowrap
36
36
 
37
- =rbbt_accordion_menu_item($color_bg: $color_menu_item_bg, $color_text: $color_menu_item_text)
37
+ =rbbt_accordion_menu_item($color_bg: $color_menu_item_bg, $color_text: $color_menu_item_text, $color_menu_border: $color_menu_border)
38
38
  +_rbbt_menu_item($color_bg, $color_text)
39
39
  border: 1px solid $color_menu_border
40
40
  border-top: 0px
@@ -44,7 +44,7 @@
44
44
  margin: 0
45
45
  padding: 7px
46
46
 
47
- =rbbt_tab_menu_item($color_bg: $color_menu_item_bg, $color_text: $color_menu_item_text)
47
+ =rbbt_tab_menu_item($color_bg: $color_menu_item_bg, $color_text: $color_menu_item_text, $color_menu_border: $color_menu_border)
48
48
  +_rbbt_menu_item($color_bg, $color_text)
49
49
 
50
50
  height: $size_menu_item
@@ -17,6 +17,7 @@ $color_menu_text: #020202
17
17
 
18
18
  .dark
19
19
  +rebase($base3,$base2,$base1,$base0,$base00,$base01,$base02,$base03)
20
+
20
21
  .light
21
22
  +rebase($base03,$base02,$base01,$base00,$base0,$base1,$base2,$base3)
22
23
 
@@ -62,6 +62,7 @@ $padding_top_menu: 5px
62
62
  &.user
63
63
  float: right
64
64
  background-color: $color_menu_bg
65
+
65
66
  dl.rbbt_menu > dd
66
67
  box-shadow: 1px 3px -4px 4px rgba(0, 0, 0, 0.1)
67
68
 
@@ -5,3 +5,13 @@
5
5
  right: 0
6
6
  margin-right: -1px
7
7
  padding: $vindent $indent
8
+ &.workflows
9
+ padding: 0
10
+ dl
11
+ overflow: hidden
12
+ ul
13
+ margin: 0
14
+ & > li
15
+ @media #{only-large}
16
+ +ellipsis_text
17
+ display: block
@@ -2,8 +2,22 @@ ul.tasks > li
2
2
  display: block !important
3
3
 
4
4
  .workflow_task
5
+ +card
6
+ .sidebar
7
+ .workflow_tasks
8
+ +rbbt_accordion
9
+
10
+ .description
11
+ +grid_row
12
+ +clearfix
13
+ .task_description
14
+
15
+
5
16
  .title
6
- span.workflow
17
+ .task_name
18
+ .workflow_link
19
+ display: inline-block
20
+ margin: $indent
7
21
  font-weight: 600
8
22
 
9
23
  span.task
@@ -14,9 +28,14 @@ ul.tasks > li
14
28
 
15
29
  .form
16
30
  @extend .action_parameters
31
+ margin: 0px !important
17
32
  select#_format
18
33
  width: 5em
19
34
  float: right
35
+ .examples
36
+ ul
37
+ li
38
+ +rbbt_menu_item($color_bg: $base3, $color_menu_border: $base3)
20
39
 
21
40
  dd.job_control, dd.job_files
22
41
  +clearfix
@@ -2,24 +2,26 @@
2
2
  - action = to(File.join('/', workflow.to_s, task.to_s))
3
3
  - task_info = workflow.task_info(task)
4
4
 
5
- .workflow_task
5
+ .workflow_task(id=id)
6
6
  .title
7
- %h3
8
- = workflow
9
- %span.task= Misc.humanize task
10
- - if task_info[:description]
11
- .description
12
- :markdown
13
- #{task_info[:description]}
7
+ %h3
8
+ =Misc.humanize task
9
+ .workflow_link
10
+ %a(href="/#{workflow.to_s}")= workflow
11
+ .description
12
+ - if task_info[:description]
13
+ .task_description
14
+ :markdown
15
+ #{task_info[:description]}
16
+
14
17
  .form
15
18
  = partial_render('partials/form', :id => id, :action => action, :method => 'post',
16
19
  :enctype => "multipart/form-data", :info => task_info, :klass => 'workflow_task')
17
-
20
+
18
21
  - if workflow.libdir.examples[task.to_s].exists?
19
22
  .examples
20
23
 
21
- %p
22
- Click the links bellow to load example data:
24
+ Click the links bellow to load example data:
23
25
 
24
26
  :javascript
25
27
  example_inputs = [];
@@ -36,11 +38,13 @@
36
38
 
37
39
  :javascript
38
40
  deffer(function(){
41
+ var form = $('.workflow_task[id=#{id}] > .form > form')
42
+
39
43
  $("a.load_example").click(function(){
40
44
  var link = $(this);
41
45
  var name = $(link).attr('name');
42
46
  var inputs = example_inputs[name];
43
- var form = link.parents('.workflow_task').find('.form')
47
+ form[0].reset()
44
48
 
45
49
  for (var input in inputs){
46
50
  var value = inputs[input]
@@ -11,5 +11,30 @@
11
11
  %dd
12
12
  %ul.jobs
13
13
 
14
+ - if defined? Sinatra::RbbtRESTWorkflow and Sinatra::RbbtRESTWorkflow::WORKFLOWS
15
+ - expoted_workflows = Sinatra::RbbtRESTWorkflow::WORKFLOWS.collect do |workflow|
16
+ - next if workflow.asynchronous_exports.empty? and workflow.synchronous_exports.empty? and workflow.exec_exports.empty?
17
+ - workflow
18
+
19
+ - expoted_workflows.compact!
20
+ - if expoted_workflows.any?
21
+ %dt.next Workflows
22
+ %dd.workflows
23
+ %dl.rbbt_vertical_menu
24
+ - expoted_workflows.each do |workflow|
25
+ %dt.next
26
+ = workflow.to_s
27
+ %dd
28
+ %p= workflow.documentation[:description].split(/\n\n/).first if workflow.documentation[:description]
29
+
30
+ %ul
31
+ - tasks = workflow.exec_exports + workflow.synchronous_exports + workflow.asynchronous_exports
32
+
33
+ - tasks.sort.each do |task|
34
+ %li
35
+ %a(href="#{File.join("/", workflow.to_s, task.to_s)}")= task
36
+ - info = workflow.task_info(task)
37
+ - if info[:description]
38
+ = info[:description].split(/\n\s*\n/).first
14
39
  %dt
15
40
  %a(href='/help') Help
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.3.13
4
+ version: 1.3.14
5
5
  platform: ruby
6
6
  authors:
7
7
  - Miguel Vazquez
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-04-21 00:00:00.000000000 Z
11
+ date: 2014-05-09 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rake