remove `msf/ui` requires

lib/metasploit/framework/command/console.rb

@@ -57,7 +57,6 @@ class Metasploit::Framework::Command::Console < Metasploit::Framework::Command::
   def driver
     unless @driver
       # require here so minimum loading is done before {start} is called.
-      require 'msf/ui'
 
       @driver = Msf::Ui::Console::Driver.new(
           Msf::Ui::Console::Driver::DefaultPrompt,

lib/msf/core/rpc/v10/rpc_console.rb

@@ -1,7 +1,6 @@
 # -*- coding: binary -*-
 require 'pp'
 require 'rex'
-require 'msf/ui/web/driver'
 
 module Msf
 module RPC

lib/msf/ui.rb

@@ -5,9 +5,3 @@ end
 end
 
 require 'rex/ui'
-require 'msf/ui/banner'
-require 'msf/ui/tip'
-require 'msf/ui/debug'
-require 'msf/ui/driver'
-require 'msf/ui/common'
-require 'msf/ui/console'

lib/msf/ui/console.rb

@@ -8,4 +8,3 @@ end
 end
 end
 
-require 'msf/ui/console/driver'

lib/msf/ui/console/command_dispatcher.rb

@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-require 'msf/ui/console/command_dispatcher/common'
 module Msf
 module Ui
 module Console
@@ -133,8 +132,3 @@ module CommandDispatcher
 
 end
 end end end
-
-require 'msf/ui/console/module_action_commands'
-require 'msf/ui/console/module_command_dispatcher'
-require 'msf/ui/console/module_option_tab_completion'
-require 'msf/ui/console/command_dispatcher/core'

lib/msf/ui/console/command_dispatcher/core.rb

@@ -10,17 +10,6 @@ require 'rex/ui/text/output/buffer/stdout'
 # Project
 #
 
-require 'msf/ui/console/command_dispatcher/encoder'
-require 'msf/ui/console/command_dispatcher/exploit'
-require 'msf/ui/console/command_dispatcher/nop'
-require 'msf/ui/console/command_dispatcher/payload'
-require 'msf/ui/console/command_dispatcher/auxiliary'
-require 'msf/ui/console/command_dispatcher/post'
-require 'msf/ui/console/command_dispatcher/evasion'
-require 'msf/ui/console/command_dispatcher/jobs'
-require 'msf/ui/console/command_dispatcher/resource'
-require 'msf/ui/console/command_dispatcher/modules'
-require 'msf/ui/console/command_dispatcher/developer'
 require 'msf/util/document_generator'
 
 require 'msf/core/opt_condition'

lib/msf/ui/console/command_dispatcher/db.rb

@@ -3,7 +3,6 @@
 require 'json'
 require 'rexml/document'
 require 'rex/parser/nmap_xml'
-require 'msf/ui/console/command_dispatcher/db/analyze'
 require 'metasploit/framework/data_service'
 require 'metasploit/framework/data_service/remote/http/core'
 

lib/msf/ui/console/command_dispatcher/modules.rb

@@ -1,10 +1,7 @@
 # -*- coding: binary -*-
 
 require 'rex/ui/text/output/buffer/stdout'
-require 'msf/ui/console/table_print/rank_styler'
-require 'msf/ui/console/table_print/rank_formatter'
-require 'msf/ui/console/table_print/highlight_substring_styler'
-
+require 'rex/parser/arguments'
 
 module Msf
   module Ui

lib/msf/ui/console/driver.rb

@@ -1,10 +1,4 @@
 # -*- coding: binary -*-
-require 'msf/ui'
-require 'msf/ui/console/framework_event_manager'
-require 'msf/ui/console/command_dispatcher'
-require 'msf/ui/console/command_dispatcher/db'
-require 'msf/ui/console/command_dispatcher/creds'
-require 'msf/ui/console/table'
 require 'find'
 require 'erb'
 require 'rexml/document'

lib/msf/ui/console/module_command_dispatcher.rb

@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-require 'msf/ui/console/command_dispatcher'
 require 'rex/parser/arguments'
 
 module Msf

lib/msf/ui/web.rb

@@ -12,4 +12,3 @@ end
 end
 end
 
-require 'msf/ui/web/driver'

lib/msf/ui/web/driver.rb

@@ -1,6 +1,5 @@
 # -*- coding: binary -*-
 require 'rex/proto/http'
-require 'msf/ui'
 
 module Msf
 module Ui

spec/lib/msf/debug_spec.rb

@@ -1,6 +1,4 @@
 require 'spec_helper'
-require 'msf/ui/debug'
-require 'msf/ui/console/driver'
 
 RSpec.describe Msf::Ui::Debug do
   let(:file_fixtures_path) { File.join(Msf::Config.install_root, 'spec', 'file_fixtures') }

spec/lib/msf/ui/console/command_dispatcher/auxiliary_spec.rb

@@ -1,7 +1,5 @@
 require 'spec_helper'
 
-require 'msf/ui'
-require 'msf/ui/console/command_dispatcher/auxiliary'
 
 RSpec.describe Msf::Ui::Console::CommandDispatcher::Auxiliary do
   include_context 'Msf::DBManager'

spec/lib/msf/ui/console/command_dispatcher/common_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'msf/ui/console/command_dispatcher/common'
 
 RSpec.describe ::Msf::Ui::Console::CommandDispatcher::Common do
   let(:subject) do

spec/lib/msf/ui/console/command_dispatcher/core_spec.rb

@@ -1,8 +1,5 @@
 require 'spec_helper'
 
-require 'msf/ui'
-require 'msf/ui/console/module_command_dispatcher'
-require 'msf/ui/console/command_dispatcher/core'
 require 'readline'
 
 RSpec.describe Msf::Ui::Console::CommandDispatcher::Core do

spec/lib/msf/ui/console/command_dispatcher/creds_spec.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 require 'spec_helper'
 
-require 'msf/ui'
-require 'msf/ui/console/command_dispatcher/creds'
 
 RSpec.describe Msf::Ui::Console::CommandDispatcher::Creds do
 

spec/lib/msf/ui/console/command_dispatcher/db_spec.rb

@@ -1,7 +1,5 @@
 require 'spec_helper'
 
-require 'msf/ui'
-require 'msf/ui/console/command_dispatcher/db'
 
 RSpec.describe Msf::Ui::Console::CommandDispatcher::Db do
   include_context 'Msf::DBManager'

spec/lib/msf/ui/console/command_dispatcher/exploit_spec.rb

@@ -1,7 +1,5 @@
 require 'spec_helper'
 
-require 'msf/ui'
-require 'msf/ui/console/command_dispatcher/exploit'
 
 RSpec.describe Msf::Ui::Console::CommandDispatcher::Exploit do
   include_context 'Msf::DBManager'

spec/lib/msf/ui/console/table_print/highlight_substring_styler_spec.rb

@@ -1,6 +1,5 @@
 require 'spec_helper'
 
-require 'msf/ui/console/table_print/highlight_substring_styler'
 
 RSpec.describe Msf::Ui::Console::TablePrint::HighlightSubstringStyler do
   describe 'style' do

spec/lib/msf/ui/console/table_print/rank_formatter_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'msf/ui/console/table_print/rank_formatter'
 
 RSpec.describe Msf::Ui::Console::TablePrint::RankFormatter do
   describe 'format' do

spec/lib/msf/ui/console/table_print/rank_styler_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'msf/ui/console/table_print/rank_styler'
 
 RSpec.describe Msf::Ui::Console::TablePrint::RankStyler do
   describe 'style' do

test/tests/testbase.rb

@@ -3,6 +3,5 @@
 $:.unshift(File.join(File.expand_path(File.dirname(__FILE__)), '..', '..', 'lib'))
 
 require 'rex'
-require 'msf/ui'
 
 $msf = Msf::Simple::Framework.create

tools/exploit/msf_irb_shell.rb

@@ -16,7 +16,6 @@ require 'msfenv'
 $:.unshift(ENV['MSF_LOCAL_LIB']) if ENV['MSF_LOCAL_LIB']
 
 require 'rex'
-require 'msf/ui'
 
 framework = Msf::Simple::Framework.create
 

tools/exploit/reg.rb

@@ -21,7 +21,6 @@ require 'msfenv'
 $:.unshift(ENV['MSF_LOCAL_LIB']) if ENV['MSF_LOCAL_LIB']
 
 require 'rex'
-require 'msf/ui'
 require 'rex/registry/hive'
 
 def print_all(nodekey)

tools/modules/module_count.rb

@@ -20,7 +20,6 @@ require 'msfenv'
 $:.unshift(ENV['MSF_LOCAL_LIB']) if ENV['MSF_LOCAL_LIB']
 
 require 'rex'
-require 'msf/ui'
 
 # Always disable the database (we never need it just to list module
 # information).

tools/modules/module_description.rb

@@ -20,7 +20,6 @@ require 'msfenv'
 $:.unshift(ENV['MSF_LOCAL_LIB']) if ENV['MSF_LOCAL_LIB']
 
 require 'rex'
-require 'msf/ui'
 
 sort = 0
 filter= 'All'

tools/modules/module_disclodate.rb

@@ -20,7 +20,6 @@ require 'msfenv'
 $:.unshift(ENV['MSF_LOCAL_LIB']) if ENV['MSF_LOCAL_LIB']
 
 require 'rex'
-require 'msf/ui'
 
 nilc = false
 sort = 0

tools/modules/module_license.rb

@@ -20,7 +20,6 @@ require 'msfenv'
 $:.unshift(ENV['MSF_LOCAL_LIB']) if ENV['MSF_LOCAL_LIB']
 
 require 'rex'
-require 'msf/ui'
 
 def lic_short(l)
   if (l.class == Array)

tools/modules/module_mixins.rb

@@ -20,7 +20,6 @@ require 'msfenv'
 $:.unshift(ENV['MSF_LOCAL_LIB']) if ENV['MSF_LOCAL_LIB']
 
 require 'rex'
-require 'msf/ui'
 
 def do_want(klass)
   return false if klass.class != Module

tools/modules/module_payloads.rb

@@ -20,7 +20,6 @@ require 'msfenv'
 $:.unshift(ENV['MSF_LOCAL_LIB']) if ENV['MSF_LOCAL_LIB']
 
 require 'rex'
-require 'msf/ui'
 
 # Initialize the simplified framework instance.
 $framework = Msf::Simple::Framework.create('DisableDatabase' => true)

tools/modules/module_ports.rb

@@ -20,7 +20,6 @@ require 'msfenv'
 $:.unshift(ENV['MSF_LOCAL_LIB']) if ENV['MSF_LOCAL_LIB']
 
 require 'rex'
-require 'msf/ui'
 
 # Initialize the simplified framework instance.
 $framework = Msf::Simple::Framework.create('DisableDatabase' => true)

tools/modules/module_rank.rb

@@ -20,7 +20,6 @@ require 'msfenv'
 $:.unshift(ENV['MSF_LOCAL_LIB']) if ENV['MSF_LOCAL_LIB']
 
 require 'rex'
-require 'msf/ui'
 
 ranks= Hash.new
 

tools/modules/module_reference.rb

@@ -20,7 +20,6 @@ require 'msfenv'
 $:.unshift(ENV['MSF_LOCAL_LIB']) if ENV['MSF_LOCAL_LIB']
 
 require 'rex'
-require 'msf/ui'
 require 'uri'
 
 

tools/modules/module_targets.rb

@@ -20,7 +20,6 @@ require 'msfenv'
 $:.unshift(ENV['MSF_LOCAL_LIB']) if ENV['MSF_LOCAL_LIB']
 
 require 'rex'
-require 'msf/ui'
 
 sort=0
 fil = 0

tools/modules/payload_lengths.rb

@@ -20,7 +20,6 @@ require 'msfenv'
 $:.unshift(ENV['MSF_LOCAL_LIB']) if ENV['MSF_LOCAL_LIB']
 
 require 'rex'
-require 'msf/ui'
 
 Indent = '    '
 

tools/modules/update_payload_cached_sizes.rb

@@ -22,7 +22,6 @@ $:.unshift(ENV['MSF_LOCAL_LIB']) if ENV['MSF_LOCAL_LIB']
 gem 'rex-text'
 
 require 'rex'
-require 'msf/ui'
 require 'msf/util/payload_cached_size'
 
 # Initialize the simplified framework instance.