facter 4.0.39 → 4.0.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1cc7c2dc4026c1c24f4140c319b3ac68c5b77dd1b42e61c46f07facff044380
-  data.tar.gz: 3565addd16973284508cfc3058aab779dcf3bb30d4c65257fc9831cee898a380
+  metadata.gz: 64bb37710d33d522370161fab93516fed5961615ff3fc44609ee6700318efda4
+  data.tar.gz: 47e222b78a6a4ce13ee4d0fc91cbcca942b4b3c9357e35debbc2ea61d401867c
 SHA512:
-  metadata.gz: ca715b689b8b050d20021ed104770a75737fed542236826592068d01066adfc369b222dbf94f2d1eb867c5b3d2023689f8ebd458f690f3f969e98c1c39375ddb
-  data.tar.gz: cf6be422f902d75dcbf6fb6d147c3c95f718ab2129a18756b0ffe0626f3cfb3fd4f652a8c9f3278801826a7e15e35e9574cf11e22780593f79db315c6aa3b87b
+  metadata.gz: 4bb85c358a104d83fde58ad5ce0733736f5e2295324d1041e79d24c5c08cf284f2eb32c30b9024a5f216713b8a12a92a01249aab0346aec016ebeecc1c77d82f
+  data.tar.gz: 2f079a4fc5788d5e4c5698d0b5ad31cfc7affa352b19d636c077faa3125e342ba14e4d1c3d53a1684112cd9a76c27365fe9f2f9713502ea52b8d4ceffd56eee7

data/bin/facter

@@ -4,8 +4,7 @@
 require 'pathname'
 require 'facter/framework/cli/cli_launcher.rb'
 
-cli_launcher = CliLauncher.new(ARGV)
+Facter::OptionsValidator.validate(ARGV)
+processed_arguments = CliLauncher.prepare_arguments(ARGV)
 
-cli_launcher.validate_options
-cli_launcher.prepare_arguments
-cli_launcher.start
+CliLauncher.start(processed_arguments)

data/lib/facter.rb

@@ -17,6 +17,27 @@ module Facter
   @warn_once = []
 
   class << self
+    def resolve(args_as_string)
+      require 'facter/framework/cli/cli_launcher'
+
+      args = args_as_string.split(' ')
+
+      Facter::OptionsValidator.validate(args)
+      processed_arguments = CliLauncher.prepare_arguments(args, nil)
+
+      cli = Facter::Cli.new([], processed_arguments)
+
+      if cli.args.include?(:version)
+        cli.invoke(:version, [])
+      elsif cli.args.include?('--list-cache-groups')
+        cli.invoke(:list_cache_groups, [])
+      elsif cli.args.include?('--list-block-groups')
+        cli.invoke(:list_block_groups, [])
+      else
+        cli.invoke(:arg_parser)
+      end
+    end
+
     def clear_messages
       logger.debug('clear_messages is not implemented')
     end
@@ -284,6 +305,18 @@ module Facter
       @already_searched[user_query]&.value
     end
 
+    def values(options, user_queries)
+      init_cli_options(options, user_queries)
+      resolved_facts = Facter::FactManager.instance.resolve_facts(user_queries)
+      Facter::SessionCache.invalidate_all_caches
+
+      if user_queries.count.zero?
+        Facter::FactCollection.new.build_fact_collection!(resolved_facts)
+      else
+        FormatterHelper.retrieve_facts_to_display_for_user_query(user_queries, resolved_facts)
+      end
+    end
+
     # Returns Facter version
     #
     # @return [String] Current version
@@ -311,19 +344,13 @@ module Facter
       [fact_formatter.format(resolved_facts), status || 0]
     end
 
-    def log_exception(exception, message = :default)
-      arr = []
-      if message == :default
-        arr << exception.message
-      elsif message
-        arr << message
-      end
-      if Options[:trace]
-        arr << 'backtrace:'
-        arr.concat(exception.backtrace)
-      end
+    def log_exception(exception, message = nil)
+      error_message = []
+
+      error_message << message.to_s unless message.nil? || (message.is_a?(String) && message.empty?)
 
-      logger.error(arr.flatten.join("\n"))
+      parse_exception(exception, error_message)
+      logger.error(error_message.flatten.join("\n"))
     end
 
     # Returns a list with the names of all solved facts
@@ -365,6 +392,19 @@ module Facter
 
     private
 
+    def parse_exception(exception, error_message)
+      if exception.is_a?(Exception)
+        error_message << exception.message if error_message.empty?
+
+        if Options[:trace] && !exception.backtrace.nil?
+          error_message << 'backtrace:'
+          error_message.concat(exception.backtrace)
+        end
+      elsif error_message.empty?
+        error_message << exception.to_s
+      end
+    end
+
     def logger
       @logger ||= Log.new(self)
     end

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

@@ -59,7 +59,7 @@ module LegacyFacter
           basename = File.basename(file)
           next if file_blocked?(basename)
 
-          if facts.find { |f| f.name == basename } && cm.group_cached?(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'))
           else

data/lib/facter/facts/aix/disks.rb

@@ -24,7 +24,7 @@ module Facts
 
       def add_legacy_facts(disks, facts)
         disks.each do |disk_name, disk_info|
-          facts.push(Facter::ResolvedFact.new("blockdevice_#{disk_name}_size", disk_info[:size_bytes].to_s, :legacy))
+          facts.push(Facter::ResolvedFact.new("blockdevice_#{disk_name}_size", disk_info[:size_bytes], :legacy))
         end
       end
     end

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

@@ -35,7 +35,8 @@ module Facts
         product_name = Facter::Resolvers::Linux::DmiBios.resolve(:product_name)
         return unless product_name
 
-        Facter::FactsUtils::HYPERVISORS_HASH.each { |key, value| return value if product_name.include?(key) }
+        _, value = Facter::FactsUtils::HYPERVISORS_HASH.find { |key, _value| product_name.include?(key) }
+        value
       end
 
       def check_bios_vendor

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

@@ -33,7 +33,8 @@ module Facts
         product_name = Facter::Resolvers::Linux::DmiBios.resolve(:product_name)
         return unless product_name
 
-        Facter::FactsUtils::HYPERVISORS_HASH.each { |key, value| return value if product_name.include?(key) }
+        _, value = Facter::FactsUtils::HYPERVISORS_HASH.find { |key, _value| product_name.include?(key) }
+        value
       end
 
       def check_bios_vendor

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

@@ -24,7 +24,7 @@ module Facts
 
       def add_legacy_facts(disks, facts)
         disks.each do |disk_name, disk_info|
-          facts.push(Facter::ResolvedFact.new("blockdevice_#{disk_name}_size", disk_info[:size_bytes].to_s, :legacy))
+          facts.push(Facter::ResolvedFact.new("blockdevice_#{disk_name}_size", disk_info[:size_bytes], :legacy))
           facts.push(Facter::ResolvedFact.new("blockdevice_#{disk_name}_vendor", disk_info[:vendor], :legacy))
         end
       end

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

@@ -1,14 +1,18 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
+require 'thor'
+
 module Facter
   class Cli < Thor
-    check_unknown_options!
-
     class_option :color,
                  type: :boolean,
                  desc: 'Enable color output.'
 
+    class_option :no_color,
+                 type: :boolean,
+                 desc: 'Disable color output.'
+
     class_option :config,
                  aliases: '-c',
                  type: :string,
@@ -29,17 +33,6 @@ module Facter
                  repeatable: true,
                  desc: 'A directory to use for external facts.'
 
-    class_option :help,
-                 hide: true,
-                 aliases: '-h',
-                 type: :boolean,
-                 desc: 'Print this help message.'
-
-    class_option :man,
-                 hide: true,
-                 type: :boolean,
-                 desc: 'Display manual.'
-
     class_option :hocon,
                  type: :boolean,
                  desc: 'Output in Hocon format.'
@@ -49,36 +42,28 @@ module Facter
                  type: :boolean,
                  desc: 'Output in JSON format.'
 
-    class_option :list_block_groups,
-                 type: :boolean,
-                 desc: 'List the names of all blockable fact groups.'
-
-    class_option :list_cache_groups,
-                 type: :boolean,
-                 desc: 'List the names of all cacheable fact groups.'
-
     class_option :log_level,
                  aliases: '-l',
                  type: :string,
                  desc: 'Set logging level. Supported levels are: none, trace, debug, info, warn, error, and fatal.'
 
-    class_option :block,
+    class_option :no_block,
                  type: :boolean,
                  desc: 'Disable fact blocking.'
 
-    class_option :cache,
+    class_option :no_cache,
                  type: :boolean,
                  desc: 'Disable loading and refreshing facts from the cache'
 
-    class_option :custom_facts,
+    class_option :no_custom_facts,
                  type: :boolean,
                  desc: 'Disable custom facts.'
 
-    class_option :external_facts,
+    class_option :no_external_facts,
                  type: :boolean,
                  desc: 'Disable external facts.'
 
-    class_option :ruby,
+    class_option :no_ruby,
                  type: :boolean,
                  desc: 'Disable loading Ruby, facts requiring Ruby, and custom facts.'
 
@@ -90,6 +75,11 @@ module Facter
                  type: :boolean,
                  desc: 'Enable verbose (info) output.'
 
+    class_option :puppet,
+                 type: :boolean,
+                 aliases: '-p',
+                 desc: 'Load the Puppet libraries, thus allowing Facter to load Puppet-specific facts.'
+
     class_option :show_legacy,
                  type: :boolean,
                  desc: 'Show legacy facts when querying all facts.'
@@ -103,17 +93,12 @@ module Facter
                  type: :boolean,
                  desc: 'Enable more aggressive error reporting.'
 
-    class_option :puppet,
-                 type: :boolean,
-                 aliases: '-p',
-                 desc: 'Load the Puppet libraries, thus allowing Facter to load Puppet-specific facts.'
-
     class_option :timing,
                  type: :boolean,
                  aliases: '-t',
                  desc: 'Show how much time it took to resolve each fact'
 
-    desc '--man', 'Manual', hide: true
+    desc '--man', 'Display manual.', hide: true
     map ['--man'] => :man
     def man(*args)
       require 'erb'
@@ -126,7 +111,6 @@ module Facter
     end
 
     desc 'query', 'Default method', hide: true
-    desc '[options] [query] [query] [...]', ''
     def query(*args)
       output, status = Facter.to_user_output(@options, *args)
       puts output
@@ -135,13 +119,21 @@ module Facter
       exit status
     end
 
+    desc 'arg_parser', 'Parse arguments', hide: true
+    def arg_parser(*args)
+      # ignore unknown options
+      args.reject! { |arg| arg.start_with?('-') }
+
+      Facter.values(@options, args)
+    end
+
     desc '--version, -v', 'Print the version', hide: true
     map ['--version', '-v'] => :version
-    def version
+    def version(*_args)
       puts Facter::VERSION
     end
 
-    desc '--list-block-groups', 'List block groups', hide: true
+    desc '--list-block-groups', 'List block groups'
     map ['--list-block-groups'] => :list_block_groups
     def list_block_groups(*args)
       options = @options.map { |(k, v)| [k.to_sym, v] }.to_h
@@ -153,7 +145,7 @@ module Facter
       puts block_groups
     end
 
-    desc '--list-cache-groups', 'List cache groups', hide: true
+    desc '--list-cache-groups', 'List cache groups'
     map ['--list-cache-groups'] => :list_cache_groups
     def list_cache_groups(*args)
       options = @options.map { |(k, v)| [k.to_sym, v] }.to_h
@@ -165,6 +157,61 @@ module Facter
       puts cache_groups
     end
 
+    desc 'help', 'Help for all arguments'
+    def help(*args)
+      help_string = +''
+      help_string << help_header(args)
+      help_string << add_class_options_to_help
+      help_string << add_commands_to_help
+
+      puts help_string
+    end
+
+    no_commands do
+      def help_header(_args)
+        path = File.join(File.dirname(__FILE__), '../../')
+
+        Util::FileHelper.safe_read("#{path}fixtures/facter_help_header")
+      end
+
+      IGNORE_OPTIONS = %w[log_level color no_color].freeze
+
+      def add_class_options_to_help
+        help_class_options = +''
+        class_options = Cli.class_options
+        class_options.each do |class_option|
+          option = class_option[1]
+          next if option.hide
+
+          help_class_options << build_option(option.name, option.aliases, option.description)
+        end
+
+        help_class_options
+      end
+
+      def add_commands_to_help
+        help_command_options = +''
+        Cli.commands
+           .select { |_k, command_class| command_class.instance_of?(Thor::Command) }
+           .each do |_k, command|
+          help_command_options << build_option(command['name'], [], command['description'])
+        end
+
+        help_command_options
+      end
+
+      def build_option(name, aliases, description)
+        help_option = +''
+        help_option << aliases.join(',').rjust(10)
+        help_option << ' '
+        help_option << "[--#{name}]".ljust(30)
+        help_option << " #{description}"
+        help_option << "\n"
+
+        help_option
+      end
+    end
+
     def self.exit_on_failure?
       true
     end

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

@@ -1,59 +1,55 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require 'thor'
 require 'facter/framework/logging/logger.rb'
 Facter::Log.output(STDERR)
 require 'facter'
 require 'facter/framework/cli/cli'
 
 class CliLauncher
-  def initialize(args)
-    @args = args
-  end
-
-  def validate_options
-    Facter::OptionsValidator.validate(@args)
-  end
+  class << self
+    def prepare_arguments(args, task = Facter::Cli.default_task)
+      args.unshift(task) unless
+        check_if_arguments_is_known(Facter::Cli.all_tasks, args) ||
+        check_if_arguments_is_known(Facter::Cli.instance_variable_get(:@map), args) ||
+        !task
+
+      reorder_program_arguments(args)
+    end
 
-  def prepare_arguments
-    @args.unshift(Facter::Cli.default_task) unless
-      check_if_arguments_is_known(Facter::Cli.all_tasks, @args) ||
-      check_if_arguments_is_known(Facter::Cli.instance_variable_get(:@map), @args)
+    def start(args)
+      # stop parsing arguments if we don't recognize them
+      Thor.check_unknown_options!
+      Facter::Cli.start(args, debug: true)
+    rescue Thor::UnknownArgumentError => e
+      Facter::OptionsValidator.write_error_and_exit("unrecognised option '#{e.unknown.first}'")
+    end
 
-    @args = reorder_program_arguments(@args)
-  end
+    private
 
-  def start
-    Facter::Cli.start(@args, debug: true)
-  rescue Thor::UnknownArgumentError => e
-    Facter::OptionsValidator.write_error_and_exit("unrecognised option '#{e.unknown.first}'")
-  end
-
-  private
+    def check_if_arguments_is_known(known_arguments, program_arguments)
+      program_arguments.each do |argument|
+        return true if known_arguments.key?(argument)
+      end
 
-  def check_if_arguments_is_known(known_arguments, program_arguments)
-    program_arguments.each do |argument|
-      return true if known_arguments.key?(argument)
+      false
     end
 
-    false
-  end
-
-  def reorder_program_arguments(program_arguments)
-    priority_arguments = Facter::Cli.instance_variable_get(:@map)
+    def reorder_program_arguments(program_arguments)
+      priority_arguments = Facter::Cli.instance_variable_get(:@map)
 
-    priority_args = []
-    normal_args = []
+      priority_args = []
+      normal_args = []
 
-    program_arguments.each do |argument|
-      if priority_arguments.include?(argument)
-        priority_args << argument
-      else
-        normal_args << argument
+      program_arguments.each do |argument|
+        if priority_arguments.include?(argument)
+          priority_args << argument
+        else
+          normal_args << argument
+        end
       end
-    end
 
-    priority_args.concat(normal_args)
+      priority_args.concat(normal_args)
+    end
   end
 end

data/lib/facter/framework/config/fact_groups.rb

@@ -2,7 +2,7 @@
 
 module Facter
   class FactGroups
-    attr_reader :groups, :block_list
+    attr_reader :groups, :block_list, :facts_ttls
 
     @groups_ttls = []
 
@@ -14,6 +14,10 @@ module Facter
       @groups ||= File.readable?(@groups_file_path) ? Hocon.load(@groups_file_path) : {}
       load_groups
       load_groups_from_options
+      load_facts_ttls
+
+      # Reverse sort facts so that children have precedence when caching. eg: os.macosx vs os
+      @facts_ttls = @facts_ttls.sort.reverse.to_h
     end
 
     # Breakes down blocked groups in blocked facts
@@ -31,6 +35,9 @@ module Facter
 
     # Get the group name a fact is part of
     def get_fact_group(fact_name)
+      fact = get_fact(fact_name)
+      return fact[:group] if fact
+
       @groups.detect { |k, v| break k if Array(v).find { |f| fact_name =~ /^#{f}.*/ } }
     end
 
@@ -41,6 +48,15 @@ module Facter
       ttls_to_seconds(ttls[group_name])
     end
 
+    def get_fact(fact_name)
+      return @facts_ttls[fact_name] if @facts_ttls[fact_name]
+
+      result = @facts_ttls.select { |name, fact| break fact if fact_name =~ /^#{name}\..*/ }
+      return nil if result == {}
+
+      result
+    end
+
     private
 
     def load_groups_from_options
@@ -55,10 +71,28 @@ module Facter
       end
     end
 
+    def load_facts_ttls
+      @facts_ttls ||= {}
+      return if @groups_ttls == []
+
+      @groups_ttls.reduce(:merge).each do |group, ttls|
+        ttls = ttls_to_seconds(ttls)
+        if @groups[group]
+          @groups[group].each do |fact|
+            if (@facts_ttls[fact] && @facts_ttls[fact][:ttls] < ttls) || @facts_ttls[fact].nil?
+              @facts_ttls[fact] = { ttls: ttls, group: group }
+            end
+          end
+        else
+          @facts_ttls[group] = { ttls: ttls, group: group }
+        end
+      end
+    end
+
     def load_groups
       config = ConfigReader.init(Options[:config])
       @block_list = config.block_list || {}
-      @groups_ttls = config.ttls || {}
+      @groups_ttls = config.ttls || []
       @groups.merge!(config.fact_groups) if config.fact_groups
     end
 

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

@@ -40,31 +40,42 @@ module Facter
       end
     end
 
-    def group_cached?(group_name)
-      cached = @fact_groups.get_group_ttls(group_name) ? true : false
-      delete_cache(group_name) unless cached
+    def fact_cache_enabled?(fact_name)
+      fact = @fact_groups.get_fact(fact_name)
+      cached = if fact
+                 !fact[:ttls].nil?
+               else
+                 false
+               end
+
+      fact_group = @fact_groups.get_fact_group(fact_name)
+      delete_cache(fact_group) if fact_group && !cached
       cached
     end
 
     private
 
     def resolve_fact(searched_fact)
-      group_name =  if searched_fact.file
-                      searched_fact.name
-                    else
-                      @fact_groups.get_fact_group(searched_fact.name)
-                    end
+      return unless fact_cache_enabled?(searched_fact.name)
 
-      return unless group_name
+      fact = if searched_fact.file
+               @fact_groups.get_fact(File.basename(searched_fact.file))
+             else
+               @fact_groups.get_fact(searched_fact.name)
+             end
 
-      return unless group_cached?(group_name)
+      return unless fact
 
-      return unless check_ttls?(group_name)
+      return unless check_ttls?(fact[:group], fact[:ttls])
 
-      data = read_group_json(group_name)
+      read_fact(searched_fact, fact[:group])
+    end
+
+    def read_fact(searched_fact, fact_group)
+      data = read_group_json(fact_group)
       return unless data
 
-      @log.debug("loading cached values for #{group_name} facts")
+      @log.debug("loading cached values for #{searched_fact.name} facts")
 
       create_facts(searched_fact, data)
     end
@@ -93,7 +104,7 @@ module Facter
                    end
       return if !group_name || fact.value.nil?
 
-      return unless group_cached?(group_name)
+      return unless fact_cache_enabled?(fact.name)
 
       @groups[group_name] ||= {}
       @groups[group_name][fact.name] = fact.value
@@ -106,10 +117,12 @@ module Facter
       end
 
       @groups.each do |group_name, data|
-        next unless check_ttls?(group_name)
+        next unless check_ttls?(group_name, @fact_groups.get_group_ttls(group_name))
 
-        @log.debug("caching values for #{group_name} facts")
         cache_file_name = File.join(@cache_dir, group_name)
+        next if File.readable?(cache_file_name)
+
+        @log.debug("caching values for #{group_name} facts")
         File.write(cache_file_name, JSON.pretty_generate(data))
       end
     end
@@ -128,8 +141,7 @@ module Facter
       @groups[group_name] = data
     end
 
-    def check_ttls?(group_name)
-      ttls = @fact_groups.get_group_ttls(group_name)
+    def check_ttls?(group_name, ttls)
       return false unless ttls
 
       cache_file_name = File.join(@cache_dir, group_name)

data/lib/facter/framework/core/fact_loaders/fact_loader.rb

@@ -20,45 +20,48 @@ module Facter
 
       @facts = []
       @external_facts = []
-      load_internal_facts(options)
-      load_external_facts(options)
 
-      @facts
+      @internal_facts = load_internal_facts(options)
+      @external_facts = load_external_facts(options)
+
+      @facts = @internal_facts + @external_facts
     end
 
     private
 
     def load_internal_facts(options)
       @log.debug('Loading internal facts')
+      internal_facts = []
 
       if options[:user_query] || options[:show_legacy]
         # if we have a user query, then we must search in core facts and legacy facts
         @log.debug('Loading all internal facts')
-        @internal_facts = @internal_loader.facts
+        internal_facts = @internal_loader.facts
       else
         @log.debug('Load only core facts')
-        @internal_facts = @internal_loader.core_facts
+        internal_facts = @internal_loader.core_facts
       end
 
-      @internal_facts = block_facts(@internal_facts, options)
-      @facts.concat(@internal_facts)
+      block_facts(internal_facts, options)
     end
 
     def load_external_facts(options)
       @log.debug('Loading external facts')
+      external_facts = []
+
       if options[:custom_facts]
         @log.debug('Loading custom facts')
-        @external_facts.concat(@external_fact_loader.custom_facts)
+        external_facts += @external_fact_loader.custom_facts
       end
 
-      @external_facts = block_facts(@external_facts, options)
+      external_facts = block_facts(external_facts, options)
 
       if options[:external_facts]
         @log.debug('Loading external facts')
-        @external_facts.concat(@external_fact_loader.external_facts)
+        external_facts += @external_fact_loader.external_facts
       end
 
-      @facts.concat(@external_facts)
+      external_facts
     end
 
     def block_facts(facts, options)

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

@@ -46,7 +46,9 @@ module Facter
         return unless file_global_conf
 
         if Options.cli?
-          @options[:custom_facts] = !file_global_conf['no-custom-facts'] unless file_global_conf['no-custom-facts'].nil?
+          unless file_global_conf['no-custom-facts'].nil?
+            @options[:no_custom_facts] = file_global_conf['no-custom-facts']
+          end
         end
 
         @options[:custom_dir] = file_global_conf['custom-dir'] unless file_global_conf['custom-dir'].nil?
@@ -57,7 +59,7 @@ module Facter
         return unless global_conf
 
         if Options.cli?
-          @options[:external_facts] = !global_conf['no-external-facts'] unless global_conf['no-external-facts'].nil?
+          @options[:no_external_facts] = global_conf['no-external-facts'] unless global_conf['no-external-facts'].nil?
         end
 
         @options[:external_dir] = [global_conf['external-dir']].flatten unless global_conf['external-dir'].nil?
@@ -67,7 +69,7 @@ module Facter
       def augment_ruby(global_conf)
         return unless global_conf
 
-        @options[:ruby] = global_conf['no-ruby'].nil? ? true : !global_conf['no-ruby']
+        @options[:no_ruby] = global_conf['no-ruby'].nil? ? false : global_conf['no-ruby']
       end
 
       def augment_show_legacy(global_conf)

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

@@ -22,14 +22,14 @@ module Facter
     @user_query = []
     @block_list = {}
     @fact_groups = {}
-    @color = false
+    @color = true
     @timing = false
 
     class << self
-      attr_reader :debug, :verbose, :log_level, :show_legacy, :ruby,
-                  :custom_facts, :blocked_facts
+      attr_reader :debug, :verbose, :log_level, :show_legacy,
+                  :custom_facts, :blocked_facts, :ruby, :external_facts
 
-      attr_accessor :config, :user_query, :strict, :json, :haml, :external_facts,
+      attr_accessor :config, :user_query, :strict, :json, :haml,
                     :cache, :yaml, :puppet, :ttls, :block, :cli, :config_file_custom_dir,
                     :config_file_external_dir, :default_external_dir, :fact_groups,
                     :block_list, :color, :trace, :timing
@@ -45,16 +45,28 @@ module Facter
         options
       end
 
-      def ruby=(bool)
-        if bool == true
-          @ruby = true
-        else
+      def no_ruby=(bool)
+        if bool
           @ruby = false
           @custom_facts = false
           @blocked_facts << 'ruby'
+        else
+          @ruby = true
         end
       end
 
+      def no_block=(bool)
+        @block = !bool
+      end
+
+      def no_cache=(bool)
+        @cache = !bool
+      end
+
+      def no_color=(bool)
+        @color = !bool
+      end
+
       def external_dir
         return fallback_external_dir if @external_dir.empty? && @external_facts
 
@@ -99,8 +111,8 @@ module Facter
         end
       end
 
-      def custom_facts=(bool)
-        if bool == true
+      def no_custom_facts=(bool)
+        if bool == false
           @custom_facts = true
           @ruby = true
         else
@@ -108,6 +120,10 @@ module Facter
         end
       end
 
+      def no_external_facts=(bool)
+        @external_facts = !bool
+      end
+
       def log_level=(level)
         level = level.to_sym
         case level
@@ -156,6 +172,7 @@ module Facter
         @custom_facts = true
         @external_dir = []
         @default_external_dir = []
+        @config_file_external_dir = []
         @external_facts = true
         @blocked_facts = []
         @fact_groups = {}

data/lib/facter/framework/logging/logger.rb

@@ -91,9 +91,7 @@ module Facter
     def error(msg, colorize = false)
       @@has_errors = true
 
-      if msg.nil? || msg.empty?
-        empty_message_error(msg)
-      elsif @@message_callback
+      if @@message_callback
         @@message_callback.call(:error, msg)
       else
         msg = colorize(msg, RED) if colorize || Options[:color]
@@ -111,8 +109,6 @@ module Facter
     private
 
     def colorize(msg, color)
-      return msg if OsDetector.instance.identifier.eql?(:windows)
-
       "#{color}#{msg}#{RESET}"
     end
 

data/lib/facter/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Facter
-  VERSION = '4.0.39' unless defined?(VERSION)
+  VERSION = '4.0.40' unless defined?(VERSION)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: facter
 version: !ruby/object:Gem::Version
-  version: 4.0.39
+  version: 4.0.40
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-23 00:00:00.000000000 Z
+date: 2020-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler