facter 4.0.49 → 4.0.50

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

@@ -9,7 +9,7 @@ module Facter
         class << self
           private
 
-          def post_resolve(fact_name)
+          def post_resolve(fact_name, _options)
             @fact_list.fetch(fact_name) { collect_kstat_info(fact_name) }
           end
 

data/lib/facter/resolvers/solaris/zone.rb

@@ -9,7 +9,7 @@ module Facter
         class << self
           private
 
-          def post_resolve(fact_name)
+          def post_resolve(fact_name, _options)
             @fact_list.fetch(fact_name) { build_zone_fact(fact_name) }
           end
 

data/lib/facter/resolvers/solaris/zone_name.rb

@@ -9,7 +9,7 @@ module Facter
         class << self
           private
 
-          def post_resolve(fact_name)
+          def post_resolve(fact_name, _options)
             @fact_list.fetch(fact_name) { build_current_zone_name_fact(fact_name) }
           end
 

data/lib/facter/resolvers/specific_release_file.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Facter
+  module Resolvers
+    class SpecificReleaseFile < BaseResolver
+      # :release
+
+      init_resolver
+
+      class << self
+        private
+
+        def post_resolve(fact_name, options)
+          @fact_list.fetch(fact_name) { read_release_file(fact_name, options) }
+        end
+
+        def read_release_file(fact_name, options)
+          release_file = options[:release_file]
+          return unless release_file
+
+          output = Facter::Util::FileHelper.safe_read(release_file, nil)
+          return @fact_list[fact_name] = nil if output.nil?
+
+          if options[:regex]
+            @fact_list[:release] = output.strip =~ /#{options[:regex]}/ ? Regexp.last_match : nil
+            return @fact_list[fact_name]
+          end
+
+          @fact_list[:release] = output.strip
+          @fact_list[fact_name]
+        end
+      end
+    end
+  end
+end

data/lib/facter/resolvers/ssh.rb

@@ -13,7 +13,7 @@ module Facter
       class << self
         private
 
-        def post_resolve(fact_name)
+        def post_resolve(fact_name, _options)
           @fact_list.fetch(fact_name) { retrieve_info(fact_name) }
         end
 

data/lib/facter/resolvers/suse_release.rb

@@ -12,7 +12,7 @@ module Facter
       class << self
         private
 
-        def post_resolve(fact_name)
+        def post_resolve(fact_name, _options)
           @fact_list.fetch(fact_name) { read_suse_release(fact_name) }
         end
 

data/lib/facter/resolvers/sw_vers.rb

@@ -12,7 +12,7 @@ module Facter
       class << self
         private
 
-        def post_resolve(fact_name)
+        def post_resolve(fact_name, _options)
           @fact_list.fetch(fact_name) { software_version_system_call(fact_name) }
         end
 

data/lib/facter/resolvers/timezone.rb

@@ -8,7 +8,7 @@ module Facter
       class << self
         private
 
-        def post_resolve(fact_name)
+        def post_resolve(fact_name, _options)
           @fact_list.fetch(fact_name) { determine_timezone }
         end
 

data/lib/facter/resolvers/uname.rb

@@ -8,7 +8,7 @@ module Facter
       class << self
         private
 
-        def post_resolve(fact_name)
+        def post_resolve(fact_name, _options)
           @fact_list.fetch(fact_name) { uname_system_call(fact_name) }
         end
 

data/lib/facter/resolvers/uptime.rb

@@ -8,7 +8,7 @@ module Facter
       class << self
         private
 
-        def post_resolve(fact_name)
+        def post_resolve(fact_name, _options)
           @fact_list.fetch(fact_name) { uptime_system_call(fact_name) }
         end
 

data/lib/facter/resolvers/virt_what.rb

@@ -8,7 +8,7 @@ module Facter
       class << self
         private
 
-        def post_resolve(fact_name)
+        def post_resolve(fact_name, _options)
           @fact_list.fetch(fact_name) { retrieve_from_virt_what(fact_name) }
         end
 

data/lib/facter/resolvers/vmware.rb

@@ -8,7 +8,7 @@ module Facter
       class << self
         private
 
-        def post_resolve(fact_name)
+        def post_resolve(fact_name, _options)
           @fact_list.fetch(fact_name) { vmware_command(fact_name) }
         end
 

data/lib/facter/resolvers/windows/aio_agent_version.rb

@@ -10,7 +10,7 @@ module Facter
         class << self
           private
 
-          def post_resolve(fact_name)
+          def post_resolve(fact_name, _options)
             @fact_list.fetch(fact_name) { read_version(fact_name) }
           end
 

data/lib/facter/resolvers/windows/dmi_bios.rb

@@ -12,7 +12,7 @@ module Facter
 
         private
 
-        def post_resolve(fact_name)
+        def post_resolve(fact_name, _options)
           @fact_list.fetch(fact_name) { read_fact_from_bios(fact_name) }
         end
 

data/lib/facter/resolvers/windows/dmi_computersystem.rb

@@ -12,7 +12,7 @@ module Facter
 
         private
 
-        def post_resolve(fact_name)
+        def post_resolve(fact_name, _options)
           @fact_list.fetch(fact_name) { read_fact_from_computer_system(fact_name) }
         end
 

data/lib/facter/resolvers/windows/ffi/network_utils.rb

@@ -31,8 +31,7 @@ class NetworkUtils
 
     def find_mac_address(adapter)
       adapter[:PhysicalAddress].first(adapter[:PhysicalAddressLength])
-                               .map { |e| format('%<mac_address>02x', mac_address: e.to_i) }
-                               .join(':').upcase
+                               .map { |e| format('%<mac_address>02x', mac_address: e.to_i) }.join(':').upcase
     end
   end
 end

data/lib/facter/resolvers/windows/fips.rb

@@ -12,7 +12,7 @@ module Facter
         class << self
           private
 
-          def post_resolve(fact_name)
+          def post_resolve(fact_name, _options)
             @fact_list.fetch(fact_name) { read_fact_from_registry(fact_name) }
           end
 

data/lib/facter/resolvers/windows/hardware_architecture.rb

@@ -8,7 +8,7 @@ module Facter
       class << self
         private
 
-        def post_resolve(fact_name)
+        def post_resolve(fact_name, _options)
           @fact_list.fetch(fact_name) { read_hardware_information(fact_name) }
         end
 

data/lib/facter/resolvers/windows/identity.rb

@@ -11,7 +11,7 @@ module Facter
       class << self
         private
 
-        def post_resolve(fact_name)
+        def post_resolve(fact_name, _options)
           @fact_list.fetch(fact_name) { retrieve_facts(fact_name) }
         end
 

data/lib/facter/resolvers/windows/kernel.rb

@@ -10,7 +10,7 @@ module Facter
       class << self
         private
 
-        def post_resolve(fact_name)
+        def post_resolve(fact_name, _options)
           @fact_list.fetch(fact_name) { read_os_version_information(fact_name) }
         end
 

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

@@ -10,7 +10,7 @@ module Facter
       class << self
         private
 
-        def post_resolve(fact_name)
+        def post_resolve(fact_name, _options)
           @fact_list.fetch(fact_name) { validate_info(fact_name) }
         end
 

data/lib/facter/resolvers/windows/netkvm.rb

@@ -10,7 +10,7 @@ module Facter
       class << self
         private
 
-        def post_resolve(fact_name)
+        def post_resolve(fact_name, _options)
           @fact_list.fetch(fact_name) { read_fact_from_registry(fact_name) }
         end
 

data/lib/facter/resolvers/windows/networking.rb

@@ -10,7 +10,7 @@ module Facter
         class << self
           private
 
-          def post_resolve(fact_name)
+          def post_resolve(fact_name, _options)
             @fact_list.fetch(fact_name) { read_network_information(fact_name) }
           end
 
@@ -24,12 +24,12 @@ module Facter
 
             return unless (adapter_addresses = get_adapter_addresses(size_ptr, adapter_addresses, flags))
 
+            retrieve_domain_from_registry
+
             iterate_list(adapter_addresses)
 
             Facter::Util::Resolvers::Networking.expand_main_bindings(@fact_list)
 
-            retrieve_domain_from_registry if !@fact_list[:domain] || @fact_list[:domain].empty?
-
             @fact_list[fact_name]
           end
 
@@ -71,7 +71,11 @@ module Facter
                 adapter_address = IpAdapterAddressesLh.new(adapter_address[:Next])
                 next
               end
-              @fact_list[:domain] ||= adapter_address[:DnsSuffix].read_wide_string_without_length
+
+              if !@fact_list[:domain] || @fact_list[:domain].empty?
+                @fact_list[:domain] = adapter_address[:DnsSuffix].read_wide_string_without_length
+              end
+
               name = adapter_address[:FriendlyName].read_wide_string_without_length
               net_interface[name] = build_interface_info(adapter_address, name)
             end

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

@@ -13,7 +13,7 @@ module Facter
 
         private
 
-        def post_resolve(fact_name)
+        def post_resolve(fact_name, _options)
           @fact_list.fetch(fact_name) { read_fact_from_win32_processor(fact_name) }
         end
 

data/lib/facter/resolvers/windows/product_release.rb

@@ -10,7 +10,7 @@ module Facter
       class << self
         private
 
-        def post_resolve(fact_name)
+        def post_resolve(fact_name, _options)
           @fact_list.fetch(fact_name) { read_fact_from_registry(fact_name) }
         end
 

data/lib/facter/resolvers/windows/ssh.rb

@@ -13,7 +13,7 @@ module Facter
         class << self
           private
 
-          def post_resolve(fact_name)
+          def post_resolve(fact_name, _options)
             @fact_list.fetch(fact_name) { retrieve_info(fact_name) }
           end
 

data/lib/facter/resolvers/windows/system32.rb

@@ -10,7 +10,7 @@ module Facter
       class << self
         private
 
-        def post_resolve(fact_name)
+        def post_resolve(fact_name, _options)
           @fact_list.fetch(fact_name) { retrieve_windows_binaries_path }
         end
 

data/lib/facter/resolvers/windows/uptime.rb

@@ -13,7 +13,7 @@ module Facter
         class << self
           private
 
-          def post_resolve(fact_name)
+          def post_resolve(fact_name, _options)
             @fact_list.fetch(fact_name) { calculate_system_uptime(fact_name) }
           end
 

data/lib/facter/resolvers/windows/virtualization.rb

@@ -16,7 +16,7 @@ module Facter
 
         private
 
-        def post_resolve(fact_name)
+        def post_resolve(fact_name, _options)
           @fact_list.fetch(fact_name) { read_fact_from_computer_system(fact_name) }
         end
 

data/lib/facter/resolvers/windows/win_os_description.rb

@@ -10,7 +10,7 @@ module Facter
       class << self
         private
 
-        def post_resolve(fact_name)
+        def post_resolve(fact_name, _options)
           @fact_list.fetch(fact_name) { read_from_ole(fact_name) }
         end
 

data/lib/facter/resolvers/wpar.rb

@@ -8,7 +8,7 @@ module Facter
       class << self
         private
 
-        def post_resolve(fact_name)
+        def post_resolve(fact_name, _options)
           @fact_list.fetch(fact_name) { read_wpar(fact_name) }
         end
 

data/lib/facter/resolvers/xen.rb

@@ -12,7 +12,7 @@ module Facter
       class << self
         private
 
-        def post_resolve(fact_name)
+        def post_resolve(fact_name, _options)
           @fact_list.fetch(fact_name) { detect_xen(fact_name) }
         end
 

data/lib/facter/resolvers/zfs.rb

@@ -8,7 +8,7 @@ module Facter
       class << self
         private
 
-        def post_resolve(fact_name)
+        def post_resolve(fact_name, _options)
           @fact_list.fetch(fact_name) { zfs_fact(fact_name) }
         end
 

data/lib/facter/resolvers/zpool.rb

@@ -8,7 +8,7 @@ module Facter
       class << self
         private
 
-        def post_resolve(fact_name)
+        def post_resolve(fact_name, _options)
           @fact_list.fetch(fact_name) { zpool_fact(fact_name) }
         end
 

data/lib/facter/util/facts/facts_utils.rb

@@ -24,6 +24,23 @@ module Facter
           FAMILY_HASH.each { |key, array_value| return key if array_value.any? { |os_flavour| os =~ /#{os_flavour}/i } }
           os
         end
+
+        def release_hash_from_string(output)
+          return unless output
+
+          versions = output.split('.')
+          {}.tap do |release|
+            release['full'] = output
+            release['major'] = versions[0]
+            release['minor'] = versions[1] if versions[1]
+          end
+        end
+
+        def release_hash_from_matchdata(data)
+          return if data.nil? || data[1].nil?
+
+          release_hash_from_string(data[1].to_s)
+        end
       end
     end
   end

data/lib/facter/util/facts/unit_converter.rb

@@ -17,10 +17,9 @@ module Facter
             speed = speed.to_i
             return if !speed || speed.zero?
 
-            prefix = { 3 => 'k', 6 => 'M', 9 => 'G', 12 => 'T' }
-            power = Math.log10(speed).floor
-            validated_speed = power.zero? ? speed.to_f : speed.fdiv(10**power)
-            format('%<displayed_speed>.2f', displayed_speed: validated_speed).to_s + ' ' + prefix[power] + 'Hz'
+            validated_speed, metric_prefix = determine_metric_prefix(speed)
+
+            format('%<displayed_speed>.2f', displayed_speed: validated_speed).to_s + ' ' + metric_prefix + 'Hz'
           end
 
           def bytes_to_human_readable(bytes)
@@ -54,6 +53,14 @@ module Facter
             converted_number = bytes if multiple == 'bytes'
             [converted_number, multiple]
           end
+
+          def determine_metric_prefix(num)
+            metric_prefix = { 0 => '', 3 => 'k', 6 => 'M', 9 => 'G', 12 => 'T' }
+            power = Math.log10(num).floor
+            display_exponent = power - power % 3
+            coefficient = power.zero? ? num.to_f : num.fdiv(10**display_exponent)
+            [coefficient, metric_prefix[display_exponent]]
+          end
         end
       end
     end