ohai 16.2.0 → 16.2.1
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.
- checksums.yaml +4 -4
- data/lib/ohai/plugins/darwin/hardware.rb +2 -2
- data/lib/ohai/plugins/darwin/platform.rb +3 -6
- data/lib/ohai/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 37943a2c27d2555576202a2ffdcb3ed104e0cd84d0e36c3dedb5ff7bfc1a5cd4
|
|
4
|
+
data.tar.gz: 50e8c6f17fc1560ab2c6a41c2e56adb1b800bf15ad64a1ce058334e3f491b0a3
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 7f5592b7e32c859831984be689ddbdfe19411a3efdbec7223c4f48e905b81c06a261286e150007091522f6f9eb2a231f83bd86e79231a4fed710ff76c0acdfa0
|
|
7
|
+
data.tar.gz: e516682f83325f096ebd89a12b197afb091fad3708cbd009e1936edc7597ed78e574786e4f306e53d1fb97626e0b92ffafbf78e79fac9d1f5d369baeb387a793
|
|
@@ -41,8 +41,8 @@ Ohai.plugin(:Hardware) do
|
|
|
41
41
|
hardware.merge!(hw_hash[0]["_items"][0])
|
|
42
42
|
|
|
43
43
|
# ProductName: Mac OS X
|
|
44
|
-
# ProductVersion: 10.
|
|
45
|
-
# BuildVersion:
|
|
44
|
+
# ProductVersion: 10.15.6
|
|
45
|
+
# BuildVersion: 19G46c
|
|
46
46
|
shell_out("sw_vers").stdout.lines.each do |line|
|
|
47
47
|
case line
|
|
48
48
|
when /^ProductName:\s*(.*)$/
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
#
|
|
2
2
|
# Author:: Adam Jacob (<adam@chef.io>)
|
|
3
|
-
# Copyright:: Copyright (c)
|
|
3
|
+
# Copyright:: Copyright (c) Chef Software, Inc.
|
|
4
4
|
# License:: Apache License, Version 2.0
|
|
5
5
|
#
|
|
6
6
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
@@ -23,11 +23,6 @@ Ohai.plugin(:Platform) do
|
|
|
23
23
|
so = shell_out((Ohai.abs_path( "/usr/bin/sw_vers" )).to_s)
|
|
24
24
|
so.stdout.lines do |line|
|
|
25
25
|
case line
|
|
26
|
-
when /^ProductName:\s+(.+)$/
|
|
27
|
-
macname = $1
|
|
28
|
-
macname.downcase!
|
|
29
|
-
macname.tr!(" ", "_")
|
|
30
|
-
platform macname
|
|
31
26
|
when /^ProductVersion:\s+(.+)$/
|
|
32
27
|
platform_version $1
|
|
33
28
|
when /^BuildVersion:\s+(.+)$/
|
|
@@ -35,6 +30,8 @@ Ohai.plugin(:Platform) do
|
|
|
35
30
|
end
|
|
36
31
|
end
|
|
37
32
|
|
|
33
|
+
# if we're on darwin assume we're on mac_os_x
|
|
34
|
+
platform "mac_os_x"
|
|
38
35
|
platform_family "mac_os_x"
|
|
39
36
|
end
|
|
40
37
|
end
|
data/lib/ohai/version.rb
CHANGED
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.2.
|
|
4
|
+
version: 16.2.1
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Adam Jacob
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2020-06-
|
|
11
|
+
date: 2020-06-23 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: systemu
|