infosecn1nja
/
metasploit-framework
mirror of https://github.com/infosecn1nja/metasploit-framework.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move autoloads into OptionContainer 

This seems like a better place for them to live
bug/bundler_fix
James Lee 2015-04-16 11:02:01 -05:00
parent d7fc9294f0
commit d67f7a21d9
No known key found for this signature in database
GPG Key ID: 2D6094C7CEA0A321
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/msf/core/opt_base.rb
View File

@ -5,19 +5,6 @@ require 'rex/socket'
module Msf
autoload :Opt, 'msf/core/opt'
autoload :OptAddress, 'msf/core/opt_address'
autoload :OptAddressRange, 'msf/core/opt_address_range'
autoload :OptBool, 'msf/core/opt_bool'
autoload :OptEnum, 'msf/core/opt_enum'
autoload :OptInt, 'msf/core/opt_int'
autoload :OptPath, 'msf/core/opt_path'
autoload :OptPort, 'msf/core/opt_port'
autoload :OptRaw, 'msf/core/opt_raw'
autoload :OptRegexp, 'msf/core/opt_regexp'
autoload :OptString, 'msf/core/opt_string'
###
#
# The base class for all options.

16
lib/msf/core/option_container.rb
View File

@ -1,7 +1,21 @@
# -*- coding: binary -*-
module Msf
require 'msf/core/opt_base'
autoload :Opt, 'msf/core/opt'
autoload :OptBase, 'msf/core/opt_base'
autoload :OptAddress, 'msf/core/opt_address'
autoload :OptAddressRange, 'msf/core/opt_address_range'
autoload :OptBool, 'msf/core/opt_bool'
autoload :OptEnum, 'msf/core/opt_enum'
autoload :OptInt, 'msf/core/opt_int'
autoload :OptPath, 'msf/core/opt_path'
autoload :OptPort, 'msf/core/opt_port'
autoload :OptRaw, 'msf/core/opt_raw'
autoload :OptRegexp, 'msf/core/opt_regexp'
autoload :OptString, 'msf/core/opt_string'
#
# The options purpose in life is to associate named options with arbitrary