berkshelf 1.4.5 → 1.4.6
Sign up to get free protection for your applications and to get access to all the features.
- data/CHANGELOG.md +5 -1
- data/CONTRIBUTING.md +1 -3
- data/Gemfile +1 -11
- data/Thorfile +1 -3
- data/berkshelf.gemspec +33 -24
- data/features/default_locations.feature +28 -28
- data/features/install_command.feature +16 -3
- data/features/outdated_command.feature +6 -0
- data/features/show_command.feature +1 -0
- data/features/support/env.rb +12 -5
- data/features/upload_command.feature +14 -0
- data/features/vendor_install.feature +0 -1
- data/lib/berkshelf/berksfile.rb +17 -0
- data/lib/berkshelf/community_rest.rb +3 -1
- data/lib/berkshelf/errors.rb +88 -0
- data/lib/berkshelf/locations/chef_api_location.rb +2 -1
- data/lib/berkshelf/locations/git_location.rb +2 -4
- data/lib/berkshelf/locations/site_location.rb +3 -1
- data/lib/berkshelf/ui.rb +8 -4
- data/lib/berkshelf/version.rb +1 -1
- data/spec/config/berkshelf.pem +27 -0
- data/spec/{knife.rb.sample → config/knife.rb} +2 -2
- data/spec/config/validator.pem +27 -0
- data/spec/spec_helper.rb +10 -3
- data/spec/support/chef_api.rb +4 -2
- data/spec/support/chef_server.rb +73 -0
- data/spec/support/matchers/file_system_matchers.rb +7 -7
- data/spec/unit/berkshelf/community_rest_spec.rb +2 -2
- data/spec/unit/berkshelf/config_spec.rb +1 -1
- data/spec/unit/berkshelf/init_generator_spec.rb +1 -1
- data/spec/unit/chef/config_spec.rb +1 -1
- metadata +151 -35
- data/spec/support/knife.rb +0 -18
@@ -8,13 +8,13 @@ describe Berkshelf::CommunityREST, vcr: { record: :new_episodes, serialize_with:
|
|
8
8
|
let(:gzip_reader) { double('gzip_reader') }
|
9
9
|
|
10
10
|
before do
|
11
|
-
|
11
|
+
File.stub(:open).with(target, 'rb').and_return(file)
|
12
12
|
Zlib::GzipReader.stub(:new).with(file).and_return(gzip_reader)
|
13
13
|
Archive::Tar::Minitar.stub(:unpack).with(gzip_reader, destination)
|
14
14
|
end
|
15
15
|
|
16
16
|
it 'unpacks the tar' do
|
17
|
-
|
17
|
+
File.should_receive(:open).with(target, 'rb')
|
18
18
|
::IO.should_receive(:binread).with(target, 2).and_return([0x1F, 0x8B].pack("C*"))
|
19
19
|
Zlib::GzipReader.should_receive(:new).with(file)
|
20
20
|
Archive::Tar::Minitar.should_receive(:unpack).with(gzip_reader, destination)
|
@@ -46,7 +46,7 @@ describe Berkshelf::InitGenerator, vcr: { record: :new_episodes, serialize_with:
|
|
46
46
|
context "with a metadata entry in the Berksfile" do
|
47
47
|
before(:each) do
|
48
48
|
Dir.mkdir target
|
49
|
-
|
49
|
+
File.open(target.join("metadata.rb"), 'w+') do |f|
|
50
50
|
f.write ""
|
51
51
|
end
|
52
52
|
|
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: 1.4.
|
4
|
+
version: 1.4.6
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -12,7 +12,7 @@ authors:
|
|
12
12
|
autorequire:
|
13
13
|
bindir: bin
|
14
14
|
cert_chain: []
|
15
|
-
date: 2013-
|
15
|
+
date: 2013-06-11 00:00:00.000000000 Z
|
16
16
|
dependencies:
|
17
17
|
- !ruby/object:Gem::Dependency
|
18
18
|
name: celluloid
|
@@ -275,83 +275,195 @@ dependencies:
|
|
275
275
|
requirement: !ruby/object:Gem::Requirement
|
276
276
|
none: false
|
277
277
|
requirements:
|
278
|
-
- -
|
278
|
+
- - ~>
|
279
279
|
- !ruby/object:Gem::Version
|
280
|
-
version: '0'
|
280
|
+
version: '0.5'
|
281
281
|
type: :development
|
282
282
|
prerelease: false
|
283
283
|
version_requirements: !ruby/object:Gem::Requirement
|
284
284
|
none: false
|
285
285
|
requirements:
|
286
|
-
- -
|
286
|
+
- - ~>
|
287
287
|
- !ruby/object:Gem::Version
|
288
|
-
version: '0'
|
288
|
+
version: '0.5'
|
289
289
|
- !ruby/object:Gem::Dependency
|
290
290
|
name: cane
|
291
291
|
requirement: !ruby/object:Gem::Requirement
|
292
292
|
none: false
|
293
293
|
requirements:
|
294
|
-
- -
|
294
|
+
- - ~>
|
295
295
|
- !ruby/object:Gem::Version
|
296
|
-
version: '
|
296
|
+
version: '2.5'
|
297
297
|
type: :development
|
298
298
|
prerelease: false
|
299
299
|
version_requirements: !ruby/object:Gem::Requirement
|
300
300
|
none: false
|
301
301
|
requirements:
|
302
|
-
- -
|
302
|
+
- - ~>
|
303
303
|
- !ruby/object:Gem::Version
|
304
|
-
version: '
|
304
|
+
version: '2.5'
|
305
|
+
- !ruby/object:Gem::Dependency
|
306
|
+
name: chef-zero
|
307
|
+
requirement: !ruby/object:Gem::Requirement
|
308
|
+
none: false
|
309
|
+
requirements:
|
310
|
+
- - ~>
|
311
|
+
- !ruby/object:Gem::Version
|
312
|
+
version: '1.0'
|
313
|
+
type: :development
|
314
|
+
prerelease: false
|
315
|
+
version_requirements: !ruby/object:Gem::Requirement
|
316
|
+
none: false
|
317
|
+
requirements:
|
318
|
+
- - ~>
|
319
|
+
- !ruby/object:Gem::Version
|
320
|
+
version: '1.0'
|
321
|
+
- !ruby/object:Gem::Dependency
|
322
|
+
name: fuubar
|
323
|
+
requirement: !ruby/object:Gem::Requirement
|
324
|
+
none: false
|
325
|
+
requirements:
|
326
|
+
- - ~>
|
327
|
+
- !ruby/object:Gem::Version
|
328
|
+
version: '1.1'
|
329
|
+
type: :development
|
330
|
+
prerelease: false
|
331
|
+
version_requirements: !ruby/object:Gem::Requirement
|
332
|
+
none: false
|
333
|
+
requirements:
|
334
|
+
- - ~>
|
335
|
+
- !ruby/object:Gem::Version
|
336
|
+
version: '1.1'
|
305
337
|
- !ruby/object:Gem::Dependency
|
306
338
|
name: json_spec
|
307
339
|
requirement: !ruby/object:Gem::Requirement
|
308
340
|
none: false
|
309
341
|
requirements:
|
310
|
-
- -
|
342
|
+
- - ~>
|
311
343
|
- !ruby/object:Gem::Version
|
312
|
-
version: '
|
344
|
+
version: '1.1'
|
313
345
|
type: :development
|
314
346
|
prerelease: false
|
315
347
|
version_requirements: !ruby/object:Gem::Requirement
|
316
348
|
none: false
|
317
349
|
requirements:
|
318
|
-
- -
|
350
|
+
- - ~>
|
319
351
|
- !ruby/object:Gem::Version
|
320
|
-
version: '
|
352
|
+
version: '1.1'
|
321
353
|
- !ruby/object:Gem::Dependency
|
322
354
|
name: rake
|
323
355
|
requirement: !ruby/object:Gem::Requirement
|
324
356
|
none: false
|
325
357
|
requirements:
|
326
|
-
- -
|
358
|
+
- - ~>
|
327
359
|
- !ruby/object:Gem::Version
|
328
|
-
version: 0.9
|
360
|
+
version: '0.9'
|
329
361
|
type: :development
|
330
362
|
prerelease: false
|
331
363
|
version_requirements: !ruby/object:Gem::Requirement
|
332
364
|
none: false
|
333
365
|
requirements:
|
334
|
-
- -
|
366
|
+
- - ~>
|
335
367
|
- !ruby/object:Gem::Version
|
336
|
-
version: 0.9
|
368
|
+
version: '0.9'
|
337
369
|
- !ruby/object:Gem::Dependency
|
338
370
|
name: rspec
|
339
371
|
requirement: !ruby/object:Gem::Requirement
|
340
372
|
none: false
|
341
373
|
requirements:
|
342
|
-
- -
|
374
|
+
- - ~>
|
343
375
|
- !ruby/object:Gem::Version
|
344
|
-
version: '
|
376
|
+
version: '2.13'
|
345
377
|
type: :development
|
346
378
|
prerelease: false
|
347
379
|
version_requirements: !ruby/object:Gem::Requirement
|
348
380
|
none: false
|
349
381
|
requirements:
|
350
|
-
- -
|
382
|
+
- - ~>
|
351
383
|
- !ruby/object:Gem::Version
|
352
|
-
version: '
|
384
|
+
version: '2.13'
|
385
|
+
- !ruby/object:Gem::Dependency
|
386
|
+
name: spork
|
387
|
+
requirement: !ruby/object:Gem::Requirement
|
388
|
+
none: false
|
389
|
+
requirements:
|
390
|
+
- - ~>
|
391
|
+
- !ruby/object:Gem::Version
|
392
|
+
version: '0.9'
|
393
|
+
type: :development
|
394
|
+
prerelease: false
|
395
|
+
version_requirements: !ruby/object:Gem::Requirement
|
396
|
+
none: false
|
397
|
+
requirements:
|
398
|
+
- - ~>
|
399
|
+
- !ruby/object:Gem::Version
|
400
|
+
version: '0.9'
|
401
|
+
- !ruby/object:Gem::Dependency
|
402
|
+
name: vcr
|
403
|
+
requirement: !ruby/object:Gem::Requirement
|
404
|
+
none: false
|
405
|
+
requirements:
|
406
|
+
- - ~>
|
407
|
+
- !ruby/object:Gem::Version
|
408
|
+
version: '2.4'
|
409
|
+
type: :development
|
410
|
+
prerelease: false
|
411
|
+
version_requirements: !ruby/object:Gem::Requirement
|
412
|
+
none: false
|
413
|
+
requirements:
|
414
|
+
- - ~>
|
415
|
+
- !ruby/object:Gem::Version
|
416
|
+
version: '2.4'
|
417
|
+
- !ruby/object:Gem::Dependency
|
418
|
+
name: webmock
|
419
|
+
requirement: !ruby/object:Gem::Requirement
|
420
|
+
none: false
|
421
|
+
requirements:
|
422
|
+
- - ~>
|
423
|
+
- !ruby/object:Gem::Version
|
424
|
+
version: '1.11'
|
425
|
+
type: :development
|
426
|
+
prerelease: false
|
427
|
+
version_requirements: !ruby/object:Gem::Requirement
|
428
|
+
none: false
|
429
|
+
requirements:
|
430
|
+
- - ~>
|
431
|
+
- !ruby/object:Gem::Version
|
432
|
+
version: '1.11'
|
433
|
+
- !ruby/object:Gem::Dependency
|
434
|
+
name: yard
|
435
|
+
requirement: !ruby/object:Gem::Requirement
|
436
|
+
none: false
|
437
|
+
requirements:
|
438
|
+
- - ~>
|
439
|
+
- !ruby/object:Gem::Version
|
440
|
+
version: '0.8'
|
441
|
+
type: :development
|
442
|
+
prerelease: false
|
443
|
+
version_requirements: !ruby/object:Gem::Requirement
|
444
|
+
none: false
|
445
|
+
requirements:
|
446
|
+
- - ~>
|
447
|
+
- !ruby/object:Gem::Version
|
448
|
+
version: '0.8'
|
449
|
+
- !ruby/object:Gem::Dependency
|
450
|
+
name: guard
|
451
|
+
requirement: !ruby/object:Gem::Requirement
|
452
|
+
none: false
|
453
|
+
requirements:
|
454
|
+
- - ~>
|
455
|
+
- !ruby/object:Gem::Version
|
456
|
+
version: '1.8'
|
457
|
+
type: :development
|
458
|
+
prerelease: false
|
459
|
+
version_requirements: !ruby/object:Gem::Requirement
|
460
|
+
none: false
|
461
|
+
requirements:
|
462
|
+
- - ~>
|
463
|
+
- !ruby/object:Gem::Version
|
464
|
+
version: '1.8'
|
353
465
|
- !ruby/object:Gem::Dependency
|
354
|
-
name:
|
466
|
+
name: guard-cane
|
355
467
|
requirement: !ruby/object:Gem::Requirement
|
356
468
|
none: false
|
357
469
|
requirements:
|
@@ -367,7 +479,7 @@ dependencies:
|
|
367
479
|
- !ruby/object:Gem::Version
|
368
480
|
version: '0'
|
369
481
|
- !ruby/object:Gem::Dependency
|
370
|
-
name:
|
482
|
+
name: guard-cucumber
|
371
483
|
requirement: !ruby/object:Gem::Requirement
|
372
484
|
none: false
|
373
485
|
requirements:
|
@@ -383,7 +495,7 @@ dependencies:
|
|
383
495
|
- !ruby/object:Gem::Version
|
384
496
|
version: '0'
|
385
497
|
- !ruby/object:Gem::Dependency
|
386
|
-
name:
|
498
|
+
name: guard-rspec
|
387
499
|
requirement: !ruby/object:Gem::Requirement
|
388
500
|
none: false
|
389
501
|
requirements:
|
@@ -399,7 +511,7 @@ dependencies:
|
|
399
511
|
- !ruby/object:Gem::Version
|
400
512
|
version: '0'
|
401
513
|
- !ruby/object:Gem::Dependency
|
402
|
-
name:
|
514
|
+
name: guard-spork
|
403
515
|
requirement: !ruby/object:Gem::Requirement
|
404
516
|
none: false
|
405
517
|
requirements:
|
@@ -415,21 +527,21 @@ dependencies:
|
|
415
527
|
- !ruby/object:Gem::Version
|
416
528
|
version: '0'
|
417
529
|
- !ruby/object:Gem::Dependency
|
418
|
-
name:
|
530
|
+
name: guard-yard
|
419
531
|
requirement: !ruby/object:Gem::Requirement
|
420
532
|
none: false
|
421
533
|
requirements:
|
422
|
-
- -
|
534
|
+
- - ! '>='
|
423
535
|
- !ruby/object:Gem::Version
|
424
|
-
version:
|
536
|
+
version: '0'
|
425
537
|
type: :development
|
426
538
|
prerelease: false
|
427
539
|
version_requirements: !ruby/object:Gem::Requirement
|
428
540
|
none: false
|
429
541
|
requirements:
|
430
|
-
- -
|
542
|
+
- - ! '>='
|
431
543
|
- !ruby/object:Gem::Version
|
432
|
-
version:
|
544
|
+
version: '0'
|
433
545
|
description: Manages a Cookbook's, or an Application's, Cookbook dependencies
|
434
546
|
email:
|
435
547
|
- reset@riotgames.com
|
@@ -546,6 +658,9 @@ files:
|
|
546
658
|
- lib/thor/monkies.rb
|
547
659
|
- lib/thor/monkies/hash_with_indifferent_access.rb
|
548
660
|
- lib/thor/monkies/shell.rb
|
661
|
+
- spec/config/berkshelf.pem
|
662
|
+
- spec/config/knife.rb
|
663
|
+
- spec/config/validator.pem
|
549
664
|
- spec/fixtures/Berksfile
|
550
665
|
- spec/fixtures/cassettes/Berkshelf_CommunityREST/_download/unpacks_the_archive.json
|
551
666
|
- spec/fixtures/cassettes/Berkshelf_CommunityREST/_find/raises_a_CommunitySiteError_error_on_any_non_200_or_404_response.json
|
@@ -585,10 +700,9 @@ files:
|
|
585
700
|
- spec/fixtures/lockfile_spec/with_lock/Berksfile
|
586
701
|
- spec/fixtures/lockfile_spec/without_lock/.gitkeep
|
587
702
|
- spec/fixtures/reset.pem
|
588
|
-
- spec/knife.rb.sample
|
589
703
|
- spec/spec_helper.rb
|
590
704
|
- spec/support/chef_api.rb
|
591
|
-
- spec/support/
|
705
|
+
- spec/support/chef_server.rb
|
592
706
|
- spec/support/matchers/file_system_matchers.rb
|
593
707
|
- spec/support/matchers/filepath_matchers.rb
|
594
708
|
- spec/support/test_generators.rb
|
@@ -672,6 +786,9 @@ test_files:
|
|
672
786
|
- features/update_command.feature
|
673
787
|
- features/upload_command.feature
|
674
788
|
- features/vendor_install.feature
|
789
|
+
- spec/config/berkshelf.pem
|
790
|
+
- spec/config/knife.rb
|
791
|
+
- spec/config/validator.pem
|
675
792
|
- spec/fixtures/Berksfile
|
676
793
|
- spec/fixtures/cassettes/Berkshelf_CommunityREST/_download/unpacks_the_archive.json
|
677
794
|
- spec/fixtures/cassettes/Berkshelf_CommunityREST/_find/raises_a_CommunitySiteError_error_on_any_non_200_or_404_response.json
|
@@ -711,10 +828,9 @@ test_files:
|
|
711
828
|
- spec/fixtures/lockfile_spec/with_lock/Berksfile
|
712
829
|
- spec/fixtures/lockfile_spec/without_lock/.gitkeep
|
713
830
|
- spec/fixtures/reset.pem
|
714
|
-
- spec/knife.rb.sample
|
715
831
|
- spec/spec_helper.rb
|
716
832
|
- spec/support/chef_api.rb
|
717
|
-
- spec/support/
|
833
|
+
- spec/support/chef_server.rb
|
718
834
|
- spec/support/matchers/file_system_matchers.rb
|
719
835
|
- spec/support/matchers/filepath_matchers.rb
|
720
836
|
- spec/support/test_generators.rb
|
data/spec/support/knife.rb
DELETED
@@ -1,18 +0,0 @@
|
|
1
|
-
require 'berkshelf/chef'
|
2
|
-
|
3
|
-
module Berkshelf
|
4
|
-
module RSpec
|
5
|
-
module Knife
|
6
|
-
class << self
|
7
|
-
def load_knife_config(path)
|
8
|
-
if File.exist?(path)
|
9
|
-
Berkshelf::Chef::Config.from_file(path)
|
10
|
-
ENV["CHEF_CONFIG"] = path
|
11
|
-
else
|
12
|
-
raise "Cannot continue; '#{path}' must exist and have testing credentials." unless ENV['CI']
|
13
|
-
end
|
14
|
-
end
|
15
|
-
end
|
16
|
-
end
|
17
|
-
end
|
18
|
-
end
|