daemon_controller 0.2.2 → 0.2.3

data/README.markdown

@@ -25,8 +25,20 @@ It provides the following functionality:
 *   Stopping daemons.
 *   Checking whether a daemon is running.
 
+## Installation
 
-## What is it for?
+    gem install daemon_controller
+
+
+## Resources
+
+*   [Website](http://github.com/FooBarWidget/daemon_controller)
+*   [Git repository](git://github.com/FooBarWidget/daemon_controller.git)
+*   [RubyForge project](http://rubyforge.org/projects/daemoncontrol/)
+
+
+What is it for?
+===============
 
 There is a lot of software (both Rails related and unrelated) which rely on
 servers or daemons. To name a few, in no particular order:

data/daemon_controller.gemspec

@@ -1,7 +1,8 @@
 Gem::Specification.new do |s|
   s.name = "daemon_controller"
-  s.version = "0.2.2"
-  s.date = "2009-11-06"
+  # Don't forget to update version.rb too.
+  s.version = "0.2.3"
+  s.date = "2009-11-13"
   s.summary = "A library for implementing daemon management capabilities"
   s.email = "hongli@phusion.nl"
   s.homepage = "http://github.com/FooBarWidget/daemon_controller/tree/master"
@@ -13,6 +14,7 @@ Gem::Specification.new do |s|
       "README.markdown", "LICENSE.txt", "daemon_controller.gemspec",
       "lib/daemon_controller.rb",
       "lib/daemon_controller/lock_file.rb",
+      "lib/daemon_controller/version.rb",
       "spec/test_helper.rb",
       "spec/daemon_controller_spec.rb",
       "spec/echo_server.rb"

data/lib/daemon_controller/version.rb

@@ -0,0 +1,27 @@
+# daemon_controller, library for robust daemon management
+# Copyright (c) 2009 Phusion
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+class DaemonController
+	MAJOR = 0
+	MINOR = 2
+	TINY  = 3
+	VERSION_STRING = "#{MAJOR}.#{MINOR}.#{TINY}"
+end # class DaemonController

data/lib/daemon_controller.rb

@@ -59,7 +59,11 @@ class DaemonController
 	#  
 	# [:start_command]
 	#  The command to start the daemon. This must be a a String, e.g.
-	#  "mongrel_rails start -e production".
+	#  "mongrel_rails start -e production", or a Proc which returns a String.
+	#  
+	#  If the value is a Proc, and the +before_start+ option is given too, then
+	#  the +start_command+ Proc is guaranteed to be called after the +before_start+
+	#  Proc is called.
 	#  
 	# [:ping_command]
 	#  The ping command is used to check whether the daemon can be connected to.
@@ -341,7 +345,11 @@ private
 	end
 	
 	def spawn_daemon
-		run_command(@start_command)
+		if @start_command.respond_to?(:call)
+			run_command(@start_command.call)
+		else
+			run_command(@start_command)
+		end
 	end
 	
 	def kill_daemon

data/spec/daemon_controller_spec.rb

@@ -158,6 +158,34 @@ describe DaemonController, "#start" do
 			e.message.should =~ /crashing, as instructed/
 		end
 	end
+	
+	specify "the start command may be a Proc" do
+		called = true
+		new_controller(:start_command => lambda { called = true; @start_command })
+		begin
+			@controller.start
+		ensure
+			@controller.stop
+		end
+		called.should be_true
+	end
+	
+	specify "if the start command is a Proc then it is called after before_start" do
+		log = []
+		new_controller(
+			:start_command => lambda {
+				log << "start_command"
+				@start_command
+			},
+			:before_start => lambda { log << "before_start" }
+		)
+		begin
+			@controller.start
+		ensure
+			@controller.stop
+		end
+		log.should == ["before_start", "start_command"]
+	end
 end
 
 describe DaemonController, "#stop" do

data/spec/test_helper.rb

@@ -4,22 +4,22 @@ Dir.chdir(root)
 
 module TestHelper
 	def new_controller(options = {})
-		start_command = './spec/echo_server.rb -l spec/echo_server.log -P spec/echo_server.pid'
+		@start_command = './spec/echo_server.rb -l spec/echo_server.log -P spec/echo_server.pid'
 		if options[:wait1]
-			start_command << " --wait1 #{options[:wait1]}"
+			@start_command << " --wait1 #{options[:wait1]}"
 		end
 		if options[:wait2]
-			start_command << " --wait2 #{options[:wait2]}"
+			@start_command << " --wait2 #{options[:wait2]}"
 		end
 		if options[:stop_time]
-			start_command << " --stop-time #{options[:stop_time]}"
+			@start_command << " --stop-time #{options[:stop_time]}"
 		end
 		if options[:crash_before_bind]
-			start_command << " --crash-before-bind"
+			@start_command << " --crash-before-bind"
 		end
 		new_options = {
 			:identifier    => 'My Test Daemon',
-			:start_command => start_command,
+			:start_command => @start_command,
 			:ping_command  => proc do
 				begin
 					TCPSocket.new('127.0.0.1', 3230)

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: daemon_controller
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
-  - Hongli Lai
+- Hongli Lai
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-11-06 00:00:00 +01:00
+date: 2009-11-13 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -22,14 +22,15 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-  - README.markdown
-  - LICENSE.txt
-  - daemon_controller.gemspec
-  - lib/daemon_controller.rb
-  - lib/daemon_controller/lock_file.rb
-  - spec/test_helper.rb
-  - spec/daemon_controller_spec.rb
-  - spec/echo_server.rb
+- README.markdown
+- LICENSE.txt
+- daemon_controller.gemspec
+- lib/daemon_controller.rb
+- lib/daemon_controller/lock_file.rb
+- lib/daemon_controller/version.rb
+- spec/test_helper.rb
+- spec/daemon_controller_spec.rb
+- spec/echo_server.rb
 has_rdoc: true
 homepage: http://github.com/FooBarWidget/daemon_controller/tree/master
 licenses: []
@@ -38,18 +39,18 @@ post_install_message:
 rdoc_options: []
 
 require_paths: 
-  - lib
+- lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
   version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
   version: 
 requirements: []