librex 0.0.31 → 0.0.32

data/README.markdown

@@ -3,7 +3,7 @@
 A non-official re-packaging of the Rex library as a gem for easy of usage of the Metasploit REX framework in a non Metasploit application. I received permission from HDM to create this package.
 
 Currently based on:
-SVN Revision: 12559
+SVN Revision: 12612
 
 # Credits
 The Metasploit development team <http://www.metasploit.com>

data/lib/rex.rb

@@ -40,60 +40,53 @@ end
 # Generic classes
 require 'rex/constants'
 require 'rex/exceptions'
+require 'rex/transformer'
+require 'rex/text'
+require 'rex/time'
+require 'rex/job_container'
+require 'rex/file'
 
-module Rex
-	# Generic modules
-	autoload :File,         'rex/file'
-	autoload :Text,         'rex/text'
-	autoload :Job,          'rex/job_container'
-	autoload :JobContainer, 'rex/job_container'
-	autoload :Transformer,  'rex/transformer'
-	autoload :ExtTime,      'rex/time'
+# Thread safety and synchronization
+require 'rex/sync'
 
-	# Thread safety and synchronization
-	autoload :ReadWriteLock, 'rex/sync/read_write_lock'
-	autoload :ThreadSafe,    'rex/sync/thread_safe'
-	autoload :Ref,           'rex/sync/ref'
-	autoload :Sync,          'rex/sync/event'
+# Thread factory
+require 'rex/thread_factory'
 
-	# Thread factory
-	autoload :ThreadFactory, 'rex/thread_factory'
+# Encoding
+require 'rex/encoder/xor'
+require 'rex/encoding/xor'
 
-	# Encoding
-	autoload :Encoder,  'rex/encoder'
-	autoload :Encoders, 'rex/encoders'
-	autoload :Encoding, 'rex/encoding'
+# Architecture subsystem
+require 'rex/arch'
 
-	# Architecture subsystem
-	autoload :Arch, 'rex/arch'
+# Assembly
+require 'rex/assembly/nasm'
 
-	# Assembly
-	autoload :Assembly, 'rex/assembly/nasm'
+# Logging
+require 'rex/logging/log_dispatcher'
 
-	# Logging
-	autoload :Logging, 'rex/logging'
+# IO
+require 'rex/io/stream'
+require 'rex/io/stream_abstraction'
+require 'rex/io/stream_server'
 
-	# IO
-	autoload :IO, 'rex/io'
+# Sockets
+require 'rex/socket'
 
-	# Sockets
-	autoload :Socket, 'rex/socket'
+# Protocols
 
-	# Platforms
-	autoload :Platforms, 'rex/platforms'
+require 'rex/proto'
 
-	# Protocols
-	autoload :Proto, 'rex/proto'
+# Parsers
+require 'rex/parser/arguments'
+require 'rex/parser/ini'
 
-	# Service handling
-	autoload :Service, 'rex/service'
 
-	# Parsers
-	autoload :Parser, 'rex/parser'
+# Compatibility
+require 'rex/compat'
 
-	# Compatibility
-	autoload :Compat, 'rex/compat'
-end
+# Platforms
+require 'rex/platforms'
 
 
 # Overload the Kernel.sleep() function to be thread-safe

data/lib/rex/arch.rb

@@ -2,6 +2,7 @@ require 'rex/constants'
 
 module Rex
 
+
 ###
 #
 # This module provides generalized methods for performing operations that are
@@ -14,8 +15,8 @@ module Arch
 	#
 	# Architecture classes
 	#
-	autoload :X86, 'rex/arch/x86'
-	autoload :Sparc, 'rex/arch/sparc'
+	require 'rex/arch/x86'
+	require 'rex/arch/sparc'
 
 	#
 	# This routine adjusts the stack pointer for a given architecture.

data/lib/rex/encoder/alpha2.rb

@@ -18,16 +18,14 @@
 module Rex
 module Encoder
 module Alpha2
+end end end
 
-	#
-	# autoload the Alpha2 encoders
-	#
-	autoload :Generic,      'rex/encoder/alpha2/generic'
-	autoload :AlphaMixed,   'rex/encoder/alpha2/alpha_mixed'
-	autoload :AlphaUpper,   'rex/encoder/alpha2/alpha_upper'
-	autoload :UnicodeMixed, 'rex/encoder/alpha2/unicode_mixed'
-	autoload :UnicodeUpper, 'rex/encoder/alpha2/unicode_upper'
+#
+# include the Alpha2 encodings
+#
 
-end
-end
-end
+require 'rex/encoder/alpha2/generic'
+require 'rex/encoder/alpha2/alpha_mixed'
+require 'rex/encoder/alpha2/alpha_upper'
+require 'rex/encoder/alpha2/unicode_mixed'
+require 'rex/encoder/alpha2/unicode_upper'

data/lib/rex/encoder/xor.rb

@@ -10,9 +10,6 @@ module Encoder
 ###
 class Xor
 
-	autoload :Dword,         'rex/encoder/xor/dword'
-	autoload :DwordAdditive, 'rex/encoder/xor/dword_additive'
-
 	attr_accessor :raw, :encoded, :badchars, :opts, :key, :fkey # :nodoc:
 
 	#
@@ -68,5 +65,5 @@ class Xor
 
 end
 
-end
-end
+end end
+

data/lib/rex/encoding/xor.rb

@@ -1,19 +1,20 @@
+#!/usr/bin/env ruby
+
+#
+# make sure the namespace is created
+#
+
 module Rex
 module Encoding
 module Xor
+end end end
 
-	#
-	# autoload the Xor encodings
-	#
-	autoload :Generic, 'rex/encoding/xor/generic'
-	autoload :Byte,    'rex/encoding/xor/byte'
-	autoload :Word,    'rex/encoding/xor/word'
-	autoload :Dword,   'rex/encoding/xor/dword'
-	autoload :DwordAdditive, 'rex/encoding/xor/dword_additive'
-	autoload :Qword,   'rex/encoding/xor/qword'
-
-	autoload :Exception, 'rex/encoding/xor/exceptions'
+#
+# include the Xor encodings
+#
 
-end 
-end
-end
+require 'rex/encoding/xor/generic'
+require 'rex/encoding/xor/byte'
+require 'rex/encoding/xor/word'
+require 'rex/encoding/xor/dword'
+require 'rex/encoding/xor/qword'

data/lib/rex/exploitation/cmdstager/debug_asm.rb

@@ -1,5 +1,5 @@
 ##
-# $Id$
+# $Id: debug_asm.rb 12595 2011-05-12 18:33:49Z jduck $
 ##
 
 require 'rex/text'

data/lib/rex/exploitation/cmdstager/debug_write.rb

@@ -1,5 +1,5 @@
 ##
-# $Id$
+# $Id: debug_write.rb 12595 2011-05-12 18:33:49Z jduck $
 ##
 
 require 'rex/text'

data/lib/rex/exploitation/cmdstager/tftp.rb

@@ -1,5 +1,5 @@
 ##
-# $Id: tftp.rb 10169 2010-08-27 17:23:47Z jduck $
+# $Id: tftp.rb 12600 2011-05-12 20:03:55Z hdm $
 ##
 
 require 'rex/text'

data/lib/rex/exploitation/cmdstager/vbs.rb

@@ -1,5 +1,5 @@
 ##
-# $Id$
+# $Id: vbs.rb 12595 2011-05-12 18:33:49Z jduck $
 ##
 
 require 'rex/text'

data/lib/rex/io/stream.rb

@@ -198,13 +198,9 @@ module Stream
 		end
 
 		bsize = (length == -1) ? def_block_size : length
-
-		begin
-			return read(bsize)
-		rescue Exception
-		end
-
-		return ''
+		data  = read(bsize)
+		raise EOFError if data.nil?
+		data
 	end
 
 	#

data/lib/rex/logging.rb

@@ -1,17 +1,4 @@
-##
-# $Id: $
-#
-# maps autoload for logging classes
-##
+#!/usr/bin/env ruby
 
 require 'rex/constants' # for LEV_'s
-
-module Rex
-module Logging
-	autoload :LogSink,       'rex/logging/log_sink'
-	autoload :Sinks,         'rex/logging/sinks'
-end
-end
-
-# This defines a global so it must be loaded always
-require 'rex/logging/log_dispatcher'
+require 'rex/logging/log_dispatcher'

data/lib/rex/logging/log_dispatcher.rb

@@ -1,4 +1,5 @@
 require 'rex/sync'
+require 'rex/logging/log_sink'
 
 module Rex
 module Logging

data/lib/rex/logging/log_sink.rb

@@ -37,3 +37,6 @@ end
 
 end
 end
+
+require 'rex/logging/sinks/flatfile'
+require 'rex/logging/sinks/stderr'

data/lib/rex/logging/sinks/flatfile.rb

@@ -1,5 +1,3 @@
-require 'rex/logging'
-
 module Rex
 module Logging
 module Sinks

data/lib/rex/parser/nessus_xml.rb

@@ -46,7 +46,7 @@ class NessusXMLStreamParser
 			@bid = Array.new
 			@xref = Array.new
 			@x = Hash.new
-			@x['nasl'] = attributes['pluginID']
+			@x['nasl'] = [attributes['pluginID'],attributes['pluginName']].join(" ")
 			@x['port'] = attributes['port']
 			@x['proto'] = attributes['protocol']
 			@x['svc_name'] = attributes['svc_name']

data/lib/rex/payloads.rb

@@ -1,3 +1 @@
-module Rex::Payloads
-	autoload :Win32, 'rex/payloads/win32'
-end
+require 'rex/payloads/win32'

data/lib/rex/payloads/win32.rb

@@ -1,4 +1,2 @@
-module Rex::Payloads::Win32
-	autoload :Common, 'rex/payloads/win32/common'
-	autoload :Kernel, 'rex/payloads/win32/kernel'
-end
+require 'rex/payloads/win32/common'
+require 'rex/payloads/win32/kernel'

data/lib/rex/payloads/win32/kernel.rb

@@ -1,12 +1,13 @@
 module Rex
 module Payloads
 module Win32
-module Kernel
 
-	autoload :Common,    'rex/payloads/win32/kernel/common'
-	autoload :Recovery,  'rex/payloads/win32/kernel/recovery'
-	autoload :Stager,    'rex/payloads/win32/kernel/stager'
-	autoload :Migration, 'rex/payloads/win32/kernel/migration'
+require 'rex/payloads/win32/kernel/common'
+require 'rex/payloads/win32/kernel/recovery'
+require 'rex/payloads/win32/kernel/stager'
+require 'rex/payloads/win32/kernel/migration'
+
+module Kernel
 
 	#
 	# Constructs a kernel-mode payload using the supplied options.  The options

data/lib/rex/peparsey.rb

@@ -1,11 +1,12 @@
 #!/usr/bin/env ruby
-#
-# $Id: peparsey.rb 12554 2011-05-06 18:47:10Z jduck $
-#
+
+# $Id: peparsey.rb 12600 2011-05-12 20:03:55Z hdm $
 
 module Rex
 module PeParsey
-	autoload :Pe,        'rex/peparsey/pe'
-	autoload :PeMemDump, 'rex/peparsey/pe_memdump'
+
 end
 end
+
+require 'rex/peparsey/pe'
+require 'rex/peparsey/pe_memdump'

data/lib/rex/pescan.rb

@@ -1,12 +1,13 @@
 #!/usr/bin/env ruby
-#
-# $Id: pescan.rb 12554 2011-05-06 18:47:10Z jduck $
-#
+
+# $Id: pescan.rb 12600 2011-05-12 20:03:55Z hdm $
 
 module Rex
 module PeScan
-	autoload :Analyze, 'rex/pescan/analyze'
-	autoload :Scanner, 'rex/pescan/scanner'
-	autoload :Search,  'rex/pescan/search'
+
 end
 end
+
+require 'rex/pescan/analyze'
+require 'rex/pescan/scanner'
+require 'rex/pescan/search'

data/lib/rex/platforms.rb

@@ -1,11 +1 @@
-##
-# $Id: $
-#
-# This file maps Platforms for autoload
-##
-
-module Rex
-module Platforms
-	autoload :Windows, 'rex/platforms/windows'
-end
-end
+require 'rex/platforms/windows'

data/lib/rex/proto.rb

@@ -1,24 +1,13 @@
-##
-# $Id: proto.rb 12554 2011-05-06 18:47:10Z jduck $
-#
-# This file maps Proto items for autoload
-##
+require 'rex/proto/http'
+require 'rex/proto/smb'
+require 'rex/proto/ntlm'
+require 'rex/proto/dcerpc'
+require 'rex/proto/drda'
 
 module Rex
 module Proto
 
-	autoload :Http,   'rex/proto/http'
-	autoload :SMB,    'rex/proto/smb'
-	autoload :NTLM,   'rex/proto/ntlm'
-	autoload :DCERPC, 'rex/proto/dcerpc'
-	autoload :DRDA,   'rex/proto/drda'
-
-	autoload :SunRPC, 'rex/proto/sunrpc'
-	autoload :DHCP,   'rex/proto/dhcp'
-	autoload :TFTP,   'rex/proto/tftp'
-	autoload :RFB,    'rex/proto/rfb'
-
-	attr_accessor :alias
+attr_accessor :alias
 
 end
 end

data/lib/rex/proto/dcerpc.rb

@@ -1,15 +1,6 @@
-module Rex
-module Proto
-module DCERPC
-
-	autoload :Exceptions, 'rex/proto/dcerpc/exceptions'
-	autoload :UUID,       'rex/proto/dcerpc/uuid'
-	autoload :Response,   'rex/proto/dcerpc/response'
-	autoload :Client,     'rex/proto/dcerpc/client'
-	autoload :Packet,     'rex/proto/dcerpc/packet'
-	autoload :Handle,     'rex/proto/dcerpc/handle'
-	autoload :NDR,        'rex/proto/dcerpc/ndr'
-
-end
-end
-end
+require 'rex/proto/dcerpc/uuid'
+require 'rex/proto/dcerpc/response'
+require 'rex/proto/dcerpc/client'
+require 'rex/proto/dcerpc/packet'
+require 'rex/proto/dcerpc/handle'
+require 'rex/proto/dcerpc/ndr'

data/lib/rex/proto/drda.rb

@@ -1,10 +1,5 @@
-module Rex
-module Proto
-module DRDA
-	autoload :Constants, 'rex/proto/drda/constants'
-	autoload :Utils,     'rex/proto/drda/utils'
-end
-end
-end
-
+require 'rex/proto/drda/constants'
 require 'rex/proto/drda/packet'
+require 'rex/proto/drda/utils'
+
+

data/lib/rex/proto/http.rb

@@ -1,18 +1,5 @@
-# These are required by all uses of Rex::Proto::Http
 require 'rex/proto/http/packet'
 require 'rex/proto/http/request'
 require 'rex/proto/http/response'
-
-# These are specific to use case
-module Rex
-module Proto
-module Http
-
-	autoload :Client, 'rex/proto/http/client'
-
-	autoload :Server,  'rex/proto/http/server'
-	autoload :Handler, 'rex/proto/http/handler'
-
-end
-end
-end
+require 'rex/proto/http/client'
+require 'rex/proto/http/server'

data/lib/rex/proto/http/packet.rb

@@ -1,5 +1,4 @@
 require 'rex/proto/http'
-require 'rex/text'
 
 module Rex
 module Proto

data/lib/rex/proto/ntlm.rb

@@ -1,13 +1,7 @@
-module Rex
-module Proto
-module NTLM
-	autoload :Constants,  'rex/proto/ntlm/constants'
-	autoload :Exceptions, 'rex/proto/ntlm/exceptions'
+require 'rex/proto/ntlm/constants'
+require 'rex/proto/ntlm/exceptions'
+require 'rex/proto/ntlm/crypt'
+require 'rex/proto/ntlm/utils'
+require 'rex/proto/ntlm/base'
+require 'rex/proto/ntlm/message'
 
-	autoload :Base,       'rex/proto/ntlm/base'
-	autoload :Crypt,      'rex/proto/ntlm/crypt'
-	autoload :Message,    'rex/proto/ntlm/message'
-	autoload :Utils,      'rex/proto/ntlm/utils'
-end
-end
-end

data/lib/rex/proto/ntlm/message.rb

@@ -45,8 +45,6 @@
 
 #this module defines the message class , useful for easily handling type 1/2/3 ntlm messages
 
-require 'rex/text'
-
 require 'rex/proto/ntlm/base'
 require 'rex/proto/ntlm/constants'
 require 'rex/proto/ntlm/crypt'

data/lib/rex/proto/smb.rb

@@ -1,15 +1,7 @@
-module Rex
-module Proto
-module SMB
-
-	autoload :Constants,    'rex/proto/smb/constants'
-	autoload :Exceptions,   'rex/proto/smb/exceptions'
-	autoload :Evasions,     'rex/proto/smb/evasions'
-	autoload :Crypt,        'rex/proto/smb/crypt'
-	autoload :Utils,        'rex/proto/smb/utils'
-	autoload :Client,       'rex/proto/smb/client'
-	autoload :SimpleClient, 'rex/proto/smb/simpleclient'
-
-end
-end
-end
+require 'rex/proto/smb/constants'
+require 'rex/proto/smb/exceptions'
+require 'rex/proto/smb/evasions'
+require 'rex/proto/smb/crypt'
+require 'rex/proto/smb/utils'
+require 'rex/proto/smb/client'
+require 'rex/proto/smb/simpleclient'

data/lib/rex/service_manager.rb

@@ -1,5 +1,6 @@
 require 'singleton'
 require 'rex'
+require 'rex/service'
 
 module Rex
 

data/lib/rex/socket.rb

@@ -12,23 +12,19 @@ module Rex
 ###
 module Socket
 
-	# Plumbing / Aux
-	autoload :Parameters, 'rex/socket/parameters'
-	autoload :Comm,       'rex/socket/comm'
-
-	# Underlying protocol-specific
-	autoload :Ip,           'rex/socket/ip'
-	autoload :Udp,          'rex/socket/udp'
-	autoload :Tcp,          'rex/socket/tcp'
-	autoload :TcpServer,    'rex/socket/tcp_server'
-	autoload :SslTcp,       'rex/socket/ssl_tcp'
-	autoload :SslTcpServer, 'rex/socket/ssl_tcp_server'
-
-	# Utilities
-	autoload :SwitchBoard,  'rex/socket/switch_board'
-	autoload :SubnetWalker, 'rex/socket/subnet_walker'
-	autoload :Range,        'rex/socket/range_walker'
-	autoload :RangeWalker,  'rex/socket/range_walker'
+	module Comm
+	end
+
+	require 'rex/socket/parameters'
+	require 'rex/socket/tcp'
+	require 'rex/socket/tcp_server'
+
+	require 'rex/socket/comm'
+	require 'rex/socket/comm/local'
+
+	require 'rex/socket/switch_board'
+	require 'rex/socket/subnet_walker'
+	require 'rex/socket/range_walker'
 
 	##
 	#

data/lib/rex/socket/comm.rb

@@ -14,8 +14,6 @@ module Socket
 ###
 module Comm
 
-	autoload :Local, 'rex/socket/comm/local'
-
 	###
 	# 
 	# This mixin provides stubs for event notification handlers that can be

data/lib/rex/socket/comm/local.rb

@@ -1,6 +1,10 @@
-require 'rex/compat'
-require 'rex/socket'
 require 'singleton'
+require 'rex/socket'
+require 'rex/socket/tcp'
+require 'rex/socket/ssl_tcp'
+require 'rex/socket/ssl_tcp_server'
+require 'rex/socket/udp'
+require 'rex/socket/ip'
 require 'timeout'
 
 ###

data/lib/rex/sync.rb

@@ -1,6 +1,6 @@
-module Rex
-	autoload :ReadWriteLock, 'rex/sync/read_write_lock'
-	autoload :ThreadSafe,    'rex/sync/thread_safe'
-	autoload :Ref,           'rex/sync/ref'
-	autoload :Sync,          'rex/sync/event'
-end
+#!/usr/bin/env ruby
+
+require 'rex/sync/thread_safe'
+require 'rex/sync/ref'
+require 'rex/sync/read_write_lock'
+require 'rex/sync/event'

data/lib/rex/ui.rb

@@ -3,19 +3,19 @@
 # wrappers of the rex library.
 #
 
-require 'rex'
+# General classes
+require 'rex/ui/output'
+require 'rex/ui/progress_tracker'
 
-module Rex
-module Ui
-	# General classes
-	autoload :Output,          'rex/ui/output'
-	autoload :ProgressTracker, 'rex/ui/progress_tracker'
+# Text-based user interfaces
+require 'rex/ui/text/input'
+require 'rex/ui/text/shell'
+require 'rex/ui/text/dispatcher_shell'
+require 'rex/ui/text/irb_shell'
 
-	# Text-based user interfaces
-	autoload :Text, 'rex/ui/text'
+require 'rex/ui/text/color'
+require 'rex/ui/text/table'
 
-	# Ui subscriber
-	autoload :Subscriber,  'rex/ui/subscriber'
-	autoload :Interactive, 'rex/ui/interactive'
-end
-end
+# Ui subscriber
+require 'rex/ui/subscriber'
+require 'rex/ui/interactive'

data/lib/rex/ui/text/input.rb

@@ -13,10 +13,10 @@ module Text
 ###
 class Input
 
-	autoload :Buffer,   'rex/ui/text/color'
-	autoload :Stdio,    'rex/ui/text/input/stdio'
-	autoload :Readline, 'rex/ui/text/input/readline'
-	autoload :Socket,   'rex/ui/text/input/socket'
+	require 'rex/ui/text/input/stdio'
+	require 'rex/ui/text/input/readline'
+	require 'rex/ui/text/input/socket'
+	require 'rex/ui/text/color'
 
 	include Rex::Ui::Text::Color
 

data/lib/rex/ui/text/output.rb

@@ -12,10 +12,11 @@ module Text
 ###
 class Output < Rex::Ui::Output
 
-	autoload :Stdio,  'rex/ui/text/output/stdio'
-	autoload :Socket, 'rex/ui/text/output/socket'
-	autoload :Buffer, 'rex/ui/text/output/buffer'
-	autoload :File,   'rex/ui/text/output/file'
+	require 'rex/ui/text/output/stdio'
+	require 'rex/ui/text/output/socket'
+	require 'rex/ui/text/output/buffer'
+	require 'rex/ui/text/output/file'
+	require 'rex/ui/text/color'
 
 	include Rex::Ui::Text::Color
 

metadata

@@ -2,7 +2,7 @@
 name: librex
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.31
+  version: 0.0.32
 platform: ruby
 authors: 
 - Metasploit Development Team
@@ -11,11 +11,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-07 00:00:00 -05:00
+date: 2011-05-13 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
-description: Rex provides a variety of classes useful for security testing and exploit development. Based on SVN Revision 12559
+description: Rex provides a variety of classes useful for security testing and exploit development. Based on SVN Revision 12612
 email: 
 - hdm@metasploit.com
 - jacob.hammack@hammackj.com
@@ -60,11 +60,9 @@ files:
 - lib/rex/encoder/xor/dword.rb
 - lib/rex/encoder/xor/dword_additive.rb
 - lib/rex/encoder/xor.rb
-- lib/rex/encoder.rb
 - lib/rex/encoders/xor_dword.rb
 - lib/rex/encoders/xor_dword_additive.rb
 - lib/rex/encoders/xor_dword_additive.rb.ut.rb
-- lib/rex/encoders.rb
 - lib/rex/encoding/xor/byte.rb
 - lib/rex/encoding/xor/byte.rb.ut.rb
 - lib/rex/encoding/xor/dword.rb
@@ -79,7 +77,6 @@ files:
 - lib/rex/encoding/xor/word.rb.ut.rb
 - lib/rex/encoding/xor.rb
 - lib/rex/encoding/xor.rb.ts.rb
-- lib/rex/encoding.rb
 - lib/rex/exceptions.rb
 - lib/rex/exceptions.rb.ut.rb
 - lib/rex/exploitation/cmdstager/base.rb
@@ -113,14 +110,12 @@ files:
 - lib/rex/io/stream.rb
 - lib/rex/io/stream_abstraction.rb
 - lib/rex/io/stream_server.rb
-- lib/rex/io.rb
 - lib/rex/job_container.rb
 - lib/rex/LICENSE
 - lib/rex/logging/log_dispatcher.rb
 - lib/rex/logging/log_sink.rb
 - lib/rex/logging/sinks/flatfile.rb
 - lib/rex/logging/sinks/stderr.rb
-- lib/rex/logging/sinks.rb
 - lib/rex/logging.rb
 - lib/rex/machparsey/exceptions.rb
 - lib/rex/machparsey/mach.rb
@@ -166,7 +161,6 @@ files:
 - lib/rex/parser/nexpose_xml.rb
 - lib/rex/parser/nmap_xml.rb
 - lib/rex/parser/retina_xml.rb
-- lib/rex/parser.rb
 - lib/rex/payloads/win32/common.rb
 - lib/rex/payloads/win32/kernel/common.rb
 - lib/rex/payloads/win32/kernel/migration.rb
@@ -460,7 +454,6 @@ files:
 - lib/rex/ui/text/shell.rb
 - lib/rex/ui/text/table.rb
 - lib/rex/ui/text/table.rb.ut.rb
-- lib/rex/ui/text.rb
 - lib/rex/ui.rb
 - lib/rex/zip/archive.rb
 - lib/rex/zip/blocks.rb

data/lib/rex/encoder.rb

@@ -1,17 +0,0 @@
-##
-# $Id: encoder.rb 12554 2011-05-06 18:47:10Z jduck $
-#
-# This file maps encoders for autoload
-##
-
-module Rex::Encoder
-	# Encoder support code
-	autoload :Xor,      'rex/encoder/xor'
-	autoload :Alpha2,   'rex/encoder/alpha2'
-	autoload :NonAlpha, 'rex/encoder/nonalpha'
-	autoload :NonUpper, 'rex/encoder/nonupper'
-
-	# Hrm? Is these in the wrong module?
-	autoload :XDR, 'rex/encoder/xdr'
-	autoload :NDR, 'rex/encoder/ndr'
-end

data/lib/rex/encoders.rb

@@ -1,11 +0,0 @@
-##
-# $Id: encoders.rb 12554 2011-05-06 18:47:10Z jduck $
-#
-# This file maps encoders for autoload
-##
-require 'rex'
-
-module Rex::Encoders
-	autoload :XorDword,         'rex/encoders/xor_dword'
-	autoload :XorDwordAdditive, 'rex/encoders/xor_dword_additive'
-end

data/lib/rex/encoding.rb

@@ -1,10 +0,0 @@
-##
-# $Id: encoding.rb 12554 2011-05-06 18:47:10Z jduck $
-#
-# This file maps encodings for autoload
-##
-
-module Rex::Encoding
-	# Encoding support code
-	autoload :Xor, 'rex/encoding/xor'
-end

data/lib/rex/io.rb

@@ -1,16 +0,0 @@
-##
-# $Id: io.rb 12554 2011-05-06 18:47:10Z jduck $
-# 
-# This file simply provides an autoload interface for the children 
-# of Rex::IO
-#
-##
-module Rex::IO
-	autoload :Stream,              'rex/io/stream'
-	autoload :StreamAbstraction,   'rex/io/stream_abstraction'
-	autoload :StreamServer,        'rex/io/stream_server'
-
-	autoload :BidirectionalPipe,   'rex/io/bidirectional_pipe'
-	autoload :DatagramAbstraction, 'rex/io/datagram_abstraction'
-	autoload :RingBuffer,          'rex/io/ring_buffer'
-end

data/lib/rex/logging/sinks.rb

@@ -1,16 +0,0 @@
-##
-# $Id: sinks.rb 12554 2011-05-06 18:47:10Z jduck $
-#
-# Map log sinks for autload
-##
-
-module Rex
-module Logging
-module Sinks
-
-	autoload :Flatfile, 'rex/logging/sinks/flatfile'
-	autoload :Stderr,   'rex/logging/sinks/stderr'
-
-end
-end
-end

data/lib/rex/parser.rb

@@ -1,23 +0,0 @@
-##
-# $Id: parser.rb 12554 2011-05-06 18:47:10Z jduck $
-#
-# This file maps parsers for autoload
-##
-
-module Rex
-module Parser
-	# General parsers
-	autoload :Arguments, 'rex/parser/arguments'
-	autoload :Ini,       'rex/parser/ini'
-
-	# Data import parsers
-	autoload :NmapXMLStreamParser,       'rex/parser/nmap_xml'
-	autoload :NexposeXMLStreamParser,    'rex/parser/nexpose_xml'
-	autoload :RetinaXMLStreamParser,     'rex/parser/retina_xml'
-	autoload :NetSparkerXMLStreamParser, 'rex/parser/netsparker_xml'
-	autoload :NessusXMLStreamParser,     'rex/parser/nessus_xml'
-	autoload :IP360XMLStreamParser,      'rex/parser/ip360_xml'
-	autoload :IP360ASPLXMLStreamParser,  'rex/parser/ip360_aspl_xml'
-	autoload :AppleBackupManifestDB,     'rex/parser/apple_backup_manifestdb'
-end
-end

data/lib/rex/ui/text.rb

@@ -1,17 +0,0 @@
-module Rex
-module Ui
-module Text
-	autoload :Input,  'rex/ui/text/input'
-	autoload :Output, 'rex/ui/text/output'
-	autoload :Color,  'rex/ui/text/color'
-	autoload :Table,  'rex/ui/text/table'
-	
-	autoload :PseudoShell,     'rex/ui/text/shell'
-	autoload :Shell,           'rex/ui/text/shell'
-	autoload :DispatcherShell, 'rex/ui/text/dispatcher_shell'
-	autoload :IrbShell,        'rex/ui/text/irb_shell'
-
-	autoload :ProgressTracker, 'rex/ui/text/progress_tracker'
-end
-end
-end