frontkick 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: afbcaf599563d9ebb1395512e65ce021d9f314e6
-  data.tar.gz: 203a79a478f3bc6acccb641160ca2ba73af1049d
+  metadata.gz: 5cb9b445262c3f7b278593b0bbb6bf54a14664e6
+  data.tar.gz: 6f557263aa916e8b293334da3e594931b552b721
 SHA512:
-  metadata.gz: 7a42da35a826093ba55a28d1494531f52a727b7d8f0b4af13d3faf607a7426f02c58bf8fad3e49b0305e2d5ce656b0eb08737620ce3cf33c50962f39456e4e6d
-  data.tar.gz: 79a39227fbf5051c94afd63cdf50c3852c1ac218b626028b34004715d6b7bf8d191355d586cfc333726402ae466f6776a3d7b0ef4da72c4b65b1aac61fcf2342
+  metadata.gz: f28fa5899334a518182cbce05bf4628001bc97c0cbe5e0997ecbbd2ccee374d5f4822a74ad22bce5fb09cd2e4e333bbe41181f118a24444dd3b3d5d68968228b
+  data.tar.gz: 4284c8e05039f6b3e478b3dc75959b715546a52efc82c9c5fbab27c03fc691f13a5b640e29bff07155d8f28ffa4cf7ec6970e9d169be83b20b7aec2416be776e

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.3.4 (2014/07/30)
+
+Enhancements:
+
+- Add `exclusive_blocking` option
+
 # 0.3.3 (2014/06/04)
 
 Changes:

data/Gemfile

@@ -2,4 +2,3 @@
 source 'https://rubygems.org'
 
 gemspec
-gem 'frontkick', path: '.'

data/README.md

@@ -39,6 +39,10 @@ Prohibit another process to run a command concurrently
 
     Frontkick.exec("sleep 2 && ls /hoge", :exclusive => "/tmp/frontkick.lock") # raises Fontkick::Locked if locked
 
+If you prefer to be blocked:
+
+    Frontkick.exec("sleep 2 && ls /hoge", :exclusive => "/tmp/frontkick.lock", :exclusive_blocking => true)
+
 ## Contributing
 
 1. Fork it

data/lib/frontkick/command.rb

@@ -8,7 +8,7 @@ module Frontkick
       stdin, out, err, wait_thr, pid = nil
 
       cmd_array = cmd.kind_of?(Array) ? cmd : [cmd]
-      lock_fd = file_lock(opts[:exclusive]) if opts[:exclusive]
+      lock_fd = file_lock(opts[:exclusive], opts[:exclusive_blocking]) if opts[:exclusive]
       begin
         timeout(opts[:timeout]) do # nil is for no timeout
           duration = Benchmark.realtime do
@@ -50,14 +50,19 @@ module Frontkick
     # Use file lock to perfome exclusive operation
     #
     # @param lock_file file path used to lock
+    # @param blocking blocking or non-blocking. default is nil (false)
     # @return file descriptor
     # @raise Fontkick::Locked if locked
-    def self.file_lock(lock_file)
+    def self.file_lock(lock_file, blocking = nil)
       lock_fd = File.open(lock_file, File::RDWR|File::CREAT, 0644)
-      success = lock_fd.flock(File::LOCK_EX|File::LOCK_NB)
-      unless success
-        lock_fd.flock(File::LOCK_UN)
-        raise Frontkick::Locked
+      if blocking
+        lock_fd.flock(File::LOCK_EX)
+      else
+        success = lock_fd.flock(File::LOCK_EX|File::LOCK_NB)
+        unless success
+          lock_fd.flock(File::LOCK_UN)
+          raise Frontkick::Locked
+        end
       end
       lock_fd
     end

data/lib/frontkick/version.rb

@@ -1,3 +1,3 @@
 module Frontkick
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: frontkick
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-03 00:00:00.000000000 Z
+date: 2014-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -93,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Execute a command simply!