process-daemon 0.5.1 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ac6a1383d85f2ac030dd67378c030b390ec8e57
-  data.tar.gz: bf7e354b299aa95289c9413f6433f05c3e089e1c
+  metadata.gz: 21fd4815d28972123439e807a1e57df28f451f90
+  data.tar.gz: 50b53976e7f7e5800092b7e0b5c612863d718c1b
 SHA512:
-  metadata.gz: f2dd1c47ad979b2799212c33db7794254a5b732a84bdb55076ee4725936c4f2c3dd40eea3a70f21f8663946208391d2b12b300e9e0f22f655f885fbfbf0925f4
-  data.tar.gz: de24582d288d5299e142c6a094eaabda43cc8f73fe512f660a114d5aa7de235e04fd835efec09d9aec5f26bfdd609f35ecc8f91cd6a18a2500e7180bc86cac0f
+  metadata.gz: fb95d20032105ecde239c38b303deab08312fe3fb9c572b64a4d663942ed9f077044da8415157c965e41d4dc69e17fdf20df982c7331f259f423c98b7610f89d
+  data.tar.gz: 6fb6c323210283f063d74032157d1f9c4399963eba4e209063c1c828e255205e5cb8f9725439d7d9f43fe72e0a18ac4f89645f497e69325d1cdfa4dcf60212d2

data/lib/process/daemon/controller.rb

@@ -97,7 +97,7 @@ module Process
 
 			# This function starts the daemon process in the background.
 			def start
-				@output.puts Rainbow("Starting daemon...").blue
+				@output.puts Rainbow("Starting #{@daemon.name} daemon...").blue
 
 				case ProcessFile.status(@daemon)
 				when :running
@@ -159,7 +159,7 @@ module Process
 
 			# Stops the daemon process.
 			def stop
-				@output.puts Rainbow("Stopping daemon...").blue
+				@output.puts Rainbow("Stopping #{@daemon.name} daemon...").blue
 
 				# Check if the pid file exists...
 				unless File.file?(@daemon.process_file_path)

data/lib/process/daemon/version.rb

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

data/lib/process/daemon.rb

@@ -45,23 +45,21 @@ module Process
 	# The base directory specifies a path such that:
 	#   working_directory = "."
 	#   log_directory = #{working_directory}/log
-	#   log_file_path = #{log_directory}/#{daemon_name}.log
+	#   log_file_path = #{log_directory}/#{name}.log
 	#   runtime_directory = #{working_directory}/run
-	#   process_file_path = #{runtime_directory}/#{daemon_name}.pid
+	#   process_file_path = #{runtime_directory}/#{name}.pid
 	class Daemon
-		def initialize(base_directory = ".")
-			@base_directory = base_directory
+		def initialize(working_directory = ".")
+			@working_directory = working_directory
 		end
 		
 		# Return the name of the daemon
-		def daemon_name
+		def name
 			return self.class.name.gsub(/[^a-zA-Z0-9]+/, '-')
 		end
 
 		# The directory the daemon will run in.
-		def working_directory
-			@base_directory
-		end
+		attr :working_directory
 
 		# Return the directory to store log files in.
 		def log_directory
@@ -70,7 +68,7 @@ module Process
 
 		# Standard log file for stdout and stderr.
 		def log_file_path
-			File.join(log_directory, "#{daemon_name}.log")
+			File.join(log_directory, "#{name}.log")
 		end
 
 		# Runtime data directory for the daemon.
@@ -80,13 +78,13 @@ module Process
 
 		# Standard location of process pid file.
 		def process_file_path
-			File.join(runtime_directory, "#{daemon_name}.pid")
+			File.join(runtime_directory, "#{name}.pid")
 		end
 
 		# Mark the output log.
 		def mark_log
 			File.open(log_file_path, "a") do |log_file|
-				log_file.puts "=== Log Marked @ #{Time.now.to_s} ==="
+				log_file.puts "=== Log Marked @ #{Time.now.to_s} [#{Process.pid}] ==="
 			end
 		end
 
@@ -114,8 +112,13 @@ module Process
 
 		# The main function to setup any environment required by the daemon
 		def prefork
-			@base_directory = File.expand_path(@base_directory) if @base_directory
-
+			# We freeze the working directory because it can't change after forking:
+			@working_directory = File.expand_path(working_directory)
+			
+			def self.working_directory
+				@working_directory
+			end
+			
 			FileUtils.mkdir_p(log_directory)
 			FileUtils.mkdir_p(runtime_directory)
 		end
@@ -127,7 +130,7 @@ module Process
 		# The main function to stop the daemon
 		def shutdown
 			# Interrupt all children processes, preferably to stop them so that they are not left behind.
-			Process.kill(0, :INT)
+			Process.kill(:INT, 0)
 		end
 		
 		def run

data/test/test_daemon.rb

@@ -79,7 +79,7 @@ class SleepDaemon < Process::Daemon
 	def working_directory
 		File.join(__dir__, "tmp")
 	end
-	
+
 	def startup
 		sleep 1 while true
 	end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: process-daemon
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.3
 platform: ruby
 authors:
 - Samuel Williams
@@ -14,56 +14,56 @@ dependencies:
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 5.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 5.3.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -73,8 +73,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - README.md
 - Rakefile
@@ -97,21 +97,21 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 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.'
+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