clicker 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6945c99ea0c8744bad04db4a506b1461e0ab34b7
-  data.tar.gz: fc07e55227a5f9f865e173594d963ec8df8c7719
+  metadata.gz: cb7b0b66b2bf146b1b763b91f765bea5678537a3
+  data.tar.gz: a5f69f12bd7e07c0d3c6036b26e67f81cd6e9555
 SHA512:
-  metadata.gz: 14e7d7745abe1aea2752a5258cb2f2ff326c8b84ee597eb5cd8017b1ba694cc3a7ee1ee038e1bf1b924ea9a1fca01c4860e57f9c60822945a88107e748b321a5
-  data.tar.gz: 84c1358571a8483ec92503cc68a7901d2eb5f10004273bc001ffa486c08862f935b2695d7ab2e6358f51ed84011e45085f3807a88e59e83b33c247ca266890f6
+  metadata.gz: efaeaf6b461a72879356cba31f016ef75fb2f56fbc11dd61cd5dbd3664642385269e7da09950b6aed7f51cf7bed34d474cc5dc697fb299daf8ef6f775bb5daec
+  data.tar.gz: 00c984fa279a3df5c0be6c68fed7adb6b09bda147eafa754ad0ee00732828611ea3e9fad0881d83fb5e68aff45f1ee77dc6a554d6d278634a00f479bfda985e9

data/lib/clicker/launch_lock.rb

@@ -12,28 +12,45 @@ class LaunchLock
   end
 
   def try_lock
-    File.open(@lock_file_path, 'w') do |f|
-      f.puts Process.pid
+    File.open(@lock_file_path, 'r+') do |f|
+      success = f.flock(File::LOCK_EX | File::LOCK_NB)
+      if success
+        f.puts Process.pid
+        f.flush
+	f.truncate(f.pos)
+        yield
+        return true
+      else
+        return false
+      end
     end
-    yield
-    return true
-  rescue
-    return false
-  ensure
-    FileUtils.rm(@lock_file_path)    
   end
 
   def locked?
-    File.exist?(@lock_file_path)
+    File.open(@lock_file_path, 'r') do |f|
+      rv =  f.flock(File::LOCK_EX | File::LOCK_NB)
+      case rv
+      when 0
+	return false
+      when false
+	return true
+      end
+    end
+  rescue Errno::ENOENT
+    return false
   end
 
   def owner
-    pid = nil
     File.open(@lock_file_path) do |f|
-      pid = f.gets.to_i
+      success = f.flock(File::LOCK_EX | File::LOCK_NB)
+      if success
+        return nil # owner is not alive...
+      else
+        pid = f.gets.to_i
+        return pid
+      end
     end
-    return pid
-  rescue
+  rescue Errno::ENOENT
     return nil
   end
 end

data/lib/clicker/program.rb

@@ -30,26 +30,21 @@ class Program
 
       unless success
         STDERR.puts("Error: another instance of clicker is running. (PID #{@lock.owner})")
-        STDERR.puts("the lock file is at #{@lock.lock_file_path}.")
         exit 1
       end
     when :start
-      if !@lock.locked?
+      if @lock.locked?
+        STDERR.puts("Error: another instance of clicker is running. (PID #{@lock.owner})")
+        exit 1
+      else
         if fork == nil
           if fork == nil
-            success = @lock.try_lock do 
+            @lock.try_lock do
               do_run
             end
-            unless success 
-              # ここでは端末から切り離されているので出来ることはない。
-              exit 1
-            end
+            # ここでは端末から切り離されているのでロックに失敗しても出来ることはない。
           end
         end
-      else
-        STDERR.puts("Error: another instance of clicker seems to be running. (PID #{@lock.owner})")
-        STDERR.puts("the lock file is at #{@lock.lock_file_path}.")
-        exit 1
       end
     when :stop
       if @lock.locked?
@@ -59,8 +54,6 @@ class Program
           STDERR.puts("SIGTERM has been sent to PID #{owner}.")
         rescue Errno::ESRCH
           STDERR.puts("Warning: Process (#{owner}) not found.")
-          STDERR.puts("Deleting the lock file.")
-          FileUtils.rm(@lock.lock_file_path)
         end
       else
         STDERR.puts("no instance is running.")

data/lib/clicker/version.rb

@@ -1,3 +1,3 @@
 module Clicker
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clicker
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Yoteichi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-30 00:00:00.000000000 Z
+date: 2016-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubysdl