From d61848d2cbeffaaf5ea5443e94574057d48ee22b Mon Sep 17 00:00:00 2001 From: Charlie Date: Sat, 27 Jul 2024 12:56:25 +0100 Subject: [PATCH] Update lib to use require_relative --- lib/ronin/core/cli/command_shell.rb | 4 ++-- lib/ronin/core/cli/command_shell/command.rb | 2 +- lib/ronin/core/cli/completion_command.rb | 2 +- lib/ronin/core/cli/generator.rb | 2 +- lib/ronin/core/cli/generator/options/author.rb | 2 +- lib/ronin/core/cli/help/banner.rb | 2 +- lib/ronin/core/cli/printing/params.rb | 2 +- lib/ronin/core/cli/ruby_shell.rb | 2 +- lib/ronin/core/cli/shell.rb | 2 +- lib/ronin/core/metadata/authors.rb | 2 +- lib/ronin/core/output_formats.rb | 8 ++++---- lib/ronin/core/output_formats/csv.rb | 2 +- lib/ronin/core/output_formats/json.rb | 2 +- lib/ronin/core/output_formats/ndjson.rb | 2 +- lib/ronin/core/output_formats/output_dir.rb | 2 +- lib/ronin/core/output_formats/output_file.rb | 2 +- lib/ronin/core/output_formats/txt.rb | 2 +- lib/ronin/core/params.rb | 2 +- lib/ronin/core/params/mixin.rb | 6 +++--- lib/ronin/core/params/types.rb | 16 ++++++++-------- lib/ronin/core/params/types/boolean.rb | 2 +- lib/ronin/core/params/types/enum.rb | 2 +- lib/ronin/core/params/types/float.rb | 2 +- lib/ronin/core/params/types/integer.rb | 2 +- lib/ronin/core/params/types/numeric.rb | 2 +- lib/ronin/core/params/types/regexp.rb | 2 +- lib/ronin/core/params/types/string.rb | 2 +- lib/ronin/core/params/types/type.rb | 2 +- lib/ronin/core/params/types/uri.rb | 2 +- 29 files changed, 42 insertions(+), 42 deletions(-) diff --git a/lib/ronin/core/cli/command_shell.rb b/lib/ronin/core/cli/command_shell.rb index 4f3ba67..852a56e 100644 --- a/lib/ronin/core/cli/command_shell.rb +++ b/lib/ronin/core/cli/command_shell.rb @@ -16,8 +16,8 @@ # along with ronin-core. If not, see . # -require 'ronin/core/cli/shell' -require 'ronin/core/cli/command_shell/command' +require_relative 'shell' +require_relative 'command_shell/command' require 'shellwords' diff --git a/lib/ronin/core/cli/command_shell/command.rb b/lib/ronin/core/cli/command_shell/command.rb index 3a1245a..3710838 100644 --- a/lib/ronin/core/cli/command_shell/command.rb +++ b/lib/ronin/core/cli/command_shell/command.rb @@ -16,7 +16,7 @@ # along with ronin-core. If not, see . # -require 'ronin/core/cli/shell' +require_relative '../../cli/shell' module Ronin module Core diff --git a/lib/ronin/core/cli/completion_command.rb b/lib/ronin/core/cli/completion_command.rb index 10d92f4..a112f10 100644 --- a/lib/ronin/core/cli/completion_command.rb +++ b/lib/ronin/core/cli/completion_command.rb @@ -16,7 +16,7 @@ # along with ronin-core. If not, see . # -require 'ronin/core/cli/command' +require_relative 'command' require 'command_kit/completion/install' diff --git a/lib/ronin/core/cli/generator.rb b/lib/ronin/core/cli/generator.rb index 2eaf555..29d30d5 100644 --- a/lib/ronin/core/cli/generator.rb +++ b/lib/ronin/core/cli/generator.rb @@ -16,7 +16,7 @@ # along with ronin-core. If not, see . # -require 'ronin/core/cli/command' +require_relative 'command' require 'command_kit/colors' require 'fileutils' diff --git a/lib/ronin/core/cli/generator/options/author.rb b/lib/ronin/core/cli/generator/options/author.rb index 47936c7..5405807 100644 --- a/lib/ronin/core/cli/generator/options/author.rb +++ b/lib/ronin/core/cli/generator/options/author.rb @@ -16,7 +16,7 @@ # along with ronin-core. If not, see . # -require 'ronin/core/git' +require_relative '../../../git' module Ronin module Core diff --git a/lib/ronin/core/cli/help/banner.rb b/lib/ronin/core/cli/help/banner.rb index d6348c8..8e15aa4 100644 --- a/lib/ronin/core/cli/help/banner.rb +++ b/lib/ronin/core/cli/help/banner.rb @@ -16,7 +16,7 @@ # along with ronin-core. If not, see . # -require 'ronin/core/cli/banner' +require_relative '../banner' module Ronin module Core diff --git a/lib/ronin/core/cli/printing/params.rb b/lib/ronin/core/cli/printing/params.rb index b55ca70..79b8eb9 100644 --- a/lib/ronin/core/cli/printing/params.rb +++ b/lib/ronin/core/cli/printing/params.rb @@ -16,7 +16,7 @@ # along with ronin-core. If not, see . # -require 'ronin/core/params/types' +require_relative '../../params/types' require 'command_kit/printing/tables' diff --git a/lib/ronin/core/cli/ruby_shell.rb b/lib/ronin/core/cli/ruby_shell.rb index 83fb188..c321258 100644 --- a/lib/ronin/core/cli/ruby_shell.rb +++ b/lib/ronin/core/cli/ruby_shell.rb @@ -16,7 +16,7 @@ # along with ronin-core. If not, see . # -require 'ronin/core/cli/banner' +require_relative 'banner' require 'command_kit/colors' require 'irb' diff --git a/lib/ronin/core/cli/shell.rb b/lib/ronin/core/cli/shell.rb index 8b763c8..cbf5b4d 100644 --- a/lib/ronin/core/cli/shell.rb +++ b/lib/ronin/core/cli/shell.rb @@ -16,7 +16,7 @@ # along with ronin-core. If not, see . # -require 'ronin/core/cli/banner' +require_relative 'banner' require 'command_kit/printing' require 'command_kit/colors' diff --git a/lib/ronin/core/metadata/authors.rb b/lib/ronin/core/metadata/authors.rb index e1a2e56..66e04d4 100644 --- a/lib/ronin/core/metadata/authors.rb +++ b/lib/ronin/core/metadata/authors.rb @@ -16,7 +16,7 @@ # along with ronin-core. If not, see . # -require 'ronin/core/metadata/authors/author' +require_relative 'authors/author' module Ronin module Core diff --git a/lib/ronin/core/output_formats.rb b/lib/ronin/core/output_formats.rb index ccfafa5..4ba37e6 100644 --- a/lib/ronin/core/output_formats.rb +++ b/lib/ronin/core/output_formats.rb @@ -16,10 +16,10 @@ # along with ronin-core. If not, see . # -require 'ronin/core/output_formats/txt' -require 'ronin/core/output_formats/csv' -require 'ronin/core/output_formats/json' -require 'ronin/core/output_formats/ndjson' +require_relative 'output_formats/txt' +require_relative 'output_formats/csv' +require_relative 'output_formats/json' +require_relative 'output_formats/ndjson' module Ronin module Core diff --git a/lib/ronin/core/output_formats/csv.rb b/lib/ronin/core/output_formats/csv.rb index 9690953..44ea1b6 100644 --- a/lib/ronin/core/output_formats/csv.rb +++ b/lib/ronin/core/output_formats/csv.rb @@ -16,7 +16,7 @@ # along with ronin-core. If not, see . # -require 'ronin/core/output_formats/output_file' +require_relative 'output_file' require 'csv' diff --git a/lib/ronin/core/output_formats/json.rb b/lib/ronin/core/output_formats/json.rb index 48185fa..2d53bad 100644 --- a/lib/ronin/core/output_formats/json.rb +++ b/lib/ronin/core/output_formats/json.rb @@ -16,7 +16,7 @@ # along with ronin-core. If not, see . # -require 'ronin/core/output_formats/output_file' +require_relative 'output_file' require 'json' diff --git a/lib/ronin/core/output_formats/ndjson.rb b/lib/ronin/core/output_formats/ndjson.rb index 1d65633..c73a59a 100644 --- a/lib/ronin/core/output_formats/ndjson.rb +++ b/lib/ronin/core/output_formats/ndjson.rb @@ -16,7 +16,7 @@ # along with ronin-core. If not, see . # -require 'ronin/core/output_formats/output_file' +require_relative 'output_file' require 'json' diff --git a/lib/ronin/core/output_formats/output_dir.rb b/lib/ronin/core/output_formats/output_dir.rb index 45a3386..747358d 100644 --- a/lib/ronin/core/output_formats/output_dir.rb +++ b/lib/ronin/core/output_formats/output_dir.rb @@ -16,7 +16,7 @@ # along with ronin-core. If not, see . # -require 'ronin/core/output_formats/output_format' +require_relative 'output_format' require 'fileutils' diff --git a/lib/ronin/core/output_formats/output_file.rb b/lib/ronin/core/output_formats/output_file.rb index cecf4b9..1221afa 100644 --- a/lib/ronin/core/output_formats/output_file.rb +++ b/lib/ronin/core/output_formats/output_file.rb @@ -16,7 +16,7 @@ # along with ronin-core. If not, see . # -require 'ronin/core/output_formats/output_format' +require_relative 'output_format' module Ronin module Core diff --git a/lib/ronin/core/output_formats/txt.rb b/lib/ronin/core/output_formats/txt.rb index f9f8c04..422bb33 100644 --- a/lib/ronin/core/output_formats/txt.rb +++ b/lib/ronin/core/output_formats/txt.rb @@ -16,7 +16,7 @@ # along with ronin-core. If not, see . # -require 'ronin/core/output_formats/output_file' +require_relative 'output_file' module Ronin module Core diff --git a/lib/ronin/core/params.rb b/lib/ronin/core/params.rb index b7925b9..4559105 100644 --- a/lib/ronin/core/params.rb +++ b/lib/ronin/core/params.rb @@ -16,4 +16,4 @@ # along with ronin-core. If not, see . # -require 'ronin/core/params/mixin' +require_relative 'params/mixin' diff --git a/lib/ronin/core/params/mixin.rb b/lib/ronin/core/params/mixin.rb index fe68d21..866171c 100644 --- a/lib/ronin/core/params/mixin.rb +++ b/lib/ronin/core/params/mixin.rb @@ -16,9 +16,9 @@ # along with ronin-core. If not, see . # -require 'ronin/core/params/exceptions' -require 'ronin/core/params/param' -require 'ronin/core/params/types' +require_relative 'exceptions' +require_relative 'param' +require_relative 'types' module Ronin module Core diff --git a/lib/ronin/core/params/types.rb b/lib/ronin/core/params/types.rb index 742fb28..5f9fd1d 100644 --- a/lib/ronin/core/params/types.rb +++ b/lib/ronin/core/params/types.rb @@ -16,14 +16,14 @@ # along with ronin-core. If not, see . # -require 'ronin/core/params/exceptions' -require 'ronin/core/params/types/string' -require 'ronin/core/params/types/boolean' -require 'ronin/core/params/types/integer' -require 'ronin/core/params/types/float' -require 'ronin/core/params/types/regexp' -require 'ronin/core/params/types/uri' -require 'ronin/core/params/types/enum' +require_relative 'exceptions' +require_relative 'types/string' +require_relative 'types/boolean' +require_relative 'types/integer' +require_relative 'types/float' +require_relative 'types/regexp' +require_relative 'types/uri' +require_relative 'types/enum' module Ronin module Core diff --git a/lib/ronin/core/params/types/boolean.rb b/lib/ronin/core/params/types/boolean.rb index 7895a66..c437b83 100644 --- a/lib/ronin/core/params/types/boolean.rb +++ b/lib/ronin/core/params/types/boolean.rb @@ -16,7 +16,7 @@ # along with ronin-core. If not, see . # -require 'ronin/core/params/types/type' +require_relative 'type' module Ronin module Core diff --git a/lib/ronin/core/params/types/enum.rb b/lib/ronin/core/params/types/enum.rb index d112b7f..1550f76 100644 --- a/lib/ronin/core/params/types/enum.rb +++ b/lib/ronin/core/params/types/enum.rb @@ -16,7 +16,7 @@ # along with ronin-core. If not, see . # -require 'ronin/core/params/types/type' +require_relative 'type' module Ronin module Core diff --git a/lib/ronin/core/params/types/float.rb b/lib/ronin/core/params/types/float.rb index 6dfcc25..8bdaf6d 100644 --- a/lib/ronin/core/params/types/float.rb +++ b/lib/ronin/core/params/types/float.rb @@ -16,7 +16,7 @@ # along with ronin-core. If not, see . # -require 'ronin/core/params/types/numeric' +require_relative 'numeric' module Ronin module Core diff --git a/lib/ronin/core/params/types/integer.rb b/lib/ronin/core/params/types/integer.rb index 0e0169f..2cc7911 100644 --- a/lib/ronin/core/params/types/integer.rb +++ b/lib/ronin/core/params/types/integer.rb @@ -16,7 +16,7 @@ # along with ronin-core. If not, see . # -require 'ronin/core/params/types/numeric' +require_relative 'numeric' module Ronin module Core diff --git a/lib/ronin/core/params/types/numeric.rb b/lib/ronin/core/params/types/numeric.rb index 503d676..28db7b2 100644 --- a/lib/ronin/core/params/types/numeric.rb +++ b/lib/ronin/core/params/types/numeric.rb @@ -16,7 +16,7 @@ # along with ronin-core. If not, see . # -require 'ronin/core/params/types/type' +require_relative 'type' module Ronin module Core diff --git a/lib/ronin/core/params/types/regexp.rb b/lib/ronin/core/params/types/regexp.rb index c90f5f0..09f5011 100644 --- a/lib/ronin/core/params/types/regexp.rb +++ b/lib/ronin/core/params/types/regexp.rb @@ -16,7 +16,7 @@ # along with ronin-core. If not, see . # -require 'ronin/core/params/types/type' +require_relative 'type' module Ronin module Core diff --git a/lib/ronin/core/params/types/string.rb b/lib/ronin/core/params/types/string.rb index f4f8174..2775b91 100644 --- a/lib/ronin/core/params/types/string.rb +++ b/lib/ronin/core/params/types/string.rb @@ -16,7 +16,7 @@ # along with ronin-core. If not, see . # -require 'ronin/core/params/types/type' +require_relative 'type' module Ronin module Core diff --git a/lib/ronin/core/params/types/type.rb b/lib/ronin/core/params/types/type.rb index 0ce2966..cf9a5e5 100644 --- a/lib/ronin/core/params/types/type.rb +++ b/lib/ronin/core/params/types/type.rb @@ -16,7 +16,7 @@ # along with ronin-core. If not, see . # -require 'ronin/core/params/exceptions' +require_relative '../exceptions' module Ronin module Core diff --git a/lib/ronin/core/params/types/uri.rb b/lib/ronin/core/params/types/uri.rb index 752c0bc..bcfc9cb 100644 --- a/lib/ronin/core/params/types/uri.rb +++ b/lib/ronin/core/params/types/uri.rb @@ -16,7 +16,7 @@ # along with ronin-core. If not, see . # -require 'ronin/core/params/types/type' +require_relative 'type' require 'uri'