facter 4.2.11 → 4.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b94d35e70448fb5efde799119e0bcfe508e4097133b44939c453fcbd0f39983a
-  data.tar.gz: 6f97201f2619f853c2a66ff15cb4538b67dc3d843ff48629ca65d7b0bfc626d3
+  metadata.gz: '098fd60710cceb1a13598b4a2bc95e407ef3b196ca050f54c86af4f53055ec89'
+  data.tar.gz: 4203dae20b429320376bb4b8302bf9e549104c30781ebd19b023625be2d351dc
 SHA512:
-  metadata.gz: 3ad5f88e1d7e8517c6cae2687fbf74a05ebcd2a92e54baef7276b08d6e0bee0e4af77e4f908951acf2e956d9e9ff9ced4773fff260639e2e1db3b230da75700a
-  data.tar.gz: 6a3e65102fd483807f3d67fa17eda71f7cdce61f59cc7e512c81990d9b02a29389c2c582ae3ccf187d3450918c28f9efc0a7a50c31314950f4109d3492e9c21d
+  metadata.gz: cf7bc0aee205b9cffca4e422e55449f033132d0552df44185c216fda3a87f3278e7ad14bb9f602db8812009db965f48503a0d7e227a4929b7b84d16c70fd2c9f
+  data.tar.gz: 0d1c7af1a8d5244d8504dd50f95485a519249cd0ac2a7715e62fea18e16557a076e215756e5f1b4783aae9069a269bda3e2843f106e34b83a0db313bfc2db0af

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

@@ -9,6 +9,10 @@ module Facter
         DEFAULT_COMMAND_EXTENSIONS = %w[.COM .EXE .BAT .CMD].freeze
 
         def which(bin)
+          # `echo` is allowed for facter 3.x compatibility, otherwise
+          # all commands much be found on the PATH or absolute.
+          return bin if /^echo$/i =~ bin
+
           if absolute_path?(bin)
             return bin if File.executable?(bin)
           else

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

@@ -70,7 +70,11 @@ module LegacyFacter
         def parse_executable_output(output)
           res = nil
           begin
-            res = YAML.safe_load(output, [Symbol, Time])
+            res = if Gem::Version.new(Psych::VERSION) >= Gem::Version.new('3.1.0') # Ruby 2.6+
+                    YAML.safe_load(output, permitted_classes: [Symbol, Time])
+                  else
+                    YAML.safe_load(output, [Symbol, Time])
+                  end
           rescue StandardError => e
             Facter.debug("Could not parse executable fact output as YAML or JSON (#{e.message})")
           end
@@ -114,7 +118,11 @@ module LegacyFacter
           # Add quotes to Yaml time
           cont = content.gsub(TIME, '"\1"')
 
-          YAML.safe_load(cont, [Date])
+          if Gem::Version.new(Psych::VERSION) >= Gem::Version.new('3.1.0') # Ruby 2.6+
+            YAML.safe_load(cont, permitted_classes: [Date], aliases: true)
+          else
+            YAML.safe_load(cont, [Date], [], [], true)
+          end
         end
       end
 

data/lib/facter/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: facter
 version: !ruby/object:Gem::Version
-  version: 4.2.11
+  version: 4.2.12
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-22 00:00:00.000000000 Z
+date: 2022-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake