rexec 1.4.1 → 1.5.0

data/Gemfile

@@ -0,0 +1,4 @@
+# A sample Gemfile
+source "https://rubygems.org"
+
+gem "rake"

data/lib/rexec/daemon/base.rb

@@ -35,84 +35,79 @@ module RExec
 		# 	end
 		# 	
 		# 	Server.daemonize
+		#
+		# The base directory specifies a path such that:
+		#   working_directory = #{@@base_directory}/#{daemon_name}
+		#   log_directory = #{working_directory}/log
+		#   log_file_path = #{log_directory}/daemon.log
+		#   runtime_directory = #{working_directory}/run
+		#   process_file_path = #{runtime_directory}/daemon.pid
 		class Base
-			@@var_directory = nil
-			@@log_directory = nil
-			@@pid_directory = nil
+			# For a system-level daemon you might want to specify "/var"
+			@@base_directory = "."
 
 			# Return the name of the daemon
 			def self.daemon_name
 				return name.gsub(/[^a-zA-Z0-9]+/, '-')
 			end
 
-			# Base directory for daemon log files / run files
-			def self.var_directory
-				@@var_directory || File.join("", "var")
-			end
-
-			# The directory the daemon will run in (Dir.chdir)
+			# The directory the daemon will run in.
 			def self.working_directory
-				var_directory
+				File.join(@@base_directory, daemon_name)
 			end
 
-			# Return the directory to store log files in
+			# Return the directory to store log files in.
 			def self.log_directory
-				@@log_directory || File.join(var_directory, "log", daemon_name)
+				File.join(working_directory, "log")
 			end
 
-			# Standard log file for errors
-			def self.err_fn
-				File.join(log_directory, "stderr.log")
+			# Standard log file for stdout and stderr.
+			def self.log_file_path
+				File.join(log_directory, "daemon.log")
 			end
 
-			# Standard log file for normal output
-			def self.log_fn
-				File.join(log_directory, "stdout.log")
+			# Runtime data directory for the daemon.
+			def self.runtime_directory
+				File.join(working_directory, "run")
 			end
 
-			# Standard location of pid file
-			def self.pid_directory
-				@@pid_directory || File.join(var_directory, "run", daemon_name)
+			# Standard location of process pid file.
+			def self.process_file_path
+				File.join(runtime_directory, "daemon.pid")
 			end
 
-			# Standard pid file
-			def self.pid_fn
-				File.join(pid_directory, "#{daemon_name}.pid")
-			end
-
-			# Mark the error log
-			def self.mark_err_log
-				fp = File.open(err_fn, "a")
-				fp.puts "=== Error Log Opened @ #{Time.now.to_s} ==="
-				fp.close
+			# Mark the output log.
+			def self.mark_log
+				File.open(log_file_path, "a") do |log_file|
+					log_file.puts "=== Log Marked @ #{Time.now.to_s} ==="
+				end
 			end
 
-			# Prints some information relating to daemon startup problems
-			def self.tail_err_log(outp)
+			# Prints some information relating to daemon startup problems.
+			def self.tail_log(output)
 				lines = []
 
-				File.open(err_fn, "r") do |fp|
-					fp.seek_end
+				File.open(error_log_path, "r") do |log_file|
+					log_file.seek_end
 
-					fp.reverse_each_line do |line|
+					log_file.reverse_each_line do |line|
 						lines << line
-						break if line.match("=== Error Log") || line.match("=== Daemon Exception Backtrace")
+						break if line.match("=== Log Marked") || line.match("=== Daemon Exception Backtrace")
 					end
 				end
 
 				lines.reverse_each do |line|
-					outp.puts line
+					output.puts line
 				end
 			end
 
-			# Check the last few lines of the log file to find out if
-			# the daemon crashed.
+			# Check the last few lines of the log file to find out if the daemon crashed.
 			def self.crashed?
-				File.open(err_fn, "r") do |fp|
-					fp.seek_end
+				File.open(error_log_path, "r") do |log_file|
+					log_file.seek_end
 
 					count = 2
-					fp.reverse_each_line do |line|
+					log_file.reverse_each_line do |line|
 						return true if line.match("=== Daemon Crashed")
 
 						count -= 1
@@ -146,12 +141,10 @@ module RExec
 
 			# The main function to setup any environment required by the daemon
 			def self.prefork
-				@@var_directory = File.expand_path(@@var_directory) if @@var_directory
-				@@log_directory = File.expand_path(@@log_directory) if @@log_directory
-				@@pid_directory = File.expand_path(@@pid_directory) if @@pid_directory
+				@@base_directory = File.expand_path(@@base_directory) if @@base_directory
 
 				FileUtils.mkdir_p(log_directory)
-				FileUtils.mkdir_p(pid_directory)
+				FileUtils.mkdir_p(runtime_directory)
 			end
 
 			# The main function to start the daemon

data/lib/rexec/daemon/controller.rb

@@ -18,7 +18,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'rexec/daemon/pidfile'
+require 'rexec/daemon/process_file'
 require 'rexec/task'
 
 module RExec
@@ -28,21 +28,19 @@ module RExec
 
 		# This module contains functionality related to starting and stopping the daemon, and code for processing command line input.
 		module Controller
-			# This function is called from the daemon executable. It processes ARGV and checks whether the user is asking for
-			# +start+, +stop+, +restart+ or +status+.
+			# 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)
-				#puts "Running in #{WorkingDirectory}, logs in #{LogDirectory}"
-				case !ARGV.empty? && ARGV[0]
+				case ARGV.shift
 				when 'start'
 					start(daemon)
 					status(daemon)
 				when 'stop'
 					stop(daemon)
 					status(daemon)
-					PidFile.cleanup(daemon)
+					ProcessFile.cleanup(daemon)
 				when 'restart'
 					stop(daemon)
-					PidFile.cleanup(daemon)
+					ProcessFile.cleanup(daemon)
 					start(daemon)
 					status(daemon)
 				when 'status'
@@ -57,7 +55,7 @@ module RExec
 			def self.start(daemon)
 				puts "Starting daemon..."
 
-				case PidFile.status(daemon)
+				case ProcessFile.status(daemon)
 				when :running
 					$stderr.puts "Daemon already running!"
 					return
@@ -66,26 +64,26 @@ module RExec
 				else
 					$stderr.puts "Daemon in unknown state! Will clear previous state and continue."
 					status(daemon)
-					PidFile.clear(daemon)
+					ProcessFile.clear(daemon)
 				end
 
 				daemon.prefork
-				daemon.mark_err_log
+				daemon.mark_log
 
 				fork do
 					Process.setsid
 					exit if fork
 
-					PidFile.store(daemon, Process.pid)
+					ProcessFile.store(daemon, Process.pid)
 
 					File.umask 0000
 					Dir.chdir daemon.working_directory
 
 					$stdin.reopen "/dev/null"
-					$stdout.reopen daemon.log_fn, "a"
+					$stdout.reopen daemon.log_file_path, "a"
 					$stdout.sync = true
 					
-					$stderr.reopen daemon.err_fn, "a"
+					$stderr.reopen $stdout
 					$stderr.sync = true
 
 					begin
@@ -130,7 +128,7 @@ module RExec
 				puts "Waiting for daemon to start..."
 				sleep 0.1
 				timer = TIMEOUT
-				pid = PidFile.recall(daemon)
+				pid = ProcessFile.recall(daemon)
 
 				while pid == nil and timer > 0
 					# Wait a moment for the forking to finish...
@@ -140,7 +138,7 @@ module RExec
 					# If the daemon has crashed, it is never going to start...
 					break if daemon.crashed?
 
-					pid = PidFile.recall(daemon)
+					pid = ProcessFile.recall(daemon)
 
 					timer -= 1
 				end
@@ -148,15 +146,15 @@ module RExec
 
 			# Prints out the status of the daemon
 			def self.status(daemon)
-				case PidFile.status(daemon)
+				case ProcessFile.status(daemon)
 				when :running
-					puts "Daemon status: running pid=#{PidFile.recall(daemon)}"
+					puts "Daemon status: running pid=#{ProcessFile.recall(daemon)}"
 				when :unknown
 					if daemon.crashed?
 						puts "Daemon status: crashed"
 
 						$stdout.flush
-						daemon.tail_err_log($stderr)
+						daemon.tail_error_log($stderr)
 					else
 						puts "Daemon status: unknown"
 					end
@@ -170,27 +168,27 @@ module RExec
 				puts "Stopping daemon..."
 
 				# Check if the pid file exists...
-				if !File.file?(daemon.pid_fn)
+				unless File.file?(daemon.process_file_path)
 					puts "Pid file not found. Is the daemon running?"
 					return
 				end
 
-				pid = PidFile.recall(daemon)
+				pid = ProcessFile.recall(daemon)
 
 				# Check if the daemon is already stopped...
-				unless PidFile.running(daemon)
+				unless ProcessFile.running(daemon)
 					puts "Pid #{pid} is not running. Has daemon crashed?"
 					return
 				end
 
-				pid = PidFile.recall(daemon)
+				pid = ProcessFile.recall(daemon)
 				Process.kill("INT", pid)
 				sleep 0.1
 
 				# Kill/Term loop - if the daemon didn't die easily, shoot
 				# it a few more times.
 				attempts = 5
-				while PidFile.running(daemon) and attempts > 0
+				while ProcessFile.running(daemon) and attempts > 0
 					sig = (attempts < 2) ? "KILL" : "TERM"
 
 					puts "Sending #{sig} to pid #{pid}..."
@@ -201,13 +199,13 @@ module RExec
 				end
 
 				# If after doing our best the daemon is still running (pretty odd)...
-				if PidFile.running(daemon)
+				if ProcessFile.running(daemon)
 					puts "Daemon appears to be still running!"
 					return
 				end
 
 				# Otherwise the daemon has been stopped.
-				PidFile.clear(daemon)
+				ProcessFile.clear(daemon)
 			end
 		end
 	end

data/lib/rexec/daemon/{pidfile.rb → process_file.rb}

@@ -21,21 +21,21 @@
 module RExec
 	module Daemon
 		# This module controls the storage and retrieval of process id files.
-		module PidFile
+		module ProcessFile
 			# Saves the pid for the given daemon
 			def self.store(daemon, pid)
-				File.open(daemon.pid_fn, 'w') {|f| f << pid}
+				File.open(daemon.process_file_path, 'w') {|f| f << pid}
 			end
 
 			# Retrieves the pid for the given daemon
 			def self.recall(daemon)
-				IO.read(daemon.pid_fn).to_i rescue nil
+				IO.read(daemon.process_file_path).to_i rescue nil
 			end
 
 			# Removes the pid saved for a particular daemon
 			def self.clear(daemon)
-				if File.exist? daemon.pid_fn
-					FileUtils.rm(daemon.pid_fn)
+				if File.exist? daemon.process_file_path
+					FileUtils.rm(daemon.process_file_path)
 				end
 			end
 
@@ -58,8 +58,8 @@ module RExec
 			# This function returns the status of the daemon. This can be one of +:running+, +:unknown+ (pid file exists but no 
 			# corresponding process can be found) or +:stopped+.
 			def self.status(daemon)
-				if File.exist? daemon.pid_fn
-					return PidFile.running(daemon) ? :running : :unknown
+				if File.exist? daemon.process_file_path
+					return ProcessFile.running(daemon) ? :running : :unknown
 				else
 					return :stopped
 				end

data/lib/rexec/version.rb

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

data/rakefile.rb

@@ -0,0 +1,10 @@
+
+require 'rake/testtask'
+
+Rake::TestTask.new do |t|
+	t.libs << 'test'
+end
+
+desc "Run tests"
+task :default => :test
+

data/test/client.rb

@@ -19,18 +19,18 @@
 # THE SOFTWARE.
 
 $connection.run do |object|
-  case(object[0])
-  when :bounce
-    $stderr.puts("Bouncing #{object[1].inspect}...")
-    $connection.send_object(object[1])
-  when :exception
-    $stderr.puts("Raising exception...")
-    raise Exception.new("I love exceptions!")
-  when :stop
-    $stderr.puts("Stopping connection manually...")
-    $connection.stop
-  when :stderr
-    $stderr.puts object[1]
-    $stderr.flush
-  end
+	case(object[0])
+	when :bounce
+		$stderr.puts("Bouncing #{object[1].inspect}...")
+		$connection.send_object(object[1])
+	when :exception
+		$stderr.puts("Raising exception...")
+		raise Exception.new("I love exceptions!")
+	when :stop
+		$stderr.puts("Stopping connection manually...")
+		$connection.stop
+	when :stderr
+		$stderr.puts object[1]
+		$stderr.flush
+	end
 end

data/test/daemon.rb

@@ -20,8 +20,9 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'rubygems'
+$LOAD_PATH.unshift File.expand_path("../../lib/", __FILE__)
 
+require 'rubygems'
 require 'pathname'
 
 require 'rexec'
@@ -33,41 +34,39 @@ require 'xmlrpc/server'
 
 # Very simple XMLRPC daemon
 class TestDaemon < RExec::Daemon::Base
-  @@var_directory = "/tmp/ruby-test/var"
+	@@var_directory = "/tmp/ruby-test/var"
   
-  def self.run
-    puts "Starting server..."
-    
-    @@rpc_server = WEBrick::HTTPServer.new(
-      :Port => 11235,
-      :BindAddress => "0.0.0.0",
-      :SSLEnable => true,
-      :SSLVerifyClient => OpenSSL::SSL::VERIFY_NONE,
-      :SSLCertName => [["CN", WEBrick::Utils::getservername]])
-    
-    @@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)
-    
-    $stdout.flush
-    $stderr.flush
+	def self.run
+		puts "Starting server..."
     
-    @@rpc_server.start
-  end
-  
-  def self.shutdown
+		@@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)
+
+		$stdout.flush
+		$stderr.flush
+
+		@@rpc_server.start
+	end
+
+	def self.shutdown
 		puts "Shutting down server..."
-    @@rpc_server.shutdown
-  end
+		@@rpc_server.shutdown
+	end
 end
 
 TestDaemon.daemonize

data/test/helper.rb

@@ -0,0 +1,5 @@
+
+$LOAD_PATH.unshift File.expand_path("../../lib/", __FILE__)
+
+require 'rubygems'
+require 'test/unit'

data/test/listing_example.rb

@@ -20,19 +20,20 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'rubygems'
+require 'helper'
+
 require 'rexec'
 
 CLIENT = <<EOF
 
 $connection.run do |path|
-  listing = []
+	listing = []
 
-  IO.popen("ls -la " + path.dump, "r+") do |ls|
-    listing = ls.readlines
-  end
+	IO.popen("ls -la " + path.dump, "r+") do |ls|
+		listing = ls.readlines
+	end
 
-  $connection.send_object(listing)
+	$connection.send_object(listing)
 end
 
 EOF
@@ -41,14 +42,14 @@ command = ARGV[0] || "ruby"
 
 puts "Starting server..."
 RExec::start_server(CLIENT, command) do |conn, pid|
-  puts "Sending path..."
-  conn.send_object("/")
+	puts "Sending path..."
+	conn.send_object("/")
 
-  puts "Waiting for response..."
-  listing = conn.receive_object
+	puts "Waiting for response..."
+	listing = conn.receive_object
 
-  puts "Received listing:"
-  listing.each do |entry|
-    puts "\t#{entry}"
-  end
+	puts "Received listing:"
+	listing.each do |entry|
+		puts "\t#{entry}"
+	end
 end

data/test/{daemon_test.rb → test_daemon.rb}

@@ -20,30 +20,28 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'rubygems'
+require 'helper'
+
 require 'pathname'
 require 'xmlrpc/client'
-require 'test/unit'
 
 class DaemonTest < Test::Unit::TestCase
-  DAEMON = (Pathname.new(__FILE__).dirname + "./daemon.rb").realpath
-  def setup
-    system(DAEMON, "start")
-    
-    # Daemon takes a moment to become fully operational
-    sleep(5)
-  end
-  
-  def teardown
-    system(DAEMON, "stop")
-  end
-
-  def test_connection
-    rpc = XMLRPC::Client.new_from_uri("https://localhost:11235")
-    rpc.call("add", 10)
-    
-    total = rpc.call("total")
-    
-    assert_equal 10, total
-  end
+	DAEMON = (Pathname.new(__FILE__).dirname + "./daemon.rb").realpath
+
+	def setup
+		system(DAEMON.to_s, "start")
+	end
+
+	def teardown
+		system(DAEMON.to_s, "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
 end

data/test/{remote_server_test.rb → test_remote_server.rb}

@@ -23,9 +23,8 @@
 # This script is used to test actual remote connections
 # e.g. ./test_remote.rb "ssh haru.oriontransfer.org"
 
-require 'rubygems'
+require 'helper'
 
-require 'test/unit'
 require 'fileutils'
 require 'pathname'
 require 'rexec'

data/test/test_server.rb

@@ -0,0 +1,93 @@
+#!/usr/bin/env ruby
+
+# Copyright (c) 2007, 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 'helper'
+
+require 'fileutils'
+require 'pathname'
+require 'rexec'
+
+class ServerTest < Test::Unit::TestCase
+	def test_local_execution
+		code = Pathname.new(__FILE__).dirname + "./client.rb"
+		sobj = [1, 2, "three", 4]
+		stderr_text = "There was no error.. maybe?"
+		connection_started = false
+		object_received = false
+
+		RExec::start_server(code.read, "ruby", :passthrough => []) do |conn, task|
+			connection_started = true
+			conn.send_object([:bounce, sobj])
+
+			assert_equal sobj, conn.receive_object
+
+			assert_raises(Exception) do
+				conn.send_object([:exception])
+				obj = conn.receive_object
+        
+				puts "Received object which should have been exception: #{obj.inspect}"
+			end
+
+			conn.dump_errors
+			conn.send_object([:stderr, stderr_text])
+
+			puts "Attemping to read from #{conn.error.to_i}..."
+			assert_equal stderr_text, conn.error.readline.chomp
+
+			conn.stop
+		end
+
+		assert(connection_started, "Connection started")
+	end
+  
+	def test_shell_execution
+		connection_started = false
+		code = Pathname.new(__FILE__).dirname + "client.rb"
+
+		test_obj = [1, 2, 3, 4, "five"]
+
+		RExec::start_server(code.read, "/bin/sh -c ruby", :passthrough => []) do |conn, task|
+			connection_started = true
+			conn.send_object([:bounce, test_obj])
+
+			assert_equal test_obj, conn.receive_object
+
+			conn.stop
+		end
+
+		assert(connection_started, "Connection started")
+	end
+  
+	def test_shell_execution_non_block
+		connection_started = false
+		code = Pathname.new(__FILE__).dirname + "client.rb"
+
+		test_obj = [1, 2, 3, 4, "five"]
+
+		conn, task = RExec::start_server(code.read, "/bin/sh -c ruby", :passthrough => [])
+		conn.send_object([:bounce, test_obj])
+
+		assert_equal test_obj, conn.receive_object
+
+		conn.stop
+	end
+end

data/test/test_task.rb

@@ -0,0 +1,168 @@
+#!/usr/bin/env ruby
+
+# Copyright (c) 2007, 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 'helper'
+
+require 'fileutils'
+require 'pathname'
+require 'rexec'
+require 'timeout'
+
+class TaskTest < Test::Unit::TestCase
+	TASK_PATH = Pathname.new(__FILE__).dirname + "./task.rb"
+	TEXT = "The quick brown fox jumped over the lazy dog."
+	STDOUT_TEXT = "STDOUT: " + TEXT
+	STDERR_TEXT = "STDERR: " + TEXT
+
+	def test_script_execution
+		RExec::Task.open(TASK_PATH) do |task|
+			task.input.puts(TEXT)
+			task.input.close
+
+			assert_equal STDOUT_TEXT, task.output.readline.chomp
+			assert_equal STDERR_TEXT, task.error.readline.chomp
+		end
+	end
+
+	def test_ruby_execution
+		RExec::Task.open(["ruby", '-']) do |task|
+			task.input.puts(TASK_PATH.read)
+			task.input.puts("\004")
+
+			task.input.puts(TEXT)
+			task.input.close
+
+			assert_equal STDOUT_TEXT, task.output.readline.chomp
+			assert_equal STDERR_TEXT, task.error.readline.chomp
+		end
+	end
+
+	def test_spawn_child
+		rd, wr = IO.pipe
+		pid = RExec::Task.spawn_child do
+			rd.close
+			wr.write(TEXT)
+			wr.close
+			exit(10)
+		end
+
+		wr.close
+
+		pid, status = Process.wait2(pid)
+
+		assert_equal rd.read, TEXT
+		assert_equal status, status
+	end
+
+	def test_spawn_daemon
+		rd, wr = IO.pipe
+
+		# We launch one daemon to start another. The first daemon will exit, but the second will keep on running.
+		ppid = RExec::Task.spawn_daemon do
+			RExec::Task.spawn_daemon do
+				rd.close
+				sleep 0.5
+				wr.puts(TEXT, Process.pid)
+				wr.close
+				sleep 0.5
+			end
+		end
+
+		wr.close
+
+		Timeout::timeout(5) do
+			until !RExec::Task.running?(ppid) do
+				sleep(0.1)
+			end
+
+			text = rd.readline.chomp
+			pid = rd.readline.chomp.to_i
+
+			assert_raises(EOFError) do
+				rd.readline
+			end
+
+			assert_equal text, TEXT
+			assert RExec::Task.running?(pid)
+
+			until !RExec::Task.running?(pid) do
+				sleep(0.1)
+			end
+		end
+	end
+
+	def test_task
+		test_results = Proc.new do |input, output, error|
+			input.puts TEXT
+			input.flush
+
+			assert_equal output.readline.chomp, STDOUT_TEXT
+			assert_equal error.readline.chomp, STDERR_TEXT
+		end
+
+		RExec::Task.open(TASK_PATH) do |task|
+			test_results.call(task.input, task.output, task.error)
+		end
+
+		rd, wr = IO.pipe
+
+		RExec::Task.open(TASK_PATH, :in => rd) do |task|
+			test_results.call(wr, task.output, task.error)
+		end
+
+		assert rd.closed?
+
+		assert_raises(Errno::EPIPE) do
+			wr.puts "The pipe is closed on the other side.."
+		end
+
+		in_rd, in_wr = IO.pipe
+		out_rd, out_wr = IO.pipe
+		err_rd, err_wr = IO.pipe
+
+		spawn_child_daemon = Proc.new do
+			task = RExec::Task.open(TASK_PATH, :in => in_rd, :out => out_wr, :err => err_wr, :daemonize => true)
+		end
+
+		task = RExec::Task.open(spawn_child_daemon, :daemonize => true)
+
+		until !task.running? do
+			sleep 0.1
+		end
+
+		test_results.call(in_wr, out_rd, err_rd)
+
+		assert !task.running?
+	end
+
+	def test_task_passthrough
+		script = "echo " + "Hello World!".dump + " | #{TASK_PATH.realpath.to_s.dump}"
+
+		RExec::Task.open(script, :passthrough => :all) do
+
+		end
+
+		[$stdin, $stdout, $stderr].each do |io|
+			assert !io.closed?
+		end
+	end
+end

metadata

@@ -1,38 +1,29 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rexec
-version: !ruby/object:Gem::Version 
-  hash: 5
+version: !ruby/object:Gem::Version
+  version: 1.5.0
   prerelease: 
-  segments: 
-  - 1
-  - 4
-  - 1
-  version: 1.4.1
 platform: ruby
-authors: 
+authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-09 00:00:00 Z
+date: 2012-10-15 00:00:00.000000000 Z
 dependencies: []
-
 description: 
-email: samuel.williams@oriontransfer.co.nz
-executables: 
+email: samuel@oriontransfer.org
+executables:
 - daemon-exec
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - bin/daemon-exec
 - lib/rexec/client.rb
 - lib/rexec/connection.rb
 - lib/rexec/daemon/base.rb
 - lib/rexec/daemon/controller.rb
-- lib/rexec/daemon/pidfile.rb
+- lib/rexec/daemon/process_file.rb
 - lib/rexec/daemon.rb
 - lib/rexec/environment.rb
 - lib/rexec/priviledges.rb
@@ -44,49 +35,39 @@ files:
 - lib/rexec.rb
 - test/client.rb
 - test/daemon.rb
-- test/daemon_test.rb
+- test/helper.rb
 - test/interrupt.rb
 - test/listing_example.rb
-- test/remote_server_test.rb
-- test/server_test.rb
 - test/task.rb
-- test/task_test.rb
+- test/test_daemon.rb
+- test/test_remote_server.rb
+- test/test_server.rb
+- test/test_task.rb
 - README.md
+- rakefile.rb
+- Gemfile
 homepage: http://www.oriontransfer.co.nz/gems/rexec
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.7
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: RExec (Remote Execution) is a tool to facilitate communicating to another ruby process and executing code.
-test_files: 
-- test/daemon_test.rb
-- test/remote_server_test.rb
-- test/server_test.rb
-- test/task_test.rb
+summary: RExec assists with and manages the execution of child and daemon tasks.
+test_files: []

data/test/server_test.rb

@@ -1,94 +0,0 @@
-#!/usr/bin/env ruby
-
-# Copyright (c) 2007, 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 'rubygems'
-
-require 'test/unit'
-require 'fileutils'
-require 'pathname'
-require 'rexec'
-
-class ServerTest < Test::Unit::TestCase
-  def test_local_execution
-    code = Pathname.new(__FILE__).dirname + "./client.rb"
-    sobj = [1, 2, "three", 4]
-    stderr_text = "There was no error.. maybe?"
-    connection_started = false
-    object_received = false
-
-    RExec::start_server(code.read, "ruby", :passthrough => []) do |conn, task|
-      connection_started = true
-      conn.send_object([:bounce, sobj])
-
-      assert_equal sobj, conn.receive_object
-
-      assert_raises(Exception) do
-        conn.send_object([:exception])
-        obj = conn.receive_object
-        
-        puts "Received object which should have been exception: #{obj.inspect}"
-      end
-
-      conn.dump_errors
-      conn.send_object([:stderr, stderr_text])
-
-      puts "Attemping to read from #{conn.error.to_i}..."
-      assert_equal stderr_text, conn.error.readline.chomp
-
-      conn.stop
-    end
-
-    assert(connection_started, "Connection started")
-  end
-  
-  def test_shell_execution
-    connection_started = false
-    code = Pathname.new(__FILE__).dirname + "client.rb"
-
-    test_obj = [1, 2, 3, 4, "five"]
-
-    RExec::start_server(code.read, "/bin/sh -c ruby", :passthrough => []) do |conn, task|
-      connection_started = true
-      conn.send_object([:bounce, test_obj])
-
-      assert_equal test_obj, conn.receive_object
-
-      conn.stop
-    end
-
-    assert(connection_started, "Connection started")
-  end
-  
-  def test_shell_execution_non_block
-    connection_started = false
-    code = Pathname.new(__FILE__).dirname + "client.rb"
-
-    test_obj = [1, 2, 3, 4, "five"]
-
-    conn, task = RExec::start_server(code.read, "/bin/sh -c ruby", :passthrough => [])
-    conn.send_object([:bounce, test_obj])
-
-    assert_equal test_obj, conn.receive_object
-
-    conn.stop
-  end
-end

data/test/task_test.rb

@@ -1,170 +0,0 @@
-#!/usr/bin/env ruby
-
-# Copyright (c) 2007, 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 'rubygems'
-
-require 'test/unit'
-require 'fileutils'
-require 'pathname'
-require 'rexec'
-
-require 'timeout'
-
-class TaskTest < Test::Unit::TestCase
-  TASK_PATH = Pathname.new(__FILE__).dirname + "./task.rb"
-  TEXT = "The quick brown fox jumped over the lazy dog."
-  STDOUT_TEXT = "STDOUT: " + TEXT
-  STDERR_TEXT = "STDERR: " + TEXT
-  
-  def test_script_execution
-    RExec::Task.open(TASK_PATH) do |task|
-      task.input.puts(TEXT)
-      task.input.close
-      
-      assert_equal STDOUT_TEXT, task.output.readline.chomp
-      assert_equal STDERR_TEXT, task.error.readline.chomp
-    end
-  end
-  
-  def test_ruby_execution
-    RExec::Task.open("ruby") do |task|
-      task.input.puts(TASK_PATH.read)
-      task.input.puts("\004")
-      
-      task.input.puts(TEXT)
-      task.input.close
-      
-      assert_equal STDOUT_TEXT, task.output.readline.chomp
-      assert_equal STDERR_TEXT, task.error.readline.chomp
-    end
-  end
-  
-  def test_spawn_child
-    rd, wr = IO.pipe
-    pid = RExec::Task.spawn_child do
-      rd.close
-      wr.write(TEXT)
-      wr.close
-      exit(10)
-    end
-    
-    wr.close
-    
-    pid, status = Process.wait2(pid)
-    
-    assert_equal rd.read, TEXT
-    assert_equal status, status
-  end
-  
-  def test_spawn_daemon
-    rd, wr = IO.pipe
-    
-    # We launch one daemon to start another. The first daemon will exit, but the second will keep on running.
-    ppid = RExec::Task.spawn_daemon do
-      RExec::Task.spawn_daemon do
-        rd.close
-        sleep 0.5
-        wr.puts(TEXT, Process.pid)
-        wr.close
-        sleep 0.5
-      end
-    end
-    
-    wr.close
-    
-    Timeout::timeout(5) do
-      until !RExec::Task.running?(ppid) do
-        sleep(0.1)
-      end
-      
-      text = rd.readline.chomp
-      pid = rd.readline.chomp.to_i
-      
-      assert_raises(EOFError) do
-        rd.readline
-      end
-      
-      assert_equal text, TEXT
-      assert RExec::Task.running?(pid)
-      
-      until !RExec::Task.running?(pid) do
-        sleep(0.1)
-      end
-    end
-  end
-  
-  def test_task
-    test_results = Proc.new do |input, output, error|
-      input.puts TEXT
-      input.flush
-      
-      assert_equal output.readline.chomp, STDOUT_TEXT
-      assert_equal error.readline.chomp, STDERR_TEXT
-    end
-    
-    RExec::Task.open(TASK_PATH) do |task|
-      test_results.call(task.input, task.output, task.error)
-    end
-    
-    rd, wr = IO.pipe
-    
-    RExec::Task.open(TASK_PATH, :in => rd) do |task|
-      test_results.call(wr, task.output, task.error)
-    end
-    
-    assert rd.closed?
-    
-    assert_raises(Errno::EINVAL) do
-      wr.puts "The pipe is closed on the other side.."
-    end
-    
-    in_rd, in_wr = IO.pipe
-    out_rd, out_wr = IO.pipe
-    err_rd, err_wr = IO.pipe
-    
-    spawn_child_daemon = Proc.new do
-      task = RExec::Task.open(TASK_PATH, :in => in_rd, :out => out_wr, :err => err_wr, :daemonize => true)
-    end
-    
-    task = RExec::Task.open(spawn_child_daemon, :daemonize => true)
-    
-    until !task.running? do
-      sleep 0.1
-    end
-    
-    test_results.call(in_wr, out_rd, err_rd)
-    
-    assert !task.running?
-  end
-  
-  def test_task_passthrough
-    script = "echo " + "Hello World!".dump + " | #{TASK_PATH.realpath.to_s.dump}"
-    
-    RExec::Task.open(script, :passthrough => :all) do
-      
-    end
-
-    [$stdin, $stdout, $stderr].each do |io|
-      assert !io.closed?
-    end
-  end
-end