filelock 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4d5bba388f19de54cba97e0af369c8c18764bb5
-  data.tar.gz: 5a42b3b0e31fd1f9b2f02d1f1eef513a9112244e
+  metadata.gz: 8306638bf16d2c4aa3be2543c24d68e0a673fd31
+  data.tar.gz: 8d19eb1e21833db47e8b7fe67f36915482a5b6ce
 SHA512:
-  metadata.gz: cd10b0613b05bff7c4d9eb70985e9ffe1e3236d9e6a8f84d9d1cc77af3486bc1767c91a0345abfe551924a8d0bce088401c34ce9c0adb681dd663f8f087795d4
-  data.tar.gz: 9d4f60be252ceb0be614e8f6a701493aeff105db1b9e77c3c68c97dfe6d3756a44265985e62f3a3f32d1b593a7ea26afe2a2e73d5901a3eed2ecdfa331b99aec
+  metadata.gz: 2042a3b18be5cd3045051369501b5a50437e407841050d7c637254b0858a97a555160f19d91e7b2feb507e6e350fad9dc2561ace97d614eb7c918dc992bb197e
+  data.tar.gz: 08a2351b10bd4c078d513e98c8a9db180b964b877d7f8ab0a5a27f2851b5eed0e48f6aaf6522fe443e7c57d43e1fb2fc8a160c904a417c965e74cb5694927db1

data/CHANGELOG.md

@@ -1,7 +1,12 @@
+# 1.1.1
+
+- fix: Load timeout module before using it
+- pass locked file to block provided to Filelock
+
 # 1.1.0
 
 - Add `:wait` flag for lock-acquiting timeout
-- Add two new timeout exteptions: `FileLock::ExecTimeout` and `FileLock::WaitTimeout`
+- Add two new timeout exceptions: `FileLock::ExecTimeout` and `FileLock::WaitTimeout`
 
 # 1.0.3
 

data/README.md

@@ -43,6 +43,16 @@ You can detect this kind of timeout by catching `Filelock::WaitTimeout`.
 
 Note that lock file directory must already exist, and lock file is not removed after unlock.
 
+### Getting handle to locked file
+
+
+```ruby
+Filelock '/tmp/path/to/lock' do |file|
+  file.truncate
+  file.write Process.pid
+end
+```
+
 ## FAQ
 
 *Does it support NFS?*

data/lib/filelock.rb

@@ -1,7 +1,7 @@
+require 'timeout'
 require 'filelock/version'
 require 'filelock/exec_timeout'
 require 'filelock/wait_timeout'
-require 'timeout'
 require 'tempfile'
 
 if RUBY_PLATFORM == "java"
@@ -9,7 +9,7 @@ if RUBY_PLATFORM == "java"
     lockname = lockname.path if lockname.is_a?(Tempfile)
     File.open(lockname, File::RDWR|File::CREAT, 0644) do |file|
       Thread.pass until Timeout::timeout(options.fetch(:wait, 60*60*24), Filelock::WaitTimeout) { file.flock(File::LOCK_EX) }
-      Timeout::timeout(options.fetch(:timeout, 60), Filelock::ExecTimeout) { yield }
+      Timeout::timeout(options.fetch(:timeout, 60), Filelock::ExecTimeout) { yield file }
     end
   end
 else
@@ -17,7 +17,7 @@ else
     lockname = lockname.path if lockname.is_a?(Tempfile)
     File.open(lockname, File::RDWR|File::CREAT, 0644) do |file|
       Timeout::timeout(options.fetch(:wait, 60*60*24), Filelock::WaitTimeout) { file.flock(File::LOCK_EX) }
-      Timeout::timeout(options.fetch(:timeout, 60), Filelock::ExecTimeout) { yield }
+      Timeout::timeout(options.fetch(:timeout, 60), Filelock::ExecTimeout) { yield file }
     end
   end
 end

data/lib/filelock/version.rb

@@ -1,3 +1,3 @@
 module Filelock
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/spec/filelock_spec.rb

@@ -59,6 +59,17 @@ describe Filelock do
     end
   end
 
+  it 'passes handle to block' do
+    Dir.mktmpdir do |dir|
+      lockpath = File.join(dir, 'sample.lock')
+      Filelock lockpath do |lock|
+        lock.write '42'
+      end
+
+      expect(File.read(File.join(dir,'sample.lock'))).to eq('42')
+    end
+  end
+
   it 'runs in parallel without race condition' do
     answer = 0
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: filelock
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Adam Stankiewicz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-06 00:00:00.000000000 Z
+date: 2016-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler