single_instance 0.1.0 → 0.2.0

data/.gitignore

@@ -19,3 +19,6 @@ rdoc
 pkg
 
 ## PROJECT::SPECIFIC
+pkg/*
+*.gem
+.bundle

data/.rvmrc

@@ -0,0 +1 @@
+rvm 1.9.2-p0@single_instance --create

data/Gemfile

@@ -0,0 +1,4 @@
+source :gemcutter
+
+# Specify your gem's dependencies in single_instance.gemspec
+gemspec

data/Gemfile.lock

@@ -0,0 +1,17 @@
+PATH
+  remote: .
+  specs:
+    single_instance (0.1.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    thoughtbot-shoulda (2.11.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (>= 1.0.0)
+  single_instance!
+  thoughtbot-shoulda

data/README.rdoc

@@ -22,6 +22,15 @@ is running:
       end
     end
 
+Run without a block, it creates a lock that lasts as long as the process is running:
+
+    # in Rakefile
+    task :all => [:exclusive, :this, :that, :whatever]
+    task :exclusive do
+      SingleInstance.exclusive_non_blocking(:build_models) || exit
+    end
+
+
 == Note on Patches/Pull Requests
  
 * Fork the project.
@@ -35,4 +44,4 @@ is running:
 
 == Copyright
 
-Copyright (c) 2010 ICE House AB. See LICENSE for details.
+Copyright (c) 2010-11 ICE House AB. See LICENSE for details.

data/Rakefile

@@ -1,21 +1,5 @@
-require 'rubygems'
-require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "single_instance"
-    gem.summary = %Q{Ruby Gem that makes sure that only a single instance of a code block is running.}
-    gem.email = "dev+gemsupport@icehouse.se"
-    gem.homepage = "http://github.com/icehouse/single_instance"
-    gem.authors = ["David Vrensk", "Magnus Enarsson"]
-    gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
-end
+require 'bundler'
+Bundler::GemHelper.install_tasks
 
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
@@ -37,8 +21,8 @@ rescue LoadError
   end
 end
 
-task :test => :check_dependencies
-
+# task :test => :check_dependencies
+# 
 task :default => :test
 
 require 'rake/rdoctask'

data/lib/single_instance/version.rb

@@ -0,0 +1,3 @@
+module SingleInstance
+  VERSION = "0.2.0"
+end

data/lib/single_instance.rb

@@ -2,27 +2,33 @@ require 'tmpdir'
 
 module SingleInstance
   Blocker = Struct.new :pid, :started_at
+
   class << self
 
     def exclusive_non_blocking(name, &block)
       lock_file = File.join(Dir::tmpdir, "single_instance_#{name}.pid")
-      File.open(lock_file, "a+") do |file|
+      begin
+        file = File.open(lock_file, "a+")
         file.rewind
-        begin
-          if file.flock(File::LOCK_EX|File::LOCK_NB)
-            file.truncate(0)
-            file.puts $$
-            file.puts Time.now.to_i
-            file.flush
+        if file.flock(File::LOCK_EX|File::LOCK_NB)
+          file.truncate(0)
+          file.puts $$
+          file.puts Time.now.to_i
+          file.flush
+          if block_given?
             yield nil
-          elsif block.arity == 1
-            pid = file.readline.to_i
-            started_at = Time.at(file.readline.to_i)
-            yield Blocker.new(pid, started_at)
+          else
+            (@lock_files ||= []) << file
           end
-        ensure
-          file.flock(File::LOCK_UN)
+        elsif block_given? && block.arity == 1
+          pid = file.readline.to_i
+          started_at = Time.at(file.readline.to_i)
+          yield Blocker.new(pid, started_at)
+        else
+          false
         end
+      ensure
+        file.close if block_given?
       end
     end
 

data/single_instance.gemspec

@@ -0,0 +1,23 @@
+# -*- encoding: utf-8 -*-
+require File.expand_path("../lib/single_instance/version", __FILE__)
+
+Gem::Specification.new do |s|
+  s.name        = "single_instance"
+  s.version     = SingleInstance::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["David Vrensk", "Magnus Enarsson"]
+  s.email       = ["dev+gemsupport@icehouse.se"]
+  s.homepage    = "http://github.com/icehouse/single_instance"
+  s.summary     = %Q{Ruby Gem that makes sure that only a single instance of a code block or process is running.}
+  s.description = "SingleInstance uses an exclusive file lock to allow or block execution of code."
+
+  s.required_rubygems_version = ">= 1.3.6"
+  s.rubyforge_project         = "single_instance"
+
+  s.add_development_dependency "bundler", ">= 1.0.0"
+  s.add_development_dependency "thoughtbot-shoulda", ">= 0"
+
+  s.files        = `git ls-files`.split("\n")
+  s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact
+  s.require_path = 'lib'
+end

data/test/test_single_instance.rb

@@ -42,6 +42,13 @@ class TestSingleInstance < Test::Unit::TestCase
       assert @block_1
       assert @block_2
     end
+
+    context "without a block" do
+      should "create a lock that lasts until the process terminates" do
+        assert SingleInstance.exclusive_non_blocking(:blockless)
+        assert ! SingleInstance.exclusive_non_blocking(:blockless)
+      end
+    end
   end
 
 end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: single_instance
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - David Vrensk
@@ -10,36 +15,58 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-09 00:00:00 +01:00
+date: 2011-05-02 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: thoughtbot-shoulda
+  name: bundler
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: thoughtbot-shoulda
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
-description: 
-email: dev+gemsupport@icehouse.se
+  type: :development
+  version_requirements: *id002
+description: SingleInstance uses an exclusive file lock to allow or block execution of code.
+email: 
+- dev+gemsupport@icehouse.se
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
 - .document
 - .gitignore
+- .rvmrc
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
-- VERSION
 - lib/single_instance.rb
+- lib/single_instance/version.rb
+- single_instance.gemspec
 - test/helper.rb
 - test/test_single_instance.rb
 has_rdoc: true
@@ -47,29 +74,34 @@ homepage: http://github.com/icehouse/single_instance
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+      segments: 
+      - 1
+      - 3
+      - 6
+      version: 1.3.6
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.3.5
+rubyforge_project: single_instance
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Ruby Gem that makes sure that only a single instance of a code block is running.
-test_files: 
-- test/helper.rb
-- test/test_single_instance.rb
+summary: Ruby Gem that makes sure that only a single instance of a code block or process is running.
+test_files: []
+

data/VERSION

@@ -1 +0,0 @@
-0.1.0