facter 4.0.35 → 4.0.40

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/formatters/legacy_fact_formatter.rb

@@ -26,7 +26,8 @@ module Facter
       pretty_json = hash_to_facter_format(fact_collection)
 
       pretty_json = remove_enclosing_accolades(pretty_json)
-      remove_comma_and_quotation(pretty_json)
+      pretty_json = remove_comma_and_quotation(pretty_json)
+      handle_newlines(pretty_json)
     end
 
     def format_for_multiple_user_queries(user_queries, resolved_facts)
@@ -38,6 +39,7 @@ module Facter
       pretty_json = hash_to_facter_format(facts_to_display)
       pretty_json = remove_enclosing_accolades(pretty_json)
       pretty_json = remove_comma_and_quotation(pretty_json)
+      pretty_json = handle_newlines(pretty_json)
 
       @log.debug('Remove quotes from value if value is a string')
       pretty_json.gsub(/^(\S*) => \"(.*)\"/, '\1 => \2')
@@ -84,6 +86,11 @@ module Facter
       pretty_fact_json.gsub(/^},/, '}')
     end
 
+    def handle_newlines(pretty_fact_json)
+      @log.debug('Convert newline characters to actual newlines')
+      pretty_fact_json.gsub('\n', "\n")
+    end
+
     def remove_comma_and_quotation(output)
       # quotation marks that come after \ are not removed
       @log.debug('Remove unnecessary comma and quotation marks on root facts')

data/lib/facter/framework/formatters/yaml_fact_formatter.rb

@@ -56,7 +56,7 @@ module Facter
       return false if value[/^[0-9]+$/]
       return true if value =~ /y|Y|yes|Yes|YES|n|N|no|No|NO|True|TRUE|False|FALSE|on|On|ON|off|Off|OFF|:/
       return false if value[/[a-zA-Z]/]
-      return false if value[/[0-9]+\.[0-9]+\./]
+      return false if value[/[0-9]+\.[0-9]+/]
 
       true
     end

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/

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

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

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

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

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

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

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

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Facter
+  module Resolvers
+    module Aix
+      class OsLevel < BaseResolver
+        @fact_list ||= {}
+
+        class << self
+          private
+
+          def post_resolve(fact_name)
+            @fact_list.fetch(fact_name) { read_oslevel(fact_name) }
+          end
+
+          def read_oslevel(fact_name)
+            output = Facter::Core::Execution.execute('/usr/bin/oslevel -s', { limit: 2, logger: log })
+            @fact_list[:build] = output unless output.empty?
+            @fact_list[:kernel] = 'AIX'
+
+            @fact_list[fact_name]
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -4,7 +4,6 @@ module Facter
   module Resolvers
     module Aix
       class Partitions < BaseResolver
-        @semaphore = Mutex.new
         @fact_list ||= {}
         class << self
           private
@@ -14,8 +13,6 @@ module Facter
           end
 
           def query_cudv(fact_name)
-            @fact_list[:partitions] = {}
-
             odmquery = Facter::ODMQuery.new
             odmquery.equals('PdDvLn', 'logical_volume/lvsubclass/lvtype')
 
@@ -23,6 +20,8 @@ module Facter
 
             return unless result
 
+            @fact_list[:partitions] = {}
+
             result.each_line do |line|
               next unless line.include?('name')
 

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

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

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

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Facter
+  module Resolvers
+    module Aix
+      class Serialnumber < BaseResolver
+        @fact_list ||= {}
+
+        class << self
+          private
+
+          def post_resolve(fact_name)
+            @fact_list.fetch(fact_name) { read_serialnumber(fact_name) }
+          end
+
+          def read_serialnumber(fact_name)
+            odmquery = Facter::ODMQuery.new
+            odmquery
+              .equals('name', 'sys0')
+              .equals('attribute', 'systemid')
+            result = odmquery.execute
+
+            result.each_line do |line|
+              if line.include?('value')
+                @fact_list[:serialnumber] = line.split('=')[1].strip.delete('\"')[6..-1]
+                break
+              end
+            end
+
+            @fact_list[fact_name]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/resolvers/augeas_resolver.rb

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

data/lib/facter/resolvers/base_resolver.rb

@@ -16,15 +16,20 @@ module Facter
       end
 
       def self.resolve(fact_name)
-        @semaphore.synchronize do
-          subscribe_to_manager
-          post_resolve(fact_name)
-        end
+        subscribe_to_manager
+        post_resolve(fact_name)
+
+        validate_resolution(fact_name)
       rescue LoadError, NameError => e
         log.debug("resolving fact #{fact_name}, but #{e}")
         @fact_list[fact_name] = nil
       end
 
+      def self.validate_resolution(fact_name)
+        @fact_list.fetch(fact_name) { @fact_list[fact_name] = nil }
+        @fact_list[fact_name]
+      end
+
       def self.post_resolve(_fact_name)
         raise NotImplementedError, "You must implement post_resolve(fact_name) method in #{name}"
       end

data/lib/facter/resolvers/bsd/processors.rb

@@ -5,7 +5,6 @@ module Facter
     module Bsd
       class Processors < BaseResolver
         @log = Facter::Log.new(self)
-        @semaphore = Mutex.new
         @fact_list ||= {}
         class << self
           private