facter 4.0.8.pre → 4.0.9.pre

data/lib/framework/formatters/formatter_helper.rb

@@ -23,7 +23,7 @@ module Facter
 
       def retrieve_fact_value_for_single_query(user_query, resolved_facts)
         fact_collection = build_fact_collection_for_user_query(user_query, resolved_facts)
-        fact_collection = Facter::Utils.sort_hash_by_key(fact_collection)
+        fact_collection = Utils.sort_hash_by_key(fact_collection)
         splitted_user_query = Utils.split_user_query(user_query)
         fact_collection.dig(*splitted_user_query)
       end

data/lib/framework/logging/logger.rb

@@ -1,18 +1,42 @@
 # frozen_string_literal: true
 
+require 'logger'
+
 module Facter
   RED = 31
 
   class Log
     @@file_logger = Logger.new(File.new("#{ROOT_DIR}/example.log", 'a'))
-    @@legacy_logger = LegacyLogger.new
-    @@logger = MultiLogger.new([@@legacy_logger, @@file_logger])
+    @@legacy_logger = nil
+    @@logger = MultiLogger.new([@@file_logger])
     @@logger.level = :warn
+    @@message_callback = nil
+
+    class << self
+      def on_message(&block)
+        @@message_callback = block
+      end
+
+      def level=(log_level)
+        @@logger.level = log_level
+      end
+
+      def level
+        @@logger.level
+      end
+    end
 
     def initialize(logged_class)
       determine_callers_name(logged_class)
       set_format_for_file_logger
-      set_format_for_stdout
+    end
+
+    def self.add_legacy_logger(output)
+      return if @@legacy_logger
+
+      @@legacy_logger = Logger.new(output)
+      set_format_for_legacy_logger
+      @@logger.add_logger(@@legacy_logger)
     end
 
     def determine_callers_name(sender_self)
@@ -26,23 +50,24 @@ module Facter
       end
     end
 
-    def set_format_for_stdout
+    def self.set_format_for_legacy_logger
       @@legacy_logger.formatter = proc do |severity, datetime, _progname, msg|
         datetime = datetime.strftime(@datetime_format || '%Y-%m-%d %H:%M:%S.%6N ')
         "[#{datetime}] #{severity} #{msg} \n"
       end
     end
 
-    def self.level=(log_level)
-      @@logger.level = log_level
-    end
-
-    def self.level
-      @@logger.level
-    end
-
     def debug(msg)
-      @@logger.debug(@class_name + ' - ' + msg)
+      return unless Facter.debugging?
+
+      if msg.nil? || msg.empty?
+        invoker = caller(1..1).first.slice(/.*:\d+/)
+        self.warn "#{self.class}#debug invoked with invalid message #{msg.inspect}:#{msg.class} at #{invoker}"
+      elsif @@message_callback
+        @@message_callback.call(:debug, msg)
+      else
+        @@logger.debug(@class_name + ' - ' + msg)
+      end
     end
 
     def info(msg)

data/lib/framework/logging/multilogger.rb

@@ -86,6 +86,10 @@ module Facter
       @loggers = loggers
     end
 
+    def add_logger(logger)
+      @loggers << logger
+    end
+
     # Methods that write to logs just write to each contained logging in turn
     def add(severity, message = nil, progname = nil, &block)
       loggers.each { |logger| logger.add(severity, message, progname, &block) }

data/lib/framework/parsers/query_parser.rb

@@ -91,7 +91,7 @@ module Facter
 
       def construct_filter_tokens(query_tokens, query_token_range)
         (query_tokens - query_tokens[query_token_range]).map do |token|
-          token =~ /^[0-9]+$/ ? token.to_i : token.to_sym
+          token =~ /^[0-9]+$/ ? token.to_i : token
         end
       end
     end

data/lib/framework/utils/utils.rb

@@ -20,5 +20,18 @@ module Facter
       queries = user_query.split('.')
       queries.map! { |query| query =~ /^[0-9]+$/ ? query.to_i : query }
     end
+
+    def self.deep_stringify_keys(object)
+      case object
+      when Hash
+        object.each_with_object({}) do |(key, value), result|
+          result[key.to_s] = deep_stringify_keys(value)
+        end
+      when Array
+        object.map { |e| deep_stringify_keys(e) }
+      else
+        object
+      end
+    end
   end
 end

data/lib/models/resolved_fact.rb

@@ -7,7 +7,7 @@ module Facter
 
     def initialize(name, value = '', type = :core)
       @name = name
-      @value = value
+      @value = Utils.deep_stringify_keys(value)
       type =~ /core|legacy/ ? @type = type : (raise ArgumentError, 'The type provided for fact is not legacy or core!')
     end
 

data/lib/models/searched_fact.rb

@@ -2,7 +2,7 @@
 
 module Facter
   class SearchedFact
-    attr_accessor :name, :fact_class, :filter_tokens, :user_query, :type
+    attr_reader :name, :fact_class, :filter_tokens, :user_query, :type
 
     def initialize(fact_name, fact_class, filter_tokens, user_query, type)
       @name = fact_name

data/lib/resolvers/base_resolver.rb

@@ -21,7 +21,7 @@ module Facter
           post_resolve(fact_name)
         end
       rescue LoadError => e
-        log.error("resolving fact #{fact_name}, but #{e}")
+        log.debug("resolving fact #{fact_name}, but #{e}")
         @fact_list[fact_name] = nil
       end
 

data/lib/resolvers/fips_enabled_resolver.rb

@@ -16,6 +16,8 @@ module Facter
           end
 
           def read_fips_file(fact_name)
+            return @fact_list[fact_name] = false unless File.directory?('/proc/sys/crypto')
+
             file_output = File.read('/proc/sys/crypto/fips_enabled')
             @fact_list[:fips_enabled] = file_output.strip == '1'
             @fact_list[fact_name]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: facter
 version: !ruby/object:Gem::Version
-  version: 4.0.8.pre
+  version: 4.0.9.pre
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-26 00:00:00.000000000 Z
+date: 2020-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -42,16 +42,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -254,17 +254,42 @@ files:
 - lib/facts/aix/ruby/sitedir.rb
 - lib/facts/aix/ruby/version.rb
 - lib/facts/aix/ssh.rb
-- lib/facts/base/network_interface.rb
+- lib/facts/debian/disks.rb
+- lib/facts/debian/dmi/bios/release_date.rb
+- lib/facts/debian/dmi/bios/vendor.rb
+- lib/facts/debian/dmi/bios/version.rb
+- lib/facts/debian/dmi/board/manufacturer.rb
+- lib/facts/debian/dmi/board/product.rb
+- lib/facts/debian/dmi/board/serial_number.rb
+- lib/facts/debian/dmi/chassis/asset_tag.rb
+- lib/facts/debian/dmi/chassis/type.rb
+- lib/facts/debian/dmi/manufacturer.rb
+- lib/facts/debian/dmi/product/name.rb
+- lib/facts/debian/dmi/product/serial_number.rb
+- lib/facts/debian/dmi/product/uuid.rb
 - lib/facts/debian/facterversion.rb
+- lib/facts/debian/filesystems.rb
+- lib/facts/debian/fips_enabled.rb
 - lib/facts/debian/kernel.rb
 - lib/facts/debian/kernelmajversion.rb
 - lib/facts/debian/kernelrelease.rb
 - lib/facts/debian/kernelversion.rb
+- lib/facts/debian/load_averages.rb
 - lib/facts/debian/memory/swap/available.rb
 - lib/facts/debian/memory/swap/available_bytes.rb
 - lib/facts/debian/memory/swap/capacity.rb
+- lib/facts/debian/memory/swap/total.rb
+- lib/facts/debian/memory/swap/total_bytes.rb
 - lib/facts/debian/memory/swap/used.rb
 - lib/facts/debian/memory/swap/used_bytes.rb
+- lib/facts/debian/memory/system/available.rb
+- lib/facts/debian/memory/system/available_bytes.rb
+- lib/facts/debian/memory/system/capacity.rb
+- lib/facts/debian/memory/system/total.rb
+- lib/facts/debian/memory/system/total_bytes.rb
+- lib/facts/debian/memory/system/used.rb
+- lib/facts/debian/memory/system/used_bytes.rb
+- lib/facts/debian/mountpoints.rb
 - lib/facts/debian/networking/domain.rb
 - lib/facts/debian/networking/fqdn.rb
 - lib/facts/debian/networking/hostname.rb
@@ -279,13 +304,18 @@ files:
 - lib/facts/debian/os/release.rb
 - lib/facts/debian/os/selinux.rb
 - lib/facts/debian/path.rb
+- lib/facts/debian/processors/count.rb
+- lib/facts/debian/processors/isa.rb
+- lib/facts/debian/processors/models.rb
+- lib/facts/debian/processors/physicalcount.rb
 - lib/facts/debian/ruby/platform.rb
 - lib/facts/debian/ruby/sitedir.rb
 - lib/facts/debian/ruby/version.rb
-- lib/facts/debian/system_uptime/system_uptime_days.rb
-- lib/facts/debian/system_uptime/system_uptime_hours.rb
-- lib/facts/debian/system_uptime/system_uptime_minutes.rb
-- lib/facts/debian/system_uptime/system_uptime_uptime.rb
+- lib/facts/debian/ssh.rb
+- lib/facts/debian/system_uptime/days.rb
+- lib/facts/debian/system_uptime/hours.rb
+- lib/facts/debian/system_uptime/minutes.rb
+- lib/facts/debian/system_uptime/uptime.rb
 - lib/facts/debian/timezone.rb
 - lib/facts/el/disks.rb
 - lib/facts/el/dmi/bios/release_date.rb
@@ -350,7 +380,6 @@ files:
 - lib/facts/el/system_uptime/uptime.rb
 - lib/facts/el/timezone.rb
 - lib/facts/macosx/augeas.rb
-- lib/facts/macosx/count.rb
 - lib/facts/macosx/dmi/product/name.rb
 - lib/facts/macosx/facterversion.rb
 - lib/facts/macosx/filesystems.rb
@@ -360,7 +389,6 @@ files:
 - lib/facts/macosx/identity/uid.rb
 - lib/facts/macosx/identity/user.rb
 - lib/facts/macosx/is_virtual.rb
-- lib/facts/macosx/isa.rb
 - lib/facts/macosx/kernel.rb
 - lib/facts/macosx/kernelmajversion.rb
 - lib/facts/macosx/kernelrelease.rb
@@ -381,28 +409,28 @@ files:
 - lib/facts/macosx/memory/system/total_bytes.rb
 - lib/facts/macosx/memory/system/used.rb
 - lib/facts/macosx/memory/system/used_bytes.rb
-- lib/facts/macosx/models.rb
 - lib/facts/macosx/mountpoints.rb
-- lib/facts/macosx/network_ip.rb
 - lib/facts/macosx/networking/domain.rb
 - lib/facts/macosx/networking/fqdn.rb
 - lib/facts/macosx/networking/hostname.rb
-- lib/facts/macosx/networking/ipaddress.rb
+- lib/facts/macosx/networking/ip.rb
 - lib/facts/macosx/os/architecture.rb
 - lib/facts/macosx/os/family.rb
 - lib/facts/macosx/os/hardware.rb
+- lib/facts/macosx/os/macosx/build.rb
+- lib/facts/macosx/os/macosx/product.rb
+- lib/facts/macosx/os/macosx/version.rb
 - lib/facts/macosx/os/name.rb
 - lib/facts/macosx/os/release.rb
-- lib/facts/macosx/os/sw_vers/build.rb
-- lib/facts/macosx/os/sw_vers/product.rb
-- lib/facts/macosx/os/sw_vers/version.rb
 - lib/facts/macosx/path.rb
-- lib/facts/macosx/physicalcount.rb
-- lib/facts/macosx/processor_resolver.rb
+- lib/facts/macosx/processors/count.rb
+- lib/facts/macosx/processors/isa.rb
+- lib/facts/macosx/processors/models.rb
+- lib/facts/macosx/processors/physicalcount.rb
+- lib/facts/macosx/processors/speed.rb
 - lib/facts/macosx/ruby/platform.rb
 - lib/facts/macosx/ruby/sitedir.rb
 - lib/facts/macosx/ruby/version.rb
-- lib/facts/macosx/speed.rb
 - lib/facts/macosx/system_profiler/boot_mode.rb
 - lib/facts/macosx/system_profiler/boot_rom_version.rb
 - lib/facts/macosx/system_profiler/boot_volume.rb
@@ -424,9 +452,9 @@ files:
 - lib/facts/macosx/system_profiler/system_version.rb
 - lib/facts/macosx/system_profiler/uptime.rb
 - lib/facts/macosx/system_profiler/username.rb
+- lib/facts/macosx/system_uptime/days.rb
+- lib/facts/macosx/system_uptime/hours.rb
 - lib/facts/macosx/system_uptime/seconds.rb
-- lib/facts/macosx/system_uptime/system_uptime_days.rb
-- lib/facts/macosx/system_uptime/system_uptime_hours.rb
 - lib/facts/macosx/system_uptime/uptime.rb
 - lib/facts/macosx/timezone.rb
 - lib/facts/sles/facterversion.rb
@@ -474,7 +502,7 @@ files:
 - lib/facts/solaris/networking/domain.rb
 - lib/facts/solaris/networking/fqdn.rb
 - lib/facts/solaris/networking/hostname.rb
-- lib/facts/solaris/networking/ipaddress.rb
+- lib/facts/solaris/networking/ip.rb
 - lib/facts/solaris/os/architecture.rb
 - lib/facts/solaris/os/family.rb
 - lib/facts/solaris/os/hardware.rb
@@ -507,10 +535,10 @@ files:
 - lib/facts/windows/interfaces.rb
 - lib/facts/windows/ipaddress6_interfaces.rb
 - lib/facts/windows/ipaddress_interfaces.rb
-- lib/facts/windows/kernel/kernel.rb
-- lib/facts/windows/kernel/kernel_maj_version.rb
-- lib/facts/windows/kernel/kernel_release.rb
-- lib/facts/windows/kernel/kernel_version.rb
+- lib/facts/windows/kernel.rb
+- lib/facts/windows/kernelmajversion.rb
+- lib/facts/windows/kernelrelease.rb
+- lib/facts/windows/kernelversion.rb
 - lib/facts/windows/macaddress_interfaces.rb
 - lib/facts/windows/memory/system/available.rb
 - lib/facts/windows/memory/system/available_bytes.rb
@@ -559,10 +587,10 @@ files:
 - lib/facts/windows/ruby/sitedir.rb
 - lib/facts/windows/ruby/version.rb
 - lib/facts/windows/scope6_interfaces.rb
-- lib/facts/windows/system_uptime/system_uptime_days.rb
-- lib/facts/windows/system_uptime/system_uptime_hours.rb
-- lib/facts/windows/system_uptime/system_uptime_seconds.rb
-- lib/facts/windows/system_uptime/system_uptime_uptime.rb
+- lib/facts/windows/system_uptime/days.rb
+- lib/facts/windows/system_uptime/hours.rb
+- lib/facts/windows/system_uptime/seconds.rb
+- lib/facts/windows/system_uptime/uptime.rb
 - lib/facts/windows/timezone.rb
 - lib/facts/windows/virtualization/is_virtual.rb
 - lib/facts/windows/virtualization/virtual.rb
@@ -599,7 +627,6 @@ files:
 - lib/framework/formatters/json_fact_formatter.rb
 - lib/framework/formatters/legacy_fact_formatter.rb
 - lib/framework/formatters/yaml_fact_formatter.rb
-- lib/framework/logging/legacy_logger.rb
 - lib/framework/logging/logger.rb
 - lib/framework/logging/multilogger.rb
 - lib/framework/parsers/query_parser.rb
@@ -635,6 +662,7 @@ files:
 - lib/resolvers/macosx/ipaddress_resolver.rb
 - lib/resolvers/macosx/load_averages_resolver.rb
 - lib/resolvers/macosx/mountpoints_resolver.rb
+- lib/resolvers/macosx/processor_resolver.rb
 - lib/resolvers/macosx/swap_memory_resolver.rb
 - lib/resolvers/macosx/system_memory_resolver.rb
 - lib/resolvers/macosx/system_profiler_resolver.rb

data/lib/facts/base/network_interface.rb

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-module Facter
-  class NetworkInterface
-    def initialize(*_args)
-      raise(_, 'Not Implemented')
-    end
-  end
-end

data/lib/facts/debian/system_uptime/system_uptime_days.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-module Facter
-  module Debian
-    class SystemUptimeDays
-      FACT_NAME = 'system_uptime.days'
-
-      def call_the_resolver
-        fact_value = Facter::Resolvers::Uptime.resolve(:days)
-
-        ResolvedFact.new(FACT_NAME, fact_value)
-      end
-    end
-  end
-end

data/lib/facts/debian/system_uptime/system_uptime_hours.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-module Facter
-  module Debian
-    class SystemUptimeHours
-      FACT_NAME = 'system_uptime.hours'
-
-      def call_the_resolver
-        fact_value = Facter::Resolvers::Uptime.resolve(:hours)
-
-        ResolvedFact.new(FACT_NAME, fact_value)
-      end
-    end
-  end
-end

data/lib/facts/debian/system_uptime/system_uptime_minutes.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-module Facter
-  module Debian
-    class SystemUptimeMinutes
-      FACT_NAME = 'system_uptime.minutes'
-
-      def call_the_resolver
-        fact_value = Facter::Resolvers::Uptime.resolve(:minutes)
-
-        ResolvedFact.new(FACT_NAME, fact_value)
-      end
-    end
-  end
-end