yajl-ruby 0.7.1 → 0.7.2

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.

This version of yajl-ruby might be problematic. Click here for more details.

Files changed (46) hide show
  1. data/CHANGELOG.md +8 -1
  2. data/MIT-LICENSE +3 -3
  3. data/README.rdoc +8 -8
  4. data/VERSION.yml +1 -1
  5. data/benchmark/subjects/ohai.yml +171 -171
  6. data/ext/api/yajl_common.h +9 -9
  7. data/ext/api/yajl_gen.h +10 -10
  8. data/ext/api/yajl_parse.h +15 -15
  9. data/ext/yajl.c +8 -8
  10. data/ext/yajl_alloc.c +6 -6
  11. data/ext/yajl_alloc.h +6 -6
  12. data/ext/yajl_buf.c +7 -7
  13. data/ext/yajl_buf.h +7 -7
  14. data/ext/yajl_bytestack.h +10 -10
  15. data/ext/yajl_encode.c +12 -12
  16. data/ext/yajl_encode.h +6 -6
  17. data/ext/yajl_ext.c +67 -80
  18. data/ext/yajl_ext.h +4 -4
  19. data/ext/yajl_gen.c +16 -16
  20. data/ext/yajl_lex.c +79 -76
  21. data/ext/yajl_lex.h +14 -14
  22. data/ext/yajl_parser.c +34 -34
  23. data/ext/yajl_parser.h +7 -7
  24. data/lib/yajl.rb +7 -7
  25. data/lib/yajl/bzip2/stream_reader.rb +1 -11
  26. data/lib/yajl/bzip2/stream_writer.rb +1 -1
  27. data/lib/yajl/deflate/stream_reader.rb +6 -7
  28. data/lib/yajl/deflate/stream_writer.rb +2 -2
  29. data/lib/yajl/gzip/stream_reader.rb +0 -10
  30. data/lib/yajl/http_stream.rb +12 -12
  31. data/lib/yajl/json_gem/encoding.rb +4 -4
  32. data/lib/yajl/json_gem/parsing.rb +3 -3
  33. data/spec/encoding/encoding_spec.rb +23 -23
  34. data/spec/global/global_spec.rb +8 -8
  35. data/spec/http/http_delete_spec.rb +13 -13
  36. data/spec/http/http_error_spec.rb +2 -2
  37. data/spec/http/http_get_spec.rb +15 -15
  38. data/spec/http/http_post_spec.rb +12 -12
  39. data/spec/http/http_put_spec.rb +14 -14
  40. data/spec/json_gem_compatibility/compatibility_spec.rb +21 -21
  41. data/spec/parsing/active_support_spec.rb +6 -6
  42. data/spec/parsing/chunked_spec.rb +12 -12
  43. data/spec/parsing/fixtures_spec.rb +4 -4
  44. data/spec/parsing/one_off_spec.rb +9 -9
  45. data/yajl-ruby.gemspec +3 -3
  46. metadata +12 -5
data/CHANGELOG.md CHANGED
@@ -1,5 +1,12 @@
1
1
  # Changelog
2
2
 
3
+ ## 0.7.2 (February 23rd, 2010)
4
+ * fixed broken to_json compatibility
5
+ * removed strlen in a few places in favor of RSTRING_LEN since ruby already knows the length of the string
6
+ * patched Yajl to more efficiently reset it's lexer (no more malloc/free)
7
+ * removed dependency on IO#eof? when parsing from an IO for full Rack-spec compatibility
8
+ * removed some various cruft code in C
9
+
3
10
  ## 0.7.1 (February 17th, 2010)
4
11
  * revert a patch made to bundled Yajl enabling optional quoting of strings that broke binary API compatibility
5
12
 
@@ -200,7 +207,7 @@
200
207
  * fixed a bug in Yajl::Stream.parse that was causing "strange" Ruby malloc errors on large files, with large strings
201
208
  * added Yajl::GzipStreamReader as a wrapper around Zlib::GzipReader to allow for standard IO#read behavior
202
209
  * this allows Yajl::Stream to read off of a Gzip stream directly
203
-
210
+
204
211
  ## 0.4.0 (April 29th, 2009)
205
212
  * NOTE: Breaking API change:
206
213
  * refactored Stream parsing methods out of Yajl::Native into Yajl::Stream
data/MIT-LICENSE CHANGED
@@ -1,5 +1,5 @@
1
1
  Copyright (c) 2008-2010 Brian Lopez - http://github.com/brianmario
2
-
2
+
3
3
  Permission is hereby granted, free of charge, to any person obtaining
4
4
  a copy of this software and associated documentation files (the
5
5
  "Software"), to deal in the Software without restriction, including
@@ -7,10 +7,10 @@ without limitation the rights to use, copy, modify, merge, publish,
7
7
  distribute, sublicense, and/or sell copies of the Software, and to
8
8
  permit persons to whom the Software is furnished to do so, subject to
9
9
  the following conditions:
10
-
10
+
11
11
  The above copyright notice and this permission notice shall be
12
12
  included in all copies or substantial portions of the Software.
13
-
13
+
14
14
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
15
15
  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
16
16
  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
data/README.rdoc CHANGED
@@ -64,18 +64,18 @@ only had access to chunks of it at a time. No problem!
64
64
  def post_init
65
65
  @parser = Yajl::Parser.new
66
66
  end
67
-
67
+
68
68
  def object_parsed(obj)
69
69
  puts "Sometimes one pays most for the things one gets for nothing. - Albert Einstein"
70
70
  puts obj.inspect
71
71
  end
72
-
72
+
73
73
  def connection_completed
74
74
  # once a full JSON object has been parsed from the stream
75
75
  # object_parsed will be called, and passed the constructed object
76
76
  @parser.on_parse_complete = method(:object_parsed)
77
77
  end
78
-
78
+
79
79
  def receive_data(data)
80
80
  # continue passing chunks
81
81
  @parser << data
@@ -92,13 +92,13 @@ This actually makes a request using a raw TCPSocket, then parses the JSON body r
92
92
 
93
93
  require 'uri'
94
94
  require 'yajl/http_stream'
95
-
95
+
96
96
  url = URI.parse("http://search.twitter.com/search.json?q=engineyard")
97
97
  results = Yajl::HttpStream.get(url)
98
98
 
99
99
  Or do the same request, with Gzip and Deflate output compression support (also supports Bzip2, if loaded):
100
100
  (this does the same raw socket Request, but transparently parses the compressed response body)
101
-
101
+
102
102
  require 'uri'
103
103
  require 'yajl/gzip'
104
104
  require 'yajl/deflate'
@@ -118,7 +118,7 @@ it's much better to leave string keys enabled (the default), so they can get GC'
118
118
 
119
119
  require 'uri'
120
120
  require 'yajl/http_stream'
121
-
121
+
122
122
  uri = URI.parse("http://#{username}:#{password}@stream.twitter.com/spritzer.json")
123
123
  Yajl::HttpStream.get(uri, :symbolize_keys => true) do |hash|
124
124
  puts hash.inspect
@@ -127,7 +127,7 @@ it's much better to leave string keys enabled (the default), so they can get GC'
127
127
  Or how about parsing directly from a compressed file?
128
128
 
129
129
  require 'yajl/bzip2'
130
-
130
+
131
131
  file = File.new('some.json.bz2', 'r')
132
132
  result = Yajl::Bzip2::StreamReader.parse(file)
133
133
 
@@ -170,7 +170,7 @@ Using EventMachine and you want to encode and send in chunks?
170
170
  status = File.read("/path/to/huge/status_file.txt")
171
171
  @motd = {:motd => motd_contents, :system_status => status}
172
172
  end
173
-
173
+
174
174
  def connection_completed
175
175
  # The encoder will do it's best to hand you data in chunks that
176
176
  # are around 8kb (but you may see some that are larger)
data/VERSION.yml CHANGED
@@ -2,4 +2,4 @@
2
2
  :major: 0
3
3
  :minor: 7
4
4
  :build:
5
- :patch: 1
5
+ :patch: 2
data/benchmark/subjects/ohai.yml CHANGED
@@ -1,394 +1,394 @@
1
- ---
2
- kernel:
1
+ ---
2
+ kernel:
3
3
  name: Darwin
4
4
  machine: i386
5
- modules:
6
- com.apple.driver.AppleAPIC:
5
+ modules:
6
+ com.apple.driver.AppleAPIC:
7
7
  size: 12288
8
8
  version: "1.4"
9
9
  index: "26"
10
10
  refcount: "0"
11
- com.apple.driver.AirPort.Atheros:
11
+ com.apple.driver.AirPort.Atheros:
12
12
  size: 593920
13
13
  version: 318.8.3
14
14
  index: "88"
15
15
  refcount: "0"
16
- com.apple.driver.AppleIntelCPUPowerManagement:
16
+ com.apple.driver.AppleIntelCPUPowerManagement:
17
17
  size: 102400
18
18
  version: 59.0.1
19
19
  index: "22"
20
20
  refcount: "0"
21
- com.apple.iokit.IOStorageFamily:
21
+ com.apple.iokit.IOStorageFamily:
22
22
  size: 98304
23
23
  version: 1.5.5
24
24
  index: "44"
25
25
  refcount: "9"
26
- com.apple.iokit.IOATAPIProtocolTransport:
26
+ com.apple.iokit.IOATAPIProtocolTransport:
27
27
  size: 16384
28
28
  version: 1.5.2
29
29
  index: "52"
30
30
  refcount: "0"
31
- com.apple.iokit.IOPCIFamily:
31
+ com.apple.iokit.IOPCIFamily:
32
32
  size: 65536
33
33
  version: "2.5"
34
34
  index: "17"
35
35
  refcount: "18"
36
- org.virtualbox.kext.VBoxDrv:
36
+ org.virtualbox.kext.VBoxDrv:
37
37
  size: 118784
38
38
  version: 2.2.0
39
39
  index: "114"
40
40
  refcount: "3"
41
- com.cisco.nke.ipsec:
41
+ com.cisco.nke.ipsec:
42
42
  size: 454656
43
43
  version: 2.0.1
44
44
  index: "111"
45
45
  refcount: "0"
46
- com.apple.driver.AppleHPET:
46
+ com.apple.driver.AppleHPET:
47
47
  size: 12288
48
48
  version: "1.3"
49
49
  index: "33"
50
50
  refcount: "0"
51
- com.apple.driver.AppleUSBHub:
51
+ com.apple.driver.AppleUSBHub:
52
52
  size: 49152
53
53
  version: 3.2.7
54
54
  index: "47"
55
55
  refcount: "0"
56
- com.apple.iokit.IOFireWireFamily:
56
+ com.apple.iokit.IOFireWireFamily:
57
57
  size: 258048
58
58
  version: 3.4.6
59
59
  index: "49"
60
60
  refcount: "2"
61
- com.apple.driver.AppleUSBComposite:
61
+ com.apple.driver.AppleUSBComposite:
62
62
  size: 16384
63
63
  version: 3.2.0
64
64
  index: "60"
65
65
  refcount: "1"
66
- com.apple.driver.AppleIntelPIIXATA:
66
+ com.apple.driver.AppleIntelPIIXATA:
67
67
  size: 36864
68
68
  version: 2.0.0
69
69
  index: "41"
70
70
  refcount: "0"
71
- com.apple.driver.AppleSmartBatteryManager:
71
+ com.apple.driver.AppleSmartBatteryManager:
72
72
  size: 28672
73
73
  version: 158.6.0
74
74
  index: "32"
75
75
  refcount: "0"
76
- com.apple.filesystems.udf:
76
+ com.apple.filesystems.udf:
77
77
  size: 233472
78
78
  version: 2.0.2
79
79
  index: "119"
80
80
  refcount: "0"
81
- com.apple.iokit.IOSMBusFamily:
81
+ com.apple.iokit.IOSMBusFamily:
82
82
  size: 12288
83
83
  version: "1.1"
84
84
  index: "27"
85
85
  refcount: "2"
86
- com.apple.iokit.IOACPIFamily:
86
+ com.apple.iokit.IOACPIFamily:
87
87
  size: 16384
88
88
  version: 1.2.0
89
89
  index: "18"
90
90
  refcount: "10"
91
- foo.tap:
91
+ foo.tap:
92
92
  size: 24576
93
93
  version: "1.0"
94
94
  index: "113"
95
95
  refcount: "0"
96
- com.vmware.kext.vmx86:
96
+ com.vmware.kext.vmx86:
97
97
  size: 864256
98
98
  version: 2.0.4
99
99
  index: "104"
100
100
  refcount: "0"
101
- com.apple.iokit.CHUDUtils:
101
+ com.apple.iokit.CHUDUtils:
102
102
  size: 28672
103
103
  version: "200"
104
104
  index: "98"
105
105
  refcount: "0"
106
- com.apple.driver.AppleACPIButtons:
106
+ com.apple.driver.AppleACPIButtons:
107
107
  size: 16384
108
108
  version: 1.2.4
109
109
  index: "30"
110
110
  refcount: "0"
111
- com.apple.driver.AppleFWOHCI:
111
+ com.apple.driver.AppleFWOHCI:
112
112
  size: 139264
113
113
  version: 3.7.2
114
114
  index: "50"
115
115
  refcount: "0"
116
- com.apple.iokit.IOSCSIArchitectureModelFamily:
116
+ com.apple.iokit.IOSCSIArchitectureModelFamily:
117
117
  size: 102400
118
118
  version: 2.0.5
119
119
  index: "51"
120
120
  refcount: "4"
121
- org.virtualbox.kext.VBoxNetAdp:
121
+ org.virtualbox.kext.VBoxNetAdp:
122
122
  size: 8192
123
123
  version: 2.2.0
124
124
  index: "117"
125
125
  refcount: "0"
126
- com.apple.filesystems.autofs:
126
+ com.apple.filesystems.autofs:
127
127
  size: 45056
128
128
  version: 2.0.1
129
129
  index: "109"
130
130
  refcount: "0"
131
- com.vmware.kext.vmnet:
131
+ com.vmware.kext.vmnet:
132
132
  size: 36864
133
133
  version: 2.0.4
134
134
  index: "108"
135
135
  refcount: "0"
136
- com.apple.iokit.IOSCSIBlockCommandsDevice:
136
+ com.apple.iokit.IOSCSIBlockCommandsDevice:
137
137
  size: 90112
138
138
  version: 2.0.5
139
139
  index: "57"
140
140
  refcount: "1"
141
- com.apple.driver.AppleACPIPCI:
141
+ com.apple.driver.AppleACPIPCI:
142
142
  size: 12288
143
143
  version: 1.2.4
144
144
  index: "31"
145
145
  refcount: "0"
146
- com.apple.security.seatbelt:
146
+ com.apple.security.seatbelt:
147
147
  size: 98304
148
148
  version: "107.10"
149
149
  index: "25"
150
150
  refcount: "0"
151
- com.apple.driver.AppleUpstreamUserClient:
151
+ com.apple.driver.AppleUpstreamUserClient:
152
152
  size: 16384
153
153
  version: 2.7.2
154
154
  index: "100"
155
155
  refcount: "0"
156
- com.apple.kext.OSvKernDSPLib:
156
+ com.apple.kext.OSvKernDSPLib:
157
157
  size: 12288
158
158
  version: "1.1"
159
159
  index: "79"
160
160
  refcount: "1"
161
- com.apple.iokit.IOBDStorageFamily:
161
+ com.apple.iokit.IOBDStorageFamily:
162
162
  size: 20480
163
163
  version: "1.5"
164
164
  index: "58"
165
165
  refcount: "1"
166
- com.apple.iokit.IOGraphicsFamily:
166
+ com.apple.iokit.IOGraphicsFamily:
167
167
  size: 118784
168
168
  version: 1.7.1
169
169
  index: "70"
170
170
  refcount: "5"
171
- com.apple.iokit.IONetworkingFamily:
171
+ com.apple.iokit.IONetworkingFamily:
172
172
  size: 90112
173
173
  version: 1.6.1
174
174
  index: "82"
175
175
  refcount: "4"
176
- com.apple.iokit.IOATAFamily:
176
+ com.apple.iokit.IOATAFamily:
177
177
  size: 53248
178
178
  version: 2.0.0
179
179
  index: "40"
180
180
  refcount: "2"
181
- com.apple.iokit.IOUSBHIDDriver:
181
+ com.apple.iokit.IOUSBHIDDriver:
182
182
  size: 20480
183
183
  version: 3.2.2
184
184
  index: "63"
185
185
  refcount: "2"
186
- org.virtualbox.kext.VBoxUSB:
186
+ org.virtualbox.kext.VBoxUSB:
187
187
  size: 28672
188
188
  version: 2.2.0
189
189
  index: "115"
190
190
  refcount: "0"
191
- com.apple.security.TMSafetyNet:
191
+ com.apple.security.TMSafetyNet:
192
192
  size: 12288
193
193
  version: "3"
194
194
  index: "23"
195
195
  refcount: "0"
196
- com.apple.iokit.IONDRVSupport:
196
+ com.apple.iokit.IONDRVSupport:
197
197
  size: 57344
198
198
  version: 1.7.1
199
199
  index: "71"
200
200
  refcount: "3"
201
- com.apple.BootCache:
201
+ com.apple.BootCache:
202
202
  size: 20480
203
203
  version: "30.3"
204
204
  index: "20"
205
205
  refcount: "0"
206
- com.vmware.kext.vmioplug:
206
+ com.vmware.kext.vmioplug:
207
207
  size: 24576
208
208
  version: 2.0.4
209
209
  index: "107"
210
210
  refcount: "0"
211
- com.apple.iokit.IOUSBUserClient:
211
+ com.apple.iokit.IOUSBUserClient:
212
212
  size: 8192
213
213
  version: 3.2.4
214
214
  index: "46"
215
215
  refcount: "1"
216
- com.apple.iokit.IOSCSIMultimediaCommandsDevice:
216
+ com.apple.iokit.IOSCSIMultimediaCommandsDevice:
217
217
  size: 90112
218
218
  version: 2.0.5
219
219
  index: "59"
220
220
  refcount: "0"
221
- com.apple.driver.AppleIRController:
221
+ com.apple.driver.AppleIRController:
222
222
  size: 20480
223
223
  version: "110"
224
224
  index: "78"
225
225
  refcount: "0"
226
- com.apple.driver.AudioIPCDriver:
226
+ com.apple.driver.AudioIPCDriver:
227
227
  size: 16384
228
228
  version: 1.0.5
229
229
  index: "81"
230
230
  refcount: "0"
231
- com.apple.driver.AppleLPC:
231
+ com.apple.driver.AppleLPC:
232
232
  size: 12288
233
233
  version: 1.2.11
234
234
  index: "73"
235
235
  refcount: "0"
236
- org.virtualbox.kext.VBoxNetFlt:
236
+ org.virtualbox.kext.VBoxNetFlt:
237
237
  size: 16384
238
238
  version: 2.2.0
239
239
  index: "116"
240
240
  refcount: "0"
241
- com.apple.iokit.CHUDKernLib:
241
+ com.apple.iokit.CHUDKernLib:
242
242
  size: 20480
243
243
  version: "196"
244
244
  index: "93"
245
245
  refcount: "2"
246
- com.apple.iokit.CHUDProf:
246
+ com.apple.iokit.CHUDProf:
247
247
  size: 49152
248
248
  version: "207"
249
249
  index: "97"
250
250
  refcount: "0"
251
- com.apple.NVDAResman:
251
+ com.apple.NVDAResman:
252
252
  size: 2478080
253
253
  version: 5.3.6
254
254
  index: "90"
255
255
  refcount: "2"
256
- com.apple.driver.AppleACPIEC:
256
+ com.apple.driver.AppleACPIEC:
257
257
  size: 20480
258
258
  version: 1.2.4
259
259
  index: "28"
260
260
  refcount: "0"
261
- foo.tun:
261
+ foo.tun:
262
262
  size: 24576
263
263
  version: "1.0"
264
264
  index: "118"
265
265
  refcount: "0"
266
- com.apple.iokit.IOSerialFamily:
266
+ com.apple.iokit.IOSerialFamily:
267
267
  size: 36864
268
268
  version: "9.3"
269
269
  index: "102"
270
270
  refcount: "1"
271
- com.apple.GeForce:
271
+ com.apple.GeForce:
272
272
  size: 622592
273
273
  version: 5.3.6
274
274
  index: "96"
275
275
  refcount: "0"
276
- com.apple.iokit.IOCDStorageFamily:
276
+ com.apple.iokit.IOCDStorageFamily:
277
277
  size: 32768
278
278
  version: "1.5"
279
279
  index: "55"
280
280
  refcount: "3"
281
- com.apple.driver.AppleUSBEHCI:
281
+ com.apple.driver.AppleUSBEHCI:
282
282
  size: 73728
283
283
  version: 3.2.5
284
284
  index: "39"
285
285
  refcount: "0"
286
- com.apple.nvidia.nv50hal:
286
+ com.apple.nvidia.nv50hal:
287
287
  size: 2445312
288
288
  version: 5.3.6
289
289
  index: "91"
290
290
  refcount: "0"
291
- com.apple.driver.AppleSMBIOS:
291
+ com.apple.driver.AppleSMBIOS:
292
292
  size: 16384
293
293
  version: 1.1.1
294
294
  index: "29"
295
295
  refcount: "0"
296
- com.apple.driver.AppleBacklight:
296
+ com.apple.driver.AppleBacklight:
297
297
  size: 16384
298
298
  version: 1.4.4
299
299
  index: "72"
300
300
  refcount: "0"
301
- com.apple.driver.AppleACPIPlatform:
301
+ com.apple.driver.AppleACPIPlatform:
302
302
  size: 253952
303
303
  version: 1.2.4
304
304
  index: "19"
305
305
  refcount: "3"
306
- com.apple.iokit.SCSITaskUserClient:
306
+ com.apple.iokit.SCSITaskUserClient:
307
307
  size: 24576
308
308
  version: 2.0.5
309
309
  index: "54"
310
310
  refcount: "0"
311
- com.apple.iokit.IOHIDFamily:
311
+ com.apple.iokit.IOHIDFamily:
312
312
  size: 233472
313
313
  version: 1.5.3
314
314
  index: "21"
315
315
  refcount: "7"
316
- com.apple.driver.DiskImages:
316
+ com.apple.driver.DiskImages:
317
317
  size: 65536
318
318
  version: 195.2.2
319
319
  index: "101"
320
320
  refcount: "0"
321
- com.apple.iokit.IODVDStorageFamily:
321
+ com.apple.iokit.IODVDStorageFamily:
322
322
  size: 24576
323
323
  version: "1.5"
324
324
  index: "56"
325
325
  refcount: "2"
326
- com.apple.iokit.IOFireWireIP:
326
+ com.apple.iokit.IOFireWireIP:
327
327
  size: 36864
328
328
  version: 1.7.6
329
329
  index: "83"
330
330
  refcount: "0"
331
- com.apple.driver.AppleRTC:
331
+ com.apple.driver.AppleRTC:
332
332
  size: 20480
333
333
  version: 1.2.3
334
334
  index: "34"
335
335
  refcount: "0"
336
- com.apple.driver.XsanFilter:
336
+ com.apple.driver.XsanFilter:
337
337
  size: 20480
338
338
  version: 2.7.91
339
339
  index: "53"
340
340
  refcount: "0"
341
- com.apple.driver.AppleEFIRuntime:
341
+ com.apple.driver.AppleEFIRuntime:
342
342
  size: 12288
343
343
  version: 1.2.0
344
344
  index: "35"
345
345
  refcount: "1"
346
- com.apple.iokit.IOAHCIBlockStorage:
346
+ com.apple.iokit.IOAHCIBlockStorage:
347
347
  size: 69632
348
348
  version: 1.2.0
349
349
  index: "48"
350
350
  refcount: "0"
351
- com.apple.nke.applicationfirewall:
351
+ com.apple.nke.applicationfirewall:
352
352
  size: 32768
353
353
  version: 1.0.77
354
354
  index: "24"
355
355
  refcount: "0"
356
- com.apple.iokit.IO80211Family:
356
+ com.apple.iokit.IO80211Family:
357
357
  size: 126976
358
358
  version: "215.1"
359
359
  index: "87"
360
360
  refcount: "1"
361
- com.vmware.kext.vmci:
361
+ com.vmware.kext.vmci:
362
362
  size: 45056
363
363
  version: 2.0.4
364
364
  index: "106"
365
365
  refcount: "0"
366
- com.apple.iokit.IOAHCIFamily:
366
+ com.apple.iokit.IOAHCIFamily:
367
367
  size: 24576
368
368
  version: 1.5.0
369
369
  index: "42"
370
370
  refcount: "2"
371
- com.apple.driver.AppleUSBUHCI:
371
+ com.apple.driver.AppleUSBUHCI:
372
372
  size: 57344
373
373
  version: 3.2.5
374
374
  index: "38"
375
375
  refcount: "0"
376
- com.apple.driver.AppleUSBMergeNub:
376
+ com.apple.driver.AppleUSBMergeNub:
377
377
  size: 12288
378
378
  version: 3.2.4
379
379
  index: "61"
380
380
  refcount: "0"
381
- com.apple.iokit.IOUSBFamily:
381
+ com.apple.iokit.IOUSBFamily:
382
382
  size: 167936
383
383
  version: 3.2.7
384
384
  index: "37"
385
385
  refcount: "13"
386
- com.apple.driver.AppleEFINVRAM:
386
+ com.apple.driver.AppleEFINVRAM:
387
387
  size: 24576
388
388
  version: 1.2.0
389
389
  index: "36"
390
390
  refcount: "0"
391
- com.apple.driver.AppleAHCIPort:
391
+ com.apple.driver.AppleAHCIPort:
392
392
  size: 53248
393
393
  version: 1.5.2
394
394
  index: "43"
@@ -396,18 +396,18 @@ kernel:
396
396
  os: Darwin
397
397
  version: "Darwin Kernel Version 9.6.0: Mon Nov 24 17:37:00 PST 2008; root:xnu-1228.9.59~1/RELEASE_I386"
398
398
  release: 9.6.0
399
- command:
399
+ command:
400
400
  ps: ps -ef
401
401
  platform: mac_os_x
402
402
  platform_version: 10.5.6
403
- keys:
404
- ssh:
403
+ keys:
404
+ ssh:
405
405
  host_dsa_public: private
406
406
  host_rsa_public: private
407
407
  ipaddress: 192.168.88.1
408
408
  fqdn: local.local
409
- network:
410
- settings:
409
+ network:
410
+ settings:
411
411
  net.inet6.ip6.forwarding: "0"
412
412
  net.inet.ip.dummynet.debug: "0"
413
413
  net.inet.ip.rtexpire: "10"
@@ -636,16 +636,16 @@ network:
636
636
  net.inet6.ipsec6.ah_trans_deflev: "1"
637
637
  net.inet.ip.random_id: "1"
638
638
  net.inet.icmp.timestamp: "0"
639
- interfaces:
640
- stf0:
639
+ interfaces:
640
+ stf0:
641
641
  flags: []
642
642
 
643
643
  number: "0"
644
644
  mtu: "1280"
645
645
  type: stf
646
646
  encapsulation: 6to4
647
- vmnet1:
648
- flags:
647
+ vmnet1:
648
+ flags:
649
649
  - UP
650
650
  - BROADCAST
651
651
  - SMART
@@ -653,7 +653,7 @@ network:
653
653
  - SIMPLEX
654
654
  - MULTICAST
655
655
  number: "1"
656
- addresses:
656
+ addresses:
657
657
  - broadcast: 192.168.88.255
658
658
  netmask: 255.255.255.0
659
659
  family: inet
@@ -663,27 +663,27 @@ network:
663
663
  mtu: "1500"
664
664
  type: vmnet
665
665
  encapsulation: Ethernet
666
- vboxnet0:
667
- flags:
666
+ vboxnet0:
667
+ flags:
668
668
  - BROADCAST
669
669
  - RUNNING
670
670
  - SIMPLEX
671
671
  - MULTICAST
672
672
  number: "0"
673
- addresses:
673
+ addresses:
674
674
  - family: lladdr
675
675
  address: private
676
676
  mtu: "1500"
677
677
  type: vboxnet
678
678
  encapsulation: Ethernet
679
- lo0:
680
- flags:
679
+ lo0:
680
+ flags:
681
681
  - UP
682
682
  - LOOPBACK
683
683
  - RUNNING
684
684
  - MULTICAST
685
685
  number: "0"
686
- addresses:
686
+ addresses:
687
687
  - scope: Link
688
688
  prefixlen: "64"
689
689
  family: inet6
@@ -702,9 +702,9 @@ network:
702
702
  mtu: "16384"
703
703
  type: lo
704
704
  encapsulation: Loopback
705
- vboxn:
706
- counters:
707
- tx:
705
+ vboxn:
706
+ counters:
707
+ tx:
708
708
  packets: "0"
709
709
  bytes: "0"
710
710
  compressed: 0
@@ -713,7 +713,7 @@ network:
713
713
  errors: "0"
714
714
  drop: 0
715
715
  overrun: 0
716
- rx:
716
+ rx:
717
717
  packets: "0"
718
718
  bytes: "0"
719
719
  compressed: 0
@@ -722,17 +722,17 @@ network:
722
722
  overrun: 0
723
723
  multicast: 0
724
724
  frame: 0
725
- gif0:
726
- flags:
725
+ gif0:
726
+ flags:
727
727
  - POINTOPOINT
728
728
  - MULTICAST
729
729
  number: "0"
730
730
  mtu: "1280"
731
731
  type: gif
732
732
  encapsulation: IPIP
733
- vmnet:
734
- counters:
735
- tx:
733
+ vmnet:
734
+ counters:
735
+ tx:
736
736
  packets: "0"
737
737
  bytes: "0"
738
738
  compressed: 0
@@ -741,7 +741,7 @@ network:
741
741
  errors: "0"
742
742
  drop: 0
743
743
  overrun: 0
744
- rx:
744
+ rx:
745
745
  packets: "0"
746
746
  bytes: "0"
747
747
  compressed: 0
@@ -750,8 +750,8 @@ network:
750
750
  overrun: 0
751
751
  multicast: 0
752
752
  frame: 0
753
- en0:
754
- flags:
753
+ en0:
754
+ flags:
755
755
  - UP
756
756
  - BROADCAST
757
757
  - SMART
@@ -760,64 +760,64 @@ network:
760
760
  - MULTICAST
761
761
  status: inactive
762
762
  number: "0"
763
- addresses:
763
+ addresses:
764
764
  - family: lladdr
765
765
  address: private
766
766
  mtu: "1500"
767
767
  type: en
768
- media:
769
- supported:
770
- - autoselect:
768
+ media:
769
+ supported:
770
+ - autoselect:
771
771
  options: []
772
772
 
773
- - 10baseT/UTP:
774
- options:
773
+ - 10baseT/UTP:
774
+ options:
775
775
  - half-duplex
776
- - 10baseT/UTP:
777
- options:
776
+ - 10baseT/UTP:
777
+ options:
778
778
  - full-duplex
779
- - 10baseT/UTP:
780
- options:
779
+ - 10baseT/UTP:
780
+ options:
781
781
  - full-duplex
782
782
  - hw-loopback
783
- - 10baseT/UTP:
784
- options:
783
+ - 10baseT/UTP:
784
+ options:
785
785
  - full-duplex
786
786
  - flow-control
787
- - 100baseTX:
788
- options:
787
+ - 100baseTX:
788
+ options:
789
789
  - half-duplex
790
- - 100baseTX:
791
- options:
790
+ - 100baseTX:
791
+ options:
792
792
  - full-duplex
793
- - 100baseTX:
794
- options:
793
+ - 100baseTX:
794
+ options:
795
795
  - full-duplex
796
796
  - hw-loopback
797
- - 100baseTX:
798
- options:
797
+ - 100baseTX:
798
+ options:
799
799
  - full-duplex
800
800
  - flow-control
801
- - 1000baseT:
802
- options:
801
+ - 1000baseT:
802
+ options:
803
803
  - full-duplex
804
- - 1000baseT:
805
- options:
804
+ - 1000baseT:
805
+ options:
806
806
  - full-duplex
807
807
  - hw-loopback
808
- - 1000baseT:
809
- options:
808
+ - 1000baseT:
809
+ options:
810
810
  - full-duplex
811
811
  - flow-control
812
- - none:
812
+ - none:
813
813
  options: []
814
814
 
815
- selected:
816
- - autoselect:
815
+ selected:
816
+ - autoselect:
817
817
  options: []
818
818
 
819
- counters:
820
- tx:
819
+ counters:
820
+ tx:
821
821
  packets: "0"
822
822
  bytes: "342"
823
823
  compressed: 0
@@ -826,7 +826,7 @@ network:
826
826
  errors: "0"
827
827
  drop: 0
828
828
  overrun: 0
829
- rx:
829
+ rx:
830
830
  packets: "0"
831
831
  bytes: "0"
832
832
  compressed: 0
@@ -836,8 +836,8 @@ network:
836
836
  multicast: 0
837
837
  frame: 0
838
838
  encapsulation: Ethernet
839
- vmnet8:
840
- flags:
839
+ vmnet8:
840
+ flags:
841
841
  - UP
842
842
  - BROADCAST
843
843
  - SMART
@@ -845,7 +845,7 @@ network:
845
845
  - SIMPLEX
846
846
  - MULTICAST
847
847
  number: "8"
848
- addresses:
848
+ addresses:
849
849
  - broadcast: 192.168.237.255
850
850
  netmask: 255.255.255.0
851
851
  family: inet
@@ -855,8 +855,8 @@ network:
855
855
  mtu: "1500"
856
856
  type: vmnet
857
857
  encapsulation: Ethernet
858
- en1:
859
- flags:
858
+ en1:
859
+ flags:
860
860
  - UP
861
861
  - BROADCAST
862
862
  - SMART
@@ -865,7 +865,7 @@ network:
865
865
  - MULTICAST
866
866
  status: active
867
867
  number: "1"
868
- addresses:
868
+ addresses:
869
869
  - scope: Link
870
870
  prefixlen: "64"
871
871
  family: inet6
@@ -878,17 +878,17 @@ network:
878
878
  address: private
879
879
  mtu: "1500"
880
880
  type: en
881
- media:
882
- supported:
883
- - autoselect:
881
+ media:
882
+ supported:
883
+ - autoselect:
884
884
  options: []
885
885
 
886
- selected:
887
- - autoselect:
886
+ selected:
887
+ - autoselect:
888
888
  options: []
889
889
 
890
- counters:
891
- tx:
890
+ counters:
891
+ tx:
892
892
  packets: "7041789"
893
893
  bytes: "449206298"
894
894
  compressed: 0
@@ -897,7 +897,7 @@ network:
897
897
  errors: "95"
898
898
  drop: 0
899
899
  overrun: 0
900
- rx:
900
+ rx:
901
901
  packets: "19966002"
902
902
  bytes: "13673879120"
903
903
  compressed: 0
@@ -907,10 +907,10 @@ network:
907
907
  multicast: 0
908
908
  frame: 0
909
909
  encapsulation: Ethernet
910
- arp:
910
+ arp:
911
911
  192.168.1.7: private
912
- fw0:
913
- flags:
912
+ fw0:
913
+ flags:
914
914
  - UP
915
915
  - BROADCAST
916
916
  - SMART
@@ -919,22 +919,22 @@ network:
919
919
  - MULTICAST
920
920
  status: inactive
921
921
  number: "0"
922
- addresses:
922
+ addresses:
923
923
  - family: lladdr
924
924
  address: private
925
925
  mtu: "4078"
926
926
  type: fw
927
- media:
928
- supported:
929
- - autoselect:
930
- options:
927
+ media:
928
+ supported:
929
+ - autoselect:
930
+ options:
931
931
  - full-duplex
932
- selected:
933
- - autoselect:
934
- options:
932
+ selected:
933
+ - autoselect:
934
+ options:
935
935
  - full-duplex
936
- counters:
937
- tx:
936
+ counters:
937
+ tx:
938
938
  packets: "0"
939
939
  bytes: "346"
940
940
  compressed: 0
@@ -943,7 +943,7 @@ network:
943
943
  errors: "0"
944
944
  drop: 0
945
945
  overrun: 0
946
- rx:
946
+ rx:
947
947
  packets: "0"
948
948
  bytes: "0"
949
949
  compressed: 0
@@ -959,8 +959,8 @@ ohai_time: 1240624355.08575
959
959
  platform_build: 9G55
960
960
  os_version: 9.6.0
961
961
  hostname: local
962
- languages:
963
- ruby:
962
+ languages:
963
+ ruby:
964
964
  target_os: darwin9.0
965
965
  platform: universal-darwin9.0
966
966
  host_vendor: apple