facter 4.5.2 → 4.6.1

data/lib/facter/framework/core/options/config_file_options.rb

@@ -60,10 +60,8 @@ module Facter
       def augment_custom(file_global_conf)
         return unless file_global_conf
 
-        if Options.cli?
-          unless file_global_conf['no-custom-facts'].nil?
-            @options[:no_custom_facts] = file_global_conf['no-custom-facts']
-          end
+        if Options.cli? && !file_global_conf['no-custom-facts'].nil?
+          @options[:no_custom_facts] = file_global_conf['no-custom-facts']
         end
 
         @options[:custom_dir] = file_global_conf['custom-dir'] unless file_global_conf['custom-dir'].nil?
@@ -73,8 +71,8 @@ module Facter
       def augment_external(global_conf)
         return unless global_conf
 
-        if Options.cli?
-          @options[:no_external_facts] = global_conf['no-external-facts'] unless global_conf['no-external-facts'].nil?
+        if Options.cli? && !global_conf['no-external-facts'].nil?
+          @options[:no_external_facts] = global_conf['no-external-facts']
         end
 
         @options[:external_dir] = [global_conf['external-dir']].flatten unless global_conf['external-dir'].nil?

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

@@ -14,7 +14,8 @@ module Facter
 
       user_query = user_queries.first
       return format_for_no_query(resolved_facts) if user_query.empty?
-      return format_for_single_user_query(user_queries.first, resolved_facts) unless user_query.empty?
+
+      format_for_single_user_query(user_queries.first, resolved_facts) unless user_query.empty?
     end
 
     private
@@ -39,7 +40,7 @@ module Facter
 
       return '' unless fact_value
 
-      fact_value.class == Hash ? hash_to_hocon(fact_value) : fact_value
+      fact_value.instance_of?(Hash) ? hash_to_hocon(fact_value) : fact_value
     end
 
     def hash_to_hocon(fact_collection)

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

@@ -42,7 +42,7 @@ module Facter
       pretty_json = handle_newlines(pretty_json)
 
       @log.debug('Remove quotes from value if value is a string')
-      pretty_json.gsub(/^(\S*) => \"(.*)\"/, '\1 => \2')
+      pretty_json.gsub(/^(\S*) => "(.*)"/, '\1 => \2')
     end
 
     def format_for_single_user_query(user_query, resolved_facts)
@@ -55,7 +55,7 @@ module Facter
       pretty_json = fact_value.nil? ? '' : hash_to_facter_format(fact_value)
 
       @log.debug('Remove quotes from value if it is a simple string')
-      pretty_json.gsub(/^"(.*)\"/, '\1')
+      pretty_json.gsub(/^"(.*)"/, '\1')
     end
 
     def hash_to_facter_format(facts_hash)
@@ -66,7 +66,7 @@ module Facter
       pretty_json.gsub!(/":\s/, '" => ')
 
       @log.debug('Remove quotes from parent nodes')
-      pretty_json.gsub!(/\"(.*)\"\ =>/, '\1 =>')
+      pretty_json.gsub!(/"(.*)"\ =>/, '\1 =>')
 
       @log.debug('Remove double backslashes from paths')
       pretty_json.gsub(/\\\\/, '\\')
@@ -95,7 +95,7 @@ module Facter
       # quotation marks that come after \ are not removed
       @log.debug('Remove unnecessary comma and quotation marks on root facts')
       output.split("\n")
-            .map! { |line| /^[\s]+/.match?(line) ? line : line.gsub(/,$|(?<!\\)\"/, '').gsub('\\"', '"') }.join("\n")
+            .map! { |line| /^\s+/.match?(line) ? line : line.gsub(/,$|(?<!\\)"/, '').gsub('\\"', '"') }.join("\n")
     end
   end
 end

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

@@ -107,7 +107,7 @@ module Facter
         @@message_callback.call(:debug, msg)
       else
         msg = colorize(msg, CYAN) if Options[:color]
-        @@logger.debug(@class_name + ' - ' + msg)
+        @@logger.debug("#{@class_name} - #{msg}")
       end
     end
 
@@ -128,7 +128,7 @@ module Facter
         @@message_callback.call(:info, msg)
       else
         msg = colorize(msg, GREEN) if Options[:color]
-        @@logger.info(@class_name + ' - ' + msg)
+        @@logger.info("#{@class_name} - #{msg}")
       end
     end
 
@@ -137,7 +137,7 @@ module Facter
         @@message_callback.call(:warn, msg)
       else
         msg = colorize(msg, YELLOW) if Options[:color]
-        @@logger.warn(@class_name + ' - ' + msg)
+        @@logger.warn("#{@class_name} - #{msg}")
       end
     end
 
@@ -149,20 +149,20 @@ module Facter
       warn(message_string)
     end
 
-    def error(msg, colorize = false)
+    def error(msg, colorize = false) # rubocop:disable Style/OptionalBooleanParameter
       @@has_errors = true
 
       if @@message_callback && Options[:allow_external_loggers]
         @@message_callback.call(:error, msg)
       else
         msg = colorize(msg, RED) if colorize || Options[:color]
-        @@logger.error(@class_name + ' - ' + msg)
+        @@logger.error("#{@class_name} - #{msg}")
       end
     end
 
     def log_exception(exception)
       msg = exception.message
-      msg += "\n" + exception.backtrace.join("\n") if Options[:trace]
+      msg += "\n#{exception.backtrace.join("\n")}" if Options[:trace]
 
       error(msg, true)
     end

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

@@ -3,17 +3,16 @@
 class LoggerHelper
   class << self
     def determine_callers_name(sender_self)
-      class_name = case sender_self
-                   when String
-                     sender_self
-                   when Class
-                     sender_self.name
-                   when Module
-                     sender_self.name
-                   else # when class is singleton
-                     sender_self.class.name
-                   end
-      class_name
+      case sender_self
+      when String
+        sender_self
+      when Class
+        sender_self.name
+      when Module
+        sender_self.name
+      else # when class is singleton
+        sender_self.class.name
+      end
     end
   end
 end

data/lib/facter/resolvers/aix/ffi/ffi_helper.rb

@@ -77,7 +77,7 @@ module Facter
 
               family = FFI::AF_UNSPEC
 
-              addresses.each do |_k, addr|
+              addresses.each_value do |addr|
                 if family != FFI::AF_UNSPEC &&
                    addr[:sa_family] != FFI::AF_UNSPEC &&
                    family != addr[:sa_family]

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

@@ -47,7 +47,7 @@ module Facter
 
               info = line.split("\s")
               interface_name = info[0]
-              mac = info[3][/^([0-9a-f]{1,2}[\.:-]){5}([0-9a-f]{1,2})$/]
+              mac = info[3][/^([0-9a-f]{1,2}[.:-]){5}([0-9a-f]{1,2})$/]
               if interfaces[interface_name]
                 interfaces[interface_name][:mtu] = info[1].to_i
                 interfaces[interface_name][:mac] = format_mac_address(mac) if mac

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

@@ -22,7 +22,7 @@ module Facter
 
             result.each_line do |line|
               if line.include?('value')
-                @fact_list[:serialnumber] = line.split('=')[1].strip.delete('\"')[6..-1]
+                @fact_list[:serialnumber] = line.split('=')[1].strip.delete('\"')[6..]
                 break
               end
             end

data/lib/facter/resolvers/amzn/os_release_rpm.rb

@@ -15,7 +15,7 @@ module Facter
 
           def rpm_system_call(fact_name)
             output = Facter::Core::Execution.execute(
-              'rpm -q --qf \'%{NAME}\n%{VERSION}\n%{RELEASE}\n%{VENDOR}\' -f /etc/os-release',
+              'rpm -q --qf \'%<NAME>s\n%<VERSION>s\n%<RELEASE>s\n%<VENDOR>s\' -f /etc/os-release',
               logger: log
             )
             build_fact_list(output)

data/lib/facter/resolvers/dmi.rb

@@ -22,6 +22,7 @@ module Facter
           # :product_serial
           # :product_name
           # :product_uuid
+          # :product_version
 
           private
 
@@ -32,7 +33,7 @@ module Facter
           def read_facts(fact_name)
             files = %w[bios_date bios_vendor bios_version board_asset_tag board_vendor board_name
                        board_serial chassis_asset_tag chassis_type sys_vendor product_name
-                       product_serial product_uuid]
+                       product_serial product_uuid product_version]
             return unless File.directory?('/sys/class/dmi')
 
             file_content = Facter::Util::FileHelper.safe_read("/sys/class/dmi/id/#{fact_name}", nil)

data/lib/facter/resolvers/fips_enabled.rb

@@ -4,7 +4,7 @@ module Facter
   module Resolvers
     module Linux
       class FipsEnabled < BaseResolver
-        #:fips_enabled
+        # :fips_enabled
 
         init_resolver
 

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

@@ -7,7 +7,7 @@ module Facter
         init_resolver
 
         class << self
-          #:model
+          # :model
 
           private
 

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

@@ -15,7 +15,7 @@ module Facter
 
           def read_swap_memory(fact_name)
             output = Facter::Core::Execution.execute('swapinfo -k', logger: log)
-            data = output.split("\n")[1..-1].map { |line| line.split(/\s+/) }
+            data = output.split("\n")[1..].map { |line| line.split(/\s+/) }
 
             unless data.empty?
               @fact_list[:total_bytes]     = kilobytes_to_bytes(data.map { |line| line[1].to_i }.inject(:+))

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

@@ -7,7 +7,7 @@ module Facter
         init_resolver
 
         class << self
-          #:model
+          # :model
 
           VM_GUEST_SYSCTL_NAMES = {
             'hv' => 'hyperv',

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

@@ -50,7 +50,7 @@ module Facter
             end
 
             log.debug("Tried to retrieve hostname and got: #{output}")
-            return output unless output&.empty?
+            output unless output&.empty?
           end
 
           def parse_fqdn(output)

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

@@ -7,7 +7,7 @@ module Facter
         init_resolver
 
         class << self
-          #:model
+          # :model
 
           private
 

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

@@ -16,7 +16,7 @@ module Facter
 
           def read_filesystems(fact_name)
             output = Facter::Core::Execution.execute('mount', logger: log)
-            filesystems = output.scan(/\(([a-z]+)\,*/).flatten
+            filesystems = output.scan(/\(([a-z]+),*/).flatten
             @fact_list[:macosx_filesystems] = filesystems.uniq.sort.join(',')
             @fact_list[fact_name]
           end

data/lib/facter/resolvers/memory.rb

@@ -57,7 +57,7 @@ module Facter
           end
 
           def compute_capacity(used, total)
-            format('%<computed_capacity>.2f', computed_capacity: (used / total.to_f * 100)) + '%'
+            "#{format('%<computed_capacity>.2f', computed_capacity: (used / total.to_f * 100))}%"
           end
 
           def compute_used(total, free)

data/lib/facter/resolvers/networking.rb

@@ -39,12 +39,12 @@ module Facter
           # convert ip ranges into single ip. eg. 10.16.132.213 -->  10.16.132.213 is converted to 10.16.132.213
           # convert ip6 ranges into single ip. eg. 2001:db8:cafe::132:213 -->
           # 2001:db8:cafe::132:213 is converted to 2001:db8:cafe::132:213
-          response.gsub!(/([\da-fA-F]+([\.:]+[\da-fA-F]+)*)\s+-->\s+[\da-fA-F]+([\.:]+[\da-fA-F]+)*/, '\\1')
+          response.gsub!(/([\da-fA-F]+([.:]+[\da-fA-F]+)*)\s+-->\s+[\da-fA-F]+([.:]+[\da-fA-F]+)*/, '\\1')
         end
 
         def parse_interfaces_response(response)
           parsed_interfaces_data = {}
-          interfaces_data = Hash[*response.split(/^([A-Za-z0-9_\.]+): /)[1..-1]]
+          interfaces_data = Hash[*response.split(/^([A-Za-z0-9_.]+): /)[1..]]
 
           interfaces_data.each do |interface_name, raw_data|
             parsed_interface_data = {}
@@ -66,7 +66,7 @@ module Facter
 
         def extract_mac(raw_data, parsed_interface_data)
           mac = raw_data.match(/(?:ether|lladdr)\s+((?:\w?\w:){5}\w?\w)|(?:infiniband)\s+((?:\w?\w:){19}\w?\w)/)
-                       &.captures&.compact&.first
+                        &.captures&.compact&.first
           parsed_interface_data[:mac] = mac unless mac.nil?
         end
 

data/lib/facter/resolvers/os_release.rb

@@ -110,7 +110,7 @@ module Facter
 
         def append_linux_to_os_name
           os_name = @fact_list[:name]
-          @fact_list[:name] = os_name + 'Linux' if os_name.downcase.start_with?('virtuozzo')
+          @fact_list[:name] = "#{os_name}Linux" if os_name.downcase.start_with?('virtuozzo')
         end
       end
     end

data/lib/facter/resolvers/partitions.rb

@@ -112,9 +112,9 @@ module Facter
 
         def execute_and_extract_blkid_info
           stdout = Facter::Core::Execution.execute('blkid', logger: log)
-          output_hash = Hash[*stdout.split(/^([^:]+):/)[1..-1]]
+          output_hash = Hash[*stdout.split(/^([^:]+):/)[1..]]
           output_hash.each do |key, value|
-            output_hash[key] = Hash[*value.delete('"').chomp.rstrip.split(/ ([^= ]+)=/)[1..-1]]
+            output_hash[key] = Hash[*value.delete('"').chomp.rstrip.split(/ ([^= ]+)=/)[1..]]
           end
         end
 

data/lib/facter/resolvers/processors_lscpu.rb

@@ -10,8 +10,8 @@ module Facter
                   cores_per_socket: "-e 'Core(s)'" }.freeze
 
         class << self
-          #:cores_per_socket
-          #:threads_per_core
+          # :cores_per_socket
+          # :threads_per_core
 
           private
 

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 require 'ffi'
-require_relative 'structs.rb'
-require_relative 'functions.rb'
+require_relative 'structs'
+require_relative 'functions'
 
 module Facter
   module Resolvers

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

@@ -23,7 +23,7 @@ module Facter
             end
           end
 
-          def read_mounts(fact_name) # rubocop:disable Metrics/MethodLength
+          def read_mounts(fact_name)
             @mounts = []
             @auto_home_paths = []
             begin

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'ffi/ffi.rb'
+require_relative 'ffi/ffi'
 module Facter
   module Resolvers
     module Solaris

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

@@ -26,7 +26,7 @@ module Facter
 
               @fact_list[:major] = major
               @fact_list[:minor] = minor
-              @fact_list[:full] = major == '10' ? major + '_u' + minor : major + '.' + minor
+              @fact_list[:full] = major == '10' ? "#{major}_u#{minor}" : "#{major}.#{minor}"
               break
             end
             @fact_list[fact_name]
@@ -36,7 +36,7 @@ module Facter
             result = text.match(regex_pattern)
             major, minor = result.captures if result
             minor = regex_pattern == /Solaris (\d+)/ ? '0' : minor
-            return [major, minor] if major && minor
+            [major, minor] if major && minor
           end
         end
       end

data/lib/facter/resolvers/virt_what.rb

@@ -30,7 +30,8 @@ module Facter
           xen_info = xen_info.to_s
           return 'xenu' if /xen-domu/.match?(xen_info)
           return 'xenhvm' if /xen-hvm/.match?(xen_info)
-          return 'xen0' if /xen-dom0/.match?(xen_info)
+
+          'xen0' if /xen-dom0/.match?(xen_info)
         end
 
         def determine_other(output)

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

@@ -58,8 +58,9 @@ module Facter
           @fact_list[:total_bytes] = result[:total_bytes]
           @fact_list[:available_bytes] = result[:available_bytes]
           @fact_list[:used_bytes] = result[:used_bytes]
-          @fact_list[:capacity] = format('%<capacity>.2f',
-                                         capacity: (result[:used_bytes] / result[:total_bytes].to_f * 100)) + '%'
+          @fact_list[:capacity] = format(
+            '%<capacity>.2f%%', capacity: (result[:used_bytes] / result[:total_bytes].to_f * 100)
+          )
         end
       end
     end

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

@@ -23,19 +23,19 @@ module Facter
         end
 
         def build_fact_list(reg)
-          reg.each do |name, _value|
+          reg.each do |name, _type, value|
             case name
             when 'EditionID'
-              @fact_list[:edition_id] = reg[name]
+              @fact_list[:edition_id] = value
             when 'InstallationType'
-              @fact_list[:installation_type] = reg[name]
+              @fact_list[:installation_type] = value
             when 'ProductName'
-              @fact_list[:product_name] = reg[name]
+              @fact_list[:product_name] = value
             when 'DisplayVersion'
-              @fact_list[:release_id] = reg[name]
-              @fact_list[:display_version] = reg[name]
+              @fact_list[:release_id] = value
+              @fact_list[:display_version] = value
             when 'ReleaseId'
-              @fact_list[:release_id] = reg[name] unless @fact_list[:release_id]
+              @fact_list[:release_id] = value unless @fact_list[:release_id]
             end
           end
         end

data/lib/facter/util/aix/odm_query.rb

@@ -38,7 +38,7 @@ module Facter
         end
 
         def query
-          'odmget -q "' + @conditions.join(' AND ') + '"'
+          "odmget -q \"#{@conditions.join(' AND ')}\""
         end
       end
     end

data/lib/facter/util/api_debugger.rb

@@ -34,9 +34,9 @@ module Facter
 
         options.split(',').each do |option|
           if option.start_with?('-')
-            exclude << option[1..-1].to_sym
+            exclude << option[1..].to_sym
           elsif option.start_with?('+')
-            print_caller << option[1..-1].to_sym
+            print_caller << option[1..].to_sym
           end
         end
 

data/lib/facter/util/facts/posix/virtual_detector.rb

@@ -7,11 +7,10 @@ module Facter
         module VirtualDetector
           class << self
             def platform
-              @@fact_value ||= check_docker_lxc || check_freebsd || check_gce || retrieve_from_virt_what
-              @@fact_value ||= check_vmware || check_open_vz || check_vserver || check_xen || check_other_facts
-              @@fact_value ||= check_lspci || 'physical'
-
-              @@fact_value
+              @fact_value ||= # rubocop:disable Naming/MemoizedInstanceVariableName
+                check_docker_lxc || check_freebsd || check_gce || check_illumos_lx || \
+                retrieve_from_virt_what || check_vmware || check_open_vz || check_vserver || \
+                check_xen || check_other_facts || check_lspci || 'physical'
             end
 
             private
@@ -25,6 +24,10 @@ module Facter
               'gce' if bios_vendor&.include?('Google')
             end
 
+            def check_illumos_lx
+              'illumos-lx' if Facter::Resolvers::Uname.resolve(:kernelversion) == 'BrandZ virtual linux'
+            end
+
             def check_vmware
               Facter::Resolvers::Vmware.resolve(:vm)
             end

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

@@ -19,12 +19,12 @@ module Facter
 
             validated_speed, metric_prefix = determine_metric_prefix(speed)
 
-            format('%<displayed_speed>.2f', displayed_speed: validated_speed.round(2)).to_s + ' ' + metric_prefix + 'Hz'
+            "#{format('%<displayed_speed>.2f', displayed_speed: validated_speed.round(2))} #{metric_prefix}Hz"
           end
 
           def bytes_to_human_readable(bytes)
             return unless bytes
-            return bytes.to_s + ' bytes' if bytes < 1024
+            return "#{bytes} bytes" if bytes < 1024
 
             number, multiple = determine_exponent(bytes)
 

data/lib/facter/util/file_helper.rb

@@ -27,8 +27,7 @@ module Facter
         # method, we can't remove it entirely until the next major Facter
         # release (presumably Facter 5).
         def dir_children(path)
-          children = Dir.children(path)
-          children
+          Dir.children(path)
         end
 
         private

data/lib/facter/util/macosx/system_profile_executor.rb

@@ -23,12 +23,12 @@ module Facter
           private
 
           def output_to_hash(output)
-            output.scan(/.*:[ ].*$/).map { |e| e.strip.match(/(.*?): (.*)/).captures }.to_h
+            output.scan(/.*: .*$/).map { |e| e.strip.match(/(.*?): (.*)/).captures }.to_h
           end
 
           def normalize_keys(system_profiler_hash)
-            system_profiler_hash.map do |k, v|
-              [k.downcase.tr(' ', '_').delete("\(\)").to_sym, v]
+            system_profiler_hash.transform_keys do |k|
+              k.downcase.tr(' ', '_').delete("\(\)").to_sym
             end.to_h
           end
         end

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

@@ -54,7 +54,8 @@ module Facter
                         'site'
                       elsif addrinfo.ipv6_loopback?
                         'host'
-                      else 'global'
+                      else
+                        'global'
                       end
             scope6.join
           end
@@ -102,7 +103,7 @@ module Facter
           def expand_interfaces(interfaces)
             interfaces.each_value do |values|
               expand_binding(values, values[:bindings]) if values[:bindings]
-              expand_binding(values, values[:bindings6], false) if values[:bindings6]
+              expand_binding(values, values[:bindings6], ipv4_type: false) if values[:bindings6]
             end
           end
 
@@ -112,7 +113,7 @@ module Facter
             end
           end
 
-          def expand_binding(values, bindings, ipv4_type = true)
+          def expand_binding(values, bindings, ipv4_type: true)
             binding = find_valid_binding(bindings)
             ip_protocol_type = ipv4_type ? '' : '6'
 

data/lib/facter/util/utils.rb

@@ -3,10 +3,10 @@
 module Facter
   module Utils
     # Sort nested hash.
-    def self.sort_hash_by_key(hash, recursive = true, &block)
+    def self.sort_hash_by_key(hash, recursive: true, &block)
       hash.keys.sort(&block).each_with_object(hash.class.new) do |key, seed|
         seed[key] = hash[key]
-        seed[key] = sort_hash_by_key(seed[key], true, &block) if recursive && seed[key].is_a?(Hash)
+        seed[key] = sort_hash_by_key(seed[key], recursive: true, &block) if recursive && seed[key].is_a?(Hash)
 
         seed
       end

data/lib/facter/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Facter
-  VERSION = '4.5.2' unless defined?(VERSION)
+  VERSION = '4.6.1' unless defined?(VERSION)
 end

data/lib/facter.rb

@@ -653,6 +653,13 @@ module Facter
       nil
     end
 
+    # We don't respond to any missing methods
+    #
+    # @api private
+    def respond_to_missing?(_method, *)
+      false
+    end
+
     prepend ApiDebugger if ENV['API_DEBUG']
   end
 end