Prefer require_relative over path injection

config.ru

@@ -4,15 +4,10 @@
 #
 # Rackup config for the Colore app
 #
-require 'pathname'
 require "sinatra"
 
-BASE = Pathname.new(__FILE__).realpath.parent
-$: << BASE
-$: << BASE + 'lib'
-require 'config/initializers/sidekiq'
-
-require 'app'
+require_relative 'config/initializers/sidekiq'
+require_relative 'lib/app'
 
 require 'sidekiq/web'
 require 'sidekiq/cron/web'

config/initializers/sidekiq.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'pathname'
 require 'sidekiq'
-require 'config'
+
+require_relative '../../lib/config'
 
 Sidekiq.configure_server do |config|
   config.redis = Colore::C_.redis

lib/app.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
 
-require 'pathname'
 require 'haml'
 require 'net/http'
-require 'sinatra/base'
+require 'pathname'
 require 'pp'
+require 'sinatra/base'
+
 require_relative 'colore'
 
 module Colore

lib/autoheathen.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
-require 'heathen'
+require_relative 'heathen'
+
 require_relative 'autoheathen/config'
 require_relative 'autoheathen/email_processor'

lib/autoheathen/email_processor.rb

@@ -1,12 +1,11 @@
 # frozen_string_literal: true
 
+require 'filemagic/ext'
+require 'haml'
+require 'logger'
 require 'mail'
+require 'pathname'
 require 'yaml'
-require 'logger'
-require 'haml'
-require 'filemagic/ext'
-require_relative 'config'
-require 'heathen'
 
 module AutoHeathen
   class EmailProcessor

lib/config.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'erb'
+require 'pathname'
 require 'yaml'
 
 Encoding.default_internal = 'UTF-8'

lib/converter.rb

@@ -2,7 +2,8 @@
 
 require 'filemagic/ext'
 require 'mime/types'
-require 'heathen'
+
+require_relative 'heathen'
 
 module Colore
   # The Colore Converter is a glue class to allow Colore to access the Heathen conversion

lib/doc_key.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'digest/md5'
+require 'pathname'
 
 module Colore
   # This is the unique identifier for a document, a composite of

lib/document.rb

@@ -1,9 +1,11 @@
 # frozen_string_literal: true
 
+require 'filemagic/ext'
+require 'fileutils'
+require 'json'
 require 'pathname'
 require 'stringio'
-require 'json'
-require 'filemagic/ext'
+
 require_relative 'doc_key'
 
 module Colore

lib/heathen.rb

@@ -2,7 +2,6 @@
 
 require 'filemagic/ext'
 require 'pathname'
-HEATHEN_BASE = Pathname.new(__FILE__).realpath.parent + 'heathen'
 
 require_relative 'heathen/errors'
 require_relative 'heathen/filename'
@@ -11,6 +10,10 @@
 require_relative 'heathen/converter'
 require_relative 'heathen/executioner'
 require_relative 'heathen/processor'
-Dir.glob((HEATHEN_BASE + 'processor_methods' + '*.rb').to_s).each do |method|
-  require_relative method
-end
+
+require_relative 'heathen/processor_methods/convert_image'
+require_relative 'heathen/processor_methods/htmltotext'
+require_relative 'heathen/processor_methods/libreoffice'
+require_relative 'heathen/processor_methods/pdftotext'
+require_relative 'heathen/processor_methods/tesseract'
+require_relative 'heathen/processor_methods/wkhtmltopdf'

lib/heathen/processor.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
+require 'fileutils'
 require 'logger'
+require 'pathname'
 
 module Heathen
   # The Processor is the heart of the Heathen conversion process. Mixed in to it are all

lib/heathen/processor_methods/libreoffice.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'fileutils'
+
 module Heathen
   class Processor
     DEV_SHM_PATH = '/dev/shm'

lib/legacy_converter.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
 
-require 'pathname'
+require 'digest/sha2'
 require 'filemagic/ext'
 require 'mime/types'
-require 'heathen'
-require 'digest/sha2'
+require 'pathname'
+
+require_relative 'heathen'
 
 module Colore
   # The Colore Legacy Converter provides the conversion functionality from

lib/sidekiq_app.rb

@@ -1,16 +1,5 @@
 # frozen_string_literal: true
 
-#
 # Application initializer for the Colore Sidekiq process. See (BASE/run_sidekiq) for usage.
-#
-#
-require 'pathname'
-require 'sidekiq'
-
-BASE = Pathname.new(__FILE__).realpath.parent.parent
-$: << BASE # for config initializers
-$: << BASE + 'lib'
-
-require 'config/initializers/sidekiq'
-
+require_relative '../config/initializers/sidekiq'
 require_relative 'colore'

spec/helpers/storage.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'fileutils'
+require 'pathname'
 
 def tmp_storage_dir
   Pathname.new('/tmp') + "colore_test.#{Process.pid}"

spec/spec_helper.rb

@@ -16,6 +16,7 @@
 
 require 'byebug'
 require 'logger'
+require 'pathname'
 require 'rack/test'
 require 'sidekiq/testing'
 require 'simplecov'