openfact 5.7.0 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2436b1bee62f23687acd129998826dd14375cfd0db9805b6b0be6bf94d60658
-  data.tar.gz: 914cc3673def6ead78853f0b4cf0addece2313c534c15fcc9850e47a37c39e82
+  metadata.gz: e52f6542f74fd6ae174527c89973ccf46aa5542e44d9f397bc800fbc92d357bd
+  data.tar.gz: ce3214f7c6274abcff1fb2606963f551f207a2aa0a67016b01614468a685f42a
 SHA512:
-  metadata.gz: 80fbe8822e7b0f6bbdfdfb76eee4a6cee2771e7f36fd251b655e264bfcf032e76034217fa5e1477f59d973d3e7b2a9b264f2ee4fe91f402de7a6507b3d1b034c
-  data.tar.gz: 8adbeb6dad88667ec34f829b830282f3812a3b3e8b54615500b0564b3f2f2d4b911c36c3571207722ee4bc56dba73864d170eeba7cec57423e6c6bd8056e082b
+  metadata.gz: 864114f9fa9ed5f294a306aa3d7d0e10d069bc3ad3020e33d63a022c83989e4fb4bd16fae775a6ee125dcf8feb5d67b3e571ebd95c869f5bcf5390c7b3b749a0
+  data.tar.gz: af09f689814fbd7ea78a4323025522447b7edb9811a257973efaf083f45fa78f4c55945ccc8384e3fadd7e0b20786e7bf499fdc3d88a8bfa91cd1a4a1b28a9c3

data/lib/docs/generate.rb

@@ -18,11 +18,7 @@ def format_facts(fact_hash)
                            facts: fact_hash
                          })
 
-  erb = if ERB.instance_method(:initialize).parameters.assoc(:key) # Ruby 2.6+
-          ERB.new(File.read(PATH_TO_TEMPLATE), trim_mode: '-')
-        else
-          ERB.new(File.read(PATH_TO_TEMPLATE), nil, '-')
-        end
+  erb = ERB.new(File.read(PATH_TO_TEMPLATE), trim_mode: '-')
   erb.result(scope.instance_eval { binding })
 end
 

data/lib/facter/custom_facts/core/aggregate.rb

@@ -109,7 +109,7 @@ module Facter
       # @api private
       def evaluate(&block)
         if @last_evaluated
-          msg = +"Already evaluated #{@name}"
+          msg = "Already evaluated #{@name}"
           msg << " at #{@last_evaluated}" if msg.is_a? String
           msg << ', reevaluating anyways'
           log.warn msg
@@ -252,9 +252,7 @@ module Facter
           LegacyFacter::Util::Values.deep_merge(result, current)
         end
       rescue LegacyFacter::Util::Values::DeepMergeError => e
-        raise ArgumentError, 'Could not deep merge all chunks (Original error: ' \
-                         "#{e.message}), ensure that chunks return either an Array or Hash or " \
-                         'override the aggregate block', e.backtrace
+        raise ArgumentError, "Could not deep merge all chunks (Original error: #{e.message}), ensure that chunks return either an Array or Hash or override the aggregate block", e.backtrace
       end
 
       # Order chunks based on their dependencies

data/lib/facter/custom_facts/core/execution/base.rb

@@ -8,6 +8,7 @@ module Facter
       class Base
         STDERR_MESSAGE = 'Command %s completed with the following stderr message: %s'
         VALID_OPTIONS = %i[on_fail expand logger timeout].freeze
+        DEPRECATED_TIMEOUT_OPTIONS = %i[time_limit limit].freeze
         DEFAULT_EXECUTION_TIMEOUT = 300
         def initialize
           @log = Log.new(self)
@@ -19,7 +20,7 @@ module Facter
           old = {}
           values.each do |var, value|
             # save the old value if it exists
-            if (old_val = ENV[var])
+            if (old_val = ENV.fetch(var, nil))
               old[var] = old_val
             end
             # set the new (temporary) value for the environment variable
@@ -43,7 +44,7 @@ module Facter
         def execute(command, options = {})
           on_fail, expand, logger, timeout = extract_options(options)
 
-          expanded_command = if !expand && builtin_command?(command) || logger
+          expanded_command = if (!expand && builtin_command?(command)) || logger
                                command
                              else
                                expand_command(command)
@@ -115,12 +116,15 @@ module Facter
           expand = options.fetch(:expand, true)
           logger = options[:logger]
           timeout = (options[:timeout] || options[:time_limit] || options[:limit]).to_i
-          timeout = timeout.positive? ? timeout : nil
+          timeout = nil unless timeout.positive?
 
-          extra_keys = options.keys - VALID_OPTIONS
+          (options.keys & DEPRECATED_TIMEOUT_OPTIONS).each do |key|
+            @log.warnonce("#{key} is deprecated and will be removed in a future version, use timeout instead")
+          end
+
+          extra_keys = options.keys - VALID_OPTIONS - DEPRECATED_TIMEOUT_OPTIONS
           unless extra_keys.empty?
-            @log.warn("Unexpected key passed to Facter::Core::Execution.execute option: #{extra_keys.join(',')}" \
-                      " - valid keys: #{VALID_OPTIONS.join(',')}")
+            @log.warn("Unexpected key passed to Facter::Core::Execution.execute option: #{extra_keys.join(',')} - valid keys: #{VALID_OPTIONS.join(',')}")
           end
 
           [on_fail, expand, logger, timeout]

data/lib/facter/custom_facts/core/execution/posix.rb

@@ -4,7 +4,7 @@ module Facter
   module Core
     module Execution
       class Posix < Facter::Core::Execution::Base
-        DEFAULT_SEARCH_PATHS = ['/sbin', '/usr/sbin'].freeze
+        DEFAULT_SEARCH_PATHS = ['/sbin', '/usr/sbin', '/opt/puppetlabs/bin'].freeze
 
         def search_paths
           # Make sure custom_facts is usable even for non-root users. Most commands
@@ -25,14 +25,14 @@ module Facter
           nil
         end
 
-        ABSOLUTE_PATH_REGEX = %r{^/}.freeze
+        ABSOLUTE_PATH_REGEX = %r{^/}
 
         def absolute_path?(path)
           !!(path =~ ABSOLUTE_PATH_REGEX)
         end
 
-        DOUBLE_QUOTED_COMMAND = /\A"(.+?)"(?:\s+(.*))?/.freeze
-        SINGLE_QUOTED_COMMAND = /\A'(.+?)'(?:\s+(.*))?/.freeze
+        DOUBLE_QUOTED_COMMAND = /\A"(.+?)"(?:\s+(.*))?/
+        SINGLE_QUOTED_COMMAND = /\A'(.+?)'(?:\s+(.*))?/
 
         def expand_command(command)
           exe = nil
@@ -48,7 +48,7 @@ module Facter
           return unless exe && (expanded = which(exe))
 
           expanded = expanded.dup
-          expanded = +"'#{expanded}'" if /\s/.match?(expanded)
+          expanded = "'#{expanded}'" if /\s/.match?(expanded)
           expanded << " #{args}" if args
 
           expanded

data/lib/facter/custom_facts/core/execution/windows.rb

@@ -22,7 +22,7 @@ module Facter
               dest = File.join(dir, bin)
               dest.gsub!(File::SEPARATOR, File::ALT_SEPARATOR)
               if File.extname(dest).empty?
-                exts = ENV['PATHEXT']
+                exts = ENV['PATHEXT'] # rubocop:disable Style/FetchEnvVar
                 exts = exts ? exts.split(File::PATH_SEPARATOR) : DEFAULT_COMMAND_EXTENSIONS
                 exts.each do |ext|
                   destext = dest + ext
@@ -38,13 +38,13 @@ module Facter
         slash = '[\\\\/]'
         name = '[^\\\\/]+'
         ABSOLUTE_PATH_REGEX =
-          /^(([A-Z]:#{slash})|(#{slash}#{slash}#{name}#{slash}#{name})|(#{slash}#{slash}\?#{slash}#{name}))/i.freeze
+          /^(([A-Z]:#{slash})|(#{slash}#{slash}#{name}#{slash}#{name})|(#{slash}#{slash}\?#{slash}#{name}))/i
 
         def absolute_path?(path)
           !!(path =~ ABSOLUTE_PATH_REGEX)
         end
 
-        DOUBLE_QUOTED_COMMAND = /\A"(.+?)"(?:\s+(.*))?/.freeze
+        DOUBLE_QUOTED_COMMAND = /\A"(.+?)"(?:\s+(.*))?/
 
         def expand_command(command)
           exe = nil
@@ -59,7 +59,7 @@ module Facter
           return unless exe && (expanded = which(exe))
 
           expanded = expanded.dup
-          expanded = +"\"#{expanded}\"" if /\s+/.match?(expanded)
+          expanded = "\"#{expanded}\"" if /\s+/.match?(expanded)
           expanded << " #{args}" if args
 
           expanded
@@ -69,7 +69,7 @@ module Facter
           expand = options.fetch(:expand, true)
           raise ArgumentError.new, 'Unsupported argument on Windows expand with value false' unless expand
 
-          super(command, options)
+          super
         end
       end
     end

data/lib/facter/custom_facts/core/execution.rb

@@ -94,9 +94,11 @@ module Facter
       # @return [String/nil] Output of the program, or nil if the command does
       #   not exist or could not be executed.
       #
-      # @deprecated Use #{execute} instead
+      # @deprecated Use {execute} instead
       # @api public
       def exec(command)
+        Facter.warnonce('Facter::Core::Execution.exec is deprecated and will be removed in a future major version. ' \
+                        'Use Facter::Core::Execution.execute instead.')
         @@impl.execute(command, on_fail: nil)
       end
 

data/lib/facter/custom_facts/core/resolvable.rb

@@ -20,11 +20,9 @@ module LegacyFacter
       # Return the timeout period for resolving a value.
       # (see #timeout)
       # @return [Numeric]
-      # @comment requiring 'timeout' stdlib class causes Object#timeout to be
-      #   defined which delegates to Timeout.timeout. This method may potentially
-      #   overwrite the #timeout attr_reader on this class, so we define #limit to
-      #   avoid conflicts.
+      # @deprecated Use timeout instead.
       def limit
+        Facter::Log.new(self).warnonce('limit is deprecated and will be removed in a future version, use timeout instead')
         @timeout || 0
       end
 
@@ -74,14 +72,14 @@ module LegacyFacter
         result = nil
 
         with_timing do
-          Timeout.timeout(limit) do
+          Timeout.timeout(@timeout || 0) do
             result = resolve_value
           end
         end
 
         LegacyFacter::Util::Normalization.normalize(result)
       rescue Timeout::Error => e
-        Facter.log_exception(e, "Timed out after #{limit} seconds while resolving #{qualified_name}")
+        Facter.log_exception(e, "Timed out after #{@timeout || 0} seconds while resolving #{qualified_name}")
 
         nil
       rescue LegacyFacter::Util::Normalization::NormalizationError => e

data/lib/facter/custom_facts/util/collection.rb

@@ -162,8 +162,6 @@ module LegacyFacter
         if fact.nil?
           fact = Facter::Util::Fact.new(name, options)
           @facts[name] = fact
-        else
-          fact.extract_ldapname_option!(options)
         end
 
         fact

data/lib/facter/custom_facts/util/config.rb

@@ -25,7 +25,7 @@ module LegacyFacter
       end
 
       def self.windows_data_dir
-        ENV['ProgramData'] || ENV['APPDATA'] if LegacyFacter::Util::Config.windows?
+        ENV['ProgramData'] || ENV.fetch('APPDATA', nil) if LegacyFacter::Util::Config.windows?
       end
 
       def self.external_facts_dirs

data/lib/facter/custom_facts/util/directory_loader.rb

@@ -64,8 +64,7 @@ module LegacyFacter
           next if file_blocked?(basename)
 
           if facts.find { |f| f.name == basename } && cm.fact_cache_enabled?(basename)
-            Facter.log_exception(Exception.new("Caching is enabled for group \"#{basename}\" while "\
-              'there are at least two external facts files with the same filename'))
+            Facter.log_exception(Exception.new("Caching is enabled for group \"#{basename}\" while there are at least two external facts files with the same filename"))
           else
             searched_fact = Facter::SearchedFact.new(basename, nil, nil, :file)
             searched_fact.file = file
@@ -93,10 +92,7 @@ module LegacyFacter
           if data == false
             log.warn "Could not interpret fact file #{fact.file}"
           elsif (data == {}) || data.nil?
-            log.debug(
-              "Structured data fact file #{fact.file} was parsed but was either empty or an invalid filetype "\
-                '(valid filetypes are .yaml, .json, and .txt).'
-            )
+            log.debug("Structured data fact file #{fact.file} was parsed but was either empty or an invalid filetype (valid filetypes are .yaml, .json, and .txt).")
           elsif !data.is_a?(Hash)
             log.error("Structured data fact file #{fact.file} was parsed but no key=>value data was returned.")
           else

data/lib/facter/custom_facts/util/fact.rb

@@ -17,10 +17,6 @@ module Facter
       # @return [String]
       attr_reader :name
 
-      # @return [String]
-      # @deprecated
-      attr_accessor :ldapname
-
       # Fact options e.g. fact_type
       attr_accessor :options
 
@@ -31,16 +27,12 @@ module Facter
       # for the public API for creating facts.
       # @param name [String] the fact name
       # @param options [Hash] optional parameters
-      # @option options [String] :ldapname set the ldapname property on the fact
       #
       # @api private
       def initialize(name, options = {})
         @name = LegacyFacter::Util::Normalization.normalize(name.to_s.downcase).intern
 
         @options = options.dup
-        extract_ldapname_option!(options)
-
-        @ldapname ||= @name.to_s
 
         @resolves = []
         @searching = false
@@ -142,15 +134,6 @@ module Facter
         @value
       end
 
-      # @api private
-      # @deprecated
-      def extract_ldapname_option!(options)
-        return unless options[:ldapname]
-
-        log.warnonce('ldapname is deprecated and will be removed in a future version')
-        self.ldapname = options.delete(:ldapname)
-      end
-
       private
 
       def log
@@ -244,8 +227,7 @@ module Facter
 
         if resolve
           if resolution_type != resolve.resolution_type
-            raise ArgumentError, "Cannot return resolution #{resolution_name} with type" \
-                                 " #{resolution_type}; already defined as #{resolve.resolution_type}"
+            raise ArgumentError, "Cannot return resolution #{resolution_name} with type #{resolution_type}; already defined as #{resolve.resolution_type}"
           end
         else
           case resolution_type
@@ -254,8 +236,7 @@ module Facter
           when :aggregate
             resolve = Facter::Core::Aggregate.new(resolution_name, self)
           else
-            raise ArgumentError,
-                  "Expected resolution type to be one of (:simple, :aggregate) but was #{resolution_type}"
+            raise ArgumentError, "Expected resolution type to be one of (:simple, :aggregate) but was #{resolution_type}"
           end
 
           @resolves << resolve

data/lib/facter/custom_facts/util/parser.rb

@@ -111,7 +111,7 @@ module LegacyFacter
       # https://github.com/ruby/psych/blob/d2deaa9adfc88fc0b870df022a434d6431277d08/lib/psych/scalar_scanner.rb#L9
       # It is used to detect Time in YAML, but we use it to wrap time objects in quotes to be treated as strings.
       TIME =
-        /(\d{4}-\d{1,2}-\d{1,2}(?:[Tt]|\s+)\d{1,2}:\d\d:\d\d(?:\.\d*)?(?:\s*(?:Z|[-+]\d{1,2}:?(?:\d\d)?))?\s*$)/.freeze
+        /(\d{4}-\d{1,2}-\d{1,2}(?:[Tt]|\s+)\d{1,2}:\d\d:\d\d(?:\.\d*)?(?:\s*(?:Z|[-+]\d{1,2}:?(?:\d\d)?))?\s*$)/
 
       class YamlParser < Base
         def parse_results
@@ -189,10 +189,10 @@ module LegacyFacter
         # Returns a hash of facts from powershell output
         def parse_results
           powershell =
-            if File.readable?("#{ENV['SYSTEMROOT']}\\sysnative\\WindowsPowershell\\v1.0\\powershell.exe")
-              "#{ENV['SYSTEMROOT']}\\sysnative\\WindowsPowershell\\v1.0\\powershell.exe"
-            elsif File.readable?("#{ENV['SYSTEMROOT']}\\system32\\WindowsPowershell\\v1.0\\powershell.exe")
-              "#{ENV['SYSTEMROOT']}\\system32\\WindowsPowershell\\v1.0\\powershell.exe"
+            if File.readable?("#{ENV.fetch('SYSTEMROOT', nil)}\\sysnative\\WindowsPowershell\\v1.0\\powershell.exe")
+              "#{ENV.fetch('SYSTEMROOT', nil)}\\sysnative\\WindowsPowershell\\v1.0\\powershell.exe"
+            elsif File.readable?("#{ENV.fetch('SYSTEMROOT', nil)}\\system32\\WindowsPowershell\\v1.0\\powershell.exe")
+              "#{ENV.fetch('SYSTEMROOT', nil)}\\system32\\WindowsPowershell\\v1.0\\powershell.exe"
             else
               'powershell.exe'
             end

data/lib/facter/custom_facts/util/resolution.rb

@@ -23,14 +23,21 @@ module Facter
       extend Facter::Core::Execution
 
       class << self
-        # Expose command execution methods that were extracted into
-        # Facter::Core::Execution from Facter::Util::Resolution in Facter 2.0.0 for
-        # compatibility.
-        #
-        # @deprecated
-        #
+        # @deprecated Use Facter::Core::Execution.which instead
         # @api public
-        public :which, :exec
+        def which(bin)
+          Facter.warnonce('Facter::Util::Resolution.which is deprecated and will be removed in a future major version. ' \
+                          'Use Facter::Core::Execution.which instead.')
+          Facter::Core::Execution.which(bin)
+        end
+
+        # @deprecated Use Facter::Core::Execution.execute instead
+        # @api public
+        def exec(command)
+          Facter.warnonce('Facter::Util::Resolution.exec is deprecated and will be removed in a future major version. ' \
+                          'Use Facter::Core::Execution.execute instead.')
+          Facter::Core::Execution.execute(command, on_fail: nil)
+        end
 
         # @api private
         public :with_env
@@ -90,7 +97,7 @@ module Facter
       # @api private
       def evaluate(&block)
         if @last_evaluated
-          msg = +"Already evaluated #{@name}"
+          msg = "Already evaluated #{@name}"
           msg << " at #{@last_evaluated}" if msg.is_a? String
           msg << ', reevaluating anyways'
           log.warn msg

data/lib/facter/facts/aix/networking/interfaces.rb

@@ -8,7 +8,7 @@ module Facts
 
         def call_the_resolver
           fact_value = Facter::Resolvers::Aix::Networking.resolve(:interfaces)
-          fact_value = fact_value&.any? ? fact_value : nil
+          fact_value = nil unless fact_value&.any?
 
           Facter::ResolvedFact.new(FACT_NAME, fact_value)
         end

data/lib/facter/facts/freebsd/ec2_metadata.rb

@@ -10,7 +10,7 @@ module Facts
 
         fact_value = Facter::Resolvers::Ec2.resolve(:metadata)
 
-        Facter::ResolvedFact.new(FACT_NAME, fact_value&.empty? ? nil : fact_value)
+        Facter::ResolvedFact.new(FACT_NAME, fact_value && fact_value.empty? ? nil : fact_value)
       end
 
       private

data/lib/facter/facts/freebsd/ec2_userdata.rb

@@ -10,7 +10,7 @@ module Facts
 
         fact_value = Facter::Resolvers::Ec2.resolve(:userdata)
 
-        Facter::ResolvedFact.new(FACT_NAME, fact_value&.empty? ? nil : fact_value)
+        Facter::ResolvedFact.new(FACT_NAME, fact_value && fact_value.empty? ? nil : fact_value)
       end
 
       private

data/lib/facter/facts/linux/az_metadata.rb

@@ -10,7 +10,7 @@ module Facts
 
         fact_value = Facter::Resolvers::Az.resolve(:metadata)
 
-        Facter::ResolvedFact.new(FACT_NAME, fact_value&.empty? ? nil : fact_value)
+        Facter::ResolvedFact.new(FACT_NAME, fact_value && fact_value.empty? ? nil : fact_value)
       end
 
       private

data/lib/facter/facts/linux/dhcp_servers.rb

@@ -8,7 +8,7 @@ module Facts
 
       def call_the_resolver
         fact_value = construct_addresses_hash
-        fact_value = !fact_value || fact_value.empty? ? nil : fact_value
+        fact_value = nil if !fact_value || fact_value.empty?
         Facter::ResolvedFact.new(FACT_NAME, fact_value, :legacy)
       end
 

data/lib/facter/facts/linux/ec2_metadata.rb

@@ -10,7 +10,7 @@ module Facts
 
         fact_value = Facter::Resolvers::Ec2.resolve(:metadata)
 
-        Facter::ResolvedFact.new(FACT_NAME, fact_value&.empty? ? nil : fact_value)
+        Facter::ResolvedFact.new(FACT_NAME, fact_value && fact_value.empty? ? nil : fact_value)
       end
 
       private

data/lib/facter/facts/linux/ec2_userdata.rb

@@ -10,7 +10,7 @@ module Facts
 
         fact_value = Facter::Resolvers::Ec2.resolve(:userdata)
 
-        Facter::ResolvedFact.new(FACT_NAME, fact_value&.empty? ? nil : fact_value)
+        Facter::ResolvedFact.new(FACT_NAME, fact_value && fact_value.empty? ? nil : fact_value)
       end
 
       private

data/lib/facter/facts/macosx/dhcp_servers.rb

@@ -8,7 +8,7 @@ module Facts
 
       def call_the_resolver
         fact_value = construct_addresses_hash
-        fact_value = !fact_value || fact_value.empty? ? nil : fact_value
+        fact_value = nil if !fact_value || fact_value.empty?
         Facter::ResolvedFact.new(FACT_NAME, fact_value, :legacy)
       end
 

data/lib/facter/facts/openbsd/ec2_metadata.rb

@@ -10,7 +10,7 @@ module Facts
 
         fact_value = Facter::Resolvers::Ec2.resolve(:metadata)
 
-        Facter::ResolvedFact.new(FACT_NAME, fact_value&.empty? ? nil : fact_value)
+        Facter::ResolvedFact.new(FACT_NAME, fact_value && fact_value.empty? ? nil : fact_value)
       end
 
       private

data/lib/facter/facts/openbsd/ec2_userdata.rb

@@ -10,7 +10,7 @@ module Facts
 
         fact_value = Facter::Resolvers::Ec2.resolve(:userdata)
 
-        Facter::ResolvedFact.new(FACT_NAME, fact_value&.empty? ? nil : fact_value)
+        Facter::ResolvedFact.new(FACT_NAME, fact_value && fact_value.empty? ? nil : fact_value)
       end
 
       private

data/lib/facter/facts/solaris/dhcp_servers.rb

@@ -8,7 +8,7 @@ module Facts
 
       def call_the_resolver
         fact_value = construct_addresses_hash
-        fact_value = !fact_value || fact_value.empty? ? nil : fact_value
+        fact_value = nil if !fact_value || fact_value.empty?
         Facter::ResolvedFact.new(FACT_NAME, fact_value, :legacy)
       end
 

data/lib/facter/facts/windows/az_metadata.rb

@@ -10,7 +10,7 @@ module Facts
 
         fact_value = Facter::Resolvers::Az.resolve(:metadata)
 
-        Facter::ResolvedFact.new(FACT_NAME, fact_value&.empty? ? nil : fact_value)
+        Facter::ResolvedFact.new(FACT_NAME, fact_value && fact_value.empty? ? nil : fact_value)
       end
 
       private

data/lib/facter/facts/windows/dhcp_servers.rb

@@ -8,7 +8,7 @@ module Facts
 
       def call_the_resolver
         fact_value = construct_addresses_hash
-        fact_value = !fact_value || fact_value.empty? ? nil : fact_value
+        fact_value = nil if !fact_value || fact_value.empty?
         Facter::ResolvedFact.new(FACT_NAME, fact_value, :legacy)
       end
 

data/lib/facter/facts/windows/ec2_metadata.rb

@@ -10,7 +10,7 @@ module Facts
 
         fact_value = Facter::Resolvers::Ec2.resolve(:metadata)
 
-        Facter::ResolvedFact.new(FACT_NAME, fact_value&.empty? ? nil : fact_value)
+        Facter::ResolvedFact.new(FACT_NAME, fact_value && fact_value.empty? ? nil : fact_value)
       end
 
       private

data/lib/facter/facts/windows/ec2_userdata.rb

@@ -10,7 +10,7 @@ module Facts
 
         fact_value = Facter::Resolvers::Ec2.resolve(:userdata)
 
-        Facter::ResolvedFact.new(FACT_NAME, fact_value&.empty? ? nil : fact_value)
+        Facter::ResolvedFact.new(FACT_NAME, fact_value && fact_value.empty? ? nil : fact_value)
       end
 
       private

data/lib/facter/framework/cli/cli.rb

@@ -113,7 +113,7 @@ module Facter
       negate_options = %w[block cache custom_facts external_facts]
 
       template = File.join(File.dirname(__FILE__), '..', '..', 'templates', 'man.erb')
-      erb = ERB.new(File.read(template), nil, '-')
+      erb = ERB.new(File.read(template), trim_mode: '-')
       erb.filename = template
       puts erb.result(binding)
     end
@@ -201,11 +201,11 @@ module Facter
         Cli.commands.values
            .select { |command_class| command_class.instance_of?(Thor::Command) }
            .each do |command|
-             help_command_options << build_option(
-               command['name'],
-               [command['usage'].split(',')[1]],
-               command['description']
-             )
+          help_command_options << build_option(
+            command['name'],
+            [command['usage'].split(',')[1]],
+            command['description']
+          )
         end
 
         help_command_options

data/lib/facter/framework/core/cache_manager.rb

@@ -77,8 +77,7 @@ module Facter
 
     def external_fact_in_custom_group?(searched_fact, fact_name, fact)
       if searched_fact.type == :file && fact[:group] != fact_name
-        @log.error("Cannot cache '#{fact_name}' fact from '#{fact[:group]}' group. "\
-                    'Caching custom group is not supported for external facts.')
+        @log.error("Cannot cache '#{fact_name}' fact from '#{fact[:group]}' group. Caching custom group is not supported for external facts.")
         return true
       end
 
@@ -121,8 +120,7 @@ cache_format_version is incorrect!")
       else
         return unless data[searched_fact.name]
 
-        [Facter::ResolvedFact.new(searched_fact.name, data[searched_fact.name], searched_fact.type,
-                                  searched_fact.user_query)]
+        [Facter::ResolvedFact.new(searched_fact.name, data[searched_fact.name], searched_fact.type, searched_fact.user_query)]
       end
     end
 
@@ -131,8 +129,7 @@ cache_format_version is incorrect!")
       data.each do |fact_name, fact_value|
         next if fact_name == 'cache_format_version'
 
-        fact = Facter::ResolvedFact.new(fact_name, fact_value, searched_fact.type,
-                                        searched_fact.user_query)
+        fact = Facter::ResolvedFact.new(fact_name, fact_value, searched_fact.type, searched_fact.user_query)
         fact.file = searched_fact.file
         facts << fact
       end

data/lib/facter/framework/core/options/option_store.rb

@@ -162,7 +162,7 @@ module Facter
       end
 
       def set(key, value)
-        send("#{key}=".to_sym, value)
+        send(:"#{key}=", value)
       end
 
       def reset

data/lib/facter/framework/core/options.rb

@@ -16,7 +16,7 @@ module Facter
       end
 
       def []=(key, value)
-        OptionStore.send("#{key}=".to_sym, value)
+        OptionStore.send(:"#{key}=", value)
       end
 
       def custom_dir?

data/lib/facter/framework/formatters/legacy_fact_formatter.rb

@@ -69,7 +69,7 @@ module Facter
       pretty_json.gsub!(/"(.*)"\ =>/, '\1 =>')
 
       @log.debug('Remove double backslashes from paths')
-      pretty_json.gsub(/\\\\/, '\\')
+      pretty_json.gsub('\\\\', '\\')
     end
 
     def remove_enclosing_accolades(pretty_fact_json)

data/lib/facter/models/fact_collection.rb

@@ -79,9 +79,7 @@ module Facter
       split_fact_name = extract_fact_name(fact)
       bury(*split_fact_name << fact.value)
     rescue NoMethodError
-      @log.error("#{fact.type.to_s.capitalize} fact `#{fact.name}` cannot be added to collection."\
-          ' The format of this fact is incompatible with other'\
-          " facts that belong to `#{fact.name.split('.').first}` group")
+      @log.error("#{fact.type.to_s.capitalize} fact `#{fact.name}` cannot be added to collection. The format of this fact is incompatible with other facts that belong to `#{fact.name.split('.').first}` group")
     end
 
     def extract_fact_name(fact)