ohai 16.5.0 → 16.5.4

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 +7 -6
  3. data/bin/ohai +1 -1
  4. data/lib/ohai/config.rb +1 -2
  5. data/lib/ohai/version.rb +2 -2
  6. data/ohai.gemspec +5 -6
  7. metadata +70 -70
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 8039a80535910fc0746573f29cbd7746fbe1ac34a46a2c98a93603ac7b4fb83e
4
- data.tar.gz: cf27f4ca401a9c57674d2c10b72867ef1e423d85e3849fcf1cd9d318e87a8716
3
+ metadata.gz: 0ad9b4829ddd7c9f0d80fbe665cdd9ce8b2c1aec690af23980d30f2b14a6787f
4
+ data.tar.gz: 60f516dec3ca0d7e3b0043f394f19c6554ff9b247563128298caa9d1dc1886f8
5
5
  SHA512:
6
- metadata.gz: 54f972aa56f93adfa75ee164c2e505bc1a6b8dcdbc797e6cac6ccc8ea02e5fede2340f63b9529d7f4a3a6ab814543b46d65607c40b39d617602bfad009f183e6
7
- data.tar.gz: 3453c0ef0e9c0e0dce7eebb258738c1fbcf0578a1894ab6eb7476385b5b0c9973d0dfc2c42be7c9ff544e33838aeeb8979daef1e0f6d331cffca7265643841ec
6
+ metadata.gz: f68bab715188ed1fcf41192a9311ede7deff2381b1195f893b8ef64cc0898db86fe26c7e6f6249e94ee10ebfe624591b2950d5c17e62deebe990e1cf2dad0127
7
+ data.tar.gz: 9899021fa77161437c708a2fbbe6140600196010f03cf4f0e24153c384cea252d2a7b892406abfee9d3cae17b08bb7a1fa314a61724b40e3185ab3693c4c8f21
data/Gemfile CHANGED
@@ -5,19 +5,20 @@ gemspec
5
5
  # NOTE: do not submit PRs to add pry as a dep, add to your Gemfile.local
6
6
  group :development do
7
7
  gem "chefstyle", git: "https://github.com/chef/chefstyle.git", branch: "master"
8
- gem "rubocop-performance", "1.8.0"
8
+ gem "ipaddr_extensions"
9
9
  gem "rake", ">= 10.1.0"
10
+ gem "rspec-collection_matchers", "~> 1.0"
10
11
  gem "rspec-core", "~> 3.0"
11
12
  gem "rspec-expectations", "~> 3.0"
12
13
  gem "rspec-mocks", "~> 3.0"
13
- gem "rspec-collection_matchers", "~> 1.0"
14
- gem "ipaddr_extensions"
14
+ gem "rubocop-performance", "1.8.0"
15
+ gem "rubocop-rspec"
15
16
  end
16
17
 
17
18
  group :docs do
18
- gem "yard"
19
- gem "redcarpet"
20
19
  gem "github-markup"
20
+ gem "redcarpet"
21
+ gem "yard"
21
22
  end
22
23
 
23
24
  group :debug do
@@ -25,4 +26,4 @@ group :debug do
25
26
  gem "pry-byebug"
26
27
  gem "pry-stack_explorer", "~> 0.4.0" # pin until we drop ruby < 2.6
27
28
  gem "rb-readline"
28
- end
29
+ end
data/bin/ohai CHANGED
@@ -18,7 +18,7 @@
18
18
  #
19
19
 
20
20
  # if we're in a source code checkout, we want to run the code from that.
21
- $:.unshift File.expand_path("../../lib", __FILE__)
21
+ $:.unshift File.expand_path("../lib", __dir__)
22
22
  require "ohai/application"
23
23
 
24
24
  Ohai::Application.new.run
data/lib/ohai/config.rb CHANGED
@@ -27,14 +27,13 @@ module Ohai
27
27
  # Reopens ChefConfig::Config to add Ohai configuration settings.
28
28
  # see: https://github.com/chef/chef/blob/master/lib/chef/config.rb
29
29
  class Config
30
-
31
30
  config_context :ohai do
32
31
  default :disabled_plugins, []
33
32
  default :hints_path, [ ChefConfig::Config.platform_specific_path("/etc/chef/ohai/hints") ]
34
33
  default :log_level, :auto
35
34
  default :log_location, STDERR
36
35
  default :plugin, ( Ohai::PluginConfig.new { |h, k| h[k] = Ohai::PluginConfig.new } )
37
- default :plugin_path, [ File.expand_path(File.join(File.dirname(__FILE__), "plugins")), ChefConfig::Config.platform_specific_path("/etc/chef/ohai/plugins") ]
36
+ default :plugin_path, [ File.expand_path(File.join(__dir__, "plugins")), ChefConfig::Config.platform_specific_path("/etc/chef/ohai/plugins") ]
38
37
  default :critical_plugins, []
39
38
  # causes all optional plugins to be run.
40
39
  default :run_all_plugins, false
data/lib/ohai/version.rb CHANGED
@@ -17,6 +17,6 @@
17
17
  #
18
18
 
19
19
  module Ohai
20
- OHAI_ROOT = File.expand_path(File.dirname(__FILE__))
21
- VERSION = "16.5.0".freeze
20
+ OHAI_ROOT = File.expand_path(__dir__)
21
+ VERSION = "16.5.4".freeze
22
22
  end
data/ohai.gemspec CHANGED
@@ -1,5 +1,4 @@
1
-
2
- $:.unshift File.expand_path("../lib", __FILE__)
1
+ $:.unshift File.expand_path("lib", __dir__)
3
2
  require "ohai/version"
4
3
 
5
4
  Gem::Specification.new do |s|
@@ -14,17 +13,17 @@ Gem::Specification.new do |s|
14
13
 
15
14
  s.required_ruby_version = ">= 2.5"
16
15
 
16
+ s.add_dependency "chef-config", ">= 12.8", "< 17"
17
+ s.add_dependency "chef-utils", ">= 16.0", "< 17"
18
+ s.add_dependency "ffi", "~> 1.9"
17
19
  s.add_dependency "ffi-yajl", "~> 2.2"
20
+ s.add_dependency "ipaddress"
18
21
  s.add_dependency "mixlib-cli", ">= 1.7.0" # 1.7+ needed to support passing multiple options
19
22
  s.add_dependency "mixlib-config", ">= 2.0", "< 4.0"
20
23
  s.add_dependency "mixlib-log", ">= 2.0.1", "< 4.0"
21
24
  s.add_dependency "mixlib-shellout", ">= 2.0", "< 4.0"
22
25
  s.add_dependency "plist", "~> 3.1"
23
- s.add_dependency "ipaddress"
24
26
  s.add_dependency "wmi-lite", "~> 1.0"
25
- s.add_dependency "ffi", "~> 1.9"
26
- s.add_dependency "chef-config", ">= 12.8", "< 17"
27
- s.add_dependency "chef-utils", ">= 16.0", "< 17"
28
27
  # Note for ohai developers: If chef-config causes you grief, try:
29
28
  # bundle install --with development
30
29
  # this should work as long as chef is a development dependency in Gemfile.
metadata CHANGED
@@ -1,15 +1,69 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ohai
3
3
  version: !ruby/object:Gem::Version
4
- version: 16.5.0
4
+ version: 16.5.4
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-09-09 00:00:00.000000000 Z
11
+ date: 2020-09-17 00:00:00.000000000 Z
12
12
  dependencies:
13
+ - !ruby/object:Gem::Dependency
14
+ name: chef-config
15
+ requirement: !ruby/object:Gem::Requirement
16
+ requirements:
17
+ - - ">="
18
+ - !ruby/object:Gem::Version
19
+ version: '12.8'
20
+ - - "<"
21
+ - !ruby/object:Gem::Version
22
+ version: '17'
23
+ type: :runtime
24
+ prerelease: false
25
+ version_requirements: !ruby/object:Gem::Requirement
26
+ requirements:
27
+ - - ">="
28
+ - !ruby/object:Gem::Version
29
+ version: '12.8'
30
+ - - "<"
31
+ - !ruby/object:Gem::Version
32
+ version: '17'
33
+ - !ruby/object:Gem::Dependency
34
+ name: chef-utils
35
+ requirement: !ruby/object:Gem::Requirement
36
+ requirements:
37
+ - - ">="
38
+ - !ruby/object:Gem::Version
39
+ version: '16.0'
40
+ - - "<"
41
+ - !ruby/object:Gem::Version
42
+ version: '17'
43
+ type: :runtime
44
+ prerelease: false
45
+ version_requirements: !ruby/object:Gem::Requirement
46
+ requirements:
47
+ - - ">="
48
+ - !ruby/object:Gem::Version
49
+ version: '16.0'
50
+ - - "<"
51
+ - !ruby/object:Gem::Version
52
+ version: '17'
53
+ - !ruby/object:Gem::Dependency
54
+ name: ffi
55
+ requirement: !ruby/object:Gem::Requirement
56
+ requirements:
57
+ - - "~>"
58
+ - !ruby/object:Gem::Version
59
+ version: '1.9'
60
+ type: :runtime
61
+ prerelease: false
62
+ version_requirements: !ruby/object:Gem::Requirement
63
+ requirements:
64
+ - - "~>"
65
+ - !ruby/object:Gem::Version
66
+ version: '1.9'
13
67
  - !ruby/object:Gem::Dependency
14
68
  name: ffi-yajl
15
69
  requirement: !ruby/object:Gem::Requirement
@@ -24,6 +78,20 @@ dependencies:
24
78
  - - "~>"
25
79
  - !ruby/object:Gem::Version
26
80
  version: '2.2'
81
+ - !ruby/object:Gem::Dependency
82
+ name: ipaddress
83
+ requirement: !ruby/object:Gem::Requirement
84
+ requirements:
85
+ - - ">="
86
+ - !ruby/object:Gem::Version
87
+ version: '0'
88
+ type: :runtime
89
+ prerelease: false
90
+ version_requirements: !ruby/object:Gem::Requirement
91
+ requirements:
92
+ - - ">="
93
+ - !ruby/object:Gem::Version
94
+ version: '0'
27
95
  - !ruby/object:Gem::Dependency
28
96
  name: mixlib-cli
29
97
  requirement: !ruby/object:Gem::Requirement
@@ -112,20 +180,6 @@ dependencies:
112
180
  - - "~>"
113
181
  - !ruby/object:Gem::Version
114
182
  version: '3.1'
115
- - !ruby/object:Gem::Dependency
116
- name: ipaddress
117
- requirement: !ruby/object:Gem::Requirement
118
- requirements:
119
- - - ">="
120
- - !ruby/object:Gem::Version
121
- version: '0'
122
- type: :runtime
123
- prerelease: false
124
- version_requirements: !ruby/object:Gem::Requirement
125
- requirements:
126
- - - ">="
127
- - !ruby/object:Gem::Version
128
- version: '0'
129
183
  - !ruby/object:Gem::Dependency
130
184
  name: wmi-lite
131
185
  requirement: !ruby/object:Gem::Requirement
@@ -140,60 +194,6 @@ dependencies:
140
194
  - - "~>"
141
195
  - !ruby/object:Gem::Version
142
196
  version: '1.0'
143
- - !ruby/object:Gem::Dependency
144
- name: ffi
145
- requirement: !ruby/object:Gem::Requirement
146
- requirements:
147
- - - "~>"
148
- - !ruby/object:Gem::Version
149
- version: '1.9'
150
- type: :runtime
151
- prerelease: false
152
- version_requirements: !ruby/object:Gem::Requirement
153
- requirements:
154
- - - "~>"
155
- - !ruby/object:Gem::Version
156
- version: '1.9'
157
- - !ruby/object:Gem::Dependency
158
- name: chef-config
159
- requirement: !ruby/object:Gem::Requirement
160
- requirements:
161
- - - ">="
162
- - !ruby/object:Gem::Version
163
- version: '12.8'
164
- - - "<"
165
- - !ruby/object:Gem::Version
166
- version: '17'
167
- type: :runtime
168
- prerelease: false
169
- version_requirements: !ruby/object:Gem::Requirement
170
- requirements:
171
- - - ">="
172
- - !ruby/object:Gem::Version
173
- version: '12.8'
174
- - - "<"
175
- - !ruby/object:Gem::Version
176
- version: '17'
177
- - !ruby/object:Gem::Dependency
178
- name: chef-utils
179
- requirement: !ruby/object:Gem::Requirement
180
- requirements:
181
- - - ">="
182
- - !ruby/object:Gem::Version
183
- version: '16.0'
184
- - - "<"
185
- - !ruby/object:Gem::Version
186
- version: '17'
187
- type: :runtime
188
- prerelease: false
189
- version_requirements: !ruby/object:Gem::Requirement
190
- requirements:
191
- - - ">="
192
- - !ruby/object:Gem::Version
193
- version: '16.0'
194
- - - "<"
195
- - !ruby/object:Gem::Version
196
- version: '17'
197
197
  description: Ohai profiles your system and emits JSON
198
198
  email: adam@chef.io
199
199
  executables: