cleverua-lockfile 1.0.0 → 1.1.0

data/README.rdoc

@@ -4,7 +4,7 @@
 
 == DESCRIPTION:
 
-This ruby gem allows you create a lock file on disk right before it yields given code block. It would not allow to yield the block again while the first one finished (ie while lock file exists). This gem currently works on UNIX operational systems.
+This ruby gem allows you create a lock file on disk right before it yields given code block. It would not allow to yield the block again while the first one finished (ie while lock file exists). This gem currently works on UNIX operating systems. This gem should not be used on NFS (http://lwn.net/Articles/251004/)
 
 == USAGE EXAMPLE
 
@@ -19,15 +19,15 @@ This ruby gem allows you create a lock file on disk right before it yields given
 === TO FORCE STOP
   include Lockfile
   
-  Lockfile.force_stop(LOCK_FILE_PATH)
+  Lockfile.release_lock(LOCK_FILE_PATH)
 
 == REQUIREMENTS:
 
-* a UNIX operational system
+* a UNIX operating system
 
 == INSTALL:
 
-  sudo gem install lockfile
+  sudo gem install cleverua-lockfile
 
 == LICENSE:
 

data/Rakefile

@@ -10,6 +10,7 @@ begin
     gem.email = "pavlo@cleverua.com"
     gem.homepage = "http://github.com/cleverua/lockfile"
     gem.authors = ["pavlo"]
+    gem.version = "1.1.0"
     #gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/lib/lockfile.rb

@@ -7,10 +7,8 @@ module Lockfile
   end
   
   def with_lock_file(lock_file_path, write_pid = true)
-    return false if has_lock?(lock_file_path)
-    
+    return false unless obtain_lock(lock_file_path, write_pid)
     begin
-      obtain_lock(lock_file_path, write_pid)
       yield
     ensure 
       release_lock(lock_file_path)
@@ -19,9 +17,12 @@ module Lockfile
   
   private
   def obtain_lock(lf, write_pid)
-    open(lf, "w+") do |o|
+    File.open(lf, File::CREAT | File::EXCL | File::WRONLY) do |o|
       o.write(Process.pid) if write_pid
     end  
+    return true
+  rescue
+    return false
   end
   
   def release_lock(lf)

data/test/test_lockfile.rb

@@ -22,7 +22,21 @@ class TestLockfile < Test::Unit::TestCase
     end
   end
 
+  class Lockfile::File < ::File
+    #slow open down once to demonstrate race condition
+    def self.open(*args)
+      unless @no_sleep
+        @no_sleep = true
+        sleep(1)
+      end
+      super
+    end
+  end
+
+
   should "not allow to launch other processes while the previous one has lock" do
+    Lockfile.ensure_no_lock_file_exists(LOCK_FILE)
+
     p1 = TestProcess.new
     p2 = TestProcess.new
     p3 = TestProcess.new
@@ -35,8 +49,7 @@ class TestLockfile < Test::Unit::TestCase
     t2.join
     t3.join
     
-    assert p1.launched? 
-    assert !p2.launched?
-    assert !p3.launched?
+    #only one should launch
+    assert_equal 1, [p1, p2, p3].select{|i| i.launched? }.size
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cleverua-lockfile
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: false
   segments: 
   - 1
+  - 1
   - 0
-  - 0
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - pavlo
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-06 00:00:00 +03:00
+date: 2010-11-29 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -30,7 +30,6 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
-- .gitignore
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -43,8 +42,8 @@ homepage: http://github.com/cleverua/lockfile
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 

data/.gitignore

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC