chef-dk 3.6.57 → 3.7.23

Sign up to get free protection for your applications and to get access to all the features.
Files changed (91) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +3 -2
  3. data/Gemfile.lock +54 -54
  4. data/Rakefile +6 -2
  5. data/chef-dk.gemspec +2 -2
  6. data/lib/chef-dk/cli.rb +1 -1
  7. data/lib/chef-dk/command/clean_policy_cookbooks.rb +1 -1
  8. data/lib/chef-dk/command/clean_policy_revisions.rb +1 -1
  9. data/lib/chef-dk/command/delete_policy.rb +1 -1
  10. data/lib/chef-dk/command/delete_policy_group.rb +1 -1
  11. data/lib/chef-dk/command/diff.rb +1 -1
  12. data/lib/chef-dk/command/export.rb +1 -1
  13. data/lib/chef-dk/command/generate.rb +1 -1
  14. data/lib/chef-dk/command/generator_commands/generator_generator.rb +1 -1
  15. data/lib/chef-dk/command/install.rb +1 -1
  16. data/lib/chef-dk/command/provision.rb +6 -3
  17. data/lib/chef-dk/command/push.rb +1 -1
  18. data/lib/chef-dk/command/push_archive.rb +1 -1
  19. data/lib/chef-dk/command/shell_init.rb +1 -1
  20. data/lib/chef-dk/command/show_policy.rb +1 -1
  21. data/lib/chef-dk/command/undelete.rb +1 -1
  22. data/lib/chef-dk/command/update.rb +1 -1
  23. data/lib/chef-dk/command/verify.rb +2 -2
  24. data/lib/chef-dk/generator.rb +4 -4
  25. data/lib/chef-dk/policyfile/git_lock_fetcher.rb +1 -1
  26. data/lib/chef-dk/policyfile/uploader.rb +1 -1
  27. data/lib/chef-dk/policyfile_services/export_repo.rb +2 -2
  28. data/lib/chef-dk/policyfile_services/push_archive.rb +1 -1
  29. data/lib/chef-dk/service_exception_inspectors/http.rb +1 -1
  30. data/lib/chef-dk/version.rb +1 -1
  31. data/spec/unit/cli_spec.rb +1 -1
  32. data/spec/unit/command/base_spec.rb +3 -3
  33. data/spec/unit/command/clean_policy_cookbooks_spec.rb +2 -2
  34. data/spec/unit/command/clean_policy_revisions_spec.rb +2 -2
  35. data/spec/unit/command/delete_policy_group_spec.rb +2 -2
  36. data/spec/unit/command/delete_policy_spec.rb +2 -2
  37. data/spec/unit/command/export_spec.rb +3 -3
  38. data/spec/unit/command/generate_spec.rb +1 -1
  39. data/spec/unit/command/generator_commands/build_cookbook_spec.rb +2 -2
  40. data/spec/unit/command/generator_commands/cookbook_spec.rb +15 -15
  41. data/spec/unit/command/generator_commands/generator_generator_spec.rb +1 -1
  42. data/spec/unit/command/generator_commands/policyfile_spec.rb +1 -1
  43. data/spec/unit/command/generator_commands/repo_spec.rb +3 -3
  44. data/spec/unit/command/install_spec.rb +2 -2
  45. data/spec/unit/command/provision_spec.rb +7 -7
  46. data/spec/unit/command/push_spec.rb +2 -2
  47. data/spec/unit/command/shell_init_spec.rb +5 -5
  48. data/spec/unit/command/show_policy_spec.rb +2 -2
  49. data/spec/unit/command/undelete_spec.rb +2 -2
  50. data/spec/unit/command/update_spec.rb +4 -4
  51. data/spec/unit/policyfile/chef_server_lock_fetcher_spec.rb +1 -1
  52. data/spec/unit/policyfile/comparison_base_spec.rb +1 -1
  53. data/spec/unit/policyfile/differ_spec.rb +8 -8
  54. data/spec/unit/policyfile/git_lock_fetcher_spec.rb +8 -8
  55. data/spec/unit/policyfile/local_lock_fetcher_spec.rb +1 -1
  56. data/spec/unit/policyfile/reports/upload_spec.rb +1 -1
  57. data/spec/unit/policyfile_demands_spec.rb +5 -5
  58. data/spec/unit/policyfile_evaluation_spec.rb +3 -3
  59. data/spec/unit/policyfile_lock_build_spec.rb +14 -14
  60. data/spec/unit/policyfile_lock_validation_spec.rb +13 -13
  61. data/spec/unit/policyfile_services/clean_policies_spec.rb +3 -3
  62. data/spec/unit/policyfile_services/export_repo_spec.rb +2 -2
  63. data/spec/unit/policyfile_services/install_spec.rb +1 -1
  64. data/spec/unit/policyfile_services/push_archive_spec.rb +2 -2
  65. data/spec/unit/policyfile_services/push_spec.rb +1 -1
  66. data/spec/unit/policyfile_services/show_policy_spec.rb +13 -13
  67. data/spec/unit/policyfile_services/undelete_spec.rb +1 -1
  68. data/spec/unit/policyfile_services/update_attributes_spec.rb +1 -1
  69. data/spec/unit/policyfile_services/update_spec.rb +1 -1
  70. data/spec/unit/service_exception_inspectors/http_spec.rb +2 -2
  71. metadata +9 -29
  72. data/acceptance/.shared/kitchen_acceptance/.kitchen.digitalocean.yml +0 -27
  73. data/acceptance/.shared/kitchen_acceptance/.kitchen.ec2.yml +0 -287
  74. data/acceptance/.shared/kitchen_acceptance/.kitchen.vagrant.yml +0 -52
  75. data/acceptance/.shared/kitchen_acceptance/libraries/kitchen.rb +0 -51
  76. data/acceptance/.shared/kitchen_acceptance/metadata.rb +0 -1
  77. data/acceptance/Gemfile +0 -21
  78. data/acceptance/Gemfile.lock +0 -335
  79. data/acceptance/README.md +0 -132
  80. data/acceptance/trivial/.acceptance/acceptance-cookbook/.gitignore +0 -2
  81. data/acceptance/trivial/.acceptance/acceptance-cookbook/metadata.rb +0 -2
  82. data/acceptance/trivial/.acceptance/acceptance-cookbook/recipes/destroy.rb +0 -1
  83. data/acceptance/trivial/.acceptance/acceptance-cookbook/recipes/provision.rb +0 -1
  84. data/acceptance/trivial/.acceptance/acceptance-cookbook/recipes/verify.rb +0 -1
  85. data/acceptance/trivial/.kitchen.yml +0 -7
  86. data/acceptance/trivial/test/integration/chefdk-current-install/inspec/chef_client_spec.rb +0 -5
  87. data/tasks/announce.rb +0 -57
  88. data/tasks/bin/bundle-platform.bat +0 -2
  89. data/tasks/dependencies.rb +0 -56
  90. data/tasks/templates/prerelease.md.erb +0 -26
  91. data/tasks/templates/release.md.erb +0 -26
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 5efe53aaa527d1bacb2c39fa87a4bc8fbcfcf695371957521cf23b64e132fdec
4
- data.tar.gz: fae96dc2073d15083a8469714e91925c85b7e3dd70b8ba0480b47c27ac62cef1
3
+ metadata.gz: d9e26e189b2cdbb53ee07cec7e580dbd5969ae397a6271ee91cc00592fc6f596
4
+ data.tar.gz: d6304cf94b0ce7b455e69bcd06ae2868ff90d16228ad57bda1737a0796536926
5
5
  SHA512:
6
- metadata.gz: 5abd2fba57f8cd7da933c7b4817dadefba40170ef9028d03fe738d3b60abf3dfc868e605f435964fd008990299d304974db54908722e53ac752f9d6e02e8930f
7
- data.tar.gz: 24d4e637fcafcdfca407736d8950dc2a18902021eb6b8ad89648c83e871d97e83aee0d689bffd23f8e4d659e3db15189a5f290c60466eebd498a28c587384517
6
+ metadata.gz: 871348c53b01835baf44e0c8d0c7896699969a5363868d728f1284d71d2e3868e23701d63bba97150fbf90f58ebf5f5824a5dd296f5b41961a56187a809673af
7
+ data.tar.gz: b1b754f0e0b2dab91f8210bab15f85668f6456a12092a9e76e98cc170261c3e69b8f098a4049a61f4871847b04aa5527d4f72452313c87bd58c38eeb25b529aa
data/Gemfile CHANGED
@@ -32,7 +32,8 @@ group(:omnibus_package, :development, :test) do
32
32
  gem "pry"
33
33
  gem "yard"
34
34
  gem "guard"
35
- gem "cookstyle", ">= 2.0.0"
35
+ # Cookstyle 4.0 includes non-backwards compatable changes so we need to pin to 3.x.
36
+ gem "cookstyle", "~> 3.0"
36
37
  gem "foodcritic", ">= 12.1"
37
38
  gem "ffi-libarchive"
38
39
  end
@@ -57,7 +58,7 @@ group(:omnibus_package) do
57
58
  # gems to Rubygems now, so letting this float on latest should always give us the latest
58
59
  # stable release. May have to re-pin around major version bumping time, or during patch
59
60
  # fixes.
60
- gem "chef", "= 14.8.12"
61
+ gem "chef", "= 14.10.9"
61
62
  gem "cheffish", ">= 14.0.1"
62
63
  gem "chefspec", ">= 7.3.0"
63
64
  gem "fauxhai", ">= 6.7"
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- chef-dk (3.6.57)
4
+ chef-dk (3.7.23)
5
5
  addressable (>= 2.3.5, < 2.6)
6
6
  chef (~> 14.0)
7
7
  chef-provisioning (~> 2.0)
@@ -30,13 +30,13 @@ GEM
30
30
  mixlib-shellout (~> 2.0)
31
31
  artifactory (3.0.0)
32
32
  ast (2.4.0)
33
- aws-sdk (2.11.197)
34
- aws-sdk-resources (= 2.11.197)
35
- aws-sdk-core (2.11.197)
33
+ aws-sdk (2.11.212)
34
+ aws-sdk-resources (= 2.11.212)
35
+ aws-sdk-core (2.11.212)
36
36
  aws-sigv4 (~> 1.0)
37
37
  jmespath (~> 1.0)
38
- aws-sdk-resources (2.11.197)
39
- aws-sdk-core (= 2.11.197)
38
+ aws-sdk-resources (2.11.212)
39
+ aws-sdk-core (= 2.11.212)
40
40
  aws-sigv4 (1.0.3)
41
41
  axiom-types (0.1.1)
42
42
  descendants_tracker (~> 0.0.4)
@@ -46,7 +46,7 @@ GEM
46
46
  ms_rest_azure (~> 0.11.0)
47
47
  azure_mgmt_key_vault (0.17.2)
48
48
  ms_rest_azure (~> 0.11.0)
49
- azure_mgmt_network (0.18.2)
49
+ azure_mgmt_network (0.18.3)
50
50
  ms_rest_azure (~> 0.11.0)
51
51
  azure_mgmt_resources (0.17.2)
52
52
  ms_rest_azure (~> 0.11.0)
@@ -68,10 +68,10 @@ GEM
68
68
  debug_inspector (>= 0.0.1)
69
69
  builder (3.2.3)
70
70
  byebug (10.0.2)
71
- chef (14.8.12)
71
+ chef (14.10.9)
72
72
  addressable
73
73
  bundler (>= 1.10)
74
- chef-config (= 14.8.12)
74
+ chef-config (= 14.10.9)
75
75
  chef-zero (>= 13.0)
76
76
  diff-lcs (~> 1.2, >= 1.2.4)
77
77
  erubis (~> 2.7)
@@ -79,7 +79,7 @@ GEM
79
79
  ffi-yajl (~> 2.2)
80
80
  highline (~> 1.6, >= 1.6.9)
81
81
  iniparse (~> 1.4)
82
- mixlib-archive (~> 0.4)
82
+ mixlib-archive (>= 0.4, < 2.0)
83
83
  mixlib-authentication (~> 2.1)
84
84
  mixlib-cli (~> 1.7)
85
85
  mixlib-log (~> 2.0, >= 2.0.3)
@@ -98,10 +98,10 @@ GEM
98
98
  specinfra (~> 2.10)
99
99
  syslog-logger (~> 1.6)
100
100
  uuidtools (~> 2.1.5)
101
- chef (14.8.12-universal-mingw32)
101
+ chef (14.10.9-universal-mingw32)
102
102
  addressable
103
103
  bundler (>= 1.10)
104
- chef-config (= 14.8.12)
104
+ chef-config (= 14.10.9)
105
105
  chef-zero (>= 13.0)
106
106
  diff-lcs (~> 1.2, >= 1.2.4)
107
107
  erubis (~> 2.7)
@@ -110,7 +110,7 @@ GEM
110
110
  highline (~> 1.6, >= 1.6.9)
111
111
  iniparse (~> 1.4)
112
112
  iso8601 (~> 0.12.1)
113
- mixlib-archive (~> 0.4)
113
+ mixlib-archive (>= 0.4, < 2.0)
114
114
  mixlib-authentication (~> 2.1)
115
115
  mixlib-cli (~> 1.7)
116
116
  mixlib-log (~> 2.0, >= 2.0.3)
@@ -144,7 +144,7 @@ GEM
144
144
  chef-api (0.9.0)
145
145
  logify (~> 0.1)
146
146
  mime-types
147
- chef-apply (0.2.4)
147
+ chef-apply (0.2.8)
148
148
  chef (>= 14.0)
149
149
  chef-dk (>= 3.0)
150
150
  chef-telemetry
@@ -157,7 +157,7 @@ GEM
157
157
  toml-rb
158
158
  train
159
159
  tty-spinner
160
- chef-config (14.8.12)
160
+ chef-config (14.10.9)
161
161
  addressable
162
162
  fuzzyurl
163
163
  mixlib-config (>= 2.2.12, < 3.0)
@@ -191,7 +191,7 @@ GEM
191
191
  retryable
192
192
  winrm-elevated
193
193
  chef-sugar (5.0.0)
194
- chef-telemetry (0.1.0)
194
+ chef-telemetry (0.1.8)
195
195
  chef-config
196
196
  concurrent-ruby (~> 1.0)
197
197
  ffi-yajl (~> 2.2)
@@ -210,7 +210,7 @@ GEM
210
210
  chef (>= 12.16.42)
211
211
  fauxhai (>= 4)
212
212
  rspec (~> 3.0)
213
- chefstyle (0.11.0)
213
+ chefstyle (0.11.2)
214
214
  rubocop (= 0.55.0)
215
215
  citrus (3.0.2)
216
216
  cleanroom (1.0.0)
@@ -251,7 +251,7 @@ GEM
251
251
  descendants_tracker (0.0.4)
252
252
  thread_safe (~> 0.3, >= 0.3.1)
253
253
  diff-lcs (1.3)
254
- diffy (3.2.1)
254
+ diffy (3.3.0)
255
255
  docker-api (1.34.2)
256
256
  excon (>= 0.47.0)
257
257
  multi_json
@@ -276,14 +276,14 @@ GEM
276
276
  faraday (>= 0.7.4, < 1.0)
277
277
  fauxhai (6.10.0)
278
278
  net-ssh
279
- ffi (1.9.25)
280
- ffi (1.9.25-x64-mingw32)
281
- ffi (1.9.25-x86-mingw32)
279
+ ffi (1.10.0)
280
+ ffi (1.10.0-x64-mingw32)
281
+ ffi (1.10.0-x86-mingw32)
282
282
  ffi-libarchive (0.4.6)
283
283
  ffi (~> 1.0)
284
- ffi-rzmq (2.0.6)
285
- ffi-rzmq-core (>= 1.0.6)
286
- ffi-rzmq-core (1.0.6)
284
+ ffi-rzmq (2.0.7)
285
+ ffi-rzmq-core (>= 1.0.7)
286
+ ffi-rzmq-core (1.0.7)
287
287
  ffi
288
288
  ffi-win32-extensions (1.0.3)
289
289
  ffi
@@ -310,7 +310,7 @@ GEM
310
310
  fog-json (1.2.0)
311
311
  fog-core
312
312
  multi_json (~> 1.10)
313
- fog-openstack (0.3.9)
313
+ fog-openstack (0.3.10)
314
314
  fog-core (>= 1.45, <= 2.1.0)
315
315
  fog-json (>= 1.0)
316
316
  ipaddress (>= 0.8)
@@ -387,12 +387,12 @@ GEM
387
387
  http-form_data (1.0.3)
388
388
  http_parser.rb (0.6.0)
389
389
  httpclient (2.8.3)
390
- i18n (1.3.0)
390
+ i18n (1.5.3)
391
391
  concurrent-ruby (~> 1.0)
392
392
  ice_nine (0.11.2)
393
393
  inifile (3.0.0)
394
394
  iniparse (1.4.4)
395
- inspec (3.2.6)
395
+ inspec (3.4.1)
396
396
  addressable (~> 2.4)
397
397
  faraday (>= 0.9.0)
398
398
  faraday_middleware (~> 0.12.2)
@@ -413,7 +413,7 @@ GEM
413
413
  term-ansicolor
414
414
  thor (~> 0.20)
415
415
  tomlrb (~> 1.2)
416
- train (~> 1.5, >= 1.6.3)
416
+ train (~> 1.5, >= 1.7.0)
417
417
  tty-prompt (~> 0.17)
418
418
  tty-table (~> 0.10)
419
419
  ipaddress (0.8.3)
@@ -422,7 +422,7 @@ GEM
422
422
  json (2.1.0)
423
423
  jwt (2.1.0)
424
424
  kartograph (0.2.7)
425
- kitchen-azurerm (0.14.7)
425
+ kitchen-azurerm (0.14.8)
426
426
  azure_mgmt_network (~> 0.18, >= 0.18.2)
427
427
  azure_mgmt_resources (~> 0.17, >= 0.17.2)
428
428
  inifile (~> 3.0, >= 3.0.0)
@@ -446,11 +446,11 @@ GEM
446
446
  test-kitchen
447
447
  kitchen-hyperv (0.5.2)
448
448
  test-kitchen (~> 1.4)
449
- kitchen-inspec (0.25.0)
449
+ kitchen-inspec (1.0.1)
450
450
  hashie (~> 3.4)
451
- inspec (>= 0.34.0, < 4.0.0)
451
+ inspec (>= 1.47.0, < 4.0.0)
452
452
  test-kitchen (~> 1.6)
453
- kitchen-vagrant (1.3.6)
453
+ kitchen-vagrant (1.4.0)
454
454
  test-kitchen (~> 1.4)
455
455
  knife-acl (1.0.3)
456
456
  knife-cloud (1.2.3)
@@ -472,7 +472,7 @@ GEM
472
472
  chef (>= 11.0.0)
473
473
  diffy (>= 3.0.1)
474
474
  git (>= 1.2.5)
475
- knife-tidy (1.2.0)
475
+ knife-tidy (2.0.0)
476
476
  knife-vsphere (2.1.1)
477
477
  chef-vault (>= 2.6.0)
478
478
  filesize (~> 0.1.1)
@@ -500,7 +500,7 @@ GEM
500
500
  mime-types-data (~> 3.2015)
501
501
  mime-types-data (3.2018.0812)
502
502
  mini_portile2 (2.4.0)
503
- minitar (0.7)
503
+ minitar (0.8)
504
504
  minitest (5.10.3)
505
505
  mixlib-archive (0.4.19)
506
506
  mixlib-log
@@ -547,11 +547,11 @@ GEM
547
547
  net-ssh-gateway (>= 1.2.0)
548
548
  net-telnet (0.1.1)
549
549
  netaddr (1.5.1)
550
- nokogiri (1.9.1)
550
+ nokogiri (1.10.1)
551
551
  mini_portile2 (~> 2.4.0)
552
- nokogiri (1.9.1-x64-mingw32)
552
+ nokogiri (1.10.1-x64-mingw32)
553
553
  mini_portile2 (~> 2.4.0)
554
- nokogiri (1.9.1-x86-mingw32)
554
+ nokogiri (1.10.1-x86-mingw32)
555
555
  mini_portile2 (~> 2.4.0)
556
556
  nori (2.6.0)
557
557
  notiffany (0.1.1)
@@ -578,8 +578,8 @@ GEM
578
578
  uuidtools
579
579
  os (1.0.0)
580
580
  paint (1.0.1)
581
- parallel (1.12.1)
582
- parser (2.5.3.0)
581
+ parallel (1.13.0)
582
+ parser (2.6.0.0)
583
583
  ast (~> 2.4.0)
584
584
  parslet (1.8.2)
585
585
  pastel (0.7.2)
@@ -680,14 +680,14 @@ GEM
680
680
  solve (4.0.2)
681
681
  molinillo (~> 0.6)
682
682
  semverse (>= 1.1, < 4.0)
683
- specinfra (2.76.5)
683
+ specinfra (2.76.9)
684
684
  net-scp
685
685
  net-ssh (>= 2.7)
686
686
  net-telnet (= 0.1.1)
687
687
  sfl
688
688
  sshkey (1.9.0)
689
- sslshake (1.2.0)
690
- stove (7.0.1)
689
+ sslshake (1.3.0)
690
+ stove (7.1.0)
691
691
  chef-api (~> 0.5)
692
692
  logify (~> 0.2)
693
693
  strings (0.1.4)
@@ -698,7 +698,7 @@ GEM
698
698
  structured_warnings (0.3.0)
699
699
  syslog-logger (1.6.8)
700
700
  systemu (2.6.5)
701
- term-ansicolor (1.7.0)
701
+ term-ansicolor (1.7.1)
702
702
  tins (~> 1.0)
703
703
  test-kitchen (1.24.0)
704
704
  mixlib-install (~> 3.6)
@@ -713,12 +713,12 @@ GEM
713
713
  thor (0.20.3)
714
714
  thread_safe (0.3.6)
715
715
  timeliness (0.3.8)
716
- timers (4.2.0)
716
+ timers (4.3.0)
717
717
  tins (1.20.2)
718
718
  toml-rb (1.1.2)
719
719
  citrus (~> 3.0, > 3.0)
720
720
  tomlrb (1.2.8)
721
- train (1.6.3)
721
+ train (1.7.1)
722
722
  aws-sdk (~> 2)
723
723
  azure_graph_rbac (~> 0.16)
724
724
  azure_mgmt_key_vault (~> 0.17)
@@ -728,7 +728,7 @@ GEM
728
728
  googleauth (~> 0.6.6)
729
729
  inifile
730
730
  json (>= 1.8, < 3.0)
731
- mixlib-shellout (~> 2.0)
731
+ mixlib-shellout (>= 2.0)
732
732
  net-scp (~> 1.2)
733
733
  net-ssh (>= 2.9, < 6.0)
734
734
  winrm (~> 2.0)
@@ -738,7 +738,7 @@ GEM
738
738
  trollop (2.9.9)
739
739
  tty-color (0.4.3)
740
740
  tty-cursor (0.6.0)
741
- tty-prompt (0.18.0)
741
+ tty-prompt (0.18.1)
742
742
  necromancer (~> 0.4.0)
743
743
  pastel (~> 0.7.0)
744
744
  timers (~> 4.0)
@@ -775,7 +775,7 @@ GEM
775
775
  descendants_tracker (~> 0.0, >= 0.0.3)
776
776
  equalizer (~> 0.0, >= 0.0.9)
777
777
  win32-api (1.5.3-universal-mingw32)
778
- win32-certstore (0.1.11)
778
+ win32-certstore (0.2.3)
779
779
  ffi
780
780
  mixlib-shellout
781
781
  win32-dir (0.5.1)
@@ -795,7 +795,7 @@ GEM
795
795
  win32-service (1.0.1)
796
796
  ffi
797
797
  ffi-win32-extensions
798
- win32-taskscheduler (2.0.1)
798
+ win32-taskscheduler (2.0.4)
799
799
  ffi
800
800
  structured_warnings
801
801
  windows-api (0.4.4)
@@ -821,9 +821,9 @@ GEM
821
821
  rubyzip (~> 1.1)
822
822
  winrm (~> 2.0)
823
823
  wisper (2.0.0)
824
- wmi-lite (1.0.1)
824
+ wmi-lite (1.0.2)
825
825
  xmlrpc (0.3.0)
826
- yard (0.9.16)
826
+ yard (0.9.18)
827
827
 
828
828
  PLATFORMS
829
829
  ruby
@@ -835,7 +835,7 @@ DEPENDENCIES
835
835
  artifactory
836
836
  berkshelf (>= 7.0.5)
837
837
  bundler
838
- chef (= 14.8.12)
838
+ chef (= 14.10.9)
839
839
  chef-apply
840
840
  chef-dk!
841
841
  chef-provisioning (>= 2.7.1)
@@ -846,7 +846,7 @@ DEPENDENCIES
846
846
  cheffish (>= 14.0.1)
847
847
  chefspec (>= 7.3.0)
848
848
  chefstyle
849
- cookstyle (>= 2.0.0)
849
+ cookstyle (~> 3.0)
850
850
  cucumber
851
851
  dco
852
852
  dep-selector-libgecode
@@ -912,4 +912,4 @@ DEPENDENCIES
912
912
  yard
913
913
 
914
914
  BUNDLED WITH
915
- 1.17.2
915
+ 1.17.3
data/Rakefile CHANGED
@@ -15,8 +15,12 @@
15
15
  # limitations under the License.
16
16
  #
17
17
 
18
- require_relative "tasks/dependencies"
19
- require_relative "tasks/announce"
18
+ begin
19
+ require_relative "tasks/dependencies"
20
+ require_relative "tasks/announce"
21
+ rescue LoadError
22
+ puts "Additional rake tasks not found. If you require these rake tasks run Rake from the git repo not the installation files!"
23
+ end
20
24
 
21
25
  namespace :style do
22
26
  begin
data/chef-dk.gemspec CHANGED
@@ -34,9 +34,9 @@ Gem::Specification.new do |gem|
34
34
  gem.files = %w{Rakefile LICENSE warning.txt} +
35
35
  Dir.glob("Gemfile*") + # Includes Gemfile and locks
36
36
  Dir.glob("*.gemspec") +
37
- Dir.glob("{lib,spec,acceptance,tasks}/**/*", File::FNM_DOTMATCH).reject { |f| File.directory?(f) }
37
+ Dir.glob("{lib,spec}/**/*", File::FNM_DOTMATCH).reject { |f| File.directory?(f) }
38
38
  gem.executables = %w{ chef }
39
- gem.test_files = gem.files.grep(%r{^(test|spec|features)/})
39
+ gem.test_files = gem.files.grep(%r{^spec/})
40
40
  gem.require_paths = ["lib"]
41
41
 
42
42
  gem.add_dependency "mixlib-cli", "~> 1.7"
data/lib/chef-dk/cli.rb CHANGED
@@ -36,7 +36,7 @@ module ChefDK
36
36
  chef -h/--help
37
37
  chef -v/--version
38
38
  chef command [arguments...] [options...]
39
- BANNER
39
+ BANNER
40
40
 
41
41
  option :version,
42
42
  short: "-v",
data/lib/chef-dk/command/clean_policy_cookbooks.rb CHANGED
@@ -40,7 +40,7 @@ module ChefDK
40
40
 
41
41
  Options:
42
42
 
43
- BANNER
43
+ BANNER
44
44
 
45
45
  option :config_file,
46
46
  short: "-c CONFIG_FILE",
data/lib/chef-dk/command/clean_policy_revisions.rb CHANGED
@@ -39,7 +39,7 @@ module ChefDK
39
39
 
40
40
  Options:
41
41
 
42
- BANNER
42
+ BANNER
43
43
 
44
44
  option :config_file,
45
45
  short: "-c CONFIG_FILE",
data/lib/chef-dk/command/delete_policy.rb CHANGED
@@ -39,7 +39,7 @@ module ChefDK
39
39
 
40
40
  Options:
41
41
 
42
- BANNER
42
+ BANNER
43
43
 
44
44
  option :config_file,
45
45
  short: "-c CONFIG_FILE",
data/lib/chef-dk/command/delete_policy_group.rb CHANGED
@@ -39,7 +39,7 @@ module ChefDK
39
39
 
40
40
  Options:
41
41
 
42
- BANNER
42
+ BANNER
43
43
 
44
44
  option :config_file,
45
45
  short: "-c CONFIG_FILE",