chef-dk 0.14.25 → 0.15.9

Sign up to get free protection for your applications and to get access to all the features.
Files changed (328) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +15 -12
  3. data/Gemfile.lock +56 -82
  4. data/LICENSE +201 -201
  5. data/acceptance/.shared/kitchen_acceptance/.kitchen.digitalocean.yml +27 -27
  6. data/acceptance/.shared/kitchen_acceptance/.kitchen.ec2.yml +288 -288
  7. data/acceptance/.shared/kitchen_acceptance/.kitchen.vagrant.yml +52 -52
  8. data/acceptance/.shared/kitchen_acceptance/libraries/kitchen.rb +51 -51
  9. data/acceptance/.shared/kitchen_acceptance/metadata.rb +1 -1
  10. data/acceptance/Gemfile.lock +18 -21
  11. data/acceptance/README.md +132 -132
  12. data/acceptance/trivial/.acceptance/acceptance-cookbook/.gitignore +2 -2
  13. data/acceptance/trivial/.acceptance/acceptance-cookbook/metadata.rb +2 -2
  14. data/acceptance/trivial/.acceptance/acceptance-cookbook/recipes/destroy.rb +1 -1
  15. data/acceptance/trivial/.acceptance/acceptance-cookbook/recipes/provision.rb +1 -1
  16. data/acceptance/trivial/.acceptance/acceptance-cookbook/recipes/verify.rb +1 -1
  17. data/acceptance/trivial/.kitchen.yml +7 -7
  18. data/acceptance/trivial/test/integration/chefdk-current-install/inspec/chef_client_spec.rb +5 -5
  19. data/bin/chef +25 -25
  20. data/chef-dk.gemspec +1 -0
  21. data/lib/chef-dk.rb +19 -19
  22. data/lib/chef-dk/authenticated_http.rb +40 -40
  23. data/lib/chef-dk/chef_runner.rb +1 -1
  24. data/lib/chef-dk/cli.rb +2 -2
  25. data/lib/chef-dk/command/base.rb +79 -79
  26. data/lib/chef-dk/command/clean_policy_cookbooks.rb +116 -116
  27. data/lib/chef-dk/command/clean_policy_revisions.rb +113 -113
  28. data/lib/chef-dk/command/delete_policy.rb +122 -122
  29. data/lib/chef-dk/command/delete_policy_group.rb +122 -122
  30. data/lib/chef-dk/command/diff.rb +316 -316
  31. data/lib/chef-dk/command/env.rb +90 -90
  32. data/lib/chef-dk/command/exec.rb +45 -45
  33. data/lib/chef-dk/command/export.rb +2 -2
  34. data/lib/chef-dk/command/gem.rb +47 -47
  35. data/lib/chef-dk/command/generate.rb +2 -0
  36. data/lib/chef-dk/command/generator_commands/app.rb +107 -107
  37. data/lib/chef-dk/command/generator_commands/attribute.rb +37 -37
  38. data/lib/chef-dk/command/generator_commands/base.rb +148 -148
  39. data/lib/chef-dk/command/generator_commands/build_cookbook.rb +110 -0
  40. data/lib/chef-dk/command/generator_commands/cookbook.rb +21 -0
  41. data/lib/chef-dk/command/generator_commands/cookbook_code_file.rb +100 -100
  42. data/lib/chef-dk/command/generator_commands/cookbook_file.rb +45 -45
  43. data/lib/chef-dk/command/generator_commands/generator_generator.rb +177 -177
  44. data/lib/chef-dk/command/generator_commands/lwrp.rb +36 -36
  45. data/lib/chef-dk/command/generator_commands/policyfile.rb +127 -127
  46. data/lib/chef-dk/command/generator_commands/recipe.rb +36 -36
  47. data/lib/chef-dk/command/generator_commands/repo.rb +125 -125
  48. data/lib/chef-dk/command/generator_commands/template.rb +46 -46
  49. data/lib/chef-dk/command/install.rb +121 -121
  50. data/lib/chef-dk/command/provision.rb +438 -438
  51. data/lib/chef-dk/command/push.rb +118 -118
  52. data/lib/chef-dk/command/push_archive.rb +126 -126
  53. data/lib/chef-dk/command/shell_init.rb +180 -180
  54. data/lib/chef-dk/command/show_policy.rb +165 -165
  55. data/lib/chef-dk/command/undelete.rb +155 -155
  56. data/lib/chef-dk/command/update.rb +148 -148
  57. data/lib/chef-dk/command/verify.rb +9 -11
  58. data/lib/chef-dk/completions/bash.sh.erb +5 -5
  59. data/lib/chef-dk/completions/chef.fish.erb +10 -10
  60. data/lib/chef-dk/completions/zsh.zsh.erb +21 -21
  61. data/lib/chef-dk/configurable.rb +69 -69
  62. data/lib/chef-dk/cookbook_metadata.rb +45 -45
  63. data/lib/chef-dk/cookbook_omnifetch.rb +32 -32
  64. data/lib/chef-dk/cookbook_profiler/git.rb +151 -151
  65. data/lib/chef-dk/cookbook_profiler/identifiers.rb +72 -72
  66. data/lib/chef-dk/cookbook_profiler/null_scm.rb +32 -32
  67. data/lib/chef-dk/exceptions.rb +129 -129
  68. data/lib/chef-dk/helpers.rb +24 -17
  69. data/lib/chef-dk/pager.rb +106 -106
  70. data/lib/chef-dk/policyfile/chef_repo_cookbook_source.rb +138 -138
  71. data/lib/chef-dk/policyfile/chef_server_cookbook_source.rb +54 -54
  72. data/lib/chef-dk/policyfile/community_cookbook_source.rb +97 -97
  73. data/lib/chef-dk/policyfile/comparison_base.rb +124 -124
  74. data/lib/chef-dk/policyfile/cookbook_location_specification.rb +154 -154
  75. data/lib/chef-dk/policyfile/cookbook_locks.rb +466 -466
  76. data/lib/chef-dk/policyfile/cookbook_sources.rb +22 -22
  77. data/lib/chef-dk/policyfile/delivery_supermarket_source.rb +90 -90
  78. data/lib/chef-dk/policyfile/differ.rb +266 -266
  79. data/lib/chef-dk/policyfile/dsl.rb +261 -261
  80. data/lib/chef-dk/policyfile/lister.rb +232 -232
  81. data/lib/chef-dk/policyfile/null_cookbook_source.rb +45 -45
  82. data/lib/chef-dk/policyfile/read_cookbook_for_compat_mode_upload.rb +124 -124
  83. data/lib/chef-dk/policyfile/reports/install.rb +70 -70
  84. data/lib/chef-dk/policyfile/reports/table_printer.rb +58 -58
  85. data/lib/chef-dk/policyfile/reports/upload.rb +70 -70
  86. data/lib/chef-dk/policyfile/solution_dependencies.rb +298 -298
  87. data/lib/chef-dk/policyfile/storage_config.rb +100 -100
  88. data/lib/chef-dk/policyfile/undo_record.rb +142 -142
  89. data/lib/chef-dk/policyfile/undo_stack.rb +130 -130
  90. data/lib/chef-dk/policyfile/uploader.rb +213 -213
  91. data/lib/chef-dk/policyfile_compiler.rb +419 -419
  92. data/lib/chef-dk/policyfile_lock.rb +552 -552
  93. data/lib/chef-dk/policyfile_services/clean_policies.rb +95 -95
  94. data/lib/chef-dk/policyfile_services/clean_policy_cookbooks.rb +125 -125
  95. data/lib/chef-dk/policyfile_services/export_repo.rb +421 -421
  96. data/lib/chef-dk/policyfile_services/install.rb +126 -126
  97. data/lib/chef-dk/policyfile_services/push_archive.rb +204 -204
  98. data/lib/chef-dk/policyfile_services/rm_policy.rb +142 -142
  99. data/lib/chef-dk/policyfile_services/rm_policy_group.rb +86 -86
  100. data/lib/chef-dk/policyfile_services/show_policy.rb +237 -237
  101. data/lib/chef-dk/policyfile_services/undelete.rb +108 -108
  102. data/lib/chef-dk/policyfile_services/update_attributes.rb +104 -104
  103. data/lib/chef-dk/service_exception_inspectors.rb +25 -25
  104. data/lib/chef-dk/service_exception_inspectors/base.rb +40 -40
  105. data/lib/chef-dk/service_exception_inspectors/http.rb +121 -121
  106. data/lib/chef-dk/service_exceptions.rb +143 -143
  107. data/lib/chef-dk/shell_out.rb +36 -36
  108. data/lib/chef-dk/skeletons/code_generator/files/default/Berksfile +3 -3
  109. data/lib/chef-dk/skeletons/code_generator/files/default/build-cookbook/.kitchen.yml +21 -0
  110. data/lib/chef-dk/skeletons/code_generator/files/default/build-cookbook/README.md +146 -0
  111. data/lib/chef-dk/skeletons/code_generator/files/default/build-cookbook/test-fixture-recipe.rb +7 -0
  112. data/lib/chef-dk/skeletons/code_generator/files/default/chefignore +102 -102
  113. data/lib/chef-dk/skeletons/code_generator/files/default/cookbook_readmes/README-policy.md +9 -9
  114. data/lib/chef-dk/skeletons/code_generator/files/default/cookbook_readmes/README.md +54 -54
  115. data/lib/chef-dk/skeletons/code_generator/files/default/delivery-config.json +10 -0
  116. data/lib/chef-dk/skeletons/code_generator/files/default/gitignore +16 -16
  117. data/lib/chef-dk/skeletons/code_generator/files/default/repo/README.md +28 -28
  118. data/lib/chef-dk/skeletons/code_generator/files/default/repo/cookbooks/example/README.md +27 -27
  119. data/lib/chef-dk/skeletons/code_generator/files/default/repo/cookbooks/example/attributes/default.rb +7 -7
  120. data/lib/chef-dk/skeletons/code_generator/files/default/repo/cookbooks/example/metadata.rb +3 -3
  121. data/lib/chef-dk/skeletons/code_generator/files/default/repo/cookbooks/example/recipes/default.rb +8 -8
  122. data/lib/chef-dk/skeletons/code_generator/files/default/repo/data_bags/README.md +58 -58
  123. data/lib/chef-dk/skeletons/code_generator/files/default/repo/data_bags/example/example_item.json +3 -3
  124. data/lib/chef-dk/skeletons/code_generator/files/default/repo/dot-chef-repo.txt +6 -6
  125. data/lib/chef-dk/skeletons/code_generator/files/default/repo/environments/README.md +9 -9
  126. data/lib/chef-dk/skeletons/code_generator/files/default/repo/environments/example.json +12 -12
  127. data/lib/chef-dk/skeletons/code_generator/files/default/repo/policies/README.md +24 -24
  128. data/lib/chef-dk/skeletons/code_generator/files/default/repo/roles/README.md +9 -9
  129. data/lib/chef-dk/skeletons/code_generator/files/default/repo/roles/example.json +12 -12
  130. data/lib/chef-dk/skeletons/code_generator/files/default/serverspec_spec_helper.rb +8 -8
  131. data/lib/chef-dk/skeletons/code_generator/files/default/spec_helper.rb +2 -2
  132. data/lib/chef-dk/skeletons/code_generator/files/default/spec_helper_policyfile.rb +2 -2
  133. data/lib/chef-dk/skeletons/code_generator/metadata.rb +8 -8
  134. data/lib/chef-dk/skeletons/code_generator/recipes/app.rb +97 -97
  135. data/lib/chef-dk/skeletons/code_generator/recipes/attribute.rb +12 -12
  136. data/lib/chef-dk/skeletons/code_generator/recipes/build_cookbook.rb +88 -0
  137. data/lib/chef-dk/skeletons/code_generator/recipes/cookbook.rb +6 -0
  138. data/lib/chef-dk/skeletons/code_generator/recipes/cookbook_file.rb +24 -24
  139. data/lib/chef-dk/skeletons/code_generator/recipes/lwrp.rb +23 -23
  140. data/lib/chef-dk/skeletons/code_generator/recipes/policyfile.rb +8 -8
  141. data/lib/chef-dk/skeletons/code_generator/recipes/recipe.rb +27 -27
  142. data/lib/chef-dk/skeletons/code_generator/recipes/repo.rb +67 -67
  143. data/lib/chef-dk/skeletons/code_generator/recipes/template.rb +32 -32
  144. data/lib/chef-dk/skeletons/code_generator/templates/default/LICENSE.all_rights.erb +3 -3
  145. data/lib/chef-dk/skeletons/code_generator/templates/default/LICENSE.gplv2.erb +339 -339
  146. data/lib/chef-dk/skeletons/code_generator/templates/default/LICENSE.gplv3.erb +674 -674
  147. data/lib/chef-dk/skeletons/code_generator/templates/default/LICENSE.mit.erb +21 -21
  148. data/lib/chef-dk/skeletons/code_generator/templates/default/Policyfile.rb.erb +25 -25
  149. data/lib/chef-dk/skeletons/code_generator/templates/default/README.md.erb +4 -4
  150. data/lib/chef-dk/skeletons/code_generator/templates/default/build-cookbook/Berksfile.erb +20 -0
  151. data/lib/chef-dk/skeletons/code_generator/templates/default/build-cookbook/metadata.rb.erb +9 -0
  152. data/lib/chef-dk/skeletons/code_generator/templates/default/build-cookbook/recipe.rb.erb +8 -0
  153. data/lib/chef-dk/skeletons/code_generator/templates/default/kitchen.yml.erb +3 -2
  154. data/lib/chef-dk/skeletons/code_generator/templates/default/kitchen_policyfile.yml.erb +3 -2
  155. data/lib/chef-dk/skeletons/code_generator/templates/default/metadata.rb.erb +7 -7
  156. data/lib/chef-dk/skeletons/code_generator/templates/default/recipe.rb.erb +5 -5
  157. data/lib/chef-dk/skeletons/code_generator/templates/default/recipe_spec.rb.erb +20 -20
  158. data/lib/chef-dk/skeletons/code_generator/templates/default/repo/gitignore.erb +11 -11
  159. data/lib/chef-dk/skeletons/code_generator/templates/default/serverspec_default_spec.rb.erb +9 -9
  160. data/lib/chef-dk/ui.rb +58 -58
  161. data/lib/chef-dk/version.rb +1 -1
  162. data/lib/kitchen/provisioner/policyfile_zero.rb +195 -195
  163. data/omnibus_overrides.rb +2 -1
  164. data/spec/shared/a_file_generator.rb +125 -125
  165. data/spec/shared/a_generated_file.rb +12 -12
  166. data/spec/shared/command_with_ui_object.rb +11 -11
  167. data/spec/shared/fixture_cookbook_checksums.rb +47 -47
  168. data/spec/shared/setup_git_cookbooks.rb +53 -53
  169. data/spec/spec_helper.rb +51 -51
  170. data/spec/test_helpers.rb +84 -84
  171. data/spec/unit/chef_runner_spec.rb +1 -1
  172. data/spec/unit/cli_spec.rb +23 -6
  173. data/spec/unit/command/clean_policy_cookbooks_spec.rb +181 -181
  174. data/spec/unit/command/clean_policy_revisions_spec.rb +181 -181
  175. data/spec/unit/command/delete_policy_group_spec.rb +207 -207
  176. data/spec/unit/command/delete_policy_spec.rb +207 -207
  177. data/spec/unit/command/diff_spec.rb +312 -312
  178. data/spec/unit/command/env_spec.rb +52 -52
  179. data/spec/unit/command/exec_spec.rb +179 -179
  180. data/spec/unit/command/export_spec.rb +200 -200
  181. data/spec/unit/command/generate_spec.rb +142 -142
  182. data/spec/unit/command/generator_commands/app_spec.rb +169 -169
  183. data/spec/unit/command/generator_commands/attribute_spec.rb +32 -32
  184. data/spec/unit/command/generator_commands/base_spec.rb +136 -136
  185. data/spec/unit/command/generator_commands/build_cookbook_spec.rb +309 -0
  186. data/spec/unit/command/generator_commands/cookbook_file_spec.rb +32 -32
  187. data/spec/unit/command/generator_commands/cookbook_spec.rb +98 -4
  188. data/spec/unit/command/generator_commands/generator_generator_spec.rb +229 -229
  189. data/spec/unit/command/generator_commands/lwrp_spec.rb +32 -32
  190. data/spec/unit/command/generator_commands/policyfile_spec.rb +225 -225
  191. data/spec/unit/command/generator_commands/recipe_spec.rb +34 -34
  192. data/spec/unit/command/generator_commands/template_spec.rb +32 -32
  193. data/spec/unit/command/install_spec.rb +179 -179
  194. data/spec/unit/command/provision_spec.rb +592 -592
  195. data/spec/unit/command/push_archive_spec.rb +153 -153
  196. data/spec/unit/command/push_spec.rb +199 -199
  197. data/spec/unit/command/shell_init_spec.rb +329 -329
  198. data/spec/unit/command/show_policy_spec.rb +235 -235
  199. data/spec/unit/command/undelete_spec.rb +246 -246
  200. data/spec/unit/command/update_spec.rb +275 -275
  201. data/spec/unit/command/verify_spec.rb +1 -3
  202. data/spec/unit/commands_map_spec.rb +57 -57
  203. data/spec/unit/configurable_spec.rb +41 -41
  204. data/spec/unit/cookbook_metadata_spec.rb +98 -98
  205. data/spec/unit/cookbook_profiler/git_spec.rb +176 -176
  206. data/spec/unit/cookbook_profiler/identifiers_spec.rb +83 -83
  207. data/spec/unit/fixtures/chef-runner-cookbooks/test_cookbook/recipes/recipe_one.rb +9 -9
  208. data/spec/unit/fixtures/chef-runner-cookbooks/test_cookbook/recipes/recipe_two.rb +9 -9
  209. data/spec/unit/fixtures/command/cli_test_command.rb +26 -26
  210. data/spec/unit/fixtures/command/explicit_path_example.rb +7 -7
  211. data/spec/unit/fixtures/configurable/test_config_loader.rb +5 -5
  212. data/spec/unit/fixtures/configurable/test_configurable.rb +10 -10
  213. data/spec/unit/fixtures/cookbook_cache/baz-f59ee7a5bca6a4e606b67f7f856b768d847c39bb/.kitchen.yml +16 -16
  214. data/spec/unit/fixtures/cookbook_cache/baz-f59ee7a5bca6a4e606b67f7f856b768d847c39bb/Berksfile +3 -3
  215. data/spec/unit/fixtures/cookbook_cache/baz-f59ee7a5bca6a4e606b67f7f856b768d847c39bb/README.md +4 -4
  216. data/spec/unit/fixtures/cookbook_cache/baz-f59ee7a5bca6a4e606b67f7f856b768d847c39bb/chefignore +96 -96
  217. data/spec/unit/fixtures/cookbook_cache/baz-f59ee7a5bca6a4e606b67f7f856b768d847c39bb/metadata.rb +8 -8
  218. data/spec/unit/fixtures/cookbook_cache/baz-f59ee7a5bca6a4e606b67f7f856b768d847c39bb/recipes/default.rb +8 -8
  219. data/spec/unit/fixtures/cookbook_cache/dep_of_bar-1.2.3/.kitchen.yml +16 -16
  220. data/spec/unit/fixtures/cookbook_cache/dep_of_bar-1.2.3/Berksfile +3 -3
  221. data/spec/unit/fixtures/cookbook_cache/dep_of_bar-1.2.3/README.md +4 -4
  222. data/spec/unit/fixtures/cookbook_cache/dep_of_bar-1.2.3/chefignore +96 -96
  223. data/spec/unit/fixtures/cookbook_cache/dep_of_bar-1.2.3/metadata.rb +8 -8
  224. data/spec/unit/fixtures/cookbook_cache/dep_of_bar-1.2.3/recipes/default.rb +8 -8
  225. data/spec/unit/fixtures/cookbook_cache/foo-1.0.0/.kitchen.yml +16 -16
  226. data/spec/unit/fixtures/cookbook_cache/foo-1.0.0/Berksfile +3 -3
  227. data/spec/unit/fixtures/cookbook_cache/foo-1.0.0/README.md +4 -4
  228. data/spec/unit/fixtures/cookbook_cache/foo-1.0.0/chefignore +96 -96
  229. data/spec/unit/fixtures/cookbook_cache/foo-1.0.0/metadata.rb +8 -8
  230. data/spec/unit/fixtures/cookbook_cache/foo-1.0.0/recipes/default.rb +8 -8
  231. data/spec/unit/fixtures/cookbooks_api/pruned_small_universe.json +1321 -1321
  232. data/spec/unit/fixtures/cookbooks_api/small_universe.json +2987 -2987
  233. data/spec/unit/fixtures/cookbooks_api/universe.json +1 -1
  234. data/spec/unit/fixtures/cookbooks_api/update_fixtures.rb +36 -36
  235. data/spec/unit/fixtures/dev_cookbooks/README.md +16 -16
  236. data/spec/unit/fixtures/eg_omnibus_dir/valid/embedded/apps/berkshelf/integration_test +2 -2
  237. data/spec/unit/fixtures/eg_omnibus_dir/valid/embedded/apps/berkshelf/verify_me +5 -5
  238. data/spec/unit/fixtures/eg_omnibus_dir/valid/embedded/apps/chef/verify_me +3 -3
  239. data/spec/unit/fixtures/eg_omnibus_dir/valid/embedded/apps/test-kitchen/verify_me +2 -2
  240. data/spec/unit/fixtures/example_cookbook/.gitignore +17 -17
  241. data/spec/unit/fixtures/example_cookbook/.kitchen.yml +16 -16
  242. data/spec/unit/fixtures/example_cookbook/Berksfile +3 -3
  243. data/spec/unit/fixtures/example_cookbook/README.md +4 -4
  244. data/spec/unit/fixtures/example_cookbook/chefignore +96 -96
  245. data/spec/unit/fixtures/example_cookbook/metadata.rb +8 -8
  246. data/spec/unit/fixtures/example_cookbook/recipes/default.rb +8 -8
  247. data/spec/unit/fixtures/example_cookbook_metadata_json_only/.gitignore +17 -17
  248. data/spec/unit/fixtures/example_cookbook_metadata_json_only/.kitchen.yml +16 -16
  249. data/spec/unit/fixtures/example_cookbook_metadata_json_only/Berksfile +3 -3
  250. data/spec/unit/fixtures/example_cookbook_metadata_json_only/README.md +4 -4
  251. data/spec/unit/fixtures/example_cookbook_metadata_json_only/chefignore +96 -96
  252. data/spec/unit/fixtures/example_cookbook_metadata_json_only/metadata.json +5 -5
  253. data/spec/unit/fixtures/example_cookbook_metadata_json_only/recipes/default.rb +8 -8
  254. data/spec/unit/fixtures/example_cookbook_no_metadata/.gitignore +17 -17
  255. data/spec/unit/fixtures/example_cookbook_no_metadata/.kitchen.yml +16 -16
  256. data/spec/unit/fixtures/example_cookbook_no_metadata/Berksfile +3 -3
  257. data/spec/unit/fixtures/example_cookbook_no_metadata/README.md +4 -4
  258. data/spec/unit/fixtures/example_cookbook_no_metadata/chefignore +96 -96
  259. data/spec/unit/fixtures/example_cookbook_no_metadata/recipes/default.rb +8 -8
  260. data/spec/unit/fixtures/local_path_cookbooks/another-local-cookbook/README.md +4 -4
  261. data/spec/unit/fixtures/local_path_cookbooks/another-local-cookbook/chefignore +96 -96
  262. data/spec/unit/fixtures/local_path_cookbooks/another-local-cookbook/metadata.rb +8 -8
  263. data/spec/unit/fixtures/local_path_cookbooks/another-local-cookbook/recipes/default.rb +8 -8
  264. data/spec/unit/fixtures/local_path_cookbooks/cookbook-with-a-dep/Berksfile +3 -3
  265. data/spec/unit/fixtures/local_path_cookbooks/cookbook-with-a-dep/README.md +4 -4
  266. data/spec/unit/fixtures/local_path_cookbooks/cookbook-with-a-dep/chefignore +96 -96
  267. data/spec/unit/fixtures/local_path_cookbooks/cookbook-with-a-dep/metadata.rb +9 -9
  268. data/spec/unit/fixtures/local_path_cookbooks/cookbook-with-a-dep/recipes/default.rb +8 -8
  269. data/spec/unit/fixtures/local_path_cookbooks/local-cookbook/.kitchen.yml +16 -16
  270. data/spec/unit/fixtures/local_path_cookbooks/local-cookbook/Berksfile +3 -3
  271. data/spec/unit/fixtures/local_path_cookbooks/local-cookbook/README.md +4 -4
  272. data/spec/unit/fixtures/local_path_cookbooks/local-cookbook/chefignore +96 -96
  273. data/spec/unit/fixtures/local_path_cookbooks/local-cookbook/metadata.rb +8 -8
  274. data/spec/unit/fixtures/local_path_cookbooks/local-cookbook/recipes/default.rb +8 -8
  275. data/spec/unit/fixtures/local_path_cookbooks/metadata-missing/README.md +2 -2
  276. data/spec/unit/fixtures/local_path_cookbooks/noignore-f59ee7a5bca6a4e606b67f7f856b768d847c39bb/.kitchen.yml +16 -16
  277. data/spec/unit/fixtures/local_path_cookbooks/noignore-f59ee7a5bca6a4e606b67f7f856b768d847c39bb/README.md +4 -4
  278. data/spec/unit/fixtures/local_path_cookbooks/noignore-f59ee7a5bca6a4e606b67f7f856b768d847c39bb/metadata.rb +8 -8
  279. data/spec/unit/fixtures/local_path_cookbooks/noignore-f59ee7a5bca6a4e606b67f7f856b768d847c39bb/recipes/default.rb +8 -8
  280. data/spec/unit/gemfile_util_spec.rb +41 -0
  281. data/spec/unit/helpers_spec.rb +19 -0
  282. data/spec/unit/pager_spec.rb +119 -119
  283. data/spec/unit/policyfile/chef_repo_cookbook_source_spec.rb +93 -93
  284. data/spec/unit/policyfile/chef_server_cookbook_source_spec.rb +34 -34
  285. data/spec/unit/policyfile/community_cookbook_source_spec.rb +84 -84
  286. data/spec/unit/policyfile/comparison_base_spec.rb +343 -343
  287. data/spec/unit/policyfile/cookbook_location_specification_spec.rb +277 -277
  288. data/spec/unit/policyfile/cookbook_locks_spec.rb +529 -529
  289. data/spec/unit/policyfile/delivery_supermarket_source_spec.rb +130 -130
  290. data/spec/unit/policyfile/differ_spec.rb +687 -687
  291. data/spec/unit/policyfile/lister_spec.rb +272 -272
  292. data/spec/unit/policyfile/null_cookbook_source_spec.rb +35 -35
  293. data/spec/unit/policyfile/read_cookbook_for_compat_mode_upload_spec.rb +92 -92
  294. data/spec/unit/policyfile/reports/install_spec.rb +115 -115
  295. data/spec/unit/policyfile/reports/upload_spec.rb +96 -96
  296. data/spec/unit/policyfile/solution_dependencies_spec.rb +145 -145
  297. data/spec/unit/policyfile/storage_config_spec.rb +172 -172
  298. data/spec/unit/policyfile/undo_record_spec.rb +260 -260
  299. data/spec/unit/policyfile/undo_stack_spec.rb +266 -266
  300. data/spec/unit/policyfile/uploader_spec.rb +410 -410
  301. data/spec/unit/policyfile_demands_spec.rb +1203 -1203
  302. data/spec/unit/policyfile_evaluation_spec.rb +642 -642
  303. data/spec/unit/policyfile_lock_build_spec.rb +1056 -1056
  304. data/spec/unit/policyfile_lock_install_spec.rb +138 -138
  305. data/spec/unit/policyfile_lock_serialization_spec.rb +425 -425
  306. data/spec/unit/policyfile_lock_validation_spec.rb +611 -611
  307. data/spec/unit/policyfile_services/clean_policies_spec.rb +236 -236
  308. data/spec/unit/policyfile_services/clean_policy_cookbooks_spec.rb +275 -275
  309. data/spec/unit/policyfile_services/export_repo_spec.rb +481 -481
  310. data/spec/unit/policyfile_services/install_spec.rb +211 -211
  311. data/spec/unit/policyfile_services/push_archive_spec.rb +378 -378
  312. data/spec/unit/policyfile_services/push_spec.rb +233 -233
  313. data/spec/unit/policyfile_services/rm_policy_group_spec.rb +241 -241
  314. data/spec/unit/policyfile_services/rm_policy_spec.rb +266 -266
  315. data/spec/unit/policyfile_services/show_policy_spec.rb +889 -889
  316. data/spec/unit/policyfile_services/undelete_spec.rb +304 -304
  317. data/spec/unit/policyfile_services/update_attributes_spec.rb +217 -217
  318. data/spec/unit/service_exception_inspectors/base_spec.rb +43 -43
  319. data/spec/unit/service_exception_inspectors/http_spec.rb +140 -140
  320. data/spec/unit/shell_out_spec.rb +34 -34
  321. data/tasks/bin/bundle-platform +6 -2
  322. data/tasks/bin/bundle-platform.bat +0 -0
  323. data/tasks/bin/create-override-gemfile +0 -0
  324. data/tasks/bundle_util.rb +18 -2
  325. data/tasks/gemfile_util.rb +53 -8
  326. data/version_policy.rb +9 -1
  327. data/warning.txt +9 -9
  328. metadata +30 -3
@@ -0,0 +1,309 @@
1
+ #
2
+ # Copyright:: Copyright (c) 2014 Chef Software Inc.
3
+ # License:: Apache License, Version 2.0
4
+ #
5
+ # Licensed under the Apache License, Version 2.0 (the "License");
6
+ # you may not use this file except in compliance with the License.
7
+ # You may obtain a copy of the License at
8
+ #
9
+ # http://www.apache.org/licenses/LICENSE-2.0
10
+ #
11
+ # Unless required by applicable law or agreed to in writing, software
12
+ # distributed under the License is distributed on an "AS IS" BASIS,
13
+ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14
+ # See the License for the specific language governing permissions and
15
+ # limitations under the License.
16
+ #
17
+
18
+ require 'spec_helper'
19
+ require 'shared/custom_generator_cookbook'
20
+ require 'chef-dk/command/generator_commands/build_cookbook'
21
+
22
+ describe ChefDK::Command::GeneratorCommands::BuildCookbook do
23
+
24
+ let(:argv) { %w[delivery_project] }
25
+
26
+ let(:stdout_io) { StringIO.new }
27
+ let(:stderr_io) { StringIO.new }
28
+
29
+ let(:expected_cookbook_file_relpaths) do
30
+ %w[
31
+ .kitchen.yml
32
+ data_bags
33
+ data_bags/keys
34
+ data_bags/keys/delivery_builder_keys.json
35
+ test
36
+ test/fixtures
37
+ test/fixtures/cookbooks
38
+ test/fixtures/cookbooks/test
39
+ test/fixtures/cookbooks/test/metadata.rb
40
+ test/fixtures/cookbooks/test/recipes
41
+ test/fixtures/cookbooks/test/recipes/default.rb
42
+ Berksfile
43
+ chefignore
44
+ metadata.rb
45
+ README.md
46
+ LICENSE
47
+ recipes
48
+ recipes/default.rb
49
+ recipes/deploy.rb
50
+ recipes/functional.rb
51
+ recipes/lint.rb
52
+ recipes/provision.rb
53
+ recipes/publish.rb
54
+ recipes/quality.rb
55
+ recipes/security.rb
56
+ recipes/smoke.rb
57
+ recipes/syntax.rb
58
+ recipes/unit.rb
59
+ secrets
60
+ secrets/fakey-mcfakerton
61
+ ]
62
+ end
63
+
64
+ let(:expected_cookbook_files) do
65
+ expected_cookbook_file_relpaths.map do |relpath|
66
+ File.join(tempdir, "delivery_project", ".delivery", "build-cookbook", relpath)
67
+ end
68
+ end
69
+
70
+ subject(:cookbook_generator) do
71
+ described_class.new(argv)
72
+ end
73
+
74
+ def generator_context
75
+ ChefDK::Generator.context
76
+ end
77
+
78
+ before do
79
+ ChefDK::Generator.reset
80
+ end
81
+
82
+ it "configures the chef runner" do
83
+ expect(cookbook_generator.chef_runner).to be_a(ChefDK::ChefRunner)
84
+ expect(cookbook_generator.chef_runner.cookbook_path).to eq(File.expand_path('lib/chef-dk/skeletons', project_root))
85
+ end
86
+
87
+ context "when given invalid/incomplete arguments" do
88
+
89
+ let(:expected_help_message) do
90
+ "Usage: chef generate build-cookbook NAME [options]\n"
91
+ end
92
+
93
+
94
+ def with_argv(argv)
95
+ generator = described_class.new(argv)
96
+ allow(generator).to receive(:stdout).and_return(stdout_io)
97
+ allow(generator).to receive(:stderr).and_return(stderr_io)
98
+ generator
99
+ end
100
+
101
+ it "prints usage when args are empty" do
102
+ with_argv([]).run
103
+ expect(stderr_io.string).to include(expected_help_message)
104
+ end
105
+
106
+ end
107
+
108
+ context "when given the name of the delivery project" do
109
+
110
+ let(:argv) { %w[delivery_project] }
111
+
112
+ let(:project_dir) { File.join(tempdir, "delivery_project") }
113
+
114
+ before do
115
+ reset_tempdir
116
+ Dir.mkdir(project_dir)
117
+ end
118
+
119
+ it "configures the generator context" do
120
+ cookbook_generator.read_and_validate_params
121
+ cookbook_generator.setup_context
122
+ expect(generator_context.delivery_project_dir).to eq(File.join(Dir.pwd, "delivery_project"))
123
+ end
124
+
125
+ it "creates a build cookbook" do
126
+ Dir.chdir(tempdir) do
127
+ allow(cookbook_generator.chef_runner).to receive(:stdout).and_return(stdout_io)
128
+ cookbook_generator.run
129
+ end
130
+ generated_files = Dir.glob("#{tempdir}/delivery_project/**/*", File::FNM_DOTMATCH)
131
+ expected_cookbook_files.each do |expected_file|
132
+ expect(generated_files).to include(expected_file)
133
+ end
134
+ end
135
+
136
+ shared_examples_for "a generated file" do |context_var|
137
+ before do
138
+ Dir.chdir(tempdir) do
139
+ allow(cookbook_generator.chef_runner).to receive(:stdout).and_return(stdout_io)
140
+ cookbook_generator.run
141
+ end
142
+ end
143
+
144
+ it "should contain #{context_var} from the generator context" do
145
+ expect(File.read(file)).to include(line)
146
+ end
147
+ end
148
+
149
+ # This shared example group requires a let binding for
150
+ # `expected_kitchen_yml_content`
151
+ shared_examples_for "kitchen_yml_and_integration_tests" do
152
+
153
+ describe "Generating Test Kitchen and integration testing files" do
154
+
155
+ before do
156
+ Dir.chdir(tempdir) do
157
+ allow(cookbook_generator.chef_runner).to receive(:stdout).and_return(stdout_io)
158
+ cookbook_generator.run
159
+ end
160
+ end
161
+
162
+ let(:file) { File.join(tempdir, "delivery_project", ".delivery", "build-cookbook", ".kitchen.yml") }
163
+
164
+ it "creates a .kitchen.yml with the expected content" do
165
+ expect(IO.read(file)).to eq(expected_kitchen_yml_content)
166
+ end
167
+
168
+ end
169
+ end
170
+
171
+ context "when the delivery project is a cookbook" do
172
+
173
+ let(:parent_metadata_rb) { File.join(tempdir, "delivery_project", "metadata.rb") }
174
+
175
+ before do
176
+ FileUtils.touch(parent_metadata_rb)
177
+ end
178
+
179
+ it "detects that the parent project is a cookbook" do
180
+ Dir.chdir(tempdir) do
181
+ cookbook_generator.read_and_validate_params
182
+ cookbook_generator.setup_context
183
+ expect(generator_context.build_cookbook_parent_is_cookbook).to eq(true)
184
+ end
185
+ end
186
+
187
+ describe "metadata.rb" do
188
+ let(:file) { File.join(tempdir, "delivery_project", ".delivery", "build-cookbook", "metadata.rb") }
189
+
190
+ include_examples "a generated file", :cookbook_name do
191
+ let(:line) do
192
+ <<-METADATA
193
+ name 'build-cookbook'
194
+ maintainer 'The Authors'
195
+ maintainer_email 'you@example.com'
196
+ license 'all_rights'
197
+ version '0.1.0'
198
+
199
+ depends 'delivery-truck'
200
+ METADATA
201
+ end
202
+ end
203
+ end
204
+
205
+ describe "delivery phase recipes" do
206
+
207
+ before do
208
+ Dir.chdir(tempdir) do
209
+ allow(cookbook_generator.chef_runner).to receive(:stdout).and_return(stdout_io)
210
+ cookbook_generator.run
211
+ end
212
+ end
213
+
214
+ it "generates phase recipes which include the corresponding delivery truck recipe" do
215
+ %w[
216
+ deploy.rb
217
+ functional.rb
218
+ lint.rb
219
+ provision.rb
220
+ publish.rb
221
+ quality.rb
222
+ security.rb
223
+ smoke.rb
224
+ syntax.rb
225
+ unit.rb
226
+ ].each do |phase_recipe|
227
+ recipe_file = File.join(tempdir, "delivery_project", ".delivery", "build-cookbook", "recipes", phase_recipe)
228
+ phase = File.basename(phase_recipe, ".rb")
229
+ expected_content = %Q[include_recipe 'delivery-truck::#{phase}']
230
+ expect(IO.read(recipe_file)).to include(expected_content)
231
+ end
232
+ end
233
+
234
+ end
235
+
236
+ end
237
+
238
+ context "when the delivery project is not a cookbook" do
239
+
240
+ it "detects that the parent project is not a cookbook" do
241
+ cookbook_generator.read_and_validate_params
242
+ cookbook_generator.setup_context
243
+ expect(generator_context.build_cookbook_parent_is_cookbook).to eq(false)
244
+ end
245
+
246
+ describe "metadata.rb" do
247
+ let(:file) { File.join(tempdir, "delivery_project", ".delivery", "build-cookbook", "metadata.rb") }
248
+
249
+ include_examples "a generated file", :cookbook_name do
250
+ let(:line) do
251
+ <<-METADATA
252
+ name 'build-cookbook'
253
+ maintainer 'The Authors'
254
+ maintainer_email 'you@example.com'
255
+ license 'all_rights'
256
+ version '0.1.0'
257
+ METADATA
258
+ end
259
+ end
260
+ end
261
+
262
+ describe "delivery phase recipes" do
263
+
264
+ before do
265
+ Dir.chdir(tempdir) do
266
+ allow(cookbook_generator.chef_runner).to receive(:stdout).and_return(stdout_io)
267
+ cookbook_generator.run
268
+ end
269
+ end
270
+
271
+ it "generates phase recipes that are empty" do
272
+ %w[
273
+ deploy.rb
274
+ functional.rb
275
+ lint.rb
276
+ provision.rb
277
+ publish.rb
278
+ quality.rb
279
+ security.rb
280
+ smoke.rb
281
+ syntax.rb
282
+ unit.rb
283
+ ].each do |phase_recipe|
284
+ recipe_file = File.join(tempdir, "delivery_project", ".delivery", "build-cookbook", "recipes", phase_recipe)
285
+ expect(IO.read(recipe_file)).to_not include("include_recipe")
286
+ end
287
+ end
288
+
289
+ end
290
+
291
+ end
292
+ end
293
+
294
+ context "when given a path including the .delivery directory" do
295
+ let(:argv) { [ File.join(tempdir, "delivery_project", ".delivery", "build-cookbook") ] }
296
+
297
+ before do
298
+ reset_tempdir
299
+ end
300
+
301
+ it "correctly sets the delivery project dir to the parent of the .delivery dir" do
302
+ cookbook_generator.read_and_validate_params
303
+ cookbook_generator.setup_context
304
+ expect(generator_context.delivery_project_dir).to eq(File.join(tempdir, "delivery_project"))
305
+ end
306
+
307
+ end
308
+
309
+ end
@@ -1,32 +1,32 @@
1
- #
2
- # Copyright:: Copyright (c) 2014 Chef Software Inc.
3
- # License:: Apache License, Version 2.0
4
- #
5
- # Licensed under the Apache License, Version 2.0 (the "License");
6
- # you may not use this file except in compliance with the License.
7
- # You may obtain a copy of the License at
8
- #
9
- # http://www.apache.org/licenses/LICENSE-2.0
10
- #
11
- # Unless required by applicable law or agreed to in writing, software
12
- # distributed under the License is distributed on an "AS IS" BASIS,
13
- # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14
- # See the License for the specific language governing permissions and
15
- # limitations under the License.
16
- #
17
-
18
- require 'spec_helper'
19
- require 'shared/a_file_generator'
20
- require 'chef-dk/command/generator_commands/cookbook_file'
21
-
22
- describe ChefDK::Command::GeneratorCommands::CookbookFile do
23
-
24
- include_examples "a file generator" do
25
-
26
- let(:generator_name) { "file" }
27
- let(:generated_files) { [ "files/default/new_file.txt" ] }
28
- let(:new_file_name) { "new_file.txt" }
29
-
30
- end
31
- end
32
-
1
+ #
2
+ # Copyright:: Copyright (c) 2014 Chef Software Inc.
3
+ # License:: Apache License, Version 2.0
4
+ #
5
+ # Licensed under the Apache License, Version 2.0 (the "License");
6
+ # you may not use this file except in compliance with the License.
7
+ # You may obtain a copy of the License at
8
+ #
9
+ # http://www.apache.org/licenses/LICENSE-2.0
10
+ #
11
+ # Unless required by applicable law or agreed to in writing, software
12
+ # distributed under the License is distributed on an "AS IS" BASIS,
13
+ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14
+ # See the License for the specific language governing permissions and
15
+ # limitations under the License.
16
+ #
17
+
18
+ require 'spec_helper'
19
+ require 'shared/a_file_generator'
20
+ require 'chef-dk/command/generator_commands/cookbook_file'
21
+
22
+ describe ChefDK::Command::GeneratorCommands::CookbookFile do
23
+
24
+ include_examples "a file generator" do
25
+
26
+ let(:generator_name) { "file" }
27
+ let(:generated_files) { [ "files/default/new_file.txt" ] }
28
+ let(:new_file_name) { "new_file.txt" }
29
+
30
+ end
31
+ end
32
+
@@ -280,10 +280,11 @@ provisioner:
280
280
  # default verifier)
281
281
  # verifier:
282
282
  # name: inspec
283
+ # format: doc
283
284
 
284
285
  platforms:
285
- - name: ubuntu-14.04
286
- - name: centos-7.1
286
+ - name: ubuntu-16.04
287
+ - name: centos-7.2
287
288
 
288
289
  suites:
289
290
  - name: default
@@ -350,10 +351,11 @@ provisioner:
350
351
  # default verifier)
351
352
  # verifier:
352
353
  # name: inspec
354
+ # format: doc
353
355
 
354
356
  platforms:
355
- - name: ubuntu-14.04
356
- - name: centos-7.1
357
+ - name: ubuntu-16.04
358
+ - name: centos-7.2
357
359
 
358
360
  suites:
359
361
  - name: default
@@ -378,6 +380,98 @@ SPEC_HELPER
378
380
 
379
381
  end
380
382
 
383
+ context "when configured for delivery" do
384
+
385
+ let(:argv) { %w[new_cookbook --delivery] }
386
+
387
+ let(:dot_delivery) { File.join(tempdir, "new_cookbook", ".delivery") }
388
+
389
+ before do
390
+ Dir.chdir(tempdir) do
391
+ allow(cookbook_generator.chef_runner).to receive(:stdout).and_return(stdout_io)
392
+ cookbook_generator.run
393
+ end
394
+ end
395
+
396
+ describe ".delivery/config.json" do
397
+
398
+ let(:file) { File.join(tempdir, "new_cookbook", ".delivery", "config.json") }
399
+
400
+ let(:expected_content) do
401
+ <<-CONFIG_DOT_JSON
402
+ {
403
+ "version": "2",
404
+ "build_cookbook": {
405
+ "name": "build-cookbook",
406
+ "path": ".delivery/build-cookbook"
407
+ },
408
+ "skip_phases": [],
409
+ "build_nodes": {},
410
+ "dependencies": []
411
+ }
412
+ CONFIG_DOT_JSON
413
+ end
414
+
415
+ it "configures delivery to use a local build cookbook" do
416
+ expect(IO.read(file)).to eq(expected_content)
417
+ end
418
+
419
+ end
420
+
421
+ describe "build cookbook recipes" do
422
+
423
+ let(:file) do
424
+ File.join(dot_delivery, "build-cookbook", "recipes", "publish.rb")
425
+ end
426
+
427
+ let(:expected_content) do
428
+ <<-CONFIG_DOT_JSON
429
+ include_recipe 'delivery-truck::publish'
430
+ CONFIG_DOT_JSON
431
+ end
432
+
433
+ it "delegates functionality to delivery-truck" do
434
+ expect(IO.read(file)).to include(expected_content)
435
+ end
436
+
437
+ end
438
+
439
+ describe "build cookbook Berksfile" do
440
+
441
+ let(:file) do
442
+ File.join(dot_delivery, "build-cookbook", "Berksfile")
443
+ end
444
+
445
+ let(:expected_content) do
446
+ <<-CONFIG_DOT_JSON
447
+ source 'https://supermarket.chef.io'
448
+
449
+ metadata
450
+
451
+ cookbook 'delivery-truck',
452
+ git: 'https://github.com/chef-cookbooks/delivery-truck.git',
453
+ branch: 'master'
454
+
455
+ # This is so we know where to get delivery-truck's dependency
456
+ cookbook 'delivery-sugar',
457
+ git: 'https://github.com/chef-cookbooks/delivery-sugar.git',
458
+ branch: 'master'
459
+
460
+ group :delivery do
461
+ cookbook 'delivery_build', git: 'https://github.com/chef-cookbooks/delivery_build'
462
+ cookbook 'delivery-base', git: 'https://github.com/chef-cookbooks/delivery-base'
463
+ cookbook 'test', path: './test/fixtures/cookbooks/test'
464
+ end
465
+ CONFIG_DOT_JSON
466
+ end
467
+
468
+ it "sets the sources for delivery library cookbooks to github" do
469
+ expect(IO.read(file)).to include(expected_content)
470
+ end
471
+
472
+ end
473
+ end
474
+
381
475
  describe "metadata.rb" do
382
476
  let(:file) { File.join(tempdir, "new_cookbook", "metadata.rb") }
383
477