fixed typo in simplified modules

git-svn-id: file:///home/svn/framework3/trunk@4465 4d416f70-5f16-0410-b530-b9f4589650da

lib/msf/base/simple/auxiliary.rb

@@ -23,7 +23,7 @@ module Auxiliary
 	# 	A string of comma separated option values that should be imported into
 	# 	the datastore.
 	#
-	# Option
+	# Options
 	#
 	# 	A hash of values to be imported directly into the datastore.
 	#

lib/msf/base/simple/exploit.rb

@@ -37,7 +37,7 @@ module Exploit
 	# 	A string of comma separated option values that should be imported into
 	# 	the datastore.
 	#
-	# Option
+	# Options
 	#
 	# 	A hash of values to be imported directly into the datastore.
 	#

lib/msf/base/simple/module.rb

@@ -18,7 +18,7 @@ module Module
 	def _import_extra_options(opts)
 		# If options were supplied, import them into the payload's
 		# datastore
-		if (opts['Option'])
+		if (opts['Options'])
 			self.datastore.import_options_from_hash(opts['Options'])
 		elsif (opts['OptionStr'])
 			self.datastore.import_options_from_s(opts['OptionStr'])

lib/rex/proto/dcerpc/client.rb.ut.rb

@@ -7,6 +7,9 @@ require 'rex/socket'
 require 'rex/proto/dcerpc/client'
 require 'rex/proto/dcerpc/handle'
 
+begin
+require 'flexmock'
+
 class Rex::Proto::DCERPC::Client::UnitTest < Test::Unit::TestCase
 
 	Klass = Rex::Proto::DCERPC::Client
@@ -482,3 +485,6 @@ read = [
 	def test_write
 	end
 end
+
+rescue LoadError
+end

lib/rex/test.rb

@@ -1,5 +1,4 @@
 require 'test/unit'
-require 'flexmock'
 
 # DEFAULTS
 module Rex