RubyGems - facter - Versions diffs - 4.0.44 → 4.0.46 - Mend

facter 4.0.44 → 4.0.46

Files changed (127) hide show

data/lib/facter/resolvers/dmi_decode.rb CHANGED

@@ -3,7 +3,7 @@
 module Facter
   module Resolvers
     class DmiDecode < BaseResolver
-      @fact_list ||= {}
+      init_resolver
       ADDRESS_TO_VERSION = {
         0xe8480 => 'ESXi 2.5',

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

@@ -5,7 +5,8 @@ module Facter
     module Linux
       class DmiBios < BaseResolver
         @log = Facter::Log.new(self)
-        @fact_list ||= {}
+        init_resolver
         class << self
           # :bios_vendor

data/lib/facter/resolvers/ec2.rb CHANGED

@@ -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 CHANGED

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

data/lib/facter/resolvers/facterversion_resolver.rb CHANGED

@@ -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 CHANGED

@@ -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 CHANGED

@@ -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 CHANGED

@@ -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 CHANGED

@@ -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 CHANGED

@@ -4,7 +4,8 @@ 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

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

@@ -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

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

@@ -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 CHANGED

@@ -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 CHANGED

@@ -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 CHANGED

@@ -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 CHANGED

@@ -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 CHANGED

@@ -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 CHANGED

@@ -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 CHANGED

@@ -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 CHANGED

@@ -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 CHANGED

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

data/lib/facter/resolvers/lspci.rb CHANGED

@@ -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 CHANGED

@@ -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 CHANGED

@@ -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 CHANGED

@@ -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 CHANGED

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

data/lib/facter/resolvers/macosx/processor_resolver.rb CHANGED

@@ -4,7 +4,8 @@ module Facter
   module Resolvers
     module Macosx
       class Processors < BaseResolver
-        @fact_list = {}
+        init_resolver
         ITEMS = { logical_count: 'hw.logicalcpu_max',
                   physical_count: 'hw.physicalcpu_max',
                   brand: 'machdep.cpu.brand_string',

data/lib/facter/resolvers/macosx/swap_memory_resolver.rb CHANGED

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

data/lib/facter/resolvers/macosx/system_memory_resolver.rb CHANGED

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

data/lib/facter/resolvers/macosx/system_profiler_resolver.rb CHANGED

@@ -15,7 +15,7 @@ module Facter
         SP_ETHERNET_DATA_TYPE = %i[type bus vendor_id device_id subsystem_vendor_id
                                    subsystem_id revision_id bsd_name kext_name location version].freeze
-        @fact_list = {}
+        init_resolver
         class << self
           private
@@ -25,8 +25,6 @@ module Facter
           end
           def retrieve_system_profiler(fact_name)
-            @fact_list ||= {}
             case fact_name
             when *SP_HARDWARE_DATA_TYPE
               @fact_list.merge!(SystemProfileExecutor.execute('SPHardwareDataType'))

data/lib/facter/resolvers/memory_resolver.rb CHANGED

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

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

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

data/lib/facter/resolvers/networking_linux_resolver.rb CHANGED

@@ -3,7 +3,8 @@
 module Facter
   module Resolvers
     class NetworkingLinux < BaseResolver
-      @fact_list = {}
+      init_resolver
       DIRS = ['/var/lib/dhclient/', '/var/lib/dhcp/', '/var/lib/dhcp3/', '/var/lib/NetworkManager/', '/var/db/'].freeze
       class << self
@@ -16,8 +17,6 @@ module Facter
         end
         def retrieve_network_info(fact_name)
-          @fact_list ||= {}
           retrieve_interface_info
           retrieve_interfaces_mac_and_mtu
           retrieve_default_interface
@@ -113,6 +112,8 @@ module Facter
                       "ip4_mask_length = #{ip4_mask_length}")
           binding = ::Resolvers::Utils::Networking.build_binding(ip4_address, ip4_mask_length)
+          return unless binding
           build_network_info_structure!(network_info, interface_name, :bindings)
           network_info[interface_name][:bindings] << binding
@@ -120,7 +121,7 @@ module Facter
         def retrieve_name_and_ip_info(tokens)
           interface_name = tokens[1]
-          ip_info = tokens[3].split('/')
+          ip_info = tokens[4] =~ /peer/ ? tokens[5].split('/') : tokens[3].split('/')
           ip_address = ip_info[0]
           ip_mask_length = ip_info[1]

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

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

data/lib/facter/resolvers/open_vz.rb CHANGED

@@ -5,7 +5,7 @@ module Facter
     class OpenVz < BaseResolver
       # build
-      @fact_list ||= {}
+      init_resolver
       class << self
         private

data/lib/facter/resolvers/os_release_resolver.rb CHANGED

@@ -14,7 +14,7 @@ module Facter
       # :support_url
       # :bug_report_url
-      @fact_list ||= {}
+      init_resolver
       class << self
         private