rexec 1.5.0 → 1.5.1

data/Gemfile

@@ -2,3 +2,4 @@
 source "https://rubygems.org"
 
 gem "rake"
+gem "rainbow"

data/lib/rexec/daemon/base.rb

@@ -53,7 +53,7 @@ module RExec
 
 			# The directory the daemon will run in.
 			def self.working_directory
-				File.join(@@base_directory, daemon_name)
+				@@base_directory
 			end
 
 			# Return the directory to store log files in.
@@ -63,7 +63,7 @@ module RExec
 
 			# Standard log file for stdout and stderr.
 			def self.log_file_path
-				File.join(log_directory, "daemon.log")
+				File.join(log_directory, "#{daemon_name}.log")
 			end
 
 			# Runtime data directory for the daemon.
@@ -73,7 +73,7 @@ module RExec
 
 			# Standard location of process pid file.
 			def self.process_file_path
-				File.join(runtime_directory, "daemon.pid")
+				File.join(runtime_directory, "#{daemon_name}.pid")
 			end
 
 			# Mark the output log.
@@ -87,7 +87,7 @@ module RExec
 			def self.tail_log(output)
 				lines = []
 
-				File.open(error_log_path, "r") do |log_file|
+				File.open(log_file_path, "r") do |log_file|
 					log_file.seek_end
 
 					log_file.reverse_each_line do |line|
@@ -103,10 +103,10 @@ module RExec
 
 			# Check the last few lines of the log file to find out if the daemon crashed.
 			def self.crashed?
-				File.open(error_log_path, "r") do |log_file|
+				File.open(log_file_path, "r") do |log_file|
 					log_file.seek_end
 
-					count = 2
+					count = 3
 					log_file.reverse_each_line do |line|
 						return true if line.match("=== Daemon Crashed")
 

data/lib/rexec/daemon/controller.rb

@@ -21,6 +21,8 @@
 require 'rexec/daemon/process_file'
 require 'rexec/task'
 
+require 'rainbow'
+
 module RExec
 	module Daemon
 		# Daemon startup timeout
@@ -53,16 +55,16 @@ module RExec
 
 			# This function starts the supplied daemon
 			def self.start(daemon)
-				puts "Starting daemon..."
+				puts "Starting daemon...".color(:blue)
 
 				case ProcessFile.status(daemon)
 				when :running
-					$stderr.puts "Daemon already running!"
+					$stderr.puts "Daemon already running!".color(:blue)
 					return
 				when :stopped
 					# We are good to go...
 				else
-					$stderr.puts "Daemon in unknown state! Will clear previous state and continue."
+					$stderr.puts "Daemon in unknown state! Will clear previous state and continue.".color(:red)
 					status(daemon)
 					ProcessFile.clear(daemon)
 				end
@@ -125,14 +127,14 @@ module RExec
 					end
 				end
 
-				puts "Waiting for daemon to start..."
+				puts "Waiting for daemon to start...".color(:blue)
 				sleep 0.1
 				timer = TIMEOUT
 				pid = ProcessFile.recall(daemon)
 
 				while pid == nil and timer > 0
 					# Wait a moment for the forking to finish...
-					puts "Waiting for daemon to start (#{timer}/#{TIMEOUT})"
+					puts "Waiting for daemon to start (#{timer}/#{TIMEOUT})".color(:blue)
 					sleep 1
 
 					# If the daemon has crashed, it is never going to start...
@@ -148,28 +150,29 @@ module RExec
 			def self.status(daemon)
 				case ProcessFile.status(daemon)
 				when :running
-					puts "Daemon status: running pid=#{ProcessFile.recall(daemon)}"
+					puts "Daemon status: running pid=#{ProcessFile.recall(daemon)}".color(:green)
 				when :unknown
 					if daemon.crashed?
-						puts "Daemon status: crashed"
+						puts "Daemon status: crashed".color(:red)
 
 						$stdout.flush
-						daemon.tail_error_log($stderr)
+						$stderr.puts "Dumping daemon crash log:".color(:red)
+						daemon.tail_log($stderr)
 					else
-						puts "Daemon status: unknown"
+						puts "Daemon status: unknown".color(:red)
 					end
 				when :stopped
-					puts "Daemon status: stopped"
+					puts "Daemon status: stopped".color(:blue)
 				end
 			end
 
 			# Stops the daemon process.
 			def self.stop(daemon)
-				puts "Stopping daemon..."
+				puts "Stopping daemon...".color(:blue)
 
 				# Check if the pid file exists...
 				unless File.file?(daemon.process_file_path)
-					puts "Pid file not found. Is the daemon running?"
+					puts "Pid file not found. Is the daemon running?".color(:red)
 					return
 				end
 
@@ -177,7 +180,7 @@ module RExec
 
 				# Check if the daemon is already stopped...
 				unless ProcessFile.running(daemon)
-					puts "Pid #{pid} is not running. Has daemon crashed?"
+					puts "Pid #{pid} is not running. Has daemon crashed?".color(:red)
 					return
 				end
 
@@ -191,7 +194,7 @@ module RExec
 				while ProcessFile.running(daemon) and attempts > 0
 					sig = (attempts < 2) ? "KILL" : "TERM"
 
-					puts "Sending #{sig} to pid #{pid}..."
+					puts "Sending #{sig} to pid #{pid}...".color(:red)
 					Process.kill(sig, pid)
 
 					sleep 1
@@ -200,7 +203,7 @@ module RExec
 
 				# If after doing our best the daemon is still running (pretty odd)...
 				if ProcessFile.running(daemon)
-					puts "Daemon appears to be still running!"
+					puts "Daemon appears to be still running!".color(:red)
 					return
 				end
 

data/lib/rexec/version.rb

@@ -22,7 +22,7 @@ module RExec
 	module VERSION
 		MAJOR = 1
 		MINOR = 5
-		TINY  = 0
+		TINY  = 1
 
 		STRING = [MAJOR, MINOR, TINY].join('.')
 	end

data/test/test_remote_server.rb

@@ -21,7 +21,7 @@
 # THE SOFTWARE.
 
 # This script is used to test actual remote connections
-# e.g. ./test_remote.rb "ssh haru.oriontransfer.org"
+# e.g. ./test_remote_server.rb "ssh haru.oriontransfer.org"
 
 require 'helper'
 
@@ -65,4 +65,3 @@ class RemoteServerTest < Test::Unit::TestCase
 		conn.stop
 	end
 end
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rexec
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-15 00:00:00.000000000 Z
-dependencies: []
+date: 2012-10-19 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rainbow
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: samuel@oriontransfer.org
 executables:
@@ -58,6 +74,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3629144491147234128
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: