From a3ca08443ccfe8c325c45b849f85b96f3b931299 Mon Sep 17 00:00:00 2001
From: Steve Kemp <steve@steve.org.uk>
Date: Thu, 22 Nov 2012 00:06:17 +0000
Subject:   Updated to require libraries more sanely

---
 bin/custodian-parse-execute          | 1 -
 lib/custodian/protocoltest/ftp.rb    | 2 ++
 lib/custodian/protocoltest/jabber.rb | 3 +++
 lib/custodian/protocoltest/ldap.rb   | 3 +++
 lib/custodian/protocoltest/rsync.rb  | 3 +++
 lib/custodian/protocoltest/smtp.rb   | 3 +++
 lib/custodian/protocoltest/ssh.rb    | 2 ++
 lib/custodian/protocoltest/tcp.rb    | 2 ++
 8 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/bin/custodian-parse-execute b/bin/custodian-parse-execute
index 6329dd9..c0057de 100755
--- a/bin/custodian-parse-execute
+++ b/bin/custodian-parse-execute
@@ -8,7 +8,6 @@
 #
 #
 
-require 'custodian/testfactory.rb'
 require 'custodian/protocoltest/tcp.rb'
 require 'custodian/protocoltest/ftp.rb'
 require 'custodian/protocoltest/jabber.rb'
diff --git a/lib/custodian/protocoltest/ftp.rb b/lib/custodian/protocoltest/ftp.rb
index 89b4a2b..c92f295 100644
--- a/lib/custodian/protocoltest/ftp.rb
+++ b/lib/custodian/protocoltest/ftp.rb
@@ -1,3 +1,5 @@
+require 'custodian/protocoltest/tcp'
+
 #
 #  The FTP-protocol test.
 #
diff --git a/lib/custodian/protocoltest/jabber.rb b/lib/custodian/protocoltest/jabber.rb
index 5a38aa1..166e98e 100644
--- a/lib/custodian/protocoltest/jabber.rb
+++ b/lib/custodian/protocoltest/jabber.rb
@@ -1,3 +1,6 @@
+require 'custodian/protocoltest/tcp'
+
+
 #
 #  The Jabber-protocol test.
 #
diff --git a/lib/custodian/protocoltest/ldap.rb b/lib/custodian/protocoltest/ldap.rb
index 6b55687..920c1d5 100644
--- a/lib/custodian/protocoltest/ldap.rb
+++ b/lib/custodian/protocoltest/ldap.rb
@@ -1,3 +1,6 @@
+require 'custodian/protocoltest/tcp'
+
+
 #
 #  The LDAP-protocol test.
 #
diff --git a/lib/custodian/protocoltest/rsync.rb b/lib/custodian/protocoltest/rsync.rb
index c8a2095..eb8614f 100644
--- a/lib/custodian/protocoltest/rsync.rb
+++ b/lib/custodian/protocoltest/rsync.rb
@@ -1,3 +1,6 @@
+require 'custodian/protocoltest/tcp'
+
+
 #
 #  The RSYNC-protocol test.
 #
diff --git a/lib/custodian/protocoltest/smtp.rb b/lib/custodian/protocoltest/smtp.rb
index 2e1e1e6..374db6c 100644
--- a/lib/custodian/protocoltest/smtp.rb
+++ b/lib/custodian/protocoltest/smtp.rb
@@ -1,3 +1,6 @@
+require 'custodian/protocoltest/tcp'
+
+
 #
 #  The SMTP-protocol test.
 #
diff --git a/lib/custodian/protocoltest/ssh.rb b/lib/custodian/protocoltest/ssh.rb
index 78e8e67..792d114 100644
--- a/lib/custodian/protocoltest/ssh.rb
+++ b/lib/custodian/protocoltest/ssh.rb
@@ -1,3 +1,5 @@
+require 'custodian/protocoltest/tcp'
+
 #
 #  The SSH-protocol test.
 #
diff --git a/lib/custodian/protocoltest/tcp.rb b/lib/custodian/protocoltest/tcp.rb
index 1849f21..4f80b42 100644
--- a/lib/custodian/protocoltest/tcp.rb
+++ b/lib/custodian/protocoltest/tcp.rb
@@ -1,3 +1,5 @@
+
+require 'custodian/testfactory.rb'
 require 'socket'
 require 'timeout'
 
-- 
cgit v1.2.1