rbbt-rest 1.3.8 → 1.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af2d0738024e2f1576ee464174c75e69bff9e565
-  data.tar.gz: f8b5daa03aad2d4f9f0686fb0dc77864a691d173
+  metadata.gz: 27fb73d8f78ef62a68182c55e631b6d70c508d8e
+  data.tar.gz: a12b4c60cc6759a36de87af95783eb71362b98ca
 SHA512:
-  metadata.gz: 80f04a7411ff1e2d08f77c5edb4c966615409ba6c66f0a793cb766efaebeb313478f4954dacda49869a2ea0ecae465e4af55773780a58a570fcdb0997aae1849
-  data.tar.gz: c874aceb9421927804e172ffd46d2e6ab7e1f8e60a31aeb51d1d6cb4db268e3416bd61fe0bfc75b540892331e85b561e6638b9ce015797f20a3993d7c1ad034b
+  metadata.gz: 197d4db15e3b84632e8370f578aada3f6930d3126cf623a55da1f4c6861009796ccfbe1da1e41f215c9d3fce2c1ee9546b78cf09802dd309da3ba5e79cd188ed
+  data.tar.gz: 8cebd8b14a008b30705dc15f2471668271cb5712ede4deec16687f18cce6bd0c9ca6c56838813906762ff75b111543e7c2507c114d0e4b2d255c170197d1afcc

data/lib/rbbt/rest/client/get.rb

@@ -14,7 +14,10 @@ class WorkflowRESTClient
                           when IO
                             value.read
                           when TSV::Dumper
-                            value.stream.read
+                            value.stream
+                          when Step
+                            stream = get_stream(value)
+                            stream || value.load
                           else
                             value
                           end

data/lib/rbbt/rest/client/step.rb

@@ -3,8 +3,17 @@ class WorkflowRESTClient
 
     attr_accessor :url, :base_url, :task, :base_name, :inputs, :result_type, :result_description, :is_exec
 
+    def self.get_streams(inputs)
+      inputs.each do |k,v|
+        if Step === v
+          stream = v.get_stream
+          inputs[k] = stream || v.load
+        end
+      end
+    end
     def initialize(base_url, task = nil, base_name = nil, inputs = nil, result_type = nil, result_description = nil, is_exec = false)
       @base_url, @task, @base_name, @inputs, @result_type, @result_description, @is_exec = base_url, task, base_name, inputs, result_type, result_description, is_exec
+      RemoteStep.get_streams @inputs
     end
 
     def name
@@ -35,7 +44,7 @@ class WorkflowRESTClient
     end
 
     def done?
-      status.to_s == 'done'
+      @done || status.to_s == 'done'
     end
 
     def files
@@ -49,7 +58,9 @@ class WorkflowRESTClient
     #{{{ MANAGEMENT
     
     def init_job(cache_type = :asynchronous)
-      @name ||= WorkflowRESTClient.post_jobname(File.join(base_url, task.to_s), inputs.merge(:jobname => @name, :_cache_type => cache_type))
+      @name ||= Persist.memory("RemoteSteps", :jobname => @name, :inputs => inputs) do
+        WorkflowRESTClient.post_jobname(File.join(base_url, task.to_s), inputs.merge(:jobname => @name, :_cache_type => cache_type))
+      end
       @url = File.join(base_url, task.to_s, @name)
       nil
     end
@@ -109,7 +120,8 @@ class WorkflowRESTClient
     def run(noload = false)
       return exec_job if @is_exec
       init_job(:synchronous) 
-      noload ? @name : self.load
+      return self.load unless noload
+      self.load
     end
 
     def exec(*args)
@@ -131,9 +143,7 @@ class WorkflowRESTClient
 
     def clean
       begin
-        ddd inputs
         inputs[:_update] = :clean
-        ddd inputs
       rescue Exception
       end
       self

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-rest
 version: !ruby/object:Gem::Version
-  version: 1.3.8
+  version: 1.3.9
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-31 00:00:00.000000000 Z
+date: 2014-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake