facter 4.3.1 → 4.4.1

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

@@ -13,7 +13,7 @@ module Facter
             description = input[:description]
             kernel_version = input[:kernel_version]
 
-            if version =~ /10.0/
+            if /10.0/.match?(version)
               check_version_10_11(consumerrel, kernel_version)
             else
               check_version_6(version, consumerrel) || check_version_5(version, consumerrel, description) || version
@@ -47,7 +47,7 @@ module Facter
           end
 
           def check_version_5(version, consumerrel, description)
-            return unless version =~ /5.2/
+            return unless /5.2/.match?(version)
             return 'XP' if consumerrel
 
             description == 'R2' ? '2003 R2' : '2003'

data/lib/facter/util/linux/dhcp.rb

@@ -45,7 +45,7 @@ module Facter
 
               lease_files.select do |file|
                 content = Facter::Util::FileHelper.safe_read("#{dir}#{file}", nil)
-                next unless content =~ /interface.*#{interface_name}/
+                next unless /interface.*#{interface_name}/.match?(content)
 
                 dhcp = content.match(/dhcp-server-identifier ([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/)
                 return dhcp[1] if dhcp

data/lib/facter/util/resolvers/ffi/hostname.rb

@@ -36,7 +36,7 @@ module Facter
             raw_hostname.read_string
           end
 
-          def self.getffiaddrinfo(hostname) # rubocop:disable  Metrics/AbcSize
+          def self.getffiaddrinfo(hostname)
             ret = FFI::MemoryPointer.new(:pointer)
 
             hints = Facter::Util::Resolvers::Ffi::AddrInfo.new

data/lib/facter/util/utils.rb

@@ -14,7 +14,7 @@ module Facter
 
     def self.split_user_query(user_query)
       queries = user_query.split('.')
-      queries.map! { |query| query =~ /^[0-9]+$/ ? query.to_i : query }
+      queries.map! { |query| /^[0-9]+$/.match?(query) ? query.to_i : query }
     end
 
     def self.deep_stringify_keys(object)

data/lib/facter/version.rb

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

data/lib/facter.rb

@@ -3,9 +3,9 @@
 require 'pathname'
 require_relative 'util/api_debugger' if ENV['API_DEBUG']
 
-require 'facter/version'
-require 'facter/framework/core/file_loader'
-require 'facter/framework/core/options/options_validator'
+require_relative 'facter/version'
+require_relative 'facter/framework/core/file_loader'
+require_relative 'facter/framework/core/options/options_validator'
 
 module Facter
   class ResolveCustomFactError < StandardError; end
@@ -22,7 +22,7 @@ module Facter
     #
     # @api private
     def resolve(args_as_string)
-      require 'facter/framework/cli/cli_launcher'
+      require_relative 'facter/framework/cli/cli_launcher'
 
       args = args_as_string.split(' ')
       Facter::OptionsValidator.validate(args)
@@ -380,7 +380,14 @@ module Facter
       resolved_facts = Facter::FactManager.instance.resolve_facts
       resolved_facts.reject! { |fact| fact.type == :custom && fact.value.nil? }
       collection = Facter::FactCollection.new.build_fact_collection!(resolved_facts)
-      Hash[collection]
+
+      # Ensures order of keys in hash returned from Facter.to_hash() and
+      # Facter.resolve() is always stable
+      if collection.empty?
+        Hash[collection]
+      else
+        Hash[Facter::Utils.sort_hash_by_key(collection)]
+      end
     end
 
     # Check whether printing stack trace is enabled
@@ -510,8 +517,10 @@ module Facter
       resolved_facts = Facter::FactManager.instance.resolve_facts(user_query)
       resolved_facts.reject! { |fact| fact.type == :custom && fact.value.nil? }
 
+      # Ensures order of keys in hash returned from Facter.to_hash() and
+      # Facter.resolve() is always stable
       if user_query.count.zero?
-        Facter::FactCollection.new.build_fact_collection!(resolved_facts)
+        Facter::Utils.sort_hash_by_key(Facter::FactCollection.new.build_fact_collection!(resolved_facts))
       else
         FormatterHelper.retrieve_facts_to_display_for_user_query(user_query, resolved_facts)
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: facter
 version: !ruby/object:Gem::Version
-  version: 4.3.1
+  version: 4.4.1
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-04 00:00:00.000000000 Z
+date: 2023-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: 13.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: 13.0.6
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -649,6 +649,10 @@ files:
 - lib/facter/facts/mariner/os/release.rb
 - lib/facter/facts/meego/os/release.rb
 - lib/facter/facts/oel/os/release.rb
+- lib/facter/facts/ol/lsbdistdescription.rb
+- lib/facter/facts/ol/lsbdistid.rb
+- lib/facter/facts/ol/os/distro/description.rb
+- lib/facter/facts/ol/os/distro/id.rb
 - lib/facter/facts/ol/os/release.rb
 - lib/facter/facts/openwrt/os/release.rb
 - lib/facter/facts/ovs/os/release.rb
@@ -776,7 +780,6 @@ files:
 - lib/facter/facts/ubuntu/os/distro/release.rb
 - lib/facter/facts/ubuntu/os/release.rb
 - lib/facter/facts/windows/aio_agent_version.rb
-- lib/facter/facts/windows/augeas/version.rb
 - lib/facter/facts/windows/az_metadata.rb
 - lib/facter/facts/windows/cloud/provider.rb
 - lib/facter/facts/windows/dhcp_servers.rb
@@ -1085,7 +1088,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.4.12
 signing_key: 
 specification_version: 4
 summary: Facter, a system inventory tool

data/lib/facter/facts/windows/augeas/version.rb

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-module Facts
-  module Windows
-    module Augeas
-      class Version
-        FACT_NAME = 'augeas.version'
-        ALIASES = 'augeasversion'
-
-        def call_the_resolver
-          fact_value = Facter::Resolvers::Augeas.resolve(:augeas_version)
-
-          [Facter::ResolvedFact.new(FACT_NAME, fact_value),
-           Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
-        end
-      end
-    end
-  end
-end