chef-dk 0.14.25 → 0.15.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (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
@@ -1,261 +1,261 @@
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/cookbook_sources'
19
- require 'chef-dk/policyfile/cookbook_location_specification'
20
- require 'chef-dk/policyfile/storage_config'
21
-
22
- require 'chef/node/attribute'
23
- require 'chef/run_list/run_list_item'
24
-
25
- module ChefDK
26
- module Policyfile
27
- class DSL
28
-
29
- RUN_LIST_ITEM_COMPONENT = %r/^[.[:alnum:]_-]+$/.freeze
30
-
31
- include StorageConfigDelegation
32
-
33
- attr_writer :name
34
-
35
- attr_reader :errors
36
- attr_reader :run_list
37
- attr_reader :default_source
38
- attr_reader :cookbook_location_specs
39
-
40
- attr_reader :named_run_lists
41
- attr_reader :node_attributes
42
-
43
- attr_reader :storage_config
44
-
45
- def initialize(storage_config)
46
- @name = nil
47
- @errors = []
48
- @run_list = []
49
- @named_run_lists = {}
50
- @default_source = [ NullCookbookSource.new ]
51
- @cookbook_location_specs = {}
52
- @storage_config = storage_config
53
-
54
- @node_attributes = Chef::Node::Attribute.new({}, {}, {}, {})
55
- end
56
-
57
- def name(name = nil)
58
- unless name.nil?
59
- @name = name
60
- end
61
- @name
62
- end
63
-
64
- def run_list(*run_list_items)
65
- run_list_items = run_list_items.flatten
66
- unless run_list_items.empty?
67
- validate_run_list_items(run_list_items)
68
- @run_list = run_list_items
69
- end
70
- @run_list
71
- end
72
-
73
- def named_run_list(name, *run_list_items)
74
- run_list_items = run_list_items.flatten
75
- unless run_list_items.empty?
76
- validate_run_list_items(run_list_items, name)
77
- @named_run_lists[name] = run_list_items
78
- end
79
- @named_run_lists[name]
80
- end
81
-
82
- def default_source(source_type = nil, source_argument = nil, &block)
83
- return @default_source if source_type.nil?
84
- case source_type
85
- when :community, :supermarket
86
- set_default_community_source(source_argument, &block)
87
- when :delivery_supermarket
88
- set_default_delivery_supermarket_source(source_argument, &block)
89
- when :chef_server
90
- set_default_chef_server_source(source_argument, &block)
91
- when :chef_repo
92
- set_default_chef_repo_source(source_argument, &block)
93
- else
94
- @errors << "Invalid default_source type '#{source_type.inspect}'"
95
- end
96
- end
97
-
98
- def cookbook(name, *version_and_source_opts)
99
- source_options =
100
- if version_and_source_opts.last.is_a?(Hash)
101
- version_and_source_opts.pop
102
- else
103
- {}
104
- end
105
-
106
- constraint = version_and_source_opts.first || ">= 0.0.0"
107
- spec = CookbookLocationSpecification.new(name, constraint, source_options, storage_config)
108
-
109
-
110
- if existing_source = @cookbook_location_specs[name]
111
- err = "Cookbook '#{name}' assigned to conflicting sources\n\n"
112
- err << "Previous source: #{existing_source.source_options.inspect}\n"
113
- err << "Conflicts with: #{source_options.inspect}\n"
114
- @errors << err
115
- else
116
- @cookbook_location_specs[name] = spec
117
- @errors += spec.errors
118
- end
119
- end
120
-
121
- def default
122
- @node_attributes.default
123
- end
124
-
125
- def override
126
- @node_attributes.override
127
- end
128
-
129
- def eval_policyfile(policyfile_string)
130
- @policyfile_filename = policyfile_filename
131
- instance_eval(policyfile_string, policyfile_filename)
132
- validate!
133
- self
134
- rescue SyntaxError => e
135
- @errors << "Invalid ruby syntax in policyfile '#{policyfile_filename}':\n\n#{e.message}"
136
- rescue SignalException, SystemExit
137
- # allow signal from kill, ctrl-C, etc. to bubble up:
138
- raise
139
- rescue Exception => e
140
- error_message = "Evaluation of policyfile '#{policyfile_filename}' raised an exception\n"
141
- error_message << " Exception: #{e.class.name} \"#{e.to_s}\"\n\n"
142
- trace = filtered_bt(policyfile_filename, e)
143
- error_message << " Relevant Code:\n"
144
- error_message << " #{error_context(policyfile_string, policyfile_filename, e)}\n\n"
145
- unless trace.empty?
146
- error_message << " Backtrace:\n"
147
- # TODO: need a way to disable filtering
148
- error_message << filtered_bt(policyfile_filename, e).inject("") { |formatted_trace, line| formatted_trace << " #{line}\n" }
149
- end
150
- @errors << error_message
151
- end
152
-
153
- private
154
-
155
- def set_default_community_source(source_uri, &block)
156
- set_default_source(CommunityCookbookSource.new(source_uri, &block))
157
- end
158
-
159
- def set_default_delivery_supermarket_source(source_uri, &block)
160
- if source_uri.nil?
161
- @errors << "You must specify the server's URI when using a default_source :delivery_supermarket"
162
- else
163
- set_default_source(DeliverySupermarketSource.new(source_uri, &block))
164
- end
165
- end
166
-
167
- def set_default_chef_server_source(source_uri, &block)
168
- if source_uri.nil?
169
- @errors << "You must specify the server's URI when using a default_source :chef_server"
170
- else
171
- set_default_source(ChefServerCookbookSource.new(source_uri))
172
- end
173
- end
174
-
175
- def set_default_chef_repo_source(path, &block)
176
- if path.nil?
177
- @errors << "You must specify the path to the chef-repo when using a default_source :chef_repo"
178
- else
179
- set_default_source(ChefRepoCookbookSource.new(File.expand_path(path, storage_config.relative_paths_root), &block))
180
- end
181
- end
182
-
183
- def set_default_source(source)
184
- @default_source.delete_at(0) if @default_source[0].null?
185
- @default_source << source
186
- end
187
-
188
- def validate!
189
- if @run_list.empty?
190
- @errors << "Invalid run_list. run_list cannot be empty"
191
- end
192
-
193
- handle_preferred_cookbooks_conflicts
194
- end
195
-
196
- def validate_run_list_items(items, run_list_name = nil)
197
- items.each do |item|
198
-
199
- run_list_desc = run_list_name.nil? ? "Run List Item '#{item}'" : "Named Run List '#{run_list_name}' Item '#{item}'"
200
-
201
- item_name = Chef::RunList::RunListItem.new(item).name
202
- cookbook, separator, recipe = item_name.partition('::')
203
-
204
- if RUN_LIST_ITEM_COMPONENT.match(cookbook).nil?
205
- message = "#{run_list_desc} has invalid cookbook name '#{cookbook}'.\nCookbook names can only contain alphanumerics, hyphens, and underscores."
206
-
207
- # Special case when there's only one colon instead of two:
208
- if cookbook =~ /[^:]:[^:]/
209
- message << "\nDid you mean '#{item.sub(":", "::")}'?"
210
- end
211
-
212
- @errors << message
213
- end
214
- unless separator.empty?
215
- # we have a cookbook and recipe
216
- if RUN_LIST_ITEM_COMPONENT.match(recipe).nil?
217
- @errors << "#{run_list_desc} has invalid recipe name '#{recipe}'.\nRecipe names can only contain alphanumerics, hyphens, and underscores."
218
- end
219
- end
220
- end
221
- end
222
-
223
- def handle_preferred_cookbooks_conflicts
224
- conflicting_source_messages = []
225
- default_source.combination(2).each do |source_a, source_b|
226
- conflicting_preferences = source_a.preferred_cookbooks & source_b.preferred_cookbooks
227
- next if conflicting_preferences.empty?
228
- conflicting_source_messages << "#{source_a.desc} and #{source_b.desc} are both set as the preferred source for cookbook(s) '#{conflicting_preferences.join(', ')}'"
229
- end
230
- unless conflicting_source_messages.empty?
231
- msg = "Multiple sources are marked as the preferred source for some cookbooks. Only one source can be preferred for a cookbook.\n"
232
- msg << conflicting_source_messages.join("\n") << "\n"
233
- @errors << msg
234
- end
235
- end
236
-
237
- def error_context(policyfile_string, policyfile_filename, exception)
238
- if line_number_to_show = culprit_line_number(policyfile_filename, exception)
239
- code = policyfile_string.lines.to_a[line_number_to_show - 1].strip
240
- "#{line_number_to_show}: #{code}"
241
- else
242
- "Could not find relevant code from backtrace"
243
- end
244
- end
245
-
246
- def culprit_line_number(policyfile_filename, exception)
247
- if most_proximate_backtrace_line = filtered_bt(policyfile_filename, exception).first
248
- most_proximate_backtrace_line[/^(?:.\:)?[^:]+:([\d]+)/,1].to_i
249
- else
250
- nil
251
- end
252
- end
253
-
254
- def filtered_bt(policyfile_filename, exception)
255
- policyfile_filename_matcher = /^#{Regexp.escape(policyfile_filename)}/
256
- exception.backtrace.select {|line| line =~ policyfile_filename_matcher }
257
- end
258
-
259
- end
260
- end
261
- end
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/cookbook_sources'
19
+ require 'chef-dk/policyfile/cookbook_location_specification'
20
+ require 'chef-dk/policyfile/storage_config'
21
+
22
+ require 'chef/node/attribute'
23
+ require 'chef/run_list/run_list_item'
24
+
25
+ module ChefDK
26
+ module Policyfile
27
+ class DSL
28
+
29
+ RUN_LIST_ITEM_COMPONENT = %r/^[.[:alnum:]_-]+$/.freeze
30
+
31
+ include StorageConfigDelegation
32
+
33
+ attr_writer :name
34
+
35
+ attr_reader :errors
36
+ attr_reader :run_list
37
+ attr_reader :default_source
38
+ attr_reader :cookbook_location_specs
39
+
40
+ attr_reader :named_run_lists
41
+ attr_reader :node_attributes
42
+
43
+ attr_reader :storage_config
44
+
45
+ def initialize(storage_config)
46
+ @name = nil
47
+ @errors = []
48
+ @run_list = []
49
+ @named_run_lists = {}
50
+ @default_source = [ NullCookbookSource.new ]
51
+ @cookbook_location_specs = {}
52
+ @storage_config = storage_config
53
+
54
+ @node_attributes = Chef::Node::Attribute.new({}, {}, {}, {})
55
+ end
56
+
57
+ def name(name = nil)
58
+ unless name.nil?
59
+ @name = name
60
+ end
61
+ @name
62
+ end
63
+
64
+ def run_list(*run_list_items)
65
+ run_list_items = run_list_items.flatten
66
+ unless run_list_items.empty?
67
+ validate_run_list_items(run_list_items)
68
+ @run_list = run_list_items
69
+ end
70
+ @run_list
71
+ end
72
+
73
+ def named_run_list(name, *run_list_items)
74
+ run_list_items = run_list_items.flatten
75
+ unless run_list_items.empty?
76
+ validate_run_list_items(run_list_items, name)
77
+ @named_run_lists[name] = run_list_items
78
+ end
79
+ @named_run_lists[name]
80
+ end
81
+
82
+ def default_source(source_type = nil, source_argument = nil, &block)
83
+ return @default_source if source_type.nil?
84
+ case source_type
85
+ when :community, :supermarket
86
+ set_default_community_source(source_argument, &block)
87
+ when :delivery_supermarket
88
+ set_default_delivery_supermarket_source(source_argument, &block)
89
+ when :chef_server
90
+ set_default_chef_server_source(source_argument, &block)
91
+ when :chef_repo
92
+ set_default_chef_repo_source(source_argument, &block)
93
+ else
94
+ @errors << "Invalid default_source type '#{source_type.inspect}'"
95
+ end
96
+ end
97
+
98
+ def cookbook(name, *version_and_source_opts)
99
+ source_options =
100
+ if version_and_source_opts.last.is_a?(Hash)
101
+ version_and_source_opts.pop
102
+ else
103
+ {}
104
+ end
105
+
106
+ constraint = version_and_source_opts.first || ">= 0.0.0"
107
+ spec = CookbookLocationSpecification.new(name, constraint, source_options, storage_config)
108
+
109
+
110
+ if existing_source = @cookbook_location_specs[name]
111
+ err = "Cookbook '#{name}' assigned to conflicting sources\n\n"
112
+ err << "Previous source: #{existing_source.source_options.inspect}\n"
113
+ err << "Conflicts with: #{source_options.inspect}\n"
114
+ @errors << err
115
+ else
116
+ @cookbook_location_specs[name] = spec
117
+ @errors += spec.errors
118
+ end
119
+ end
120
+
121
+ def default
122
+ @node_attributes.default
123
+ end
124
+
125
+ def override
126
+ @node_attributes.override
127
+ end
128
+
129
+ def eval_policyfile(policyfile_string)
130
+ @policyfile_filename = policyfile_filename
131
+ instance_eval(policyfile_string, policyfile_filename)
132
+ validate!
133
+ self
134
+ rescue SyntaxError => e
135
+ @errors << "Invalid ruby syntax in policyfile '#{policyfile_filename}':\n\n#{e.message}"
136
+ rescue SignalException, SystemExit
137
+ # allow signal from kill, ctrl-C, etc. to bubble up:
138
+ raise
139
+ rescue Exception => e
140
+ error_message = "Evaluation of policyfile '#{policyfile_filename}' raised an exception\n"
141
+ error_message << " Exception: #{e.class.name} \"#{e.to_s}\"\n\n"
142
+ trace = filtered_bt(policyfile_filename, e)
143
+ error_message << " Relevant Code:\n"
144
+ error_message << " #{error_context(policyfile_string, policyfile_filename, e)}\n\n"
145
+ unless trace.empty?
146
+ error_message << " Backtrace:\n"
147
+ # TODO: need a way to disable filtering
148
+ error_message << filtered_bt(policyfile_filename, e).inject("") { |formatted_trace, line| formatted_trace << " #{line}\n" }
149
+ end
150
+ @errors << error_message
151
+ end
152
+
153
+ private
154
+
155
+ def set_default_community_source(source_uri, &block)
156
+ set_default_source(CommunityCookbookSource.new(source_uri, &block))
157
+ end
158
+
159
+ def set_default_delivery_supermarket_source(source_uri, &block)
160
+ if source_uri.nil?
161
+ @errors << "You must specify the server's URI when using a default_source :delivery_supermarket"
162
+ else
163
+ set_default_source(DeliverySupermarketSource.new(source_uri, &block))
164
+ end
165
+ end
166
+
167
+ def set_default_chef_server_source(source_uri, &block)
168
+ if source_uri.nil?
169
+ @errors << "You must specify the server's URI when using a default_source :chef_server"
170
+ else
171
+ set_default_source(ChefServerCookbookSource.new(source_uri))
172
+ end
173
+ end
174
+
175
+ def set_default_chef_repo_source(path, &block)
176
+ if path.nil?
177
+ @errors << "You must specify the path to the chef-repo when using a default_source :chef_repo"
178
+ else
179
+ set_default_source(ChefRepoCookbookSource.new(File.expand_path(path, storage_config.relative_paths_root), &block))
180
+ end
181
+ end
182
+
183
+ def set_default_source(source)
184
+ @default_source.delete_at(0) if @default_source[0].null?
185
+ @default_source << source
186
+ end
187
+
188
+ def validate!
189
+ if @run_list.empty?
190
+ @errors << "Invalid run_list. run_list cannot be empty"
191
+ end
192
+
193
+ handle_preferred_cookbooks_conflicts
194
+ end
195
+
196
+ def validate_run_list_items(items, run_list_name = nil)
197
+ items.each do |item|
198
+
199
+ run_list_desc = run_list_name.nil? ? "Run List Item '#{item}'" : "Named Run List '#{run_list_name}' Item '#{item}'"
200
+
201
+ item_name = Chef::RunList::RunListItem.new(item).name
202
+ cookbook, separator, recipe = item_name.partition('::')
203
+
204
+ if RUN_LIST_ITEM_COMPONENT.match(cookbook).nil?
205
+ message = "#{run_list_desc} has invalid cookbook name '#{cookbook}'.\nCookbook names can only contain alphanumerics, hyphens, and underscores."
206
+
207
+ # Special case when there's only one colon instead of two:
208
+ if cookbook =~ /[^:]:[^:]/
209
+ message << "\nDid you mean '#{item.sub(":", "::")}'?"
210
+ end
211
+
212
+ @errors << message
213
+ end
214
+ unless separator.empty?
215
+ # we have a cookbook and recipe
216
+ if RUN_LIST_ITEM_COMPONENT.match(recipe).nil?
217
+ @errors << "#{run_list_desc} has invalid recipe name '#{recipe}'.\nRecipe names can only contain alphanumerics, hyphens, and underscores."
218
+ end
219
+ end
220
+ end
221
+ end
222
+
223
+ def handle_preferred_cookbooks_conflicts
224
+ conflicting_source_messages = []
225
+ default_source.combination(2).each do |source_a, source_b|
226
+ conflicting_preferences = source_a.preferred_cookbooks & source_b.preferred_cookbooks
227
+ next if conflicting_preferences.empty?
228
+ conflicting_source_messages << "#{source_a.desc} and #{source_b.desc} are both set as the preferred source for cookbook(s) '#{conflicting_preferences.join(', ')}'"
229
+ end
230
+ unless conflicting_source_messages.empty?
231
+ msg = "Multiple sources are marked as the preferred source for some cookbooks. Only one source can be preferred for a cookbook.\n"
232
+ msg << conflicting_source_messages.join("\n") << "\n"
233
+ @errors << msg
234
+ end
235
+ end
236
+
237
+ def error_context(policyfile_string, policyfile_filename, exception)
238
+ if line_number_to_show = culprit_line_number(policyfile_filename, exception)
239
+ code = policyfile_string.lines.to_a[line_number_to_show - 1].strip
240
+ "#{line_number_to_show}: #{code}"
241
+ else
242
+ "Could not find relevant code from backtrace"
243
+ end
244
+ end
245
+
246
+ def culprit_line_number(policyfile_filename, exception)
247
+ if most_proximate_backtrace_line = filtered_bt(policyfile_filename, exception).first
248
+ most_proximate_backtrace_line[/^(?:.\:)?[^:]+:([\d]+)/,1].to_i
249
+ else
250
+ nil
251
+ end
252
+ end
253
+
254
+ def filtered_bt(policyfile_filename, exception)
255
+ policyfile_filename_matcher = /^#{Regexp.escape(policyfile_filename)}/
256
+ exception.backtrace.select {|line| line =~ policyfile_filename_matcher }
257
+ end
258
+
259
+ end
260
+ end
261
+ end