Switched to require_relative for loading local files (closes #79).

ronin-rb · Aug 4, 2024 · bd3e0fd · bd3e0fd
1 parent 7b96e3f
commit bd3e0fd
Show file tree

Hide file tree

Showing 32 changed files with 62 additions and 60 deletions.
diff --git a/lib/ronin/db.rb b/lib/ronin/db.rb
@@ -18,9 +18,9 @@
 # along with ronin-db.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-require 'ronin/db/exceptions'
-require 'ronin/db/config_file'
-require 'ronin/db/version'
+require_relative 'db/exceptions'
+require_relative 'db/config_file'
+require_relative 'db/version'
 
 module Ronin
   #

diff --git a/lib/ronin/db/cli.rb b/lib/ronin/db/cli.rb
@@ -18,13 +18,14 @@
 # along with ronin-db.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-require 'ronin/db/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 DB
     #

diff --git a/lib/ronin/db/cli/command.rb b/lib/ronin/db/cli/command.rb
@@ -18,7 +18,7 @@
 # along with ronin-db.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-require 'ronin/db/root'
+require_relative '../root'
 
 require 'ronin/core/cli/command'
 

diff --git a/lib/ronin/db/cli/commands/add.rb b/lib/ronin/db/cli/commands/add.rb
@@ -18,9 +18,9 @@
 # along with ronin-db.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-require 'ronin/db/cli/command'
-require 'ronin/db/cli/uri_methods'
-require 'ronin/db/config_file'
+require_relative '../command'
+require_relative '../uri_methods'
+require_relative '../../config_file'
 
 require 'command_kit/options/verbose'
 require 'command_kit/printing'

diff --git a/lib/ronin/db/cli/commands/asn.rb b/lib/ronin/db/cli/commands/asn.rb
@@ -18,9 +18,9 @@
 # along with ronin-db.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-require 'ronin/db/cli/model_command'
-require 'ronin/core/cli/logging'
+require_relative '../model_command'
 
+require 'ronin/core/cli/logging'
 require 'ronin/support/network/asn'
 require 'ronin/support/network/asn/list'
 

diff --git a/lib/ronin/db/cli/commands/certs.rb b/lib/ronin/db/cli/commands/certs.rb
@@ -18,7 +18,7 @@
 # along with ronin-db.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-require 'ronin/db/cli/model_command'
+require_relative '../model_command'
 
 require 'command_kit/printing/indent'
 require 'command_kit/printing/fields'

diff --git a/lib/ronin/db/cli/commands/completion.rb b/lib/ronin/db/cli/commands/completion.rb
@@ -18,9 +18,10 @@
 # along with ronin-db.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-require 'ronin/db/root'
 require 'ronin/core/cli/completion_command'
 
+require_relative '../../root'
+
 module Ronin
   module DB
     class CLI

diff --git a/lib/ronin/db/cli/commands/creds.rb b/lib/ronin/db/cli/commands/creds.rb
@@ -18,8 +18,8 @@
 # along with ronin-db.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-require 'ronin/db/cli/model_command'
-require 'ronin/db/cli/modifiable'
+require_relative '../model_command'
+require_relative '../modifiable'
 
 module Ronin
   module DB

diff --git a/lib/ronin/db/cli/commands/edit.rb b/lib/ronin/db/cli/commands/edit.rb
@@ -18,8 +18,8 @@
 # along with ronin-db.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-require 'ronin/db/cli/command'
-require 'ronin/db/config_file'
+require_relative '../command'
+require_relative '../../config_file'
 
 require 'command_kit/edit'
 

diff --git a/lib/ronin/db/cli/commands/emails.rb b/lib/ronin/db/cli/commands/emails.rb
@@ -18,8 +18,8 @@
 # along with ronin-db.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-require 'ronin/db/cli/model_command'
-require 'ronin/db/cli/modifiable'
+require_relative '../model_command'
+require_relative '../modifiable'
 
 module Ronin
   module DB

diff --git a/lib/ronin/db/cli/commands/hosts.rb b/lib/ronin/db/cli/commands/hosts.rb
@@ -18,8 +18,8 @@
 # along with ronin-db.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-require 'ronin/db/cli/model_command'
-require 'ronin/db/cli/modifiable'
+require_relative '../model_command'
+require_relative '../modifiable'
 
 module Ronin
   module DB

diff --git a/lib/ronin/db/cli/commands/ips.rb b/lib/ronin/db/cli/commands/ips.rb
@@ -18,8 +18,8 @@
 # along with ronin-db.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-require 'ronin/db/cli/model_command'
-require 'ronin/db/cli/modifiable'
+require_relative '../model_command'
+require_relative '../modifiable'
 
 module Ronin
   module DB

diff --git a/lib/ronin/db/cli/commands/irb.rb b/lib/ronin/db/cli/commands/irb.rb
@@ -18,9 +18,9 @@
 # along with ronin-db.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-require 'ronin/db/cli/command'
-require 'ronin/db/cli/database_options'
-require 'ronin/db/cli/ruby_shell'
+require_relative '../command'
+require_relative '../database_options'
+require_relative '../ruby_shell'
 
 module Ronin
   module DB

diff --git a/lib/ronin/db/cli/commands/list.rb b/lib/ronin/db/cli/commands/list.rb
@@ -18,8 +18,8 @@
 # along with ronin-db.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-require 'ronin/db/cli/command'
-require 'ronin/db/config_file'
+require_relative '../command'
+require_relative '../../config_file'
 
 require 'command_kit/options/verbose'
 require 'command_kit/printing'

diff --git a/lib/ronin/db/cli/commands/migrate.rb b/lib/ronin/db/cli/commands/migrate.rb
@@ -18,9 +18,9 @@
 # along with ronin-db.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-require 'ronin/db/cli/command'
-require 'ronin/db/cli/database_options'
-require 'ronin/db'
+require_relative '../command'
+require_relative '../database_options'
+require_relative '../../../db'
 
 module Ronin
   module DB

diff --git a/lib/ronin/db/cli/commands/open_ports.rb b/lib/ronin/db/cli/commands/open_ports.rb
@@ -18,7 +18,7 @@
 # along with ronin-db.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-require 'ronin/db/cli/model_command'
+require_relative '../model_command'
 
 module Ronin
   module DB

diff --git a/lib/ronin/db/cli/commands/oses.rb b/lib/ronin/db/cli/commands/oses.rb
@@ -18,7 +18,7 @@
 # along with ronin-db.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-require 'ronin/db/cli/model_command'
+require_relative '../model_command'
 
 module Ronin
   module DB

diff --git a/lib/ronin/db/cli/commands/passwords.rb b/lib/ronin/db/cli/commands/passwords.rb
@@ -18,8 +18,8 @@
 # along with ronin-db.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-require 'ronin/db/cli/model_command'
-require 'ronin/db/cli/modifiable'
+require_relative '../model_command'
+require_relative '../modifiable'
 
 module Ronin
   module DB

diff --git a/lib/ronin/db/cli/commands/people.rb b/lib/ronin/db/cli/commands/people.rb
@@ -18,8 +18,8 @@
 # along with ronin-db.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-require 'ronin/db/cli/model_command'
-require 'ronin/db/cli/modifiable'
+require_relative '../model_command'
+require_relative '../modifiable'
 
 module Ronin
   module DB

diff --git a/lib/ronin/db/cli/commands/phone_numbers.rb b/lib/ronin/db/cli/commands/phone_numbers.rb
@@ -18,8 +18,8 @@
 # along with ronin-db.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-require 'ronin/db/cli/model_command'
-require 'ronin/db/cli/modifiable'
+require_relative '../model_command'
+require_relative '../modifiable'
 
 module Ronin
   module DB

diff --git a/lib/ronin/db/cli/commands/ports.rb b/lib/ronin/db/cli/commands/ports.rb
@@ -18,8 +18,8 @@
 # along with ronin-db.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-require 'ronin/db/cli/model_command'
-require 'ronin/db/cli/modifiable'
+require_relative '../model_command'
+require_relative '../modifiable'
 
 module Ronin
   module DB

diff --git a/lib/ronin/db/cli/commands/remove.rb b/lib/ronin/db/cli/commands/remove.rb
@@ -18,8 +18,8 @@
 # along with ronin-db.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-require 'ronin/db/cli/command'
-require 'ronin/db/config_file'
+require_relative '../command'
+require_relative '../../config_file'
 
 module Ronin
   module DB

diff --git a/lib/ronin/db/cli/commands/services.rb b/lib/ronin/db/cli/commands/services.rb
@@ -18,8 +18,8 @@
 # along with ronin-db.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-require 'ronin/db/cli/model_command'
-require 'ronin/db/cli/modifiable'
+require_relative '../model_command'
+require_relative '../modifiable'
 
 module Ronin
   module DB

diff --git a/lib/ronin/db/cli/commands/software.rb b/lib/ronin/db/cli/commands/software.rb
@@ -18,7 +18,7 @@
 # along with ronin-db.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-require 'ronin/db/cli/model_command'
+require_relative '../model_command'
 
 module Ronin
   module DB

diff --git a/lib/ronin/db/cli/commands/street_addresses.rb b/lib/ronin/db/cli/commands/street_addresses.rb
@@ -18,7 +18,7 @@
 # along with ronin-db.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-require 'ronin/db/cli/model_command'
+require_relative '../model_command'
 
 module Ronin
   module DB

diff --git a/lib/ronin/db/cli/commands/urls.rb b/lib/ronin/db/cli/commands/urls.rb
@@ -18,8 +18,8 @@
 # along with ronin-db.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-require 'ronin/db/cli/model_command'
-require 'ronin/db/cli/modifiable'
+require_relative '../model_command'
+require_relative '../modifiable'
 
 module Ronin
   module DB

diff --git a/lib/ronin/db/cli/commands/web_vulns.rb b/lib/ronin/db/cli/commands/web_vulns.rb
@@ -18,7 +18,7 @@
 # along with ronin-db.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-require 'ronin/db/cli/model_command'
+require_relative '../model_command'
 
 module Ronin
   module DB

diff --git a/lib/ronin/db/cli/database_options.rb b/lib/ronin/db/cli/database_options.rb
@@ -18,8 +18,8 @@
 # along with ronin-db.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-require 'ronin/db/cli/uri_methods'
-require 'ronin/db'
+require_relative 'uri_methods'
+require_relative '../../db'
 
 module Ronin
   module DB

diff --git a/lib/ronin/db/cli/model_command.rb b/lib/ronin/db/cli/model_command.rb
@@ -18,10 +18,10 @@
 # along with ronin-db.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-require 'ronin/db/cli/command'
-require 'ronin/db/cli/database_options'
-require 'ronin/core/cli/logging'
+require_relative 'command'
+require_relative 'database_options'
 
+require 'ronin/core/cli/logging'
 require 'command_kit/options/verbose'
 
 module Ronin

diff --git a/lib/ronin/db/cli/modifiable.rb b/lib/ronin/db/cli/modifiable.rb
@@ -18,8 +18,8 @@
 # along with ronin-db.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-require 'ronin/db/cli/deletable'
-require 'ronin/db/cli/importable'
+require_relative 'deletable'
+require_relative 'importable'
 
 module Ronin
   module DB

diff --git a/lib/ronin/db/cli/uri_methods.rb b/lib/ronin/db/cli/uri_methods.rb
@@ -18,8 +18,8 @@
 # along with ronin-db.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-require 'ronin/db/cli/command'
-require 'ronin/db'
+require_relative 'command'
+require_relative '../../db'
 
 module Ronin
   module DB

diff --git a/lib/ronin/db/config_file.rb b/lib/ronin/db/config_file.rb
@@ -18,8 +18,8 @@
 # along with ronin-db.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-require 'ronin/db/exceptions'
-require 'ronin/db/home'
+require_relative 'exceptions'
+require_relative 'home'
 
 require 'fileutils'
 require 'yaml'