berkshelf 0.1.2 → 0.1.3

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 (8) hide show
  1. data/.rbenv-version +1 -1
  2. data/features/upload_command.feature +16 -1
  3. data/lib/berkshelf/berksfile.rb +1 -1
  4. data/lib/berkshelf/generator_files/chefignore +4 -0
  5. data/lib/berkshelf/uploader.rb +1 -1
  6. data/lib/berkshelf/version.rb +1 -1
  7. data/lib/chef/knife/berks_update.rb +1 -0
  8. metadata +137 -42
data/.rbenv-version CHANGED
@@ -1 +1 @@
1
- 1.9.3-p125
1
+ 1.9.3-p194
data/features/upload_command.feature CHANGED
@@ -3,7 +3,7 @@ Feature: upload command
3
3
  I need a way to upload cookbooks to a Chef server that I have installed into my Bookshelf
4
4
  So they are available to Chef clients
5
5
 
6
- @wip @slow_process
6
+ @slow_process @wip
7
7
  Scenario: running the upload command when the Sources in the Berksfile are already installed
8
8
  Given I write to "Berksfile" with:
9
9
  """
@@ -54,3 +54,18 @@ Feature: upload command
54
54
  And the Chef server should have the cookbooks:
55
55
  | example_cookbook | 0.5.0 |
56
56
  And the exit status should be 0
57
+
58
+ @slow_process
59
+ Scenario: running the upload command with a Berksfile containing a source that has a Git location
60
+ Given I write to "Berksfile" with:
61
+ """
62
+ cookbook "artifact", git: "git://github.com/RiotGames/artifact-cookbook.git", ref: "0.9.8"
63
+ """
64
+ And the Chef server does not have the cookbooks:
65
+ | artifact | 0.9.8 |
66
+ When I run the upload command
67
+ Then the output should contain "Installing artifact (0.9.8) from git:"
68
+ And the output should contain "Uploading artifact (0.9.8) to:"
69
+ And the Chef server should have the cookbooks:
70
+ | artifact | 0.9.8 |
71
+ And the exit status should be 0
data/lib/berkshelf/berksfile.rb CHANGED
@@ -147,7 +147,7 @@ module Berkshelf
147
147
  resolver = Resolver.new(Berkshelf.downloader, sources(exclude: options[:without]))
148
148
 
149
149
  resolver.resolve.each do |cb|
150
- Berkshelf.ui.info "Uploading #{cb.cookbook_name} (#{cb.version}) to: #{chef_server_url}"
150
+ Berkshelf.ui.info "Uploading #{cb.cookbook_name} (#{cb.version}) to: '#{chef_server_url}'"
151
151
  uploader.upload!(cb, options)
152
152
  end
153
153
  end
data/lib/berkshelf/generator_files/chefignore CHANGED
@@ -40,5 +40,9 @@ spec/*
40
40
  spec/fixtures/*
41
41
  features/*
42
42
 
43
+ ## SCM
44
+ .gitignore
45
+
43
46
  # Berkshelf
44
47
  Berksfile
48
+ Berksfile.lock
data/lib/berkshelf/uploader.rb CHANGED
@@ -58,7 +58,7 @@ module Berkshelf
58
58
  commit_sandbox(new_sandbox)
59
59
  save_cookbook(cookbook, options)
60
60
 
61
- TXResult.new(:ok, "#{cookbook.cookbook_name} (#{cookbook.version}) uploaded to: #{server_url}")
61
+ TXResult.new(:ok, "#{cookbook.cookbook_name} (#{cookbook.version}) uploaded to: '#{server_url}'")
62
62
  end
63
63
 
64
64
  private
data/lib/berkshelf/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Berkshelf
2
- VERSION = "0.1.2"
2
+ VERSION = "0.1.3"
3
3
  end
data/lib/chef/knife/berks_update.rb CHANGED
@@ -1,4 +1,5 @@
1
1
  require 'chef/knife'
2
+ require 'chef/knife/berks_install'
2
3
 
3
4
  module Berkshelf
4
5
  class BerksUpdate < BerksInstall
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: berkshelf
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.2
4
+ version: 0.1.3
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -12,11 +12,11 @@ authors:
12
12
  autorequire:
13
13
  bindir: bin
14
14
  cert_chain: []
15
- date: 2012-06-22 00:00:00.000000000 Z
15
+ date: 2012-06-23 00:00:00.000000000 Z
16
16
  dependencies:
17
17
  - !ruby/object:Gem::Dependency
18
18
  name: dep_selector
19
- requirement: &70134686922100 !ruby/object:Gem::Requirement
19
+ requirement: !ruby/object:Gem::Requirement
20
20
  none: false
21
21
  requirements:
22
22
  - - ! '>='
@@ -24,10 +24,15 @@ dependencies:
24
24
  version: '0'
25
25
  type: :runtime
26
26
  prerelease: false
27
- version_requirements: *70134686922100
27
+ version_requirements: !ruby/object:Gem::Requirement
28
+ none: false
29
+ requirements:
30
+ - - ! '>='
31
+ - !ruby/object:Gem::Version
32
+ version: '0'
28
33
  - !ruby/object:Gem::Dependency
29
34
  name: chef
30
- requirement: &70134686921160 !ruby/object:Gem::Requirement
35
+ requirement: !ruby/object:Gem::Requirement
31
36
  none: false
32
37
  requirements:
33
38
  - - ~>
@@ -35,10 +40,15 @@ dependencies:
35
40
  version: 0.10.0
36
41
  type: :runtime
37
42
  prerelease: false
38
- version_requirements: *70134686921160
43
+ version_requirements: !ruby/object:Gem::Requirement
44
+ none: false
45
+ requirements:
46
+ - - ~>
47
+ - !ruby/object:Gem::Version
48
+ version: 0.10.0
39
49
  - !ruby/object:Gem::Dependency
40
50
  name: minitar
41
- requirement: &70134686920480 !ruby/object:Gem::Requirement
51
+ requirement: !ruby/object:Gem::Requirement
42
52
  none: false
43
53
  requirements:
44
54
  - - ! '>='
@@ -46,10 +56,15 @@ dependencies:
46
56
  version: '0'
47
57
  type: :runtime
48
58
  prerelease: false
49
- version_requirements: *70134686920480
59
+ version_requirements: !ruby/object:Gem::Requirement
60
+ none: false
61
+ requirements:
62
+ - - ! '>='
63
+ - !ruby/object:Gem::Version
64
+ version: '0'
50
65
  - !ruby/object:Gem::Dependency
51
66
  name: thor
52
- requirement: &70134686919240 !ruby/object:Gem::Requirement
67
+ requirement: !ruby/object:Gem::Requirement
53
68
  none: false
54
69
  requirements:
55
70
  - - ~>
@@ -57,10 +72,15 @@ dependencies:
57
72
  version: 0.15.2
58
73
  type: :runtime
59
74
  prerelease: false
60
- version_requirements: *70134686919240
75
+ version_requirements: !ruby/object:Gem::Requirement
76
+ none: false
77
+ requirements:
78
+ - - ~>
79
+ - !ruby/object:Gem::Version
80
+ version: 0.15.2
61
81
  - !ruby/object:Gem::Dependency
62
82
  name: cucumber
63
- requirement: &70134686918520 !ruby/object:Gem::Requirement
83
+ requirement: !ruby/object:Gem::Requirement
64
84
  none: false
65
85
  requirements:
66
86
  - - ! '>='
@@ -68,10 +88,15 @@ dependencies:
68
88
  version: '0'
69
89
  type: :development
70
90
  prerelease: false
71
- version_requirements: *70134686918520
91
+ version_requirements: !ruby/object:Gem::Requirement
92
+ none: false
93
+ requirements:
94
+ - - ! '>='
95
+ - !ruby/object:Gem::Version
96
+ version: '0'
72
97
  - !ruby/object:Gem::Dependency
73
98
  name: vcr
74
- requirement: &70134686917060 !ruby/object:Gem::Requirement
99
+ requirement: !ruby/object:Gem::Requirement
75
100
  none: false
76
101
  requirements:
77
102
  - - ! '>='
@@ -79,10 +104,15 @@ dependencies:
79
104
  version: '0'
80
105
  type: :development
81
106
  prerelease: false
82
- version_requirements: *70134686917060
107
+ version_requirements: !ruby/object:Gem::Requirement
108
+ none: false
109
+ requirements:
110
+ - - ! '>='
111
+ - !ruby/object:Gem::Version
112
+ version: '0'
83
113
  - !ruby/object:Gem::Dependency
84
114
  name: webmock
85
- requirement: &70134686932520 !ruby/object:Gem::Requirement
115
+ requirement: !ruby/object:Gem::Requirement
86
116
  none: false
87
117
  requirements:
88
118
  - - ! '>='
@@ -90,10 +120,15 @@ dependencies:
90
120
  version: '0'
91
121
  type: :development
92
122
  prerelease: false
93
- version_requirements: *70134686932520
123
+ version_requirements: !ruby/object:Gem::Requirement
124
+ none: false
125
+ requirements:
126
+ - - ! '>='
127
+ - !ruby/object:Gem::Version
128
+ version: '0'
94
129
  - !ruby/object:Gem::Dependency
95
130
  name: aruba
96
- requirement: &70134686931720 !ruby/object:Gem::Requirement
131
+ requirement: !ruby/object:Gem::Requirement
97
132
  none: false
98
133
  requirements:
99
134
  - - ! '>='
@@ -101,10 +136,15 @@ dependencies:
101
136
  version: '0'
102
137
  type: :development
103
138
  prerelease: false
104
- version_requirements: *70134686931720
139
+ version_requirements: !ruby/object:Gem::Requirement
140
+ none: false
141
+ requirements:
142
+ - - ! '>='
143
+ - !ruby/object:Gem::Version
144
+ version: '0'
105
145
  - !ruby/object:Gem::Dependency
106
146
  name: rspec
107
- requirement: &70134686931040 !ruby/object:Gem::Requirement
147
+ requirement: !ruby/object:Gem::Requirement
108
148
  none: false
109
149
  requirements:
110
150
  - - ! '>='
@@ -112,10 +152,15 @@ dependencies:
112
152
  version: '0'
113
153
  type: :development
114
154
  prerelease: false
115
- version_requirements: *70134686931040
155
+ version_requirements: !ruby/object:Gem::Requirement
156
+ none: false
157
+ requirements:
158
+ - - ! '>='
159
+ - !ruby/object:Gem::Version
160
+ version: '0'
116
161
  - !ruby/object:Gem::Dependency
117
162
  name: json_spec
118
- requirement: &70134686930320 !ruby/object:Gem::Requirement
163
+ requirement: !ruby/object:Gem::Requirement
119
164
  none: false
120
165
  requirements:
121
166
  - - ! '>='
@@ -123,10 +168,15 @@ dependencies:
123
168
  version: '0'
124
169
  type: :development
125
170
  prerelease: false
126
- version_requirements: *70134686930320
171
+ version_requirements: !ruby/object:Gem::Requirement
172
+ none: false
173
+ requirements:
174
+ - - ! '>='
175
+ - !ruby/object:Gem::Version
176
+ version: '0'
127
177
  - !ruby/object:Gem::Dependency
128
178
  name: simplecov
129
- requirement: &70134686929320 !ruby/object:Gem::Requirement
179
+ requirement: !ruby/object:Gem::Requirement
130
180
  none: false
131
181
  requirements:
132
182
  - - ! '>='
@@ -134,10 +184,15 @@ dependencies:
134
184
  version: '0'
135
185
  type: :development
136
186
  prerelease: false
137
- version_requirements: *70134686929320
187
+ version_requirements: !ruby/object:Gem::Requirement
188
+ none: false
189
+ requirements:
190
+ - - ! '>='
191
+ - !ruby/object:Gem::Version
192
+ version: '0'
138
193
  - !ruby/object:Gem::Dependency
139
194
  name: fuubar
140
- requirement: &70134686928360 !ruby/object:Gem::Requirement
195
+ requirement: !ruby/object:Gem::Requirement
141
196
  none: false
142
197
  requirements:
143
198
  - - ! '>='
@@ -145,10 +200,15 @@ dependencies:
145
200
  version: '0'
146
201
  type: :development
147
202
  prerelease: false
148
- version_requirements: *70134686928360
203
+ version_requirements: !ruby/object:Gem::Requirement
204
+ none: false
205
+ requirements:
206
+ - - ! '>='
207
+ - !ruby/object:Gem::Version
208
+ version: '0'
149
209
  - !ruby/object:Gem::Dependency
150
210
  name: spork
151
- requirement: &70134686927880 !ruby/object:Gem::Requirement
211
+ requirement: !ruby/object:Gem::Requirement
152
212
  none: false
153
213
  requirements:
154
214
  - - ! '>='
@@ -156,10 +216,15 @@ dependencies:
156
216
  version: '0'
157
217
  type: :development
158
218
  prerelease: false
159
- version_requirements: *70134686927880
219
+ version_requirements: !ruby/object:Gem::Requirement
220
+ none: false
221
+ requirements:
222
+ - - ! '>='
223
+ - !ruby/object:Gem::Version
224
+ version: '0'
160
225
  - !ruby/object:Gem::Dependency
161
226
  name: yard
162
- requirement: &70134686927220 !ruby/object:Gem::Requirement
227
+ requirement: !ruby/object:Gem::Requirement
163
228
  none: false
164
229
  requirements:
165
230
  - - ! '>='
@@ -167,10 +232,15 @@ dependencies:
167
232
  version: '0'
168
233
  type: :development
169
234
  prerelease: false
170
- version_requirements: *70134686927220
235
+ version_requirements: !ruby/object:Gem::Requirement
236
+ none: false
237
+ requirements:
238
+ - - ! '>='
239
+ - !ruby/object:Gem::Version
240
+ version: '0'
171
241
  - !ruby/object:Gem::Dependency
172
242
  name: guard
173
- requirement: &70134686926260 !ruby/object:Gem::Requirement
243
+ requirement: !ruby/object:Gem::Requirement
174
244
  none: false
175
245
  requirements:
176
246
  - - ! '>='
@@ -178,10 +248,15 @@ dependencies:
178
248
  version: '0'
179
249
  type: :development
180
250
  prerelease: false
181
- version_requirements: *70134686926260
251
+ version_requirements: !ruby/object:Gem::Requirement
252
+ none: false
253
+ requirements:
254
+ - - ! '>='
255
+ - !ruby/object:Gem::Version
256
+ version: '0'
182
257
  - !ruby/object:Gem::Dependency
183
258
  name: guard-rspec
184
- requirement: &70134686925600 !ruby/object:Gem::Requirement
259
+ requirement: !ruby/object:Gem::Requirement
185
260
  none: false
186
261
  requirements:
187
262
  - - ! '>='
@@ -189,10 +264,15 @@ dependencies:
189
264
  version: '0'
190
265
  type: :development
191
266
  prerelease: false
192
- version_requirements: *70134686925600
267
+ version_requirements: !ruby/object:Gem::Requirement
268
+ none: false
269
+ requirements:
270
+ - - ! '>='
271
+ - !ruby/object:Gem::Version
272
+ version: '0'
193
273
  - !ruby/object:Gem::Dependency
194
274
  name: guard-cucumber
195
- requirement: &70134686924680 !ruby/object:Gem::Requirement
275
+ requirement: !ruby/object:Gem::Requirement
196
276
  none: false
197
277
  requirements:
198
278
  - - ! '>='
@@ -200,10 +280,15 @@ dependencies:
200
280
  version: '0'
201
281
  type: :development
202
282
  prerelease: false
203
- version_requirements: *70134686924680
283
+ version_requirements: !ruby/object:Gem::Requirement
284
+ none: false
285
+ requirements:
286
+ - - ! '>='
287
+ - !ruby/object:Gem::Version
288
+ version: '0'
204
289
  - !ruby/object:Gem::Dependency
205
290
  name: guard-spork
206
- requirement: &70134686940300 !ruby/object:Gem::Requirement
291
+ requirement: !ruby/object:Gem::Requirement
207
292
  none: false
208
293
  requirements:
209
294
  - - ! '>='
@@ -211,10 +296,15 @@ dependencies:
211
296
  version: '0'
212
297
  type: :development
213
298
  prerelease: false
214
- version_requirements: *70134686940300
299
+ version_requirements: !ruby/object:Gem::Requirement
300
+ none: false
301
+ requirements:
302
+ - - ! '>='
303
+ - !ruby/object:Gem::Version
304
+ version: '0'
215
305
  - !ruby/object:Gem::Dependency
216
306
  name: guard-yard
217
- requirement: &70134686939060 !ruby/object:Gem::Requirement
307
+ requirement: !ruby/object:Gem::Requirement
218
308
  none: false
219
309
  requirements:
220
310
  - - ! '>='
@@ -222,7 +312,12 @@ dependencies:
222
312
  version: '0'
223
313
  type: :development
224
314
  prerelease: false
225
- version_requirements: *70134686939060
315
+ version_requirements: !ruby/object:Gem::Requirement
316
+ none: false
317
+ requirements:
318
+ - - ! '>='
319
+ - !ruby/object:Gem::Version
320
+ version: '0'
226
321
  description: Manages a Cookbook's, or an Application's, Cookbook dependencies
227
322
  email:
228
323
  - josiah@skirmisher.net
@@ -346,10 +441,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
346
441
  version: '0'
347
442
  segments:
348
443
  - 0
349
- hash: -4431400407552958690
444
+ hash: 2051689970099247932
350
445
  requirements: []
351
446
  rubyforge_project:
352
- rubygems_version: 1.8.11
447
+ rubygems_version: 1.8.23
353
448
  signing_key:
354
449
  specification_version: 3
355
450
  summary: Manages a Cookbook's, or an Application's, Cookbook dependencies