process-daemon 0.1.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9fd3e1daea454199404057b9b504216e8a93a5e
-  data.tar.gz: 0b3858725986811d62424f5182deba146f7d96a0
+  metadata.gz: ad2299e94a6c61f1720944c19525b84c535c597f
+  data.tar.gz: 38aed4cdf9ee795711e7b9507bb1008e7a9940c4
 SHA512:
-  metadata.gz: c65fb3fd1f265a5fc532331435eb2905d7ca0bcc8de4d3b8cc2c0598196a0d3c5627d1542ed8baa93839595247902e5238e79342c8ed41a05d83d3b5bbcba502
-  data.tar.gz: 8a121e07c4d44af7c8c2a653ec44ed2c78455b5b372057f7f14b05f52ffbc8405e7f0f4979bf1f42d6630851a5c0337aac7110c0030bafa38cf36c9fe78d3dc0
+  metadata.gz: e6653cc71627aac7a2ebb0c5bf90c71eda263507d01f6ab5d1a6bd267fdfb866cf84a92e5f9ff13dc50219f2eca3e607843a4e161b9ddfdd87559bb6a3b3c662
+  data.tar.gz: 85831d76b49be8ee9e046e6a4921d72fa4ffd08b80fcee77dfb98652ce710504e9057a42cd645d758ed593ddef389a03de96b9b1c638ef1ba6a4e265be36ecbb

data/lib/process/daemon.rb

@@ -130,10 +130,30 @@ module Process
 			Process.kill(0, :INT)
 		end
 		
+		# Helper methods for static daemon instance
+		
+		def self.instance
+			@instance ||= self.new
+		end
+		
+		# Main entry point for command line:
 		def self.daemonize(argv = ARGV)
-			@@instance ||= self.new
-			
-			Controller.daemonize(@@instance, argv)
+			Controller.daemonize(instance, argv)
+		end
+		
+		# Start the daemon instance:
+		def self.start
+			Controller.start(instance)
+		end
+		
+		# Stop the daemon instance:
+		def self.stop
+			Controller.stop(instance)
+		end
+		
+		# Get the status of the daemon instance, `:stopped`, `:running` or `:unknown`.
+		def self.status
+			ProcessFile.status(instance)
 		end
 	end
 end

data/lib/process/daemon/controller.rb

@@ -29,24 +29,24 @@ module Process
 		module Controller
 			# This function is called from the daemon executable. It processes ARGV and checks whether the user is asking for `start`, `stop`, `restart`, `status`.
 			def self.daemonize(daemon, argv = ARGV)
-				case argv.shift
-				when 'start'
+				case argv.shift.to_sym
+				when :start
 					start(daemon)
 					status(daemon)
-				when 'stop'
+				when :stop
 					stop(daemon)
 					status(daemon)
 					ProcessFile.cleanup(daemon)
-				when 'restart'
+				when :restart
 					stop(daemon)
 					ProcessFile.cleanup(daemon)
 					start(daemon)
 					status(daemon)
-				when 'status'
+				when :status
 					status(daemon)
 				else
 					puts "Invalid command. Please specify start, restart, stop or status."
-					exit
+					exit 1
 				end
 			end
 

data/lib/process/daemon/version.rb

@@ -20,6 +20,6 @@
 
 module Process
 	class Daemon
-		VERSION = "0.1.0"
+		VERSION = "0.3.0"
 	end
 end

data/process-daemon.gemspec

@@ -20,5 +20,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 "rake"
 end

data/test/daemon.rb

@@ -0,0 +1,47 @@
+#!/usr/bin/env ruby
+
+require 'process/daemon'
+
+require 'webrick'
+require 'webrick/https'
+
+require 'xmlrpc/server'
+
+# Very simple XMLRPC daemon
+class XMLRPCDaemon < Process::Daemon
+	def base_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("fourty-two") do |amount|
+			"Hello World"
+		end
+		
+		@rpc_server.mount("/RPC2", @listener)
+		
+		begin
+			@rpc_server.start
+		rescue Interrupt
+			puts "Daemon interrupted..."
+		ensure
+			@rpc_server.shutdown
+		end
+	end
+	
+	def shutdown
+		puts "Stopping the RPC server..."
+		@rpc_server.stop
+	end
+end
+
+XMLRPCDaemon.daemonize

data/test/test_daemon.rb

@@ -75,14 +75,23 @@ class XMLRPCDaemon < Process::Daemon
 	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
-		@daemon = XMLRPCDaemon.new
-		Process::Daemon::Controller.start(@daemon)
+		XMLRPCDaemon.start
 	end
 
 	def teardown
-		Process::Daemon::Controller.stop(@daemon)
+		XMLRPCDaemon.stop
 	end
 
 	def test_connection
@@ -93,4 +102,8 @@ class DaemonTest < MiniTest::Test
 
 		assert_equal 10, total
 	end
+	
+	def test_instances
+		refute_equal SleepDaemon.instance, XMLRPCDaemon.instance
+	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: process-daemon
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -38,6 +38,20 @@ dependencies:
     - - ~>
       - !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
@@ -71,6 +85,7 @@ files:
 - lib/process/daemon/process_file.rb
 - lib/process/daemon/version.rb
 - process-daemon.gemspec
+- test/daemon.rb
 - test/test_daemon.rb
 homepage: ''
 licenses:
@@ -98,4 +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