facter 4.0.22 → 4.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bac8104b3cb1089d8ec98cb6ce258acd13dd1278893c51a57726b25d2767f9dd
-  data.tar.gz: 93bf171d4bdc05edeca4fb79d8797af52404ce08da575cae8786fb40cd3534dc
+  metadata.gz: c4c01aab49dd7e09e17c3ed32dd16db6a14095a160f398443ec3c12f8a99ac0f
+  data.tar.gz: 31b07ae25da27da958aa2d78ee4b2526092dd38f93564fbfbdd305fc9918fe72
 SHA512:
-  metadata.gz: 0e155dd9dd597c9de0a223b45fc6dbe269fcda89d79b80be6527debd407cd22a2dd05c5bd788941fb4e15ef5794a41638da602cdce295495ef513865258d2bd6
-  data.tar.gz: 306c94ffbee046cba1e4dbd351b81f45df23b79383375ec969b1ef72df6f946b1e175758f467eaedc2d5e6bca33f0e6c884827eefb28562a81e88e8017d03c09
+  metadata.gz: ed83b3e0dbc7d4f81d9816b2e2820c20d096b8fdfa6b72c448f645de8ea437441f768b3730087f56d92aeca67a9001f35df4b3206a9c7e3162bef7fdc3ab267d
+  data.tar.gz: e656c9cedecb2c7fb61a30e452ffd1e1c065e16960c1d5ca2a4b9a3c3e34714741ce42874aace47b16a92ce9501bf33306eb517dd2ac5625ef575e0b5c89ede5

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 
 
+## [4.0.23](https://github.com/puppetlabs/facter-ng/tree/4.0.23) (2020-05-22)
+
+[Full Changelog](https://github.com/puppetlabs/facter-ng/compare/4.0.22...4.0.23)
+
+### Fixed
+
+- \(FACT-2632\) Log error message if we encounter exceptions while loading custom facts files [\#528](https://github.com/puppetlabs/facter-ng/pull/528) ([IrimieBogdan](https://github.com/IrimieBogdan))
+- \(FACT-2631\) Trace is not working as expected [\#527](https://github.com/puppetlabs/facter-ng/pull/527) ([IrimieBogdan](https://github.com/IrimieBogdan))
+
+
+
 ## [4.0.22](https://github.com/puppetlabs/facter-ng/tree/4.0.22) (2020-05-20)
 
 [Full Changelog](https://github.com/puppetlabs/facter-ng/compare/4.0.21...4.0.22)

data/VERSION

@@ -1 +1 @@
-4.0.22
+4.0.23

data/facter.gemspec

@@ -40,7 +40,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '>= 12.3.3'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop', '~> 0.81.0'
-  spec.add_development_dependency 'rubocop-performance', '~> 1.5'
+  spec.add_development_dependency 'rubocop-performance', '~> 1.5.2'
   spec.add_development_dependency 'rubocop-rspec', '~> 1.38'
   spec.add_development_dependency 'sys-filesystem', '~> 1.3'
   spec.add_development_dependency 'yard', '~> 0.9'

data/lib/custom_facts/util/loader.rb

@@ -113,6 +113,8 @@ module LegacyFacter
           # in case it's loadable later on.
           @loaded.delete(file)
           Facter.log_exception(e, "Error loading fact #{file}: #{e.message}")
+        rescue StandardError => e
+          Facter.log_exception(e, "error while resolving custom facts in #{file} #{e.message}")
         end
       end
 

data/lib/framework/core/fact_loaders/external_fact_loader.rb

@@ -7,7 +7,7 @@ module Facter
     end
 
     def external_facts
-      @external_facts ||= load_external_facts
+      @external_facts = load_external_facts
     end
 
     def all_facts

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

@@ -4,7 +4,6 @@ module Facter
   class OptionStore
     # default options
     @debug = false
-    @trace = false
     @verbose = false
     # TODO: constant is not yet available when running puppet facts
     @log_level = :warn
@@ -113,7 +112,6 @@ module Facter
         case level
         when :trace
           @log_level = :debug
-          @trace = true
         when :debug
           @log_level = :debug
           @debug = true
@@ -122,7 +120,6 @@ module Facter
         end
 
         Facter::Log.level = @log_level
-        Facter.trace(@trace)
       end
 
       def show_legacy=(bool)
@@ -135,13 +132,7 @@ module Facter
       end
 
       def trace=(bool)
-        if bool == true
-          self.log_level = :trace
-        else
-          @log_level = Facter::DEFAULT_LOG_LEVEL
-          @trace = false
-          Facter.trace(false)
-        end
+        Facter.trace(bool)
       end
 
       def set(key, value)
@@ -150,7 +141,6 @@ module Facter
 
       def reset
         @debug = false
-        @trace = false
         @verbose = false
         # TODO: constant is not yet available when running puppet facts
         @log_level = :warn

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: facter
 version: !ruby/object:Gem::Version
-  version: 4.0.22
+  version: 4.0.23
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-20 00:00:00.000000000 Z
+date: 2020-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 1.5.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 1.5.2
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement