rbbt-util 5.17.59 → 5.17.60

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 849b316f4dfa60ed5c29ef8da518739f1e367f5b
-  data.tar.gz: ae52b18f5d3ad480fabd97b1d6c335ec6d761015
+  metadata.gz: 65d71e6047aa30d6972336d3dc639a541e2fa06b
+  data.tar.gz: 74ca7ab7c13906eeb787ac6d6a07dc8a009b6ec3
 SHA512:
-  metadata.gz: 71e1e58112898babac4e3314fe5cd6199b8401f77724d1282eb91915fd1c5399dcb2acd0bd5c2d4e8928f6530536bbce7186b44117a71abc567b827ffca9a2e6
-  data.tar.gz: ee609ff5e22ce8d218416af0e3a4c958dc58b63033f70eecec04b1f89961643a98197ee7d6815712d7ece7ef4b7edab2f240dff502818ccd21b7c2fd039bd03e
+  metadata.gz: f1eaeb0173581df92c752cea6eb1bbb03f5fb5836f1231a9cfa2b8419fb88a2129b6745415ad31c12d6f88c5ffe15862969115ee269670f4171ef0acc5731345
+  data.tar.gz: 08e4e15dad4e2d99eedb5bd0d55d69b538fd0d91a9c504a1ea32dff29f014af1f6cf01990150a032943e1a9519e453ba9f5a080adc9265e03020137ea1f00454

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

@@ -7,7 +7,7 @@ class WorkflowRESTClient
       inputs.each do |k,v|
         if Step === v
           stream = v.get_stream
-          inputs[k] = stream || v.load
+          inputs[k] = stream || v.run
         end
       end
     end
@@ -29,8 +29,8 @@ class WorkflowRESTClient
     end
 
     def info(check_lock=false)
-      @info = nil unless @info and @info[:status] and @info[:status].to_sym == :done
-      @info ||= begin
+      done = @info and @info[:status] and @info[:status].to_sym == :done
+      @info ||= Persist.memory("RemoteSteps Info", :url => @url, :persist => !done) do
                   init_job unless url
                   info = WorkflowRESTClient.get_json(File.join(url, 'info'))
                   info = WorkflowRESTClient.fix_hash(info)
@@ -153,16 +153,18 @@ class WorkflowRESTClient
 
     def recursive_clean
       begin
-        inputs[:_update] = :recursive_clean
+        WorkflowRESTClient.get_raw(url, params.merge(:_update => :recursive_clean))
       rescue Exception
+        Log.exception $!
       end
       self
     end
 
     def clean
       begin
-        inputs[:_update] = :clean
+        WorkflowRESTClient.get_raw(url, params.merge(:_update => :clean))
       rescue Exception
+        Log.exception $!
       end
       self
     end

data/lib/rbbt/workflow/step.rb

@@ -230,7 +230,7 @@ class Step
 
     # A step result with no info_file means that it was manually
     # placed. In that case, do not consider its dependencies
-    return [] if not WorkflowRESTClient::RemoteStep === self and Open.exists?(self.path.to_s) and not Open.exists? self.info_file
+    return [] if not (defined? WorkflowRESTClient and  WorkflowRESTClient::RemoteStep === self) and Open.exists?(self.path.to_s) and not Open.exists? self.info_file
 
     return [] if dependencies.nil? or dependencies.empty?
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.17.59
+  version: 5.17.60
 platform: ruby
 authors:
 - Miguel Vazquez