facter 4.0.30 → 4.0.35

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

@@ -14,10 +14,10 @@ module Facts
       private
 
       def construct_addresses_hash
-        interfaces = Facter::Resolvers::Networking.resolve(:interfaces)
+        interfaces = Facter::Resolvers::Windows::Networking.resolve(:interfaces)
         return unless interfaces
 
-        servers = { system: Facter::Resolvers::Networking.resolve(:dhcp) }
+        servers = { system: Facter::Resolvers::Windows::Networking.resolve(:dhcp) }
         interfaces&.each { |interface_name, info| servers[interface_name] = info[:dhcp] if info[:dhcp] }
         servers
       end

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

@@ -6,7 +6,7 @@ module Facts
       FACT_NAME = 'interfaces'
 
       def call_the_resolver
-        fact_value = Facter::Resolvers::Networking.resolve(:interfaces)
+        fact_value = Facter::Resolvers::Windows::Networking.resolve(:interfaces)
 
         Facter::ResolvedFact.new(FACT_NAME, fact_value ? fact_value.keys.join(',') : nil, :legacy)
       end

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

@@ -8,7 +8,7 @@ module Facts
 
       def call_the_resolver
         arr = []
-        interfaces = Facter::Resolvers::Networking.resolve(:interfaces)
+        interfaces = Facter::Resolvers::Windows::Networking.resolve(:interfaces)
         interfaces&.each do |interface_name, info|
           arr << Facter::ResolvedFact.new("ipaddress6_#{interface_name}", info[:ip6], :legacy) if info[:ip6]
         end

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

@@ -8,7 +8,7 @@ module Facts
 
       def call_the_resolver
         arr = []
-        interfaces = Facter::Resolvers::Networking.resolve(:interfaces)
+        interfaces = Facter::Resolvers::Windows::Networking.resolve(:interfaces)
         interfaces&.each do |interface_name, info|
           arr << Facter::ResolvedFact.new("ipaddress_#{interface_name}", info[:ip], :legacy) if info[:ip]
         end

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

@@ -8,7 +8,7 @@ module Facts
 
       def call_the_resolver
         arr = []
-        interfaces = Facter::Resolvers::Networking.resolve(:interfaces)
+        interfaces = Facter::Resolvers::Windows::Networking.resolve(:interfaces)
         interfaces&.each do |interface_name, info|
           arr << Facter::ResolvedFact.new("macaddress_#{interface_name}", info[:mac], :legacy) if info[:mac]
         end

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

@@ -8,7 +8,7 @@ module Facts
 
       def call_the_resolver
         arr = []
-        interfaces = Facter::Resolvers::Networking.resolve(:interfaces)
+        interfaces = Facter::Resolvers::Windows::Networking.resolve(:interfaces)
         interfaces&.each do |interface_name, info|
           arr << Facter::ResolvedFact.new("mtu_#{interface_name}", info[:mtu], :legacy) if info[:mtu]
         end

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

@@ -8,7 +8,7 @@ module Facts
 
       def call_the_resolver
         arr = []
-        interfaces = Facter::Resolvers::Networking.resolve(:interfaces)
+        interfaces = Facter::Resolvers::Windows::Networking.resolve(:interfaces)
         interfaces&.each do |interface_name, info|
           arr << Facter::ResolvedFact.new("netmask6_#{interface_name}", info[:netmask6], :legacy) if info[:netmask6]
         end

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

@@ -8,7 +8,7 @@ module Facts
 
       def call_the_resolver
         arr = []
-        interfaces = Facter::Resolvers::Networking.resolve(:interfaces)
+        interfaces = Facter::Resolvers::Windows::Networking.resolve(:interfaces)
         interfaces&.each do |interface_name, info|
           arr << Facter::ResolvedFact.new("netmask_#{interface_name}", info[:netmask], :legacy) if info[:netmask]
         end

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

@@ -8,7 +8,7 @@ module Facts
 
       def call_the_resolver
         arr = []
-        interfaces = Facter::Resolvers::Networking.resolve(:interfaces)
+        interfaces = Facter::Resolvers::Windows::Networking.resolve(:interfaces)
         interfaces&.each do |interface_name, info|
           arr << Facter::ResolvedFact.new("network6_#{interface_name}", info[:network6], :legacy) if info[:network6]
         end

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

@@ -8,7 +8,7 @@ module Facts
 
       def call_the_resolver
         arr = []
-        interfaces = Facter::Resolvers::Networking.resolve(:interfaces)
+        interfaces = Facter::Resolvers::Windows::Networking.resolve(:interfaces)
         interfaces&.each do |interface_name, info|
           arr << Facter::ResolvedFact.new("network_#{interface_name}", info[:network], :legacy) if info[:network]
         end

data/lib/facter/facts/windows/networking/dhcp.rb

@@ -7,7 +7,7 @@ module Facts
         FACT_NAME = 'networking.dhcp'
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::Networking.resolve(:dhcp)
+          fact_value = Facter::Resolvers::Windows::Networking.resolve(:dhcp)
 
           Facter::ResolvedFact.new(FACT_NAME, fact_value)
         end

data/lib/facter/facts/windows/networking/domain.rb

@@ -8,7 +8,7 @@ module Facts
         ALIASES = 'domain'
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::Networking.resolve(:domain)
+          fact_value = Facter::Resolvers::Windows::Networking.resolve(:domain)
 
           [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end

data/lib/facter/facts/windows/networking/fqdn.rb

@@ -8,7 +8,7 @@ module Facts
         ALIASES = 'fqdn'
 
         def call_the_resolver
-          domain = Facter::Resolvers::Networking.resolve(:domain)
+          domain = Facter::Resolvers::Windows::Networking.resolve(:domain)
           hostname = Facter::Resolvers::Hostname.resolve(:hostname)
           return Facter::ResolvedFact.new(FACT_NAME, nil) if !hostname || hostname.empty?
 

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

@@ -7,7 +7,7 @@ module Facts
         FACT_NAME = 'networking.interfaces'
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::Networking.resolve(:interfaces)
+          fact_value = Facter::Resolvers::Windows::Networking.resolve(:interfaces)
 
           Facter::ResolvedFact.new(FACT_NAME, fact_value)
         end

data/lib/facter/facts/windows/networking/ip.rb

@@ -8,7 +8,7 @@ module Facts
         ALIASES = 'ipaddress'
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::Networking.resolve(:ip)
+          fact_value = Facter::Resolvers::Windows::Networking.resolve(:ip)
 
           [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end

data/lib/facter/facts/windows/networking/ip6.rb

@@ -8,7 +8,7 @@ module Facts
         ALIASES = 'ipaddress6'
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::Networking.resolve(:ip6)
+          fact_value = Facter::Resolvers::Windows::Networking.resolve(:ip6)
 
           [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end

data/lib/facter/facts/windows/networking/mac.rb

@@ -8,7 +8,7 @@ module Facts
         ALIASES = 'macaddress'
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::Networking.resolve(:mac)
+          fact_value = Facter::Resolvers::Windows::Networking.resolve(:mac)
 
           [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end

data/lib/facter/facts/windows/networking/mtu.rb

@@ -7,7 +7,7 @@ module Facts
         FACT_NAME = 'networking.mtu'
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::Networking.resolve(:mtu)
+          fact_value = Facter::Resolvers::Windows::Networking.resolve(:mtu)
 
           Facter::ResolvedFact.new(FACT_NAME, fact_value)
         end

data/lib/facter/facts/windows/networking/netmask.rb

@@ -8,7 +8,7 @@ module Facts
         ALIASES = 'netmask'
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::Networking.resolve(:netmask)
+          fact_value = Facter::Resolvers::Windows::Networking.resolve(:netmask)
 
           [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end

data/lib/facter/facts/windows/networking/netmask6.rb

@@ -8,7 +8,7 @@ module Facts
         ALIASES = 'netmask6'
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::Networking.resolve(:netmask6)
+          fact_value = Facter::Resolvers::Windows::Networking.resolve(:netmask6)
 
           [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end

data/lib/facter/facts/windows/networking/network.rb

@@ -8,7 +8,7 @@ module Facts
         ALIASES = 'network'
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::Networking.resolve(:network)
+          fact_value = Facter::Resolvers::Windows::Networking.resolve(:network)
 
           [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end

data/lib/facter/facts/windows/networking/network6.rb

@@ -8,7 +8,7 @@ module Facts
         ALIASES = 'network6'
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::Networking.resolve(:network6)
+          fact_value = Facter::Resolvers::Windows::Networking.resolve(:network6)
 
           [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end

data/lib/facter/facts/windows/networking/primary.rb

@@ -7,7 +7,7 @@ module Facts
         FACT_NAME = 'networking.primary'
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::Networking.resolve(:primary_interface)
+          fact_value = Facter::Resolvers::Windows::Networking.resolve(:primary_interface)
 
           Facter::ResolvedFact.new(FACT_NAME, fact_value)
         end

data/lib/facter/facts/windows/networking/scope6.rb

@@ -7,7 +7,7 @@ module Facts
         FACT_NAME = 'networking.scope6'
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::Networking.resolve(:scope6)
+          fact_value = Facter::Resolvers::Windows::Networking.resolve(:scope6)
 
           Facter::ResolvedFact.new(FACT_NAME, fact_value)
         end

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

@@ -9,7 +9,7 @@ module Facts
       def call_the_resolver
         arr = []
         result = {}
-        interfaces = Facter::Resolvers::Networking.resolve(:interfaces)
+        interfaces = Facter::Resolvers::Windows::Networking.resolve(:interfaces)
         interfaces&.each { |interface_name, info| result["scope6_#{interface_name}"] = info[:scope6] if info[:scope6] }
 
         result.each { |fact, value| arr << Facter::ResolvedFact.new(fact, value, :legacy) }

data/lib/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)
@@ -119,16 +136,28 @@ module Facter
       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
+    def list_block_groups(*args)
+      options = @options.map { |(k, v)| [k.to_sym, v] }.to_h
+      Facter::Options.init_from_cli(options, args)
+
+      block_groups = Facter::FactGroups.new.groups.to_yaml.lines[1..-1].join
+      block_groups.gsub!(/:\s*\n/, "\n")
+
+      puts block_groups
     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
+    def list_cache_groups(*args)
+      options = @options.map { |(k, v)| [k.to_sym, v] }.to_h
+      Facter::Options.init_from_cli(options, args)
+
+      cache_groups = Facter::FactGroups.new.groups.to_yaml.lines[1..-1].join
+      cache_groups.gsub!(/:\s*\n/, "\n")
+
+      puts cache_groups
     end
 
     def self.exit_on_failure?

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

@@ -13,6 +13,7 @@ module Facter
       @groups_file_path = group_list_path || default_path
       @groups ||= File.readable?(@groups_file_path) ? Hocon.load(@groups_file_path) : {}
       load_groups
+      load_groups_from_options
     end
 
     # Breakes down blocked groups in blocked facts
@@ -42,6 +43,18 @@ module Facter
 
     private
 
+    def load_groups_from_options
+      Options.external_dir.each do |dir|
+        next unless Dir.exist?(dir)
+
+        ext_facts = Dir.entries(dir)
+        ext_facts.reject! { |ef| ef =~ /^(\.|\.\.)$/ }
+        ext_facts.each do |ef|
+          @groups[ef] = nil
+        end
+      end
+    end
+
     def load_groups
       config = ConfigReader.init(Options[:config])
       @block_list = config.block_list || {}

data/lib/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.message + ' ' + e.backtrace.join("\n"))
+            @@log.log_exception(e)
             nil
           end
         end

data/lib/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/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/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/facter/framework/detector/os_detector.rb

@@ -44,7 +44,11 @@ class OsDetector
     hierarchy = @os_hierarchy.construct_hierarchy(identifier)
     if hierarchy.empty?
       @log.debug("Could not detect hierarchy using os identifier: #{identifier} , trying with family")
-      hierarchy = @os_hierarchy.construct_hierarchy(detect_family)
+
+      detect_family.to_s.split.each do |family|
+        hierarchy = @os_hierarchy.construct_hierarchy(family)
+        return hierarchy unless hierarchy.empty?
+      end
     end
 
     if hierarchy.empty?

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

@@ -3,10 +3,11 @@
 require 'logger'
 
 module Facter
-  RED = 31
-  GREEN = 32
-  YELLOW = 33
-  CYAN = 36
+  RED     = "\e[31m"
+  GREEN   = "\e[32m"
+  YELLOW  = "\e[33m"
+  CYAN    = "\e[36m"
+  RESET   = "\e[0m"
 
   DEFAULT_LOG_LEVEL = :warn
 
@@ -104,12 +105,19 @@ module Facter
       end
     end
 
+    def log_exception(exception)
+      msg = colorize(exception.message, RED) + "\n"
+      msg += exception.backtrace.join("\n") if Options[:trace]
+
+      @@logger.error(@class_name + ' - ' + msg)
+    end
+
     private
 
     def colorize(msg, color)
       return msg if OsDetector.instance.identifier.eql?(:windows)
 
-      "\e[0;#{color}m#{msg}\e[0m"
+      "#{color}#{msg}#{RESET}"
     end
 
     def debugging_active?