ohai 0.6.12.rc.2 → 0.6.12.rc.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (5) hide show
  1. data/lib/ohai/plugins/linux/network.rb +13 -4
  2. data/lib/ohai/plugins/network.rb +9 -5
  3. data/lib/ohai/version.rb +1 -1
  4. data/spec/ohai/plugins/linux/network_spec.rb +7 -0
  5. metadata +211 -166
data/lib/ohai/plugins/linux/network.rb CHANGED
@@ -88,15 +88,24 @@ if File.exist?("/sbin/ip")
88
88
  iface[cint][:addresses][$2.upcase] = { "family" => "lladdr" }
89
89
  end
90
90
  end
91
- if line =~ /inet (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\/(\d{1,2})/
91
+ if line =~ /inet (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})(\/(\d{1,2}))?/
92
92
  iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
93
- tmp_addr = $1
94
- iface[cint][:addresses][tmp_addr] = { "family" => "inet" }
95
- iface[cint][:addresses][tmp_addr][:netmask] = IPAddr.new("255.255.255.255").mask($2.to_i).to_s
93
+ tmp_addr, tmp_prefix = $1, $3
94
+ tmp_prefix ||= "32"
95
+ iface[cint][:addresses][tmp_addr] = { "family" => "inet", "prefixlen" => tmp_prefix }
96
+ iface[cint][:addresses][tmp_addr][:netmask] = IPAddr.new("255.255.255.255").mask(tmp_prefix.to_i).to_s
97
+
98
+ if line =~ /peer (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/
99
+ iface[cint][:addresses][tmp_addr][:peer] = $1
100
+ end
96
101
 
97
102
  if line =~ /brd (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/
98
103
  iface[cint][:addresses][tmp_addr][:broadcast] = $1
99
104
  end
105
+
106
+ if line =~ /scope (\w+)/
107
+ iface[cint][:addresses][tmp_addr][:scope] = ($1.eql?("host") ? "Node" : $1.capitalize)
108
+ end
100
109
  end
101
110
  if line =~ /inet6 ([a-f0-9\:]+)\/(\d+) scope (\w+)/
102
111
  iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
data/lib/ohai/plugins/network.rb CHANGED
@@ -34,7 +34,7 @@ def find_ip_and_mac(addresses, match = nil)
34
34
  if match.nil?
35
35
  ip = addr if addresses[addr]["family"].eql?("inet")
36
36
  else
37
- ip = addr if addresses[addr]["family"].eql?("inet") && network_contains_address(match, addr, addresses[addr][:netmask])
37
+ ip = addr if addresses[addr]["family"].eql?("inet") && network_contains_address(match, addr, addresses[addr])
38
38
  end
39
39
  mac = addr if addresses[addr]["family"].eql?("lladdr")
40
40
  break if (ip and mac)
@@ -43,10 +43,14 @@ def find_ip_and_mac(addresses, match = nil)
43
43
  [ip, mac]
44
44
  end
45
45
 
46
- def network_contains_address(address_to_match, network_ip, network_mask)
47
- network = IPAddress "#{network_ip}/#{network_mask}"
48
- host = IPAddress address_to_match
49
- network.include?(host)
46
+ def network_contains_address(address_to_match, network_ip, network_opts)
47
+ if network_opts[:peer]
48
+ network_opts[:peer] == address_to_match
49
+ else
50
+ network = IPAddress "#{network_ip}/#{network_opts[:netmask]}"
51
+ host = IPAddress address_to_match
52
+ network.include?(host)
53
+ end
50
54
  end
51
55
 
52
56
  # If we have a default interface that has addresses, populate the short-cut attributes
data/lib/ohai/version.rb CHANGED
@@ -18,6 +18,6 @@
18
18
 
19
19
  module Ohai
20
20
  OHAI_ROOT = File.expand_path(File.dirname(__FILE__))
21
- VERSION = '0.6.12.rc.2'
21
+ VERSION = '0.6.12.rc.3'
22
22
  end
23
23
 
data/spec/ohai/plugins/linux/network_spec.rb CHANGED
@@ -18,6 +18,13 @@
18
18
 
19
19
  require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb')
20
20
 
21
+ begin
22
+ require 'ipaddress'
23
+ rescue LoadError => e
24
+ puts "The linux network plugin spec tests will fail without the 'ipaddress' library/gem.\n\n"
25
+ raise e
26
+ end
27
+
21
28
  describe Ohai::System, "Linux Network Plugin" do
22
29
 
23
30
  before do
metadata CHANGED
@@ -1,8 +1,15 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ohai
3
3
  version: !ruby/object:Gem::Version
4
+ hash: 15424019
4
5
  prerelease: 7
5
- version: 0.6.12.rc.2
6
+ segments:
7
+ - 0
8
+ - 6
9
+ - 12
10
+ - rc
11
+ - 3
12
+ version: 0.6.12.rc.3
6
13
  platform: ruby
7
14
  authors:
8
15
  - Adam Jacob
@@ -10,7 +17,7 @@ autorequire:
10
17
  bindir: bin
11
18
  cert_chain: []
12
19
 
13
- date: 2012-03-02 00:00:00 Z
20
+ date: 2012-03-06 00:00:00 Z
14
21
  dependencies:
15
22
  - !ruby/object:Gem::Dependency
16
23
  name: systemu
@@ -20,6 +27,9 @@ dependencies:
20
27
  requirements:
21
28
  - - ">="
22
29
  - !ruby/object:Gem::Version
30
+ hash: 3
31
+ segments:
32
+ - 0
23
33
  version: "0"
24
34
  type: :runtime
25
35
  version_requirements: *id001
@@ -31,6 +41,9 @@ dependencies:
31
41
  requirements:
32
42
  - - ">="
33
43
  - !ruby/object:Gem::Version
44
+ hash: 3
45
+ segments:
46
+ - 0
34
47
  version: "0"
35
48
  type: :runtime
36
49
  version_requirements: *id002
@@ -42,6 +55,9 @@ dependencies:
42
55
  requirements:
43
56
  - - ">="
44
57
  - !ruby/object:Gem::Version
58
+ hash: 3
59
+ segments:
60
+ - 0
45
61
  version: "0"
46
62
  type: :runtime
47
63
  version_requirements: *id003
@@ -53,6 +69,9 @@ dependencies:
53
69
  requirements:
54
70
  - - ">="
55
71
  - !ruby/object:Gem::Version
72
+ hash: 3
73
+ segments:
74
+ - 0
56
75
  version: "0"
57
76
  type: :runtime
58
77
  version_requirements: *id004
@@ -64,6 +83,9 @@ dependencies:
64
83
  requirements:
65
84
  - - ">="
66
85
  - !ruby/object:Gem::Version
86
+ hash: 3
87
+ segments:
88
+ - 0
67
89
  version: "0"
68
90
  type: :runtime
69
91
  version_requirements: *id005
@@ -75,6 +97,9 @@ dependencies:
75
97
  requirements:
76
98
  - - ">="
77
99
  - !ruby/object:Gem::Version
100
+ hash: 3
101
+ segments:
102
+ - 0
78
103
  version: "0"
79
104
  type: :runtime
80
105
  version_requirements: *id006
@@ -86,6 +111,9 @@ dependencies:
86
111
  requirements:
87
112
  - - ">="
88
113
  - !ruby/object:Gem::Version
114
+ hash: 3
115
+ segments:
116
+ - 0
89
117
  version: "0"
90
118
  type: :development
91
119
  version_requirements: *id007
@@ -97,6 +125,9 @@ dependencies:
97
125
  requirements:
98
126
  - - ">="
99
127
  - !ruby/object:Gem::Version
128
+ hash: 3
129
+ segments:
130
+ - 0
100
131
  version: "0"
101
132
  type: :development
102
133
  version_requirements: *id008
@@ -108,6 +139,9 @@ dependencies:
108
139
  requirements:
109
140
  - - ">="
110
141
  - !ruby/object:Gem::Version
142
+ hash: 3
143
+ segments:
144
+ - 0
111
145
  version: "0"
112
146
  type: :development
113
147
  version_requirements: *id009
@@ -119,6 +153,9 @@ dependencies:
119
153
  requirements:
120
154
  - - ">="
121
155
  - !ruby/object:Gem::Version
156
+ hash: 3
157
+ segments:
158
+ - 0
122
159
  version: "0"
123
160
  type: :development
124
161
  version_requirements: *id010
@@ -135,206 +172,206 @@ files:
135
172
  - README.rdoc
136
173
  - Rakefile
137
174
  - docs/man/man1/ohai.1
138
- - lib/ohai.rb
139
- - lib/ohai/plugins/languages.rb
140
- - lib/ohai/plugins/virtualization.rb
141
- - lib/ohai/plugins/dmi.rb
142
- - lib/ohai/plugins/passwd.rb
143
- - lib/ohai/plugins/ohai.rb
144
- - lib/ohai/plugins/php.rb
145
- - lib/ohai/plugins/ip_scopes.rb
146
- - lib/ohai/plugins/keys.rb
147
- - lib/ohai/plugins/dmi_common.rb
148
- - lib/ohai/plugins/rackspace.rb
175
+ - lib/ohai/exception.rb
149
176
  - lib/ohai/plugins/erlang.rb
150
- - lib/ohai/plugins/freebsd/virtualization.rb
151
- - lib/ohai/plugins/freebsd/memory.rb
152
- - lib/ohai/plugins/freebsd/hostname.rb
153
- - lib/ohai/plugins/freebsd/uptime.rb
154
- - lib/ohai/plugins/freebsd/ssh_host_key.rb
155
- - lib/ohai/plugins/freebsd/network.rb
156
- - lib/ohai/plugins/freebsd/kernel.rb
157
- - lib/ohai/plugins/freebsd/platform.rb
158
- - lib/ohai/plugins/freebsd/ps.rb
159
- - lib/ohai/plugins/freebsd/cpu.rb
160
- - lib/ohai/plugins/freebsd/filesystem.rb
161
- - lib/ohai/plugins/linux/virtualization.rb
162
- - lib/ohai/plugins/linux/lsb.rb
163
- - lib/ohai/plugins/linux/memory.rb
164
- - lib/ohai/plugins/linux/hostname.rb
165
- - lib/ohai/plugins/linux/uptime.rb
166
- - lib/ohai/plugins/linux/ssh_host_key.rb
167
- - lib/ohai/plugins/linux/block_device.rb
177
+ - lib/ohai/plugins/windows/network.rb
178
+ - lib/ohai/plugins/windows/filesystem.rb
179
+ - lib/ohai/plugins/windows/platform.rb
180
+ - lib/ohai/plugins/windows/kernel.rb
181
+ - lib/ohai/plugins/windows/hostname.rb
182
+ - lib/ohai/plugins/windows/cpu.rb
183
+ - lib/ohai/plugins/netbsd/network.rb
184
+ - lib/ohai/plugins/netbsd/filesystem.rb
185
+ - lib/ohai/plugins/netbsd/platform.rb
186
+ - lib/ohai/plugins/netbsd/ssh_host_key.rb
187
+ - lib/ohai/plugins/netbsd/uptime.rb
188
+ - lib/ohai/plugins/netbsd/kernel.rb
189
+ - lib/ohai/plugins/netbsd/memory.rb
190
+ - lib/ohai/plugins/netbsd/hostname.rb
191
+ - lib/ohai/plugins/netbsd/cpu.rb
192
+ - lib/ohai/plugins/netbsd/virtualization.rb
193
+ - lib/ohai/plugins/netbsd/ps.rb
194
+ - lib/ohai/plugins/network.rb
195
+ - lib/ohai/plugins/perl.rb
196
+ - lib/ohai/plugins/openbsd/network.rb
197
+ - lib/ohai/plugins/openbsd/filesystem.rb
198
+ - lib/ohai/plugins/openbsd/platform.rb
199
+ - lib/ohai/plugins/openbsd/ssh_host_key.rb
200
+ - lib/ohai/plugins/openbsd/uptime.rb
201
+ - lib/ohai/plugins/openbsd/kernel.rb
202
+ - lib/ohai/plugins/openbsd/memory.rb
203
+ - lib/ohai/plugins/openbsd/hostname.rb
204
+ - lib/ohai/plugins/openbsd/cpu.rb
205
+ - lib/ohai/plugins/openbsd/virtualization.rb
206
+ - lib/ohai/plugins/openbsd/ps.rb
168
207
  - lib/ohai/plugins/linux/network.rb
169
- - lib/ohai/plugins/linux/kernel.rb
208
+ - lib/ohai/plugins/linux/filesystem.rb
170
209
  - lib/ohai/plugins/linux/platform.rb
171
- - lib/ohai/plugins/linux/ps.rb
210
+ - lib/ohai/plugins/linux/ssh_host_key.rb
211
+ - lib/ohai/plugins/linux/uptime.rb
212
+ - lib/ohai/plugins/linux/kernel.rb
213
+ - lib/ohai/plugins/linux/memory.rb
214
+ - lib/ohai/plugins/linux/lsb.rb
215
+ - lib/ohai/plugins/linux/block_device.rb
216
+ - lib/ohai/plugins/linux/hostname.rb
172
217
  - lib/ohai/plugins/linux/cpu.rb
173
- - lib/ohai/plugins/linux/filesystem.rb
174
- - lib/ohai/plugins/groovy.rb
175
- - lib/ohai/plugins/darwin/hostname.rb
176
- - lib/ohai/plugins/darwin/uptime.rb
177
- - lib/ohai/plugins/darwin/ssh_host_key.rb
178
- - lib/ohai/plugins/darwin/network.rb
179
- - lib/ohai/plugins/darwin/system_profiler.rb
180
- - lib/ohai/plugins/darwin/kernel.rb
181
- - lib/ohai/plugins/darwin/platform.rb
182
- - lib/ohai/plugins/darwin/ps.rb
183
- - lib/ohai/plugins/darwin/filesystem.rb
184
- - lib/ohai/plugins/chef.rb
185
- - lib/ohai/plugins/hostname.rb
186
- - lib/ohai/plugins/perl.rb
187
- - lib/ohai/plugins/uptime.rb
188
- - lib/ohai/plugins/ec2.rb
218
+ - lib/ohai/plugins/linux/virtualization.rb
219
+ - lib/ohai/plugins/linux/ps.rb
220
+ - lib/ohai/plugins/platform.rb
189
221
  - lib/ohai/plugins/network_listeners.rb
190
- - lib/ohai/plugins/hpux/memory.rb
191
- - lib/ohai/plugins/hpux/hostname.rb
192
- - lib/ohai/plugins/hpux/uptime.rb
193
- - lib/ohai/plugins/hpux/ssh_host_key.rb
194
- - lib/ohai/plugins/hpux/network.rb
195
- - lib/ohai/plugins/hpux/platform.rb
196
- - lib/ohai/plugins/hpux/ps.rb
197
- - lib/ohai/plugins/hpux/cpu.rb
198
- - lib/ohai/plugins/hpux/filesystem.rb
199
- - lib/ohai/plugins/mono.rb
200
- - lib/ohai/plugins/solaris2/virtualization.rb
222
+ - lib/ohai/plugins/dmi_common.rb
223
+ - lib/ohai/plugins/solaris2/network.rb
224
+ - lib/ohai/plugins/solaris2/filesystem.rb
225
+ - lib/ohai/plugins/solaris2/platform.rb
201
226
  - lib/ohai/plugins/solaris2/dmi.rb
202
- - lib/ohai/plugins/solaris2/hostname.rb
203
- - lib/ohai/plugins/solaris2/uptime.rb
204
227
  - lib/ohai/plugins/solaris2/ssh_host_key.rb
205
- - lib/ohai/plugins/solaris2/network.rb
206
- - lib/ohai/plugins/solaris2/zpools.rb
228
+ - lib/ohai/plugins/solaris2/uptime.rb
207
229
  - lib/ohai/plugins/solaris2/kernel.rb
208
- - lib/ohai/plugins/solaris2/platform.rb
209
- - lib/ohai/plugins/solaris2/ps.rb
230
+ - lib/ohai/plugins/solaris2/hostname.rb
210
231
  - lib/ohai/plugins/solaris2/cpu.rb
211
- - lib/ohai/plugins/solaris2/filesystem.rb
212
- - lib/ohai/plugins/ohai_time.rb
213
- - lib/ohai/plugins/c.rb
214
- - lib/ohai/plugins/lua.rb
215
- - lib/ohai/plugins/openbsd/virtualization.rb
216
- - lib/ohai/plugins/openbsd/memory.rb
217
- - lib/ohai/plugins/openbsd/hostname.rb
218
- - lib/ohai/plugins/openbsd/uptime.rb
219
- - lib/ohai/plugins/openbsd/ssh_host_key.rb
220
- - lib/ohai/plugins/openbsd/network.rb
221
- - lib/ohai/plugins/openbsd/kernel.rb
222
- - lib/ohai/plugins/openbsd/platform.rb
223
- - lib/ohai/plugins/openbsd/ps.rb
224
- - lib/ohai/plugins/openbsd/cpu.rb
225
- - lib/ohai/plugins/openbsd/filesystem.rb
226
- - lib/ohai/plugins/python.rb
227
- - lib/ohai/plugins/network.rb
228
- - lib/ohai/plugins/kernel.rb
229
- - lib/ohai/plugins/cloud.rb
232
+ - lib/ohai/plugins/solaris2/zpools.rb
233
+ - lib/ohai/plugins/solaris2/virtualization.rb
234
+ - lib/ohai/plugins/solaris2/ps.rb
235
+ - lib/ohai/plugins/php.rb
236
+ - lib/ohai/plugins/dmi.rb
230
237
  - lib/ohai/plugins/java.rb
231
- - lib/ohai/plugins/platform.rb
232
- - lib/ohai/plugins/ruby.rb
233
- - lib/ohai/plugins/os.rb
234
- - lib/ohai/plugins/sigar/memory.rb
235
- - lib/ohai/plugins/sigar/hostname.rb
236
- - lib/ohai/plugins/sigar/uptime.rb
238
+ - lib/ohai/plugins/chef.rb
239
+ - lib/ohai/plugins/mono.rb
237
240
  - lib/ohai/plugins/sigar/network.rb
241
+ - lib/ohai/plugins/sigar/filesystem.rb
238
242
  - lib/ohai/plugins/sigar/network_route.rb
239
243
  - lib/ohai/plugins/sigar/platform.rb
244
+ - lib/ohai/plugins/sigar/uptime.rb
245
+ - lib/ohai/plugins/sigar/memory.rb
246
+ - lib/ohai/plugins/sigar/hostname.rb
240
247
  - lib/ohai/plugins/sigar/cpu.rb
241
- - lib/ohai/plugins/sigar/filesystem.rb
242
- - lib/ohai/plugins/command.rb
243
- - lib/ohai/plugins/windows/hostname.rb
244
- - lib/ohai/plugins/windows/network.rb
245
- - lib/ohai/plugins/windows/kernel.rb
246
- - lib/ohai/plugins/windows/platform.rb
247
- - lib/ohai/plugins/windows/cpu.rb
248
- - lib/ohai/plugins/windows/filesystem.rb
248
+ - lib/ohai/plugins/uptime.rb
249
+ - lib/ohai/plugins/kernel.rb
250
+ - lib/ohai/plugins/passwd.rb
249
251
  - lib/ohai/plugins/eucalyptus.rb
250
- - lib/ohai/plugins/netbsd/virtualization.rb
251
- - lib/ohai/plugins/netbsd/memory.rb
252
- - lib/ohai/plugins/netbsd/hostname.rb
253
- - lib/ohai/plugins/netbsd/uptime.rb
254
- - lib/ohai/plugins/netbsd/ssh_host_key.rb
255
- - lib/ohai/plugins/netbsd/network.rb
256
- - lib/ohai/plugins/netbsd/kernel.rb
257
- - lib/ohai/plugins/netbsd/platform.rb
258
- - lib/ohai/plugins/netbsd/ps.rb
259
- - lib/ohai/plugins/netbsd/cpu.rb
260
- - lib/ohai/plugins/netbsd/filesystem.rb
261
- - lib/ohai/plugins/aix/memory.rb
262
- - lib/ohai/plugins/aix/hostname.rb
263
- - lib/ohai/plugins/aix/uptime.rb
264
- - lib/ohai/plugins/aix/ssh_host_key.rb
252
+ - lib/ohai/plugins/cloud.rb
253
+ - lib/ohai/plugins/python.rb
265
254
  - lib/ohai/plugins/aix/network.rb
255
+ - lib/ohai/plugins/aix/filesystem.rb
266
256
  - lib/ohai/plugins/aix/platform.rb
267
- - lib/ohai/plugins/aix/ps.rb
257
+ - lib/ohai/plugins/aix/ssh_host_key.rb
258
+ - lib/ohai/plugins/aix/uptime.rb
259
+ - lib/ohai/plugins/aix/memory.rb
260
+ - lib/ohai/plugins/aix/hostname.rb
268
261
  - lib/ohai/plugins/aix/cpu.rb
269
- - lib/ohai/plugins/aix/filesystem.rb
270
- - lib/ohai/application.rb
262
+ - lib/ohai/plugins/aix/ps.rb
263
+ - lib/ohai/plugins/rackspace.rb
264
+ - lib/ohai/plugins/darwin/network.rb
265
+ - lib/ohai/plugins/darwin/filesystem.rb
266
+ - lib/ohai/plugins/darwin/system_profiler.rb
267
+ - lib/ohai/plugins/darwin/platform.rb
268
+ - lib/ohai/plugins/darwin/ssh_host_key.rb
269
+ - lib/ohai/plugins/darwin/uptime.rb
270
+ - lib/ohai/plugins/darwin/kernel.rb
271
+ - lib/ohai/plugins/darwin/hostname.rb
272
+ - lib/ohai/plugins/darwin/ps.rb
273
+ - lib/ohai/plugins/groovy.rb
274
+ - lib/ohai/plugins/hostname.rb
275
+ - lib/ohai/plugins/hpux/network.rb
276
+ - lib/ohai/plugins/hpux/filesystem.rb
277
+ - lib/ohai/plugins/hpux/platform.rb
278
+ - lib/ohai/plugins/hpux/ssh_host_key.rb
279
+ - lib/ohai/plugins/hpux/uptime.rb
280
+ - lib/ohai/plugins/hpux/memory.rb
281
+ - lib/ohai/plugins/hpux/hostname.rb
282
+ - lib/ohai/plugins/hpux/cpu.rb
283
+ - lib/ohai/plugins/hpux/ps.rb
284
+ - lib/ohai/plugins/languages.rb
285
+ - lib/ohai/plugins/ohai.rb
286
+ - lib/ohai/plugins/os.rb
287
+ - lib/ohai/plugins/ip_scopes.rb
288
+ - lib/ohai/plugins/ohai_time.rb
289
+ - lib/ohai/plugins/command.rb
290
+ - lib/ohai/plugins/c.rb
291
+ - lib/ohai/plugins/ruby.rb
292
+ - lib/ohai/plugins/ec2.rb
293
+ - lib/ohai/plugins/freebsd/network.rb
294
+ - lib/ohai/plugins/freebsd/filesystem.rb
295
+ - lib/ohai/plugins/freebsd/platform.rb
296
+ - lib/ohai/plugins/freebsd/ssh_host_key.rb
297
+ - lib/ohai/plugins/freebsd/uptime.rb
298
+ - lib/ohai/plugins/freebsd/kernel.rb
299
+ - lib/ohai/plugins/freebsd/memory.rb
300
+ - lib/ohai/plugins/freebsd/hostname.rb
301
+ - lib/ohai/plugins/freebsd/cpu.rb
302
+ - lib/ohai/plugins/freebsd/virtualization.rb
303
+ - lib/ohai/plugins/freebsd/ps.rb
304
+ - lib/ohai/plugins/lua.rb
305
+ - lib/ohai/plugins/keys.rb
306
+ - lib/ohai/plugins/virtualization.rb
271
307
  - lib/ohai/version.rb
272
308
  - lib/ohai/mash.rb
273
- - lib/ohai/exception.rb
274
- - lib/ohai/config.rb
275
- - lib/ohai/log.rb
276
309
  - lib/ohai/system.rb
277
- - lib/ohai/mixin/string.rb
310
+ - lib/ohai/log.rb
311
+ - lib/ohai/config.rb
312
+ - lib/ohai/application.rb
313
+ - lib/ohai/mixin/ec2_metadata.rb
278
314
  - lib/ohai/mixin/from_file.rb
315
+ - lib/ohai/mixin/string.rb
279
316
  - lib/ohai/mixin/command.rb
280
- - lib/ohai/mixin/ec2_metadata.rb
281
- - spec/ohai/plugins/groovy_spec.rb
317
+ - lib/ohai.rb
318
+ - spec/rcov.opts
319
+ - spec/ohai/plugins/erlang_spec.rb
320
+ - spec/ohai/plugins/netbsd/kernel_spec.rb
321
+ - spec/ohai/plugins/netbsd/hostname_spec.rb
322
+ - spec/ohai/plugins/netbsd/platform_spec.rb
282
323
  - spec/ohai/plugins/lua_spec.rb
283
- - spec/ohai/plugins/ec2_spec.rb
284
- - spec/ohai/plugins/ruby_spec.rb
285
- - spec/ohai/plugins/fail_spec.rb
286
- - spec/ohai/plugins/rackspace_spec.rb
287
- - spec/ohai/plugins/freebsd/kernel_spec.rb
288
- - spec/ohai/plugins/freebsd/platform_spec.rb
289
- - spec/ohai/plugins/freebsd/hostname_spec.rb
290
- - spec/ohai/plugins/php_spec.rb
291
- - spec/ohai/plugins/linux/cpu_spec.rb
292
- - spec/ohai/plugins/linux/network_spec.rb
324
+ - spec/ohai/plugins/openbsd/kernel_spec.rb
325
+ - spec/ohai/plugins/openbsd/hostname_spec.rb
326
+ - spec/ohai/plugins/openbsd/platform_spec.rb
327
+ - spec/ohai/plugins/passwd_spec.rb
328
+ - spec/ohai/plugins/ohai_time_spec.rb
329
+ - spec/ohai/plugins/kernel_spec.rb
330
+ - spec/ohai/plugins/linux/lsb_spec.rb
331
+ - spec/ohai/plugins/linux/virtualization_spec.rb
293
332
  - spec/ohai/plugins/linux/kernel_spec.rb
294
- - spec/ohai/plugins/linux/platform_spec.rb
295
333
  - spec/ohai/plugins/linux/uptime_spec.rb
296
- - spec/ohai/plugins/linux/virtualization_spec.rb
297
- - spec/ohai/plugins/linux/lsb_spec.rb
298
- - spec/ohai/plugins/linux/hostname_spec.rb
334
+ - spec/ohai/plugins/linux/network_spec.rb
299
335
  - spec/ohai/plugins/linux/filesystem_spec.rb
300
- - spec/ohai/plugins/chef_spec.rb
301
- - spec/ohai/plugins/darwin/kernel_spec.rb
302
- - spec/ohai/plugins/darwin/platform_spec.rb
303
- - spec/ohai/plugins/darwin/hostname_spec.rb
336
+ - spec/ohai/plugins/linux/cpu_spec.rb
337
+ - spec/ohai/plugins/linux/hostname_spec.rb
338
+ - spec/ohai/plugins/linux/platform_spec.rb
339
+ - spec/ohai/plugins/c_spec.rb
340
+ - spec/ohai/plugins/solaris2/virtualization_spec.rb
341
+ - spec/ohai/plugins/solaris2/kernel_spec.rb
342
+ - spec/ohai/plugins/solaris2/network_spec.rb
343
+ - spec/ohai/plugins/solaris2/hostname_spec.rb
344
+ - spec/ohai/plugins/cloud_spec.rb
345
+ - spec/ohai/plugins/ruby_spec.rb
304
346
  - spec/ohai/plugins/python_spec.rb
347
+ - spec/ohai/plugins/sigar/network_route_spec.rb
348
+ - spec/ohai/plugins/ohai_spec.rb
349
+ - spec/ohai/plugins/hostname_spec.rb
350
+ - spec/ohai/plugins/eucalyptus_spec.rb
351
+ - spec/ohai/plugins/mono_spec.rb
352
+ - spec/ohai/plugins/rackspace_spec.rb
305
353
  - spec/ohai/plugins/java_spec.rb
306
- - spec/ohai/plugins/kernel_spec.rb
354
+ - spec/ohai/plugins/darwin/kernel_spec.rb
355
+ - spec/ohai/plugins/darwin/hostname_spec.rb
356
+ - spec/ohai/plugins/darwin/platform_spec.rb
357
+ - spec/ohai/plugins/ec2_spec.rb
358
+ - spec/ohai/plugins/fail_spec.rb
307
359
  - spec/ohai/plugins/dmi_spec.rb
308
- - spec/ohai/plugins/mono_spec.rb
309
- - spec/ohai/plugins/solaris2/network_spec.rb
310
- - spec/ohai/plugins/solaris2/kernel_spec.rb
311
- - spec/ohai/plugins/solaris2/virtualization_spec.rb
312
- - spec/ohai/plugins/solaris2/hostname_spec.rb
313
- - spec/ohai/plugins/openbsd/kernel_spec.rb
314
- - spec/ohai/plugins/openbsd/platform_spec.rb
315
- - spec/ohai/plugins/openbsd/hostname_spec.rb
316
- - spec/ohai/plugins/platform_spec.rb
317
- - spec/ohai/plugins/erlang_spec.rb
360
+ - spec/ohai/plugins/chef_spec.rb
361
+ - spec/ohai/plugins/php_spec.rb
362
+ - spec/ohai/plugins/groovy_spec.rb
318
363
  - spec/ohai/plugins/perl_spec.rb
319
- - spec/ohai/plugins/c_spec.rb
320
- - spec/ohai/plugins/ohai_spec.rb
321
- - spec/ohai/plugins/sigar/network_route_spec.rb
364
+ - spec/ohai/plugins/platform_spec.rb
365
+ - spec/ohai/plugins/freebsd/kernel_spec.rb
366
+ - spec/ohai/plugins/freebsd/hostname_spec.rb
367
+ - spec/ohai/plugins/freebsd/platform_spec.rb
322
368
  - spec/ohai/plugins/os_spec.rb
323
- - spec/ohai/plugins/passwd_spec.rb
324
- - spec/ohai/plugins/cloud_spec.rb
325
- - spec/ohai/plugins/eucalyptus_spec.rb
326
- - spec/ohai/plugins/netbsd/kernel_spec.rb
327
- - spec/ohai/plugins/netbsd/platform_spec.rb
328
- - spec/ohai/plugins/netbsd/hostname_spec.rb
329
- - spec/ohai/plugins/hostname_spec.rb
330
- - spec/ohai/plugins/ohai_time_spec.rb
331
- - spec/ohai/system_spec.rb
332
369
  - spec/ohai/mixin/command_spec.rb
333
370
  - spec/ohai/mixin/from_file_spec.rb
371
+ - spec/ohai/system_spec.rb
334
372
  - spec/spec_helper.rb
335
- - spec/spec.opts
336
- - spec/rcov.opts
337
373
  - spec/ohai_spec.rb
374
+ - spec/spec.opts
338
375
  - bin/ohai
339
376
  homepage: http://wiki.opscode.com/display/chef/Ohai
340
377
  licenses: []
@@ -349,12 +386,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
349
386
  requirements:
350
387
  - - ">="
351
388
  - !ruby/object:Gem::Version
389
+ hash: 3
390
+ segments:
391
+ - 0
352
392
  version: "0"
353
393
  required_rubygems_version: !ruby/object:Gem::Requirement
354
394
  none: false
355
395
  requirements:
356
396
  - - ">"
357
397
  - !ruby/object:Gem::Version
398
+ hash: 25
399
+ segments:
400
+ - 1
401
+ - 3
402
+ - 1
358
403
  version: 1.3.1
359
404
  requirements: []
360
405