silver_spurs 2.0.0.rc5 → 2.0.0.rc7

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 +15 -0
  2. data/lib/silver_spurs/client/chef_output.rb +7 -13
  3. data/lib/silver_spurs/client.rb +1 -1
  4. data/lib/silver_spurs/version.rb +1 -1
  5. data/silver_spurs.gemspec +1 -0
  6. data/spec/lib/silver_spurs/client/chef_output_spec.rb +17 -12
  7. metadata +6 -32
checksums.yaml ADDED
@@ -0,0 +1,15 @@
1
+ ---
2
+ !binary "U0hBMQ==":
3
+ metadata.gz: !binary |-
4
+ NTM4ZTQzYWE3ZDZmZGZlMWRhMzk4MThkZjRlNzkzMWEyNWIwZGY1Zg==
5
+ data.tar.gz: !binary |-
6
+ NjIwOWM5NzM4ZWIyZjBmNDdkNGJkNDJjMThlZWFkZGNkZmM4ZDA5Ng==
7
+ !binary "U0hBNTEy":
8
+ metadata.gz: !binary |-
9
+ YzE3YzMwODk1NDQ2MjA2NTNlYjhhMjljZDcwMWI4MjdkNmVlODA3NDZjMjQ3
10
+ ZWI2YjM4MDNlNjk1OWU5MGI5ZTllYzI3ZTYwZmViYWE5NGM5OTMzNWNhNjU4
11
+ NzNkNDE2ZmI2ZGIyYzE4OTIwMTg3NTI1Mjc3ZDIxMTkxYzNjNWI=
12
+ data.tar.gz: !binary |-
13
+ NWU3YWQxNjY0YjFmMDEwNTkyMDY0MWRkNDliNDdkMGZkZTVjMzgxMjE5N2Rk
14
+ ODk5YTUwYjBlNjgxMDFhODM0OWFiYzMyYTNkOWQwMTJjZDdlZDNmNzU1ODkw
15
+ MmU3YTAyODE2MmFhNmFmM2RmZDhhYWZiNzVmYzc0NWE3ZmRiM2Q=
data/lib/silver_spurs/client/chef_output.rb CHANGED
@@ -15,20 +15,14 @@ module SilverSpurs
15
15
  private
16
16
 
17
17
  def convert_status(response)
18
- code = response[0]
19
- case code
20
- when 'ok'
21
- :success
22
- when 'error'
23
- :failed
24
- end
18
+ failure = (response['exit_code'] == 1) || (response['exit_status'] == 1)
19
+ failure ? :failed : :success
25
20
  end
26
21
 
27
22
  def prettify_log(response)
28
- run_info = response[1]
29
- stdout = run_info['stdout']
30
- stderr = run_info['stderr']
31
- exit_code = run_info['exit_code'] || run_info['exit_status']
23
+ stdout = response['stdout']
24
+ stderr = response['stderr']
25
+ exit_code = response['exit_code'] || response['exit_status']
32
26
 
33
27
  template = ERB.new <<-END
34
28
  Exit Code: <%= exit_code %>
@@ -36,9 +30,9 @@ Exit Code: <%= exit_code %>
36
30
  <%= stdout %>
37
31
  --STDERR-----------------
38
32
  <%= stderr %>
39
- END
33
+ END
40
34
  template.result binding
41
35
  end
42
36
 
43
37
  end
44
- end
38
+ end
data/lib/silver_spurs/client.rb CHANGED
@@ -49,7 +49,7 @@ module SilverSpurs
49
49
  rescue RestClient::ResourceNotFound => ex
50
50
  raise ClientException.new("the host name was not found", ex.response)
51
51
  rescue Exception => ex
52
- raise ClientException.new("an unanticipated error occured", ex.message)
52
+ raise ClientException.new("an unanticipated error occured: #{ex.message}", ex.backtrace)
53
53
  end
54
54
 
55
55
  response
data/lib/silver_spurs/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module SilverSpurs
2
- VERSION = '2.0.0.rc5'
2
+ VERSION = '2.0.0.rc7'
3
3
  end
data/silver_spurs.gemspec CHANGED
@@ -14,6 +14,7 @@ Gem::Specification.new do |gem|
14
14
  gem.name = "silver_spurs"
15
15
  gem.require_paths = ["lib"]
16
16
  gem.version = SilverSpurs::VERSION
17
+ gem.required_ruby_version = '>= 1.9.3'
17
18
 
18
19
  gem.add_dependency 'sinatra', '>= 1.3.5'
19
20
  gem.add_dependency 'chef', '>= 10.18.2'
data/spec/lib/silver_spurs/client/chef_output_spec.rb CHANGED
@@ -3,16 +3,16 @@ require 'silver_spurs/client/chef_output'
3
3
  describe SilverSpurs::ChefOutput do
4
4
  describe :convert_status do
5
5
  before :each do
6
- @chef_run = SilverSpurs::ChefOutput.new(['ok', {'stdout' => '', 'stderr' => '', 'exit_code' => 0, 'exit_status' => 0}])
6
+ @chef_run = SilverSpurs::ChefOutput.new({'stdout' => '', 'stderr' => '', 'exit_code' => 0, 'exit_status' => 0})
7
7
  end
8
8
 
9
9
  def call_convert_status(response)
10
10
  @chef_run.send(:convert_status, response)
11
11
  end
12
12
 
13
- context 'response is "ok"' do
13
+ context 'exit code and status = 0' do
14
14
  before :each do
15
- @response = ["ok", {}]
15
+ @response = { 'exit_code' => 0, 'exit_status' => 0}
16
16
  end
17
17
 
18
18
  it "should return :success" do
@@ -20,9 +20,14 @@ describe SilverSpurs::ChefOutput do
20
20
  end
21
21
  end
22
22
 
23
- context 'response is "error"' do
23
+ context 'exit code or status = 1' do
24
24
  it "should return :failed" do
25
- @response = ["error", {}]
25
+ @response = { 'exit_code' => 0, 'exit_status' => 1}
26
+ call_convert_status(@response).should eq :failed
27
+ end
28
+
29
+ it "should return :failed" do
30
+ @response = { 'exit_code' => 1, 'exit_status' => 0}
26
31
  call_convert_status(@response).should eq :failed
27
32
  end
28
33
  end
@@ -31,7 +36,7 @@ describe SilverSpurs::ChefOutput do
31
36
 
32
37
  describe :prettify_log do
33
38
  before :each do
34
- @chef_run = SilverSpurs::ChefOutput.new(['ok', {'stdout' => '', 'stderr' => '', 'exit_code' => 0, 'exit_status' => 0}])
39
+ @chef_run = SilverSpurs::ChefOutput.new({'stdout' => '', 'stderr' => '', 'exit_code' => 0, 'exit_status' => 0})
35
40
  end
36
41
 
37
42
  def call_prettify_log(response)
@@ -39,39 +44,39 @@ describe SilverSpurs::ChefOutput do
39
44
  end
40
45
 
41
46
  it 'should output stderr' do
42
- response = ['ok', {'stdout' => '', 'stderr' => 'stdERR, son', 'exit_code' => 0, 'exit_status' => 0}]
47
+ response = {'stdout' => '', 'stderr' => 'stdERR, son', 'exit_code' => 0, 'exit_status' => 0}
43
48
  call_prettify_log(response).should match(/stdERR, son/)
44
49
  end
45
50
 
46
51
  it 'should output stdout' do
47
- response = ['ok', {'stdout' => 'stdOUT, son', 'stderr' => '', 'exit_code' => 0, 'exit_status' => 0}]
52
+ response = {'stdout' => 'stdOUT, son', 'stderr' => '', 'exit_code' => 0, 'exit_status' => 0}
48
53
  call_prettify_log(response).should match(/stdOUT, son/)
49
54
  end
50
55
 
51
56
  context 'when exit_code and exit_status are present' do
52
57
  it 'should prefer exit_code' do
53
- response = ['ok', {'stdout' => '', 'stderr' => '', 'exit_code' => 1, 'exit_status' => 2}]
58
+ response = {'stdout' => '', 'stderr' => '', 'exit_code' => 1, 'exit_status' => 2}
54
59
  call_prettify_log(response).should match(/Exit Code: 1/)
55
60
  end
56
61
  end
57
62
 
58
63
  context 'when exit_code is not present' do
59
64
  it 'should use exit_status' do
60
- response = ['ok', {'stdout' => '', 'stderr' => '', 'exit_code' => nil, 'exit_status' => 2}]
65
+ response = {'stdout' => '', 'stderr' => '', 'exit_code' => nil, 'exit_status' => 2}
61
66
  call_prettify_log(response).should match(/Exit Code: 2/)
62
67
  end
63
68
  end
64
69
 
65
70
  context 'when exit_status is not present' do
66
71
  it 'should use exit_code' do
67
- response = ['ok', {'stdout' => '', 'stderr' => '', 'exit_code' => 1, 'exit_status' => nil}]
72
+ response = {'stdout' => '', 'stderr' => '', 'exit_code' => 1, 'exit_status' => nil}
68
73
  call_prettify_log(response).should match(/Exit Code: 1/)
69
74
  end
70
75
  end
71
76
 
72
77
  context 'when exit_code and exit_status are not present' do
73
78
  it 'should use nil' do
74
- response = ['ok', {'stdout' => '', 'stderr' => '', 'exit_code' => nil, 'exit_status' => nil}]
79
+ response = {'stdout' => '', 'stderr' => '', 'exit_code' => nil, 'exit_status' => nil}
75
80
  call_prettify_log(response).should match(/Exit Code: /)
76
81
  end
77
82
  end
metadata CHANGED
@@ -1,20 +1,18 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: silver_spurs
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.0.rc5
5
- prerelease: 6
4
+ version: 2.0.0.rc7
6
5
  platform: ruby
7
6
  authors:
8
7
  - Christian Blades
9
8
  autorequire:
10
9
  bindir: bin
11
10
  cert_chain: []
12
- date: 2013-06-19 00:00:00.000000000 Z
11
+ date: 2013-07-17 00:00:00.000000000 Z
13
12
  dependencies:
14
13
  - !ruby/object:Gem::Dependency
15
14
  name: sinatra
16
15
  requirement: !ruby/object:Gem::Requirement
17
- none: false
18
16
  requirements:
19
17
  - - ! '>='
20
18
  - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
22
20
  type: :runtime
23
21
  prerelease: false
24
22
  version_requirements: !ruby/object:Gem::Requirement
25
- none: false
26
23
  requirements:
27
24
  - - ! '>='
28
25
  - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
30
27
  - !ruby/object:Gem::Dependency
31
28
  name: chef
32
29
  requirement: !ruby/object:Gem::Requirement
33
- none: false
34
30
  requirements:
35
31
  - - ! '>='
36
32
  - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
38
34
  type: :runtime
39
35
  prerelease: false
40
36
  version_requirements: !ruby/object:Gem::Requirement
41
- none: false
42
37
  requirements:
43
38
  - - ! '>='
44
39
  - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
46
41
  - !ruby/object:Gem::Dependency
47
42
  name: rest-client
48
43
  requirement: !ruby/object:Gem::Requirement
49
- none: false
50
44
  requirements:
51
45
  - - ~>
52
46
  - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
54
48
  type: :runtime
55
49
  prerelease: false
56
50
  version_requirements: !ruby/object:Gem::Requirement
57
- none: false
58
51
  requirements:
59
52
  - - ~>
60
53
  - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
62
55
  - !ruby/object:Gem::Dependency
63
56
  name: addressable
64
57
  requirement: !ruby/object:Gem::Requirement
65
- none: false
66
58
  requirements:
67
59
  - - ~>
68
60
  - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
70
62
  type: :runtime
71
63
  prerelease: false
72
64
  version_requirements: !ruby/object:Gem::Requirement
73
- none: false
74
65
  requirements:
75
66
  - - ~>
76
67
  - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
78
69
  - !ruby/object:Gem::Dependency
79
70
  name: ridley
80
71
  requirement: !ruby/object:Gem::Requirement
81
- none: false
82
72
  requirements:
83
73
  - - ~>
84
74
  - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
86
76
  type: :runtime
87
77
  prerelease: false
88
78
  version_requirements: !ruby/object:Gem::Requirement
89
- none: false
90
79
  requirements:
91
80
  - - ~>
92
81
  - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
94
83
  - !ruby/object:Gem::Dependency
95
84
  name: guard
96
85
  requirement: !ruby/object:Gem::Requirement
97
- none: false
98
86
  requirements:
99
87
  - - ! '>='
100
88
  - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
102
90
  type: :development
103
91
  prerelease: false
104
92
  version_requirements: !ruby/object:Gem::Requirement
105
- none: false
106
93
  requirements:
107
94
  - - ! '>='
108
95
  - !ruby/object:Gem::Version
@@ -110,7 +97,6 @@ dependencies:
110
97
  - !ruby/object:Gem::Dependency
111
98
  name: guard-rspec
112
99
  requirement: !ruby/object:Gem::Requirement
113
- none: false
114
100
  requirements:
115
101
  - - ! '>='
116
102
  - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
118
104
  type: :development
119
105
  prerelease: false
120
106
  version_requirements: !ruby/object:Gem::Requirement
121
- none: false
122
107
  requirements:
123
108
  - - ! '>='
124
109
  - !ruby/object:Gem::Version
@@ -126,7 +111,6 @@ dependencies:
126
111
  - !ruby/object:Gem::Dependency
127
112
  name: simplecov
128
113
  requirement: !ruby/object:Gem::Requirement
129
- none: false
130
114
  requirements:
131
115
  - - ! '>='
132
116
  - !ruby/object:Gem::Version
@@ -134,7 +118,6 @@ dependencies:
134
118
  type: :development
135
119
  prerelease: false
136
120
  version_requirements: !ruby/object:Gem::Requirement
137
- none: false
138
121
  requirements:
139
122
  - - ! '>='
140
123
  - !ruby/object:Gem::Version
@@ -142,7 +125,6 @@ dependencies:
142
125
  - !ruby/object:Gem::Dependency
143
126
  name: growl
144
127
  requirement: !ruby/object:Gem::Requirement
145
- none: false
146
128
  requirements:
147
129
  - - ! '>='
148
130
  - !ruby/object:Gem::Version
@@ -150,7 +132,6 @@ dependencies:
150
132
  type: :development
151
133
  prerelease: false
152
134
  version_requirements: !ruby/object:Gem::Requirement
153
- none: false
154
135
  requirements:
155
136
  - - ! '>='
156
137
  - !ruby/object:Gem::Version
@@ -158,7 +139,6 @@ dependencies:
158
139
  - !ruby/object:Gem::Dependency
159
140
  name: rb-fsevent
160
141
  requirement: !ruby/object:Gem::Requirement
161
- none: false
162
142
  requirements:
163
143
  - - ~>
164
144
  - !ruby/object:Gem::Version
@@ -166,7 +146,6 @@ dependencies:
166
146
  type: :development
167
147
  prerelease: false
168
148
  version_requirements: !ruby/object:Gem::Requirement
169
- none: false
170
149
  requirements:
171
150
  - - ~>
172
151
  - !ruby/object:Gem::Version
@@ -174,7 +153,6 @@ dependencies:
174
153
  - !ruby/object:Gem::Dependency
175
154
  name: rack-test
176
155
  requirement: !ruby/object:Gem::Requirement
177
- none: false
178
156
  requirements:
179
157
  - - ! '>='
180
158
  - !ruby/object:Gem::Version
@@ -182,7 +160,6 @@ dependencies:
182
160
  type: :development
183
161
  prerelease: false
184
162
  version_requirements: !ruby/object:Gem::Requirement
185
- none: false
186
163
  requirements:
187
164
  - - ! '>='
188
165
  - !ruby/object:Gem::Version
@@ -190,7 +167,6 @@ dependencies:
190
167
  - !ruby/object:Gem::Dependency
191
168
  name: rake
192
169
  requirement: !ruby/object:Gem::Requirement
193
- none: false
194
170
  requirements:
195
171
  - - ! '>='
196
172
  - !ruby/object:Gem::Version
@@ -198,7 +174,6 @@ dependencies:
198
174
  type: :development
199
175
  prerelease: false
200
176
  version_requirements: !ruby/object:Gem::Requirement
201
- none: false
202
177
  requirements:
203
178
  - - ! '>='
204
179
  - !ruby/object:Gem::Version
@@ -242,27 +217,26 @@ files:
242
217
  - spec/spec_helper.rb
243
218
  homepage: http://github.com/christian-blades-cb/silver_spurs
244
219
  licenses: []
220
+ metadata: {}
245
221
  post_install_message:
246
222
  rdoc_options: []
247
223
  require_paths:
248
224
  - lib
249
225
  required_ruby_version: !ruby/object:Gem::Requirement
250
- none: false
251
226
  requirements:
252
227
  - - ! '>='
253
228
  - !ruby/object:Gem::Version
254
- version: '0'
229
+ version: 1.9.3
255
230
  required_rubygems_version: !ruby/object:Gem::Requirement
256
- none: false
257
231
  requirements:
258
232
  - - ! '>'
259
233
  - !ruby/object:Gem::Version
260
234
  version: 1.3.1
261
235
  requirements: []
262
236
  rubyforge_project:
263
- rubygems_version: 1.8.25
237
+ rubygems_version: 2.0.5
264
238
  signing_key:
265
- specification_version: 3
239
+ specification_version: 4
266
240
  summary: RESTful service to kick off chef bootstraps
267
241
  test_files:
268
242
  - spec/lib/silver_spurs/app_spec.rb