zeusd 0.1.1 → 0.2.0

data/README.md

@@ -1,10 +1,14 @@
 # Zeusd [![Gem Version](https://badge.fury.io/rb/zeusd.png)](http://badge.fury.io/rb/zeusd) [![Build Status](https://travis-ci.org/veloper/zeusd.png?branch=master)](https://travis-ci.org/veloper/zeusd) [![Code Climate](https://codeclimate.com/github/veloper/zeusd.png)](https://codeclimate.com/github/veloper/zeusd)
 
-*Run Zeus as a daemon.*
+Zeusd aims to provide greater control and easier scripting of the [Zeus Gem](https://github.com/burke/zeus) via daemonization.
 
-## Introduction
+## Feautres
 
-Zeus**d** lets you work with the [Zeus Gem](https://github.com/burke/zeus) like it's a daemon -- allowing greater control and easier scripting
+* Run the [Zeus Gem](https://github.com/burke/zeus) as a daemon.
+* Optionally block execution until Zeus has finished loaded using the `--block` flag.
+* Manage multiple zeusd daemons using the `--cwd` flag.
+
+## Usage
 
 ### Primary Commands
 

data/lib/zeusd/daemon.rb

@@ -7,18 +7,18 @@ module Zeusd
   class DaemonException < StandardError; end
 
   class Daemon
+    attr_reader :cwd, :verbose, :log_file, :log_queue, :interpreter, :child_process
+
+
     include Hooks
-    define_hooks :after_output, :after_start!, :after_stop!, :after_start_process!
+    define_hooks :after_start!, :after_stop!, :after_output
 
     after_start!  { log(:start) }
     after_stop!   { log(:stop) }
     after_output  {|x| log(x, :zeus) }
 
-    after_start_process! :ensure_log_worker
-
     after_stop! do
       (socket_file.delete rescue nil) if socket_file.exist?
-      @process = nil
     end
 
     after_output do |output|
@@ -26,8 +26,6 @@ module Zeusd
       puts(output) if verbose?
     end
 
-    attr_reader :cwd, :verbose, :log_file, :log_queue, :interpreter, :child_process
-
     def initialize(options = {})
       @cwd         = Pathname.new(options[:cwd] || Dir.pwd).realpath
       @verbose     = !!options[:verbose]
@@ -35,7 +33,9 @@ module Zeusd
     end
 
     def start!(options = {})
-      @process = Zeusd::Process.find(start_process!.pid)
+      start_child_process!
+
+      @process = Zeusd::Process.find(child_process.pid)
 
       if options.fetch(:block, false)
         sleep(0.1) until loaded?
@@ -53,7 +53,7 @@ module Zeusd
     def stop!
       return self unless process
 
-      # Kill Pids and Wait
+      # Kill process tree and wait for exits
       process.kill!(:recursive => true, :wait => true)
 
       # Check for remaining processes
@@ -61,6 +61,8 @@ module Zeusd
         raise DaemonException, "Unable to KILL processes: " + alive_processes.join(', ')
       end
 
+      @process = nil
+
       self
     ensure
       run_hook :after_stop!
@@ -74,7 +76,6 @@ module Zeusd
       interpreter.complete?
     end
 
-
     def log_file
       cwd.join('log/zeusd.log')
     end
@@ -105,17 +106,18 @@ module Zeusd
       end
     end
 
-    def start_process!
+    def start_child_process!
       @reader, @writer = IO.pipe
-      @child_process   = ChildProcess.build("zeus", "start")
+      @child_process = ChildProcess.build("zeus", "start")
       @child_process.environment["BUNDLE_GEMFILE"] = cwd.join("Gemfile").to_path
       @child_process.io.stdout = @child_process.io.stderr = @writer
-      @child_process.cwd       = cwd.to_path
-      @child_process.detach    = true
+      @child_process.cwd = cwd.to_path
+      @child_process.detach = true
       @child_process.start
+
       @writer.close
 
-      run_hook :after_start_process!
+      ensure_log_worker
 
       Thread.new do
         while (buffer = (@reader.readpartial(10000) rescue nil)) do

data/lib/zeusd/version.rb

@@ -1,3 +1,3 @@
 module Zeusd
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/zeusd.gemspec

@@ -18,10 +18,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "thor"
-  spec.add_runtime_dependency "childprocess"
-  spec.add_runtime_dependency "hooks"
-  spec.add_runtime_dependency "zeus"
+  spec.add_runtime_dependency "thor"         , "~> 0.18.1"
+  spec.add_runtime_dependency "childprocess" , "~> 0.4.0"
+  spec.add_runtime_dependency "hooks"        , "~> 0.3.3"
+  spec.add_runtime_dependency "zeus"         , "~> 0.13.3"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zeusd
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,72 +9,72 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-16 00:00:00.000000000 Z
+date: 2014-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.18.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.18.1
 - !ruby/object:Gem::Dependency
   name: childprocess
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: hooks
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.3
 - !ruby/object:Gem::Dependency
   name: zeus
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.13.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.13.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -215,7 +215,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -177571981788344824
+      hash: 3492660387363496392
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -224,7 +224,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -177571981788344824
+      hash: 3492660387363496392
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25