facter 4.0.36 → 4.0.41

data/lib/facter/framework/core/fact/internal/internal_fact_manager.rb

@@ -36,7 +36,8 @@ module Facter
         .each do |searched_fact|
         begin
           fact = CoreFact.new(searched_fact)
-          fact_value = fact.create
+          fact_value = nil
+          Facter::Framework::Benchmarking::Timer.measure(searched_fact.name) { fact_value = fact.create }
           resolved_facts << fact_value unless fact_value.nil?
         rescue StandardError => e
           @@log.log_exception(e)

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/fact_loaders/internal_fact_loader.rb

@@ -30,18 +30,18 @@ module Facter
     def load_for_os(operating_system)
       # select only classes
       classes = ClassDiscoverer.instance.discover_classes(operating_system)
-
       classes.each do |class_name|
         fact_name = class_name::FACT_NAME
-
         # if fact is already loaded, skip it
-        next if @facts.any? { |fact| fact.name == fact_name }
-
-        type = class_name.const_defined?('TYPE') ? class_name::TYPE : :core
-        load_fact(fact_name, class_name, type)
+        unless @facts.any? { |fact| fact.name == fact_name }
+          type = class_name.const_defined?('TYPE') ? class_name::TYPE : :core
+          load_fact(fact_name, class_name, type)
+        end
         next unless class_name.const_defined?('ALIASES')
 
-        [*class_name::ALIASES].each { |fact_alias| load_fact(fact_alias, class_name, :legacy) }
+        [*class_name::ALIASES].each do |fact_alias|
+          load_fact(fact_alias, class_name, :legacy) unless @facts.any? { |fact| fact.name == fact_alias }
+        end
       end
     end
 

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

@@ -39,6 +39,8 @@ load_dir(['resolvers'])
 load_dir(['facts_utils'])
 load_dir(%w[framework core])
 load_dir(['models'])
+load_dir(%w[framework benchmarking])
+
 load_dir(%w[framework core fact_loaders])
 load_dir(%w[framework core fact internal])
 load_dir(%w[framework core fact external])

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,16 +22,17 @@ 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
+                    :block_list, :color, :trace, :timing
 
       attr_writer :external_dir
 
@@ -44,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
 
@@ -98,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
@@ -107,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
@@ -155,10 +172,12 @@ module Facter
         @custom_facts = true
         @external_dir = []
         @default_external_dir = []
+        @config_file_external_dir = []
         @external_facts = true
         @blocked_facts = []
         @fact_groups = {}
         @block_list = {}
+        @timing = false
       end
 
       def fallback_external_dir

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

@@ -2,13 +2,10 @@
 
 module Facter
   class SessionCache
-    @semaphore = Mutex.new
     @resolvers = []
 
     def self.subscribe(resolver)
-      @semaphore.synchronize do
-        @resolvers << resolver
-      end
+      @resolvers << resolver
     end
 
     def self.invalidate_all_caches

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

@@ -60,9 +60,7 @@ module Facter
     def debug(msg)
       return unless debugging_active?
 
-      if msg.nil? || msg.empty?
-        empty_message_error(msg)
-      elsif @@message_callback
+      if @@message_callback
         @@message_callback.call(:debug, msg)
       else
         msg = colorize(msg, CYAN) if Options[:color]
@@ -82,9 +80,7 @@ module Facter
     end
 
     def warn(msg)
-      if msg.nil? || msg.empty?
-        empty_message_error(msg)
-      elsif @@message_callback
+      if @@message_callback
         @@message_callback.call(:warn, msg)
       else
         msg = colorize(msg, YELLOW) if Options[:color]
@@ -95,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]
@@ -115,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/patches/sysfilesystem/sys/statvfs.rb

@@ -0,0 +1,92 @@
+# frozen_string_literal: true
+
+require 'sys/filesystem'
+
+module Sys
+  class Filesystem
+    module Structs
+      class Statvfs < FFI::Struct
+        # We must remove the instance variable layout defined by sys-filesystem, because setting
+        # it the second time will make FFI log a warning message.
+        remove_instance_variable(:@layout) if @layout
+
+        if RbConfig::CONFIG['host_os'] =~ /darwin|osx|mach/i
+          layout(
+            :f_bsize, :ulong,
+            :f_frsize, :ulong,
+            :f_blocks, :uint,
+            :f_bfree, :uint,
+            :f_bavail, :uint,
+            :f_files, :uint,
+            :f_ffree, :uint,
+            :f_favail, :uint,
+            :f_fsid, :ulong,
+            :f_flag, :ulong,
+            :f_namemax, :ulong
+          )
+        elsif RbConfig::CONFIG['host'] =~ /bsd/i
+          layout(
+            :f_bavail, :uint64,
+            :f_bfree, :uint64,
+            :f_blocks, :uint64,
+            :f_favail, :uint64,
+            :f_ffree, :uint64,
+            :f_files, :uint64,
+            :f_bsize, :ulong,
+            :f_flag, :ulong,
+            :f_frsize, :ulong,
+            :f_fsid, :ulong,
+            :f_namemax, :ulong
+          )
+        elsif RbConfig::CONFIG['host'] =~ /sunos|solaris/i
+          layout(
+            :f_bsize, :ulong,
+            :f_frsize, :ulong,
+            :f_blocks, :uint64_t,
+            :f_bfree, :uint64_t,
+            :f_bavail, :uint64_t,
+            :f_files, :uint64_t,
+            :f_ffree, :uint64_t,
+            :f_favail, :uint64_t,
+            :f_fsid, :ulong,
+            :f_basetype, [:char, 16],
+            :f_flag, :ulong,
+            :f_namemax, :ulong,
+            :f_fstr, [:char, 32],
+            :f_filler, [:ulong, 16]
+          )
+        elsif RbConfig::CONFIG['host'] =~ /i686/i
+          layout(
+            :f_bsize, :ulong,
+            :f_frsize, :ulong,
+            :f_blocks, :uint,
+            :f_bfree, :uint,
+            :f_bavail, :uint,
+            :f_files, :uint,
+            :f_ffree, :uint,
+            :f_favail, :uint,
+            :f_fsid, :ulong,
+            :f_flag, :ulong,
+            :f_namemax, :ulong,
+            :f_spare, [:int, 6]
+          )
+        else
+          layout(
+            :f_bsize, :ulong,
+            :f_frsize, :ulong,
+            :f_blocks, :uint64,
+            :f_bfree, :uint64,
+            :f_bavail, :uint64,
+            :f_files, :uint64,
+            :f_ffree, :uint64,
+            :f_favail, :uint64,
+            :f_fsid, :ulong,
+            :f_flag, :ulong,
+            :f_namemax, :ulong,
+            :f_spare, [:int, 6]
+          )
+        end
+      end
+    end
+  end
+end

data/lib/facter/resolvers/aio_agent_version.rb

@@ -3,7 +3,6 @@
 module Facter
   module Resolvers
     class AioAgentVersion < BaseResolver
-      @semaphore = Mutex.new
       @fact_list ||= {}
 
       class << self

data/lib/facter/resolvers/aix/architecture_resolver.rb

@@ -4,7 +4,6 @@ module Facter
   module Resolvers
     class Architecture < BaseResolver
       # :architecture
-      @semaphore = Mutex.new
       @fact_list ||= {}
       class << self
         private

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

@@ -4,7 +4,6 @@ module Facter
   module Resolvers
     module Aix
       class Disks < BaseResolver
-        @semaphore = Mutex.new
         @fact_list ||= {}
         class << self
           private
@@ -14,12 +13,12 @@ module Facter
           end
 
           def execute_lspv(fact_name)
-            @fact_list[:disks] = {}
-
             result = Facter::Core::Execution.execute('lspv', logger: log)
 
             return if result.empty?
 
+            @fact_list[:disks] = {}
+
             result.each_line do |line|
               disk_name = line.split(' ')[0].strip
               size = find_size(disk_name)

data/lib/facter/resolvers/aix/filesystem_resolver.rb

@@ -4,7 +4,6 @@ module Facter
   module Resolvers
     module Aix
       class Filesystem < BaseResolver
-        @semaphore = Mutex.new
         @fact_list ||= {}
 
         class << self

data/lib/facter/resolvers/aix/hardware_resolver.rb

@@ -4,7 +4,6 @@ module Facter
   module Resolvers
     class Hardware < BaseResolver
       # :hardware
-      @semaphore = Mutex.new
       @fact_list ||= {}
       class << self
         private

data/lib/facter/resolvers/aix/load_averages_resolver.rb

@@ -4,7 +4,6 @@ module Facter
   module Resolvers
     module Aix
       class LoadAverages < BaseResolver
-        @semaphore = Mutex.new
         @fact_list ||= {}
         class << self
           private

data/lib/facter/resolvers/aix/memory.rb

@@ -5,7 +5,6 @@ module Facter
     module Aix
       class Memory < BaseResolver
         # :hardware
-        @semaphore = Mutex.new
         @fact_list ||= {}
         class << self
           private
@@ -18,11 +17,11 @@ module Facter
             result = Facter::Core::Execution.execute('svmon', logger: log)
             return if result.empty?
 
-            @fact_list[:system] = @fact_list[:swap] = {}
-
             pagesize = call_pagesize.to_i
             return if pagesize.zero?
 
+            @fact_list[:system] = @fact_list[:swap] = {}
+
             result.each_line do |line|
               @fact_list[:system] = populate_system(line, pagesize) if line.include?('memory')
               @fact_list[:swap] = populate_swap(line, pagesize) if line =~ /pg\sspace/