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

…134).

app.rb

@@ -27,8 +27,8 @@
 require 'sinatra/reloader'
 
 # configuration
-require './config/database'
-require './config/sidekiq'
+require_relative 'config/database'
+require_relative 'config/sidekiq'
 
 # ronin libraries
 require 'ronin/repos'
@@ -49,12 +49,12 @@
 require 'ronin/app/helpers/html'
 
 # worker classes
-require './workers/install_repo'
-require './workers/update_repo'
-require './workers/update_repos'
-require './workers/remove_repo'
-require './workers/purge_repos'
-require './workers/import'
+require_relative 'workers/install_repo'
+require_relative 'workers/update_repo'
+require_relative 'workers/update_repos'
+require_relative 'workers/remove_repo'
+require_relative 'workers/purge_repos'
+require_relative 'workers/import'
 
 require 'ronin/app/version'
 require 'sidekiq/api'

app/scanning.rb

@@ -29,11 +29,11 @@
 require 'ronin/app/helpers/html'
 
 # worker classes
-require './workers/nmap'
-require './workers/masscan'
-require './workers/spider'
-require './workers/recon'
-require './workers/vulns'
+require_relative '../workers/nmap'
+require_relative '../workers/masscan'
+require_relative '../workers/spider'
+require_relative '../workers/recon'
+require_relative '../workers/vulns'
 
 #
 # App class containing routes for scanning.

config/sidekiq.rb

@@ -2,7 +2,7 @@
 require 'sidekiq'
 require 'redis/namespace'
 
-require_relative '../lib/middleware/sidekiq/active_record_connection_pool'
+require 'middleware/sidekiq/active_record_connection_pool'
 
 redis_config = {
   url: "redis://#{ENV['REDIS_HOST']}:#{ENV['REDIS_PORT']}"

lib/ronin/app/cli.rb

@@ -21,12 +21,13 @@
 require 'ronin/core/cli/command'
 require 'ronin/core/cli/logging'
 require 'ronin/db/config_file'
-require 'ronin/app/root'
-require 'ronin/app/version'
 
 require 'command_kit/options/version'
 require 'command_kit/open_app'
 
+require_relative 'root'
+require_relative 'version'
+
 module Ronin
   module App
     #

lib/ronin/app/schemas/params_schema.rb

@@ -18,9 +18,9 @@
 # along with ronin-app.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-require 'dry-schema'
-require 'ronin/app/types'
+require_relative '../types'
 
+require 'dry-schema'
 require 'ronin/core/params/types'
 
 module Ronin

lib/ronin/app/schemas/payloads/build_schema.rb

@@ -18,9 +18,9 @@
 # along with ronin-app.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-require 'dry/schema'
+require_relative '../params_schema'
 
-require 'ronin/app/schemas/params_schema'
+require 'dry/schema'
 
 module Ronin
   module App

lib/ronin/app/schemas/payloads/encoders/encode_schema.rb

@@ -18,9 +18,9 @@
 # along with ronin-app.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-require 'dry/schema'
+require_relative '../../params_schema'
 
-require 'ronin/app/schemas/params_schema'
+require 'dry/schema'
 
 module Ronin
   module App

lib/ronin/app/types/import.rb

@@ -18,7 +18,7 @@
 # along with ronin-app.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-require 'ronin/app/types'
+require_relative '../types'
 
 module Ronin
   module App

lib/ronin/app/types/nmap.rb

@@ -18,7 +18,7 @@
 # along with ronin-app.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-require 'ronin/app/types'
+require_relative '../types'
 
 require 'nmap/command'
 

lib/ronin/app/types/spider.rb

@@ -18,7 +18,7 @@
 # along with ronin-app.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-require 'ronin/app/types'
+require_relative '../types'
 
 module Ronin
   module App

lib/ronin/app/types/vulns.rb

@@ -18,7 +18,7 @@
 # along with ronin-app.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-require 'ronin/app/types'
+require_relative '../types'
 
 module Ronin
   module App

lib/ronin/app/validations/import_params.rb

@@ -18,7 +18,7 @@
 # along with ronin-app.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-require 'ronin/app/types/import'
+require_relative '../types/import'
 
 require 'dry/validation'
 require 'set'

lib/ronin/app/validations/masscan_params.rb

@@ -18,9 +18,9 @@
 # along with ronin-app.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-require 'dry/validation'
-require 'ronin/app/types'
+require_relative '../types'
 
+require 'dry/validation'
 require 'masscan/command'
 
 module Ronin

lib/ronin/app/validations/nmap_params.rb

@@ -18,10 +18,10 @@
 # along with ronin-app.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-require 'dry/validation'
-require 'ronin/app/types'
-require 'ronin/app/types/nmap'
+require_relative '../types'
+require_relative '../types/nmap'
 
+require 'dry/validation'
 require 'nmap/command'
 
 module Ronin

lib/ronin/app/validations/recon_params.rb

@@ -18,9 +18,9 @@
 # along with ronin-app.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-require 'dry/validation'
-require 'ronin/app/types'
+require_relative '../types'
 
+require 'dry/validation'
 require 'ronin/recon/value/parser'
 
 module Ronin

lib/ronin/app/validations/spider_params.rb

@@ -18,8 +18,9 @@
 # along with ronin-app.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+require_relative '../types/spider'
+
 require 'dry/validation'
-require 'ronin/app/types/spider'
 
 module Ronin
   module App

lib/ronin/app/validations/vulns_params.rb

@@ -18,8 +18,9 @@
 # along with ronin-app.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+require_relative '../types/vulns'
+
 require 'dry/validation'
-require 'ronin/app/types/vulns'
 
 module Ronin
   module App

workers.rb

@@ -20,18 +20,18 @@
 
 $LOAD_PATH.unshift(File.join(__dir__,'lib'))
 
-require './config/sidekiq'
-require './config/database'
+require_relative 'config/sidekiq'
+require_relative 'config/database'
 
-require './workers/install_repo'
-require './workers/update_repo'
-require './workers/update_repos'
-require './workers/remove_repo'
-require './workers/purge_repos'
+require_relative 'workers/install_repo'
+require_relative 'workers/update_repo'
+require_relative 'workers/update_repos'
+require_relative 'workers/remove_repo'
+require_relative 'workers/purge_repos'
 
-require './workers/nmap'
-require './workers/masscan'
-require './workers/import'
-require './workers/spider'
-require './workers/recon'
-require './workers/vulns'
+require_relative 'workers/nmap'
+require_relative 'workers/masscan'
+require_relative 'workers/import'
+require_relative 'workers/spider'
+require_relative 'workers/recon'
+require_relative 'workers/vulns'