facter 4.0.50 → 4.0.51

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c40ef2043f777620f54c82fc1ee3e746a9b881b74771b3e6ed693773e2ae2e57
-  data.tar.gz: d6f1f89339c820f37f0a37b07ae42085a231468ce759c9d1a92b0fc7963e7f9e
+  metadata.gz: db03b26f8336c77d444ced6b4d073a927b529e6272ef0ba65eafc69af0e66060
+  data.tar.gz: a07adb46289f6315764d40a3f21c967de22c187fe9070177959a02c82bd1da6a
 SHA512:
-  metadata.gz: 91d8d74575aeff6e4b31445a362019fd8f2200f888478b3e2c019a5ccf740b1f9a8590f3edde89f69a66af3bca778d3ab6b73b658c04853122507633221066e3
-  data.tar.gz: e6cf614befcb67eea1ac89c35a22532c04e40225a87b1d81a6dbf00d227ff55f29630a8637239daf44e4f4ab5de13cb5c9c29b4b612358a8063ee36985d243f8
+  metadata.gz: 1cf1b38ac9c4e67b93e73474afa8f134132f0afd90d9cb5e45a4ced0c2cca3874ca581d1e6dd59ea154eb57e7ffc423a2a0c9aa1d36bdd04501648499dc30c3f
+  data.tar.gz: 0567b4d6940087e0c0d273392b103bd507fe6f15adbcaa826d783db1eda0c512582da10031400a0360b76fa397150101e925b4f814b394bdc478b615a1d1c1d0

data/lib/facter.rb

@@ -44,6 +44,27 @@ module Facter
       end
     end
 
+    def puppet_facts
+      require 'puppet'
+
+      # don't allow puppet logger to be injected in Facter
+      Options[:allow_external_loggers] = false
+
+      Puppet.initialize_settings
+      $LOAD_PATH << Puppet[:libdir] unless $LOAD_PATH.include?(Puppet[:libdir])
+      Facter.reset
+      Facter.search_external([Puppet[:pluginfactdest]])
+      if Puppet.respond_to? :initialize_facts
+        Puppet.initialize_facts
+      else
+        Facter.add(:puppetversion) do
+          setcode { Puppet.version.to_s }
+        end
+      end
+    rescue LoadError => e
+      logger.error("Could not load puppet gem, got #{e}")
+    end
+
     # Alias method for Facter.fact()
     # @param name [string] fact name
     #

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

@@ -159,9 +159,7 @@ module Facter
     desc '--puppet, -p', '(NOT SUPPORTED)Load the Puppet libraries, thus allowing Facter to load Puppet-specific facts.'
     map ['--puppet', '-p'] => :puppet
     def puppet(*args)
-      log = Log.new(self)
-      log.warn('`facter --puppet` and `facter -p` are no longer supported, use `puppet facts show` instead')
-      log.warn('the output does not contain puppet facts!')
+      Facter.puppet_facts
 
       output, status = Facter.to_user_output(@options, *args)
       puts output

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

@@ -35,6 +35,7 @@ module Facter
     @external_dir = []
     @custom_dir = []
     @hocon = false
+    @allow_external_loggers = true
 
     class << self
       attr_reader :debug, :verbose, :log_level, :show_legacy,
@@ -43,7 +44,7 @@ module Facter
       attr_accessor :config, :user_query, :strict, :json,
                     :cache, :yaml, :puppet, :ttls, :block, :cli, :config_file_custom_dir,
                     :config_file_external_dir, :default_external_dir, :fact_groups,
-                    :block_list, :color, :trace, :sequential, :timing, :hocon
+                    :block_list, :color, :trace, :sequential, :timing, :hocon, :allow_external_loggers
 
       attr_writer :external_dir
 
@@ -179,7 +180,6 @@ module Facter
         @ttls = []
         @block = true
         @cli = nil
-        @custom_facts = true
         reset_config
       end
 
@@ -198,6 +198,12 @@ module Facter
         @ttls = []
         @trace = false
         @timing = false
+        @allow_external_loggers = true
+        reset_facts
+      end
+
+      def reset_facts
+        @custom_facts = true
         @external_dir = []
         @custom_dir = []
       end

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

@@ -60,7 +60,7 @@ module Facter
     def debug(msg)
       return unless debugging_active?
 
-      if @@message_callback
+      if @@message_callback && Options[:allow_external_loggers]
         @@message_callback.call(:debug, msg)
       else
         msg = colorize(msg, CYAN) if Options[:color]
@@ -71,7 +71,7 @@ module Facter
     def info(msg)
       if msg.nil? || msg.empty?
         empty_message_error(msg)
-      elsif @@message_callback
+      elsif @@message_callback && Options[:allow_external_loggers]
         @@message_callback.call(:info, msg)
       else
         msg = colorize(msg, GREEN) if Options[:color]
@@ -80,7 +80,7 @@ module Facter
     end
 
     def warn(msg)
-      if @@message_callback
+      if @@message_callback && Options[:allow_external_loggers]
         @@message_callback.call(:warn, msg)
       else
         msg = colorize(msg, YELLOW) if Options[:color]
@@ -91,7 +91,7 @@ module Facter
     def error(msg, colorize = false)
       @@has_errors = true
 
-      if @@message_callback
+      if @@message_callback && Options[:allow_external_loggers]
         @@message_callback.call(:error, msg)
       else
         msg = colorize(msg, RED) if colorize || Options[:color]

data/lib/facter/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: facter
 version: !ruby/object:Gem::Version
-  version: 4.0.50
+  version: 4.0.51
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-04 00:00:00.000000000 Z
+date: 2021-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake