flock_synchronize 1.1.0 → 1.2.0

data/lib/flock_synchronize.rb

@@ -14,14 +14,30 @@ module FlockSynchronize
     #    some.code_that_needs(synchronizing)
     #  end
     #
-    # The optional locking_constant parameter allows you to specify a different
-    # constant than LOCK_EX. See the File.flock documentation for more info.
+    # Options available:
     #
-    def self.flock_synchronize(key, locking_constant=File::LOCK_EX)
+    #   locking_constant: use a different constant than LOCK_EX. See the
+    #                     File.flock documentation for more info.
+    #   timeout:          automatically unlock if the lock was created more
+    #                     this number of seconds ago
+    #
+    def self.flock_synchronize(key, options={})
+        # Previous versions took locking_constant as second param and now it's
+        # a hash
+        if !options.kind_of? Hash
+            options = {locking_constant: options}
+        end
+        options[:locking_constant] ||= File::LOCK_EX
+        
         filename = File.join(Dir.tmpdir, "#{key}.flock")
         begin
+            if options[:timeout]
+                if File.exists? filename and (Time.now - File.mtime(filename)) > options[:timeout]
+                    File.unlink filename
+                end
+            end
             File.open(filename, 'w') do |f|
-                f.flock(locking_constant)
+                f.flock(options[:locking_constant])
                 yield
             end
         ensure

data/lib/flock_synchronize/version.rb

@@ -1,3 +1,3 @@
 module FlockSynchronize
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flock_synchronize
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-30 00:00:00.000000000 Z
+date: 2015-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler