Switched to using require_relative for loading local files (closes #96

).
ronin-rb · Aug 4, 2024 · 708bd0e · 708bd0e
1 parent 83f5ca9
commit 708bd0e
Show file tree

Hide file tree

Showing 22 changed files with 49 additions and 39 deletions.
diff --git a/lib/ronin/web/cli.rb b/lib/ronin/web/cli.rb
@@ -18,13 +18,14 @@
 # along with ronin-web.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-require 'ronin/web/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 Web
     #

diff --git a/lib/ronin/web/cli/browser_shell.rb b/lib/ronin/web/cli/browser_shell.rb
@@ -19,9 +19,10 @@
 #
 
 require 'ronin/core/cli/command_shell'
-require 'ronin/web/cli/js_shell'
 require 'ronin/web/browser'
 
+require_relative 'js_shell'
+
 module Ronin
   module Web
     class CLI

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

diff --git a/lib/ronin/web/cli/commands/browser.rb b/lib/ronin/web/cli/commands/browser.rb
@@ -18,10 +18,10 @@
 # along with ronin-web.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-require 'ronin/web/cli/command'
-require 'ronin/web/cli/browser_options'
-require 'ronin/web/cli/browser_shell'
-require 'ronin/web/cli/js_shell'
+require_relative '../command'
+require_relative '../browser_options'
+require_relative '../browser_shell'
+require_relative '../js_shell'
 
 require 'command_kit/colors'
 

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

diff --git a/lib/ronin/web/cli/commands/diff.rb b/lib/ronin/web/cli/commands/diff.rb
@@ -18,9 +18,9 @@
 # along with ronin-web.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-require 'ronin/web/cli/command'
-require 'ronin/support/network/http'
+require_relative '../command'
 
+require 'ronin/support/network/http'
 require 'command_kit/colors'
 require 'nokogiri/diff'
 

diff --git a/lib/ronin/web/cli/commands/html.rb b/lib/ronin/web/cli/commands/html.rb
@@ -18,9 +18,9 @@
 # along with ronin-web.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-require 'ronin/web/cli/commands/xml'
-require 'ronin/support/network/http'
+require_relative 'xml'
 
+require 'ronin/support/network/http'
 require 'nokogiri'
 
 module Ronin

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

diff --git a/lib/ronin/web/cli/commands/new.rb b/lib/ronin/web/cli/commands/new.rb
@@ -16,7 +16,8 @@
 # along with ronin-web.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-require 'ronin/web/cli/command'
+require_relative '../command'
+
 require 'command_kit/commands/auto_load'
 
 module Ronin

diff --git a/lib/ronin/web/cli/commands/new/app.rb b/lib/ronin/web/cli/commands/new/app.rb
@@ -16,8 +16,8 @@
 # along with ronin-web.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-require 'ronin/web/cli/command'
-require 'ronin/web/root'
+require_relative '../../command'
+require_relative '../../../root'
 
 require 'ronin/core/cli/generator'
 

diff --git a/lib/ronin/web/cli/commands/new/nokogiri.rb b/lib/ronin/web/cli/commands/new/nokogiri.rb
@@ -16,8 +16,8 @@
 # along with ronin-web.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-require 'ronin/web/cli/command'
-require 'ronin/web/root'
+require_relative '../../command'
+require_relative '../../../root'
 
 require 'ronin/core/cli/generator'
 

diff --git a/lib/ronin/web/cli/commands/new/server.rb b/lib/ronin/web/cli/commands/new/server.rb
@@ -16,8 +16,8 @@
 # along with ronin-web.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-require 'ronin/web/cli/command'
-require 'ronin/web/root'
+require_relative '../../command'
+require_relative '../../../root'
 
 require 'ronin/core/cli/generator'
 

diff --git a/lib/ronin/web/cli/commands/new/spider.rb b/lib/ronin/web/cli/commands/new/spider.rb
@@ -16,8 +16,8 @@
 # along with ronin-web.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-require 'ronin/web/cli/command'
-require 'ronin/web/root'
+require_relative '../../command'
+require_relative '../../../root'
 
 require 'ronin/core/cli/generator'
 

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

diff --git a/lib/ronin/web/cli/commands/screenshot.rb b/lib/ronin/web/cli/commands/screenshot.rb
@@ -18,8 +18,8 @@
 # along with ronin-web.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-require 'ronin/web/cli/command'
-require 'ronin/web/cli/browser_options'
+require_relative '../command'
+require_relative '../browser_options'
 
 require 'ronin/core/cli/logging'
 

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

diff --git a/lib/ronin/web/cli/commands/session_cookie.rb b/lib/ronin/web/cli/commands/session_cookie.rb
@@ -18,7 +18,8 @@
 # along with ronin-web.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-require 'ronin/web/cli/command'
+require_relative '../command'
+
 require 'ronin/web/session_cookie'
 require 'ronin/support/network/http'
 require 'ronin/support/encoding/hex'

diff --git a/lib/ronin/web/cli/commands/spider.rb b/lib/ronin/web/cli/commands/spider.rb
@@ -18,8 +18,9 @@
 # along with ronin-web.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-require 'ronin/web/cli/command'
-require 'ronin/web/cli/spider_options'
+require_relative '../command'
+require_relative '../spider_options'
+
 require 'ronin/web/spider/archive'
 require 'ronin/web/spider/git_archive'
 require 'ronin/support/network/http/user_agents'

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

diff --git a/lib/ronin/web/cli/commands/vulns.rb b/lib/ronin/web/cli/commands/vulns.rb
@@ -18,8 +18,9 @@
 # along with ronin-web.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-require 'ronin/web/cli/command'
-require 'ronin/web/cli/spider_options'
+require_relative '../command'
+require_relative '../spider_options'
+
 require 'ronin/core/cli/logging'
 require 'ronin/vulns/url_scanner'
 require 'ronin/vulns/cli/printing'

diff --git a/lib/ronin/web/cli/commands/wordlist.rb b/lib/ronin/web/cli/commands/wordlist.rb
@@ -18,10 +18,10 @@
 # along with ronin-web.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-require 'ronin/web/cli/command'
-require 'ronin/web/cli/spider_options'
-require 'ronin/core/cli/logging'
+require_relative '../command'
+require_relative '../spider_options'
 
+require 'ronin/core/cli/logging'
 require 'wordlist/builder'
 require 'nokogiri'
 

diff --git a/lib/ronin/web/cli/commands/xml.rb b/lib/ronin/web/cli/commands/xml.rb
@@ -18,9 +18,9 @@
 # along with ronin-web.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-require 'ronin/web/cli/command'
-require 'ronin/support/network/http'
+require_relative '../command'
 
+require 'ronin/support/network/http'
 require 'nokogiri'
 
 module Ronin