facter 4.0.22 → 4.0.23

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +11 -0
  3. data/VERSION +1 -1
  4. data/facter.gemspec +1 -1
  5. data/lib/custom_facts/util/loader.rb +2 -0
  6. data/lib/framework/core/fact_loaders/external_fact_loader.rb +1 -1
  7. data/lib/framework/core/options/option_store.rb +1 -11
  8. metadata +4 -4
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: bac8104b3cb1089d8ec98cb6ce258acd13dd1278893c51a57726b25d2767f9dd
4
- data.tar.gz: 93bf171d4bdc05edeca4fb79d8797af52404ce08da575cae8786fb40cd3534dc
3
+ metadata.gz: c4c01aab49dd7e09e17c3ed32dd16db6a14095a160f398443ec3c12f8a99ac0f
4
+ data.tar.gz: 31b07ae25da27da958aa2d78ee4b2526092dd38f93564fbfbdd305fc9918fe72
5
5
  SHA512:
6
- metadata.gz: 0e155dd9dd597c9de0a223b45fc6dbe269fcda89d79b80be6527debd407cd22a2dd05c5bd788941fb4e15ef5794a41638da602cdce295495ef513865258d2bd6
7
- data.tar.gz: 306c94ffbee046cba1e4dbd351b81f45df23b79383375ec969b1ef72df6f946b1e175758f467eaedc2d5e6bca33f0e6c884827eefb28562a81e88e8017d03c09
6
+ metadata.gz: ed83b3e0dbc7d4f81d9816b2e2820c20d096b8fdfa6b72c448f645de8ea437441f768b3730087f56d92aeca67a9001f35df4b3206a9c7e3162bef7fdc3ab267d
7
+ data.tar.gz: e656c9cedecb2c7fb61a30e452ffd1e1c065e16960c1d5ca2a4b9a3c3e34714741ce42874aace47b16a92ce9501bf33306eb517dd2ac5625ef575e0b5c89ede5
data/CHANGELOG.md CHANGED
@@ -1,5 +1,16 @@
1
1
 
2
2
 
3
+ ## [4.0.23](https://github.com/puppetlabs/facter-ng/tree/4.0.23) (2020-05-22)
4
+
5
+ [Full Changelog](https://github.com/puppetlabs/facter-ng/compare/4.0.22...4.0.23)
6
+
7
+ ### Fixed
8
+
9
+ - \(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))
10
+ - \(FACT-2631\) Trace is not working as expected [\#527](https://github.com/puppetlabs/facter-ng/pull/527) ([IrimieBogdan](https://github.com/IrimieBogdan))
11
+
12
+
13
+
3
14
  ## [4.0.22](https://github.com/puppetlabs/facter-ng/tree/4.0.22) (2020-05-20)
4
15
 
5
16
  [Full Changelog](https://github.com/puppetlabs/facter-ng/compare/4.0.21...4.0.22)
data/VERSION CHANGED
@@ -1 +1 @@
1
- 4.0.22
1
+ 4.0.23
data/facter.gemspec CHANGED
@@ -40,7 +40,7 @@ Gem::Specification.new do |spec|
40
40
  spec.add_development_dependency 'rake', '>= 12.3.3'
41
41
  spec.add_development_dependency 'rspec', '~> 3.0'
42
42
  spec.add_development_dependency 'rubocop', '~> 0.81.0'
43
- spec.add_development_dependency 'rubocop-performance', '~> 1.5'
43
+ spec.add_development_dependency 'rubocop-performance', '~> 1.5.2'
44
44
  spec.add_development_dependency 'rubocop-rspec', '~> 1.38'
45
45
  spec.add_development_dependency 'sys-filesystem', '~> 1.3'
46
46
  spec.add_development_dependency 'yard', '~> 0.9'
data/lib/custom_facts/util/loader.rb CHANGED
@@ -113,6 +113,8 @@ module LegacyFacter
113
113
  # in case it's loadable later on.
114
114
  @loaded.delete(file)
115
115
  Facter.log_exception(e, "Error loading fact #{file}: #{e.message}")
116
+ rescue StandardError => e
117
+ Facter.log_exception(e, "error while resolving custom facts in #{file} #{e.message}")
116
118
  end
117
119
  end
118
120
 
data/lib/framework/core/fact_loaders/external_fact_loader.rb CHANGED
@@ -7,7 +7,7 @@ module Facter
7
7
  end
8
8
 
9
9
  def external_facts
10
- @external_facts ||= load_external_facts
10
+ @external_facts = load_external_facts
11
11
  end
12
12
 
13
13
  def all_facts
data/lib/framework/core/options/option_store.rb CHANGED
@@ -4,7 +4,6 @@ module Facter
4
4
  class OptionStore
5
5
  # default options
6
6
  @debug = false
7
- @trace = false
8
7
  @verbose = false
9
8
  # TODO: constant is not yet available when running puppet facts
10
9
  @log_level = :warn
@@ -113,7 +112,6 @@ module Facter
113
112
  case level
114
113
  when :trace
115
114
  @log_level = :debug
116
- @trace = true
117
115
  when :debug
118
116
  @log_level = :debug
119
117
  @debug = true
@@ -122,7 +120,6 @@ module Facter
122
120
  end
123
121
 
124
122
  Facter::Log.level = @log_level
125
- Facter.trace(@trace)
126
123
  end
127
124
 
128
125
  def show_legacy=(bool)
@@ -135,13 +132,7 @@ module Facter
135
132
  end
136
133
 
137
134
  def trace=(bool)
138
- if bool == true
139
- self.log_level = :trace
140
- else
141
- @log_level = Facter::DEFAULT_LOG_LEVEL
142
- @trace = false
143
- Facter.trace(false)
144
- end
135
+ Facter.trace(bool)
145
136
  end
146
137
 
147
138
  def set(key, value)
@@ -150,7 +141,6 @@ module Facter
150
141
 
151
142
  def reset
152
143
  @debug = false
153
- @trace = false
154
144
  @verbose = false
155
145
  # TODO: constant is not yet available when running puppet facts
156
146
  @log_level = :warn
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: facter
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.0.22
4
+ version: 4.0.23
5
5
  platform: ruby
6
6
  authors:
7
7
  - Puppet
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-05-20 00:00:00.000000000 Z
11
+ date: 2020-05-22 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -86,14 +86,14 @@ dependencies:
86
86
  requirements:
87
87
  - - "~>"
88
88
  - !ruby/object:Gem::Version
89
- version: '1.5'
89
+ version: 1.5.2
90
90
  type: :development
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
94
  - - "~>"
95
95
  - !ruby/object:Gem::Version
96
- version: '1.5'
96
+ version: 1.5.2
97
97
  - !ruby/object:Gem::Dependency
98
98
  name: rubocop-rspec
99
99
  requirement: !ruby/object:Gem::Requirement