chef 11.4.4 → 11.6.0.hotfix.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (504) hide show
  1. data/README.md +1 -1
  2. data/Rakefile +18 -1
  3. data/bin/chef-service-manager +37 -0
  4. data/distro/common/html/chef-client.8.html +4 -4
  5. data/distro/common/html/chef-expander.8.html +4 -4
  6. data/distro/common/html/chef-expanderctl.8.html +4 -4
  7. data/distro/common/html/chef-server-webui.8.html +4 -4
  8. data/distro/common/html/chef-server.8.html +4 -4
  9. data/distro/common/html/chef-shell.1.html +4 -4
  10. data/distro/common/html/chef-solo.8.html +12 -18
  11. data/distro/common/html/chef-solr.8.html +4 -4
  12. data/distro/common/html/knife-bootstrap.1.html +4 -4
  13. data/distro/common/html/knife-client.1.html +4 -4
  14. data/distro/common/html/knife-configure.1.html +4 -4
  15. data/distro/common/html/knife-cookbook-site.1.html +4 -4
  16. data/distro/common/html/knife-cookbook.1.html +7 -10
  17. data/distro/common/html/knife-data-bag.1.html +7 -10
  18. data/distro/common/html/knife-environment.1.html +6 -8
  19. data/distro/common/html/knife-exec.1.html +4 -4
  20. data/distro/common/html/knife-index.1.html +4 -4
  21. data/distro/common/html/knife-node.1.html +4 -4
  22. data/distro/common/html/knife-role.1.html +4 -4
  23. data/distro/common/html/knife-search.1.html +4 -4
  24. data/distro/common/html/knife-ssh.1.html +4 -4
  25. data/distro/common/html/knife-status.1.html +4 -4
  26. data/distro/common/html/knife-tag.1.html +4 -4
  27. data/distro/common/html/knife.1.html +4 -4
  28. data/distro/common/man/man1/chef-shell.1 +1 -1
  29. data/distro/common/man/man1/knife-bootstrap.1 +1 -1
  30. data/distro/common/man/man1/knife-client.1 +1 -1
  31. data/distro/common/man/man1/knife-configure.1 +1 -1
  32. data/distro/common/man/man1/knife-cookbook-site.1 +1 -1
  33. data/distro/common/man/man1/knife-cookbook.1 +2 -15
  34. data/distro/common/man/man1/knife-data-bag.1 +2 -15
  35. data/distro/common/man/man1/knife-environment.1 +2 -12
  36. data/distro/common/man/man1/knife-exec.1 +1 -1
  37. data/distro/common/man/man1/knife-index.1 +1 -1
  38. data/distro/common/man/man1/knife-node.1 +1 -1
  39. data/distro/common/man/man1/knife-role.1 +1 -1
  40. data/distro/common/man/man1/knife-search.1 +1 -1
  41. data/distro/common/man/man1/knife-ssh.1 +1 -1
  42. data/distro/common/man/man1/knife-status.1 +1 -1
  43. data/distro/common/man/man1/knife-tag.1 +1 -1
  44. data/distro/common/man/man1/knife.1 +1 -1
  45. data/distro/common/man/man8/chef-client.8 +1 -1
  46. data/distro/common/man/man8/chef-expander.8 +1 -1
  47. data/distro/common/man/man8/chef-expanderctl.8 +1 -1
  48. data/distro/common/man/man8/chef-server-webui.8 +1 -1
  49. data/distro/common/man/man8/chef-server.8 +1 -1
  50. data/distro/common/man/man8/chef-solo.8 +4 -36
  51. data/distro/common/man/man8/chef-solr.8 +1 -1
  52. data/distro/debian/etc/init.d/chef-client +4 -2
  53. data/distro/windows/service_manager.rb +2 -146
  54. data/lib/chef.rb +1 -1
  55. data/lib/chef/application.rb +5 -12
  56. data/lib/chef/application/apply.rb +2 -0
  57. data/lib/chef/application/client.rb +12 -12
  58. data/lib/chef/application/knife.rb +2 -2
  59. data/lib/chef/application/solo.rb +4 -5
  60. data/lib/chef/application/windows_service.rb +113 -56
  61. data/lib/chef/application/windows_service_manager.rb +179 -0
  62. data/lib/chef/chef_fs.rb +2 -4
  63. data/lib/chef/chef_fs/chef_fs_data_store.rb +371 -0
  64. data/lib/chef/chef_fs/command_line.rb +145 -93
  65. data/lib/chef/chef_fs/config.rb +205 -0
  66. data/lib/chef/chef_fs/data_handler/acl_data_handler.rb +26 -0
  67. data/lib/chef/chef_fs/data_handler/client_data_handler.rb +38 -0
  68. data/lib/chef/chef_fs/data_handler/container_data_handler.rb +29 -0
  69. data/lib/chef/chef_fs/data_handler/cookbook_data_handler.rb +38 -0
  70. data/lib/chef/chef_fs/data_handler/data_bag_item_data_handler.rb +56 -0
  71. data/lib/chef/chef_fs/data_handler/data_handler_base.rb +128 -0
  72. data/lib/chef/chef_fs/data_handler/environment_data_handler.rb +40 -0
  73. data/lib/chef/chef_fs/data_handler/group_data_handler.rb +51 -0
  74. data/lib/chef/chef_fs/data_handler/node_data_handler.rb +36 -0
  75. data/lib/chef/chef_fs/data_handler/role_data_handler.rb +40 -0
  76. data/lib/chef/chef_fs/data_handler/user_data_handler.rb +27 -0
  77. data/lib/chef/chef_fs/file_system.rb +195 -127
  78. data/lib/chef/chef_fs/file_system/acl_dir.rb +64 -0
  79. data/lib/chef/chef_fs/file_system/acl_entry.rb +58 -0
  80. data/lib/chef/chef_fs/file_system/acls_dir.rb +68 -0
  81. data/lib/chef/chef_fs/file_system/already_exists_error.rb +31 -0
  82. data/lib/chef/chef_fs/file_system/base_fs_object.rb +98 -39
  83. data/lib/chef/chef_fs/file_system/chef_repository_file_system_cookbook_dir.rb +85 -0
  84. data/lib/chef/chef_fs/file_system/chef_repository_file_system_cookbook_entry.rb +71 -0
  85. data/lib/chef/chef_fs/file_system/chef_repository_file_system_cookbooks_dir.rb +55 -0
  86. data/lib/chef/chef_fs/file_system/chef_repository_file_system_data_bags_dir.rb +36 -0
  87. data/lib/chef/chef_fs/file_system/chef_repository_file_system_entry.rb +14 -63
  88. data/lib/chef/chef_fs/file_system/chef_repository_file_system_root_dir.rb +93 -3
  89. data/lib/chef/chef_fs/file_system/chef_server_root_dir.rb +35 -9
  90. data/lib/chef/chef_fs/file_system/cookbook_dir.rb +67 -32
  91. data/lib/chef/chef_fs/file_system/cookbook_file.rb +13 -6
  92. data/lib/chef/chef_fs/file_system/cookbook_frozen_error.rb +31 -0
  93. data/lib/chef/chef_fs/file_system/cookbooks_acl_dir.rb +41 -0
  94. data/lib/chef/chef_fs/file_system/cookbooks_dir.rb +102 -21
  95. data/lib/chef/chef_fs/file_system/data_bag_dir.rb +12 -21
  96. data/lib/chef/chef_fs/file_system/data_bags_dir.rb +14 -8
  97. data/lib/chef/chef_fs/file_system/default_environment_cannot_be_modified_error.rb +36 -0
  98. data/lib/chef/chef_fs/file_system/environments_dir.rb +60 -0
  99. data/lib/chef/chef_fs/file_system/file_system_entry.rb +8 -8
  100. data/lib/chef/chef_fs/file_system/file_system_error.rb +3 -1
  101. data/lib/chef/chef_fs/file_system/memory_dir.rb +52 -0
  102. data/lib/chef/chef_fs/file_system/memory_file.rb +17 -0
  103. data/lib/chef/chef_fs/file_system/memory_root.rb +21 -0
  104. data/lib/chef/chef_fs/file_system/multiplexed_dir.rb +48 -0
  105. data/lib/chef/chef_fs/file_system/must_delete_recursively_error.rb +2 -2
  106. data/lib/chef/chef_fs/file_system/nodes_dir.rb +17 -9
  107. data/lib/chef/chef_fs/file_system/nonexistent_fs_object.rb +0 -4
  108. data/lib/chef/chef_fs/file_system/not_found_error.rb +2 -2
  109. data/lib/chef/chef_fs/file_system/operation_failed_error.rb +34 -0
  110. data/lib/chef/chef_fs/file_system/operation_not_allowed_error.rb +48 -0
  111. data/lib/chef/chef_fs/file_system/rest_list_dir.rb +42 -13
  112. data/lib/chef/chef_fs/file_system/rest_list_entry.rb +81 -27
  113. data/lib/chef/chef_fs/knife.rb +68 -29
  114. data/lib/chef/chef_fs/parallelizer.rb +129 -0
  115. data/lib/chef/chef_fs/path_utils.rb +29 -3
  116. data/lib/chef/chef_fs/raw_request.rb +79 -0
  117. data/lib/chef/client.rb +46 -20
  118. data/lib/chef/config.rb +59 -61
  119. data/lib/chef/cookbook/chefignore.rb +2 -1
  120. data/lib/chef/cookbook/synchronizer.rb +8 -6
  121. data/lib/chef/cookbook/syntax_check.rb +17 -2
  122. data/lib/chef/cookbook_uploader.rb +10 -1
  123. data/lib/chef/cookbook_version.rb +0 -109
  124. data/lib/chef/data_bag.rb +15 -6
  125. data/lib/chef/deprecation/mixin/template.rb +49 -0
  126. data/lib/chef/deprecation/provider/cookbook_file.rb +55 -0
  127. data/lib/chef/deprecation/provider/file.rb +197 -0
  128. data/lib/chef/deprecation/provider/remote_file.rb +86 -0
  129. data/lib/chef/deprecation/provider/template.rb +63 -0
  130. data/lib/chef/deprecation/warnings.rb +38 -0
  131. data/lib/chef/encrypted_data_bag_item.rb +153 -61
  132. data/lib/chef/environment.rb +34 -3
  133. data/lib/chef/event_dispatch/base.rb +3 -0
  134. data/lib/chef/exceptions.rb +27 -2
  135. data/lib/chef/file_access_control/unix.rb +64 -7
  136. data/lib/chef/file_access_control/windows.rb +22 -11
  137. data/lib/chef/file_content_management/content_base.rb +56 -0
  138. data/lib/chef/file_content_management/deploy.rb +38 -0
  139. data/lib/chef/file_content_management/deploy/cp.rb +48 -0
  140. data/lib/chef/file_content_management/deploy/mv_unix.rb +77 -0
  141. data/lib/chef/file_content_management/deploy/mv_windows.rb +95 -0
  142. data/lib/chef/file_content_management/tempfile.rb +61 -0
  143. data/lib/chef/formatters/doc.rb +1 -1
  144. data/lib/chef/formatters/error_descriptor.rb +5 -4
  145. data/lib/chef/formatters/error_inspectors/cookbook_resolve_error_inspector.rb +23 -3
  146. data/lib/chef/formatters/error_inspectors/registration_error_inspector.rb +4 -0
  147. data/lib/chef/json_compat.rb +3 -0
  148. data/lib/chef/knife.rb +12 -3
  149. data/lib/chef/knife/bootstrap.rb +46 -2
  150. data/lib/chef/knife/bootstrap/archlinux-gems.erb +3 -3
  151. data/lib/chef/knife/bootstrap/centos5-gems.erb +3 -3
  152. data/lib/chef/knife/bootstrap/chef-full.erb +4 -4
  153. data/lib/chef/knife/bootstrap/fedora13-gems.erb +3 -3
  154. data/lib/chef/knife/bootstrap/ubuntu10.04-apt.erb +3 -3
  155. data/lib/chef/knife/bootstrap/ubuntu10.04-gems.erb +3 -3
  156. data/lib/chef/knife/bootstrap/ubuntu12.04-gems.erb +3 -3
  157. data/lib/chef/knife/client_show.rb +2 -5
  158. data/lib/chef/knife/configure.rb +3 -3
  159. data/lib/chef/knife/cookbook_create.rb +6 -5
  160. data/lib/chef/knife/cookbook_download.rb +13 -5
  161. data/lib/chef/knife/cookbook_site_share.rb +1 -0
  162. data/lib/chef/knife/cookbook_test.rb +1 -0
  163. data/lib/chef/knife/cookbook_upload.rb +4 -9
  164. data/lib/chef/knife/core/bootstrap_context.rb +10 -4
  165. data/lib/chef/knife/core/generic_presenter.rb +16 -0
  166. data/lib/chef/knife/core/node_editor.rb +1 -1
  167. data/lib/chef/knife/core/subcommand_loader.rb +43 -12
  168. data/lib/chef/knife/core/ui.rb +19 -4
  169. data/lib/chef/knife/delete.rb +76 -9
  170. data/lib/chef/knife/deps.rb +139 -0
  171. data/lib/chef/knife/diff.rb +22 -5
  172. data/lib/chef/knife/download.rb +16 -3
  173. data/lib/chef/knife/edit.rb +76 -0
  174. data/lib/chef/knife/environment_show.rb +2 -7
  175. data/lib/chef/knife/list.rb +91 -47
  176. data/lib/chef/knife/node_run_list_set.rb +66 -0
  177. data/lib/chef/knife/node_show.rb +1 -7
  178. data/lib/chef/knife/raw.rb +20 -64
  179. data/lib/chef/knife/role_show.rb +2 -4
  180. data/lib/chef/knife/search.rb +5 -6
  181. data/lib/chef/knife/show.rb +34 -11
  182. data/lib/chef/knife/ssh.rb +8 -0
  183. data/lib/chef/knife/upload.rb +23 -4
  184. data/lib/chef/knife/user_show.rb +2 -5
  185. data/lib/chef/knife/xargs.rb +265 -0
  186. data/lib/chef/log.rb +2 -2
  187. data/lib/chef/mixin/file_class.rb +0 -9
  188. data/lib/chef/mixin/language_include_recipe.rb +1 -1
  189. data/lib/chef/mixin/params_validate.rb +19 -9
  190. data/lib/chef/mixin/template.rb +126 -36
  191. data/lib/chef/mixin/windows_architecture_helper.rb +91 -0
  192. data/lib/chef/monkey_patches/file.rb +26 -0
  193. data/lib/chef/monkey_patches/net-ssh-multi.rb +140 -0
  194. data/lib/chef/monkey_patches/securerandom.rb +44 -0
  195. data/lib/chef/monologger.rb +93 -0
  196. data/lib/chef/node.rb +4 -0
  197. data/lib/chef/platform.rb +4 -490
  198. data/lib/chef/platform/provider_mapping.rb +529 -0
  199. data/lib/chef/{monkey_patches/dir.rb → platform/query_helpers.rb} +25 -19
  200. data/lib/chef/provider.rb +12 -9
  201. data/lib/chef/provider/batch.rb +35 -0
  202. data/lib/chef/provider/cookbook_file.rb +9 -78
  203. data/lib/chef/provider/cookbook_file/content.rb +49 -0
  204. data/lib/chef/provider/deploy.rb +24 -20
  205. data/lib/chef/provider/deploy/revision.rb +27 -0
  206. data/lib/chef/provider/directory.rb +19 -22
  207. data/lib/chef/provider/execute.rb +22 -5
  208. data/lib/chef/provider/file.rb +299 -217
  209. data/lib/chef/provider/file/content.rb +39 -0
  210. data/lib/chef/provider/git.rb +76 -43
  211. data/lib/chef/provider/group/usermod.rb +2 -2
  212. data/lib/chef/provider/ifconfig.rb +25 -35
  213. data/lib/chef/provider/ifconfig/debian.rb +71 -0
  214. data/lib/chef/provider/ifconfig/redhat.rb +47 -0
  215. data/lib/chef/provider/link.rb +10 -3
  216. data/lib/chef/provider/mount.rb +1 -1
  217. data/lib/chef/provider/mount/mount.rb +8 -3
  218. data/lib/chef/provider/mount/windows.rb +4 -1
  219. data/lib/chef/provider/package/portage.rb +9 -4
  220. data/lib/chef/provider/package/rubygems.rb +45 -10
  221. data/lib/chef/provider/package/smartos.rb +47 -36
  222. data/lib/chef/provider/package/yum.rb +19 -12
  223. data/lib/chef/provider/package/zypper.rb +45 -55
  224. data/lib/chef/provider/powershell_script.rb +77 -0
  225. data/lib/chef/provider/remote_directory.rb +5 -6
  226. data/lib/chef/provider/remote_file.rb +12 -108
  227. data/lib/chef/provider/remote_file/cache_control_data.rb +165 -0
  228. data/lib/chef/provider/remote_file/content.rb +75 -0
  229. data/lib/chef/provider/remote_file/fetcher.rb +43 -0
  230. data/lib/chef/provider/remote_file/ftp.rb +183 -0
  231. data/lib/chef/provider/remote_file/http.rb +124 -0
  232. data/lib/chef/provider/remote_file/local_file.rb +47 -0
  233. data/lib/chef/provider/route.rb +6 -2
  234. data/lib/chef/provider/script.rb +14 -2
  235. data/lib/chef/provider/service/macosx.rb +16 -10
  236. data/lib/chef/provider/service/solaris.rb +6 -5
  237. data/lib/chef/provider/template.rb +16 -78
  238. data/lib/chef/provider/template/content.rb +61 -0
  239. data/lib/chef/provider/user/solaris.rb +90 -0
  240. data/lib/chef/provider/user/useradd.rb +76 -63
  241. data/lib/chef/provider/windows_script.rb +73 -0
  242. data/lib/chef/providers.rb +16 -0
  243. data/lib/chef/resource.rb +23 -2
  244. data/lib/chef/resource/batch.rb +31 -0
  245. data/lib/chef/resource/conditional.rb +4 -0
  246. data/lib/chef/resource/conditional_action_not_nothing.rb +48 -0
  247. data/lib/chef/resource/file.rb +31 -3
  248. data/lib/chef/resource/link.rb +17 -0
  249. data/lib/chef/resource/lwrp_base.rb +1 -1
  250. data/lib/chef/resource/mount.rb +29 -2
  251. data/lib/chef/resource/powershell_script.rb +31 -0
  252. data/lib/chef/resource/remote_file.rb +47 -1
  253. data/lib/chef/resource/route.rb +1 -1
  254. data/lib/chef/resource/template.rb +145 -0
  255. data/lib/chef/resource/windows_script.rb +62 -0
  256. data/lib/chef/resource_collection.rb +45 -11
  257. data/lib/chef/resource_reporter.rb +81 -52
  258. data/lib/chef/resources.rb +2 -0
  259. data/lib/chef/rest.rb +13 -4
  260. data/lib/chef/rest/rest_request.rb +5 -1
  261. data/lib/chef/run_context/cookbook_compiler.rb +3 -3
  262. data/lib/chef/run_list/run_list_expansion.rb +1 -1
  263. data/lib/chef/run_lock.rb +7 -1
  264. data/lib/chef/runner.rb +0 -1
  265. data/lib/chef/scan_access_control.rb +6 -1
  266. data/lib/chef/search/query.rb +2 -2
  267. data/lib/chef/shell/shell_session.rb +2 -2
  268. data/lib/chef/util/backup.rb +84 -0
  269. data/lib/chef/util/diff.rb +145 -0
  270. data/lib/chef/util/file_edit.rb +1 -1
  271. data/lib/chef/util/selinux.rb +100 -0
  272. data/lib/chef/util/windows/net_user.rb +14 -1
  273. data/lib/chef/util/windows/volume.rb +2 -2
  274. data/lib/chef/version.rb +1 -1
  275. data/lib/chef/version/platform.rb +42 -0
  276. data/lib/chef/version_class.rb +1 -1
  277. data/lib/chef/version_constraint.rb +6 -5
  278. data/lib/chef/version_constraint/platform.rb +26 -0
  279. data/lib/chef/win32/api/file.rb +8 -2
  280. data/lib/chef/win32/version.rb +25 -8
  281. data/spec/data/apt/chef-integration-test-1.0/debian/changelog +5 -0
  282. data/spec/data/apt/chef-integration-test-1.0/debian/compat +1 -0
  283. data/spec/data/apt/chef-integration-test-1.0/debian/control +13 -0
  284. data/spec/data/apt/chef-integration-test-1.0/debian/copyright +34 -0
  285. data/spec/data/apt/chef-integration-test-1.0/debian/files +1 -0
  286. data/spec/data/apt/chef-integration-test-1.0/debian/rules +13 -0
  287. data/spec/data/apt/chef-integration-test-1.0/debian/source/format +1 -0
  288. data/spec/data/apt/chef-integration-test-1.1/debian/changelog +11 -0
  289. data/spec/data/apt/chef-integration-test-1.1/debian/compat +1 -0
  290. data/spec/data/apt/chef-integration-test-1.1/debian/control +13 -0
  291. data/spec/data/apt/chef-integration-test-1.1/debian/copyright +34 -0
  292. data/spec/data/apt/chef-integration-test-1.1/debian/files +1 -0
  293. data/spec/data/apt/chef-integration-test-1.1/debian/rules +13 -0
  294. data/spec/data/apt/chef-integration-test-1.1/debian/source/format +1 -0
  295. data/spec/data/apt/chef-integration-test_1.0-1_amd64.changes +22 -0
  296. data/spec/data/apt/chef-integration-test_1.0-1_amd64.deb +0 -0
  297. data/spec/data/apt/chef-integration-test_1.0.orig.tar.gz +0 -0
  298. data/spec/data/apt/chef-integration-test_1.1-1_amd64.changes +22 -0
  299. data/spec/data/apt/chef-integration-test_1.1-1_amd64.deb +0 -0
  300. data/spec/data/apt/chef-integration-test_1.1.orig.tar.gz +0 -0
  301. data/spec/data/apt/var/www/apt/conf/distributions +7 -0
  302. data/spec/data/apt/var/www/apt/conf/incoming +4 -0
  303. data/spec/data/apt/var/www/apt/conf/pulls +3 -0
  304. data/spec/data/apt/var/www/apt/db/checksums.db +0 -0
  305. data/spec/data/apt/var/www/apt/db/contents.cache.db +0 -0
  306. data/spec/data/apt/var/www/apt/db/packages.db +0 -0
  307. data/spec/data/apt/var/www/apt/db/references.db +0 -0
  308. data/spec/data/apt/var/www/apt/db/release.caches.db +0 -0
  309. data/spec/data/apt/var/www/apt/db/version +4 -0
  310. data/spec/data/apt/var/www/apt/dists/sid/Release +19 -0
  311. data/spec/data/apt/var/www/apt/dists/sid/main/binary-amd64/Packages +16 -0
  312. data/spec/data/apt/var/www/apt/dists/sid/main/binary-amd64/Packages.gz +0 -0
  313. data/spec/data/apt/var/www/apt/dists/sid/main/binary-amd64/Release +5 -0
  314. data/spec/data/apt/var/www/apt/dists/sid/main/binary-i386/Packages +0 -0
  315. data/spec/data/apt/var/www/apt/pool/main/c/chef-integration-test/chef-integration-test_1.0-1_amd64.deb +0 -0
  316. data/spec/data/apt/var/www/apt/pool/main/c/chef-integration-test/chef-integration-test_1.1-1_amd64.deb +0 -0
  317. data/spec/data/bootstrap/encrypted_data_bag_secret +1 -0
  318. data/spec/data/bootstrap/secret.erb +9 -0
  319. data/spec/data/cookbooks/ignorken/recipes/default.rb +1 -0
  320. data/spec/data/cookbooks/ignorken/recipes/ignoreme.rb +2 -0
  321. data/spec/data/cookbooks/openldap/files/default/.dotfile +1 -0
  322. data/spec/data/cookbooks/openldap/files/default/.ssh/id_rsa +1 -0
  323. data/spec/data/cookbooks/openldap/files/default/remotedir/.a_dotdir/.a_dotfile_in_a_dotdir +1 -0
  324. data/spec/data/cookbooks/openldap/files/default/remotedir/remotesubdir/.a_dotfile +1 -0
  325. data/spec/data/cookbooks/openldap/templates/default/all_windows_line_endings.erb +4 -0
  326. data/spec/data/cookbooks/openldap/templates/default/helper_test.erb +1 -0
  327. data/spec/data/cookbooks/openldap/templates/default/helpers_via_partial_test.erb +1 -0
  328. data/spec/data/cookbooks/openldap/templates/default/no_windows_line_endings.erb +4 -0
  329. data/spec/data/cookbooks/openldap/templates/default/some_windows_line_endings.erb +4 -0
  330. data/spec/data/cookbooks/preseed/files/default/preseed-file.seed +1 -0
  331. data/spec/data/cookbooks/preseed/templates/default/preseed-template.seed +1 -0
  332. data/spec/data/file-providers-method-snapshot-chef-11-4.json +127 -0
  333. data/spec/data/git_bundles/example-repo.gitbundle +0 -0
  334. data/spec/data/knife-home/.chef/plugins/knife/example_home_subcommand.rb +0 -0
  335. data/spec/data/knife_subcommand/test_yourself.rb +8 -0
  336. data/spec/data/null_config.rb +1 -0
  337. data/spec/data/partial_one.erb +1 -1
  338. data/spec/data/remote_file/nyan_cat.png.gz +0 -0
  339. data/spec/functional/file_content_management/deploy_strategies_spec.rb +238 -0
  340. data/spec/functional/knife/exec_spec.rb +2 -2
  341. data/spec/functional/provider/remote_file/cache_control_data_spec.rb +101 -0
  342. data/spec/functional/resource/batch_spec.rb +64 -0
  343. data/spec/functional/resource/cookbook_file_spec.rb +2 -3
  344. data/spec/functional/resource/deploy_revision_spec.rb +180 -0
  345. data/spec/functional/resource/directory_spec.rb +2 -2
  346. data/spec/functional/resource/file_spec.rb +17 -1
  347. data/spec/functional/resource/git_spec.rb +259 -0
  348. data/spec/functional/resource/link_spec.rb +422 -388
  349. data/spec/functional/resource/package_spec.rb +297 -0
  350. data/spec/functional/resource/powershell_spec.rb +188 -0
  351. data/spec/functional/resource/registry_spec.rb +8 -4
  352. data/spec/functional/resource/remote_directory_spec.rb +2 -2
  353. data/spec/functional/resource/remote_file_spec.rb +97 -29
  354. data/spec/functional/resource/template_spec.rb +173 -17
  355. data/spec/functional/resource/user_spec.rb +547 -0
  356. data/spec/functional/run_lock_spec.rb +5 -0
  357. data/spec/functional/shell_spec.rb +2 -1
  358. data/spec/functional/win32/service_manager_spec.rb +269 -0
  359. data/spec/functional/win32/versions_spec.rb +78 -0
  360. data/spec/integration/knife/chef_repo_path_spec.rb +805 -0
  361. data/spec/integration/knife/chef_repository_file_system_spec.rb +276 -0
  362. data/spec/integration/knife/chefignore_spec.rb +271 -0
  363. data/spec/integration/knife/delete_spec.rb +944 -0
  364. data/spec/integration/knife/deps_spec.rb +648 -0
  365. data/spec/integration/knife/diff_spec.rb +536 -0
  366. data/spec/integration/knife/download_spec.rb +962 -0
  367. data/spec/integration/knife/list_spec.rb +633 -0
  368. data/spec/integration/knife/raw_spec.rb +166 -0
  369. data/spec/integration/knife/redirection_spec.rb +57 -0
  370. data/spec/integration/knife/show_spec.rb +158 -0
  371. data/spec/integration/knife/upload_spec.rb +1060 -0
  372. data/spec/integration/solo/solo_spec.rb +41 -0
  373. data/spec/spec_helper.rb +55 -1
  374. data/spec/support/chef_helpers.rb +32 -0
  375. data/spec/support/platform_helpers.rb +40 -0
  376. data/spec/support/platforms/win32/spec_service.rb +59 -0
  377. data/spec/support/shared/functional/directory_resource.rb +43 -16
  378. data/spec/support/shared/functional/file_resource.rb +661 -20
  379. data/spec/support/shared/functional/securable_resource.rb +109 -8
  380. data/spec/support/shared/functional/securable_resource_with_reporting.rb +39 -31
  381. data/spec/support/shared/integration/integration_helper.rb +166 -0
  382. data/spec/support/shared/integration/knife_support.rb +171 -0
  383. data/spec/support/shared/unit/execute_resource.rb +125 -0
  384. data/spec/support/shared/unit/file_system_support.rb +8 -48
  385. data/spec/support/shared/unit/provider/file.rb +609 -0
  386. data/spec/support/shared/unit/provider/useradd_based_user_provider.rb +407 -0
  387. data/spec/support/shared/unit/script_resource.rb +52 -0
  388. data/spec/support/shared/unit/windows_script_resource.rb +48 -0
  389. data/spec/tiny_server.rb +13 -11
  390. data/spec/unit/application/client_spec.rb +39 -1
  391. data/spec/unit/application/knife_spec.rb +12 -0
  392. data/spec/unit/application/solo_spec.rb +1 -1
  393. data/spec/unit/application_spec.rb +57 -2
  394. data/spec/unit/chef_fs/diff_spec.rb +30 -31
  395. data/spec/unit/chef_fs/file_pattern_spec.rb +2 -2
  396. data/spec/unit/chef_fs/file_system_spec.rb +2 -3
  397. data/spec/unit/client_spec.rb +20 -1
  398. data/spec/unit/config_spec.rb +70 -52
  399. data/spec/unit/cookbook/synchronizer_spec.rb +49 -1
  400. data/spec/unit/cookbook/syntax_check_spec.rb +28 -3
  401. data/spec/unit/cookbook_loader_spec.rb +3 -2
  402. data/spec/unit/daemon_spec.rb +7 -7
  403. data/spec/unit/data_bag_spec.rb +7 -0
  404. data/spec/unit/deprecation_spec.rb +86 -0
  405. data/spec/unit/encrypted_data_bag_item_spec.rb +183 -88
  406. data/spec/unit/environment_spec.rb +98 -0
  407. data/spec/unit/exceptions_spec.rb +6 -1
  408. data/spec/unit/file_access_control_spec.rb +21 -1
  409. data/spec/unit/file_content_management/deploy/cp_spec.rb +46 -0
  410. data/spec/unit/file_content_management/deploy/mv_unix_spec.rb +103 -0
  411. data/spec/unit/file_content_management/deploy/mv_windows_spec.rb +179 -0
  412. data/spec/unit/formatters/error_inspectors/cookbook_resolve_error_inspector_spec.rb +38 -2
  413. data/spec/unit/formatters/error_inspectors/resource_failure_inspector_spec.rb +3 -2
  414. data/spec/unit/knife/bootstrap_spec.rb +128 -29
  415. data/spec/unit/knife/configure_spec.rb +42 -26
  416. data/spec/unit/knife/cookbook_download_spec.rb +24 -3
  417. data/spec/unit/knife/cookbook_upload_spec.rb +8 -4
  418. data/spec/unit/knife/core/bootstrap_context_spec.rb +78 -61
  419. data/spec/unit/knife/core/subcommand_loader_spec.rb +20 -0
  420. data/spec/unit/knife/core/ui_spec.rb +41 -0
  421. data/spec/unit/knife/node_run_list_set_spec.rb +140 -0
  422. data/spec/unit/knife_spec.rb +21 -0
  423. data/spec/unit/mixin/enforce_ownership_and_permissions_spec.rb +1 -0
  424. data/spec/unit/mixin/params_validate_spec.rb +35 -0
  425. data/spec/unit/mixin/template_spec.rb +69 -57
  426. data/spec/unit/mixin/windows_architecture_helper_spec.rb +83 -0
  427. data/spec/unit/node_spec.rb +7 -0
  428. data/spec/unit/platform_spec.rb +15 -1
  429. data/spec/unit/provider/cookbook_file/content_spec.rb +40 -0
  430. data/spec/unit/provider/cookbook_file_spec.rb +26 -183
  431. data/spec/unit/provider/cron/solaris_spec.rb +1 -1
  432. data/spec/unit/provider/deploy/revision_spec.rb +19 -11
  433. data/spec/unit/provider/deploy_spec.rb +2 -2
  434. data/spec/unit/provider/directory_spec.rb +23 -23
  435. data/spec/unit/provider/execute_spec.rb +27 -1
  436. data/spec/unit/provider/file/content_spec.rb +101 -0
  437. data/spec/unit/provider/file_spec.rb +25 -484
  438. data/spec/unit/provider/git_spec.rb +224 -28
  439. data/spec/unit/provider/group/usermod_spec.rb +3 -1
  440. data/spec/unit/provider/ifconfig/debian_spec.rb +89 -0
  441. data/spec/unit/provider/ifconfig/redhat_spec.rb +71 -0
  442. data/spec/unit/provider/ifconfig_spec.rb +0 -33
  443. data/spec/unit/provider/mount/mount_spec.rb +33 -2
  444. data/spec/unit/provider/mount/windows_spec.rb +4 -1
  445. data/spec/unit/provider/mount_spec.rb +16 -6
  446. data/spec/unit/provider/package/portage_spec.rb +44 -0
  447. data/spec/unit/provider/package/rubygems_spec.rb +44 -1
  448. data/spec/unit/provider/package/smartos_spec.rb +3 -2
  449. data/spec/unit/provider/package/yum_spec.rb +36 -39
  450. data/spec/unit/provider/package/zypper_spec.rb +84 -22
  451. data/spec/unit/provider/package_spec.rb +0 -4
  452. data/spec/unit/provider/powershell_spec.rb +38 -0
  453. data/spec/unit/provider/remote_directory_spec.rb +0 -4
  454. data/spec/unit/provider/remote_file/cache_control_data_spec.rb +211 -0
  455. data/spec/unit/provider/remote_file/content_spec.rb +230 -0
  456. data/spec/unit/provider/remote_file/fetcher_spec.rb +75 -0
  457. data/spec/unit/provider/remote_file/ftp_spec.rb +224 -0
  458. data/spec/unit/provider/remote_file/http_spec.rb +319 -0
  459. data/spec/unit/provider/remote_file/local_file_spec.rb +60 -0
  460. data/spec/unit/provider/remote_file_spec.rb +33 -295
  461. data/spec/unit/provider/route_spec.rb +25 -9
  462. data/spec/unit/provider/service/macosx_spec.rb +176 -152
  463. data/spec/unit/provider/service/solaris_smf_service_spec.rb +21 -18
  464. data/spec/unit/provider/service/systemd_service_spec.rb +2 -2
  465. data/spec/unit/provider/service/upstart_service_spec.rb +2 -2
  466. data/spec/unit/provider/service_spec.rb +3 -3
  467. data/spec/unit/provider/template/content_spec.rb +78 -0
  468. data/spec/unit/provider/template_spec.rb +52 -184
  469. data/spec/unit/provider/user/solaris_spec.rb +80 -0
  470. data/spec/unit/provider/user/useradd_spec.rb +12 -358
  471. data/spec/unit/resource/batch_spec.rb +48 -0
  472. data/spec/unit/resource/conditional_action_not_nothing_spec.rb +45 -0
  473. data/spec/unit/resource/execute_spec.rb +3 -101
  474. data/spec/unit/resource/file_spec.rb +0 -5
  475. data/spec/unit/resource/group_spec.rb +9 -0
  476. data/spec/unit/resource/ifconfig_spec.rb +60 -1
  477. data/spec/unit/resource/link_spec.rb +1 -0
  478. data/spec/unit/resource/mount_spec.rb +37 -0
  479. data/spec/unit/resource/powershell_spec.rb +48 -0
  480. data/spec/unit/resource/remote_file_spec.rb +44 -4
  481. data/spec/unit/resource/route_spec.rb +1 -1
  482. data/spec/unit/resource/script_spec.rb +13 -36
  483. data/spec/unit/resource/template_spec.rb +111 -8
  484. data/spec/unit/resource/user_spec.rb +7 -0
  485. data/spec/unit/resource_collection_spec.rb +61 -32
  486. data/spec/unit/resource_reporter_spec.rb +115 -102
  487. data/spec/unit/resource_spec.rb +170 -1
  488. data/spec/unit/rest/auth_credentials_spec.rb +2 -2
  489. data/spec/unit/rest_spec.rb +6 -2
  490. data/spec/unit/run_context/cookbook_compiler_spec.rb +9 -0
  491. data/spec/unit/runner_spec.rb +1 -1
  492. data/spec/unit/scan_access_control_spec.rb +4 -2
  493. data/spec/unit/shell/shell_session_spec.rb +15 -2
  494. data/spec/unit/util/backup_spec.rb +149 -0
  495. data/spec/unit/util/diff_spec.rb +596 -0
  496. data/spec/unit/util/selinux_spec.rb +172 -0
  497. data/spec/unit/version/platform_spec.rb +61 -0
  498. data/spec/unit/version_constraint/platform_spec.rb +46 -0
  499. data/spec/unit/version_constraint_spec.rb +5 -0
  500. metadata +233 -10
  501. data/lib/chef/chef_fs/file_system/data_bag_item.rb +0 -59
  502. data/spec/unit/chef_fs/file_system/chef_server_root_dir_spec.rb +0 -237
  503. data/spec/unit/chef_fs/file_system/cookbooks_dir_spec.rb +0 -568
  504. data/spec/unit/chef_fs/file_system/data_bags_dir_spec.rb +0 -220
@@ -0,0 +1,944 @@
1
+ #
2
+ # Author:: John Keiser (<jkeiser@opscode.com>)
3
+ # Copyright:: Copyright (c) 2013 Opscode, Inc.
4
+ # License:: Apache License, Version 2.0
5
+ #
6
+ # Licensed under the Apache License, Version 2.0 (the "License");
7
+ # you may not use this file except in compliance with the License.
8
+ # You may obtain a copy of the License at
9
+ #
10
+ # http://www.apache.org/licenses/LICENSE-2.0
11
+ #
12
+ # Unless required by applicable law or agreed to in writing, software
13
+ # distributed under the License is distributed on an "AS IS" BASIS,
14
+ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15
+ # See the License for the specific language governing permissions and
16
+ # limitations under the License.
17
+
18
+ require 'support/shared/integration/integration_helper'
19
+ require 'chef/knife/delete'
20
+ require 'chef/knife/list'
21
+ require 'chef/knife/raw'
22
+
23
+ describe 'knife delete' do
24
+ extend IntegrationSupport
25
+ include KnifeSupport
26
+
27
+ let :everything do
28
+ <<EOM
29
+ /clients
30
+ /clients/x.json
31
+ /cookbooks
32
+ /cookbooks/x
33
+ /cookbooks/x/metadata.rb
34
+ /data_bags
35
+ /data_bags/x
36
+ /data_bags/x/y.json
37
+ /environments
38
+ /environments/_default.json
39
+ /environments/x.json
40
+ /nodes
41
+ /nodes/x.json
42
+ /roles
43
+ /roles/x.json
44
+ /users
45
+ /users/x.json
46
+ EOM
47
+ end
48
+
49
+ let :server_everything do
50
+ <<EOM
51
+ /clients
52
+ /clients/chef-validator.json
53
+ /clients/chef-webui.json
54
+ /clients/x.json
55
+ /cookbooks
56
+ /cookbooks/x
57
+ /cookbooks/x/metadata.rb
58
+ /data_bags
59
+ /data_bags/x
60
+ /data_bags/x/y.json
61
+ /environments
62
+ /environments/_default.json
63
+ /environments/x.json
64
+ /nodes
65
+ /nodes/x.json
66
+ /roles
67
+ /roles/x.json
68
+ /users
69
+ /users/admin.json
70
+ /users/x.json
71
+ EOM
72
+ end
73
+ let :server_nothing do
74
+ <<EOM
75
+ /clients
76
+ /clients/chef-validator.json
77
+ /clients/chef-webui.json
78
+ /cookbooks
79
+ /data_bags
80
+ /environments
81
+ /environments/_default.json
82
+ /nodes
83
+ /roles
84
+ /users
85
+ /users/admin.json
86
+ EOM
87
+ end
88
+
89
+ let :nothing do
90
+ <<EOM
91
+ /clients
92
+ /cookbooks
93
+ /data_bags
94
+ /environments
95
+ /nodes
96
+ /roles
97
+ /users
98
+ EOM
99
+ end
100
+
101
+ when_the_chef_server "has one of each thing" do
102
+ client 'x', '{}'
103
+ cookbook 'x', '1.0.0', { 'metadata.rb' => 'version "1.0.0"' }
104
+ data_bag 'x', { 'y' => '{}' }
105
+ environment 'x', '{}'
106
+ node 'x', '{}'
107
+ role 'x', '{}'
108
+ user 'x', '{}'
109
+
110
+ when_the_repository 'also has one of each thing' do
111
+ file 'clients/x.json', {}
112
+ file 'cookbooks/x/metadata.rb', ''
113
+ file 'data_bags/x/y.json', {}
114
+ file 'environments/_default.json', {}
115
+ file 'environments/x.json', {}
116
+ file 'nodes/x.json', {}
117
+ file 'roles/x.json', {}
118
+ file 'users/x.json', {}
119
+
120
+ it 'knife delete --both /cookbooks/x fails' do
121
+ knife('delete --both /cookbooks/x').should_fail <<EOM
122
+ ERROR: /cookbooks/x (remote) must be deleted recursively! Pass -r to knife delete.
123
+ ERROR: /cookbooks/x (local) must be deleted recursively! Pass -r to knife delete.
124
+ EOM
125
+ knife('list -Rf /').should_succeed server_everything
126
+ knife('list -Rf --local /').should_succeed everything
127
+ end
128
+
129
+ it 'knife delete --both -r /cookbooks/x deletes x' do
130
+ knife('delete --both -r /cookbooks/x').should_succeed "Deleted /cookbooks/x\n"
131
+ knife('list -Rf /').should_succeed <<EOM
132
+ /clients
133
+ /clients/chef-validator.json
134
+ /clients/chef-webui.json
135
+ /clients/x.json
136
+ /cookbooks
137
+ /data_bags
138
+ /data_bags/x
139
+ /data_bags/x/y.json
140
+ /environments
141
+ /environments/_default.json
142
+ /environments/x.json
143
+ /nodes
144
+ /nodes/x.json
145
+ /roles
146
+ /roles/x.json
147
+ /users
148
+ /users/admin.json
149
+ /users/x.json
150
+ EOM
151
+ knife('list -Rf --local /').should_succeed <<EOM
152
+ /clients
153
+ /clients/x.json
154
+ /cookbooks
155
+ /data_bags
156
+ /data_bags/x
157
+ /data_bags/x/y.json
158
+ /environments
159
+ /environments/_default.json
160
+ /environments/x.json
161
+ /nodes
162
+ /nodes/x.json
163
+ /roles
164
+ /roles/x.json
165
+ /users
166
+ /users/x.json
167
+ EOM
168
+ end
169
+
170
+ it 'knife delete -r --local /cookbooks/x deletes x locally but not remotely' do
171
+ knife('delete -r --local /cookbooks/x').should_succeed "Deleted /cookbooks/x\n"
172
+ knife('list -Rf /').should_succeed server_everything
173
+ knife('list -Rf --local /').should_succeed <<EOM
174
+ /clients
175
+ /clients/x.json
176
+ /cookbooks
177
+ /data_bags
178
+ /data_bags/x
179
+ /data_bags/x/y.json
180
+ /environments
181
+ /environments/_default.json
182
+ /environments/x.json
183
+ /nodes
184
+ /nodes/x.json
185
+ /roles
186
+ /roles/x.json
187
+ /users
188
+ /users/x.json
189
+ EOM
190
+ end
191
+
192
+ it 'knife delete -r /cookbooks/x deletes x remotely but not locally' do
193
+ knife('delete -r /cookbooks/x').should_succeed "Deleted /cookbooks/x\n"
194
+ knife('list -Rf /').should_succeed <<EOM
195
+ /clients
196
+ /clients/chef-validator.json
197
+ /clients/chef-webui.json
198
+ /clients/x.json
199
+ /cookbooks
200
+ /data_bags
201
+ /data_bags/x
202
+ /data_bags/x/y.json
203
+ /environments
204
+ /environments/_default.json
205
+ /environments/x.json
206
+ /nodes
207
+ /nodes/x.json
208
+ /roles
209
+ /roles/x.json
210
+ /users
211
+ /users/admin.json
212
+ /users/x.json
213
+ EOM
214
+ knife('list -Rf --local /').should_succeed everything
215
+ end
216
+
217
+ # TODO delete empty data bag (particularly different on local side)
218
+ context 'with an empty data bag on both' do
219
+ data_bag 'empty', {}
220
+ directory 'data_bags/empty'
221
+ it 'knife delete --both /data_bags/empty fails but deletes local version' do
222
+ knife('delete --both /data_bags/empty').should_fail <<EOM
223
+ ERROR: /data_bags/empty (remote) must be deleted recursively! Pass -r to knife delete.
224
+ ERROR: /data_bags/empty (local) must be deleted recursively! Pass -r to knife delete.
225
+ EOM
226
+ knife('list -Rf /').should_succeed <<EOM
227
+ /clients
228
+ /clients/chef-validator.json
229
+ /clients/chef-webui.json
230
+ /clients/x.json
231
+ /cookbooks
232
+ /cookbooks/x
233
+ /cookbooks/x/metadata.rb
234
+ /data_bags
235
+ /data_bags/empty
236
+ /data_bags/x
237
+ /data_bags/x/y.json
238
+ /environments
239
+ /environments/_default.json
240
+ /environments/x.json
241
+ /nodes
242
+ /nodes/x.json
243
+ /roles
244
+ /roles/x.json
245
+ /users
246
+ /users/admin.json
247
+ /users/x.json
248
+ EOM
249
+ knife('list -Rf --local /').should_succeed <<EOM
250
+ /clients
251
+ /clients/x.json
252
+ /cookbooks
253
+ /cookbooks/x
254
+ /cookbooks/x/metadata.rb
255
+ /data_bags
256
+ /data_bags/empty
257
+ /data_bags/x
258
+ /data_bags/x/y.json
259
+ /environments
260
+ /environments/_default.json
261
+ /environments/x.json
262
+ /nodes
263
+ /nodes/x.json
264
+ /roles
265
+ /roles/x.json
266
+ /users
267
+ /users/x.json
268
+ EOM
269
+ end
270
+ end
271
+
272
+ it 'knife delete --both /data_bags/x fails' do
273
+ knife('delete --both /data_bags/x').should_fail <<EOM
274
+ ERROR: /data_bags/x (remote) must be deleted recursively! Pass -r to knife delete.
275
+ ERROR: /data_bags/x (local) must be deleted recursively! Pass -r to knife delete.
276
+ EOM
277
+ knife('list -Rf /').should_succeed server_everything
278
+ knife('list -Rf --local /').should_succeed everything
279
+ end
280
+
281
+ it 'knife delete --both -r /data_bags/x deletes x' do
282
+ knife('delete --both -r /data_bags/x').should_succeed "Deleted /data_bags/x\n"
283
+ knife('list -Rf /').should_succeed <<EOM
284
+ /clients
285
+ /clients/chef-validator.json
286
+ /clients/chef-webui.json
287
+ /clients/x.json
288
+ /cookbooks
289
+ /cookbooks/x
290
+ /cookbooks/x/metadata.rb
291
+ /data_bags
292
+ /environments
293
+ /environments/_default.json
294
+ /environments/x.json
295
+ /nodes
296
+ /nodes/x.json
297
+ /roles
298
+ /roles/x.json
299
+ /users
300
+ /users/admin.json
301
+ /users/x.json
302
+ EOM
303
+ knife('list -Rf --local /').should_succeed <<EOM
304
+ /clients
305
+ /clients/x.json
306
+ /cookbooks
307
+ /cookbooks/x
308
+ /cookbooks/x/metadata.rb
309
+ /data_bags
310
+ /environments
311
+ /environments/_default.json
312
+ /environments/x.json
313
+ /nodes
314
+ /nodes/x.json
315
+ /roles
316
+ /roles/x.json
317
+ /users
318
+ /users/x.json
319
+ EOM
320
+ end
321
+
322
+ it 'knife delete --both /environments/x.json deletes x' do
323
+ knife('delete --both /environments/x.json').should_succeed "Deleted /environments/x.json\n"
324
+ knife('list -Rf /').should_succeed <<EOM
325
+ /clients
326
+ /clients/chef-validator.json
327
+ /clients/chef-webui.json
328
+ /clients/x.json
329
+ /cookbooks
330
+ /cookbooks/x
331
+ /cookbooks/x/metadata.rb
332
+ /data_bags
333
+ /data_bags/x
334
+ /data_bags/x/y.json
335
+ /environments
336
+ /environments/_default.json
337
+ /nodes
338
+ /nodes/x.json
339
+ /roles
340
+ /roles/x.json
341
+ /users
342
+ /users/admin.json
343
+ /users/x.json
344
+ EOM
345
+ knife('list -Rf --local /').should_succeed <<EOM
346
+ /clients
347
+ /clients/x.json
348
+ /cookbooks
349
+ /cookbooks/x
350
+ /cookbooks/x/metadata.rb
351
+ /data_bags
352
+ /data_bags/x
353
+ /data_bags/x/y.json
354
+ /environments
355
+ /environments/_default.json
356
+ /nodes
357
+ /nodes/x.json
358
+ /roles
359
+ /roles/x.json
360
+ /users
361
+ /users/x.json
362
+ EOM
363
+ end
364
+
365
+ it 'knife delete --both /roles/x.json deletes x' do
366
+ knife('delete --both /roles/x.json').should_succeed "Deleted /roles/x.json\n"
367
+ knife('list -Rf /').should_succeed <<EOM
368
+ /clients
369
+ /clients/chef-validator.json
370
+ /clients/chef-webui.json
371
+ /clients/x.json
372
+ /cookbooks
373
+ /cookbooks/x
374
+ /cookbooks/x/metadata.rb
375
+ /data_bags
376
+ /data_bags/x
377
+ /data_bags/x/y.json
378
+ /environments
379
+ /environments/_default.json
380
+ /environments/x.json
381
+ /nodes
382
+ /nodes/x.json
383
+ /roles
384
+ /users
385
+ /users/admin.json
386
+ /users/x.json
387
+ EOM
388
+ knife('list -Rf --local /').should_succeed <<EOM
389
+ /clients
390
+ /clients/x.json
391
+ /cookbooks
392
+ /cookbooks/x
393
+ /cookbooks/x/metadata.rb
394
+ /data_bags
395
+ /data_bags/x
396
+ /data_bags/x/y.json
397
+ /environments
398
+ /environments/_default.json
399
+ /environments/x.json
400
+ /nodes
401
+ /nodes/x.json
402
+ /roles
403
+ /users
404
+ /users/x.json
405
+ EOM
406
+ end
407
+
408
+ it 'knife delete --both /environments/_default.json fails but still deletes the local copy' do
409
+ knife('delete --both /environments/_default.json').should_fail :stderr => "ERROR: /environments/_default.json (remote) cannot be deleted (default environment cannot be modified).\n", :stdout => "Deleted /environments/_default.json\n"
410
+ knife('list -Rf /').should_succeed server_everything
411
+ knife('list -Rf --local /').should_succeed <<EOM
412
+ /clients
413
+ /clients/x.json
414
+ /cookbooks
415
+ /cookbooks/x
416
+ /cookbooks/x/metadata.rb
417
+ /data_bags
418
+ /data_bags/x
419
+ /data_bags/x/y.json
420
+ /environments
421
+ /environments/x.json
422
+ /nodes
423
+ /nodes/x.json
424
+ /roles
425
+ /roles/x.json
426
+ /users
427
+ /users/x.json
428
+ EOM
429
+ end
430
+
431
+ it 'knife delete --both /environments/nonexistent.json fails' do
432
+ knife('delete --both /environments/nonexistent.json').should_fail "ERROR: /environments/nonexistent.json: No such file or directory\n"
433
+ knife('list -Rf /').should_succeed server_everything
434
+ knife('list -Rf --local /').should_succeed everything
435
+ end
436
+
437
+ it 'knife delete --both / fails' do
438
+ knife('delete --both /').should_fail <<EOM
439
+ ERROR: / (remote) cannot be deleted.
440
+ ERROR: / (local) cannot be deleted.
441
+ EOM
442
+ knife('list -Rf /').should_succeed server_everything
443
+ knife('list -Rf --local /').should_succeed everything
444
+ end
445
+
446
+ it 'knife delete --both -r /* fails' do
447
+ knife('delete --both -r /*').should_fail <<EOM
448
+ ERROR: / (remote) cannot be deleted.
449
+ ERROR: / (local) cannot be deleted.
450
+ ERROR: /clients (remote) cannot be deleted.
451
+ ERROR: /clients (local) cannot be deleted.
452
+ ERROR: /cookbooks (remote) cannot be deleted.
453
+ ERROR: /cookbooks (local) cannot be deleted.
454
+ ERROR: /data_bags (remote) cannot be deleted.
455
+ ERROR: /data_bags (local) cannot be deleted.
456
+ ERROR: /environments (remote) cannot be deleted.
457
+ ERROR: /environments (local) cannot be deleted.
458
+ ERROR: /nodes (remote) cannot be deleted.
459
+ ERROR: /nodes (local) cannot be deleted.
460
+ ERROR: /roles (remote) cannot be deleted.
461
+ ERROR: /roles (local) cannot be deleted.
462
+ ERROR: /users (remote) cannot be deleted.
463
+ ERROR: /users (local) cannot be deleted.
464
+ EOM
465
+ knife('list -Rf /').should_succeed server_everything
466
+ knife('list -Rf --local /').should_succeed everything
467
+ end
468
+ end
469
+
470
+ when_the_repository 'has only top-level directories' do
471
+ directory 'clients'
472
+ directory 'cookbooks'
473
+ directory 'data_bags'
474
+ directory 'environments'
475
+ directory 'nodes'
476
+ directory 'roles'
477
+ directory 'users'
478
+
479
+ it 'knife delete --both /cookbooks/x fails' do
480
+ knife('delete --both /cookbooks/x').should_fail "ERROR: /cookbooks/x (remote) must be deleted recursively! Pass -r to knife delete.\n"
481
+ knife('list -Rf /').should_succeed server_everything
482
+ knife('list -Rf --local /').should_succeed nothing
483
+ end
484
+
485
+ it 'knife delete --both -r /cookbooks/x deletes x' do
486
+ knife('delete --both -r /cookbooks/x').should_succeed "Deleted /cookbooks/x\n"
487
+ knife('list -Rf /').should_succeed <<EOM
488
+ /clients
489
+ /clients/chef-validator.json
490
+ /clients/chef-webui.json
491
+ /clients/x.json
492
+ /cookbooks
493
+ /data_bags
494
+ /data_bags/x
495
+ /data_bags/x/y.json
496
+ /environments
497
+ /environments/_default.json
498
+ /environments/x.json
499
+ /nodes
500
+ /nodes/x.json
501
+ /roles
502
+ /roles/x.json
503
+ /users
504
+ /users/admin.json
505
+ /users/x.json
506
+ EOM
507
+ knife('list -Rf --local /').should_succeed nothing
508
+ end
509
+
510
+ it 'knife delete --both /data_bags/x fails' do
511
+ knife('delete --both /data_bags/x').should_fail "ERROR: /data_bags/x (remote) must be deleted recursively! Pass -r to knife delete.\n"
512
+ knife('list -Rf /').should_succeed server_everything
513
+ knife('list -Rf --local /').should_succeed nothing
514
+ end
515
+
516
+ it 'knife delete --both -r /data_bags/x deletes x' do
517
+ knife('delete --both -r /data_bags/x').should_succeed "Deleted /data_bags/x\n"
518
+ knife('list -Rf /').should_succeed <<EOM
519
+ /clients
520
+ /clients/chef-validator.json
521
+ /clients/chef-webui.json
522
+ /clients/x.json
523
+ /cookbooks
524
+ /cookbooks/x
525
+ /cookbooks/x/metadata.rb
526
+ /data_bags
527
+ /environments
528
+ /environments/_default.json
529
+ /environments/x.json
530
+ /nodes
531
+ /nodes/x.json
532
+ /roles
533
+ /roles/x.json
534
+ /users
535
+ /users/admin.json
536
+ /users/x.json
537
+ EOM
538
+ knife('list -Rf --local /').should_succeed nothing
539
+ end
540
+
541
+ it 'knife delete --both /environments/x.json deletes x' do
542
+ knife('delete --both /environments/x.json').should_succeed "Deleted /environments/x.json\n"
543
+ knife('list -Rf /').should_succeed <<EOM
544
+ /clients
545
+ /clients/chef-validator.json
546
+ /clients/chef-webui.json
547
+ /clients/x.json
548
+ /cookbooks
549
+ /cookbooks/x
550
+ /cookbooks/x/metadata.rb
551
+ /data_bags
552
+ /data_bags/x
553
+ /data_bags/x/y.json
554
+ /environments
555
+ /environments/_default.json
556
+ /nodes
557
+ /nodes/x.json
558
+ /roles
559
+ /roles/x.json
560
+ /users
561
+ /users/admin.json
562
+ /users/x.json
563
+ EOM
564
+ knife('list -Rf --local /').should_succeed nothing
565
+ end
566
+
567
+ it 'knife delete --both /roles/x.json deletes x' do
568
+ knife('delete --both /roles/x.json').should_succeed "Deleted /roles/x.json\n"
569
+ knife('list -Rf /').should_succeed <<EOM
570
+ /clients
571
+ /clients/chef-validator.json
572
+ /clients/chef-webui.json
573
+ /clients/x.json
574
+ /cookbooks
575
+ /cookbooks/x
576
+ /cookbooks/x/metadata.rb
577
+ /data_bags
578
+ /data_bags/x
579
+ /data_bags/x/y.json
580
+ /environments
581
+ /environments/_default.json
582
+ /environments/x.json
583
+ /nodes
584
+ /nodes/x.json
585
+ /roles
586
+ /users
587
+ /users/admin.json
588
+ /users/x.json
589
+ EOM
590
+ knife('list -Rf --local /').should_succeed nothing
591
+ end
592
+
593
+ it 'knife delete --both /environments/_default.json fails' do
594
+ knife('delete --both /environments/_default.json').should_fail "", :stderr => "ERROR: /environments/_default.json (remote) cannot be deleted (default environment cannot be modified).\n"
595
+ knife('list -Rf /').should_succeed server_everything
596
+ knife('list -Rf --local /').should_succeed nothing
597
+ end
598
+
599
+ it 'knife delete --both / fails' do
600
+ knife('delete --both /').should_fail "ERROR: / (remote) cannot be deleted.\nERROR: / (local) cannot be deleted.\n"
601
+ knife('list -Rf /').should_succeed server_everything
602
+ knife('list -Rf --local /').should_succeed nothing
603
+ end
604
+
605
+ it 'knife delete --both -r /* fails' do
606
+ knife('delete --both -r /*').should_fail <<EOM
607
+ ERROR: / (remote) cannot be deleted.
608
+ ERROR: / (local) cannot be deleted.
609
+ ERROR: /clients (remote) cannot be deleted.
610
+ ERROR: /clients (local) cannot be deleted.
611
+ ERROR: /cookbooks (remote) cannot be deleted.
612
+ ERROR: /cookbooks (local) cannot be deleted.
613
+ ERROR: /data_bags (remote) cannot be deleted.
614
+ ERROR: /data_bags (local) cannot be deleted.
615
+ ERROR: /environments (remote) cannot be deleted.
616
+ ERROR: /environments (local) cannot be deleted.
617
+ ERROR: /nodes (remote) cannot be deleted.
618
+ ERROR: /nodes (local) cannot be deleted.
619
+ ERROR: /roles (remote) cannot be deleted.
620
+ ERROR: /roles (local) cannot be deleted.
621
+ ERROR: /users (remote) cannot be deleted.
622
+ ERROR: /users (local) cannot be deleted.
623
+ EOM
624
+ knife('list -Rf /').should_succeed server_everything
625
+ knife('list -Rf --local /').should_succeed nothing
626
+ end
627
+
628
+ it 'knife delete --both /environments/nonexistent.json fails' do
629
+ knife('delete --both /environments/nonexistent.json').should_fail "ERROR: /environments/nonexistent.json: No such file or directory\n"
630
+ knife('list -Rf /').should_succeed server_everything
631
+ knife('list -Rf --local /').should_succeed nothing
632
+ end
633
+
634
+ context 'and cwd is at the top level' do
635
+ cwd '.'
636
+ it 'knife delete fails' do
637
+ knife('delete').should_fail "FATAL: Must specify at least one argument. If you want to delete everything in this directory, type \"knife delete --recurse .\"\n", :stdout => /USAGE/
638
+ knife('list -Rf /').should_succeed <<EOM
639
+ clients
640
+ clients/chef-validator.json
641
+ clients/chef-webui.json
642
+ clients/x.json
643
+ cookbooks
644
+ cookbooks/x
645
+ cookbooks/x/metadata.rb
646
+ data_bags
647
+ data_bags/x
648
+ data_bags/x/y.json
649
+ environments
650
+ environments/_default.json
651
+ environments/x.json
652
+ nodes
653
+ nodes/x.json
654
+ roles
655
+ roles/x.json
656
+ users
657
+ users/admin.json
658
+ users/x.json
659
+ EOM
660
+ knife('list -Rf --local /').should_succeed <<EOM
661
+ clients
662
+ cookbooks
663
+ data_bags
664
+ environments
665
+ nodes
666
+ roles
667
+ users
668
+ EOM
669
+ end
670
+ end
671
+ end
672
+ end
673
+
674
+ when_the_chef_server 'is empty' do
675
+ when_the_repository 'has one of each thing' do
676
+ file 'clients/x.json', {}
677
+ file 'cookbooks/x/metadata.rb', ''
678
+ file 'data_bags/x/y.json', {}
679
+ file 'environments/_default.json', {}
680
+ file 'environments/x.json', {}
681
+ file 'nodes/x.json', {}
682
+ file 'roles/x.json', {}
683
+ file 'users/x.json', {}
684
+
685
+ it 'knife delete --both /cookbooks/x fails' do
686
+ knife('delete --both /cookbooks/x').should_fail "ERROR: /cookbooks/x (local) must be deleted recursively! Pass -r to knife delete.\n"
687
+ knife('list -Rf /').should_succeed server_nothing
688
+ knife('list -Rf --local /').should_succeed everything
689
+ end
690
+
691
+ it 'knife delete --both -r /cookbooks/x deletes x' do
692
+ knife('delete --both -r /cookbooks/x').should_succeed "Deleted /cookbooks/x\n"
693
+ knife('list -Rf /').should_succeed server_nothing
694
+ knife('list -Rf --local /').should_succeed <<EOM
695
+ /clients
696
+ /clients/x.json
697
+ /cookbooks
698
+ /data_bags
699
+ /data_bags/x
700
+ /data_bags/x/y.json
701
+ /environments
702
+ /environments/_default.json
703
+ /environments/x.json
704
+ /nodes
705
+ /nodes/x.json
706
+ /roles
707
+ /roles/x.json
708
+ /users
709
+ /users/x.json
710
+ EOM
711
+ end
712
+
713
+ it 'knife delete --both /data_bags/x fails' do
714
+ knife('delete --both /data_bags/x').should_fail "ERROR: /data_bags/x (local) must be deleted recursively! Pass -r to knife delete.\n"
715
+ knife('list -Rf /').should_succeed server_nothing
716
+ knife('list -Rf --local /').should_succeed everything
717
+ end
718
+
719
+ it 'knife delete --both -r /data_bags/x deletes x' do
720
+ knife('delete --both -r /data_bags/x').should_succeed "Deleted /data_bags/x\n"
721
+ knife('list -Rf /').should_succeed server_nothing
722
+ knife('list -Rf --local /').should_succeed <<EOM
723
+ /clients
724
+ /clients/x.json
725
+ /cookbooks
726
+ /cookbooks/x
727
+ /cookbooks/x/metadata.rb
728
+ /data_bags
729
+ /environments
730
+ /environments/_default.json
731
+ /environments/x.json
732
+ /nodes
733
+ /nodes/x.json
734
+ /roles
735
+ /roles/x.json
736
+ /users
737
+ /users/x.json
738
+ EOM
739
+ end
740
+
741
+ it 'knife delete --both /environments/x.json deletes x' do
742
+ knife('delete --both /environments/x.json').should_succeed "Deleted /environments/x.json\n"
743
+ knife('list -Rf /').should_succeed server_nothing
744
+ knife('list -Rf --local /').should_succeed <<EOM
745
+ /clients
746
+ /clients/x.json
747
+ /cookbooks
748
+ /cookbooks/x
749
+ /cookbooks/x/metadata.rb
750
+ /data_bags
751
+ /data_bags/x
752
+ /data_bags/x/y.json
753
+ /environments
754
+ /environments/_default.json
755
+ /nodes
756
+ /nodes/x.json
757
+ /roles
758
+ /roles/x.json
759
+ /users
760
+ /users/x.json
761
+ EOM
762
+ end
763
+
764
+ it 'knife delete --both /roles/x.json deletes x' do
765
+ knife('delete --both /roles/x.json').should_succeed "Deleted /roles/x.json\n"
766
+ knife('list -Rf /').should_succeed server_nothing
767
+ knife('list -Rf --local /').should_succeed <<EOM
768
+ /clients
769
+ /clients/x.json
770
+ /cookbooks
771
+ /cookbooks/x
772
+ /cookbooks/x/metadata.rb
773
+ /data_bags
774
+ /data_bags/x
775
+ /data_bags/x/y.json
776
+ /environments
777
+ /environments/_default.json
778
+ /environments/x.json
779
+ /nodes
780
+ /nodes/x.json
781
+ /roles
782
+ /users
783
+ /users/x.json
784
+ EOM
785
+ end
786
+
787
+ it 'knife delete --both /environments/_default.json fails but still deletes the local copy' do
788
+ knife('delete --both /environments/_default.json').should_fail :stderr => "ERROR: /environments/_default.json (remote) cannot be deleted (default environment cannot be modified).\n", :stdout => "Deleted /environments/_default.json\n"
789
+ knife('list -Rf /').should_succeed server_nothing
790
+ knife('list -Rf --local /').should_succeed <<EOM
791
+ /clients
792
+ /clients/x.json
793
+ /cookbooks
794
+ /cookbooks/x
795
+ /cookbooks/x/metadata.rb
796
+ /data_bags
797
+ /data_bags/x
798
+ /data_bags/x/y.json
799
+ /environments
800
+ /environments/x.json
801
+ /nodes
802
+ /nodes/x.json
803
+ /roles
804
+ /roles/x.json
805
+ /users
806
+ /users/x.json
807
+ EOM
808
+ end
809
+
810
+ it 'knife delete --both / fails' do
811
+ knife('delete --both /').should_fail "ERROR: / (remote) cannot be deleted.\nERROR: / (local) cannot be deleted.\n"
812
+ knife('list -Rf /').should_succeed server_nothing
813
+ knife('list -Rf --local /').should_succeed everything
814
+ end
815
+
816
+ it 'knife delete --both -r /* fails' do
817
+ knife('delete --both -r /*').should_fail <<EOM
818
+ ERROR: / (remote) cannot be deleted.
819
+ ERROR: / (local) cannot be deleted.
820
+ ERROR: /clients (remote) cannot be deleted.
821
+ ERROR: /clients (local) cannot be deleted.
822
+ ERROR: /cookbooks (remote) cannot be deleted.
823
+ ERROR: /cookbooks (local) cannot be deleted.
824
+ ERROR: /data_bags (remote) cannot be deleted.
825
+ ERROR: /data_bags (local) cannot be deleted.
826
+ ERROR: /environments (remote) cannot be deleted.
827
+ ERROR: /environments (local) cannot be deleted.
828
+ ERROR: /nodes (remote) cannot be deleted.
829
+ ERROR: /nodes (local) cannot be deleted.
830
+ ERROR: /roles (remote) cannot be deleted.
831
+ ERROR: /roles (local) cannot be deleted.
832
+ ERROR: /users (remote) cannot be deleted.
833
+ ERROR: /users (local) cannot be deleted.
834
+ EOM
835
+ knife('list -Rf /').should_succeed server_nothing
836
+ knife('list -Rf --local /').should_succeed everything
837
+ end
838
+
839
+ it 'knife delete --both /environments/nonexistent.json fails' do
840
+ knife('delete --both /environments/nonexistent.json').should_fail "ERROR: /environments/nonexistent.json: No such file or directory\n"
841
+ knife('list -Rf /').should_succeed server_nothing
842
+ knife('list -Rf --local /').should_succeed everything
843
+ end
844
+
845
+ context 'and cwd is at the top level' do
846
+ cwd '.'
847
+ it 'knife delete fails' do
848
+ knife('delete').should_fail "FATAL: Must specify at least one argument. If you want to delete everything in this directory, type \"knife delete --recurse .\"\n", :stdout => /USAGE/
849
+ knife('list -Rf /').should_succeed <<EOM
850
+ clients
851
+ clients/chef-validator.json
852
+ clients/chef-webui.json
853
+ cookbooks
854
+ data_bags
855
+ environments
856
+ environments/_default.json
857
+ nodes
858
+ roles
859
+ users
860
+ users/admin.json
861
+ EOM
862
+ knife('list -Rf --local /').should_succeed <<EOM
863
+ clients
864
+ clients/x.json
865
+ cookbooks
866
+ cookbooks/x
867
+ cookbooks/x/metadata.rb
868
+ data_bags
869
+ data_bags/x
870
+ data_bags/x/y.json
871
+ environments
872
+ environments/_default.json
873
+ environments/x.json
874
+ nodes
875
+ nodes/x.json
876
+ roles
877
+ roles/x.json
878
+ users
879
+ users/x.json
880
+ EOM
881
+ end
882
+ end
883
+ end
884
+ end
885
+
886
+ when_the_repository 'has a cookbook' do
887
+ file 'cookbooks/x/metadata.rb', 'version "1.0.0"'
888
+ file 'cookbooks/x/onlyin1.0.0.rb', 'old_text'
889
+
890
+ when_the_chef_server 'has a later version for the cookbook' do
891
+ cookbook 'x', '1.0.0', { 'metadata.rb' => 'version "1.0.0"', 'onlyin1.0.0.rb' => '' }
892
+ cookbook 'x', '1.0.1', { 'metadata.rb' => 'version "1.0.1"', 'onlyin1.0.1.rb' => 'hi' }
893
+
894
+ # TODO this seems wrong
895
+ it 'knife delete --both -r /cookbooks/x deletes the latest version on the server and the local version' do
896
+ knife('delete --both -r /cookbooks/x').should_succeed "Deleted /cookbooks/x\n"
897
+ knife('raw /cookbooks/x').should_succeed(/1.0.0/)
898
+ knife('list --local /cookbooks').should_succeed ''
899
+ end
900
+ end
901
+
902
+ when_the_chef_server 'has an earlier version for the cookbook' do
903
+ cookbook 'x', '1.0.0', { 'metadata.rb' => 'version "1.0.0"', 'onlyin1.0.0.rb' => ''}
904
+ cookbook 'x', '0.9.9', { 'metadata.rb' => 'version "0.9.9"', 'onlyin0.9.9.rb' => 'hi' }
905
+
906
+ it 'knife delete --both /cookbooks/x deletes the latest version on the server and the local version' do
907
+ knife('delete --both -r /cookbooks/x').should_succeed "Deleted /cookbooks/x\n"
908
+ knife('raw /cookbooks/x').should_succeed(/0.9.9/)
909
+ knife('list --local /cookbooks').should_succeed ''
910
+ end
911
+ end
912
+
913
+ when_the_chef_server 'has a later version for the cookbook, and no current version' do
914
+ cookbook 'x', '1.0.1', { 'metadata.rb' => 'version "1.0.1"', 'onlyin1.0.1.rb' => 'hi' }
915
+
916
+ it 'knife delete --both /cookbooks/x deletes the server and client version of the cookbook' do
917
+ knife('delete --both -r /cookbooks/x').should_succeed "Deleted /cookbooks/x\n"
918
+ knife('raw /cookbooks/x').should_fail(/404/)
919
+ knife('list --local /cookbooks').should_succeed ''
920
+ end
921
+ end
922
+
923
+ when_the_chef_server 'has an earlier version for the cookbook, and no current version' do
924
+ cookbook 'x', '0.9.9', { 'metadata.rb' => 'version "0.9.9"', 'onlyin0.9.9.rb' => 'hi' }
925
+
926
+ it 'knife delete --both /cookbooks/x deletes the server and client version of the cookbook' do
927
+ knife('delete --both -r /cookbooks/x').should_succeed "Deleted /cookbooks/x\n"
928
+ knife('raw /cookbooks/x').should_fail(/404/)
929
+ knife('list --local /cookbooks').should_succeed ''
930
+ end
931
+ end
932
+ end
933
+
934
+ when_the_repository 'is empty' do
935
+ when_the_chef_server 'has two versions of a cookbook' do
936
+ cookbook 'x', '2.0.11', { 'metadata.rb' => 'version "2.0.11"' }
937
+ cookbook 'x', '11.0.0', { 'metadata.rb' => 'version "11.0.0"' }
938
+ it 'knife delete deletes the latest version' do
939
+ knife('delete --both -r /cookbooks/x').should_succeed "Deleted /cookbooks/x\n"
940
+ knife('raw /cookbooks/x').should_succeed /2.0.11/
941
+ end
942
+ end
943
+ end
944
+ end