ohai 7.6.0.rc.0 → 7.6.0.rc.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.
Files changed (20) hide show
  1. data/lib/ohai/mixin/ec2_metadata.rb +4 -1
  2. data/lib/ohai/mixin/gce_metadata.rb +1 -1
  3. data/lib/ohai/plugins/aix/network.rb +5 -6
  4. data/lib/ohai/plugins/aix/uptime.rb +2 -2
  5. data/lib/ohai/plugins/freebsd/cpu.rb +1 -1
  6. data/lib/ohai/plugins/java.rb +2 -2
  7. data/lib/ohai/plugins/linux/network.rb +9 -2
  8. data/lib/ohai/plugins/linux/platform.rb +1 -1
  9. data/lib/ohai/plugins/linux/virtualization.rb +2 -2
  10. data/lib/ohai/plugins/rackspace.rb +7 -1
  11. data/lib/ohai/version.rb +1 -1
  12. data/spec/unit/mixin/ec2_metadata_spec.rb +4 -3
  13. data/spec/unit/plugins/aix/network_spec.rb +6 -14
  14. data/spec/unit/plugins/aix/uptime_spec.rb +7 -6
  15. data/spec/unit/plugins/freebsd/cpu_spec.rb +1 -1
  16. data/spec/unit/plugins/linux/network_spec.rb +435 -427
  17. data/spec/unit/plugins/linux/virtualization_spec.rb +19 -1
  18. data/spec/unit/plugins/rackspace_spec.rb +19 -1
  19. metadata +87 -48
  20. checksums.yaml +0 -7
data/spec/unit/plugins/linux/virtualization_spec.rb CHANGED
@@ -230,6 +230,24 @@ VBOX
230
230
  @plugin[:virtualization][:systems]['linux-vserver'].should == "host"
231
231
  end
232
232
 
233
+ it "should set Linux-VServer host if /proc/self/status contains multiple space VxID: 0" do
234
+ File.should_receive(:exists?).with("/proc/self/status").and_return(true)
235
+ File.stub(:read).with("/proc/self/status").and_return("VxID: 0")
236
+ @plugin.run
237
+ @plugin[:virtualization][:system].should == "linux-vserver"
238
+ @plugin[:virtualization][:role].should == "host"
239
+ @plugin[:virtualization][:systems]['linux-vserver'].should == "host"
240
+ end
241
+
242
+ it "should set Linux-VServer host if /proc/self/status contains tabbed VxID:\t0" do
243
+ File.should_receive(:exists?).with("/proc/self/status").and_return(true)
244
+ File.stub(:read).with("/proc/self/status").and_return("VxID:\t0")
245
+ @plugin.run
246
+ @plugin[:virtualization][:system].should == "linux-vserver"
247
+ @plugin[:virtualization][:role].should == "host"
248
+ @plugin[:virtualization][:systems]['linux-vserver'].should == "host"
249
+ end
250
+
233
251
  it "should set Linux-VServer guest if /proc/self/status contains s_context > 0" do
234
252
  File.should_receive(:exists?).with("/proc/self/status").and_return(true)
235
253
  File.stub(:read).with("/proc/self/status").and_return("s_context: 2")
@@ -373,7 +391,7 @@ CGROUP
373
391
  File.should_receive(:exists?).with("/proc/self/cgroup").and_return(true)
374
392
  File.stub(:read).with("/proc/self/cgroup").and_return(self_cgroup)
375
393
  end
376
-
394
+
377
395
  it "sets lxc host if lxc-version exists" do
378
396
  @plugin.stub(:lxc_version_exists?).and_return("/usr/bin/lxc-version")
379
397
  @plugin.run
data/spec/unit/plugins/rackspace_spec.rb CHANGED
@@ -19,6 +19,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper.rb')
19
19
 
20
20
  describe Ohai::System, "plugin rackspace" do
21
21
  before(:each) do
22
+ Resolv.stub(:getname).and_return("1.2.3.4")
22
23
  @plugin = get_plugin("rackspace")
23
24
  @plugin[:hostname] = "katie"
24
25
  @plugin[:network] = {:interfaces => {:eth0 => {"addresses"=> {
@@ -95,6 +96,20 @@ describe Ohai::System, "plugin rackspace" do
95
96
  @plugin[:rackspace][:public_hostname].should_not be_nil
96
97
  end
97
98
 
99
+ it "should resolve hostname if reverse dns is set" do
100
+ Resolv.stub(:getname).and_return("1234.resolved.com")
101
+ @plugin.run
102
+ @plugin[:rackspace][:public_hostname].should == "1234.resolved.com"
103
+ end
104
+
105
+ [Resolv::ResolvError, Resolv::ResolvTimeout].each do |exception|
106
+ it "should return ip address when reverse dns returns exception: #{exception}" do
107
+ Resolv.stub(:getname).and_raise(exception)
108
+ @plugin.run
109
+ @plugin[:rackspace][:public_hostname].should == "1.2.3.4"
110
+ end
111
+ end
112
+
98
113
  it "should have correct values for all attributes" do
99
114
  @plugin.run
100
115
  @plugin[:rackspace][:public_ip].should == "1.2.3.4"
@@ -103,7 +118,7 @@ describe Ohai::System, "plugin rackspace" do
103
118
  @plugin[:rackspace][:local_ipv4].should == "5.6.7.8"
104
119
  @plugin[:rackspace][:public_ipv6].should == "2a00:1a48:7805:111:e875:efaf:ff08:75"
105
120
  @plugin[:rackspace][:local_hostname].should == 'katie'
106
- @plugin[:rackspace][:public_hostname].should == "1-2-3-4.static.cloud-ips.com"
121
+ @plugin[:rackspace][:public_hostname].should == "1.2.3.4"
107
122
  end
108
123
 
109
124
  it "should capture region information" do
@@ -124,10 +139,13 @@ OUT
124
139
  it_should_behave_like "rackspace"
125
140
 
126
141
  before(:each) do
142
+ Resolv.stub(:getname).and_raise(Resolv::ResolvError)
127
143
  File.stub(:exist?).with('/etc/chef/ohai/hints/rackspace.json').and_return(true)
128
144
  File.stub(:read).with('/etc/chef/ohai/hints/rackspace.json').and_return('')
129
145
  File.stub(:exist?).with('C:\chef\ohai\hints/rackspace.json').and_return(true)
130
146
  File.stub(:read).with('C:\chef\ohai\hints/rackspace.json').and_return('')
147
+ File.stub(:exist?).with('/etc/resolv.conf').and_return(true)
148
+ File.stub(:read).with('/etc/resolv.conf').and_return('')
131
149
  end
132
150
 
133
151
  describe 'with no public interfaces (empty eth0)' do
metadata CHANGED
@@ -1,257 +1,292 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ohai
3
3
  version: !ruby/object:Gem::Version
4
- version: 7.6.0.rc.0
4
+ version: 7.6.0.rc.1
5
+ prerelease: 6
5
6
  platform: ruby
6
7
  authors:
7
8
  - Adam Jacob
8
9
  autorequire:
9
10
  bindir: bin
10
11
  cert_chain: []
11
- date: 2014-09-10 00:00:00.000000000 Z
12
+ date: 2014-10-27 00:00:00.000000000 Z
12
13
  dependencies:
13
14
  - !ruby/object:Gem::Dependency
14
15
  name: mime-types
15
16
  requirement: !ruby/object:Gem::Requirement
17
+ none: false
16
18
  requirements:
17
- - - "~>"
19
+ - - ~>
18
20
  - !ruby/object:Gem::Version
19
21
  version: '1.16'
20
22
  type: :runtime
21
23
  prerelease: false
22
24
  version_requirements: !ruby/object:Gem::Requirement
25
+ none: false
23
26
  requirements:
24
- - - "~>"
27
+ - - ~>
25
28
  - !ruby/object:Gem::Version
26
29
  version: '1.16'
27
30
  - !ruby/object:Gem::Dependency
28
31
  name: systemu
29
32
  requirement: !ruby/object:Gem::Requirement
33
+ none: false
30
34
  requirements:
31
- - - "~>"
35
+ - - ~>
32
36
  - !ruby/object:Gem::Version
33
37
  version: 2.6.4
34
38
  type: :runtime
35
39
  prerelease: false
36
40
  version_requirements: !ruby/object:Gem::Requirement
41
+ none: false
37
42
  requirements:
38
- - - "~>"
43
+ - - ~>
39
44
  - !ruby/object:Gem::Version
40
45
  version: 2.6.4
41
46
  - !ruby/object:Gem::Dependency
42
47
  name: ffi-yajl
43
48
  requirement: !ruby/object:Gem::Requirement
49
+ none: false
44
50
  requirements:
45
- - - "~>"
51
+ - - ~>
46
52
  - !ruby/object:Gem::Version
47
53
  version: '1.1'
48
54
  type: :runtime
49
55
  prerelease: false
50
56
  version_requirements: !ruby/object:Gem::Requirement
57
+ none: false
51
58
  requirements:
52
- - - "~>"
59
+ - - ~>
53
60
  - !ruby/object:Gem::Version
54
61
  version: '1.1'
55
62
  - !ruby/object:Gem::Dependency
56
63
  name: mixlib-cli
57
64
  requirement: !ruby/object:Gem::Requirement
65
+ none: false
58
66
  requirements:
59
- - - ">="
67
+ - - ! '>='
60
68
  - !ruby/object:Gem::Version
61
69
  version: '0'
62
70
  type: :runtime
63
71
  prerelease: false
64
72
  version_requirements: !ruby/object:Gem::Requirement
73
+ none: false
65
74
  requirements:
66
- - - ">="
75
+ - - ! '>='
67
76
  - !ruby/object:Gem::Version
68
77
  version: '0'
69
78
  - !ruby/object:Gem::Dependency
70
79
  name: mixlib-config
71
80
  requirement: !ruby/object:Gem::Requirement
81
+ none: false
72
82
  requirements:
73
- - - "~>"
83
+ - - ~>
74
84
  - !ruby/object:Gem::Version
75
85
  version: '2.0'
76
86
  type: :runtime
77
87
  prerelease: false
78
88
  version_requirements: !ruby/object:Gem::Requirement
89
+ none: false
79
90
  requirements:
80
- - - "~>"
91
+ - - ~>
81
92
  - !ruby/object:Gem::Version
82
93
  version: '2.0'
83
94
  - !ruby/object:Gem::Dependency
84
95
  name: mixlib-log
85
96
  requirement: !ruby/object:Gem::Requirement
97
+ none: false
86
98
  requirements:
87
- - - ">="
99
+ - - ! '>='
88
100
  - !ruby/object:Gem::Version
89
101
  version: '0'
90
102
  type: :runtime
91
103
  prerelease: false
92
104
  version_requirements: !ruby/object:Gem::Requirement
105
+ none: false
93
106
  requirements:
94
- - - ">="
107
+ - - ! '>='
95
108
  - !ruby/object:Gem::Version
96
109
  version: '0'
97
110
  - !ruby/object:Gem::Dependency
98
111
  name: mixlib-shellout
99
112
  requirement: !ruby/object:Gem::Requirement
113
+ none: false
100
114
  requirements:
101
- - - ">="
115
+ - - ! '>='
102
116
  - !ruby/object:Gem::Version
103
117
  version: 2.0.0.rc.0
104
- - - "<"
118
+ - - <
105
119
  - !ruby/object:Gem::Version
106
120
  version: '3.0'
107
121
  type: :runtime
108
122
  prerelease: false
109
123
  version_requirements: !ruby/object:Gem::Requirement
124
+ none: false
110
125
  requirements:
111
- - - ">="
126
+ - - ! '>='
112
127
  - !ruby/object:Gem::Version
113
128
  version: 2.0.0.rc.0
114
- - - "<"
129
+ - - <
115
130
  - !ruby/object:Gem::Version
116
131
  version: '3.0'
117
132
  - !ruby/object:Gem::Dependency
118
133
  name: net-dhcp
119
134
  requirement: !ruby/object:Gem::Requirement
135
+ none: false
120
136
  requirements:
121
- - - ">="
137
+ - - ! '>='
122
138
  - !ruby/object:Gem::Version
123
139
  version: '0'
124
140
  type: :runtime
125
141
  prerelease: false
126
142
  version_requirements: !ruby/object:Gem::Requirement
143
+ none: false
127
144
  requirements:
128
- - - ">="
145
+ - - ! '>='
129
146
  - !ruby/object:Gem::Version
130
147
  version: '0'
131
148
  - !ruby/object:Gem::Dependency
132
149
  name: ipaddress
133
150
  requirement: !ruby/object:Gem::Requirement
151
+ none: false
134
152
  requirements:
135
- - - ">="
153
+ - - ! '>='
136
154
  - !ruby/object:Gem::Version
137
155
  version: '0'
138
156
  type: :runtime
139
157
  prerelease: false
140
158
  version_requirements: !ruby/object:Gem::Requirement
159
+ none: false
141
160
  requirements:
142
- - - ">="
161
+ - - ! '>='
143
162
  - !ruby/object:Gem::Version
144
163
  version: '0'
145
164
  - !ruby/object:Gem::Dependency
146
165
  name: wmi-lite
147
166
  requirement: !ruby/object:Gem::Requirement
167
+ none: false
148
168
  requirements:
149
- - - "~>"
169
+ - - ~>
150
170
  - !ruby/object:Gem::Version
151
171
  version: '1.0'
152
172
  type: :runtime
153
173
  prerelease: false
154
174
  version_requirements: !ruby/object:Gem::Requirement
175
+ none: false
155
176
  requirements:
156
- - - "~>"
177
+ - - ~>
157
178
  - !ruby/object:Gem::Version
158
179
  version: '1.0'
159
180
  - !ruby/object:Gem::Dependency
160
181
  name: ffi
161
182
  requirement: !ruby/object:Gem::Requirement
183
+ none: false
162
184
  requirements:
163
- - - "~>"
185
+ - - ~>
164
186
  - !ruby/object:Gem::Version
165
187
  version: '1.9'
166
188
  type: :runtime
167
189
  prerelease: false
168
190
  version_requirements: !ruby/object:Gem::Requirement
191
+ none: false
169
192
  requirements:
170
- - - "~>"
193
+ - - ~>
171
194
  - !ruby/object:Gem::Version
172
195
  version: '1.9'
173
196
  - !ruby/object:Gem::Dependency
174
197
  name: rake
175
198
  requirement: !ruby/object:Gem::Requirement
199
+ none: false
176
200
  requirements:
177
- - - "~>"
201
+ - - ~>
178
202
  - !ruby/object:Gem::Version
179
203
  version: '10.1'
180
204
  type: :runtime
181
205
  prerelease: false
182
206
  version_requirements: !ruby/object:Gem::Requirement
207
+ none: false
183
208
  requirements:
184
- - - "~>"
209
+ - - ~>
185
210
  - !ruby/object:Gem::Version
186
211
  version: '10.1'
187
212
  - !ruby/object:Gem::Dependency
188
213
  name: rspec-core
189
214
  requirement: !ruby/object:Gem::Requirement
215
+ none: false
190
216
  requirements:
191
- - - "~>"
217
+ - - ~>
192
218
  - !ruby/object:Gem::Version
193
219
  version: '3.0'
194
220
  type: :development
195
221
  prerelease: false
196
222
  version_requirements: !ruby/object:Gem::Requirement
223
+ none: false
197
224
  requirements:
198
- - - "~>"
225
+ - - ~>
199
226
  - !ruby/object:Gem::Version
200
227
  version: '3.0'
201
228
  - !ruby/object:Gem::Dependency
202
229
  name: rspec-expectations
203
230
  requirement: !ruby/object:Gem::Requirement
231
+ none: false
204
232
  requirements:
205
- - - "~>"
233
+ - - ~>
206
234
  - !ruby/object:Gem::Version
207
235
  version: '3.0'
208
236
  type: :development
209
237
  prerelease: false
210
238
  version_requirements: !ruby/object:Gem::Requirement
239
+ none: false
211
240
  requirements:
212
- - - "~>"
241
+ - - ~>
213
242
  - !ruby/object:Gem::Version
214
243
  version: '3.0'
215
244
  - !ruby/object:Gem::Dependency
216
245
  name: rspec-mocks
217
246
  requirement: !ruby/object:Gem::Requirement
247
+ none: false
218
248
  requirements:
219
- - - "~>"
249
+ - - ~>
220
250
  - !ruby/object:Gem::Version
221
251
  version: '3.0'
222
252
  type: :development
223
253
  prerelease: false
224
254
  version_requirements: !ruby/object:Gem::Requirement
255
+ none: false
225
256
  requirements:
226
- - - "~>"
257
+ - - ~>
227
258
  - !ruby/object:Gem::Version
228
259
  version: '3.0'
229
260
  - !ruby/object:Gem::Dependency
230
261
  name: rspec-collection_matchers
231
262
  requirement: !ruby/object:Gem::Requirement
263
+ none: false
232
264
  requirements:
233
- - - "~>"
265
+ - - ~>
234
266
  - !ruby/object:Gem::Version
235
267
  version: '1.0'
236
268
  type: :development
237
269
  prerelease: false
238
270
  version_requirements: !ruby/object:Gem::Requirement
271
+ none: false
239
272
  requirements:
240
- - - "~>"
273
+ - - ~>
241
274
  - !ruby/object:Gem::Version
242
275
  version: '1.0'
243
276
  - !ruby/object:Gem::Dependency
244
277
  name: chef
245
278
  requirement: !ruby/object:Gem::Requirement
279
+ none: false
246
280
  requirements:
247
- - - ">="
281
+ - - ! '>='
248
282
  - !ruby/object:Gem::Version
249
283
  version: '0'
250
284
  type: :development
251
285
  prerelease: false
252
286
  version_requirements: !ruby/object:Gem::Requirement
287
+ none: false
253
288
  requirements:
254
- - - ">="
289
+ - - ! '>='
255
290
  - !ruby/object:Gem::Version
256
291
  version: '0'
257
292
  description: Ohai profiles your system and emits JSON
@@ -264,16 +299,14 @@ files:
264
299
  - LICENSE
265
300
  - README.md
266
301
  - Rakefile
267
- - bin/ohai
268
302
  - docs/man/man1/ohai.1
269
- - lib/ohai.rb
270
303
  - lib/ohai/application.rb
271
304
  - lib/ohai/common/dmi.rb
272
305
  - lib/ohai/config.rb
273
- - lib/ohai/dsl.rb
274
- - lib/ohai/dsl/plugin.rb
275
306
  - lib/ohai/dsl/plugin/versionvi.rb
276
307
  - lib/ohai/dsl/plugin/versionvii.rb
308
+ - lib/ohai/dsl/plugin.rb
309
+ - lib/ohai/dsl.rb
277
310
  - lib/ohai/exception.rb
278
311
  - lib/ohai/hints.rb
279
312
  - lib/ohai/loader.rb
@@ -397,9 +430,10 @@ files:
397
430
  - lib/ohai/runner.rb
398
431
  - lib/ohai/system.rb
399
432
  - lib/ohai/util/file_helper.rb
400
- - lib/ohai/util/win32.rb
401
433
  - lib/ohai/util/win32/group_helper.rb
434
+ - lib/ohai/util/win32.rb
402
435
  - lib/ohai/version.rb
436
+ - lib/ohai.rb
403
437
  - spec/data/plugins/___lib64___libc.so.6.output
404
438
  - spec/data/plugins/___lib___libc.so.6.output
405
439
  - spec/data/plugins/cc.output
@@ -525,28 +559,33 @@ files:
525
559
  - spec/unit/runner_spec.rb
526
560
  - spec/unit/system_spec.rb
527
561
  - spec/unit/util/file_helper_spec.rb
562
+ - bin/ohai
528
563
  homepage: https://docs.getchef.com/ohai.html
529
564
  licenses:
530
565
  - Apache-2.0
531
- metadata: {}
532
566
  post_install_message:
533
567
  rdoc_options: []
534
568
  require_paths:
535
569
  - lib
536
570
  required_ruby_version: !ruby/object:Gem::Requirement
571
+ none: false
537
572
  requirements:
538
- - - ">="
573
+ - - ! '>='
539
574
  - !ruby/object:Gem::Version
540
575
  version: '0'
576
+ segments:
577
+ - 0
578
+ hash: -2436261048797910816
541
579
  required_rubygems_version: !ruby/object:Gem::Requirement
580
+ none: false
542
581
  requirements:
543
- - - ">"
582
+ - - ! '>'
544
583
  - !ruby/object:Gem::Version
545
584
  version: 1.3.1
546
585
  requirements: []
547
586
  rubyforge_project:
548
- rubygems_version: 2.2.2
587
+ rubygems_version: 1.8.29
549
588
  signing_key:
550
- specification_version: 4
589
+ specification_version: 3
551
590
  summary: Ohai profiles your system and emits JSON
552
591
  test_files: []