rbbt-util 5.5.8 → 5.5.9

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmM0NTFmMmQwODc0NDc3NTRjNTI5ODY3YjZiZTJkMDZmMTZkYTY3MA==
+    YzZjOWMzZjRhNWIyMmRhMjc1MjM1NGU3NGNhNWJiMWU3MmE4ZDExYw==
   data.tar.gz: !binary |-
-    Nzg3OTRjZjU3NDljZWY5MDlhOGI3OGQxNDBiMTc1ODhmZmI5OGQ1MQ==
+    MzhlY2RmNWYxNDk4ZTNmMTk2ZTU3NTYyN2JhNmY4YmJiMzUxYzQ3MA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZjViN2E5ZDJjNTM3MjJkZjRlOWNhY2RhYjhiYjZkMTUzZWZjMzA1MmViMzc3
-    Nzc4ZWFkNjYzNDc0ZjVkMjNmMmEyZmQ5MWZhNDIwY2IxNzA2MzE4ZDEwNmRm
-    NzA3YjE3YjQ1ZDE3ODMxMjRmZjViZTA1NTFiMGEzMmFhN2E0MTE=
+    ZDBmM2RhZWI3MTc3Nzc5OGQ5NGIxN2I0ZTg4ZDkyNmRlMmY5MzhjODU1YzU3
+    NWM4MjlmZmM5NGZiMjEzNjUyZWE0NjJkMDQ1NTEzNjJjNjVmMTcxOThiMTY5
+    YTQ0ZDNmYzJhOTQ3MzJmYWRkNDIwMDYxMmE4ZDZlN2ZlMTYyMzI=
   data.tar.gz: !binary |-
-    ZWUzMDU0M2I1ZTU2YmY2M2Y4ZjAzZjRiMGNiM2RlOGEzNTAxYTZhODNkZDll
-    YWFmMzI1OWRjNDNjYWExMzA0MTMxMTY0MjcxYzc1YzUyZGI0YTM0OGNlYWJh
-    MzVhZTI0Zjc3Njg1NmQxNGU2OTM3ZmQ1NzBmZGJlOThlMDZkODE=
+    N2QzYWEyNDAxYWRmOGIyMDM5YmU1YTAxZDQ3ZDA5Mzg5Njk4OTY1Zjc4Y2U4
+    ZDAwZjFiOWVlYzg1NzNkNDk2NzEzNzdkMjVjN2U2ZTk4MjQzMzY0MzRjMmY0
+    YzhkYmJiZDE3OGE0NmI0NTU4NjVmYzNhN2YwYzZmZDhkZDc4Y2E=

data/lib/rbbt/persist.rb

@@ -14,6 +14,12 @@ module Persist
     def self.cachedir
       @cachedir ||= Rbbt.var.cache.persistence 
     end
+
+    attr_accessor :lock_dir
+    
+    def lock_dir
+      @lock_dir ||= Rbbt.tmp.tsv_open_locks.find
+    end
   end
 
   MEMORY = {} unless defined? MEMORY
@@ -256,16 +262,24 @@ module Persist
           Log.low "Persist up-to-date: #{ path } - #{persist_options.inspect[0..100]}"
           return nil if persist_options[:no_load]
           return load_file(path, type) 
-        else
-          Log.medium "Persist create: #{ path } - #{persist_options.inspect[0..100]}"
         end
 
         begin
-          res = yield
-          Misc.lock(path) do
-            save_file(path, type, res)
+          lock_filename = Persist.persistence_path(path + '.persist', {:dir => Persist.lock_dir})
+          Misc.lock lock_filename  do
+            if is_persisted?(path, persist_options)
+              Log.low "Persist up-to-date: #{ path } - #{persist_options.inspect[0..100]}"
+              return nil if persist_options[:no_load]
+              return load_file(path, type) 
+            end
+
+            Log.medium "Persist create: #{ path } - #{persist_options.inspect[0..100]}"
+            res = yield
+            Misc.lock(path) do
+              save_file(path, type, res)
+            end
+            res
           end
-          res
         rescue
           Log.high "Error in persist. #{Open.exists?(path) ? "Erasing '#{ path }'" : ""}"
           FileUtils.rm path if Open.exists? path 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.5.8
+  version: 5.5.9
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-29 00:00:00.000000000 Z
+date: 2013-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake