easy-serve 0.11 → 0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ef2c07a293530b91eacbd1630d63507acddedab
-  data.tar.gz: 004b52c5e9f3399f60a882f6302b648e900c8afe
+  metadata.gz: 5c1e18a947084b2aa2f1508159eef9d102f90d0f
+  data.tar.gz: ae49fefd0aa53336007d2745d0f5471970950aac
 SHA512:
-  metadata.gz: 6ab412543120bca229865bff3b1f4a66bca28ec4bef4336feacd5c0c392a04a7a9672a6452c93539d49f6344ae8e642c3ed46b92c9773b81a2f0f1dbfa423f88
-  data.tar.gz: ec3d64c1e104eae2f79ed87fb918e992d3bf25ead58374a55cf38da332421b7e8c84c16e2007ca7e8913bd0ad50c5887ad5b47cabc6347bc967c617f72ce60fe
+  metadata.gz: b4d08db27f7c8240213ac5934cfafa08bb595b6dbea4402e09b09102f0b84133ef018f912868349166940d9c7c74b45fc3cc3b0acccb97372c6bb4814434d87f
+  data.tar.gz: e1551d47c03786400d81a0e949fd94cc18e153faebc58345e3d540a40db9950b372903135b534cf040ef2471aa0a0b97b6d9b89dee4d7e6f19962b7dcef86fb8

data/lib/easy-serve.rb

@@ -6,8 +6,10 @@ require 'fileutils'
 require 'easy-serve/service'
 
 class EasyServe
-  VERSION = "0.11"
-  
+  VERSION = "0.12"
+
+  class ServicesExistError < RuntimeError; end
+
   class EasyFormatter < Logger::Formatter
     Format = "%s: %s: %s\n"
 
@@ -70,6 +72,7 @@ class EasyServe
   #
   def initialize **opts
     @services_file = opts[:services_file]
+    @created_services_file = false
     @interactive = opts[:interactive]
     @log = opts[:log] || self.class.null_logger
     @children = [] # pid
@@ -148,7 +151,7 @@ class EasyServe
         service.cleanup
       end
 
-      if services_file
+      if @created_services_file
         begin
           FileUtils.rm services_file
         rescue Errno::ENOENT
@@ -161,32 +164,59 @@ class EasyServe
   end
   
   def start_services
-    if @owner
-      if services_file
-        begin
-          FileUtils.ln_s services_file, ".lock.#{services_file}"
-          # Successful creation of the lock file gives this process the
-          # right to create the services_file itself.
-        rescue Errno::EEXIST
-          raise Errno::EEXIST, "Services at #{services_file} already exist."
-        end
+    return unless @owner
+
+    if not services_file
+      log.debug {"starting services without services_file"}
+      yield
+      return
+    end
+
+    lock_success = with_lock_file *File.split(services_file) do
+      # Successful creation of the lock file gives this process the
+      # right to check and create the services_file itself.
+
+      if File.exist? services_file
+        raise ServicesExistError,
+          "Services at #{services_file.inspect} already exist."
       end
 
-      log.debug {"starting services"}
+      log.debug {"starting services stored in #{services_file.inspect}"}
       yield
 
-      if services_file
-        begin
-          File.open(services_file, "w") do |f|
-            YAML.dump(services, f)
-          end
-        ensure
-          FileUtils.rm_f ".lock.#{services_file}"
-        end
+      tmp = services_file + ".tmp"
+      File.open(tmp, "w") do |f|
+        YAML.dump(services, f)
       end
+      FileUtils.mv(tmp, services_file)
+      @created_services_file = true
+    end
+
+    unless lock_success
+      raise ServicesExistError,
+        "Services at #{services_file.inspect} are being created."
     end
   end
-  
+
+  # Returns true if this process got the lock.
+  def with_lock_file dir, base
+    lock_file = File.join(dir, ".lock.#{base}")
+
+    begin
+      FileUtils.ln_s ".#{Process.pid}.#{base}", lock_file
+    rescue Errno::EEXIST
+      return false
+    end
+
+    begin
+      yield
+    ensure
+      FileUtils.rm_f lock_file
+    end
+
+    true
+  end
+
   def tmpdir
     @tmpdir ||= begin
       require 'tmpdir'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: easy-serve
 version: !ruby/object:Gem::Version
-  version: '0.11'
+  version: '0.12'
 platform: ruby
 authors:
 - Joel VanderWerf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-23 00:00:00.000000000 Z
+date: 2014-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack