rbbt-rest 1.1.2 → 1.1.3

Sign up to get free protection for your applications and to get access to all the features.
@@ -99,6 +99,9 @@ class WorkflowRESTClient
99
99
  else
100
100
  url, params = @url, {:_cache_type => :synchronous}
101
101
  end
102
+
103
+ params[:jobname] = @name if @name
104
+
102
105
  case result_type
103
106
  when :string
104
107
  WorkflowRESTClient.get_raw(url, params)
@@ -184,29 +187,29 @@ class WorkflowRESTClient
184
187
  end
185
188
 
186
189
  def tasks
187
- if @tasks.nil?
188
- @tasks = {}
189
- exported_tasks.each do |task_name|
190
- info = task_info(task_name)
191
- tasks[task_name.to_sym] = Task.setup info do |*args|
192
- raise "This is a remote task"
193
- end
194
- tasks[task_name.to_sym].name = task_name.to_sym
190
+ @tasks ||= Hash.new do |hash,task_name|
191
+ info = task_info(task_name)
192
+ task = Task.setup info do |*args|
193
+ raise "This is a remote task"
195
194
  end
196
- @tasks
195
+ task.name = task_name.to_sym
196
+ hash[task_name] = task
197
197
  end
198
- @tasks
198
+ end
199
+
200
+ def load_tasks
201
+ exported_tasks.each{|name| tasks[name]}
202
+ nil
199
203
  end
200
204
 
201
205
  def task_dependencies
202
- if @task_dependencies.nil?
203
- @task_dependencies = {}
204
- exported_tasks.each do |task|
205
- task_dependencies[task] = WorkflowRESTClient.get_json(File.join(url, task.to_s, 'dependencies'))
206
+ @task_dependencies ||= Hash.new do |hash,task|
207
+ hash[task] = if exported_tasks.include? task
208
+ WorkflowRESTClient.get_json(File.join(url, task.to_s, 'dependencies'))
209
+ else
210
+ []
206
211
  end
207
- @task_dependencies
208
212
  end
209
- @task_dependencies
210
213
  end
211
214
 
212
215
  def rec_dependencies(taskname)
@@ -275,6 +278,7 @@ class WorkflowRESTClient
275
278
  end
276
279
  else
277
280
 
281
+ ddd task
278
282
  if Task === task
279
283
  task_name = task.name
280
284
  else
@@ -108,7 +108,7 @@ module Sinatra
108
108
 
109
109
  job = workflow.load_id(File.join(task, job))
110
110
 
111
- clean_job(workflow, job) if update == :clean
111
+ clean_job(workflow, job)
112
112
 
113
113
  begin
114
114
  done = job.done?
@@ -185,7 +185,7 @@ module Sinatra
185
185
  job = consume_parameter(:job)
186
186
  job = workflow.load_id(File.join(task, job))
187
187
 
188
- clean_job(workflow, job) if update == :clean
188
+ clean_job(workflow, job)
189
189
  end
190
190
  end
191
191
 
@@ -121,6 +121,8 @@ module WorkflowRESTHelpers
121
121
  inputs = prepare_job_inputs(workflow, task, params)
122
122
  job = workflow.job(task, jobname, inputs)
123
123
 
124
+ job.clean if update == :clean
125
+
124
126
  execution_type = execution_type(workflow, task)
125
127
  case execution_type
126
128
  when :exec
@@ -58,12 +58,16 @@ function parse_parameters(params){
58
58
 
59
59
  function require_js(url, success){
60
60
  var async = false;
61
+ console.log(url)
61
62
  if (undefined === success){
63
+ console.log('Sync')
62
64
  async = false;
63
65
  }else{
66
+ console.log('Async')
64
67
  async = true;
65
68
  }
66
- $.ajax({url: url, dataType:'script', async:async, success: success} ).fail(function(jqxhr, settings, exception){
69
+
70
+ $.ajax({url: url, dataType:'script', async: async, success: success} ).fail(function(jqxhr, settings, exception){
67
71
  console.log('Exception loading: ' + url)
68
72
  console.log(exception)
69
73
  console.log(jqxhr)
@@ -1,5 +1,7 @@
1
1
  .row
2
2
  .twelve.column
3
+ %h3= workflow.to_s
4
+
3
5
  %ul.tasks
4
6
  - tasks = workflow.exec_exports + workflow.synchronous_exports + workflow.asynchronous_exports
5
7
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rbbt-rest
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.2
4
+ version: 1.1.3
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2013-05-20 00:00:00.000000000 Z
12
+ date: 2013-05-22 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rake