Inch toward making modules more testable

Author: Tod Beardsley

lib/msf/core/exploit/capture.rb

@@ -13,7 +13,8 @@ module Msf
 #
 ###
 
-module Exploit::Capture
+class Exploit
+module Capture
 
 	#
 	# Initializes an instance of an exploit module that captures traffic
@@ -555,3 +556,5 @@ def capture_icmp_echo_unpack(data)
 end
 
 end
+
+end

lib/msf/core/module.rb

@@ -179,7 +179,7 @@ def replicant
 	#
 
 	def print_prefix
-		if(
+		if framework && (
 			datastore['TimestampOutput'] =~ /^(t|y|1)/i or
 			framework.datastore['TimestampOutput'] =~ /^(t|y|1)/i
 		)
@@ -192,8 +192,9 @@ def print_prefix
 			end
 
 			return prefix
+		else
+			return ''
 		end
-		''
 	end
 
 	def print_status(msg='')