srv_manager 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e428742efeb2eca1574496794c522b334d5901e3
-  data.tar.gz: a33bda0fb3c99e858d0fe16797956c5abf8ea47a
+  metadata.gz: 437563702512cd5232a464dd34613f2d9666f569
+  data.tar.gz: 210427676d2042a5c78fab487b637795ae4889c0
 SHA512:
-  metadata.gz: 9daf3784665d3c70c694fef1a46f31905a92b39877578af9c80783ea06e134c557c4a4255b5068c33586d4fac462e833bcd0d7238244143d6c74cff3b641be96
-  data.tar.gz: 1162ad9712e90041964b93bb0ef14e169c1a314b49b1c987da70a2e7c45bcb656f265f8a8129912c9de0b8740fce8f4c5bebd12c3b8b20f6519c6c7445235bd4
+  metadata.gz: efa6121b4e8303d7b1743d20e10ce8da11b47d2cd71b8c3dd78e27072f94f2d3d6b87ebcfade6e37aca4ddfa47a8e7e0fc34c1992453de5b8d8f970a3f391ee2
+  data.tar.gz: f128851de90230289a08d436bc88507f63c1886c50cb31d4cf49d21bdd99451d4c91763c9530c4ac654aebba477bf07ea173b54cbd787da35707e5dd11f0f9a5

data/bin/srv

@@ -18,6 +18,7 @@ module SrvManager
     option :processes, aliases: :p, type: :numeric
     option :auto, type: :boolean
     option :rvm, type: :boolean
+    option :pidfile
     option :env, type: :hash
     desc 'add <NAME> <COMMAND>', 'Add new service'
     def add(name, command)
@@ -151,7 +152,7 @@ module SrvManager
       end
     end
 
-    desc 'load', 'Load service configuration'
+    desc 'load <JSON_FILE>', 'Load service configuration'
     def load(filename)
       json = JSON.parse(File.read(filename))
       Context.scoped do |ctx|

data/lib/srv_manager/command.rb

@@ -5,16 +5,18 @@ module SrvManager
     attr_reader :dir
     attr_reader :env
     attr_reader :rvm
+    attr_reader :pidfile
 
     def initialize(text, options={})
       @text = text
       @dir = File.expand_path options[:dir].to_s
       @env = options[:env] || {}
       @rvm = options[:rvm] || false
+      @pidfile = File.expand_path(options[:pidfile]) if options[:pidfile]
     end
 
     def to_hash
-      {text: text, dir: dir, env: env, rvm: rvm}
+      {text: text, dir: dir, env: env, rvm: rvm, pidfile: pidfile}
     end
 
   end

data/lib/srv_manager/process.rb

@@ -11,6 +11,7 @@ module SrvManager
     def start
       return if alive?
       command.rvm ? rvm_start : default_start
+      @id = wait_for_pid(command.pidfile) if command.pidfile
       LOGGER.info "Started process #{@id}"
     end
 
@@ -42,7 +43,11 @@ module SrvManager
     private
 
     def detault_start
-      @id = ::Process.spawn command.env, command.text, chdir: command.dir, out: '/dev/null', err: '/dev/null'
+      @id = ::Process.spawn command.env, 
+                            command.text, 
+                            chdir: command.dir, 
+                            out: '/dev/null', 
+                            err: '/dev/null'
       ::Process.detach @id
     end
 
@@ -54,15 +59,15 @@ module SrvManager
                                 out: '/dev/null', 
                                 err: '/dev/null'
       ::Process.detach rvm_pid
-      @id = wait_for_pid pid_file
+      @id = wait_for_pid pid_file, true
     end
 
-    def wait_for_pid(filename)
+    def wait_for_pid(filename, delete=false)
       Timeout.timeout(60) do
         loop do
           if File.exists? filename
             pid = File.read(filename).to_i
-            File.delete filename
+            File.delete filename if delete
             return pid
           end
           sleep 0.1

data/lib/srv_manager/version.rb

@@ -1,3 +1,3 @@
 module SrvManager
-  VERSION = "0.0.4"
+  VERSION = '0.0.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: srv_manager
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Gabriel Naiman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-04 00:00:00.000000000 Z
+date: 2013-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor