chef-dk 0.13.21 → 0.14.25

Sign up to get free protection for your applications and to get access to all the features.
Files changed (336) hide show
  1. checksums.yaml +4 -4
  2. data/CONTRIBUTING.md +186 -186
  3. data/Gemfile +37 -14
  4. data/Gemfile.lock +178 -72
  5. data/LICENSE +201 -201
  6. data/README.md +11 -148
  7. data/acceptance/.shared/kitchen_acceptance/.kitchen.digitalocean.yml +27 -27
  8. data/acceptance/.shared/kitchen_acceptance/.kitchen.ec2.yml +288 -288
  9. data/acceptance/.shared/kitchen_acceptance/.kitchen.vagrant.yml +52 -52
  10. data/acceptance/.shared/kitchen_acceptance/libraries/kitchen.rb +51 -51
  11. data/acceptance/.shared/kitchen_acceptance/metadata.rb +1 -1
  12. data/acceptance/Gemfile +2 -1
  13. data/acceptance/Gemfile.lock +39 -42
  14. data/acceptance/README.md +132 -132
  15. data/acceptance/trivial/.acceptance/acceptance-cookbook/.gitignore +2 -2
  16. data/acceptance/trivial/.acceptance/acceptance-cookbook/metadata.rb +2 -2
  17. data/acceptance/trivial/.acceptance/acceptance-cookbook/recipes/destroy.rb +1 -1
  18. data/acceptance/trivial/.acceptance/acceptance-cookbook/recipes/provision.rb +1 -1
  19. data/acceptance/trivial/.acceptance/acceptance-cookbook/recipes/verify.rb +1 -1
  20. data/acceptance/trivial/.kitchen.yml +7 -7
  21. data/acceptance/trivial/test/integration/chefdk-current-install/inspec/chef_client_spec.rb +5 -5
  22. data/bin/chef +25 -25
  23. data/lib/chef-dk.rb +19 -19
  24. data/lib/chef-dk/authenticated_http.rb +40 -40
  25. data/lib/chef-dk/chef_runner.rb +107 -107
  26. data/lib/chef-dk/cli.rb +200 -200
  27. data/lib/chef-dk/command/base.rb +79 -79
  28. data/lib/chef-dk/command/clean_policy_cookbooks.rb +116 -116
  29. data/lib/chef-dk/command/clean_policy_revisions.rb +113 -113
  30. data/lib/chef-dk/command/delete_policy.rb +122 -122
  31. data/lib/chef-dk/command/delete_policy_group.rb +122 -122
  32. data/lib/chef-dk/command/diff.rb +316 -316
  33. data/lib/chef-dk/command/env.rb +90 -90
  34. data/lib/chef-dk/command/exec.rb +45 -45
  35. data/lib/chef-dk/command/export.rb +157 -157
  36. data/lib/chef-dk/command/gem.rb +47 -47
  37. data/lib/chef-dk/command/generate.rb +120 -120
  38. data/lib/chef-dk/command/generator_commands.rb +83 -80
  39. data/lib/chef-dk/command/generator_commands/app.rb +107 -107
  40. data/lib/chef-dk/command/generator_commands/attribute.rb +37 -37
  41. data/lib/chef-dk/command/generator_commands/base.rb +148 -148
  42. data/lib/chef-dk/command/generator_commands/cookbook.rb +153 -153
  43. data/lib/chef-dk/command/generator_commands/cookbook_code_file.rb +100 -100
  44. data/lib/chef-dk/command/generator_commands/cookbook_file.rb +45 -45
  45. data/lib/chef-dk/command/generator_commands/generator_generator.rb +177 -177
  46. data/lib/chef-dk/command/generator_commands/lwrp.rb +36 -36
  47. data/lib/chef-dk/command/generator_commands/policyfile.rb +127 -127
  48. data/lib/chef-dk/command/generator_commands/recipe.rb +36 -36
  49. data/lib/chef-dk/command/generator_commands/repo.rb +125 -125
  50. data/lib/chef-dk/command/generator_commands/template.rb +46 -46
  51. data/lib/chef-dk/command/install.rb +121 -121
  52. data/lib/chef-dk/command/provision.rb +438 -438
  53. data/lib/chef-dk/command/push.rb +118 -118
  54. data/lib/chef-dk/command/push_archive.rb +126 -126
  55. data/lib/chef-dk/command/shell_init.rb +180 -180
  56. data/lib/chef-dk/command/show_policy.rb +165 -165
  57. data/lib/chef-dk/command/undelete.rb +155 -155
  58. data/lib/chef-dk/command/update.rb +148 -148
  59. data/lib/chef-dk/command/verify.rb +106 -29
  60. data/lib/chef-dk/completions/bash.sh.erb +5 -5
  61. data/lib/chef-dk/completions/chef.fish.erb +10 -10
  62. data/lib/chef-dk/completions/zsh.zsh.erb +21 -21
  63. data/lib/chef-dk/component_test.rb +30 -1
  64. data/lib/chef-dk/configurable.rb +69 -69
  65. data/lib/chef-dk/cookbook_metadata.rb +45 -45
  66. data/lib/chef-dk/cookbook_omnifetch.rb +32 -32
  67. data/lib/chef-dk/cookbook_profiler/git.rb +151 -151
  68. data/lib/chef-dk/cookbook_profiler/identifiers.rb +72 -72
  69. data/lib/chef-dk/cookbook_profiler/null_scm.rb +32 -32
  70. data/lib/chef-dk/exceptions.rb +129 -129
  71. data/lib/chef-dk/generator.rb +163 -163
  72. data/lib/chef-dk/helpers.rb +159 -159
  73. data/lib/chef-dk/pager.rb +106 -106
  74. data/lib/chef-dk/policyfile/chef_repo_cookbook_source.rb +138 -138
  75. data/lib/chef-dk/policyfile/chef_server_cookbook_source.rb +54 -54
  76. data/lib/chef-dk/policyfile/community_cookbook_source.rb +97 -97
  77. data/lib/chef-dk/policyfile/comparison_base.rb +124 -124
  78. data/lib/chef-dk/policyfile/cookbook_location_specification.rb +154 -154
  79. data/lib/chef-dk/policyfile/cookbook_locks.rb +466 -466
  80. data/lib/chef-dk/policyfile/cookbook_sources.rb +22 -22
  81. data/lib/chef-dk/policyfile/delivery_supermarket_source.rb +90 -90
  82. data/lib/chef-dk/policyfile/differ.rb +266 -266
  83. data/lib/chef-dk/policyfile/dsl.rb +261 -261
  84. data/lib/chef-dk/policyfile/lister.rb +232 -232
  85. data/lib/chef-dk/policyfile/null_cookbook_source.rb +45 -45
  86. data/lib/chef-dk/policyfile/read_cookbook_for_compat_mode_upload.rb +124 -124
  87. data/lib/chef-dk/policyfile/reports/install.rb +70 -70
  88. data/lib/chef-dk/policyfile/reports/table_printer.rb +58 -58
  89. data/lib/chef-dk/policyfile/reports/upload.rb +70 -70
  90. data/lib/chef-dk/policyfile/solution_dependencies.rb +298 -298
  91. data/lib/chef-dk/policyfile/storage_config.rb +100 -100
  92. data/lib/chef-dk/policyfile/undo_record.rb +142 -142
  93. data/lib/chef-dk/policyfile/undo_stack.rb +130 -130
  94. data/lib/chef-dk/policyfile/uploader.rb +213 -213
  95. data/lib/chef-dk/policyfile_compiler.rb +419 -419
  96. data/lib/chef-dk/policyfile_lock.rb +552 -552
  97. data/lib/chef-dk/policyfile_services/clean_policies.rb +95 -95
  98. data/lib/chef-dk/policyfile_services/clean_policy_cookbooks.rb +125 -125
  99. data/lib/chef-dk/policyfile_services/export_repo.rb +421 -421
  100. data/lib/chef-dk/policyfile_services/install.rb +126 -126
  101. data/lib/chef-dk/policyfile_services/push.rb +114 -114
  102. data/lib/chef-dk/policyfile_services/push_archive.rb +204 -204
  103. data/lib/chef-dk/policyfile_services/rm_policy.rb +142 -142
  104. data/lib/chef-dk/policyfile_services/rm_policy_group.rb +86 -86
  105. data/lib/chef-dk/policyfile_services/show_policy.rb +237 -237
  106. data/lib/chef-dk/policyfile_services/undelete.rb +108 -108
  107. data/lib/chef-dk/policyfile_services/update_attributes.rb +104 -104
  108. data/lib/chef-dk/service_exception_inspectors.rb +25 -25
  109. data/lib/chef-dk/service_exception_inspectors/base.rb +40 -40
  110. data/lib/chef-dk/service_exception_inspectors/http.rb +121 -121
  111. data/lib/chef-dk/service_exceptions.rb +143 -143
  112. data/lib/chef-dk/shell_out.rb +36 -36
  113. data/lib/chef-dk/skeletons/code_generator/files/default/Berksfile +3 -3
  114. data/lib/chef-dk/skeletons/code_generator/files/default/chefignore +102 -102
  115. data/lib/chef-dk/skeletons/code_generator/files/default/cookbook_readmes/README-policy.md +9 -9
  116. data/lib/chef-dk/skeletons/code_generator/files/default/cookbook_readmes/README.md +54 -54
  117. data/lib/chef-dk/skeletons/code_generator/files/default/gitignore +16 -16
  118. data/lib/chef-dk/skeletons/code_generator/files/default/repo/README.md +28 -28
  119. data/lib/chef-dk/skeletons/code_generator/files/default/repo/cookbooks/example/README.md +27 -27
  120. data/lib/chef-dk/skeletons/code_generator/files/default/repo/cookbooks/example/attributes/default.rb +7 -7
  121. data/lib/chef-dk/skeletons/code_generator/files/default/repo/cookbooks/example/metadata.rb +3 -3
  122. data/lib/chef-dk/skeletons/code_generator/files/default/repo/cookbooks/example/recipes/default.rb +8 -8
  123. data/lib/chef-dk/skeletons/code_generator/files/default/repo/data_bags/README.md +58 -58
  124. data/lib/chef-dk/skeletons/code_generator/files/default/repo/data_bags/example/example_item.json +3 -3
  125. data/lib/chef-dk/skeletons/code_generator/files/default/repo/dot-chef-repo.txt +6 -6
  126. data/lib/chef-dk/skeletons/code_generator/files/default/repo/environments/README.md +9 -9
  127. data/lib/chef-dk/skeletons/code_generator/files/default/repo/environments/example.json +12 -12
  128. data/lib/chef-dk/skeletons/code_generator/files/default/repo/policies/README.md +24 -24
  129. data/lib/chef-dk/skeletons/code_generator/files/default/repo/roles/README.md +9 -9
  130. data/lib/chef-dk/skeletons/code_generator/files/default/repo/roles/example.json +12 -12
  131. data/lib/chef-dk/skeletons/code_generator/files/default/serverspec_spec_helper.rb +8 -8
  132. data/lib/chef-dk/skeletons/code_generator/files/default/spec_helper.rb +2 -2
  133. data/lib/chef-dk/skeletons/code_generator/files/default/spec_helper_policyfile.rb +2 -2
  134. data/lib/chef-dk/skeletons/code_generator/metadata.rb +8 -8
  135. data/lib/chef-dk/skeletons/code_generator/recipes/app.rb +97 -97
  136. data/lib/chef-dk/skeletons/code_generator/recipes/attribute.rb +12 -12
  137. data/lib/chef-dk/skeletons/code_generator/recipes/cookbook.rb +117 -117
  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.apache2.erb → LICENSE.apachev2.erb} +201 -201
  146. data/lib/chef-dk/skeletons/code_generator/templates/default/LICENSE.gplv2.erb +339 -339
  147. data/lib/chef-dk/skeletons/code_generator/templates/default/LICENSE.gplv3.erb +674 -674
  148. data/lib/chef-dk/skeletons/code_generator/templates/default/LICENSE.mit.erb +21 -21
  149. data/lib/chef-dk/skeletons/code_generator/templates/default/Policyfile.rb.erb +25 -25
  150. data/lib/chef-dk/skeletons/code_generator/templates/default/README.md.erb +4 -4
  151. data/lib/chef-dk/skeletons/code_generator/templates/default/kitchen.yml.erb +21 -21
  152. data/lib/chef-dk/skeletons/code_generator/templates/default/kitchen_policyfile.yml.erb +32 -32
  153. data/lib/chef-dk/skeletons/code_generator/templates/default/metadata.rb.erb +7 -7
  154. data/lib/chef-dk/skeletons/code_generator/templates/default/recipe.rb.erb +5 -5
  155. data/lib/chef-dk/skeletons/code_generator/templates/default/recipe_spec.rb.erb +20 -20
  156. data/lib/chef-dk/skeletons/code_generator/templates/default/repo/gitignore.erb +11 -11
  157. data/lib/chef-dk/skeletons/code_generator/templates/default/serverspec_default_spec.rb.erb +9 -9
  158. data/lib/chef-dk/ui.rb +58 -58
  159. data/lib/chef-dk/version.rb +1 -1
  160. data/lib/kitchen/provisioner/policyfile_zero.rb +195 -195
  161. data/omnibus_overrides.rb +19 -11
  162. data/spec/shared/a_file_generator.rb +125 -125
  163. data/spec/shared/a_generated_file.rb +12 -12
  164. data/spec/shared/command_with_ui_object.rb +11 -11
  165. data/spec/shared/custom_generator_cookbook.rb +130 -130
  166. data/spec/shared/fixture_cookbook_checksums.rb +47 -47
  167. data/spec/shared/setup_git_cookbooks.rb +53 -53
  168. data/spec/spec_helper.rb +51 -51
  169. data/spec/test_helpers.rb +84 -84
  170. data/spec/unit/chef_runner_spec.rb +139 -139
  171. data/spec/unit/cli_spec.rb +357 -357
  172. data/spec/unit/command/base_spec.rb +173 -169
  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/cookbook_file_spec.rb +32 -32
  186. data/spec/unit/command/generator_commands/cookbook_spec.rb +450 -450
  187. data/spec/unit/command/generator_commands/generator_generator_spec.rb +229 -229
  188. data/spec/unit/command/generator_commands/lwrp_spec.rb +32 -32
  189. data/spec/unit/command/generator_commands/policyfile_spec.rb +225 -225
  190. data/spec/unit/command/generator_commands/recipe_spec.rb +34 -34
  191. data/spec/unit/command/generator_commands/repo_spec.rb +374 -367
  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 +15 -6
  202. data/spec/unit/commands_map_spec.rb +57 -57
  203. data/spec/unit/component_test_spec.rb +128 -126
  204. data/spec/unit/configurable_spec.rb +41 -41
  205. data/spec/unit/cookbook_metadata_spec.rb +98 -98
  206. data/spec/unit/cookbook_profiler/git_spec.rb +176 -176
  207. data/spec/unit/cookbook_profiler/identifiers_spec.rb +83 -83
  208. data/spec/unit/fixtures/chef-runner-cookbooks/test_cookbook/recipes/recipe_one.rb +9 -9
  209. data/spec/unit/fixtures/chef-runner-cookbooks/test_cookbook/recipes/recipe_two.rb +9 -9
  210. data/spec/unit/fixtures/command/cli_test_command.rb +26 -26
  211. data/spec/unit/fixtures/command/explicit_path_example.rb +7 -7
  212. data/spec/unit/fixtures/configurable/test_config_loader.rb +5 -5
  213. data/spec/unit/fixtures/configurable/test_configurable.rb +10 -10
  214. data/spec/unit/fixtures/cookbook_cache/baz-f59ee7a5bca6a4e606b67f7f856b768d847c39bb/.kitchen.yml +16 -16
  215. data/spec/unit/fixtures/cookbook_cache/baz-f59ee7a5bca6a4e606b67f7f856b768d847c39bb/Berksfile +3 -3
  216. data/spec/unit/fixtures/cookbook_cache/baz-f59ee7a5bca6a4e606b67f7f856b768d847c39bb/README.md +4 -4
  217. data/spec/unit/fixtures/cookbook_cache/baz-f59ee7a5bca6a4e606b67f7f856b768d847c39bb/chefignore +96 -96
  218. data/spec/unit/fixtures/cookbook_cache/baz-f59ee7a5bca6a4e606b67f7f856b768d847c39bb/metadata.rb +8 -8
  219. data/spec/unit/fixtures/cookbook_cache/baz-f59ee7a5bca6a4e606b67f7f856b768d847c39bb/recipes/default.rb +8 -8
  220. data/spec/unit/fixtures/cookbook_cache/dep_of_bar-1.2.3/.kitchen.yml +16 -16
  221. data/spec/unit/fixtures/cookbook_cache/dep_of_bar-1.2.3/Berksfile +3 -3
  222. data/spec/unit/fixtures/cookbook_cache/dep_of_bar-1.2.3/README.md +4 -4
  223. data/spec/unit/fixtures/cookbook_cache/dep_of_bar-1.2.3/chefignore +96 -96
  224. data/spec/unit/fixtures/cookbook_cache/dep_of_bar-1.2.3/metadata.rb +8 -8
  225. data/spec/unit/fixtures/cookbook_cache/dep_of_bar-1.2.3/recipes/default.rb +8 -8
  226. data/spec/unit/fixtures/cookbook_cache/foo-1.0.0/.kitchen.yml +16 -16
  227. data/spec/unit/fixtures/cookbook_cache/foo-1.0.0/Berksfile +3 -3
  228. data/spec/unit/fixtures/cookbook_cache/foo-1.0.0/README.md +4 -4
  229. data/spec/unit/fixtures/cookbook_cache/foo-1.0.0/chefignore +96 -96
  230. data/spec/unit/fixtures/cookbook_cache/foo-1.0.0/metadata.rb +8 -8
  231. data/spec/unit/fixtures/cookbook_cache/foo-1.0.0/recipes/default.rb +8 -8
  232. data/spec/unit/fixtures/cookbooks_api/pruned_small_universe.json +1321 -1321
  233. data/spec/unit/fixtures/cookbooks_api/small_universe.json +2987 -2987
  234. data/spec/unit/fixtures/cookbooks_api/universe.json +1 -1
  235. data/spec/unit/fixtures/cookbooks_api/update_fixtures.rb +36 -36
  236. data/spec/unit/fixtures/dev_cookbooks/README.md +16 -16
  237. data/spec/unit/fixtures/eg_omnibus_dir/valid/embedded/apps/berkshelf/integration_test +2 -2
  238. data/spec/unit/fixtures/eg_omnibus_dir/valid/embedded/apps/berkshelf/verify_me +5 -5
  239. data/spec/unit/fixtures/eg_omnibus_dir/valid/embedded/apps/chef/verify_me +3 -3
  240. data/spec/unit/fixtures/eg_omnibus_dir/valid/embedded/apps/test-kitchen/verify_me +2 -2
  241. data/spec/unit/fixtures/example_cookbook/.gitignore +17 -17
  242. data/spec/unit/fixtures/example_cookbook/.kitchen.yml +16 -16
  243. data/spec/unit/fixtures/example_cookbook/Berksfile +3 -3
  244. data/spec/unit/fixtures/example_cookbook/README.md +4 -4
  245. data/spec/unit/fixtures/example_cookbook/chefignore +96 -96
  246. data/spec/unit/fixtures/example_cookbook/metadata.rb +8 -8
  247. data/spec/unit/fixtures/example_cookbook/recipes/default.rb +8 -8
  248. data/spec/unit/fixtures/example_cookbook_metadata_json_only/.gitignore +17 -17
  249. data/spec/unit/fixtures/example_cookbook_metadata_json_only/.kitchen.yml +16 -16
  250. data/spec/unit/fixtures/example_cookbook_metadata_json_only/Berksfile +3 -3
  251. data/spec/unit/fixtures/example_cookbook_metadata_json_only/README.md +4 -4
  252. data/spec/unit/fixtures/example_cookbook_metadata_json_only/chefignore +96 -96
  253. data/spec/unit/fixtures/example_cookbook_metadata_json_only/metadata.json +5 -5
  254. data/spec/unit/fixtures/example_cookbook_metadata_json_only/recipes/default.rb +8 -8
  255. data/spec/unit/fixtures/example_cookbook_no_metadata/.gitignore +17 -17
  256. data/spec/unit/fixtures/example_cookbook_no_metadata/.kitchen.yml +16 -16
  257. data/spec/unit/fixtures/example_cookbook_no_metadata/Berksfile +3 -3
  258. data/spec/unit/fixtures/example_cookbook_no_metadata/README.md +4 -4
  259. data/spec/unit/fixtures/example_cookbook_no_metadata/chefignore +96 -96
  260. data/spec/unit/fixtures/example_cookbook_no_metadata/recipes/default.rb +8 -8
  261. data/spec/unit/fixtures/local_path_cookbooks/another-local-cookbook/README.md +4 -4
  262. data/spec/unit/fixtures/local_path_cookbooks/another-local-cookbook/chefignore +96 -96
  263. data/spec/unit/fixtures/local_path_cookbooks/another-local-cookbook/metadata.rb +8 -8
  264. data/spec/unit/fixtures/local_path_cookbooks/another-local-cookbook/recipes/default.rb +8 -8
  265. data/spec/unit/fixtures/local_path_cookbooks/cookbook-with-a-dep/Berksfile +3 -3
  266. data/spec/unit/fixtures/local_path_cookbooks/cookbook-with-a-dep/README.md +4 -4
  267. data/spec/unit/fixtures/local_path_cookbooks/cookbook-with-a-dep/chefignore +96 -96
  268. data/spec/unit/fixtures/local_path_cookbooks/cookbook-with-a-dep/metadata.rb +9 -9
  269. data/spec/unit/fixtures/local_path_cookbooks/cookbook-with-a-dep/recipes/default.rb +8 -8
  270. data/spec/unit/fixtures/local_path_cookbooks/local-cookbook/.kitchen.yml +16 -16
  271. data/spec/unit/fixtures/local_path_cookbooks/local-cookbook/Berksfile +3 -3
  272. data/spec/unit/fixtures/local_path_cookbooks/local-cookbook/README.md +4 -4
  273. data/spec/unit/fixtures/local_path_cookbooks/local-cookbook/chefignore +96 -96
  274. data/spec/unit/fixtures/local_path_cookbooks/local-cookbook/metadata.rb +8 -8
  275. data/spec/unit/fixtures/local_path_cookbooks/local-cookbook/recipes/default.rb +8 -8
  276. data/spec/unit/fixtures/local_path_cookbooks/metadata-missing/README.md +2 -2
  277. data/spec/unit/fixtures/local_path_cookbooks/noignore-f59ee7a5bca6a4e606b67f7f856b768d847c39bb/.kitchen.yml +16 -16
  278. data/spec/unit/fixtures/local_path_cookbooks/noignore-f59ee7a5bca6a4e606b67f7f856b768d847c39bb/README.md +4 -4
  279. data/spec/unit/fixtures/local_path_cookbooks/noignore-f59ee7a5bca6a4e606b67f7f856b768d847c39bb/metadata.rb +8 -8
  280. data/spec/unit/fixtures/local_path_cookbooks/noignore-f59ee7a5bca6a4e606b67f7f856b768d847c39bb/recipes/default.rb +8 -8
  281. data/spec/unit/generator_spec.rb +119 -120
  282. data/spec/unit/helpers_spec.rb +92 -92
  283. data/spec/unit/pager_spec.rb +119 -119
  284. data/spec/unit/policyfile/chef_repo_cookbook_source_spec.rb +93 -93
  285. data/spec/unit/policyfile/chef_server_cookbook_source_spec.rb +34 -34
  286. data/spec/unit/policyfile/community_cookbook_source_spec.rb +84 -84
  287. data/spec/unit/policyfile/comparison_base_spec.rb +343 -343
  288. data/spec/unit/policyfile/cookbook_location_specification_spec.rb +277 -277
  289. data/spec/unit/policyfile/cookbook_locks_spec.rb +529 -529
  290. data/spec/unit/policyfile/delivery_supermarket_source_spec.rb +130 -130
  291. data/spec/unit/policyfile/differ_spec.rb +687 -687
  292. data/spec/unit/policyfile/lister_spec.rb +272 -272
  293. data/spec/unit/policyfile/null_cookbook_source_spec.rb +35 -35
  294. data/spec/unit/policyfile/read_cookbook_for_compat_mode_upload_spec.rb +92 -92
  295. data/spec/unit/policyfile/reports/install_spec.rb +115 -115
  296. data/spec/unit/policyfile/reports/upload_spec.rb +96 -96
  297. data/spec/unit/policyfile/solution_dependencies_spec.rb +145 -145
  298. data/spec/unit/policyfile/storage_config_spec.rb +172 -172
  299. data/spec/unit/policyfile/undo_record_spec.rb +260 -260
  300. data/spec/unit/policyfile/undo_stack_spec.rb +266 -266
  301. data/spec/unit/policyfile/uploader_spec.rb +410 -410
  302. data/spec/unit/policyfile_demands_spec.rb +1203 -1203
  303. data/spec/unit/policyfile_evaluation_spec.rb +642 -642
  304. data/spec/unit/policyfile_lock_build_spec.rb +1056 -1056
  305. data/spec/unit/policyfile_lock_install_spec.rb +138 -138
  306. data/spec/unit/policyfile_lock_serialization_spec.rb +425 -425
  307. data/spec/unit/policyfile_lock_validation_spec.rb +611 -611
  308. data/spec/unit/policyfile_services/clean_policies_spec.rb +236 -236
  309. data/spec/unit/policyfile_services/clean_policy_cookbooks_spec.rb +275 -275
  310. data/spec/unit/policyfile_services/export_repo_spec.rb +481 -481
  311. data/spec/unit/policyfile_services/install_spec.rb +211 -211
  312. data/spec/unit/policyfile_services/push_archive_spec.rb +378 -378
  313. data/spec/unit/policyfile_services/push_spec.rb +233 -233
  314. data/spec/unit/policyfile_services/rm_policy_group_spec.rb +241 -241
  315. data/spec/unit/policyfile_services/rm_policy_spec.rb +266 -266
  316. data/spec/unit/policyfile_services/show_policy_spec.rb +889 -889
  317. data/spec/unit/policyfile_services/undelete_spec.rb +304 -304
  318. data/spec/unit/policyfile_services/update_attributes_spec.rb +217 -217
  319. data/spec/unit/service_exception_inspectors/base_spec.rb +43 -43
  320. data/spec/unit/service_exception_inspectors/http_spec.rb +140 -140
  321. data/spec/unit/shell_out_spec.rb +34 -34
  322. data/spec/unit/tasks/helpers_spec.rb +75 -0
  323. data/tasks/bin/bundle-platform +0 -0
  324. data/tasks/bin/bundle-platform.bat +0 -0
  325. data/tasks/bin/create-override-gemfile +110 -0
  326. data/tasks/bundle.rb +27 -11
  327. data/tasks/bundle_util.rb +6 -5
  328. data/tasks/dependencies.rb +97 -122
  329. data/tasks/gemfile_util.rb +357 -66
  330. data/tasks/helpers.rb +47 -0
  331. data/tasks/version.rb +1 -5
  332. data/version_policy.rb +66 -41
  333. data/warning.txt +9 -9
  334. metadata +7 -5
  335. data/Gemfile.windows +0 -34
  336. data/Gemfile.windows.lock +0 -936
@@ -1,22 +1,22 @@
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 'chef-dk/policyfile/null_cookbook_source'
19
- require 'chef-dk/policyfile/community_cookbook_source'
20
- require 'chef-dk/policyfile/chef_server_cookbook_source'
21
- require 'chef-dk/policyfile/chef_repo_cookbook_source'
22
- require 'chef-dk/policyfile/delivery_supermarket_source'
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 'chef-dk/policyfile/null_cookbook_source'
19
+ require 'chef-dk/policyfile/community_cookbook_source'
20
+ require 'chef-dk/policyfile/chef_server_cookbook_source'
21
+ require 'chef-dk/policyfile/chef_repo_cookbook_source'
22
+ require 'chef-dk/policyfile/delivery_supermarket_source'
@@ -1,90 +1,90 @@
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 'forwardable'
19
-
20
- require 'semverse'
21
-
22
- require 'chef-dk/policyfile/community_cookbook_source'
23
-
24
- module ChefDK
25
- module Policyfile
26
-
27
- # Fetches cookbooks from a supermarket, similar to CommunityCookbookSource
28
- # (which it delegates to), except that only the latest versions of any
29
- # cookbook can be used.
30
- #
31
- # This is intended to be used in an environment where the team wants to
32
- # make only the newest version of a given cookbook available in order to
33
- # force developers to integrate continuously at the component artifact
34
- # (cookbook) level. To achieve this goal, two constraints must be imposed:
35
- #
36
- # * Cookbook changes pass through a Ci pipeline and are ultimately uploaded
37
- # to a private supermarket (or equivalent, i.e. mini-mart) after final
38
- # approval (which can be automated or not)
39
- # * Version numbers for cookbooks that pass through the Ci pipeline always
40
- # increase over time (so that largest version number == newest)
41
- #
42
- # In the future, alternative approaches may be persued to achieve the goal
43
- # of continuously integrating at the cookbook level without imposing those
44
- # constraints.
45
- #
46
- class DeliverySupermarketSource
47
-
48
- extend Forwardable
49
-
50
- def_delegator :@community_source, :uri
51
- def_delegator :@community_source, :source_options_for
52
- def_delegator :@community_source, :null?
53
- def_delegator :@community_source, :preferred_cookbooks
54
- def_delegator :@community_source, :preferred_source_for?
55
- def_delegator :@community_source, :preferred_for
56
-
57
- def initialize(uri)
58
- @community_source = CommunityCookbookSource.new(uri)
59
- yield self if block_given?
60
- end
61
-
62
- def ==(other)
63
- other.kind_of?(self.class) && other.uri == uri
64
- end
65
-
66
- def default_source_args
67
- [:delivery_supermarket, uri]
68
- end
69
-
70
- def universe_graph
71
- @universe_graph ||= begin
72
- @community_source.universe_graph.inject({}) do |truncated, (cookbook_name, version_and_deps_list)|
73
- sorted_versions = version_and_deps_list.keys.sort_by do |version_string|
74
- Semverse::Version.new(version_string)
75
- end
76
- greatest_version = sorted_versions.last
77
- truncated[cookbook_name] = { greatest_version => version_and_deps_list[greatest_version] }
78
- truncated
79
- end
80
- end
81
- end
82
-
83
- def desc
84
- "delivery_supermarket(#{uri})"
85
- end
86
-
87
- end
88
- end
89
- end
90
-
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 'forwardable'
19
+
20
+ require 'semverse'
21
+
22
+ require 'chef-dk/policyfile/community_cookbook_source'
23
+
24
+ module ChefDK
25
+ module Policyfile
26
+
27
+ # Fetches cookbooks from a supermarket, similar to CommunityCookbookSource
28
+ # (which it delegates to), except that only the latest versions of any
29
+ # cookbook can be used.
30
+ #
31
+ # This is intended to be used in an environment where the team wants to
32
+ # make only the newest version of a given cookbook available in order to
33
+ # force developers to integrate continuously at the component artifact
34
+ # (cookbook) level. To achieve this goal, two constraints must be imposed:
35
+ #
36
+ # * Cookbook changes pass through a Ci pipeline and are ultimately uploaded
37
+ # to a private supermarket (or equivalent, i.e. mini-mart) after final
38
+ # approval (which can be automated or not)
39
+ # * Version numbers for cookbooks that pass through the Ci pipeline always
40
+ # increase over time (so that largest version number == newest)
41
+ #
42
+ # In the future, alternative approaches may be persued to achieve the goal
43
+ # of continuously integrating at the cookbook level without imposing those
44
+ # constraints.
45
+ #
46
+ class DeliverySupermarketSource
47
+
48
+ extend Forwardable
49
+
50
+ def_delegator :@community_source, :uri
51
+ def_delegator :@community_source, :source_options_for
52
+ def_delegator :@community_source, :null?
53
+ def_delegator :@community_source, :preferred_cookbooks
54
+ def_delegator :@community_source, :preferred_source_for?
55
+ def_delegator :@community_source, :preferred_for
56
+
57
+ def initialize(uri)
58
+ @community_source = CommunityCookbookSource.new(uri)
59
+ yield self if block_given?
60
+ end
61
+
62
+ def ==(other)
63
+ other.kind_of?(self.class) && other.uri == uri
64
+ end
65
+
66
+ def default_source_args
67
+ [:delivery_supermarket, uri]
68
+ end
69
+
70
+ def universe_graph
71
+ @universe_graph ||= begin
72
+ @community_source.universe_graph.inject({}) do |truncated, (cookbook_name, version_and_deps_list)|
73
+ sorted_versions = version_and_deps_list.keys.sort_by do |version_string|
74
+ Semverse::Version.new(version_string)
75
+ end
76
+ greatest_version = sorted_versions.last
77
+ truncated[cookbook_name] = { greatest_version => version_and_deps_list[greatest_version] }
78
+ truncated
79
+ end
80
+ end
81
+ end
82
+
83
+ def desc
84
+ "delivery_supermarket(#{uri})"
85
+ end
86
+
87
+ end
88
+ end
89
+ end
90
+
@@ -1,266 +1,266 @@
1
- #
2
- # Copyright:: Copyright (c) 2015 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 'diff/lcs'
19
- require 'diff/lcs/hunk'
20
- require 'paint'
21
- require 'ffi_yajl'
22
-
23
- module ChefDK
24
- module Policyfile
25
- class Differ
26
-
27
- POLICY_SECTIONS = %w{ revision_id run_list named_run_lists cookbook_locks default_attributes override_attributes }.freeze
28
- LINES_OF_CONTEXT = 3
29
- INITIAL_FILE_LENGTH_DIFFERENCE = 0
30
- FORMAT = :unified
31
-
32
-
33
- attr_reader :old_lock
34
- attr_reader :old_name
35
- attr_reader :new_lock
36
- attr_reader :new_name
37
- attr_reader :ui
38
-
39
- def initialize(old_name: nil, old_lock: nil, new_name: nil, new_lock: nil, ui: nil)
40
- @old_lock = old_lock
41
- @new_lock = new_lock
42
- @old_name = old_name
43
- @new_name = new_name
44
- @ui = ui
45
-
46
- @added_cookbooks = nil
47
- @removed_cookbooks = nil
48
- @modified_cookbooks = nil
49
- end
50
-
51
- def lock_name
52
- old_lock["name"]
53
- end
54
-
55
- def old_cookbook_locks
56
- old_lock["cookbook_locks"]
57
- end
58
-
59
- def new_cookbook_locks
60
- new_lock["cookbook_locks"]
61
- end
62
-
63
- def updated_sections
64
- @updated_sections ||= POLICY_SECTIONS.select do |key|
65
- old_lock[key] != new_lock[key]
66
- end
67
- end
68
-
69
- def different?
70
- !updated_sections.empty?
71
- end
72
-
73
- def run_report
74
- unless different?
75
- ui.err("No changes for policy lock '#{lock_name}' between '#{old_name}' and '#{new_name}'")
76
- return true
77
- end
78
-
79
- ui.print("Policy lock '#{lock_name}' differs between '#{old_name}' and '#{new_name}':\n\n")
80
-
81
- report_rev_id_changes
82
- report_run_list_changes
83
- report_added_cookbooks
84
- report_removed_cookbooks
85
- report_modified_cookbooks
86
- report_default_attribute_changes
87
- report_override_attribute_changes
88
- end
89
-
90
- def report_rev_id_changes
91
- h1('REVISION ID CHANGED')
92
- old_rev = old_lock["revision_id"]
93
- new_rev = new_lock["revision_id"]
94
- diff_lines([ old_rev ], [ new_rev ])
95
- end
96
-
97
- def report_run_list_changes
98
- return nil unless updated_sections.include?("run_list")
99
- h1("RUN LIST CHANGED")
100
-
101
- old_run_list = old_lock["run_list"]
102
- new_run_list = new_lock["run_list"]
103
-
104
- diff_lines(old_run_list, new_run_list)
105
- end
106
-
107
- def report_removed_cookbooks
108
- return nil if removed_cookbooks.empty?
109
- h1("REMOVED COOKBOOKS")
110
- removed_cookbooks.each do |cb_name|
111
- ui.print("\n")
112
- old_lock = pretty_json(old_cookbook_locks[cb_name])
113
- new_lock = []
114
- h2(cb_name)
115
- diff_lines(old_lock, new_lock)
116
- end
117
- end
118
-
119
- def report_added_cookbooks
120
- return nil if added_cookbooks.empty?
121
- h1("ADDED COOKBOOKS")
122
- added_cookbooks.each do |cb_name|
123
- ui.print("\n")
124
- old_lock = []
125
- new_lock = pretty_json(new_cookbook_locks[cb_name])
126
- h2(cb_name)
127
- diff_lines(old_lock, new_lock)
128
- end
129
- end
130
-
131
- def report_modified_cookbooks
132
- return nil if modified_cookbooks.empty?
133
- h1("MODIFIED COOKBOOKS")
134
- modified_cookbooks.each do |cb_name|
135
- ui.print("\n")
136
- old_lock = pretty_json(old_cookbook_locks[cb_name])
137
- new_lock = pretty_json(new_cookbook_locks[cb_name])
138
- h2(cb_name)
139
- diff_lines(old_lock, new_lock)
140
- end
141
- end
142
-
143
- def report_default_attribute_changes
144
- return nil unless updated_sections.include?("default_attributes")
145
-
146
- h1("DEFAULT ATTRIBUTES CHANGED")
147
-
148
- old_default = pretty_json(old_lock["default_attributes"])
149
- new_default = pretty_json(new_lock["default_attributes"])
150
- diff_lines(old_default, new_default)
151
- end
152
-
153
- def report_override_attribute_changes
154
- return nil unless updated_sections.include?("override_attributes")
155
-
156
- h1("OVERRIDE ATTRIBUTES CHANGED")
157
-
158
- old_override = pretty_json(old_lock["override_attributes"])
159
- new_override = pretty_json(new_lock["override_attributes"])
160
- diff_lines(old_override, new_override)
161
- end
162
-
163
- def added_cookbooks
164
- detect_cookbook_changes if @added_cookbooks.nil?
165
- @added_cookbooks
166
- end
167
-
168
- def removed_cookbooks
169
- detect_cookbook_changes if @removed_cookbooks.nil?
170
- @removed_cookbooks
171
- end
172
-
173
- def modified_cookbooks
174
- detect_cookbook_changes if @modified_cookbooks.nil?
175
- @modified_cookbooks
176
- end
177
-
178
- private
179
-
180
- def h1(str)
181
- ui.msg(str)
182
- ui.msg('=' * str.size)
183
- end
184
-
185
- def h2(str)
186
- ui.msg(str)
187
- ui.msg('-' * str.size)
188
- end
189
-
190
- def diff_lines(old_lines, new_lines)
191
- file_length_difference = INITIAL_FILE_LENGTH_DIFFERENCE
192
-
193
- previous_hunk = nil
194
-
195
- diffs = Diff::LCS.diff(old_lines, new_lines)
196
-
197
- ui.print("\n")
198
-
199
- diffs.each do |piece|
200
- hunk = Diff::LCS::Hunk.new(old_lines, new_lines, piece, LINES_OF_CONTEXT, file_length_difference)
201
-
202
- file_length_difference = hunk.file_length_difference
203
-
204
- maybe_contiguous_hunks = (previous_hunk.nil? || hunk.merge(previous_hunk))
205
-
206
- if !maybe_contiguous_hunks
207
- print_color_diff("#{previous_hunk.diff(FORMAT)}\n")
208
- end
209
- previous_hunk = hunk
210
- end
211
- print_color_diff("#{previous_hunk.diff(FORMAT)}\n") unless previous_hunk.nil?
212
- ui.print("\n")
213
- end
214
-
215
- def print_color_diff(hunk)
216
- hunk.to_s.each_line do |line|
217
- ui.print(Paint[line, color_for_line(line)])
218
- end
219
- end
220
-
221
- def color_for_line(line)
222
- case line[0].chr
223
- when "+"
224
- :green
225
- when "-"
226
- :red
227
- when "@"
228
- line[1].chr == "@" ? :blue : nil
229
- else
230
- nil
231
- end
232
- end
233
-
234
- def pretty_json(data)
235
- FFI_Yajl::Encoder.encode(data, pretty: true).lines.map { |l| l.chomp }
236
- end
237
-
238
- def detect_cookbook_changes
239
- all_locked_cookbooks = old_cookbook_locks.keys | new_cookbook_locks.keys
240
-
241
- @added_cookbooks = []
242
- @removed_cookbooks = []
243
- @modified_cookbooks = []
244
-
245
- all_locked_cookbooks.each do |cb_name|
246
- if old_cookbook_locks.key?(cb_name) && new_cookbook_locks.key?(cb_name)
247
- old_cb_lock = old_cookbook_locks[cb_name]
248
- new_cb_lock = new_cookbook_locks[cb_name]
249
- if old_cb_lock != new_cb_lock
250
- @modified_cookbooks << cb_name
251
- end
252
- elsif old_cookbook_locks.key?(cb_name)
253
- @removed_cookbooks << cb_name
254
- elsif new_cookbook_locks.key?(cb_name)
255
- @added_cookbooks << cb_name
256
- else
257
- raise "Bug: cookbook lock #{cb_name} cannot be determined as new/removed/modified/unmodified"
258
- end
259
- end
260
- end
261
-
262
-
263
- end
264
- end
265
- end
266
-
1
+ #
2
+ # Copyright:: Copyright (c) 2015 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 'diff/lcs'
19
+ require 'diff/lcs/hunk'
20
+ require 'paint'
21
+ require 'ffi_yajl'
22
+
23
+ module ChefDK
24
+ module Policyfile
25
+ class Differ
26
+
27
+ POLICY_SECTIONS = %w{ revision_id run_list named_run_lists cookbook_locks default_attributes override_attributes }.freeze
28
+ LINES_OF_CONTEXT = 3
29
+ INITIAL_FILE_LENGTH_DIFFERENCE = 0
30
+ FORMAT = :unified
31
+
32
+
33
+ attr_reader :old_lock
34
+ attr_reader :old_name
35
+ attr_reader :new_lock
36
+ attr_reader :new_name
37
+ attr_reader :ui
38
+
39
+ def initialize(old_name: nil, old_lock: nil, new_name: nil, new_lock: nil, ui: nil)
40
+ @old_lock = old_lock
41
+ @new_lock = new_lock
42
+ @old_name = old_name
43
+ @new_name = new_name
44
+ @ui = ui
45
+
46
+ @added_cookbooks = nil
47
+ @removed_cookbooks = nil
48
+ @modified_cookbooks = nil
49
+ end
50
+
51
+ def lock_name
52
+ old_lock["name"]
53
+ end
54
+
55
+ def old_cookbook_locks
56
+ old_lock["cookbook_locks"]
57
+ end
58
+
59
+ def new_cookbook_locks
60
+ new_lock["cookbook_locks"]
61
+ end
62
+
63
+ def updated_sections
64
+ @updated_sections ||= POLICY_SECTIONS.select do |key|
65
+ old_lock[key] != new_lock[key]
66
+ end
67
+ end
68
+
69
+ def different?
70
+ !updated_sections.empty?
71
+ end
72
+
73
+ def run_report
74
+ unless different?
75
+ ui.err("No changes for policy lock '#{lock_name}' between '#{old_name}' and '#{new_name}'")
76
+ return true
77
+ end
78
+
79
+ ui.print("Policy lock '#{lock_name}' differs between '#{old_name}' and '#{new_name}':\n\n")
80
+
81
+ report_rev_id_changes
82
+ report_run_list_changes
83
+ report_added_cookbooks
84
+ report_removed_cookbooks
85
+ report_modified_cookbooks
86
+ report_default_attribute_changes
87
+ report_override_attribute_changes
88
+ end
89
+
90
+ def report_rev_id_changes
91
+ h1('REVISION ID CHANGED')
92
+ old_rev = old_lock["revision_id"]
93
+ new_rev = new_lock["revision_id"]
94
+ diff_lines([ old_rev ], [ new_rev ])
95
+ end
96
+
97
+ def report_run_list_changes
98
+ return nil unless updated_sections.include?("run_list")
99
+ h1("RUN LIST CHANGED")
100
+
101
+ old_run_list = old_lock["run_list"]
102
+ new_run_list = new_lock["run_list"]
103
+
104
+ diff_lines(old_run_list, new_run_list)
105
+ end
106
+
107
+ def report_removed_cookbooks
108
+ return nil if removed_cookbooks.empty?
109
+ h1("REMOVED COOKBOOKS")
110
+ removed_cookbooks.each do |cb_name|
111
+ ui.print("\n")
112
+ old_lock = pretty_json(old_cookbook_locks[cb_name])
113
+ new_lock = []
114
+ h2(cb_name)
115
+ diff_lines(old_lock, new_lock)
116
+ end
117
+ end
118
+
119
+ def report_added_cookbooks
120
+ return nil if added_cookbooks.empty?
121
+ h1("ADDED COOKBOOKS")
122
+ added_cookbooks.each do |cb_name|
123
+ ui.print("\n")
124
+ old_lock = []
125
+ new_lock = pretty_json(new_cookbook_locks[cb_name])
126
+ h2(cb_name)
127
+ diff_lines(old_lock, new_lock)
128
+ end
129
+ end
130
+
131
+ def report_modified_cookbooks
132
+ return nil if modified_cookbooks.empty?
133
+ h1("MODIFIED COOKBOOKS")
134
+ modified_cookbooks.each do |cb_name|
135
+ ui.print("\n")
136
+ old_lock = pretty_json(old_cookbook_locks[cb_name])
137
+ new_lock = pretty_json(new_cookbook_locks[cb_name])
138
+ h2(cb_name)
139
+ diff_lines(old_lock, new_lock)
140
+ end
141
+ end
142
+
143
+ def report_default_attribute_changes
144
+ return nil unless updated_sections.include?("default_attributes")
145
+
146
+ h1("DEFAULT ATTRIBUTES CHANGED")
147
+
148
+ old_default = pretty_json(old_lock["default_attributes"])
149
+ new_default = pretty_json(new_lock["default_attributes"])
150
+ diff_lines(old_default, new_default)
151
+ end
152
+
153
+ def report_override_attribute_changes
154
+ return nil unless updated_sections.include?("override_attributes")
155
+
156
+ h1("OVERRIDE ATTRIBUTES CHANGED")
157
+
158
+ old_override = pretty_json(old_lock["override_attributes"])
159
+ new_override = pretty_json(new_lock["override_attributes"])
160
+ diff_lines(old_override, new_override)
161
+ end
162
+
163
+ def added_cookbooks
164
+ detect_cookbook_changes if @added_cookbooks.nil?
165
+ @added_cookbooks
166
+ end
167
+
168
+ def removed_cookbooks
169
+ detect_cookbook_changes if @removed_cookbooks.nil?
170
+ @removed_cookbooks
171
+ end
172
+
173
+ def modified_cookbooks
174
+ detect_cookbook_changes if @modified_cookbooks.nil?
175
+ @modified_cookbooks
176
+ end
177
+
178
+ private
179
+
180
+ def h1(str)
181
+ ui.msg(str)
182
+ ui.msg('=' * str.size)
183
+ end
184
+
185
+ def h2(str)
186
+ ui.msg(str)
187
+ ui.msg('-' * str.size)
188
+ end
189
+
190
+ def diff_lines(old_lines, new_lines)
191
+ file_length_difference = INITIAL_FILE_LENGTH_DIFFERENCE
192
+
193
+ previous_hunk = nil
194
+
195
+ diffs = Diff::LCS.diff(old_lines, new_lines)
196
+
197
+ ui.print("\n")
198
+
199
+ diffs.each do |piece|
200
+ hunk = Diff::LCS::Hunk.new(old_lines, new_lines, piece, LINES_OF_CONTEXT, file_length_difference)
201
+
202
+ file_length_difference = hunk.file_length_difference
203
+
204
+ maybe_contiguous_hunks = (previous_hunk.nil? || hunk.merge(previous_hunk))
205
+
206
+ if !maybe_contiguous_hunks
207
+ print_color_diff("#{previous_hunk.diff(FORMAT)}\n")
208
+ end
209
+ previous_hunk = hunk
210
+ end
211
+ print_color_diff("#{previous_hunk.diff(FORMAT)}\n") unless previous_hunk.nil?
212
+ ui.print("\n")
213
+ end
214
+
215
+ def print_color_diff(hunk)
216
+ hunk.to_s.each_line do |line|
217
+ ui.print(Paint[line, color_for_line(line)])
218
+ end
219
+ end
220
+
221
+ def color_for_line(line)
222
+ case line[0].chr
223
+ when "+"
224
+ :green
225
+ when "-"
226
+ :red
227
+ when "@"
228
+ line[1].chr == "@" ? :blue : nil
229
+ else
230
+ nil
231
+ end
232
+ end
233
+
234
+ def pretty_json(data)
235
+ FFI_Yajl::Encoder.encode(data, pretty: true).lines.map { |l| l.chomp }
236
+ end
237
+
238
+ def detect_cookbook_changes
239
+ all_locked_cookbooks = old_cookbook_locks.keys | new_cookbook_locks.keys
240
+
241
+ @added_cookbooks = []
242
+ @removed_cookbooks = []
243
+ @modified_cookbooks = []
244
+
245
+ all_locked_cookbooks.each do |cb_name|
246
+ if old_cookbook_locks.key?(cb_name) && new_cookbook_locks.key?(cb_name)
247
+ old_cb_lock = old_cookbook_locks[cb_name]
248
+ new_cb_lock = new_cookbook_locks[cb_name]
249
+ if old_cb_lock != new_cb_lock
250
+ @modified_cookbooks << cb_name
251
+ end
252
+ elsif old_cookbook_locks.key?(cb_name)
253
+ @removed_cookbooks << cb_name
254
+ elsif new_cookbook_locks.key?(cb_name)
255
+ @added_cookbooks << cb_name
256
+ else
257
+ raise "Bug: cookbook lock #{cb_name} cannot be determined as new/removed/modified/unmodified"
258
+ end
259
+ end
260
+ end
261
+
262
+
263
+ end
264
+ end
265
+ end
266
+