facter 4.0.40 → 4.0.46

data/lib/facter/resolvers/disk_resolver.rb

@@ -5,9 +5,12 @@ module Facter
     module Linux
       class Disk < BaseResolver
         @log = Facter::Log.new(self)
-        @fact_list ||= {}
+
+        init_resolver
+
         DIR = '/sys/block'
-        FILE_PATHS = { model: 'device/model', size: 'size', vendor: 'device/vendor' }.freeze
+        FILE_PATHS = { model: 'device/model', size: 'size', vendor: 'device/vendor', type: 'queue/rotational' }.freeze
+
         class << self
           private
 
@@ -25,8 +28,16 @@ module Facter
                 result = Util::FileHelper.safe_read(file_path).strip
                 next if result.empty?
 
-                # Linux always considers sectors to be 512 bytes long independently of the devices real block size.
-                value[key] = file =~ /size/ ? construct_size(value, result) : result
+                value[key] = case key
+                             when :size
+                               # Linux always considers sectors to be 512 bytes long
+                               # independently of the devices real block size.
+                               construct_size(value, result)
+                             when :type
+                               result == '0' ? 'ssd' : 'hdd'
+                             else
+                               result
+                             end
               end
             end
 

data/lib/facter/resolvers/dmi_decode.rb

@@ -3,7 +3,7 @@
 module Facter
   module Resolvers
     class DmiDecode < BaseResolver
-      @fact_list ||= {}
+      init_resolver
 
       ADDRESS_TO_VERSION = {
         0xe8480 => 'ESXi 2.5',
@@ -37,6 +37,7 @@ module Facter
           @fact_list[:virtualbox_version] = output.match(/vboxVer_(\S+)/)&.captures&.first
           @fact_list[:virtualbox_revision] = output.match(/vboxRev_(\S+)/)&.captures&.first
           @fact_list[:vmware_version] = extract_vmware_version(output)
+          @fact_list[:vendor] = output.match(/Vendor: (\S+)/)&.captures&.first
 
           @fact_list[fact_name]
         end

data/lib/facter/resolvers/dmi_resolver.rb

@@ -5,7 +5,8 @@ module Facter
     module Linux
       class DmiBios < BaseResolver
         @log = Facter::Log.new(self)
-        @fact_list ||= {}
+
+        init_resolver
 
         class << self
           # :bios_vendor
@@ -36,9 +37,9 @@ module Facter
 
             file_content = Util::FileHelper.safe_read("/sys/class/dmi/id/#{fact_name}", nil)
             if files.include?(fact_name.to_s) && file_content
-              @fact_list[fact_name] = file_content.strip
+              file_content = file_content.strip
+              @fact_list[fact_name] = file_content unless file_content.empty?
               chassis_to_name(@fact_list[fact_name]) if fact_name == :chassis_type
-
             end
             @fact_list[fact_name]
           end

data/lib/facter/resolvers/ec2.rb

@@ -3,7 +3,8 @@
 module Facter
   module Resolvers
     class Ec2 < BaseResolver
-      @fact_list ||= {}
+      init_resolver
+
       EC2_METADATA_ROOT_URL = 'http://169.254.169.254/latest/meta-data/'
       EC2_USERDATA_ROOT_URL = 'http://169.254.169.254/latest/user-data/'
       EC2_SESSION_TIMEOUT = 5

data/lib/facter/resolvers/eos_release_resolver.rb

@@ -7,7 +7,7 @@ module Facter
       # :version
       # :codename
 
-      @fact_list ||= {}
+      init_resolver
 
       class << self
         private

data/lib/facter/resolvers/facterversion_resolver.rb

@@ -3,7 +3,7 @@
 module Facter
   module Resolvers
     class Facterversion < BaseResolver
-      @fact_list ||= {}
+      init_resolver
 
       class << self
         private

data/lib/facter/resolvers/filesystems_resolver.rb

@@ -5,8 +5,11 @@ module Facter
     module Linux
       class Filesystems < BaseResolver
         # :systems
-        @fact_list ||= {}
+
+        init_resolver
+
         @log = Facter::Log.new(self)
+
         class << self
           private
 

data/lib/facter/resolvers/fips_enabled_resolver.rb

@@ -5,8 +5,11 @@ module Facter
     module Linux
       class FipsEnabled < BaseResolver
         #:fips_enabled
-        @fact_list ||= {}
+
+        init_resolver
+
         @log = Facter::Log.new(self)
+
         class << self
           private
 

data/lib/facter/resolvers/freebsd/dmi_resolver.rb

@@ -4,7 +4,7 @@ module Facter
   module Resolvers
     module Freebsd
       class DmiBios < BaseResolver
-        @fact_list ||= {}
+        init_resolver
 
         class << self
           #:model

data/lib/facter/resolvers/freebsd/freebsd_version_resolver.rb

@@ -4,7 +4,7 @@ module Facter
   module Resolvers
     module Freebsd
       class FreebsdVersion < BaseResolver
-        @fact_list ||= {}
+        init_resolver
 
         class << self
           private
@@ -14,10 +14,13 @@ module Facter
           end
 
           def freebsd_version_system_call(fact_name)
-            output = Facter::Core::Execution.execute('/bin/freebsd-version -kru', logger: log)
-            return if output.empty?
+            output = Facter::Core::Execution.execute('/bin/freebsd-version -k', logger: log)
 
-            build_fact_list(output)
+            @fact_list[:installed_kernel] = output.strip unless output.empty?
+
+            output = Facter::Core::Execution.execute('/bin/freebsd-version -ru', logger: log)
+
+            build_fact_list(output) unless output.empty?
 
             @fact_list[fact_name]
           end
@@ -25,9 +28,8 @@ module Facter
           def build_fact_list(output)
             freebsd_version_results = output.split("\n")
 
-            @fact_list[:installed_kernel]   = freebsd_version_results[0].strip
-            @fact_list[:running_kernel]     = freebsd_version_results[1].strip
-            @fact_list[:installed_userland] = freebsd_version_results[2].strip
+            @fact_list[:running_kernel]     = freebsd_version_results[0].strip
+            @fact_list[:installed_userland] = freebsd_version_results[1].strip
           end
         end
       end

data/lib/facter/resolvers/freebsd/geom_resolver.rb

@@ -4,7 +4,10 @@ module Facter
   module Resolvers
     module Freebsd
       class Geom < BaseResolver
-        @fact_list ||= {}
+        init_resolver
+
+        DISKS_ATTRIBUTES = %i[read_model read_serial_number read_size].freeze
+        PARTITIONS_ATTRIBUTES = %i[read_partlabel read_partuuid read_size].freeze
 
         class << self
           private
@@ -17,37 +20,27 @@ module Facter
             require_relative 'ffi/ffi_helper'
             require 'rexml/document'
 
-            read_disks
-            read_partitions
+            topology = geom_topology
+            read_data('DISK', topology, DISKS_ATTRIBUTES)
+            read_data('PART', topology, PARTITIONS_ATTRIBUTES)
 
             @fact_list[fact_name]
           end
 
-          def read_disks
-            @fact_list[:disks] = {}
-
-            each_geom_class_provider('DISK') do |provider|
-              name = provider.get_text('./name').value
-
-              @fact_list[:disks][name] = %i[read_model read_serial_number read_size].map do |x|
-                send(x, provider)
-              end.inject(:merge)
-            end
-          end
-
-          def read_partitions
-            @fact_list[:partitions] = {}
+          def read_data(fact_name, geom_topology, data_to_read)
+            fact_list_key = fact_name == 'DISK' ? :disks : :partitions
+            @fact_list[fact_list_key] = {}
 
-            each_geom_class_provider('PART') do |provider|
+            each_geom_class_provider(fact_name, geom_topology) do |provider|
               name = provider.get_text('./name').value
 
-              @fact_list[:partitions][name] = %i[read_partlabel read_partuuid read_size].map do |x|
+              @fact_list[fact_list_key][name] = data_to_read.map do |x|
                 send(x, provider)
               end.inject(:merge)
             end
           end
 
-          def each_geom_class_provider(geom_class_name, &block)
+          def each_geom_class_provider(geom_class_name, geom_topology, &block)
             REXML::XPath.each(geom_topology, "/mesh/class[name/text() = '#{geom_class_name}']/geom/provider", &block)
           end
 
@@ -95,7 +88,7 @@ module Facter
           end
 
           def geom_topology
-            @geom_topology ||= REXML::Document.new(geom_confxml)
+            REXML::Document.new(geom_confxml)
           end
 
           def geom_confxml

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

@@ -6,8 +6,9 @@ module Facter
   module Resolvers
     module Freebsd
       class Processors < BaseResolver
+        init_resolver
         @log = Facter::Log.new(self)
-        @fact_list ||= {}
+
         class << self
           private
 
@@ -18,23 +19,27 @@ module Facter
           def collect_processors_info(fact_name)
             require 'facter/resolvers/freebsd/ffi/ffi_helper'
 
-            @fact_list[:logical_count] = logical_count
-            @fact_list[:models] = Array.new(logical_count, model) if logical_count && model
+            count = logical_count
+            model = processors_model
+            speed = processors_speed
+
+            @fact_list[:logical_count] = count
+            @fact_list[:models] = Array.new(count, model) if logical_count && model
             @fact_list[:speed] = speed * 1000 * 1000 if speed
 
             @fact_list[fact_name]
           end
 
-          def model
-            @model ||= Facter::Freebsd::FfiHelper.sysctl_by_name(:string, 'hw.model')
+          def processors_model
+            Facter::Freebsd::FfiHelper.sysctl_by_name(:string, 'hw.model')
           end
 
           def logical_count
-            @logical_count ||= Facter::Freebsd::FfiHelper.sysctl_by_name(:uint32_t, 'hw.ncpu')
+            Facter::Freebsd::FfiHelper.sysctl_by_name(:uint32_t, 'hw.ncpu')
           end
 
-          def speed
-            @speed ||= Facter::Freebsd::FfiHelper.sysctl_by_name(:uint32_t, 'hw.clockrate')
+          def processors_speed
+            Facter::Freebsd::FfiHelper.sysctl_by_name(:uint32_t, 'hw.clockrate')
           end
         end
       end

data/lib/facter/resolvers/freebsd/swap_memory_resolver.rb

@@ -4,7 +4,8 @@ module Facter
   module Resolvers
     module Freebsd
       class SwapMemory < BaseResolver
-        @fact_list ||= {}
+        init_resolver
+
         class << self
           private
 

data/lib/facter/resolvers/freebsd/system_memory_resolver.rb

@@ -4,7 +4,8 @@ module Facter
   module Resolvers
     module Freebsd
       class SystemMemory < BaseResolver
-        @fact_list ||= {}
+        init_resolver
+
         class << self
           private
 

data/lib/facter/resolvers/gce.rb

@@ -3,7 +3,8 @@
 module Facter
   module Resolvers
     class Gce < BaseResolver
-      @fact_list ||= {}
+      init_resolver
+
       METADATA_URL = 'http://metadata.google.internal/computeMetadata/v1/?recursive=true&alt=json'
       HEADERS = { "Metadata-Flavor": 'Google', "Accept": 'application/json' }.freeze
 

data/lib/facter/resolvers/hostname_resolver.rb

@@ -3,7 +3,8 @@
 module Facter
   module Resolvers
     class Hostname < BaseResolver
-      @fact_list ||= {}
+      init_resolver
+
       class << self
         private
 

data/lib/facter/resolvers/identity_resolver.rb

@@ -4,7 +4,8 @@ module Facter
   module Resolvers
     class PosxIdentity < BaseResolver
       @log = Facter::Log.new(self)
-      @fact_list ||= {}
+
+      init_resolver
 
       class << self
         private

data/lib/facter/resolvers/linux/docker_uptime.rb

@@ -4,7 +4,8 @@ module Facter
   module Resolvers
     module Linux
       class DockerUptime < BaseResolver
-        @fact_list ||= {}
+        init_resolver
+
         class << self
           private
 

data/lib/facter/resolvers/linux/load_averages.rb

@@ -4,7 +4,8 @@ module Facter
   module Resolvers
     module Linux
       class LoadAverages < BaseResolver
-        @fact_list ||= {}
+        init_resolver
+
         class << self
           private
 

data/lib/facter/resolvers/load_averages.rb

@@ -3,7 +3,8 @@
 module Facter
   module Resolvers
     class LoadAverages < BaseResolver
-      @fact_list ||= {}
+      init_resolver
+
       class << self
         private
 

data/lib/facter/resolvers/lpar_resolver.rb

@@ -3,7 +3,7 @@
 module Facter
   module Resolvers
     class Lpar < BaseResolver
-      @fact_list ||= {}
+      init_resolver
 
       class << self
         private

data/lib/facter/resolvers/lsb_release_resolver.rb

@@ -9,7 +9,7 @@ module Facter
       # :release
       # :codename
 
-      @fact_list ||= {}
+      init_resolver
 
       class << self
         private

data/lib/facter/resolvers/lspci.rb

@@ -3,7 +3,7 @@
 module Facter
   module Resolvers
     class Lspci < BaseResolver
-      @fact_list ||= {}
+      init_resolver
 
       REGEX_VALUES = { 'VirtualBox' => 'virtualbox', 'XenSource' => 'xenhvm',
                        'Microsoft Corporation Hyper-V' => 'hyperv', 'Class 8007: Google, Inc' => 'gce',

data/lib/facter/resolvers/macosx/dmi_resolver.rb

@@ -4,7 +4,7 @@ module Facter
   module Resolvers
     module Macosx
       class DmiBios < BaseResolver
-        @fact_list ||= {}
+        init_resolver
 
         class << self
           #:model

data/lib/facter/resolvers/macosx/filesystems_resolver.rb

@@ -5,7 +5,7 @@ module Facter
     module Macosx
       class Filesystems < BaseResolver
         # :macosx_filesystems
-        @fact_list ||= {}
+        init_resolver
 
         class << self
           private

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

@@ -4,7 +4,8 @@ module Facter
   module Resolvers
     module Macosx
       class LoadAverages < BaseResolver
-        @fact_list ||= {}
+        init_resolver
+
         class << self
           private
 

data/lib/facter/resolvers/macosx/mountpoints_resolver.rb

@@ -5,7 +5,8 @@ module Facter
     module Macosx
       class Mountpoints < BaseResolver
         include Facter::FilesystemHelper
-        @fact_list ||= {}
+        init_resolver
+
         class << self
           private