ohai 16.13.0 → 16.17.0

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 (7) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +1 -1
  3. data/lib/ohai/plugins/linux/platform.rb +11 -12
  4. data/lib/ohai/plugins/packages.rb +2 -1
  5. data/lib/ohai/version.rb +1 -1
  6. data/ohai.gemspec +2 -2
  7. metadata +12 -12
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 67ffbc76e1366d1413aa7f01ac2e8f4ff22b89f8a9fa8568b348a441c284b8f9
4
- data.tar.gz: 59e0790fc0ee8182982c63f1d495c89a974fec9950a0843ac46d2eeb9dea6baf
3
+ metadata.gz: 85428f5d6833cf43857b50380c5c4987462ef9af9176844387bfef5e6ebb2c6f
4
+ data.tar.gz: dead65d1c8914398e76e32db45b510f2f614ff6e24b21f7bd311811890fc778c
5
5
  SHA512:
6
- metadata.gz: 867b388ecf15e49431eaea7b315411522d8d57e2e4310cf867048dcadde9832dc94a02710c99ef332b8f51f4e9fe88db0bb00e47ac3505bc911a2ca3763a3a0e
7
- data.tar.gz: 4c0d991e9d1b3b92f705611f54af8f826ecd866cbc7f8b65d4ad70fb879f4a1501a2e1a38a908e4e6b4c3d0367e4b16167d843ba5840d64f9b41a68aae448f33
6
+ metadata.gz: ebdae2428922df53dab47f38786a70d81a196fa9f773ace33a624257f3af8b6ae49c6f6aa56112a363c4fe9f716b757c4491af7cd45f9dc9b73320f5130a8ab6
7
+ data.tar.gz: 164e7f850b0040fe46176ead6387f580d6ed881671a3c842a5f4b4d518363ed7335747c555f39ab704c684b9d63b4336ca77d3e90ddbc4928a35ae99600667a9
data/Gemfile CHANGED
@@ -3,7 +3,7 @@ source "https://rubygems.org"
3
3
 
4
4
  gemspec
5
5
 
6
- # pull these gems from master of chef/chef so that we're testing against what we will release
6
+ # pull these gems from chef-16 of chef/chef so that we're testing against what we will release
7
7
  gem "chef-config", git: "https://github.com/chef/chef", branch: "chef-16", glob: "chef-config/chef-config.gemspec"
8
8
  gem "chef-utils", git: "https://github.com/chef/chef", branch: "chef-16", glob: "chef-utils/chef-utils.gemspec"
9
9
 
data/lib/ohai/plugins/linux/platform.rb CHANGED
@@ -54,7 +54,7 @@ Ohai.plugin(:Platform) do
54
54
  end
55
55
 
56
56
  #
57
- # Cached /etc/os-release info Hash. Also has logic for Cisco Nexus
57
+ # Cached /etc/os-release info Hash. Also has logic for Cisco Nexus
58
58
  # switches that pulls the chained CISCO_RELEASE_INFO file into the Hash (other
59
59
  # distros can also reuse this method safely).
60
60
  #
@@ -122,7 +122,7 @@ Ohai.plugin(:Platform) do
122
122
  "sles_sap" => "suse",
123
123
  "sles" => "suse",
124
124
  "xenenterprise" => "xenserver",
125
- }[id] || id
125
+ }[id.downcase] || id.downcase
126
126
  end
127
127
 
128
128
  #
@@ -134,20 +134,22 @@ Ohai.plugin(:Platform) do
134
134
  #
135
135
  def platform_family_from_platform(plat)
136
136
  case plat
137
- when /debian/, /ubuntu/, /linuxmint/, /raspbian/, /cumulus/, /kali/, /pop/
137
+ when /ubuntu/, /debian/, /linuxmint/, /raspbian/, /cumulus/, /kali/, /pop/
138
138
  # apt-get+dpkg almost certainly goes here
139
139
  "debian"
140
- when /oracle/, /centos/, /redhat/, /almalinux/, /scientific/, /enterpriseenterprise/, /xcp/, /xenserver/, /cloudlinux/, /ibm_powerkvm/, /parallels/, /nexus_centos/, /clearos/, /bigip/, /alibabalinux/, /sangoma/ # Note that 'enterpriseenterprise' is oracle's LSB "distributor ID"
140
+ when /centos/, /redhat/, /oracle/, /almalinux/, /rocky/, /scientific/, /enterpriseenterprise/, /xenserver/, /xcp-ng/, /cloudlinux/, /alibabalinux/, /sangoma/, /clearos/, /parallels/, /ibm_powerkvm/, /nexus_centos/, /bigip/, /virtuozzo/ # Note that 'enterpriseenterprise' is oracle's LSB "distributor ID"
141
141
  # NOTE: "rhel" should be reserved exclusively for recompiled rhel versions that are nearly perfectly compatible down to the platform_version.
142
142
  # The operating systems that are "rhel" should all be as compatible as rhel7 = centos7 = oracle7 = scientific7 (98%-ish core RPM version compatibility
143
143
  # and the version numbers MUST track the upstream). The appropriate EPEL version repo should work nearly perfectly. Some variation like the
144
- # oracle kernel version differences and tuning and extra packages are clearly acceptable. Almost certainly some distros above (xenserver?)
145
- # should not be in this list. Please use fedora, below, instead. Also note that this is the only platform_family with this strict of a rule,
144
+ # oracle kernel version differences and tuning and extra packages are clearly acceptable. Almost certainly some distros above (xenserver?)
145
+ # should not be in this list. Please use fedora, below, instead. Also note that this is the only platform_family with this strict of a rule,
146
146
  # see the example of the debian platform family for how the rest of the platform_family designations should be used.
147
+ #
148
+ # TODO: when XCP-NG 7.4 support ends we can remove the xcp-ng match. 7.5+ reports as xenenterprise which we remap to xenserver
147
149
  "rhel"
148
150
  when /amazon/
149
151
  "amazon"
150
- when /suse/, /sles/, /opensuse/, /opensuseleap/, /sled/
152
+ when /suse/, /sles/, /opensuseleap/, /opensuse/, /sled/
151
153
  "suse"
152
154
  when /fedora/, /pidora/, /arista_eos/
153
155
  # In the broadest sense: RPM-based, fedora-derived distributions which are not strictly re-compiled RHEL (if it uses RPMs, and smells more like redhat and less like
@@ -157,8 +159,6 @@ Ohai.plugin(:Platform) do
157
159
  "wrlinux"
158
160
  when /gentoo/
159
161
  "gentoo"
160
- when /slackware/
161
- "slackware"
162
162
  when /arch/, /manjaro/, /antergos/
163
163
  "arch"
164
164
  when /exherbo/
@@ -169,6 +169,8 @@ Ohai.plugin(:Platform) do
169
169
  "clearlinux"
170
170
  when /mangeia/
171
171
  "mandriva"
172
+ when /slackware/
173
+ "slackware"
172
174
  end
173
175
  end
174
176
 
@@ -271,9 +273,6 @@ Ohai.plugin(:Platform) do
271
273
  elsif /XenServer/i.match?(lsb[:id])
272
274
  platform "xenserver"
273
275
  platform_version lsb[:release]
274
- elsif /XCP/i.match?(lsb[:id])
275
- platform "xcp"
276
- platform_version lsb[:release]
277
276
  elsif lsb[:id] # LSB can provide odd data that changes between releases, so we currently fall back on it rather than dealing with its subtleties
278
277
  platform lsb[:id].downcase
279
278
  platform_version lsb[:release]
data/lib/ohai/plugins/packages.rb CHANGED
@@ -134,8 +134,9 @@ Ohai.plugin(:Packages) do
134
134
  require "win32/registry" unless defined?(Win32::Registry)
135
135
  packages Mash.new
136
136
  collect_programs_from_registry_key(Win32::Registry::HKEY_LOCAL_MACHINE, 'Software\Microsoft\Windows\CurrentVersion\Uninstall')
137
- collect_programs_from_registry_key(Win32::Registry::HKEY_CURRENT_USER, 'Software\Microsoft\Windows\CurrentVersion\Uninstall')
137
+ # on 64 bit systems, 32 bit programs are stored here moved before HKEY_CURRENT_USER otherwise it is not collected (impacts both ohai 16 & 17)
138
138
  collect_programs_from_registry_key(Win32::Registry::HKEY_LOCAL_MACHINE, 'Software\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall')
139
+ collect_programs_from_registry_key(Win32::Registry::HKEY_CURRENT_USER, 'Software\Microsoft\Windows\CurrentVersion\Uninstall')
139
140
  # on 64 bit systems, 32 bit programs are stored here
140
141
  end
141
142
 
data/lib/ohai/version.rb CHANGED
@@ -19,5 +19,5 @@
19
19
 
20
20
  module Ohai
21
21
  OHAI_ROOT = File.expand_path(__dir__)
22
- VERSION = "16.13.0"
22
+ VERSION = "16.17.0"
23
23
  end
data/ohai.gemspec CHANGED
@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
14
14
 
15
15
  s.required_ruby_version = ">= 2.6"
16
16
 
17
- s.add_dependency "chef-config", ">= 12.8", "< 17"
17
+ s.add_dependency "chef-config", ">= 14.12", "< 17"
18
18
  s.add_dependency "chef-utils", ">= 16.0", "< 17"
19
19
  s.add_dependency "ffi", "~> 1.9"
20
20
  s.add_dependency "ffi-yajl", "~> 2.2"
@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
22
22
  s.add_dependency "mixlib-cli", ">= 1.7.0" # 1.7+ needed to support passing multiple options
23
23
  s.add_dependency "mixlib-config", ">= 2.0", "< 4.0"
24
24
  s.add_dependency "mixlib-log", ">= 2.0.1", "< 4.0"
25
- s.add_dependency "mixlib-shellout", ">= 2.0", "< 4.0"
25
+ s.add_dependency "mixlib-shellout", "~> 3.2", ">= 3.2.5"
26
26
  s.add_dependency "plist", "~> 3.1"
27
27
  s.add_dependency "train-core"
28
28
  s.add_dependency "wmi-lite", "~> 1.0"
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ohai
3
3
  version: !ruby/object:Gem::Version
4
- version: 16.13.0
4
+ version: 16.17.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Adam Jacob
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2021-04-07 00:00:00.000000000 Z
11
+ date: 2021-11-09 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: chef-config
@@ -16,7 +16,7 @@ dependencies:
16
16
  requirements:
17
17
  - - ">="
18
18
  - !ruby/object:Gem::Version
19
- version: '12.8'
19
+ version: '14.12'
20
20
  - - "<"
21
21
  - !ruby/object:Gem::Version
22
22
  version: '17'
@@ -26,7 +26,7 @@ dependencies:
26
26
  requirements:
27
27
  - - ">="
28
28
  - !ruby/object:Gem::Version
29
- version: '12.8'
29
+ version: '14.12'
30
30
  - - "<"
31
31
  - !ruby/object:Gem::Version
32
32
  version: '17'
@@ -150,22 +150,22 @@ dependencies:
150
150
  name: mixlib-shellout
151
151
  requirement: !ruby/object:Gem::Requirement
152
152
  requirements:
153
- - - ">="
153
+ - - "~>"
154
154
  - !ruby/object:Gem::Version
155
- version: '2.0'
156
- - - "<"
155
+ version: '3.2'
156
+ - - ">="
157
157
  - !ruby/object:Gem::Version
158
- version: '4.0'
158
+ version: 3.2.5
159
159
  type: :runtime
160
160
  prerelease: false
161
161
  version_requirements: !ruby/object:Gem::Requirement
162
162
  requirements:
163
- - - ">="
163
+ - - "~>"
164
164
  - !ruby/object:Gem::Version
165
- version: '2.0'
166
- - - "<"
165
+ version: '3.2'
166
+ - - ">="
167
167
  - !ruby/object:Gem::Version
168
- version: '4.0'
168
+ version: 3.2.5
169
169
  - !ruby/object:Gem::Dependency
170
170
  name: plist
171
171
  requirement: !ruby/object:Gem::Requirement