rbbt-util 5.21.0 → 5.21.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 752166bf720d5525c25bf96a2a01915c5ee7430c
-  data.tar.gz: 973d98ccede9449355b494982789b8cb82c325e1
+  metadata.gz: 43d6d582cf3e21efe8d44e4de2fc5c3876a68952
+  data.tar.gz: 5e59abd703c37d6efc9d98207e6a34d03518d41a
 SHA512:
-  metadata.gz: 31ee0806440ed08fd319e7dfe9cbcd524ec7f40bbe10cfa8b56c411172d0e27d84397b8a64674000b6b340f433e79425fa8a779d640a802c3d835cc861e7df49
-  data.tar.gz: 7763048e9ee7786cb9270e9656b821093c5d67e2f2bdef8f1fc3448b11b0fa187fcf1f53a6918de4918a759bfec4ee4755b07313015efb6620895583cb4e9549
+  metadata.gz: 2ce8696409ef7d33c8a9b2ee05dc844785b813ae234837340e6f9da7a4814f97409a32f379ee480b5326f529fd02ed22bd0bf7b4607bfb2a112d27b75cf00793
+  data.tar.gz: c2dbb0ebf44122f4dcb1b8610d11e6e2ecb236993a43a84aefd21a4ae39e2ed9f6256e497f4ef84ebfc6aff0da317f749ec91b72f8061c3099c097d64661e9b3

data/lib/rbbt/persist.rb

@@ -339,7 +339,9 @@ module Persist
     type ||= :marshal
 
     persist_options ||= {}
-    return (persist_options[:repo] || Persist::MEMORY)[persist_options[:file]] ||= yield if type ==:memory and persist_options[:file] and persist_options[:persist] and persist_options[:persist] != :update
+    if type ==:memory and persist_options[:file] and persist_options[:persist] and persist_options[:persist] != :update and not persist_options[:update]
+      return (persist_options[:repo] || Persist::MEMORY)[persist_options[:file]] ||= yield 
+    end
 
     if FalseClass === persist_options[:persist]
       yield
@@ -358,7 +360,8 @@ module Persist
       case 
       when type.to_sym == :memory
         repo = persist_options[:repo] || Persist::MEMORY
-        repo[path.find] ||= yield
+        path = path.find if Path === path
+        repo[path] = yield
 
       when (type.to_sym == :annotations and persist_options.include? :annotation_repo)
 

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

@@ -95,7 +95,7 @@ class WorkflowRESTClient
       RestClient.post(URI.encode(url), params)
     end
 
-    Log.debug{ "RestClient post_jobname: #{ url } - #{Misc.fingerprint params}: #{name}" }
+    Log.debug{ "RestClient jobname returned for #{ url } - #{Misc.fingerprint params}: #{name}" }
 
     name
   end

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

@@ -112,7 +112,7 @@ class WorkflowRESTClient
 
     def info(check_lock=false)
       @done = @info && @info[:status] && @info[:status].to_sym == :done
-      @info = Persist.memory("RemoteSteps Info", :url => @url, :persist => !!@done) do
+      @info = Persist.memory("RemoteSteps Info", :url => @url, :persist => true, :update => !@done) do
         init_job unless @url
         info = WorkflowRESTClient.get_json(File.join(@url, 'info'))
         info = WorkflowRESTClient.fix_hash(info)
@@ -214,6 +214,7 @@ class WorkflowRESTClient
     end
 
     def join
+      Log.debug{ "Joining RestClient: #{path}" }
       if IO === @result
         res = @result
         @result = nil

metadata

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