dante 0.1.5 → 0.2.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NWJkYTJiOTVkOWY1OTYzMzFhNGFmMzIzZmM5YjI0NWMxMzIxY2UwYQ==
+  data.tar.gz: !binary |-
+    NTViMjBkMGYwYWM2ZDE2YjBlMzJiZWQ1YjFlZDU0OWM2YWUzODU4NQ==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    MzIwNDBlMGNjY2Y0YmQwMjEzNzMzMjU4MmE4Y2ZkNDhhNTUwMDg5NmRlNWEy
+    ZDY3MWE5NjZiYTE4Y2U3NzFiZDA5ZmZmMWM4YTdkZGU0ZjBkMTI4MjEyMGFm
+    YjVhNTY1NjJhMjY4MjA0NmNjY2JjN2Q1MjdmNTNhMDZjMWQ3NWM=
+  data.tar.gz: !binary |-
+    YmQ4YTExNDIxYzc3YWUzNDA0MjBjMzUzYTcyMjI5NTY1OGM5YTQwOWJlYjZk
+    NThhNWRiYTM5ZmQ0MGVjOTlkNmVhZTgwOTM1ZWNhY2FjNjVjMWI2NmM5Mjhh
+    NmRlMzE3Y2JlMmQ5Yzg5YWMzOTAzNjg1MjJiYzg3NDc3MDY2NzU=

data/README.md

@@ -65,12 +65,19 @@ This gives your binary several useful things for free:
 
 will start the app undaemonized in the terminal, handling trapping and stopping the process.
 
+```
+./bin/myapp -l /var/log/myapp.log
+```
+
+will start the app undaemonized in the terminal and redirect all stdout and stderr to the specified logfile.
+
 ```
 ./bin/myapp -p 8080 -d -P /var/run/myapp.pid -l /var/log/myapp.log
 ```
 
 will daemonize and start the process, storing the pid in the specified pid file.
-All stdout and stderr will be redirected to the specified logfile.
+All stdout and stderr will be redirected to the specified logfile. If no logfile is specified in daemon mode then all 
+stdout and stderr will be directed to /var/log/<myapp name>.log.
 
 ```
 ./bin/myapp -k -P /var/run/myapp.pid
@@ -104,6 +111,10 @@ runner.with_options do |opts|
     options[:test] = test
   end
 end
+# Create validation hook for options
+runner.verify_options_hook = lambda { |opts|
+  raise Exception.new("Must supply test parameter") if opts[:test].nil?
+}
 # Parse command-line options and execute the process
 runner.execute do |opts|
   # opts: host, pid_path, port, daemonize, user, group
@@ -170,4 +181,4 @@ and that's all. Of course now you can also easily daemonize as well as start/sto
 
 ## Copyright
 
-Copyright © 2011 Nathan Esquenazi. See [LICENSE](https://github.com/bazaarlabs/dante/blob/master/LICENSE) for details.
+Copyright © 2011 Nathan Esquenazi. See [LICENSE](https://github.com/bazaarlabs/dante/blob/master/LICENSE) for details.

data/lib/dante/runner.rb

@@ -18,7 +18,7 @@ module Dante
   class Runner
     MAX_START_TRIES = 5
 
-    attr_accessor :options, :name, :description
+    attr_accessor :options, :name, :description, :verify_options_hook
 
     class << self
       def run(*args, &block)
@@ -50,6 +50,8 @@ module Dante
       parse_options
       self.options.merge!(opts)
 
+      @verify_options_hook.call(self.options) if @verify_options_hook
+
       if options.include?(:kill)
         self.stop
       else # create process
@@ -76,6 +78,10 @@ module Dante
     def daemonize
       return log("Process is already started") if self.daemon_running? # daemon already started
 
+      if !options[:log_path]
+         options[:log_path] = "/var/log/#{@name}.log"
+      end
+
       # Start process
       pid = fork do
         exit if fork
@@ -86,6 +92,7 @@ module Dante
         redirect_output!
         start
       end
+      Process.waitpid pid
       # Ensure process is running
       if until_true(MAX_START_TRIES) { self.daemon_running? }
         log "Daemon has started successfully"
@@ -99,6 +106,10 @@ module Dante
     def start
       log "Starting #{@name} service..."
 
+      if log_path = options[:log_path] && options[:daemonize].nil?
+         redirect_output! 
+      end
+
       trap("INT") {
         interrupt
         exit
@@ -175,7 +186,7 @@ module Dante
           options[:daemonize] = v
         end
 
-        opts.on("-l", "--log FILE", String, "Logfile for output") do |v|
+        opts.on("-l", "--log FILE", String, "Logfile for output", "(default: /var/log/#{@name}.log)") do |v|
           options[:log_path] = v
         end
 

data/lib/dante/version.rb

@@ -1,3 +1,3 @@
 module Dante
-  VERSION = "0.1.5"
+  VERSION = "0.2.0"
 end

data/test/runner_test.rb

@@ -1,6 +1,25 @@
 require File.expand_path('../test_helper', __FILE__)
 
 describe "dante runner" do
+
+  describe "verify options fails" do
+    it "should bubble up exception" do
+      runner = Dante::Runner.new('test-process', {key1:"val2"}) {
+        raise Exception.new("should not get here!!!")
+      }
+
+      runner.verify_options_hook = lambda { |opts|
+        raise Exception.new("Look for this exception") if(opts[:key1] != "val1")
+      }
+
+      err = assert_raises(Exception) {
+        runner.execute
+      }
+
+      assert_equal(err.message, "Look for this exception")
+    end
+  end
+
   describe "with no daemonize" do
     before do
       @process = TestingProcess.new('a')

metadata

@@ -1,74 +1,64 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: dante
-version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 5
-  version: 0.1.5
+version: !ruby/object:Gem::Version
+  version: 0.2.0
 platform: ruby
-authors: 
+authors:
 - Nathan Esquenazi
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-06-22 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-12-04 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: minitest
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Turn any process into a demon.
-email: 
+email:
 - nesquena@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - LICENSE
@@ -83,38 +73,28 @@ files:
 - test/test_helper.rb
 homepage: https://github.com/bazaarlabs/dante
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: dante
-rubygems_version: 1.8.21
+rubygems_version: 2.0.7
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Turn any process into a demon
-test_files: 
+test_files:
 - test/dante_test.rb
 - test/runner_test.rb
 - test/test_helper.rb