process-daemon 0.6.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce61de8f6a1e9c039282f457fed948aa8221d709
-  data.tar.gz: e44c53039d96fc318d894527010a5f378c4fe490
+  metadata.gz: 4f2719836b2dfefcb18754e6157764c3f964d667
+  data.tar.gz: 696fd41006946dd13a6a04eaabef60e5f35c8925
 SHA512:
-  metadata.gz: 8530411f7ca42fc9726424da6fc39358d2f6ca32fae5e67e8a6ec94682d2f2f4f7dbd7094c8367ab772f4762fadb89d495266be281d1d84e8121cc4bbcef7cd9
-  data.tar.gz: 883851f2915344371a49de317a9d6fd057b7b70ec638a3a4a6a9c438baf17c3ad73fc17ecabe9896a8c0591c9b7e86e20d55ba786ea20e467fe0dd805475e4fd
+  metadata.gz: 4a2c171b1f7007a6c69e198ee47b56409c870a6c6fe525b6d0b75f75529ea8a4cc802bf22aaad27751f0ec7e631c6ea2221be4ad83e64b4ffe4fe84b1554aeb5
+  data.tar.gz: 37b32a1adec863f0b34451b11e1dec6ddaed83e0c568be6f72d4171e5b878a7c873814353f19273ad901e63933381ee2a4699c340b18735742da40432bec4d2c

data/.travis.yml

@@ -1,11 +1,10 @@
 language: ruby
 sudo: false
 rvm:
-  - 2.2
-  - 2.1
-  - 2.0
+  - 2.0.0
+  - 2.1.8
+  - 2.2.4
+  - 2.3.0
+  - ruby-head
   - rbx-2
-matrix:
-  allow_failures:
-    - rvm: rbx-2 
 env: COVERAGE=true

data/README.md

@@ -2,9 +2,9 @@
 
 `Process::Daemon` is a stable and helpful base class for long running tasks and daemons. Provides standard `start`, `stop`, `restart`, `status` operations.
 
-[![Build Status](https://travis-ci.org/ioquatix/process-daemon.svg?branch=master)](https://travis-ci.org/ioquatix/process-daemon)
-[![Code Climate](https://codeclimate.com/github/ioquatix/process-daemon.png)](https://codeclimate.com/github/ioquatix/process-daemon)
-[![Coverage Status](https://coveralls.io/repos/ioquatix/process-daemon/badge.svg?branch=master)](https://coveralls.io/r/ioquatix/process-daemon?branch=master)
+[![Build Status](https://travis-ci.org/ioquatix/process-daemon.svg)](https://travis-ci.org/ioquatix/process-daemon)
+[![Code Climate](https://codeclimate.com/github/ioquatix/process-daemon.svg)](https://codeclimate.com/github/ioquatix/process-daemon)
+[![Coverage Status](https://coveralls.io/repos/ioquatix/process-daemon/badge.svg)](https://coveralls.io/r/ioquatix/process-daemon)
 [![Documentation](http://img.shields.io/badge/yard-docs-blue.svg)](http://www.rubydoc.info/gems/process-daemon)
 [![Code](http://img.shields.io/badge/github-code-blue.svg)](https://github.com/ioquatix/process-daemon)
 

data/lib/process/daemon.rb

@@ -162,38 +162,38 @@ module Process
 			self.shutdown
 		end
 		
-		# A shared instance of the daemon.
-		def self.instance
-			@instance ||= self.new
-		end
-		
-		# The process controller, responsible for managing the daemon process start, stop, restart, etc.
-		def self.controller(options = {})
-			@controller ||= Controller.new(instance, options)
-		end
-		
-		# The main entry point for daemonized scripts.
-		def self.daemonize(*args)
-			# Wish Ruby 2.0 kwargs were backported to 1.9.3... oh well:
-			options = (args.last === Hash) ? args.pop : {}
-			argv = (args.last === Array) ? args.pop : ARGV
+		class << self
+			# A shared instance of the daemon.
+			def instance
+				@instance ||= self.new
+			end
 			
-			controller(options).daemonize(argv)
-		end
-		
-		# Start the shared daemon instance.
-		def self.start
-			controller.start
-		end
-		
-		# Stop the shared daemon instance.
-		def self.stop
-			controller.stop
-		end
-		
-		# Check if the shared daemon instance is runnning or not.
-		def self.status
-			controller.status
+			# The process controller, responsible for managing the daemon process start, stop, restart, etc.
+			def controller(options = {})
+				@controller ||= Controller.new(instance, options)
+			end
+			
+			# The main entry point for daemonized scripts.
+			def daemonize(*args, **options)
+				args = ARGV if args.empty?
+				
+				controller(options).daemonize(args)
+			end
+			
+			# Start the shared daemon instance.
+			def start
+				controller.start
+			end
+			
+			# Stop the shared daemon instance.
+			def stop
+				controller.stop
+			end
+			
+			# Check if the shared daemon instance is runnning or not.
+			def status
+				controller.status
+			end
 		end
 	end
 end

data/lib/process/daemon/controller.rb

@@ -42,18 +42,18 @@ module Process
 				case (argv.shift || :default).to_sym
 				when :start
 					start
-					status
+					show_status
 				when :stop
 					stop
-					status
+					show_status
 					ProcessFile.cleanup(@daemon)
 				when :restart
 					stop
 					ProcessFile.cleanup(@daemon)
 					start
-					status
+					show_status
 				when :status
-					status
+					show_status
 				else
 					@output.puts Rainbow("Invalid command. Please specify start, restart, stop or status.").red
 				end
@@ -73,8 +73,8 @@ module Process
 					File.umask 0000
 					Dir.chdir @daemon.working_directory
 
-					$stdin.reopen "/dev/null"
-					$stdout.reopen @daemon.log_file_path, "a"
+					$stdin.reopen '/dev/null'
+					$stdout.reopen @daemon.log_file_path, 'a'
 					$stdout.sync = true
 				
 					$stderr.reopen $stdout
@@ -99,7 +99,7 @@ module Process
 			def start
 				@output.puts Rainbow("Starting #{@daemon.name} daemon...").blue
 
-				case ProcessFile.status(@daemon)
+				case self.status
 				when :running
 					@output.puts Rainbow("Daemon already running!").blue
 					return
@@ -132,9 +132,11 @@ module Process
 			
 			# Prints out the status of the daemon
 			def status
-				daemon_state = ProcessFile.status(@daemon)
-				
-				case daemon_state
+				ProcessFile.status(@daemon)
+			end
+			
+			def show_status
+				case self.status
 				when :running
 					@output.puts Rainbow("Daemon status: running pid=#{ProcessFile.recall(@daemon)}").green
 				when :unknown
@@ -150,8 +152,6 @@ module Process
 				when :stopped
 					@output.puts Rainbow("Daemon status: stopped").blue
 				end
-				
-				return daemon_state
 			end
 			
 			# The pid of the daemon if it is available. The pid may be invalid if the daemon has crashed.

data/lib/process/daemon/log_file.rb

@@ -31,7 +31,7 @@ module Process
 				reverse_each_line do |line|
 					lines << line
 					
-					break if yield line
+					break if block_given? and yield line
 				end
 
 				return lines.reverse
@@ -81,14 +81,19 @@ module Process
 
 				while offset == nil
 					chunk = read_reverse(REVERSE_BUFFER_SIZE)
+
 					return (buf == "" ? nil : buf) if chunk == nil
 
 					buf = chunk + buf
 
-					offset = buf.rindex(sep_string)
+					# Don't consider the last newline.
+					offset = buf.rindex(sep_string, -(sep_string.length + 1))
 				end
 
-				line = buf[offset...buf.size].sub(sep_string, "")
+				# Don't include newline:
+				offset += 1
+
+				line = buf[offset...buf.size]
 
 				seek((end_pos - buf.size) + offset, IO::SEEK_SET)
 

data/lib/process/daemon/version.rb

@@ -20,6 +20,6 @@
 
 module Process
 	class Daemon
-		VERSION = "0.6.1"
+		VERSION = "1.0.0"
 	end
 end

data/process-daemon.gemspec

@@ -23,6 +23,6 @@ Gem::Specification.new do |spec|
 	spec.add_dependency "rainbow", "~> 2.0"
 	
 	spec.add_development_dependency "bundler", "~> 1.3"
-	spec.add_development_dependency "rspec", "~> 3.3.0"
+	spec.add_development_dependency "rspec", "~> 3.4.0"
 	spec.add_development_dependency "rake"
 end

data/spec/process/daemon/crashed_daemon_spec.rb

@@ -0,0 +1,57 @@
+# Copyright, 2007, 2014, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# 
+# 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::Daemon::DaemonizeSpec
+	class CrashDaemon < Process::Daemon
+		def working_directory
+			File.expand_path("../tmp", __FILE__)
+		end
+		
+		def run
+			and_bobs_your_uncle
+		end
+	end
+
+	describe Process::Daemon do
+		it "should crash daemon and print exception" do
+			output = StringIO.new
+			
+			controller = Process::Daemon::Controller.new(CrashDaemon.instance, :output => output)
+			
+			controller.start
+			
+			sleep 1
+			
+			controller.show_status
+			
+			expect(CrashDaemon.status).to be == :unknown
+			expect(output.string).to include("=== Daemon Exception Backtrace", "=== Daemon Crashed")
+			expect(output.string).to include("NameError", "and_bobs_your_uncle")
+		end
+	end
+end

data/spec/process/daemon/daemon_spec.rb

@@ -69,14 +69,10 @@ module Process::Daemon::DaemonSpec
 		end
 	end
 
-	class SleepDaemon < Process::Daemon
+	class DefaultDaemon < Process::Daemon
 		def working_directory
 			File.expand_path("../tmp", __FILE__)
 		end
-
-		def run
-			sleep 1 while true
-		end
 	end
 
 	describe Process::Daemon do
@@ -90,6 +86,7 @@ module Process::Daemon::DaemonSpec
 		
 		it "should be running" do
 			expect(XMLRPCDaemon.status).to be == :running
+			expect(XMLRPCDaemon.instance.crashed?).to be_falsey
 		end
 		
 		it "should respond to connections" do
@@ -102,7 +99,7 @@ module Process::Daemon::DaemonSpec
 		end
 		
 		it "should be a unique instance" do
-			expect(XMLRPCDaemon.instance).to_not be == SleepDaemon.instance
+			expect(XMLRPCDaemon.instance).to_not be == DefaultDaemon.instance
 		end
 		
 		it "should produce useful output" do
@@ -112,6 +109,7 @@ module Process::Daemon::DaemonSpec
 			
 			expect(controller.status).to be == :running
 			
+			controller.show_status
 			expect(output.string).to match /Daemon status: running pid=\d+/
 			
 			output.rewind

data/spec/process/daemon/daemonize_spec.rb

@@ -0,0 +1,57 @@
+# Copyright, 2007, 2014, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# 
+# 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::Daemon::DaemonizeSpec
+	class SleepDaemon < Process::Daemon
+		def working_directory
+			File.expand_path("../tmp", __FILE__)
+		end
+	end
+
+	describe Process::Daemon do
+		it "should start daemon" do
+			SleepDaemon.daemonize(:start)
+			
+			expect(SleepDaemon.status).to be == :running
+			
+			SleepDaemon.daemonize(:stop)
+			
+			expect(SleepDaemon.status).to be == :stopped
+		end
+		
+		it "should restart daemon" do
+			SleepDaemon.daemonize(:restart)
+			
+			expect(SleepDaemon.status).to be == :running
+			
+			SleepDaemon.daemonize(:stop)
+			
+			expect(SleepDaemon.status).to be == :stopped
+		end
+	end
+end

data/spec/process/daemon/log_file_spec.rb

@@ -0,0 +1,36 @@
+# Copyright, 2014, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# 
+# 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 'process/daemon/log_file'
+
+module Process::Daemon::LogFileSpec
+	describe Process::Daemon::LogFile do
+		let(:daemon) {SleepDaemon.instance}
+		
+		it "should give the several last lines" do
+			lines = File.readlines(__FILE__)
+			
+			log_file = Process::Daemon::LogFile.open(__FILE__)
+			
+			expect(log_file.tail_log).to be == lines
+		end
+	end
+end

data/spec/process/daemon/notification_spec.rb

@@ -38,6 +38,7 @@ module Process::Daemon::NotificationSpec
 		end
 		
 		it "can be signalled within trap context and across processes" do
+			ready = Process::Daemon::Notification.new
 			notification = Process::Daemon::Notification.new
 			
 			pid = fork do
@@ -46,9 +47,13 @@ module Process::Daemon::NotificationSpec
 					exit(0)
 				end
 				
+				ready.signal
+				
 				sleep
 			end
 			
+			ready.wait(timeout: 5.0)
+			
 			Process.kill(:INT, pid)
 			
 			notification.wait(timeout: 1.0)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: process-daemon
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-23 00:00:00.000000000 Z
+date: 2016-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 3.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 3.4.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -88,8 +88,11 @@ files:
 - lib/process/daemon/process_file.rb
 - lib/process/daemon/version.rb
 - process-daemon.gemspec
+- spec/process/daemon/crashed_daemon_spec.rb
 - spec/process/daemon/daemon.rb
 - spec/process/daemon/daemon_spec.rb
+- spec/process/daemon/daemonize_spec.rb
+- spec/process/daemon/log_file_spec.rb
 - spec/process/daemon/notification_spec.rb
 - spec/process/daemon/privileges_spec.rb
 - spec/process/daemon/process_file_spec.rb
@@ -113,15 +116,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 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:
+- spec/process/daemon/crashed_daemon_spec.rb
 - spec/process/daemon/daemon.rb
 - spec/process/daemon/daemon_spec.rb
+- spec/process/daemon/daemonize_spec.rb
+- spec/process/daemon/log_file_spec.rb
 - spec/process/daemon/notification_spec.rb
 - spec/process/daemon/privileges_spec.rb
 - spec/process/daemon/process_file_spec.rb
-has_rdoc: yard