Merge pull request #2551 from joshcooper/require_relative_3184

(FACT-3184) Prefer require_relative

Author: mhashizume

lib/docs/generate_cli.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'facter/framework/cli/cli_launcher'
+require_relative '../facter/framework/cli/cli_launcher'
 
 cli = Facter::Cli.new([])
 

lib/facter.rb

@@ -3,9 +3,9 @@
 require 'pathname'
 require_relative 'util/api_debugger' if ENV['API_DEBUG']
 
-require 'facter/version'
-require 'facter/framework/core/file_loader'
-require 'facter/framework/core/options/options_validator'
+require_relative 'facter/version'
+require_relative 'facter/framework/core/file_loader'
+require_relative 'facter/framework/core/options/options_validator'
 
 module Facter
   class ResolveCustomFactError < StandardError; end
@@ -22,7 +22,7 @@ class << self
     #
     # @api private
     def resolve(args_as_string)
-      require 'facter/framework/cli/cli_launcher'
+      require_relative 'facter/framework/cli/cli_launcher'
 
       args = args_as_string.split(' ')
       Facter::OptionsValidator.validate(args)

lib/facter/custom_facts/core/file_loader.rb

@@ -1,28 +1,27 @@
 # frozen_string_literal: true
 
-require 'facter/custom_facts/core/legacy_facter'
-require 'facter/custom_facts/util/fact'
-require 'facter/custom_facts/util/collection'
-require 'facter/custom_facts/util/fact'
-require 'facter/custom_facts/util/loader'
-require 'facter/custom_facts/core/execution/base'
-require 'facter/custom_facts/core/execution/windows'
-require 'facter/custom_facts/core/execution/posix'
-require 'facter/custom_facts/util/values'
-require 'facter/custom_facts/util/confine'
+require_relative '../../../facter/custom_facts/util/fact'
+require_relative '../../../facter/custom_facts/util/collection'
+require_relative '../../../facter/custom_facts/util/fact'
+require_relative '../../../facter/custom_facts/util/loader'
+require_relative '../../../facter/custom_facts/core/execution/base'
+require_relative '../../../facter/custom_facts/core/execution/windows'
+require_relative '../../../facter/custom_facts/core/execution/posix'
+require_relative '../../../facter/custom_facts/util/values'
+require_relative '../../../facter/custom_facts/util/confine'
 
-require 'facter/custom_facts/util/config'
+require_relative '../../../facter/custom_facts/util/config'
 
-require 'facter/custom_facts/util/normalization'
-require 'facter/custom_facts/core/execution'
-require 'facter/custom_facts/core/resolvable'
-require 'facter/custom_facts/core/suitable'
-require 'facter/custom_facts/util/resolution'
-require 'facter/custom_facts/core/directed_graph'
-require 'facter/custom_facts/core/resolvable'
-require 'facter/custom_facts/core/aggregate'
-require 'facter/custom_facts/util/composite_loader'
-require 'facter/custom_facts/util/parser'
-require 'facter/custom_facts/util/directory_loader'
-require 'facter/custom_facts/util/nothing_loader'
-require 'facter/custom_facts/util/nothing_loader'
+require_relative '../../../facter/custom_facts/util/normalization'
+require_relative '../../../facter/custom_facts/core/execution'
+require_relative '../../../facter/custom_facts/core/resolvable'
+require_relative '../../../facter/custom_facts/core/suitable'
+require_relative '../../../facter/custom_facts/util/resolution'
+require_relative '../../../facter/custom_facts/core/directed_graph'
+require_relative '../../../facter/custom_facts/core/resolvable'
+require_relative '../../../facter/custom_facts/core/aggregate'
+require_relative '../../../facter/custom_facts/util/composite_loader'
+require_relative '../../../facter/custom_facts/util/parser'
+require_relative '../../../facter/custom_facts/util/directory_loader'
+require_relative '../../../facter/custom_facts/util/nothing_loader'
+require_relative '../../../facter/custom_facts/util/nothing_loader'

lib/facter/custom_facts/core/legacy_facter.rb

@@ -18,7 +18,7 @@
 
 require 'pathname'
 
-require 'facter/custom_facts/core/file_loader'
+require_relative '../../../facter/custom_facts/core/file_loader'
 
 # Functions as a hash of 'facts' about your system system, such as MAC
 # address, IP address, architecture, etc.

lib/facter/custom_facts/util/windows_root.rb

@@ -4,7 +4,7 @@ module LegacyFacter
   module Util
     module Root
       def self.root?
-        require 'facter/resolvers/windows/ffi/identity_ffi'
+        require_relative '../../../facter/resolvers/windows/ffi/identity_ffi'
         IdentityFFI.privileged?
       end
     end

lib/facter/framework/cli/cli_launcher.rb

@@ -1,10 +1,10 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require 'facter/framework/logging/logger.rb'
+require_relative '../../../facter/framework/logging/logger.rb'
 Facter::Log.output(STDERR)
-require 'facter'
-require 'facter/framework/cli/cli'
+require_relative '../../../facter'
+require_relative '../../../facter/framework/cli/cli'
 
 class CliLauncher
   class << self

lib/facter/framework/config/fact_groups.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'facter/config'
+require_relative '../../../facter/config'
 
 module Facter
   class FactGroups