facter 4.5.1 → 4.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb4ad4e8f37099548b19f8b37bc43b11b2f2ba2cfe28df31ffc30b4d8b6aac87
-  data.tar.gz: d978305277df30b5f97116aab7d96f1935de8e35db2cee3fdab1aa28db694a78
+  metadata.gz: 9cde774257133c7283c2bd6a697e8892d2614ee63d89b52d64648eb6cb8e92c2
+  data.tar.gz: a24ba725108a86b796e07cfd01f3f9ed11c03558f7fba8df77e213fbc48c3c62
 SHA512:
-  metadata.gz: 9a0ebd49f8a7ddae37b97c4c2430b93f3fb18b462203daa6544bdfcdbdc28a3c4f1df5b90bbabb17a17fa2e8a1cef28f467e1b5cad70547c616e95e1051c1688
-  data.tar.gz: ef0687cb134a6d37e1d4a35ba8047ca134230e0834f5354fc8a3ce6463999b0f237c265b4dbf1d55f45a2cf12276f207f4c5756afd62bbcf2b61abb19ccf0eaa
+  metadata.gz: 2fa441a192b26deafd97f2cda183d2aff0194dcdbd40fb7c75c610cb8e3678fbefdd29d16d7f262da3d6e45f89f99a87cdaf305100552e1d8bf4050a4fe7562d
+  data.tar.gz: a512d5720fcd1d4af1b4334a1d99831642c0cecf9f0f6a61d37d9561fa83b2eda4f1724c81b2afb324502a7171a77c7b837275f3f8530de872c6fc51d19c9217

data/bin/facter

@@ -2,7 +2,7 @@
 # frozen_string_literal: true
 
 require 'pathname'
-require 'facter/framework/cli/cli_launcher.rb'
+require 'facter/framework/cli/cli_launcher'
 
 Facter::OptionsValidator.validate(ARGV)
 processed_arguments = CliLauncher.prepare_arguments(ARGV)

data/lib/docs/generate.rb

@@ -17,12 +17,7 @@ def format_facts(fact_hash)
   scope = OpenStruct.new({
                            facts: fact_hash
                          })
-
-  erb = if ERB.instance_method(:initialize).parameters.assoc(:key) # Ruby 2.6+
-          ERB.new(File.read(PATH_TO_TEMPLATE), trim_mode: '-')
-        else
-          ERB.new(File.read(PATH_TO_TEMPLATE), nil, '-')
-        end
+  erb = ERB.new(File.read(PATH_TO_TEMPLATE), trim_mode: '-')
   erb.result(scope.instance_eval { binding })
 end
 

data/lib/facter/custom_facts/core/directed_graph.rb

@@ -22,10 +22,8 @@ module LegacyFacter
 
       alias tsort_each_node each_key
 
-      def tsort_each_child(node)
-        fetch(node, []).each do |child|
-          yield child
-        end
+      def tsort_each_child(node, &block)
+        fetch(node, []).each(&block)
       end
 
       def tsort

data/lib/facter/custom_facts/core/execution/base.rb

@@ -30,7 +30,7 @@ module Facter
         # use an ensure block to make absolutely sure we restore the variables
         ensure
           # restore the old values
-          values.each do |var, _value|
+          values.each_key do |var|
             if old.include?(var)
               ENV[var] = old[var]
             else

data/lib/facter/custom_facts/core/execution/posix.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Facter
   module Core
     module Execution
@@ -36,7 +38,8 @@ module Facter
           exe = nil
           args = nil
 
-          if (match = (command.match(DOUBLE_QUOTED_COMMAND) || command.match(SINGLE_QUOTED_COMMAND)))
+          match = command.match(DOUBLE_QUOTED_COMMAND) || command.match(SINGLE_QUOTED_COMMAND)
+          if match
             exe, args = match.captures
           else
             exe, args = command.split(/ /, 2)
@@ -44,7 +47,8 @@ module Facter
 
           return unless exe && (expanded = which(exe))
 
-          expanded = "'#{expanded}'" if /\s/.match?(expanded)
+          expanded = expanded.dup
+          expanded = +"'#{expanded}'" if /\s/.match?(expanded)
           expanded << " #{args}" if args
 
           expanded

data/lib/facter/custom_facts/core/execution/windows.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Facter
   module Core
     module Execution
@@ -56,7 +58,8 @@ module Facter
 
           return unless exe && (expanded = which(exe))
 
-          expanded = "\"#{expanded}\"" if /\s+/.match?(expanded)
+          expanded = expanded.dup
+          expanded = +"\"#{expanded}\"" if /\s+/.match?(expanded)
           expanded << " #{args}" if args
 
           expanded

data/lib/facter/custom_facts/core/execution.rb

@@ -3,7 +3,7 @@
 module Facter
   module Core
     module Execution
-      @@impl = if LegacyFacter::Util::Config.windows?
+      @@impl = if LegacyFacter::Util::Config.windows? # rubocop:disable Style/ClassVars
                  Facter::Core::Execution::Windows.new
                else
                  Facter::Core::Execution::Posix.new

data/lib/facter/custom_facts/core/file_loader.rb

@@ -2,14 +2,12 @@
 
 require_relative '../../../facter/custom_facts/util/fact'
 require_relative '../../../facter/custom_facts/util/collection'
-require_relative '../../../facter/custom_facts/util/fact'
 require_relative '../../../facter/custom_facts/util/loader'
 require_relative '../../../facter/custom_facts/core/execution/base'
 require_relative '../../../facter/custom_facts/core/execution/windows'
 require_relative '../../../facter/custom_facts/core/execution/posix'
 require_relative '../../../facter/custom_facts/util/values'
 require_relative '../../../facter/custom_facts/util/confine'
-
 require_relative '../../../facter/custom_facts/util/config'
 
 require_relative '../../../facter/custom_facts/util/normalization'
@@ -18,10 +16,8 @@ require_relative '../../../facter/custom_facts/core/resolvable'
 require_relative '../../../facter/custom_facts/core/suitable'
 require_relative '../../../facter/custom_facts/util/resolution'
 require_relative '../../../facter/custom_facts/core/directed_graph'
-require_relative '../../../facter/custom_facts/core/resolvable'
 require_relative '../../../facter/custom_facts/core/aggregate'
 require_relative '../../../facter/custom_facts/util/composite_loader'
 require_relative '../../../facter/custom_facts/util/parser'
 require_relative '../../../facter/custom_facts/util/directory_loader'
 require_relative '../../../facter/custom_facts/util/nothing_loader'
-require_relative '../../../facter/custom_facts/util/nothing_loader'

data/lib/facter/custom_facts/core/suitable.rb

@@ -18,7 +18,7 @@ module LegacyFacter
       # @return [void]
       #
       # @api public
-      def has_weight(weight)
+      def has_weight(weight) # rubocop:disable Naming/PredicateName
         @weight = weight
         self
       end

data/lib/facter/custom_facts/util/collection.rb

@@ -80,7 +80,7 @@ module LegacyFacter
 
       # Flush all cached values.
       def flush
-        @facts.each { |_name, fact| fact.flush }
+        @facts.each_value(&:flush)
         @external_facts_loaded = nil
       end
 
@@ -134,9 +134,7 @@ module LegacyFacter
         load_external_facts
       end
 
-      attr_reader :internal_loader
-
-      attr_reader :external_loader
+      attr_reader :internal_loader, :external_loader
 
       # Return a hash of all of our facts.
       def to_hash

data/lib/facter/custom_facts/util/confine.rb

@@ -63,7 +63,10 @@ module LegacyFacter
           end
         end
 
-        @values.any? { |v| convert(v) === value }
+        # we're intentionally using case equality (triple equals) because we
+        # support matching against anything that supports === such as ranges,
+        # regular expressions, etc
+        @values.any? { |v| convert(v) === value } # rubocop:disable Style/CaseEquality
       end
 
       private

data/lib/facter/custom_facts/util/fact.rb

@@ -86,7 +86,7 @@ module Facter
         resolve
       rescue StandardError => e
         msg = "Unable to add resolve #{resolution_name.inspect} for fact '#{@name}': #{e.message}"
-        msg += "\n" + e.backtrace.join("\n") if Options[:trace]
+        msg += "\n#{e.backtrace.join("\n")}" if Options[:trace]
         log.error(msg, true)
         nil
       end

data/lib/facter/custom_facts/util/loader.rb

@@ -18,7 +18,7 @@ module LegacyFacter
         shortname = fact.to_s.downcase
         load_env(shortname)
 
-        filename = shortname + '.rb'
+        filename = "#{shortname}.rb"
 
         paths = search_path
         paths&.each do |dir|
@@ -40,7 +40,7 @@ module LegacyFacter
         paths = search_path
         paths&.each do |dir|
           # clean the search path of wrong slashes and backslashes
-          dir = dir.gsub(%r{[\/\\]+}, File::SEPARATOR)
+          dir = dir.gsub(%r{[/\\]+}, File::SEPARATOR)
           # dir is already an absolute path
           Dir.glob(File.join(dir, '*.rb')).each do |path|
             # exclude dirs that end with .rb

data/lib/facter/custom_facts/util/resolution.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # This represents a fact resolution. A resolution is a concrete
 # implementation of a fact. A single fact can have many resolutions and
 # the correct resolution will be chosen at runtime. Each time
@@ -88,7 +90,7 @@ module Facter
       # @api private
       def evaluate(&block)
         if @last_evaluated
-          msg = "Already evaluated #{@name}"
+          msg = +"Already evaluated #{@name}"
           msg << " at #{@last_evaluated}" if msg.is_a? String
           msg << ', reevaluating anyways'
           log.warn msg
@@ -157,9 +159,11 @@ module Facter
       #
       # @api private
       def <=>(other)
-        return compare_equal_weights(other) if weight == other.weight
-        return 1 if weight > other.weight
-        return -1 if weight < other.weight
+        if weight == other.weight
+          compare_equal_weights(other)
+        else
+          weight <=> other.weight
+        end
       end
 
       private

data/lib/facter/custom_facts/util/values.rb

@@ -90,7 +90,7 @@ module LegacyFacter
 
         if structure.is_a? Hash
           structure.each_pair do |name, value|
-            new_path = "#{path}_#{name}".gsub(%r{\-|/}, '_')
+            new_path = "#{path}_#{name}".gsub(%r{-|/}, '_')
             results.merge! flatten_structure(new_path, value)
           end
         elsif structure.is_a? Array

data/lib/facter/facts/amzn/os/distro/release.rb

@@ -20,10 +20,15 @@ module Facts
           end
 
           def determine_release_version
+            # For backwards compatibility, use system-release for AL1/AL2
             version = Facter::Resolvers::ReleaseFromFirstLine.resolve(:release, release_file: '/etc/system-release')
+            if !version.nil? && version != '2'
+              # Use os-release for AL2023 and up
+              version = Facter::Resolvers::Amzn::OsReleaseRpm.resolve(:version)
+            end
             version ||= Facter::Resolvers::OsRelease.resolve(:version_id)
 
-            Facter::Util::Facts.release_hash_from_string(version)
+            Facter::Util::Facts.release_hash_from_string(version, include_patch: true)
           end
         end
       end

data/lib/facter/facts/amzn/os/release.rb

@@ -18,7 +18,12 @@ module Facts
         end
 
         def determine_release_version
+          # For backwards compatibility, use system-release for AL1/AL2
           version = Facter::Resolvers::ReleaseFromFirstLine.resolve(:release, release_file: '/etc/system-release')
+          if !version.nil? && version != '2'
+            # Use os-release for AL2023 and up
+            version = Facter::Resolvers::Amzn::OsReleaseRpm.resolve(:version)
+          end
           version ||= Facter::Resolvers::OsRelease.resolve(:version_id)
 
           Facter::Util::Facts.release_hash_from_string(version)

data/lib/facter/facts/linux/dmi/product/version.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Facts
+  module Linux
+    module Dmi
+      module Product
+        class Version
+          FACT_NAME = 'dmi.product.version'
+          ALIASES = 'productversion'
+
+          def call_the_resolver
+            fact_value = Facter::Resolvers::Linux::DmiBios.resolve(:product_version)
+            [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/linux/kernelmajversion.rb

@@ -17,7 +17,7 @@ module Facts
         versions_split = full_version.split('.')
         return versions_split[0] if versions_split.length <= 1
 
-        versions_split[0] + '.' + versions_split[1]
+        "#{versions_split[0]}.#{versions_split[1]}"
       end
     end
   end

data/lib/facter/facts/macosx/is_virtual.rb

@@ -23,7 +23,7 @@ module Facts
         return 'virtualbox' if boot_rom_version&.start_with?('VirtualBox')
 
         subsystem_vendor_id = Facter::Resolvers::Macosx::SystemProfiler.resolve(:subsystem_vendor_id)
-        return 'parallels' if subsystem_vendor_id&.start_with?('0x1ab8')
+        'parallels' if subsystem_vendor_id&.start_with?('0x1ab8')
       end
     end
   end

data/lib/facter/facts/macosx/virtual.rb

@@ -15,17 +15,17 @@ module Facts
 
       def check_vmware
         model_identifier = Facter::Resolvers::Macosx::SystemProfiler.resolve(:model_identifier)
-        return 'vmware' if model_identifier&.start_with?('VMware')
+        'vmware' if model_identifier&.start_with?('VMware')
       end
 
       def check_virtualbox
         boot_rom_version = Facter::Resolvers::Macosx::SystemProfiler.resolve(:boot_rom_version)
-        return 'virtualbox' if boot_rom_version&.start_with?('VirtualBox')
+        'virtualbox' if boot_rom_version&.start_with?('VirtualBox')
       end
 
       def check_parallels
         subsystem_vendor_id = Facter::Resolvers::Macosx::SystemProfiler.resolve(:subsystem_vendor_id)
-        return 'parallels' if subsystem_vendor_id&.start_with?('0x1ab8')
+        'parallels' if subsystem_vendor_id&.start_with?('0x1ab8')
       end
     end
   end

data/lib/facter/facts/mariner/os/release.rb

@@ -20,7 +20,7 @@ module Facts
         def from_specific_file
           version = Facter::Resolvers::SpecificReleaseFile.resolve(:release,
                                                                    { release_file: '/etc/mariner-release',
-                                                                     regex: /CBL\-Mariner ([0-9.]+)/ })
+                                                                     regex: /CBL-Mariner ([0-9.]+)/ })
           Facter::Util::Facts.release_hash_from_matchdata(version)
         end
 

data/lib/facter/facts/photon/os/release.rb

@@ -25,7 +25,7 @@ module Facts
 
           major = version[1].to_s
           minor = version[2].to_s
-          version_data = major + '.' + minor
+          version_data = "#{major}.#{minor}"
 
           {
             'full' => version_data,

data/lib/facter/facts/solaris/kernelmajversion.rb

@@ -8,7 +8,7 @@ module Facts
       def call_the_resolver
         full_version = Facter::Resolvers::Uname.resolve(:kernelversion)
         versions_split = full_version.split('.')
-        major_version = versions_split.length > 2 ? versions_split[0] + '.' + versions_split[1] : versions_split[0]
+        major_version = versions_split.length > 2 ? "#{versions_split[0]}.#{versions_split[1]}" : versions_split[0]
         Facter::ResolvedFact.new(FACT_NAME, major_version)
       end
     end

data/lib/facter/facts/solaris/ldom.rb

@@ -54,7 +54,7 @@ module Facts
       def create_resolved_facts_list(fact_value)
         resolved_facts = [Facter::ResolvedFact.new(FACT_NAME, fact_value)]
         ALIASES.each do |fact_alias|
-          key = fact_alias.split('_')[1..-1].map!(&:to_sym)
+          key = fact_alias.split('_')[1..].map!(&:to_sym)
           resolved_facts << Facter::ResolvedFact.new(fact_alias, fact_value.dig(*key), :legacy)
         end
 

data/lib/facter/facts/windows/hypervisors/kvm.rb

@@ -29,7 +29,7 @@ module Facts
 
           return { openstack: true } if /^OpenStack/.match?(Facter::Resolvers::DMIComputerSystem.resolve(:name))
 
-          return { amazon: true } if /^Amazon/.match?(manufacturer)
+          { amazon: true } if /^Amazon/.match?(manufacturer)
         end
       end
     end

data/lib/facter/facts/windows/interfaces.rb

@@ -9,7 +9,7 @@ module Facts
       def call_the_resolver
         fact_value = Facter::Resolvers::Windows::Networking.resolve(:interfaces)
 
-        Facter::ResolvedFact.new(FACT_NAME, fact_value ? fact_value.keys.join(',') : nil, :legacy)
+        Facter::ResolvedFact.new(FACT_NAME, fact_value&.keys&.join(','), :legacy)
       end
     end
   end

data/lib/facter/framework/benchmarking/timer.rb

@@ -7,9 +7,9 @@ module Facter
     module Benchmarking
       class Timer
         class << self
-          def measure(fact_name, prefix_message = '')
+          def measure(fact_name, prefix_message = '', &block)
             if Options[:timing]
-              time = Benchmark.measure { yield }
+              time = Benchmark.measure(&block)
 
               log = "fact '#{fact_name}', took: #{time.format('%r')} seconds"
               prefix_message = "#{prefix_message} " unless prefix_message.empty?

data/lib/facter/framework/cli/cli.rb

@@ -113,7 +113,7 @@ module Facter
       negate_options = %w[block cache custom_facts external_facts]
 
       template = File.join(File.dirname(__FILE__), '..', '..', 'templates', 'man.erb')
-      erb = ERB.new(File.read(template), nil, '-')
+      erb = ERB.new(File.read(template), trim_mode: '-')
       erb.filename = template
       puts erb.result(binding)
     end
@@ -148,7 +148,7 @@ module Facter
       options = @options.map { |(k, v)| [k.to_sym, v] }.to_h
       Facter::Options.init_from_cli(options)
 
-      block_groups = Facter::FactGroups.new.groups.to_yaml.lines[1..-1].join
+      block_groups = Facter::FactGroups.new.groups.to_yaml.lines[1..].join
       block_groups.gsub!(/:\s*\n/, "\n")
 
       puts block_groups
@@ -160,7 +160,7 @@ module Facter
       options = @options.map { |(k, v)| [k.to_sym, v] }.to_h
       Facter::Options.init_from_cli(options)
 
-      cache_groups = Facter::FactGroups.new.groups.to_yaml.lines[1..-1].join
+      cache_groups = Facter::FactGroups.new.groups.to_yaml.lines[1..].join
       cache_groups.gsub!(/:\s*\n/, "\n")
 
       puts cache_groups
@@ -183,8 +183,6 @@ module Facter
         Facter::Util::FileHelper.safe_read("#{path}fixtures/facter_help_header")
       end
 
-      IGNORE_OPTIONS = %w[log_level color no_color].freeze
-
       def add_class_options_to_help
         help_class_options = +''
         class_options = Cli.class_options
@@ -200,9 +198,9 @@ module Facter
 
       def add_commands_to_help
         help_command_options = +''
-        Cli.commands
-           .select { |_k, command_class| command_class.instance_of?(Thor::Command) }
-           .each do |_k, command|
+        Cli.commands.values
+           .select { |command_class| command_class.instance_of?(Thor::Command) }
+           .each do |command|
           help_command_options << build_option(
             command['name'],
             [command['usage'].split(',')[1]],

data/lib/facter/framework/cli/cli_launcher.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require_relative '../../../facter/framework/logging/logger.rb'
+require_relative '../../../facter/framework/logging/logger'
 Facter::Log.output(STDERR)
 require_relative '../../../facter'
 require_relative '../../../facter/framework/cli/cli'

data/lib/facter/framework/config/fact_groups.rb

@@ -124,7 +124,7 @@ module Facter
     end
 
     def append_s(unit)
-      return unit + 's' if unit.length > 2 && unit[-1] != 's'
+      return "#{unit}s" if unit.length > 2 && unit[-1] != 's'
 
       unit
     end

data/lib/facter/framework/core/cache_manager.rb

@@ -43,15 +43,14 @@ module Facter
 
     def fact_cache_enabled?(fact_name)
       fact = @fact_groups.get_fact(fact_name)
-      cached = if fact
-                 !fact[:ttls].nil?
-               else
-                 false
-               end
+      if fact
+        !fact[:ttls].nil?
+      else
+        false
+      end
 
       # fact_group = @fact_groups.get_fact_group(fact_name)
       # delete_cache(fact_group) if fact_group && !cached
-      cached
     end
 
     private

data/lib/facter/framework/core/fact_loaders/class_discoverer.rb

@@ -21,9 +21,10 @@ module Facter
 
     def find_nested_classes(mod, discovered_classes)
       mod.constants.each do |constant_name|
-        if mod.const_get(constant_name).instance_of? Class
-          discovered_classes << mod.const_get(constant_name)
-        elsif mod.const_get(constant_name).instance_of? Module
+        obj = mod.const_get(constant_name)
+        if obj.instance_of? Class
+          discovered_classes << obj
+        elsif obj.instance_of? Module
           find_nested_classes(Module.const_get("#{mod.name}::#{constant_name}"), discovered_classes)
         end
       end

data/lib/facter/framework/core/fact_loaders/fact_loader.rb

@@ -100,13 +100,11 @@ module Facter
 
       reject_list_core, reject_list_legacy = construct_reject_lists(blocked_facts, facts)
 
-      facts = facts.reject do |fact|
+      facts.reject do |fact|
         reject_list_core.include?(fact) || reject_list_core.find do |fact_to_block|
           fact_to_block.klass == fact.klass
         end || reject_list_legacy.include?(fact)
       end
-
-      facts
     end
 
     def construct_reject_lists(blocked_facts, facts)

data/lib/facter/framework/core/fact_manager.rb

@@ -25,7 +25,7 @@ module Facter
 
       resolved_facts = override_core_facts(internal_facts, external_facts)
 
-      resolved_facts = resolved_facts.concat(cached_facts)
+      resolved_facts.concat(cached_facts)
       cache_manager.cache_facts(resolved_facts)
 
       FactFilter.new.filter_facts!(resolved_facts, user_query)
@@ -84,7 +84,7 @@ module Facter
       searched_facts, cached_facts = @cache_manager.resolve_facts(searched_facts)
 
       resolved_facts = @internal_fact_mgr.resolve_facts(searched_facts)
-      resolved_facts = resolved_facts.concat(cached_facts)
+      resolved_facts.concat(cached_facts)
 
       FactFilter.new.filter_facts!(resolved_facts, user_query)
 
@@ -101,7 +101,7 @@ module Facter
       searched_facts, cached_facts = @cache_manager.resolve_facts(searched_facts)
 
       resolved_facts = @external_fact_mgr.resolve_facts(searched_facts)
-      resolved_facts = resolved_facts.concat(cached_facts)
+      resolved_facts.concat(cached_facts)
       resolved_facts if resolved_facts.any?
     end
 
@@ -115,7 +115,7 @@ module Facter
 
       resolved_facts = @external_fact_mgr.resolve_facts(searched_facts)
       resolved_facts = override_core_facts(core_facts, resolved_facts)
-      resolved_facts = resolved_facts.concat(cached_facts)
+      resolved_facts.concat(cached_facts)
 
       resolved_facts unless resolved_facts.map(&:value).compact.empty?
     end