rbbt-rest 1.3.8 → 1.3.9

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: af2d0738024e2f1576ee464174c75e69bff9e565
4
- data.tar.gz: f8b5daa03aad2d4f9f0686fb0dc77864a691d173
3
+ metadata.gz: 27fb73d8f78ef62a68182c55e631b6d70c508d8e
4
+ data.tar.gz: a12b4c60cc6759a36de87af95783eb71362b98ca
5
5
  SHA512:
6
- metadata.gz: 80f04a7411ff1e2d08f77c5edb4c966615409ba6c66f0a793cb766efaebeb313478f4954dacda49869a2ea0ecae465e4af55773780a58a570fcdb0997aae1849
7
- data.tar.gz: c874aceb9421927804e172ffd46d2e6ab7e1f8e60a31aeb51d1d6cb4db268e3416bd61fe0bfc75b540892331e85b561e6638b9ce015797f20a3993d7c1ad034b
6
+ metadata.gz: 197d4db15e3b84632e8370f578aada3f6930d3126cf623a55da1f4c6861009796ccfbe1da1e41f215c9d3fce2c1ee9546b78cf09802dd309da3ba5e79cd188ed
7
+ data.tar.gz: 8cebd8b14a008b30705dc15f2471668271cb5712ede4deec16687f18cce6bd0c9ca6c56838813906762ff75b111543e7c2507c114d0e4b2d255c170197d1afcc
@@ -14,7 +14,10 @@ class WorkflowRESTClient
14
14
  when IO
15
15
  value.read
16
16
  when TSV::Dumper
17
- value.stream.read
17
+ value.stream
18
+ when Step
19
+ stream = get_stream(value)
20
+ stream || value.load
18
21
  else
19
22
  value
20
23
  end
@@ -3,8 +3,17 @@ class WorkflowRESTClient
3
3
 
4
4
  attr_accessor :url, :base_url, :task, :base_name, :inputs, :result_type, :result_description, :is_exec
5
5
 
6
+ def self.get_streams(inputs)
7
+ inputs.each do |k,v|
8
+ if Step === v
9
+ stream = v.get_stream
10
+ inputs[k] = stream || v.load
11
+ end
12
+ end
13
+ end
6
14
  def initialize(base_url, task = nil, base_name = nil, inputs = nil, result_type = nil, result_description = nil, is_exec = false)
7
15
  @base_url, @task, @base_name, @inputs, @result_type, @result_description, @is_exec = base_url, task, base_name, inputs, result_type, result_description, is_exec
16
+ RemoteStep.get_streams @inputs
8
17
  end
9
18
 
10
19
  def name
@@ -35,7 +44,7 @@ class WorkflowRESTClient
35
44
  end
36
45
 
37
46
  def done?
38
- status.to_s == 'done'
47
+ @done || status.to_s == 'done'
39
48
  end
40
49
 
41
50
  def files
@@ -49,7 +58,9 @@ class WorkflowRESTClient
49
58
  #{{{ MANAGEMENT
50
59
 
51
60
  def init_job(cache_type = :asynchronous)
52
- @name ||= WorkflowRESTClient.post_jobname(File.join(base_url, task.to_s), inputs.merge(:jobname => @name, :_cache_type => cache_type))
61
+ @name ||= Persist.memory("RemoteSteps", :jobname => @name, :inputs => inputs) do
62
+ WorkflowRESTClient.post_jobname(File.join(base_url, task.to_s), inputs.merge(:jobname => @name, :_cache_type => cache_type))
63
+ end
53
64
  @url = File.join(base_url, task.to_s, @name)
54
65
  nil
55
66
  end
@@ -109,7 +120,8 @@ class WorkflowRESTClient
109
120
  def run(noload = false)
110
121
  return exec_job if @is_exec
111
122
  init_job(:synchronous)
112
- noload ? @name : self.load
123
+ return self.load unless noload
124
+ self.load
113
125
  end
114
126
 
115
127
  def exec(*args)
@@ -131,9 +143,7 @@ class WorkflowRESTClient
131
143
 
132
144
  def clean
133
145
  begin
134
- ddd inputs
135
146
  inputs[:_update] = :clean
136
- ddd inputs
137
147
  rescue Exception
138
148
  end
139
149
  self
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.8
4
+ version: 1.3.9
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-03-31 00:00:00.000000000 Z
11
+ date: 2014-04-05 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rake