process-daemon 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21fd4815d28972123439e807a1e57df28f451f90
-  data.tar.gz: 50b53976e7f7e5800092b7e0b5c612863d718c1b
+  metadata.gz: 576478e27475cd8801ce2ea13053480531c13ea4
+  data.tar.gz: 8ec4d0c286a5d0630c357ec529b54611abf54204
 SHA512:
-  metadata.gz: fb95d20032105ecde239c38b303deab08312fe3fb9c572b64a4d663942ed9f077044da8415157c965e41d4dc69e17fdf20df982c7331f259f423c98b7610f89d
-  data.tar.gz: 6fb6c323210283f063d74032157d1f9c4399963eba4e209063c1c828e255205e5cb8f9725439d7d9f43fe72e0a18ac4f89645f497e69325d1cdfa4dcf60212d2
+  metadata.gz: ffba1f40b923721772b95a2544c1e1ef1a19a9a2547fe92f41109cfb9802c4b30759a07382b1619adf5e7ad4746c0af00958c62a642b9f8de8110d1378afec43
+  data.tar.gz: 0eb84df60f7380f8ec498e28dcdd36ffc458e3392819e2ff91d2d2bdc0f35315e1f5175d772bbca9833fa3e4eb9d37803ebf71a1b100eb90db5baab9278439e4

data/.travis.yml

@@ -1,4 +1,5 @@
 language: ruby
 rvm:
-  - "2.0"
-  - "2.1"
+  - 1.9
+  - 2.0
+  - 2.1

data/README.md

@@ -28,9 +28,8 @@ Create a file for your daemon, e.g. `daemon.rb`:
 	
 	# Very simple XMLRPC daemon
 	class XMLRPCDaemon < Process::Daemon
-		def base_directory
-			# Should be an absolute path:
-			File.join(__dir__, "tmp")
+		def working_directory
+			File.expand_path("../tmp", __FILE__)
 		end
 	
 		def startup

data/Rakefile

@@ -1,9 +1,6 @@
 require "bundler/gem_tasks"
-require "rake/testtask"
+require "rspec/core/rake_task"
 
-Rake::TestTask.new do |t|
-	t.libs << 'test'
-end
+RSpec::Core::RakeTask.new(:spec)
 
-desc "Run tests"
-task :default => :test
+task :default => :spec

data/lib/process/daemon.rb

@@ -133,7 +133,23 @@ module Process
 			Process.kill(:INT, 0)
 		end
 		
+		attr :title
+		
+		# Set the process title - only works after daemon has forked.
+		def title= title
+			@title = title
+			
+			if Process.respond_to? :setproctitle
+				Process.setproctitle(@title)
+			else
+				$0 = @title
+			end
+		end
+		
 		def run
+			
+			self.title = self.name
+			
 			trap("INT") do
 				shutdown
 			end

data/lib/process/daemon/controller.rb

@@ -154,6 +154,10 @@ module Process
 				return daemon_state
 			end
 
+			def pid
+				ProcessFile.recall(@daemon)
+			end
+
 			# How long to wait between checking the daemon process when shutting down:
 			STOP_PERIOD = 0.1
 

data/lib/process/daemon/version.rb

@@ -20,6 +20,6 @@
 
 module Process
 	class Daemon
-		VERSION = "0.5.3"
+		VERSION = "0.5.4"
 	end
 end

data/process-daemon.gemspec

@@ -22,6 +22,6 @@ Gem::Specification.new do |spec|
 	spec.add_dependency "rainbow", "~> 2.0"
 	
 	spec.add_development_dependency "bundler", "~> 1.3"
-	spec.add_development_dependency "minitest", "~> 5.3.2"
+	spec.add_development_dependency "rspec", "~> 3.0.0.rc1"
 	spec.add_development_dependency "rake"
 end

data/{test → spec/process/daemon}/daemon.rb

@@ -9,8 +9,8 @@ require 'xmlrpc/server'
 
 # Very simple XMLRPC daemon
 class XMLRPCDaemon < Process::Daemon
-	def base_directory
-		File.join(__dir__, "tmp")
+	def working_directory
+		File.expand_path("../tmp", __FILE__)
 	end
 
 	def startup

data/spec/process/daemon/daemon_spec.rb

@@ -0,0 +1,145 @@
+#!/usr/bin/env ruby
+
+# Copyright (c) 2007, 2009, 2011 Samuel G. D. Williams. <http://www.oriontransfer.co.nz>
+# 
+# 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.
+
+require 'process/daemon'
+
+require 'webrick'
+require 'webrick/https'
+
+require 'xmlrpc/server'
+require 'xmlrpc/client'
+
+module Process
+	class Daemon
+		module DaemonSpec
+			# Very simple XMLRPC daemon
+			class XMLRPCDaemon < Process::Daemon
+				def working_directory
+					File.expand_path("../tmp", __FILE__)
+				end
+	
+				def startup
+					puts "Starting server..."
+
+					@rpc_server = WEBrick::HTTPServer.new(
+						:Port => 31337,
+						:BindAddress => "0.0.0.0"
+					)
+
+					@listener = XMLRPC::WEBrickServlet.new
+
+					@listener.add_handler("add") do |amount|
+						@count ||= 0
+						@count += amount
+					end
+
+					@listener.add_handler("total") do
+						@count
+					end
+
+					@rpc_server.mount("/RPC2", @listener)
+
+					begin
+						puts "Daemon starting..."
+						@rpc_server.start
+						puts "Daemon stopping..."
+					rescue Interrupt
+						puts "Daemon interrupted..."
+					ensure
+						puts "Daemon shutdown..."
+						@rpc_server.shutdown
+					end
+				end
+
+				def shutdown
+					puts "Stopping the RPC server..."
+					@rpc_server.stop
+				end
+			end
+
+			class SleepDaemon < Process::Daemon
+				def working_directory
+					File.expand_path("../tmp", __FILE__)
+				end
+
+				def startup
+					sleep 1 while true
+				end
+			end
+
+			describe Daemon do
+				before do
+					XMLRPCDaemon.start
+				end
+				
+				after do
+					XMLRPCDaemon.stop
+				end
+				
+				it "should be running" do
+					expect(XMLRPCDaemon.status).to be == :running
+				end
+				
+				it "should respond to connections" do
+					rpc = XMLRPC::Client.new_from_uri("http://localhost:31337")
+					rpc.call("add", 10)
+
+					total = rpc.call("total")
+					
+					expect(total).to be == 10
+				end
+				
+				it "should be a unique instance" do
+					expect(XMLRPCDaemon.instance).to_not be == SleepDaemon.instance
+				end
+				
+				it "should produce useful output" do
+					output = StringIO.new
+					
+					controller = Process::Daemon::Controller.new(XMLRPCDaemon.instance, :output => output)
+					
+					expect(controller.status).to be == :running
+					
+					expect(output.string).to match /Daemon status: running pid=\d+/
+					
+					output.rewind
+					controller.stop
+					
+					expect(output.string).to match /Stopping/
+					
+					output.rewind
+					controller.start
+					
+					expect(output.string).to match /Starting/
+				end
+				
+				it "should have correct process title" do
+					pid = XMLRPCDaemon.controller.pid
+					
+					title = `ps -p #{pid} -o command=`.strip
+					
+					expect(title).to match /XMLRPCDaemon/
+				end
+			end
+		end
+	end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: process-daemon
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-16 00:00:00.000000000 Z
+date: 2014-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.3.2
+        version: 3.0.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.3.2
+        version: 3.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -85,8 +85,8 @@ files:
 - lib/process/daemon/process_file.rb
 - lib/process/daemon/version.rb
 - process-daemon.gemspec
-- test/daemon.rb
-- test/test_daemon.rb
+- spec/process/daemon/daemon.rb
+- spec/process/daemon/daemon_spec.rb
 homepage: ''
 licenses:
 - MIT
@@ -113,5 +113,5 @@ specification_version: 4
 summary: "`Process::Daemon` is a stable and helpful base class for long running tasks
   and daemons. Provides standard `start`, `stop`, `restart`, `status` operations."
 test_files:
-- test/daemon.rb
-- test/test_daemon.rb
+- spec/process/daemon/daemon.rb
+- spec/process/daemon/daemon_spec.rb

data/test/test_daemon.rb

@@ -1,129 +0,0 @@
-#!/usr/bin/env ruby
-
-# Copyright (c) 2007, 2009, 2011 Samuel G. D. Williams. <http://www.oriontransfer.co.nz>
-# 
-# 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.
-
-require 'minitest/autorun'
-
-require 'process/daemon'
-
-require 'webrick'
-require 'webrick/https'
-
-require 'xmlrpc/server'
-require 'xmlrpc/client'
-
-# Very simple XMLRPC daemon
-class XMLRPCDaemon < Process::Daemon
-	def working_directory
-		File.join(__dir__, "tmp")
-	end
-	
-	def startup
-		puts "Starting server..."
-
-		@rpc_server = WEBrick::HTTPServer.new(
-			:Port => 31337,
-			:BindAddress => "0.0.0.0"
-		)
-
-		@listener = XMLRPC::WEBrickServlet.new
-
-		@listener.add_handler("add") do |amount|
-			@count ||= 0
-			@count += amount
-		end
-
-		@listener.add_handler("total") do
-			@count
-		end
-
-		@rpc_server.mount("/RPC2", @listener)
-
-		begin
-			puts "Daemon starting..."
-			@rpc_server.start
-			puts "Daemon stopping..."
-		rescue Interrupt
-			puts "Daemon interrupted..."
-		ensure
-			puts "Daemon shutdown..."
-			@rpc_server.shutdown
-		end
-	end
-
-	def shutdown
-		puts "Stopping the RPC server..."
-		@rpc_server.stop
-	end
-end
-
-class SleepDaemon < Process::Daemon
-	def working_directory
-		File.join(__dir__, "tmp")
-	end
-
-	def startup
-		sleep 1 while true
-	end
-end
-
-class DaemonTest < MiniTest::Test
-	def setup
-		XMLRPCDaemon.start
-	end
-
-	def teardown
-		XMLRPCDaemon.stop
-	end
-
-	def test_connection
-		rpc = XMLRPC::Client.new_from_uri("http://localhost:31337")
-		rpc.call("add", 10)
-
-		total = rpc.call("total")
-
-		assert_equal 10, total
-	end
-	
-	def test_instances
-		refute_equal SleepDaemon.instance, XMLRPCDaemon.instance
-	end
-	
-	def test_output
-		output = StringIO.new
-		
-		controller = Process::Daemon::Controller.new(XMLRPCDaemon.instance, :output => output)
-		
-		assert_equal :running, controller.status
-		
-		assert_match /Daemon status: running pid=\d+/, output.string
-		
-		output.rewind
-		controller.stop
-		
-		assert_match /Stopping daemon/, output.string
-		
-		output.rewind
-		controller.start
-		
-		assert_match /Starting daemon/, output.string
-	end
-end