diff --git a/lib/ronin/nmap.rb b/lib/ronin/nmap.rb index b56a2b5..5a26c87 100644 --- a/lib/ronin/nmap.rb +++ b/lib/ronin/nmap.rb @@ -18,8 +18,9 @@ # along with ronin-nmap. If not, see . # -require 'ronin/nmap/exceptions' -require 'ronin/nmap/importer' +require_relative 'nmap/exceptions' +require_relative 'nmap/importer' + require 'ronin/core/home' require 'nmap/command' require 'nmap/xml' diff --git a/lib/ronin/nmap/cli.rb b/lib/ronin/nmap/cli.rb index f9865a9..4aa744c 100644 --- a/lib/ronin/nmap/cli.rb +++ b/lib/ronin/nmap/cli.rb @@ -18,13 +18,14 @@ # along with ronin-nmap. If not, see . # -require 'ronin/nmap/version' require 'ronin/core/cli/help/banner' require 'command_kit/commands' require 'command_kit/commands/auto_load' require 'command_kit/options/version' +require_relative 'version' + module Ronin module Nmap # diff --git a/lib/ronin/nmap/cli/command.rb b/lib/ronin/nmap/cli/command.rb index f0eaddc..8fe72dd 100644 --- a/lib/ronin/nmap/cli/command.rb +++ b/lib/ronin/nmap/cli/command.rb @@ -18,7 +18,7 @@ # along with ronin-nmap. If not, see . # -require 'ronin/nmap/root' +require_relative '../root' require 'ronin/core/cli/command' diff --git a/lib/ronin/nmap/cli/commands/completion.rb b/lib/ronin/nmap/cli/commands/completion.rb index 55aa63e..7fca3bb 100644 --- a/lib/ronin/nmap/cli/commands/completion.rb +++ b/lib/ronin/nmap/cli/commands/completion.rb @@ -18,9 +18,10 @@ # along with ronin-nmap. If not, see . # -require 'ronin/nmap/root' require 'ronin/core/cli/completion_command' +require_relative '../../root' + module Ronin module Nmap class CLI diff --git a/lib/ronin/nmap/cli/commands/convert.rb b/lib/ronin/nmap/cli/commands/convert.rb index 1cdc8ee..2d93fc3 100644 --- a/lib/ronin/nmap/cli/commands/convert.rb +++ b/lib/ronin/nmap/cli/commands/convert.rb @@ -18,8 +18,8 @@ # along with ronin-nmap. If not, see . # -require 'ronin/nmap/cli/command' -require 'ronin/nmap/converter' +require_relative '../command' +require_relative '../../converter' module Ronin module Nmap diff --git a/lib/ronin/nmap/cli/commands/dump.rb b/lib/ronin/nmap/cli/commands/dump.rb index 12eec77..51fe1d1 100644 --- a/lib/ronin/nmap/cli/commands/dump.rb +++ b/lib/ronin/nmap/cli/commands/dump.rb @@ -18,10 +18,10 @@ # along with ronin-nmap. If not, see . # -require 'ronin/nmap/cli/command' -require 'ronin/nmap/cli/filtering_options' -require 'nmap/xml' +require_relative '../command' +require_relative '../filtering_options' +require 'nmap/xml' require 'set' module Ronin diff --git a/lib/ronin/nmap/cli/commands/grep.rb b/lib/ronin/nmap/cli/commands/grep.rb index 0ecedd5..f3ac96a 100644 --- a/lib/ronin/nmap/cli/commands/grep.rb +++ b/lib/ronin/nmap/cli/commands/grep.rb @@ -18,7 +18,7 @@ # along with ronin-nmap. If not, see . # -require 'ronin/nmap/cli/command' +require_relative '../command' require 'command_kit/colors' require 'command_kit/printing/indent' diff --git a/lib/ronin/nmap/cli/commands/import.rb b/lib/ronin/nmap/cli/commands/import.rb index e7fd36c..ee152f7 100644 --- a/lib/ronin/nmap/cli/commands/import.rb +++ b/lib/ronin/nmap/cli/commands/import.rb @@ -18,9 +18,9 @@ # along with ronin-nmap. If not, see . # -require 'ronin/nmap/cli/command' -require 'ronin/nmap/cli/importable' -require 'ronin/nmap/importer' +require_relative '../command' +require_relative '../importable' +require_relative '../../importer' module Ronin module Nmap diff --git a/lib/ronin/nmap/cli/commands/new.rb b/lib/ronin/nmap/cli/commands/new.rb index 9e5af82..927cf5f 100644 --- a/lib/ronin/nmap/cli/commands/new.rb +++ b/lib/ronin/nmap/cli/commands/new.rb @@ -18,8 +18,8 @@ # along with ronin-nmap. If not, see . # -require 'ronin/nmap/cli/command' -require 'ronin/nmap/root' +require_relative '../command' +require_relative '../../root' require 'ronin/core/cli/generator' diff --git a/lib/ronin/nmap/cli/commands/print.rb b/lib/ronin/nmap/cli/commands/print.rb index d88b0e8..6494c91 100644 --- a/lib/ronin/nmap/cli/commands/print.rb +++ b/lib/ronin/nmap/cli/commands/print.rb @@ -18,8 +18,9 @@ # along with ronin-nmap. If not, see . # -require 'ronin/nmap/cli/command' -require 'ronin/nmap/cli/filtering_options' +require_relative '../command' +require_relative '../filtering_options' + require 'nmap/xml' module Ronin diff --git a/lib/ronin/nmap/cli/commands/scan.rb b/lib/ronin/nmap/cli/commands/scan.rb index 5f9ac91..63dfd7c 100644 --- a/lib/ronin/nmap/cli/commands/scan.rb +++ b/lib/ronin/nmap/cli/commands/scan.rb @@ -18,11 +18,11 @@ # along with ronin-nmap. If not, see . # -require 'ronin/nmap/cli/command' -require 'ronin/nmap/cli/importable' -require 'ronin/nmap/converter' -require 'ronin/core/cli/logging' +require_relative '../command' +require_relative '../importable' +require_relative '../../converter' +require 'ronin/core/cli/logging' require 'tempfile' require 'set' diff --git a/lib/ronin/nmap/cli/filtering_options.rb b/lib/ronin/nmap/cli/filtering_options.rb index dd9603d..b9094e8 100644 --- a/lib/ronin/nmap/cli/filtering_options.rb +++ b/lib/ronin/nmap/cli/filtering_options.rb @@ -18,7 +18,7 @@ # along with ronin-nmap. If not, see . # -require 'ronin/nmap/cli/port_list' +require_relative 'port_list' module Ronin module Nmap diff --git a/lib/ronin/nmap/cli/importable.rb b/lib/ronin/nmap/cli/importable.rb index 69eb93d..d9e3eea 100644 --- a/lib/ronin/nmap/cli/importable.rb +++ b/lib/ronin/nmap/cli/importable.rb @@ -18,7 +18,8 @@ # along with ronin-nmap. If not, see . # -require 'ronin/nmap/importer' +require_relative '../importer' + require 'ronin/db/cli/database_options' require 'ronin/db/cli/printing' require 'ronin/core/cli/logging' diff --git a/lib/ronin/nmap/converter.rb b/lib/ronin/nmap/converter.rb index 3dd5e55..4a5c14f 100644 --- a/lib/ronin/nmap/converter.rb +++ b/lib/ronin/nmap/converter.rb @@ -18,7 +18,7 @@ # along with ronin-nmap. If not, see . # -require 'ronin/nmap/converters' +require_relative 'converters' require 'nmap/xml' diff --git a/lib/ronin/nmap/converters.rb b/lib/ronin/nmap/converters.rb index ea2074b..df03f24 100644 --- a/lib/ronin/nmap/converters.rb +++ b/lib/ronin/nmap/converters.rb @@ -18,8 +18,8 @@ # along with ronin-nmap. If not, see . # -require 'ronin/nmap/converters/json' -require 'ronin/nmap/converters/csv' +require_relative 'converters/json' +require_relative 'converters/csv' module Ronin module Nmap