ohai 6.16.0.beta.1 → 6.16.0.beta.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (4) hide show
  1. data/lib/ohai/mixin/ec2_metadata.rb +1 -2
  2. data/lib/ohai/version.rb +1 -1
  3. data/spec/unit/plugins/ec2_spec.rb +4 -4
  4. metadata +177 -174
data/lib/ohai/mixin/ec2_metadata.rb CHANGED
@@ -124,8 +124,7 @@ module Ohai
124
124
  private
125
125
 
126
126
  def expand_path(file_name)
127
- uri = URI.parse(file_name.gsub(/\=.*$/, '/'))
128
- path = uri.normalize.to_s
127
+ path = file_name.gsub(/\=.*$/, '/')
129
128
  # ignore "./" and "../"
130
129
  path.gsub(%r{/\.\.?(?:/|$)}, '/').
131
130
  sub(%r{^\.\.?(?:/|$)}, '').
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 = '6.16.0.beta.1'
21
+ VERSION = '6.16.0.beta.2'
22
22
  end
23
23
 
data/spec/unit/plugins/ec2_spec.rb CHANGED
@@ -80,17 +80,17 @@ describe Ohai::System, "plugin ec2" do
80
80
  and_return(mock("Net::HTTP Response", :body => "macs/"))
81
81
  @http_client.should_receive(:get).
82
82
  with("/2012-01-12/meta-data/network/interfaces/macs/").
83
- and_return(mock("Net::HTTP Response", :body => "fe:ff:ff:ff:ff:ff/"))
83
+ and_return(mock("Net::HTTP Response", :body => "12:34:56:78:9a:bc/"))
84
84
  @http_client.should_receive(:get).
85
- with("/2012-01-12/meta-data/network/interfaces/macs/fe:ff:ff:ff:ff:ff/").
85
+ with("/2012-01-12/meta-data/network/interfaces/macs/12:34:56:78:9a:bc/").
86
86
  and_return(mock("Net::HTTP Response", :body => "public_hostname"))
87
87
  @http_client.should_receive(:get).
88
- with("/2012-01-12/meta-data/network/interfaces/macs/fe:ff:ff:ff:ff:ff/public_hostname").
88
+ with("/2012-01-12/meta-data/network/interfaces/macs/12:34:56:78:9a:bc/public_hostname").
89
89
  and_return(mock("Net::HTTP Response", :body => "server17.opscode.com"))
90
90
  @ohai._require_plugin("ec2")
91
91
 
92
92
  @ohai[:ec2].should_not be_nil
93
- @ohai[:ec2]['network_interfaces_macs']['fe:ff:ff:ff:ff:ff']['public_hostname'].should eql('server17.opscode.com')
93
+ @ohai[:ec2]['network_interfaces_macs']['12:34:56:78:9a:bc']['public_hostname'].should eql('server17.opscode.com')
94
94
  end
95
95
 
96
96
  it "should parse ec2 iam/ directory and its JSON files properly" do
metadata CHANGED
@@ -1,201 +1,215 @@
1
- --- !ruby/object:Gem::Specification
1
+ --- !ruby/object:Gem::Specification
2
2
  name: ohai
3
- version: !ruby/object:Gem::Version
4
- hash: 2482961715
3
+ version: !ruby/object:Gem::Version
4
+ version: 6.16.0.beta.2
5
5
  prerelease: 7
6
- segments:
7
- - 6
8
- - 16
9
- - 0
10
- - beta
11
- - 1
12
- version: 6.16.0.beta.1
13
6
  platform: ruby
14
- authors:
7
+ authors:
15
8
  - Adam Jacob
16
9
  autorequire:
17
10
  bindir: bin
18
11
  cert_chain: []
19
-
20
- date: 2012-12-12 00:00:00 Z
21
- dependencies:
22
- - !ruby/object:Gem::Dependency
12
+ date: 2012-12-13 00:00:00.000000000 Z
13
+ dependencies:
14
+ - !ruby/object:Gem::Dependency
23
15
  name: systemu
24
- prerelease: false
25
- requirement: &id001 !ruby/object:Gem::Requirement
16
+ requirement: !ruby/object:Gem::Requirement
26
17
  none: false
27
- requirements:
28
- - - ">="
29
- - !ruby/object:Gem::Version
30
- hash: 3
31
- segments:
32
- - 0
33
- version: "0"
18
+ requirements:
19
+ - - ! '>='
20
+ - !ruby/object:Gem::Version
21
+ version: '0'
34
22
  type: :runtime
35
- version_requirements: *id001
36
- - !ruby/object:Gem::Dependency
37
- name: yajl-ruby
38
23
  prerelease: false
39
- requirement: &id002 !ruby/object:Gem::Requirement
24
+ version_requirements: !ruby/object:Gem::Requirement
40
25
  none: false
41
- requirements:
42
- - - ">="
43
- - !ruby/object:Gem::Version
44
- hash: 3
45
- segments:
46
- - 0
47
- version: "0"
26
+ requirements:
27
+ - - ! '>='
28
+ - !ruby/object:Gem::Version
29
+ version: '0'
30
+ - !ruby/object:Gem::Dependency
31
+ name: yajl-ruby
32
+ requirement: !ruby/object:Gem::Requirement
33
+ none: false
34
+ requirements:
35
+ - - ! '>='
36
+ - !ruby/object:Gem::Version
37
+ version: '0'
48
38
  type: :runtime
49
- version_requirements: *id002
50
- - !ruby/object:Gem::Dependency
51
- name: mixlib-cli
52
39
  prerelease: false
53
- requirement: &id003 !ruby/object:Gem::Requirement
40
+ version_requirements: !ruby/object:Gem::Requirement
54
41
  none: false
55
- requirements:
56
- - - ">="
57
- - !ruby/object:Gem::Version
58
- hash: 3
59
- segments:
60
- - 0
61
- version: "0"
42
+ requirements:
43
+ - - ! '>='
44
+ - !ruby/object:Gem::Version
45
+ version: '0'
46
+ - !ruby/object:Gem::Dependency
47
+ name: mixlib-cli
48
+ requirement: !ruby/object:Gem::Requirement
49
+ none: false
50
+ requirements:
51
+ - - ! '>='
52
+ - !ruby/object:Gem::Version
53
+ version: '0'
62
54
  type: :runtime
63
- version_requirements: *id003
64
- - !ruby/object:Gem::Dependency
65
- name: mixlib-config
66
55
  prerelease: false
67
- requirement: &id004 !ruby/object:Gem::Requirement
56
+ version_requirements: !ruby/object:Gem::Requirement
57
+ none: false
58
+ requirements:
59
+ - - ! '>='
60
+ - !ruby/object:Gem::Version
61
+ version: '0'
62
+ - !ruby/object:Gem::Dependency
63
+ name: mixlib-config
64
+ requirement: !ruby/object:Gem::Requirement
68
65
  none: false
69
- requirements:
70
- - - ">="
71
- - !ruby/object:Gem::Version
72
- hash: 3
73
- segments:
74
- - 0
75
- version: "0"
66
+ requirements:
67
+ - - ! '>='
68
+ - !ruby/object:Gem::Version
69
+ version: '0'
76
70
  type: :runtime
77
- version_requirements: *id004
78
- - !ruby/object:Gem::Dependency
79
- name: mixlib-log
80
71
  prerelease: false
81
- requirement: &id005 !ruby/object:Gem::Requirement
72
+ version_requirements: !ruby/object:Gem::Requirement
82
73
  none: false
83
- requirements:
84
- - - ">="
85
- - !ruby/object:Gem::Version
86
- hash: 3
87
- segments:
88
- - 0
89
- version: "0"
74
+ requirements:
75
+ - - ! '>='
76
+ - !ruby/object:Gem::Version
77
+ version: '0'
78
+ - !ruby/object:Gem::Dependency
79
+ name: mixlib-log
80
+ requirement: !ruby/object:Gem::Requirement
81
+ none: false
82
+ requirements:
83
+ - - ! '>='
84
+ - !ruby/object:Gem::Version
85
+ version: '0'
90
86
  type: :runtime
91
- version_requirements: *id005
92
- - !ruby/object:Gem::Dependency
93
- name: mixlib-shellout
94
87
  prerelease: false
95
- requirement: &id006 !ruby/object:Gem::Requirement
88
+ version_requirements: !ruby/object:Gem::Requirement
96
89
  none: false
97
- requirements:
98
- - - ">="
99
- - !ruby/object:Gem::Version
100
- hash: 3
101
- segments:
102
- - 0
103
- version: "0"
90
+ requirements:
91
+ - - ! '>='
92
+ - !ruby/object:Gem::Version
93
+ version: '0'
94
+ - !ruby/object:Gem::Dependency
95
+ name: mixlib-shellout
96
+ requirement: !ruby/object:Gem::Requirement
97
+ none: false
98
+ requirements:
99
+ - - ! '>='
100
+ - !ruby/object:Gem::Version
101
+ version: '0'
104
102
  type: :runtime
105
- version_requirements: *id006
106
- - !ruby/object:Gem::Dependency
107
- name: ipaddress
108
103
  prerelease: false
109
- requirement: &id007 !ruby/object:Gem::Requirement
104
+ version_requirements: !ruby/object:Gem::Requirement
105
+ none: false
106
+ requirements:
107
+ - - ! '>='
108
+ - !ruby/object:Gem::Version
109
+ version: '0'
110
+ - !ruby/object:Gem::Dependency
111
+ name: ipaddress
112
+ requirement: !ruby/object:Gem::Requirement
110
113
  none: false
111
- requirements:
112
- - - ">="
113
- - !ruby/object:Gem::Version
114
- hash: 3
115
- segments:
116
- - 0
117
- version: "0"
114
+ requirements:
115
+ - - ! '>='
116
+ - !ruby/object:Gem::Version
117
+ version: '0'
118
118
  type: :runtime
119
- version_requirements: *id007
120
- - !ruby/object:Gem::Dependency
121
- name: rake
122
119
  prerelease: false
123
- requirement: &id008 !ruby/object:Gem::Requirement
120
+ version_requirements: !ruby/object:Gem::Requirement
124
121
  none: false
125
- requirements:
126
- - - ">="
127
- - !ruby/object:Gem::Version
128
- hash: 3
129
- segments:
130
- - 0
131
- version: "0"
122
+ requirements:
123
+ - - ! '>='
124
+ - !ruby/object:Gem::Version
125
+ version: '0'
126
+ - !ruby/object:Gem::Dependency
127
+ name: rake
128
+ requirement: !ruby/object:Gem::Requirement
129
+ none: false
130
+ requirements:
131
+ - - ! '>='
132
+ - !ruby/object:Gem::Version
133
+ version: '0'
132
134
  type: :development
133
- version_requirements: *id008
134
- - !ruby/object:Gem::Dependency
135
- name: rspec-core
136
135
  prerelease: false
137
- requirement: &id009 !ruby/object:Gem::Requirement
136
+ version_requirements: !ruby/object:Gem::Requirement
138
137
  none: false
139
- requirements:
140
- - - ">="
141
- - !ruby/object:Gem::Version
142
- hash: 3
143
- segments:
144
- - 0
145
- version: "0"
138
+ requirements:
139
+ - - ! '>='
140
+ - !ruby/object:Gem::Version
141
+ version: '0'
142
+ - !ruby/object:Gem::Dependency
143
+ name: rspec-core
144
+ requirement: !ruby/object:Gem::Requirement
145
+ none: false
146
+ requirements:
147
+ - - ! '>='
148
+ - !ruby/object:Gem::Version
149
+ version: '0'
146
150
  type: :development
147
- version_requirements: *id009
148
- - !ruby/object:Gem::Dependency
149
- name: rspec-expectations
150
151
  prerelease: false
151
- requirement: &id010 !ruby/object:Gem::Requirement
152
+ version_requirements: !ruby/object:Gem::Requirement
153
+ none: false
154
+ requirements:
155
+ - - ! '>='
156
+ - !ruby/object:Gem::Version
157
+ version: '0'
158
+ - !ruby/object:Gem::Dependency
159
+ name: rspec-expectations
160
+ requirement: !ruby/object:Gem::Requirement
152
161
  none: false
153
- requirements:
154
- - - ">="
155
- - !ruby/object:Gem::Version
156
- hash: 3
157
- segments:
158
- - 0
159
- version: "0"
162
+ requirements:
163
+ - - ! '>='
164
+ - !ruby/object:Gem::Version
165
+ version: '0'
160
166
  type: :development
161
- version_requirements: *id010
162
- - !ruby/object:Gem::Dependency
163
- name: rspec-mocks
164
167
  prerelease: false
165
- requirement: &id011 !ruby/object:Gem::Requirement
168
+ version_requirements: !ruby/object:Gem::Requirement
166
169
  none: false
167
- requirements:
168
- - - ">="
169
- - !ruby/object:Gem::Version
170
- hash: 3
171
- segments:
172
- - 0
173
- version: "0"
170
+ requirements:
171
+ - - ! '>='
172
+ - !ruby/object:Gem::Version
173
+ version: '0'
174
+ - !ruby/object:Gem::Dependency
175
+ name: rspec-mocks
176
+ requirement: !ruby/object:Gem::Requirement
177
+ none: false
178
+ requirements:
179
+ - - ! '>='
180
+ - !ruby/object:Gem::Version
181
+ version: '0'
174
182
  type: :development
175
- version_requirements: *id011
176
- - !ruby/object:Gem::Dependency
177
- name: rspec_junit_formatter
178
183
  prerelease: false
179
- requirement: &id012 !ruby/object:Gem::Requirement
184
+ version_requirements: !ruby/object:Gem::Requirement
180
185
  none: false
181
- requirements:
182
- - - ">="
183
- - !ruby/object:Gem::Version
184
- hash: 3
185
- segments:
186
- - 0
187
- version: "0"
186
+ requirements:
187
+ - - ! '>='
188
+ - !ruby/object:Gem::Version
189
+ version: '0'
190
+ - !ruby/object:Gem::Dependency
191
+ name: rspec_junit_formatter
192
+ requirement: !ruby/object:Gem::Requirement
193
+ none: false
194
+ requirements:
195
+ - - ! '>='
196
+ - !ruby/object:Gem::Version
197
+ version: '0'
188
198
  type: :development
189
- version_requirements: *id012
199
+ prerelease: false
200
+ version_requirements: !ruby/object:Gem::Requirement
201
+ none: false
202
+ requirements:
203
+ - - ! '>='
204
+ - !ruby/object:Gem::Version
205
+ version: '0'
190
206
  description: Ohai profiles your system and emits JSON
191
207
  email: adam@opscode.com
192
- executables:
208
+ executables:
193
209
  - ohai
194
210
  extensions: []
195
-
196
211
  extra_rdoc_files: []
197
-
198
- files:
212
+ files:
199
213
  - LICENSE
200
214
  - README.rdoc
201
215
  - Rakefile
@@ -408,41 +422,30 @@ files:
408
422
  - spec/support/platform_helpers.rb
409
423
  - spec/rcov.opts
410
424
  - spec/ohai_spec.rb
411
- - bin/ohai
425
+ - !binary |-
426
+ YmluL29oYWk=
412
427
  homepage: http://wiki.opscode.com/display/chef/Ohai
413
428
  licenses: []
414
-
415
429
  post_install_message:
416
430
  rdoc_options: []
417
-
418
- require_paths:
431
+ require_paths:
419
432
  - lib
420
- required_ruby_version: !ruby/object:Gem::Requirement
433
+ required_ruby_version: !ruby/object:Gem::Requirement
421
434
  none: false
422
- requirements:
423
- - - ">="
424
- - !ruby/object:Gem::Version
425
- hash: 3
426
- segments:
427
- - 0
428
- version: "0"
429
- required_rubygems_version: !ruby/object:Gem::Requirement
435
+ requirements:
436
+ - - ! '>='
437
+ - !ruby/object:Gem::Version
438
+ version: '0'
439
+ required_rubygems_version: !ruby/object:Gem::Requirement
430
440
  none: false
431
- requirements:
432
- - - ">"
433
- - !ruby/object:Gem::Version
434
- hash: 25
435
- segments:
436
- - 1
437
- - 3
438
- - 1
441
+ requirements:
442
+ - - ! '>'
443
+ - !ruby/object:Gem::Version
439
444
  version: 1.3.1
440
445
  requirements: []
441
-
442
446
  rubyforge_project:
443
- rubygems_version: 1.8.10
447
+ rubygems_version: 1.8.21
444
448
  signing_key:
445
449
  specification_version: 3
446
450
  summary: Ohai profiles your system and emits JSON
447
451
  test_files: []
448
-