openfact 6.2.1 → 6.2.2

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 (5) hide show
  1. checksums.yaml +4 -4
  2. data/lib/facter/custom_facts/core/execution/base.rb +6 -1
  3. data/lib/facter/resolvers/solaris/ipaddress.rb +1 -2
  4. data/lib/facter/version.rb +1 -1
  5. metadata +3 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 8ec1e87aeff5006c3da9300d30a0a0afeed9091c895d8062ce4afe1c52755303
4
- data.tar.gz: 169e48d951c9cde33b143897b4553d78f1617a2102c5d8d562c22b9b788bb125
3
+ metadata.gz: d6abc7bb997faa4bef38adcfe94b44215a33c7c90abef73364980446765c8aa5
4
+ data.tar.gz: 627301bef10445b49b513b8ed60e175fa1f7d62a39763edd899d9d61d9e95a59
5
5
  SHA512:
6
- metadata.gz: 714c4becbbc91916e4158e510029509df78092d5ea1ac2dbff9bda114fb4be2cd4bb2c72bb37f8d402188412d176567bd8e502d608bc445df61f4141493e3f1d
7
- data.tar.gz: 7a7bfc29a6a408334203f3c45fddf959e62208bea87f8a7c9e3c76ad08e41ad1ca8a0eec812336bbdffc8ba93e246a8ba03b7b9301252d779ede5691cf494d43
6
+ metadata.gz: '03408be381d6f7ebe5371d866e167af5056e81393bddea1d942db8c57ce6d87af962569857546387e6af424806dd6a95cbfd703cdf98a5cb4d6a66b8f3fb9459'
7
+ data.tar.gz: 5346ddb96b985b96cef97b8945515e8768b3db1982e66290e81ee667e33ca4a6b07e5e9f1ed4f60956b3d87bf86263b80963fbcabbf773d9d79436ede3c842aa
data/lib/facter/custom_facts/core/execution/base.rb CHANGED
@@ -44,8 +44,13 @@ module Facter
44
44
  def execute(command, options = {})
45
45
  on_fail, expand, logger, timeout = extract_options(options)
46
46
 
47
- expanded_command = if (!expand && builtin_command?(command)) || logger
47
+ expanded_command = if !expand && builtin_command?(command)
48
48
  command
49
+ elsif logger
50
+ # Internal resolvers rely on search_paths to find commands
51
+ # outside of PATH (e.g. /usr/sbin/zpool on Solaris). Fall back
52
+ # to the command as given so failures are logged, not raised.
53
+ expand_command(command) || command
49
54
  else
50
55
  expand_command(command)
51
56
  end
data/lib/facter/resolvers/solaris/ipaddress.rb CHANGED
@@ -14,13 +14,12 @@ module Facter
14
14
  end
15
15
 
16
16
  def read_ipaddress(fact_name)
17
- ip = nil
18
17
  primary_interface = read_primary_interface
19
18
  unless primary_interface.nil?
20
19
  output = Facter::Core::Execution.execute("ifconfig #{primary_interface}", logger: log)
21
20
  output.each_line do |str|
22
21
  if str.strip =~ /inet\s(\d{1,3}.\d{1,3}.\d{1,3}.\d{1,3}) .+/
23
- @fact_list[:ip] = ip = Regexp.last_match(1)
22
+ @fact_list[:ip] = Regexp.last_match(1)
24
23
  break
25
24
  end
26
25
  end
data/lib/facter/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Facter
4
- VERSION = '6.2.1' unless defined?(VERSION)
4
+ VERSION = '6.2.2' unless defined?(VERSION)
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: openfact
3
3
  version: !ruby/object:Gem::Version
4
- version: 6.2.1
4
+ version: 6.2.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - OpenVox Project
@@ -87,14 +87,14 @@ dependencies:
87
87
  requirements:
88
88
  - - "~>"
89
89
  - !ruby/object:Gem::Version
90
- version: 1.91.0
90
+ version: 1.92.0
91
91
  type: :development
92
92
  prerelease: false
93
93
  version_requirements: !ruby/object:Gem::Requirement
94
94
  requirements:
95
95
  - - "~>"
96
96
  - !ruby/object:Gem::Version
97
- version: 1.91.0
97
+ version: 1.92.0
98
98
  - !ruby/object:Gem::Dependency
99
99
  name: rubocop-performance
100
100
  requirement: !ruby/object:Gem::Requirement