1 files changed, 66 insertions, 61 deletions

diff --git a/lib/custodian/protocoltest/ftp.rb b/lib/custodian/protocoltest/ftp.rb
index c92f295..dfa86e1 100644
--- a/lib/custodian/protocoltest/ftp.rb
+++ b/lib/custodian/protocoltest/ftp.rb
@@ -11,105 +11,110 @@ require 'custodian/protocoltest/tcp'
 #
 #  The specification of the port is optional and defaults to 21
 #
-class FTPTest < TCPTest
+module Custodian
+  module ProtocolTest
 
+    class FTPTest < TCPTest
 
-  #
-  # The line from which we were constructed.
-  #
-  attr_reader :line
 
+      #
+      # The line from which we were constructed.
+      #
+      attr_reader :line
 
-  #
-  # The host to test against.
-  #
-  attr_reader :host
 
+      #
+      # The host to test against.
+      #
+      attr_reader :host
 
-  #
-  # The port to connect to.
-  #
-  attr_reader :port
 
+      #
+      # The port to connect to.
+      #
+      attr_reader :port
 
 
 
 
-  #
-  # Constructor
-  #
-  def initialize( line )
 
-    #
-    #  Save the line
-    #
-    @line = line
+      #
+      # Constructor
+      #
+      def initialize( line )
 
-    #
-    # Save the host
-    #
-    @host  = line.split( /\s+/)[0]
+        #
+        #  Save the line
+        #
+        @line = line
 
-    #
-    # Save the port
-    #
-    if ( line =~ /on\s+([0-9]+)/ )
-      @port = $1.dup
-    else
-      @port = 21
-    end
-  end
+        #
+        # Save the host
+        #
+        @host  = line.split( /\s+/)[0]
 
+        #
+        # Save the port
+        #
+        if ( line =~ /on\s+([0-9]+)/ )
+          @port = $1.dup
+        else
+          @port = 21
+        end
+      end
 
 
 
-  #
-  # Helper for development.
-  #
-  def to_s
-    "ftp-test of #{@host}:#{@port}."
-  end
 
+      #
+      # Helper for development.
+      #
+      def to_s
+        "ftp-test of #{@host}:#{@port}."
+      end
 
 
 
-  #
-  # Convert this class to JSON such that it may be serialized.
-  #
-  def to_json
-    hash = { :line => @line }
-    hash.to_json
-  end
 
+      #
+      # Convert this class to JSON such that it may be serialized.
+      #
+      def to_json
+        hash = { :line => @line }
+        hash.to_json
+      end
 
 
 
-  # Run the TCP-protocol test.
-  #
-  def run_test
 
-    # reset the error, in case we were previously executed.
-    @error = nil
+      # Run the TCP-protocol test.
+      #
+      def run_test
 
-    run_test_internal( @host, @port, "^220" )
-  end
+        # reset the error, in case we were previously executed.
+        @error = nil
 
+        run_test_internal( @host, @port, "^220" )
+      end
 
 
 
-  #
-  # If the test fails then report the error.
-  #
-  def error
-    @error
-  end
+
+      #
+      # If the test fails then report the error.
+      #
+      def error
+        @error
+      end
 
 
 
 
-  register_test_type "ftp"
+      register_test_type "ftp"
 
 
 
 
+    end
+  end
 end