facter 4.0.26 → 4.0.32

data/lib/facter/facts_utils/facts_utils.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Facter
+  module FactsUtils
+    HYPERVISORS_HASH = { 'VMware' => 'vmware', 'VirtualBox' => 'virtualbox', 'Parallels' => 'parallels',
+                         'KVM' => 'kvm', 'Virtual Machine' => 'hyperv', 'RHEV Hypervisor' => 'rhev',
+                         'oVirt Node' => 'ovirt', 'HVM domU' => 'xenhvm', 'Bochs' => 'bochs', 'OpenBSD' => 'vmm',
+                         'BHYVE' => 'bhyve' }.freeze
+  end
+end

data/lib/{framework → facter/framework}/cli/cli.rb

@@ -35,6 +35,11 @@ module Facter
                  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.'
@@ -103,6 +108,18 @@ module Facter
                  aliases: '-p',
                  desc: 'Load the Puppet libraries, thus allowing Facter to load Puppet-specific facts.'
 
+    desc '--man', 'Manual', hide: true
+    map ['--man'] => :man
+    def man(*args)
+      require 'erb'
+      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.filename = template
+      puts erb.result(binding)
+    end
+
     desc 'query', 'Default method', hide: true
     desc '[options] [query] [query] [...]', ''
     def query(*args)
@@ -116,16 +133,16 @@ module Facter
     desc '--version, -v', 'Print the version', hide: true
     map ['--version', '-v'] => :version
     def version
-      puts FACTER_VERSION.to_s
+      puts Facter::VERSION
     end
 
-    desc '--list-block-groups', 'List block groups'
+    desc '--list-block-groups', 'List block groups', hide: true
     map ['--list-block-groups'] => :list_block_groups
     def list_block_groups(*_args)
       puts Facter::FactGroups.new.groups.to_yaml.lines[1..-1].join
     end
 
-    desc '--list-cache-groups', 'List cache groups'
+    desc '--list-cache-groups', 'List cache groups', hide: true
     map ['--list-cache-groups'] => :list_cache_groups
     def list_cache_groups(*_args)
       puts Facter::FactGroups.new.groups.to_yaml.lines[1..-1].join

data/lib/{framework → facter/framework}/cli/cli_launcher.rb

@@ -2,10 +2,10 @@
 # frozen_string_literal: true
 
 require 'thor'
-require "#{ROOT_DIR}/lib/framework/logging/logger.rb"
+require 'facter/framework/logging/logger.rb'
 Facter::Log.output(STDERR)
-require "#{ROOT_DIR}/lib/facter"
-require "#{ROOT_DIR}/lib/framework/cli/cli"
+require 'facter'
+require 'facter/framework/cli/cli'
 
 class CliLauncher
   def initialize(args)

data/lib/{framework → facter/framework}/config/fact_groups.rb

@@ -9,7 +9,8 @@ module Facter
     STRING_TO_SECONDS = { 'seconds' => 1, 'minutes' => 60, 'hours' => 3600, 'days' => 3600 * 24 }.freeze
 
     def initialize(group_list_path = nil)
-      @groups_file_path = group_list_path || File.join(ROOT_DIR, 'fact_groups.conf')
+      default_path = File.join(File.dirname(__FILE__), '../../fact_groups.conf')
+      @groups_file_path = group_list_path || default_path
       @groups ||= File.readable?(@groups_file_path) ? Hocon.load(@groups_file_path) : {}
       load_groups
     end

data/lib/{framework → facter/framework}/core/cache_manager.rb

@@ -13,14 +13,17 @@ module Facter
       return searched_facts, [] if !File.directory?(@cache_dir) || !Options[:cache]
 
       facts = []
-      searched_facts.each do |fact|
+      searched_facts.delete_if do |fact|
         res = resolve_fact(fact)
-        facts << res if res
+        if res
+          facts << res
+          true
+        else
+          false
+        end
       end
-      facts.each do |fact|
-        searched_facts.delete_if { |f| f.name == fact.name }
-      end
-      [searched_facts, facts]
+
+      [searched_facts, facts.flatten]
     end
 
     def cache_facts(resolved_facts)
@@ -37,10 +40,21 @@ 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
+      cached
+    end
+
     private
 
     def resolve_fact(searched_fact)
-      group_name = @fact_groups.get_fact_group(searched_fact.name)
+      group_name =  if searched_fact.file
+                      searched_fact.name
+                    else
+                      @fact_groups.get_fact_group(searched_fact.name)
+                    end
+
       return unless group_name
 
       return unless group_cached?(group_name)
@@ -51,16 +65,32 @@ module Facter
       return unless data
 
       @log.debug("loading cached values for #{group_name} facts")
-      create_fact(searched_fact, data[searched_fact.name])
+
+      create_facts(searched_fact, data)
     end
 
-    def create_fact(searched_fact, value)
-      Facter::ResolvedFact.new(searched_fact.name, value, searched_fact.type,
-                               searched_fact.user_query, searched_fact.filter_tokens)
+    def create_facts(searched_fact, data)
+      if searched_fact.type == :file
+        facts = []
+        data.each do |fact_name, fact_value|
+          fact = Facter::ResolvedFact.new(fact_name, fact_value, searched_fact.type,
+                                          searched_fact.user_query, searched_fact.filter_tokens)
+          fact.file = searched_fact.file
+          facts << fact
+        end
+        facts
+      else
+        [Facter::ResolvedFact.new(searched_fact.name, data[searched_fact.name], searched_fact.type,
+                                  searched_fact.user_query, searched_fact.filter_tokens)]
+      end
     end
 
     def cache_fact(fact)
-      group_name = @fact_groups.get_fact_group(fact.name)
+      group_name = if fact.file
+                     File.basename(fact.file)
+                   else
+                     @fact_groups.get_fact_group(fact.name)
+                   end
       return if !group_name || fact.value.nil?
 
       return unless group_cached?(group_name)
@@ -98,12 +128,6 @@ module Facter
       @groups[group_name] = data
     end
 
-    def group_cached?(group_name)
-      cached = @fact_groups.get_group_ttls(group_name) ? true : false
-      delete_cache(group_name) unless cached
-      cached
-    end
-
     def check_ttls?(group_name)
       ttls = @fact_groups.get_group_ttls(group_name)
       return false unless ttls

data/lib/{framework → facter/framework}/core/fact/external/external_fact_manager.rb

@@ -17,10 +17,11 @@ module Facter
       resolved_custom_facts = []
 
       custom_facts.each do |custom_fact|
-        fact_value = LegacyFacter.value(custom_fact.name)
-        resolved_fact = ResolvedFact.new(custom_fact.name, fact_value, :custom)
+        fact = LegacyFacter[custom_fact.name]
+        resolved_fact = ResolvedFact.new(custom_fact.name, fact.value, :custom)
         resolved_fact.filter_tokens = []
         resolved_fact.user_query = custom_fact.user_query
+        resolved_fact.file = fact.options[:file]
 
         resolved_custom_facts << resolved_fact
       end

data/lib/{framework → facter/framework}/core/fact/internal/internal_fact_manager.rb

@@ -40,7 +40,7 @@ module Facter
             fact = CoreFact.new(searched_fact)
             fact.create
           rescue StandardError => e
-            @@log.error(e.backtrace.join("\n"))
+            @@log.log_exception(e)
             nil
           end
         end

data/lib/{framework → facter/framework}/core/fact_loaders/external_fact_loader.rb

@@ -34,8 +34,9 @@ module Facter
 
       external_facts_to_load = LegacyFacter.collection.external_facts
 
-      external_facts_to_load&.each do |external_fact_name|
-        loaded_fact = LoadedFact.new(external_fact_name.to_s, nil, :external)
+      external_facts_to_load&.each do |k, v|
+        loaded_fact = LoadedFact.new(k.to_s, nil, :external)
+        loaded_fact.file = v.options[:file]
         external_facts << loaded_fact
       end
 

data/lib/{framework → facter/framework}/core/fact_loaders/fact_loader.rb

@@ -51,6 +51,8 @@ module Facter
         @external_facts.concat(@external_fact_loader.custom_facts)
       end
 
+      @external_facts = block_facts(@external_facts, options)
+
       if options[:external_facts]
         @log.debug('Loading external facts')
         @external_facts.concat(@external_fact_loader.external_facts)

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

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+require 'open3'
+require 'json'
+require 'yaml'
+require 'hocon'
+require 'hocon/config_value_factory'
+require 'singleton'
+require 'logger'
+
+@lib_path = File.join(File.dirname(__FILE__), '../../')
+
+def load_dir(*dirs)
+  folder_path = File.join(@lib_path, dirs)
+  return unless Dir.exist?(folder_path.tr('*', ''))
+
+  files_to_require = Dir.glob(File.join(folder_path, '*.rb')).reject { |file| file =~ %r{/ffi/} }
+  files_to_require.each(&method(:require))
+end
+
+load_dir(%w[framework core options])
+require 'facter/framework/core/options'
+require 'facter/framework/logging/logger_helper'
+require 'facter/framework/logging/logger'
+
+require 'facter/util/file_helper'
+
+require 'facter/resolvers/base_resolver'
+require 'facter/framework/detector/os_hierarchy'
+require 'facter/framework/detector/os_detector'
+
+require 'facter/framework/config/config_reader'
+require 'facter/framework/config/fact_groups'
+
+load_dir(['config'])
+
+load_dir(%w[resolvers utils])
+load_dir(['resolvers'])
+load_dir(['facts_utils'])
+load_dir(%w[framework core])
+load_dir(['models'])
+load_dir(%w[framework core fact_loaders])
+load_dir(%w[framework core fact internal])
+load_dir(%w[framework core fact external])
+load_dir(%w[framework formatters])
+
+os_hierarchy = OsDetector.instance.hierarchy
+os_hierarchy.each { |operating_system| load_dir(['facts', operating_system.downcase, '**']) }
+os_hierarchy.each { |operating_system| load_dir(['resolvers', operating_system.downcase, '**']) }
+
+require 'facter/custom_facts/core/legacy_facter'
+load_dir(%w[framework utils])
+load_dir(['util'])
+
+require 'facter/framework/core/fact_augmenter'
+require 'facter/framework/parsers/query_parser'

data/lib/{framework → facter/framework}/core/options.rb

@@ -45,6 +45,7 @@ module Facter
         Facter::OptionStore.cli = true
         Facter::OptionStore.show_legacy = false
         Facter::OptionStore.user_query = user_query
+        Facter::OptionStore.trace = cli_options[:trace]
         OptionStore.set(:config, cli_options[:config])
         ConfigFileOptions.init(cli_options[:config])
         store(ConfigFileOptions.get)

data/lib/{framework → facter/framework}/core/options/option_store.rb

@@ -25,13 +25,13 @@ module Facter
     @color = false
 
     class << self
-      attr_reader :debug, :verbose, :log_level, :show_legacy, :trace, :ruby,
+      attr_reader :debug, :verbose, :log_level, :show_legacy, :ruby,
                   :custom_facts, :blocked_facts
 
       attr_accessor :config, :user_query, :strict, :json, :haml, :external_facts,
                     :cache, :yaml, :puppet, :ttls, :block, :cli, :config_file_custom_dir,
                     :config_file_external_dir, :default_external_dir, :fact_groups,
-                    :block_list, :color
+                    :block_list, :color, :trace
 
       attr_writer :external_dir
 
@@ -131,10 +131,6 @@ module Facter
         end
       end
 
-      def trace=(bool)
-        Facter.trace(bool)
-      end
-
       def set(key, value)
         send("#{key}=".to_sym, value)
       end
@@ -150,6 +146,7 @@ module Facter
         @user_query = []
         @cli = nil
         @cache = true
+        @trace = false
         reset_config
       end
 

data/lib/{framework → facter/framework}/detector/os_hierarchy.rb

@@ -4,8 +4,8 @@ module Facter
   class OsHierarchy
     def initialize
       @log = Log.new(self)
-      json_file = Util::FileHelper.safe_read(File.join(ROOT_DIR, 'os_hierarchy.json'))
-
+      json_file_path = File.join(File.dirname(__FILE__), '../../os_hierarchy.json')
+      json_file = Util::FileHelper.safe_read(json_file_path)
       begin
         @json_os_hierarchy = JSON.parse(json_file)
       rescue JSON::ParserError => _e