facter 4.9.0 → 4.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97c091ad872480f9a35f8c56682e89b65cd221d2b7da74b6bab229e37e27dda0
-  data.tar.gz: c55e4ec6c3e39148ca2c8ce0819eecc4dcf33eddd1ece53442d293eddb405955
+  metadata.gz: 6aeed6f3058d490dd1b3e734c8d8de31efd16a275324e019e619a6084d465722
+  data.tar.gz: 224c4d60e9a71cbce735ee6de290949c73d949580e6e68ae16977b12fbc25517
 SHA512:
-  metadata.gz: 8d87380c0d913de5c09f664a5b9a7a35a26434ff806b5788c4712b70cfa6bb85e9fa6670e9bd05dbd275a6f87cd20001d620596e97f732b351d05afe9c5a47d7
-  data.tar.gz: 5900798a818340f42464fff9eec375d2810157f1b73a143fb0191c342149f92634344a4077589af2c19597d3c984aff673bfcb611b14f59a6438c1f2f27eb232
+  metadata.gz: 3c47aaeaf6fafa8cefe84f8e32fd5837d0a138ca6561b96fa7016f633e7fbc9920c0e0986334dd012d5adc34a2fecd281529a997f51a6af5db25bcc7a12553e9
+  data.tar.gz: c8af80e38871c4e5261ad91ad858c66a665a2d48094a8c1fe941cfcb4df28b20490abdba6d221fd1b10caa7e3614f04101e87f5fe983c1c8ff40846b5c025ba5

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

@@ -25,8 +25,8 @@ module Facter
             # set the new (temporary) value for the environment variable
             ENV[var] = value
           end
-          # execute the caller's block, capture the return value
-          rv = yield
+          # execute the caller's block, returning its value
+          yield
         # use an ensure block to make absolutely sure we restore the variables
         ensure
           # restore the old values
@@ -38,8 +38,6 @@ module Facter
               ENV.delete(var)
             end
           end
-          # return the captured return value
-          rv
         end
 
         def execute(command, options = {})

data/lib/facter/resolvers/hostname.rb

@@ -68,9 +68,9 @@ module Facter
 
         def read_domain
           file_content = Facter::Util::FileHelper.safe_read('/etc/resolv.conf')
-          if file_content =~ /^domain\s+(\S+)/
+          if file_content =~ /^domain\s+([^.]\S+)/
             Regexp.last_match(1)
-          elsif file_content =~ /^search\s+(\S+)/
+          elsif file_content =~ /^search\s+([^.]\S+)/
             Regexp.last_match(1)
           end
         end

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

@@ -96,9 +96,9 @@ module Facter
 
           def read_domain
             file_content = Facter::Util::FileHelper.safe_read('/etc/resolv.conf')
-            if file_content =~ /^domain\s+(\S+)/
+            if file_content =~ /^domain\s+([^.]\S+)/
               Regexp.last_match(1)
-            elsif file_content =~ /^search\s+(\S+)/
+            elsif file_content =~ /^search\s+([^.]\S+)/
               Regexp.last_match(1)
             end
           end

data/lib/facter/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: facter
 version: !ruby/object:Gem::Version
-  version: 4.9.0
+  version: 4.10.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-09-05 00:00:00.000000000 Z
+date: 2024-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -1193,7 +1193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.20
+rubygems_version: 3.5.19
 signing_key: 
 specification_version: 4
 summary: Facter, a system inventory tool