chef-dk 0.13.21 → 0.14.25

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 (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,304 +1,304 @@
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 'spec_helper'
19
- require 'chef-dk/policyfile_services/undelete'
20
-
21
- describe ChefDK::PolicyfileServices::Undelete do
22
-
23
- let(:chef_config) { double("Chef::Config") }
24
-
25
- let(:ui) { TestHelpers::TestUI.new }
26
-
27
- let(:policy_name) { nil }
28
-
29
- let(:policy_group) { nil }
30
-
31
- let(:show_orphans) { false }
32
-
33
- let(:summary_diff) { false }
34
-
35
- let(:undo_dir) { tempdir }
36
-
37
- let(:undo_record_id) { nil }
38
-
39
- subject(:undelete_service) do
40
- described_class.new(config: chef_config,
41
- ui: ui,
42
- undo_record_id: undo_record_id)
43
- end
44
-
45
- describe "listing undo operations" do
46
-
47
- before do
48
- allow(undelete_service.undo_stack).to receive(:undo_dir).and_return(undo_dir)
49
- end
50
-
51
- after do
52
- clear_tempdir
53
- end
54
-
55
- context "when the undo dir doesn't exist" do
56
-
57
- let(:undo_dir) { File.join(tempdir, "this", "isnt", "here") }
58
-
59
- it "prints a message saying there aren't any things to undo to stderr" do
60
- undelete_service.list
61
- expect(ui.output).to eq("Nothing to undo.\n")
62
- end
63
-
64
- end
65
-
66
- context "when the undo dir exists, but it empty" do
67
-
68
- it "prints a message saying there aren't any things to undo to stderr" do
69
- undelete_service.list
70
- expect(ui.output).to eq("Nothing to undo.\n")
71
- end
72
-
73
- end
74
-
75
- context "when the undo dir exists and there are undo records in it" do
76
-
77
- let(:policy_revision) do
78
- {
79
- "name" => "appserver",
80
- "revision_id" => "1111111111111111111111111111111111111111111111111111111111111111"
81
- }
82
- end
83
-
84
- let(:undo_record1) do
85
- ChefDK::Policyfile::UndoRecord.new.tap do |undo_record|
86
- undo_record.description = "delete-policy-group example1"
87
- undo_record.add_policy_group("example1")
88
- undo_record.add_policy_revision("appserver", "example1", policy_revision)
89
- end
90
- end
91
-
92
- let(:undo_record2) do
93
- ChefDK::Policyfile::UndoRecord.new.tap do |undo_record|
94
- undo_record.description = "delete-policy-group example2"
95
- undo_record.add_policy_group("example2")
96
- undo_record.add_policy_revision("appserver", "example2", policy_revision)
97
- end
98
- end
99
-
100
- let(:undo_record3) do
101
- ChefDK::Policyfile::UndoRecord.new.tap do |undo_record|
102
- undo_record.description = "delete-policy-group example3"
103
- undo_record.add_policy_group("example3")
104
- undo_record.add_policy_revision("appserver", "example3", policy_revision)
105
- end
106
- end
107
-
108
- # `Time.new` is stubbed later on, need to force it to be evaluated before
109
- # then.
110
- let!(:start_time) { Time.new }
111
-
112
- def next_time
113
- @increment ||= 0
114
- @increment += 1
115
-
116
- start_time + @increment
117
- end
118
-
119
- let(:times) { [] }
120
-
121
- before do
122
- allow(Time).to receive(:new) do
123
- t = next_time
124
- times << t
125
- t
126
- end
127
- undo_stack = ChefDK::Policyfile::UndoStack.new
128
- allow(undo_stack).to receive(:undo_dir).and_return(undo_dir)
129
- undo_stack.push(undo_record1).push(undo_record2).push(undo_record3)
130
- end
131
-
132
- it "prints the items in reverse chronological order" do
133
- undelete_service.list
134
-
135
- timestamps = times.map { |t| t.utc.strftime("%Y%m%d%H%M%S") }
136
-
137
- expected_output = <<-OUTPUT
138
- #{timestamps[2]}: delete-policy-group example3
139
- #{timestamps[1]}: delete-policy-group example2
140
- #{timestamps[0]}: delete-policy-group example1
141
- OUTPUT
142
- expect(ui.output).to eq(expected_output)
143
- end
144
-
145
- end
146
-
147
- end
148
-
149
- describe "undoing a policy group delete" do
150
-
151
- let(:policy_revision) do
152
- {
153
- "name" => "appserver",
154
- "revision_id" => "1111111111111111111111111111111111111111111111111111111111111111"
155
- }
156
- end
157
-
158
- let(:undo_record1) do
159
- ChefDK::Policyfile::UndoRecord.new.tap do |undo_record|
160
- undo_record.description = "delete-policy-group example1"
161
- undo_record.add_policy_group("example1")
162
- undo_record.add_policy_revision("appserver", "example1", policy_revision)
163
- end
164
- end
165
-
166
- let(:undo_stack) do
167
- instance_double(ChefDK::Policyfile::UndoStack).tap do |s|
168
- allow(s).to receive(:pop).and_yield(undo_record1)
169
- end
170
- end
171
-
172
- let(:http_client) { instance_double(ChefDK::AuthenticatedHTTP) }
173
-
174
- before do
175
- allow(undelete_service).to receive(:http_client).and_return(http_client)
176
- allow(undelete_service).to receive(:undo_stack).and_return(undo_stack)
177
- end
178
-
179
- describe "when an error occurs posting data to the server" do
180
-
181
- let(:response) do
182
- Net::HTTPResponse.send(:response_class, "500").new("1.0", "500", "Internal Server Error").tap do |r|
183
- r.instance_variable_set(:@body, "oops")
184
- end
185
- end
186
-
187
- let(:http_exception) do
188
- begin
189
- response.error!
190
- rescue => e
191
- e
192
- end
193
- end
194
-
195
- before do
196
- expect(http_client).to receive(:put).
197
- with("/policy_groups/example1/policies/appserver", policy_revision).
198
- and_raise(http_exception)
199
- end
200
-
201
- it "raises an error" do
202
- expect { undelete_service.run }.to raise_error(ChefDK::UndeleteError)
203
- end
204
-
205
- end
206
-
207
- context "when the undelete is successful" do
208
-
209
- before do
210
- expect(http_client).to receive(:put).
211
- with("/policy_groups/example1/policies/appserver", policy_revision)
212
- end
213
-
214
- it "uploads all policies to the server" do
215
- undelete_service.run
216
- expect(ui.output).to eq("Restored policy 'appserver'\nRestored policy group 'example1'\n")
217
- end
218
-
219
- end
220
-
221
- context "when given a specific undo record id to undo" do
222
-
223
- let(:undo_record_id) { "20150827172127" }
224
-
225
- context "and the id doesn't exist" do
226
-
227
- before do
228
- expect(undo_stack).to receive(:has_id?).with(undo_record_id).and_return(false)
229
- end
230
-
231
- it "prints an error message that the id doesn't exist" do
232
- undelete_service.run
233
- expect(ui.output).to eq("No undo record with id '#{undo_record_id}' exists\n")
234
- end
235
-
236
- end
237
-
238
- context "and the id exists" do
239
- before do
240
- expect(undo_stack).to receive(:has_id?).with(undo_record_id).and_return(true)
241
- expect(undo_stack).to receive(:delete).with(undo_record_id).and_yield(undo_record1)
242
- expect(http_client).to receive(:put).
243
- with("/policy_groups/example1/policies/appserver", policy_revision)
244
- end
245
-
246
- it "uploads all policies to the server" do
247
- undelete_service.run
248
- expect(ui.output).to eq("Restored policy 'appserver'\nRestored policy group 'example1'\n")
249
- end
250
-
251
- end
252
-
253
- end
254
-
255
- end
256
-
257
- describe "undoing a policy delete" do
258
-
259
- let(:policy_revision) do
260
- {
261
- "name" => "appserver",
262
- "revision_id" => "1111111111111111111111111111111111111111111111111111111111111111"
263
- }
264
- end
265
-
266
- let(:undo_record1) do
267
- ChefDK::Policyfile::UndoRecord.new.tap do |undo_record|
268
- undo_record.description = "delete-policy-group example1"
269
- undo_record.add_policy_revision("appserver", nil, policy_revision)
270
- end
271
- end
272
-
273
- let(:undo_stack) do
274
- instance_double(ChefDK::Policyfile::UndoStack).tap do |s|
275
- allow(s).to receive(:pop).and_yield(undo_record1)
276
- end
277
- end
278
-
279
- let(:http_client) { instance_double(ChefDK::AuthenticatedHTTP) }
280
-
281
- before do
282
- allow(undelete_service).to receive(:http_client).and_return(http_client)
283
- allow(undelete_service).to receive(:undo_stack).and_return(undo_stack)
284
- end
285
-
286
- context "when the revision to create doesn't exist" do
287
-
288
- before do
289
- expect(http_client).to receive(:post).
290
- with("/policies/appserver/revisions", policy_revision)
291
- end
292
-
293
- it "uploads all policies to the server" do
294
- undelete_service.run
295
- expect(ui.output).to eq("Restored policy 'appserver'\n")
296
- end
297
-
298
- end
299
-
300
- end
301
-
302
-
303
- end
304
-
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 'spec_helper'
19
+ require 'chef-dk/policyfile_services/undelete'
20
+
21
+ describe ChefDK::PolicyfileServices::Undelete do
22
+
23
+ let(:chef_config) { double("Chef::Config") }
24
+
25
+ let(:ui) { TestHelpers::TestUI.new }
26
+
27
+ let(:policy_name) { nil }
28
+
29
+ let(:policy_group) { nil }
30
+
31
+ let(:show_orphans) { false }
32
+
33
+ let(:summary_diff) { false }
34
+
35
+ let(:undo_dir) { tempdir }
36
+
37
+ let(:undo_record_id) { nil }
38
+
39
+ subject(:undelete_service) do
40
+ described_class.new(config: chef_config,
41
+ ui: ui,
42
+ undo_record_id: undo_record_id)
43
+ end
44
+
45
+ describe "listing undo operations" do
46
+
47
+ before do
48
+ allow(undelete_service.undo_stack).to receive(:undo_dir).and_return(undo_dir)
49
+ end
50
+
51
+ after do
52
+ clear_tempdir
53
+ end
54
+
55
+ context "when the undo dir doesn't exist" do
56
+
57
+ let(:undo_dir) { File.join(tempdir, "this", "isnt", "here") }
58
+
59
+ it "prints a message saying there aren't any things to undo to stderr" do
60
+ undelete_service.list
61
+ expect(ui.output).to eq("Nothing to undo.\n")
62
+ end
63
+
64
+ end
65
+
66
+ context "when the undo dir exists, but it empty" do
67
+
68
+ it "prints a message saying there aren't any things to undo to stderr" do
69
+ undelete_service.list
70
+ expect(ui.output).to eq("Nothing to undo.\n")
71
+ end
72
+
73
+ end
74
+
75
+ context "when the undo dir exists and there are undo records in it" do
76
+
77
+ let(:policy_revision) do
78
+ {
79
+ "name" => "appserver",
80
+ "revision_id" => "1111111111111111111111111111111111111111111111111111111111111111"
81
+ }
82
+ end
83
+
84
+ let(:undo_record1) do
85
+ ChefDK::Policyfile::UndoRecord.new.tap do |undo_record|
86
+ undo_record.description = "delete-policy-group example1"
87
+ undo_record.add_policy_group("example1")
88
+ undo_record.add_policy_revision("appserver", "example1", policy_revision)
89
+ end
90
+ end
91
+
92
+ let(:undo_record2) do
93
+ ChefDK::Policyfile::UndoRecord.new.tap do |undo_record|
94
+ undo_record.description = "delete-policy-group example2"
95
+ undo_record.add_policy_group("example2")
96
+ undo_record.add_policy_revision("appserver", "example2", policy_revision)
97
+ end
98
+ end
99
+
100
+ let(:undo_record3) do
101
+ ChefDK::Policyfile::UndoRecord.new.tap do |undo_record|
102
+ undo_record.description = "delete-policy-group example3"
103
+ undo_record.add_policy_group("example3")
104
+ undo_record.add_policy_revision("appserver", "example3", policy_revision)
105
+ end
106
+ end
107
+
108
+ # `Time.new` is stubbed later on, need to force it to be evaluated before
109
+ # then.
110
+ let!(:start_time) { Time.new }
111
+
112
+ def next_time
113
+ @increment ||= 0
114
+ @increment += 1
115
+
116
+ start_time + @increment
117
+ end
118
+
119
+ let(:times) { [] }
120
+
121
+ before do
122
+ allow(Time).to receive(:new) do
123
+ t = next_time
124
+ times << t
125
+ t
126
+ end
127
+ undo_stack = ChefDK::Policyfile::UndoStack.new
128
+ allow(undo_stack).to receive(:undo_dir).and_return(undo_dir)
129
+ undo_stack.push(undo_record1).push(undo_record2).push(undo_record3)
130
+ end
131
+
132
+ it "prints the items in reverse chronological order" do
133
+ undelete_service.list
134
+
135
+ timestamps = times.map { |t| t.utc.strftime("%Y%m%d%H%M%S") }
136
+
137
+ expected_output = <<-OUTPUT
138
+ #{timestamps[2]}: delete-policy-group example3
139
+ #{timestamps[1]}: delete-policy-group example2
140
+ #{timestamps[0]}: delete-policy-group example1
141
+ OUTPUT
142
+ expect(ui.output).to eq(expected_output)
143
+ end
144
+
145
+ end
146
+
147
+ end
148
+
149
+ describe "undoing a policy group delete" do
150
+
151
+ let(:policy_revision) do
152
+ {
153
+ "name" => "appserver",
154
+ "revision_id" => "1111111111111111111111111111111111111111111111111111111111111111"
155
+ }
156
+ end
157
+
158
+ let(:undo_record1) do
159
+ ChefDK::Policyfile::UndoRecord.new.tap do |undo_record|
160
+ undo_record.description = "delete-policy-group example1"
161
+ undo_record.add_policy_group("example1")
162
+ undo_record.add_policy_revision("appserver", "example1", policy_revision)
163
+ end
164
+ end
165
+
166
+ let(:undo_stack) do
167
+ instance_double(ChefDK::Policyfile::UndoStack).tap do |s|
168
+ allow(s).to receive(:pop).and_yield(undo_record1)
169
+ end
170
+ end
171
+
172
+ let(:http_client) { instance_double(ChefDK::AuthenticatedHTTP) }
173
+
174
+ before do
175
+ allow(undelete_service).to receive(:http_client).and_return(http_client)
176
+ allow(undelete_service).to receive(:undo_stack).and_return(undo_stack)
177
+ end
178
+
179
+ describe "when an error occurs posting data to the server" do
180
+
181
+ let(:response) do
182
+ Net::HTTPResponse.send(:response_class, "500").new("1.0", "500", "Internal Server Error").tap do |r|
183
+ r.instance_variable_set(:@body, "oops")
184
+ end
185
+ end
186
+
187
+ let(:http_exception) do
188
+ begin
189
+ response.error!
190
+ rescue => e
191
+ e
192
+ end
193
+ end
194
+
195
+ before do
196
+ expect(http_client).to receive(:put).
197
+ with("/policy_groups/example1/policies/appserver", policy_revision).
198
+ and_raise(http_exception)
199
+ end
200
+
201
+ it "raises an error" do
202
+ expect { undelete_service.run }.to raise_error(ChefDK::UndeleteError)
203
+ end
204
+
205
+ end
206
+
207
+ context "when the undelete is successful" do
208
+
209
+ before do
210
+ expect(http_client).to receive(:put).
211
+ with("/policy_groups/example1/policies/appserver", policy_revision)
212
+ end
213
+
214
+ it "uploads all policies to the server" do
215
+ undelete_service.run
216
+ expect(ui.output).to eq("Restored policy 'appserver'\nRestored policy group 'example1'\n")
217
+ end
218
+
219
+ end
220
+
221
+ context "when given a specific undo record id to undo" do
222
+
223
+ let(:undo_record_id) { "20150827172127" }
224
+
225
+ context "and the id doesn't exist" do
226
+
227
+ before do
228
+ expect(undo_stack).to receive(:has_id?).with(undo_record_id).and_return(false)
229
+ end
230
+
231
+ it "prints an error message that the id doesn't exist" do
232
+ undelete_service.run
233
+ expect(ui.output).to eq("No undo record with id '#{undo_record_id}' exists\n")
234
+ end
235
+
236
+ end
237
+
238
+ context "and the id exists" do
239
+ before do
240
+ expect(undo_stack).to receive(:has_id?).with(undo_record_id).and_return(true)
241
+ expect(undo_stack).to receive(:delete).with(undo_record_id).and_yield(undo_record1)
242
+ expect(http_client).to receive(:put).
243
+ with("/policy_groups/example1/policies/appserver", policy_revision)
244
+ end
245
+
246
+ it "uploads all policies to the server" do
247
+ undelete_service.run
248
+ expect(ui.output).to eq("Restored policy 'appserver'\nRestored policy group 'example1'\n")
249
+ end
250
+
251
+ end
252
+
253
+ end
254
+
255
+ end
256
+
257
+ describe "undoing a policy delete" do
258
+
259
+ let(:policy_revision) do
260
+ {
261
+ "name" => "appserver",
262
+ "revision_id" => "1111111111111111111111111111111111111111111111111111111111111111"
263
+ }
264
+ end
265
+
266
+ let(:undo_record1) do
267
+ ChefDK::Policyfile::UndoRecord.new.tap do |undo_record|
268
+ undo_record.description = "delete-policy-group example1"
269
+ undo_record.add_policy_revision("appserver", nil, policy_revision)
270
+ end
271
+ end
272
+
273
+ let(:undo_stack) do
274
+ instance_double(ChefDK::Policyfile::UndoStack).tap do |s|
275
+ allow(s).to receive(:pop).and_yield(undo_record1)
276
+ end
277
+ end
278
+
279
+ let(:http_client) { instance_double(ChefDK::AuthenticatedHTTP) }
280
+
281
+ before do
282
+ allow(undelete_service).to receive(:http_client).and_return(http_client)
283
+ allow(undelete_service).to receive(:undo_stack).and_return(undo_stack)
284
+ end
285
+
286
+ context "when the revision to create doesn't exist" do
287
+
288
+ before do
289
+ expect(http_client).to receive(:post).
290
+ with("/policies/appserver/revisions", policy_revision)
291
+ end
292
+
293
+ it "uploads all policies to the server" do
294
+ undelete_service.run
295
+ expect(ui.output).to eq("Restored policy 'appserver'\n")
296
+ end
297
+
298
+ end
299
+
300
+ end
301
+
302
+
303
+ end
304
+