chef 14.2.0-universal-mingw32 → 14.3.37-universal-mingw32

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 (845) hide show
  1. checksums.yaml +4 -4
  2. data/CONTRIBUTING.md +13 -12
  3. data/Gemfile +15 -0
  4. data/README.md +36 -40
  5. data/Rakefile +1 -1
  6. data/VERSION +1 -1
  7. data/bin/chef-apply +0 -1
  8. data/bin/chef-client +1 -2
  9. data/bin/chef-service-manager +7 -8
  10. data/bin/chef-shell +1 -6
  11. data/bin/chef-solo +1 -2
  12. data/bin/chef-windows-service +1 -2
  13. data/bin/knife +1 -2
  14. data/chef-universal-mingw32.gemspec +2 -2
  15. data/chef.gemspec +1 -1
  16. data/distro/ruby_bin_folder/Chef.PowerShell.Wrapper.dll +0 -0
  17. data/distro/ruby_bin_folder/Chef.PowerShell.dll +0 -0
  18. data/distro/{powershell/chef → ruby_bin_folder}/Newtonsoft.Json.dll +0 -0
  19. data/ext/win32-eventlog/Rakefile +14 -14
  20. data/lib/chef/api_client.rb +10 -10
  21. data/lib/chef/api_client/registration.rb +5 -5
  22. data/lib/chef/api_client_v1.rb +15 -15
  23. data/lib/chef/application.rb +1 -1
  24. data/lib/chef/application/apply.rb +56 -56
  25. data/lib/chef/application/client.rb +169 -170
  26. data/lib/chef/application/exit_code.rb +2 -2
  27. data/lib/chef/application/knife.rb +79 -78
  28. data/lib/chef/application/solo.rb +120 -120
  29. data/lib/chef/application/windows_service.rb +21 -21
  30. data/lib/chef/application/windows_service_manager.rb +39 -39
  31. data/lib/chef/audit/audit_event_proxy.rb +6 -6
  32. data/lib/chef/audit/audit_reporter.rb +2 -2
  33. data/lib/chef/audit/control_group_data.rb +15 -15
  34. data/lib/chef/audit/runner.rb +1 -1
  35. data/lib/chef/chef_class.rb +16 -8
  36. data/lib/chef/chef_fs/chef_fs_data_store.rb +8 -8
  37. data/lib/chef/chef_fs/config.rb +2 -2
  38. data/lib/chef/chef_fs/file_system/chef_server/acl_entry.rb +1 -1
  39. data/lib/chef/chef_fs/file_system/chef_server/acls_dir.rb +1 -1
  40. data/lib/chef/chef_fs/file_system/chef_server/chef_server_root_dir.rb +2 -2
  41. data/lib/chef/chef_fs/file_system/chef_server/cookbooks_dir.rb +1 -1
  42. data/lib/chef/chef_fs/file_system/chef_server/organization_invites_entry.rb +1 -1
  43. data/lib/chef/chef_fs/file_system/chef_server/organization_members_entry.rb +1 -1
  44. data/lib/chef/chef_fs/file_system/chef_server/rest_list_entry.rb +1 -1
  45. data/lib/chef/chef_fs/file_system/chef_server/versioned_cookbooks_dir.rb +1 -1
  46. data/lib/chef/chef_fs/file_system/repository/acls_dir.rb +1 -1
  47. data/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_dir.rb +1 -1
  48. data/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_entry.rb +3 -3
  49. data/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_root_dir.rb +2 -2
  50. data/lib/chef/chef_fs/file_system/repository/directory.rb +3 -3
  51. data/lib/chef/chef_fs/file_system/repository/file_system_entry.rb +3 -3
  52. data/lib/chef/chef_fs/knife.rb +6 -6
  53. data/lib/chef/chef_fs/parallelizer.rb +1 -1
  54. data/lib/chef/client.rb +3 -0
  55. data/lib/chef/cookbook/cookbook_version_loader.rb +1 -1
  56. data/lib/chef/cookbook/file_system_file_vendor.rb +1 -1
  57. data/lib/chef/cookbook/manifest_v0.rb +1 -1
  58. data/lib/chef/cookbook/metadata.rb +61 -61
  59. data/lib/chef/cookbook/remote_file_vendor.rb +1 -1
  60. data/lib/chef/cookbook/synchronizer.rb +2 -2
  61. data/lib/chef/cookbook_loader.rb +3 -3
  62. data/lib/chef/cookbook_manifest.rb +5 -5
  63. data/lib/chef/cookbook_site_streaming_uploader.rb +5 -5
  64. data/lib/chef/cookbook_uploader.rb +2 -2
  65. data/lib/chef/cookbook_version.rb +2 -2
  66. data/lib/chef/data_bag.rb +3 -3
  67. data/lib/chef/data_bag_item.rb +2 -2
  68. data/lib/chef/deprecated.rb +110 -176
  69. data/lib/chef/dsl/audit.rb +1 -1
  70. data/lib/chef/dsl/definitions.rb +1 -1
  71. data/lib/chef/dsl/platform_introspection.rb +5 -0
  72. data/lib/chef/dsl/reboot_pending.rb +1 -1
  73. data/lib/chef/encrypted_data_bag_item.rb +2 -2
  74. data/lib/chef/encrypted_data_bag_item/check_encrypted.rb +1 -1
  75. data/lib/chef/encrypted_data_bag_item/encryptor.rb +1 -1
  76. data/lib/chef/environment.rb +10 -10
  77. data/lib/chef/event_loggers/windows_eventlog.rb +21 -21
  78. data/lib/chef/exceptions.rb +3 -3
  79. data/lib/chef/file_cache.rb +18 -16
  80. data/lib/chef/formatters/base.rb +9 -10
  81. data/lib/chef/formatters/doc.rb +12 -16
  82. data/lib/chef/formatters/error_inspectors/api_error_formatting.rb +51 -51
  83. data/lib/chef/formatters/error_inspectors/cookbook_resolve_error_inspector.rb +10 -10
  84. data/lib/chef/formatters/error_inspectors/node_load_error_inspector.rb +13 -13
  85. data/lib/chef/formatters/error_inspectors/registration_error_inspector.rb +39 -39
  86. data/lib/chef/formatters/error_inspectors/resource_failure_inspector.rb +1 -1
  87. data/lib/chef/formatters/error_inspectors/run_list_expansion_error_inspector.rb +16 -16
  88. data/lib/chef/formatters/indentable_output_stream.rb +4 -4
  89. data/lib/chef/guard_interpreter/resource_guard_interpreter.rb +3 -3
  90. data/lib/chef/handler/json_file.rb +1 -1
  91. data/lib/chef/http/auth_credentials.rb +2 -2
  92. data/lib/chef/http/authenticator.rb +6 -6
  93. data/lib/chef/http/cookie_manager.rb +1 -1
  94. data/lib/chef/http/http_request.rb +3 -3
  95. data/lib/chef/http/json_input.rb +1 -1
  96. data/lib/chef/http/json_to_model_output.rb +1 -1
  97. data/lib/chef/http/socketless_chef_zero_client.rb +1 -1
  98. data/lib/chef/json_compat.rb +1 -1
  99. data/lib/chef/key.rb +9 -9
  100. data/lib/chef/knife.rb +5 -5
  101. data/lib/chef/knife/bootstrap.rb +116 -116
  102. data/lib/chef/knife/bootstrap/client_builder.rb +1 -1
  103. data/lib/chef/knife/client_bulk_delete.rb +3 -3
  104. data/lib/chef/knife/client_create.rb +17 -17
  105. data/lib/chef/knife/client_delete.rb +3 -3
  106. data/lib/chef/knife/client_list.rb +3 -3
  107. data/lib/chef/knife/client_reregister.rb +3 -3
  108. data/lib/chef/knife/config_get.rb +126 -0
  109. data/lib/chef/knife/configure.rb +25 -25
  110. data/lib/chef/knife/cookbook_bulk_delete.rb +1 -1
  111. data/lib/chef/knife/cookbook_delete.rb +2 -2
  112. data/lib/chef/knife/cookbook_download.rb +11 -11
  113. data/lib/chef/knife/cookbook_list.rb +6 -6
  114. data/lib/chef/knife/cookbook_metadata.rb +7 -8
  115. data/lib/chef/knife/cookbook_metadata_from_file.rb +0 -1
  116. data/lib/chef/knife/cookbook_show.rb +16 -16
  117. data/lib/chef/knife/cookbook_site_download.rb +11 -10
  118. data/lib/chef/knife/cookbook_site_install.rb +24 -24
  119. data/lib/chef/knife/cookbook_site_list.rb +8 -8
  120. data/lib/chef/knife/cookbook_site_search.rb +6 -5
  121. data/lib/chef/knife/cookbook_site_share.rb +20 -19
  122. data/lib/chef/knife/cookbook_site_show.rb +6 -5
  123. data/lib/chef/knife/cookbook_site_unshare.rb +5 -5
  124. data/lib/chef/knife/cookbook_test.rb +8 -8
  125. data/lib/chef/knife/cookbook_upload.rb +32 -32
  126. data/lib/chef/knife/core/bootstrap_context.rb +7 -7
  127. data/lib/chef/knife/core/cookbook_scm_repo.rb +1 -1
  128. data/lib/chef/knife/core/generic_presenter.rb +7 -7
  129. data/lib/chef/knife/core/hashed_command_loader.rb +1 -1
  130. data/lib/chef/knife/core/node_presenter.rb +37 -37
  131. data/lib/chef/knife/core/status_presenter.rb +11 -11
  132. data/lib/chef/knife/data_bag_from_file.rb +4 -4
  133. data/lib/chef/knife/data_bag_list.rb +3 -3
  134. data/lib/chef/knife/data_bag_secret_options.rb +13 -13
  135. data/lib/chef/knife/delete.rb +29 -13
  136. data/lib/chef/knife/deps.rb +25 -9
  137. data/lib/chef/knife/diff.rb +30 -14
  138. data/lib/chef/knife/download.rb +39 -23
  139. data/lib/chef/knife/edit.rb +19 -3
  140. data/lib/chef/knife/environment_compare.rb +8 -8
  141. data/lib/chef/knife/environment_create.rb +3 -3
  142. data/lib/chef/knife/environment_from_file.rb +5 -3
  143. data/lib/chef/knife/environment_list.rb +3 -3
  144. data/lib/chef/knife/exec.rb +7 -7
  145. data/lib/chef/knife/key_create.rb +4 -4
  146. data/lib/chef/knife/key_create_base.rb +12 -12
  147. data/lib/chef/knife/key_edit.rb +5 -5
  148. data/lib/chef/knife/key_edit_base.rb +15 -15
  149. data/lib/chef/knife/key_list.rb +3 -3
  150. data/lib/chef/knife/key_list_base.rb +9 -9
  151. data/lib/chef/knife/list.rb +35 -19
  152. data/lib/chef/knife/node_edit.rb +4 -4
  153. data/lib/chef/knife/node_list.rb +3 -3
  154. data/lib/chef/knife/node_run_list_add.rb +6 -6
  155. data/lib/chef/knife/node_show.rb +6 -6
  156. data/lib/chef/knife/osc_user_create.rb +13 -13
  157. data/lib/chef/knife/osc_user_list.rb +3 -3
  158. data/lib/chef/knife/osc_user_reregister.rb +3 -3
  159. data/lib/chef/knife/raw.rb +32 -16
  160. data/lib/chef/knife/role_create.rb +3 -3
  161. data/lib/chef/knife/role_env_run_list_add.rb +4 -3
  162. data/lib/chef/knife/role_env_run_list_remove.rb +2 -2
  163. data/lib/chef/knife/role_env_run_list_replace.rb +1 -0
  164. data/lib/chef/knife/role_list.rb +3 -3
  165. data/lib/chef/knife/role_run_list_add.rb +4 -3
  166. data/lib/chef/knife/role_run_list_remove.rb +2 -2
  167. data/lib/chef/knife/role_run_list_replace.rb +1 -0
  168. data/lib/chef/knife/search.rb +23 -23
  169. data/lib/chef/knife/serve.rb +22 -6
  170. data/lib/chef/knife/show.rb +19 -3
  171. data/lib/chef/knife/ssh.rb +68 -68
  172. data/lib/chef/knife/ssl_check.rb +31 -31
  173. data/lib/chef/knife/ssl_fetch.rb +5 -5
  174. data/lib/chef/knife/status.rb +11 -11
  175. data/lib/chef/knife/upload.rb +41 -25
  176. data/lib/chef/knife/user_create.rb +28 -28
  177. data/lib/chef/knife/user_delete.rb +9 -9
  178. data/lib/chef/knife/user_edit.rb +9 -9
  179. data/lib/chef/knife/user_list.rb +3 -3
  180. data/lib/chef/knife/user_reregister.rb +12 -12
  181. data/lib/chef/knife/user_show.rb +9 -9
  182. data/lib/chef/knife/xargs.rb +52 -36
  183. data/lib/chef/log.rb +10 -8
  184. data/lib/chef/log/winevt.rb +21 -21
  185. data/lib/chef/mixin/api_version_request_handling.rb +6 -6
  186. data/lib/chef/mixin/deep_merge.rb +1 -1
  187. data/lib/chef/mixin/deprecation.rb +2 -2
  188. data/lib/chef/mixin/params_validate.rb +9 -9
  189. data/lib/chef/mixin/properties.rb +2 -2
  190. data/lib/chef/mixin/securable.rb +11 -11
  191. data/lib/chef/mixin/shell_out.rb +138 -82
  192. data/lib/chef/mixin/wide_string.rb +5 -23
  193. data/lib/chef/mixin/windows_env_helper.rb +1 -1
  194. data/lib/chef/mixin/xml_escape.rb +3 -3
  195. data/lib/chef/node.rb +15 -15
  196. data/lib/chef/node/attribute.rb +6 -6
  197. data/lib/chef/node/attribute_collections.rb +2 -2
  198. data/lib/chef/node/mixin/deep_merge_cache.rb +1 -1
  199. data/lib/chef/node/mixin/immutablize_array.rb +2 -2
  200. data/lib/chef/node/mixin/immutablize_hash.rb +2 -2
  201. data/lib/chef/node_map.rb +77 -3
  202. data/lib/chef/org.rb +8 -8
  203. data/lib/chef/policy_builder/expand_node_object.rb +1 -1
  204. data/lib/chef/powershell.rb +9 -7
  205. data/lib/chef/property.rb +14 -14
  206. data/lib/chef/provider/apt_update.rb +2 -2
  207. data/lib/chef/provider/cron.rb +3 -3
  208. data/lib/chef/provider/cron/unix.rb +2 -2
  209. data/lib/chef/provider/dsc_resource.rb +1 -1
  210. data/lib/chef/provider/dsc_script.rb +8 -8
  211. data/lib/chef/provider/execute.rb +1 -1
  212. data/lib/chef/provider/group/aix.rb +6 -6
  213. data/lib/chef/provider/group/dscl.rb +1 -1
  214. data/lib/chef/provider/group/gpasswd.rb +4 -4
  215. data/lib/chef/provider/group/groupadd.rb +3 -3
  216. data/lib/chef/provider/group/groupmod.rb +6 -6
  217. data/lib/chef/provider/group/pw.rb +4 -4
  218. data/lib/chef/provider/group/suse.rb +2 -2
  219. data/lib/chef/provider/group/usermod.rb +1 -1
  220. data/lib/chef/provider/http_request.rb +6 -6
  221. data/lib/chef/provider/ifconfig.rb +4 -4
  222. data/lib/chef/provider/ifconfig/aix.rb +1 -1
  223. data/lib/chef/provider/mdadm.rb +1 -1
  224. data/lib/chef/provider/mount/mount.rb +1 -1
  225. data/lib/chef/provider/mount/windows.rb +7 -7
  226. data/lib/chef/provider/package.rb +3 -18
  227. data/lib/chef/provider/package/apt.rb +4 -4
  228. data/lib/chef/provider/package/bff.rb +9 -9
  229. data/lib/chef/provider/package/chocolatey.rb +7 -7
  230. data/lib/chef/provider/package/dnf.rb +2 -2
  231. data/lib/chef/provider/package/dpkg.rb +6 -6
  232. data/lib/chef/provider/package/freebsd/base.rb +2 -2
  233. data/lib/chef/provider/package/freebsd/pkg.rb +6 -6
  234. data/lib/chef/provider/package/freebsd/pkgng.rb +5 -5
  235. data/lib/chef/provider/package/freebsd/port.rb +4 -4
  236. data/lib/chef/provider/package/homebrew.rb +1 -1
  237. data/lib/chef/provider/package/ips.rb +6 -6
  238. data/lib/chef/provider/package/macports.rb +6 -6
  239. data/lib/chef/provider/package/msu.rb +1 -1
  240. data/lib/chef/provider/package/openbsd.rb +5 -5
  241. data/lib/chef/provider/package/pacman.rb +4 -4
  242. data/lib/chef/provider/package/paludis.rb +3 -3
  243. data/lib/chef/provider/package/portage.rb +5 -5
  244. data/lib/chef/provider/package/powershell.rb +6 -2
  245. data/lib/chef/provider/package/rpm.rb +10 -10
  246. data/lib/chef/provider/package/rubygems.rb +4 -4
  247. data/lib/chef/provider/package/smartos.rb +4 -4
  248. data/lib/chef/provider/package/solaris.rb +9 -9
  249. data/lib/chef/provider/package/windows.rb +4 -3
  250. data/lib/chef/provider/package/yum.rb +2 -2
  251. data/lib/chef/provider/package/zypper.rb +4 -4
  252. data/lib/chef/provider/powershell_script.rb +73 -73
  253. data/lib/chef/provider/reboot.rb +4 -4
  254. data/lib/chef/provider/registry_key.rb +4 -4
  255. data/lib/chef/provider/remote_file/cache_control_data.rb +2 -2
  256. data/lib/chef/provider/remote_file/sftp.rb +1 -1
  257. data/lib/chef/provider/resource_update.rb +1 -1
  258. data/lib/chef/provider/route.rb +2 -2
  259. data/lib/chef/provider/service/openbsd.rb +3 -3
  260. data/lib/chef/provider/service/redhat.rb +1 -1
  261. data/lib/chef/provider/service/simple.rb +1 -0
  262. data/lib/chef/provider/service/solaris.rb +1 -1
  263. data/lib/chef/provider/service/systemd.rb +2 -2
  264. data/lib/chef/provider/service/windows.rb +17 -17
  265. data/lib/chef/provider/subversion.rb +3 -3
  266. data/lib/chef/provider/systemd_unit.rb +2 -2
  267. data/lib/chef/provider/template/content.rb +1 -1
  268. data/lib/chef/provider/user/aix.rb +6 -6
  269. data/lib/chef/provider/user/dscl.rb +6 -6
  270. data/lib/chef/provider/user/linux.rb +6 -6
  271. data/lib/chef/provider/user/pw.rb +5 -5
  272. data/lib/chef/provider/user/solaris.rb +6 -6
  273. data/lib/chef/provider/user/useradd.rb +7 -7
  274. data/lib/chef/provider/windows_env.rb +6 -6
  275. data/lib/chef/provider/windows_task.rb +22 -24
  276. data/lib/chef/resource.rb +26 -4
  277. data/lib/chef/resource/chef_handler.rb +2 -0
  278. data/lib/chef/resource/chocolatey_config.rb +83 -0
  279. data/lib/chef/resource/chocolatey_source.rb +95 -0
  280. data/lib/chef/resource/cron.rb +5 -5
  281. data/lib/chef/resource/dsc_script.rb +12 -11
  282. data/lib/chef/resource/execute.rb +1 -1
  283. data/lib/chef/resource/file/verification.rb +1 -1
  284. data/lib/chef/resource/freebsd_package.rb +3 -1
  285. data/lib/chef/resource/group.rb +2 -2
  286. data/lib/chef/resource/homebrew_package.rb +2 -1
  287. data/lib/chef/resource/homebrew_tap.rb +1 -1
  288. data/lib/chef/resource/hostname.rb +23 -7
  289. data/lib/chef/resource/http_request.rb +6 -3
  290. data/lib/chef/resource/ifconfig.rb +57 -17
  291. data/lib/chef/resource/ips_package.rb +3 -1
  292. data/lib/chef/resource/kernel_module.rb +129 -0
  293. data/lib/chef/resource/launchd.rb +205 -98
  294. data/lib/chef/resource/log.rb +7 -2
  295. data/lib/chef/resource/mdadm.rb +29 -8
  296. data/lib/chef/resource/ohai.rb +2 -0
  297. data/lib/chef/resource/ohai_hint.rb +5 -3
  298. data/lib/chef/resource/openssl_dhparam.rb +1 -1
  299. data/lib/chef/resource/openssl_rsa_private_key.rb +2 -0
  300. data/lib/chef/resource/paludis_package.rb +1 -1
  301. data/lib/chef/resource/portage_package.rb +2 -0
  302. data/lib/chef/resource/powershell_package.rb +2 -0
  303. data/lib/chef/resource/powershell_package_source.rb +165 -0
  304. data/lib/chef/resource/powershell_script.rb +2 -2
  305. data/lib/chef/resource/registry_key.rb +1 -1
  306. data/lib/chef/resource/remote_directory.rb +3 -3
  307. data/lib/chef/resource/remote_file.rb +2 -2
  308. data/lib/chef/resource/resource_notification.rb +16 -16
  309. data/lib/chef/resource/rhsm_errata.rb +1 -1
  310. data/lib/chef/resource/rhsm_errata_level.rb +1 -1
  311. data/lib/chef/resource/rhsm_register.rb +4 -4
  312. data/lib/chef/resource/rhsm_repo.rb +2 -2
  313. data/lib/chef/resource/rhsm_subscription.rb +2 -2
  314. data/lib/chef/resource/script.rb +1 -1
  315. data/lib/chef/resource/service.rb +18 -18
  316. data/lib/chef/resource/ssh_known_hosts_entry.rb +146 -0
  317. data/lib/chef/resource/sudo.rb +4 -4
  318. data/lib/chef/resource/support/ssh_known_hosts.erb +3 -0
  319. data/lib/chef/resource/sysctl.rb +9 -5
  320. data/lib/chef/resource/template.rb +1 -1
  321. data/lib/chef/resource/user.rb +15 -15
  322. data/lib/chef/resource/windows_feature_dism.rb +10 -9
  323. data/lib/chef/resource/windows_feature_powershell.rb +24 -13
  324. data/lib/chef/resource/windows_script.rb +1 -1
  325. data/lib/chef/resource/windows_service.rb +2 -2
  326. data/lib/chef/resource/windows_task.rb +3 -3
  327. data/lib/chef/resource_definition.rb +1 -1
  328. data/lib/chef/resource_inspector.rb +1 -0
  329. data/lib/chef/resource_reporter.rb +4 -4
  330. data/lib/chef/resources.rb +5 -0
  331. data/lib/chef/role.rb +8 -8
  332. data/lib/chef/run_context.rb +8 -8
  333. data/lib/chef/run_list/run_list_expansion.rb +6 -6
  334. data/lib/chef/run_list/run_list_item.rb +1 -1
  335. data/lib/chef/run_list/versioned_recipe_list.rb +3 -3
  336. data/lib/chef/run_status.rb +10 -10
  337. data/lib/chef/shell.rb +60 -60
  338. data/lib/chef/shell/ext.rb +151 -151
  339. data/lib/chef/shell/shell_session.rb +2 -2
  340. data/lib/chef/user.rb +11 -11
  341. data/lib/chef/user_v1.rb +26 -26
  342. data/lib/chef/util/backup.rb +2 -2
  343. data/lib/chef/util/diff.rb +1 -1
  344. data/lib/chef/util/dsc/configuration_generator.rb +11 -11
  345. data/lib/chef/util/dsc/lcm_output_parser.rb +1 -1
  346. data/lib/chef/util/file_edit.rb +14 -14
  347. data/lib/chef/util/powershell/cmdlet.rb +4 -4
  348. data/lib/chef/util/selinux.rb +2 -2
  349. data/lib/chef/util/windows/net_group.rb +1 -1
  350. data/lib/chef/util/windows/net_use.rb +3 -3
  351. data/lib/chef/util/windows/net_user.rb +12 -12
  352. data/lib/chef/util/windows/volume.rb +2 -2
  353. data/lib/chef/version.rb +3 -3
  354. data/lib/chef/version_constraint.rb +3 -3
  355. data/lib/chef/win32/api.rb +6 -6
  356. data/lib/chef/win32/api/error.rb +2 -2
  357. data/lib/chef/win32/api/file.rb +12 -12
  358. data/lib/chef/win32/api/net.rb +58 -58
  359. data/lib/chef/win32/registry.rb +8 -8
  360. data/lib/chef/win32/security.rb +6 -6
  361. data/lib/chef/win32/security/securable_object.rb +10 -10
  362. data/lib/chef/win32/unicode.rb +6 -0
  363. data/lib/chef/win32/version.rb +16 -16
  364. data/spec/functional/audit/rspec_formatter_spec.rb +1 -1
  365. data/spec/functional/audit/runner_spec.rb +1 -1
  366. data/spec/functional/dsl/reboot_pending_spec.rb +3 -3
  367. data/spec/functional/dsl/registry_helper_spec.rb +3 -3
  368. data/spec/functional/http/simple_spec.rb +1 -1
  369. data/spec/functional/knife/exec_spec.rb +1 -1
  370. data/spec/functional/knife/ssh_spec.rb +2 -2
  371. data/spec/functional/mixin/shell_out_spec.rb +8 -4
  372. data/spec/functional/rebooter_spec.rb +6 -6
  373. data/spec/functional/resource/aixinit_service_spec.rb +2 -2
  374. data/spec/functional/resource/apt_package_spec.rb +17 -17
  375. data/spec/functional/resource/bash_spec.rb +1 -1
  376. data/spec/functional/resource/bff_spec.rb +1 -1
  377. data/spec/functional/resource/cron_spec.rb +1 -1
  378. data/spec/functional/resource/dnf_package_spec.rb +7 -7
  379. data/spec/functional/resource/dsc_script_spec.rb +94 -94
  380. data/spec/functional/resource/execute_spec.rb +4 -4
  381. data/spec/functional/resource/file_spec.rb +1 -1
  382. data/spec/functional/resource/git_spec.rb +19 -19
  383. data/spec/functional/resource/ifconfig_spec.rb +5 -5
  384. data/spec/functional/resource/link_spec.rb +1 -1
  385. data/spec/functional/resource/mount_spec.rb +2 -2
  386. data/spec/functional/resource/powershell_script_spec.rb +13 -13
  387. data/spec/functional/resource/reboot_spec.rb +3 -3
  388. data/spec/functional/resource/registry_spec.rb +82 -82
  389. data/spec/functional/resource/remote_file_spec.rb +2 -2
  390. data/spec/functional/resource/rpm_spec.rb +1 -1
  391. data/spec/functional/resource/template_spec.rb +5 -5
  392. data/spec/functional/resource/user/dscl_spec.rb +3 -3
  393. data/spec/functional/resource/windows_env_spec.rb +1 -1
  394. data/spec/functional/resource/windows_service_spec.rb +1 -1
  395. data/spec/functional/resource/windows_task_spec.rb +92 -38
  396. data/spec/functional/resource/yum_package_spec.rb +8 -8
  397. data/spec/functional/run_lock_spec.rb +4 -4
  398. data/spec/functional/shell_spec.rb +1 -1
  399. data/spec/functional/util/powershell/cmdlet_spec.rb +7 -7
  400. data/spec/functional/version_spec.rb +1 -1
  401. data/spec/functional/win32/crypto_spec.rb +9 -9
  402. data/spec/functional/win32/registry_spec.rb +66 -66
  403. data/spec/integration/client/client_spec.rb +219 -219
  404. data/spec/integration/client/exit_code_spec.rb +19 -19
  405. data/spec/integration/client/ipv6_spec.rb +36 -36
  406. data/spec/integration/knife/chef_fs_data_store_spec.rb +130 -130
  407. data/spec/integration/knife/chef_repo_path_spec.rb +418 -418
  408. data/spec/integration/knife/chef_repository_file_system_spec.rb +35 -35
  409. data/spec/integration/knife/chefignore_spec.rb +88 -88
  410. data/spec/integration/knife/client_bulk_delete_spec.rb +49 -49
  411. data/spec/integration/knife/client_create_spec.rb +5 -5
  412. data/spec/integration/knife/client_delete_spec.rb +13 -13
  413. data/spec/integration/knife/client_key_delete_spec.rb +2 -2
  414. data/spec/integration/knife/client_key_list_spec.rb +4 -4
  415. data/spec/integration/knife/client_list_spec.rb +8 -8
  416. data/spec/integration/knife/common_options_spec.rb +31 -31
  417. data/spec/integration/knife/config_get_spec.rb +183 -0
  418. data/spec/integration/knife/cookbook_api_ipv6_spec.rb +38 -38
  419. data/spec/integration/knife/cookbook_bulk_delete_spec.rb +14 -14
  420. data/spec/integration/knife/cookbook_download_spec.rb +12 -12
  421. data/spec/integration/knife/cookbook_list_spec.rb +8 -8
  422. data/spec/integration/knife/cookbook_show_spec.rb +81 -81
  423. data/spec/integration/knife/cookbook_upload_spec.rb +24 -24
  424. data/spec/integration/knife/data_bag_delete_spec.rb +8 -8
  425. data/spec/integration/knife/data_bag_from_file_spec.rb +47 -47
  426. data/spec/integration/knife/data_bag_list_spec.rb +4 -4
  427. data/spec/integration/knife/data_bag_show_spec.rb +7 -7
  428. data/spec/integration/knife/delete_spec.rb +593 -593
  429. data/spec/integration/knife/deps_spec.rb +185 -185
  430. data/spec/integration/knife/diff_spec.rb +116 -116
  431. data/spec/integration/knife/download_spec.rb +510 -510
  432. data/spec/integration/knife/environment_compare_spec.rb +15 -15
  433. data/spec/integration/knife/environment_from_file_spec.rb +59 -59
  434. data/spec/integration/knife/environment_list_spec.rb +4 -4
  435. data/spec/integration/knife/environment_show_spec.rb +25 -25
  436. data/spec/integration/knife/list_spec.rb +731 -731
  437. data/spec/integration/knife/node_bulk_delete_spec.rb +8 -8
  438. data/spec/integration/knife/node_delete_spec.rb +6 -6
  439. data/spec/integration/knife/node_environment_set_spec.rb +3 -3
  440. data/spec/integration/knife/node_from_file_spec.rb +16 -16
  441. data/spec/integration/knife/node_list_spec.rb +5 -5
  442. data/spec/integration/knife/raw_spec.rb +117 -117
  443. data/spec/integration/knife/role_bulk_delete_spec.rb +8 -8
  444. data/spec/integration/knife/role_delete_spec.rb +6 -6
  445. data/spec/integration/knife/role_from_file_spec.rb +42 -42
  446. data/spec/integration/knife/role_list_spec.rb +5 -5
  447. data/spec/integration/knife/role_show_spec.rb +9 -9
  448. data/spec/integration/knife/show_spec.rb +57 -57
  449. data/spec/integration/knife/upload_spec.rb +396 -396
  450. data/spec/integration/recipes/accumulator_spec.rb +2 -2
  451. data/spec/integration/recipes/lwrp_inline_resources_spec.rb +8 -8
  452. data/spec/integration/recipes/lwrp_spec.rb +12 -12
  453. data/spec/integration/recipes/notifies_spec.rb +167 -167
  454. data/spec/integration/recipes/notifying_block_spec.rb +2 -2
  455. data/spec/integration/recipes/remote_directory.rb +1 -1
  456. data/spec/integration/recipes/resource_converge_if_changed_spec.rb +99 -99
  457. data/spec/integration/recipes/resource_load_spec.rb +8 -8
  458. data/spec/integration/solo/solo_spec.rb +40 -40
  459. data/spec/scripts/ssl-serve.rb +12 -12
  460. data/spec/spec_helper.rb +73 -73
  461. data/spec/stress/win32/file_spec.rb +2 -2
  462. data/spec/stress/win32/security_spec.rb +2 -2
  463. data/spec/support/platform_helpers.rb +1 -1
  464. data/spec/support/shared/context/client.rb +25 -25
  465. data/spec/support/shared/functional/securable_resource.rb +13 -13
  466. data/spec/support/shared/functional/securable_resource_with_reporting.rb +6 -6
  467. data/spec/support/shared/functional/win32_service.rb +5 -5
  468. data/spec/support/shared/functional/windows_script.rb +3 -3
  469. data/spec/support/shared/integration/app_server_support.rb +3 -3
  470. data/spec/support/shared/integration/integration_helper.rb +2 -2
  471. data/spec/support/shared/integration/knife_support.rb +9 -3
  472. data/spec/support/shared/unit/api_error_inspector.rb +6 -6
  473. data/spec/support/shared/unit/api_versioning.rb +2 -2
  474. data/spec/support/shared/unit/execute_resource.rb +2 -2
  475. data/spec/support/shared/unit/provider/file.rb +12 -12
  476. data/spec/support/shared/unit/provider/useradd_based_user_provider.rb +34 -34
  477. data/spec/support/shared/unit/user_and_client_shared.rb +3 -3
  478. data/spec/tiny_server.rb +8 -8
  479. data/spec/unit/api_client/registration_spec.rb +30 -30
  480. data/spec/unit/api_client_spec.rb +6 -6
  481. data/spec/unit/api_client_v1_spec.rb +6 -6
  482. data/spec/unit/application/apply_spec.rb +4 -4
  483. data/spec/unit/application/client_spec.rb +11 -11
  484. data/spec/unit/application/knife_spec.rb +3 -3
  485. data/spec/unit/application/solo_spec.rb +5 -5
  486. data/spec/unit/application_spec.rb +11 -11
  487. data/spec/unit/audit/audit_event_proxy_spec.rb +48 -48
  488. data/spec/unit/audit/audit_reporter_spec.rb +51 -55
  489. data/spec/unit/audit/control_group_data_spec.rb +20 -20
  490. data/spec/unit/audit/runner_spec.rb +2 -2
  491. data/spec/unit/chef_class_spec.rb +120 -0
  492. data/spec/unit/chef_fs/data_handler/data_bag_item_data_handler.rb +1 -1
  493. data/spec/unit/chef_fs/data_handler/data_handler_base_spec.rb +3 -3
  494. data/spec/unit/chef_fs/diff_spec.rb +45 -45
  495. data/spec/unit/chef_fs/file_pattern_spec.rb +2 -2
  496. data/spec/unit/chef_fs/file_system/repository/directory_spec.rb +2 -2
  497. data/spec/unit/chef_fs/file_system_spec.rb +8 -8
  498. data/spec/unit/chef_fs/parallelizer.rb +12 -12
  499. data/spec/unit/client_spec.rb +15 -15
  500. data/spec/unit/config_fetcher_spec.rb +23 -23
  501. data/spec/unit/config_spec.rb +2 -2
  502. data/spec/unit/cookbook/metadata_spec.rb +81 -81
  503. data/spec/unit/cookbook/synchronizer_spec.rb +171 -171
  504. data/spec/unit/cookbook_loader_spec.rb +10 -5
  505. data/spec/unit/cookbook_site_streaming_uploader_spec.rb +6 -6
  506. data/spec/unit/cookbook_uploader_spec.rb +8 -8
  507. data/spec/unit/cookbook_version_file_specificity_spec.rb +135 -135
  508. data/spec/unit/daemon_spec.rb +4 -4
  509. data/spec/unit/data_bag_item_spec.rb +3 -3
  510. data/spec/unit/data_bag_spec.rb +1 -1
  511. data/spec/unit/data_collector/resource_report_spec.rb +1 -1
  512. data/spec/unit/data_collector_spec.rb +4 -3
  513. data/spec/unit/deprecated_spec.rb +18 -12
  514. data/spec/unit/dsl/audit_spec.rb +1 -1
  515. data/spec/unit/dsl/platform_introspection_spec.rb +16 -16
  516. data/spec/unit/dsl/reboot_pending_spec.rb +1 -1
  517. data/spec/unit/environment_spec.rb +16 -16
  518. data/spec/unit/file_access_control_spec.rb +8 -8
  519. data/spec/unit/file_content_management/deploy/mv_unix_spec.rb +3 -3
  520. data/spec/unit/file_content_management/deploy/mv_windows_spec.rb +26 -26
  521. data/spec/unit/formatters/error_description_spec.rb +39 -39
  522. data/spec/unit/formatters/error_inspectors/compile_error_inspector_spec.rb +16 -16
  523. data/spec/unit/formatters/error_inspectors/cookbook_sync_error_inspector_spec.rb +1 -1
  524. data/spec/unit/formatters/error_inspectors/node_load_error_inspector_spec.rb +1 -1
  525. data/spec/unit/formatters/error_inspectors/registration_error_inspector_spec.rb +1 -1
  526. data/spec/unit/formatters/error_inspectors/resource_failure_inspector_spec.rb +1 -1
  527. data/spec/unit/formatters/error_inspectors/run_list_expansion_error_inspector_spec.rb +5 -5
  528. data/spec/unit/guard_interpreter/resource_guard_interpreter_spec.rb +4 -4
  529. data/spec/unit/handler/json_file_spec.rb +1 -1
  530. data/spec/unit/http/api_versions_spec.rb +1 -1
  531. data/spec/unit/http/authenticator_spec.rb +17 -17
  532. data/spec/unit/http/ssl_policies_spec.rb +1 -1
  533. data/spec/unit/http/validate_content_length_spec.rb +2 -2
  534. data/spec/unit/key_spec.rb +12 -12
  535. data/spec/unit/knife/bootstrap/client_builder_spec.rb +3 -3
  536. data/spec/unit/knife/client_bulk_delete_spec.rb +1 -1
  537. data/spec/unit/knife/client_delete_spec.rb +1 -1
  538. data/spec/unit/knife/client_reregister_spec.rb +1 -1
  539. data/spec/unit/knife/configure_client_spec.rb +4 -4
  540. data/spec/unit/knife/configure_spec.rb +1 -1
  541. data/spec/unit/knife/cookbook_bulk_delete_spec.rb +1 -1
  542. data/spec/unit/knife/cookbook_delete_spec.rb +4 -4
  543. data/spec/unit/knife/cookbook_download_spec.rb +21 -21
  544. data/spec/unit/knife/cookbook_list_spec.rb +7 -7
  545. data/spec/unit/knife/cookbook_show_spec.rb +24 -24
  546. data/spec/unit/knife/cookbook_site_download_spec.rb +23 -23
  547. data/spec/unit/knife/cookbook_site_install_spec.rb +4 -4
  548. data/spec/unit/knife/cookbook_site_share_spec.rb +10 -10
  549. data/spec/unit/knife/cookbook_site_unshare_spec.rb +2 -2
  550. data/spec/unit/knife/cookbook_upload_spec.rb +19 -19
  551. data/spec/unit/knife/core/bootstrap_context_spec.rb +37 -37
  552. data/spec/unit/knife/core/cookbook_scm_repo_spec.rb +20 -20
  553. data/spec/unit/knife/core/object_loader_spec.rb +1 -1
  554. data/spec/unit/knife/core/ui_spec.rb +55 -55
  555. data/spec/unit/knife/data_bag_create_spec.rb +2 -2
  556. data/spec/unit/knife/data_bag_edit_spec.rb +1 -1
  557. data/spec/unit/knife/data_bag_secret_options_spec.rb +5 -5
  558. data/spec/unit/knife/environment_from_file_spec.rb +1 -1
  559. data/spec/unit/knife/key_create_spec.rb +4 -4
  560. data/spec/unit/knife/key_delete_spec.rb +3 -3
  561. data/spec/unit/knife/key_edit_spec.rb +3 -3
  562. data/spec/unit/knife/key_list_spec.rb +3 -3
  563. data/spec/unit/knife/key_show_spec.rb +3 -3
  564. data/spec/unit/knife/node_delete_spec.rb +1 -1
  565. data/spec/unit/knife/node_edit_spec.rb +7 -7
  566. data/spec/unit/knife/node_from_file_spec.rb +1 -1
  567. data/spec/unit/knife/node_run_list_add_spec.rb +1 -1
  568. data/spec/unit/knife/osc_user_edit_spec.rb +1 -1
  569. data/spec/unit/knife/osc_user_reregister_spec.rb +1 -1
  570. data/spec/unit/knife/role_bulk_delete_spec.rb +1 -1
  571. data/spec/unit/knife/role_create_spec.rb +1 -1
  572. data/spec/unit/knife/role_delete_spec.rb +1 -1
  573. data/spec/unit/knife/role_env_run_list_add_spec.rb +4 -4
  574. data/spec/unit/knife/role_env_run_list_clear_spec.rb +1 -1
  575. data/spec/unit/knife/role_env_run_list_remove_spec.rb +1 -1
  576. data/spec/unit/knife/role_env_run_list_replace_spec.rb +1 -1
  577. data/spec/unit/knife/role_env_run_list_set_spec.rb +1 -1
  578. data/spec/unit/knife/role_from_file_spec.rb +1 -1
  579. data/spec/unit/knife/role_run_list_add_spec.rb +4 -4
  580. data/spec/unit/knife/role_run_list_clear_spec.rb +1 -1
  581. data/spec/unit/knife/role_run_list_remove_spec.rb +1 -1
  582. data/spec/unit/knife/role_run_list_replace_spec.rb +1 -1
  583. data/spec/unit/knife/role_run_list_set_spec.rb +1 -1
  584. data/spec/unit/knife/ssh_spec.rb +25 -25
  585. data/spec/unit/knife/ssl_check_spec.rb +23 -23
  586. data/spec/unit/knife/ssl_fetch_spec.rb +11 -11
  587. data/spec/unit/knife/user_delete_spec.rb +1 -1
  588. data/spec/unit/knife/user_reregister_spec.rb +1 -1
  589. data/spec/unit/knife_spec.rb +26 -26
  590. data/spec/unit/log/syslog_spec.rb +1 -1
  591. data/spec/unit/lwrp_spec.rb +4 -4
  592. data/spec/unit/mash_spec.rb +3 -3
  593. data/spec/unit/mixin/api_version_request_handling_spec.rb +16 -16
  594. data/spec/unit/mixin/checksum_spec.rb +1 -1
  595. data/spec/unit/mixin/enforce_ownership_and_permissions_spec.rb +8 -8
  596. data/spec/unit/mixin/homebrew_user_spec.rb +1 -1
  597. data/spec/unit/mixin/params_validate_spec.rb +96 -96
  598. data/spec/unit/mixin/powershell_exec_spec.rb +1 -1
  599. data/spec/unit/mixin/powershell_type_coercions_spec.rb +1 -1
  600. data/spec/unit/mixin/securable_spec.rb +27 -27
  601. data/spec/unit/mixin/shell_out_spec.rb +286 -132
  602. data/spec/unit/mixin/user_context_spec.rb +1 -1
  603. data/spec/unit/mixin/xml_escape_spec.rb +1 -1
  604. data/spec/unit/node/attribute_spec.rb +10 -10
  605. data/spec/unit/node/vivid_mash_spec.rb +3 -3
  606. data/spec/unit/node_map_spec.rb +71 -3
  607. data/spec/unit/node_spec.rb +15 -15
  608. data/spec/unit/org_spec.rb +2 -2
  609. data/spec/unit/platform/query_helpers_spec.rb +26 -26
  610. data/spec/unit/policy_builder/expand_node_object_spec.rb +4 -4
  611. data/spec/unit/policy_builder/policyfile_spec.rb +29 -29
  612. data/spec/unit/property_spec.rb +5 -5
  613. data/spec/unit/provider/apt_repository_spec.rb +19 -19
  614. data/spec/unit/provider/cookbook_file/content_spec.rb +1 -1
  615. data/spec/unit/provider/cookbook_file_spec.rb +1 -1
  616. data/spec/unit/provider/cron/unix_spec.rb +12 -12
  617. data/spec/unit/provider/cron_spec.rb +279 -279
  618. data/spec/unit/provider/dsc_resource_spec.rb +6 -6
  619. data/spec/unit/provider/execute_spec.rb +2 -2
  620. data/spec/unit/provider/file/content_spec.rb +1 -1
  621. data/spec/unit/provider/file_spec.rb +1 -1
  622. data/spec/unit/provider/git_spec.rb +123 -123
  623. data/spec/unit/provider/group/dscl_spec.rb +18 -18
  624. data/spec/unit/provider/group/gpasswd_spec.rb +7 -7
  625. data/spec/unit/provider/group/groupadd_spec.rb +7 -7
  626. data/spec/unit/provider/group/groupmod_spec.rb +13 -13
  627. data/spec/unit/provider/group/pw_spec.rb +4 -4
  628. data/spec/unit/provider/group/suse_spec.rb +2 -2
  629. data/spec/unit/provider/group/usermod_spec.rb +4 -4
  630. data/spec/unit/provider/group_spec.rb +3 -3
  631. data/spec/unit/provider/ifconfig/aix_spec.rb +17 -17
  632. data/spec/unit/provider/ifconfig/debian_spec.rb +16 -16
  633. data/spec/unit/provider/ifconfig_spec.rb +16 -16
  634. data/spec/unit/provider/launchd_spec.rb +52 -52
  635. data/spec/unit/provider/link_spec.rb +7 -7
  636. data/spec/unit/provider/mdadm_spec.rb +3 -3
  637. data/spec/unit/provider/mount/aix_spec.rb +39 -39
  638. data/spec/unit/provider/mount/mount_spec.rb +26 -26
  639. data/spec/unit/provider/mount/solaris_spec.rb +2 -2
  640. data/spec/unit/provider/mount/windows_spec.rb +6 -6
  641. data/spec/unit/provider/ohai_spec.rb +9 -9
  642. data/spec/unit/provider/osx_profile_spec.rb +1 -1
  643. data/spec/unit/provider/package/apt_spec.rb +186 -186
  644. data/spec/unit/provider/package/bff_spec.rb +36 -36
  645. data/spec/unit/provider/package/cab_spec.rb +58 -58
  646. data/spec/unit/provider/package/chocolatey_spec.rb +34 -34
  647. data/spec/unit/provider/package/dpkg_spec.rb +33 -33
  648. data/spec/unit/provider/package/freebsd/pkg_spec.rb +35 -35
  649. data/spec/unit/provider/package/freebsd/pkgng_spec.rb +22 -22
  650. data/spec/unit/provider/package/freebsd/port_spec.rb +21 -21
  651. data/spec/unit/provider/package/homebrew_spec.rb +4 -4
  652. data/spec/unit/provider/package/ips_spec.rb +94 -94
  653. data/spec/unit/provider/package/macports_spec.rb +23 -23
  654. data/spec/unit/provider/package/msu_spec.rb +44 -44
  655. data/spec/unit/provider/package/openbsd_spec.rb +19 -19
  656. data/spec/unit/provider/package/pacman_spec.rb +50 -50
  657. data/spec/unit/provider/package/paludis_spec.rb +33 -33
  658. data/spec/unit/provider/package/portage_spec.rb +25 -25
  659. data/spec/unit/provider/package/powershell_spec.rb +98 -85
  660. data/spec/unit/provider/package/rpm_spec.rb +21 -21
  661. data/spec/unit/provider/package/rubygems_spec.rb +71 -71
  662. data/spec/unit/provider/package/smartos_spec.rb +21 -21
  663. data/spec/unit/provider/package/solaris_spec.rb +38 -38
  664. data/spec/unit/provider/package/windows/exe_spec.rb +1 -1
  665. data/spec/unit/provider/package/windows/msi_spec.rb +1 -1
  666. data/spec/unit/provider/package/windows_spec.rb +11 -4
  667. data/spec/unit/provider/package/zypper_spec.rb +42 -46
  668. data/spec/unit/provider/package_spec.rb +2 -2
  669. data/spec/unit/provider/powershell_script_spec.rb +1 -1
  670. data/spec/unit/provider/registry_key_spec.rb +22 -22
  671. data/spec/unit/provider/remote_file/cache_control_data_spec.rb +7 -7
  672. data/spec/unit/provider/remote_file/content_spec.rb +4 -4
  673. data/spec/unit/provider/remote_file/fetcher_spec.rb +5 -5
  674. data/spec/unit/provider/remote_file/ftp_spec.rb +1 -1
  675. data/spec/unit/provider/remote_file/http_spec.rb +1 -1
  676. data/spec/unit/provider/remote_file/local_file_spec.rb +2 -2
  677. data/spec/unit/provider/remote_file/network_file_spec.rb +3 -3
  678. data/spec/unit/provider/remote_file/sftp_spec.rb +2 -2
  679. data/spec/unit/provider/remote_file_spec.rb +1 -1
  680. data/spec/unit/provider/script_spec.rb +1 -1
  681. data/spec/unit/provider/service/aix_service_spec.rb +8 -8
  682. data/spec/unit/provider/service/aixinit_service_spec.rb +3 -3
  683. data/spec/unit/provider/service/arch_service_spec.rb +21 -21
  684. data/spec/unit/provider/service/debian_service_spec.rb +2 -2
  685. data/spec/unit/provider/service/freebsd_service_spec.rb +30 -30
  686. data/spec/unit/provider/service/gentoo_service_spec.rb +1 -1
  687. data/spec/unit/provider/service/init_service_spec.rb +14 -14
  688. data/spec/unit/provider/service/insserv_service_spec.rb +2 -2
  689. data/spec/unit/provider/service/invokercd_service_spec.rb +17 -17
  690. data/spec/unit/provider/service/macosx_spec.rb +59 -59
  691. data/spec/unit/provider/service/openbsd_service_spec.rb +6 -6
  692. data/spec/unit/provider/service/redhat_spec.rb +27 -27
  693. data/spec/unit/provider/service/simple_service_spec.rb +14 -14
  694. data/spec/unit/provider/service/solaris_smf_service_spec.rb +19 -19
  695. data/spec/unit/provider/service/systemd_service_spec.rb +13 -13
  696. data/spec/unit/provider/service/upstart_service_spec.rb +5 -5
  697. data/spec/unit/provider/service/windows_spec.rb +38 -38
  698. data/spec/unit/provider/service_spec.rb +3 -3
  699. data/spec/unit/provider/subversion_spec.rb +13 -13
  700. data/spec/unit/provider/systemd_unit_spec.rb +10 -10
  701. data/spec/unit/provider/template/content_spec.rb +44 -44
  702. data/spec/unit/provider/template_spec.rb +2 -2
  703. data/spec/unit/provider/user/aix_spec.rb +5 -5
  704. data/spec/unit/provider/user/dscl_spec.rb +12 -12
  705. data/spec/unit/provider/user/pw_spec.rb +12 -12
  706. data/spec/unit/provider/user/solaris_spec.rb +6 -6
  707. data/spec/unit/provider/windows_env_spec.rb +2 -2
  708. data/spec/unit/provider/windows_task_spec.rb +16 -16
  709. data/spec/unit/provider/zypper_repository_spec.rb +7 -7
  710. data/spec/unit/provider_resolver_spec.rb +3 -3
  711. data/spec/unit/recipe_spec.rb +13 -13
  712. data/spec/unit/resource/chocolatey_config_spec.rb +98 -0
  713. data/spec/unit/resource/chocolatey_source_spec.rb +102 -0
  714. data/spec/unit/resource/conditional_spec.rb +1 -1
  715. data/spec/unit/resource/cookbook_file_spec.rb +3 -3
  716. data/spec/unit/resource/dnf_package_spec.rb +3 -3
  717. data/spec/unit/resource/dsc_script_spec.rb +10 -10
  718. data/spec/unit/resource/execute_spec.rb +2 -2
  719. data/spec/unit/resource/file/verification/systemd_unit_spec.rb +1 -1
  720. data/spec/unit/resource/file/verification_spec.rb +1 -1
  721. data/spec/unit/resource/file_spec.rb +3 -3
  722. data/spec/unit/resource/freebsd_package_spec.rb +5 -4
  723. data/spec/unit/resource/group_spec.rb +4 -4
  724. data/spec/unit/resource/kernel_module_spec.rb +48 -0
  725. data/spec/unit/resource/mount_spec.rb +13 -3
  726. data/spec/unit/resource/package_spec.rb +2 -2
  727. data/spec/unit/resource/powershell_package_source_spec.rb +219 -0
  728. data/spec/unit/resource/powershell_package_spec.rb +10 -1
  729. data/spec/unit/resource/powershell_script_spec.rb +8 -8
  730. data/spec/unit/resource/registry_key_spec.rb +19 -19
  731. data/spec/unit/resource/remote_file_spec.rb +2 -2
  732. data/spec/unit/resource/resource_notification_spec.rb +8 -8
  733. data/spec/unit/resource/service_spec.rb +3 -3
  734. data/spec/unit/resource/ssh_known_hosts_entry_spec.rb +55 -0
  735. data/spec/unit/resource/template_spec.rb +2 -2
  736. data/spec/unit/resource/user_spec.rb +2 -2
  737. data/spec/unit/resource/windows_feature_dism.rb +5 -5
  738. data/spec/unit/resource/windows_feature_powershell.rb +27 -6
  739. data/spec/unit/resource/yum_package_spec.rb +3 -3
  740. data/spec/unit/resource_collection/resource_set_spec.rb +6 -6
  741. data/spec/unit/resource_collection_spec.rb +5 -5
  742. data/spec/unit/resource_definition_spec.rb +2 -2
  743. data/spec/unit/resource_inspector_spec.rb +3 -3
  744. data/spec/unit/resource_reporter_spec.rb +24 -24
  745. data/spec/unit/resource_spec.rb +65 -31
  746. data/spec/unit/role_spec.rb +22 -22
  747. data/spec/unit/run_context_spec.rb +1 -1
  748. data/spec/unit/run_list/run_list_item_spec.rb +3 -3
  749. data/spec/unit/run_list/versioned_recipe_list_spec.rb +12 -12
  750. data/spec/unit/run_list_spec.rb +6 -6
  751. data/spec/unit/runner_spec.rb +4 -4
  752. data/spec/unit/scan_access_control_spec.rb +3 -3
  753. data/spec/unit/shell/model_wrapper_spec.rb +4 -4
  754. data/spec/unit/shell/shell_ext_spec.rb +4 -4
  755. data/spec/unit/shell/shell_session_spec.rb +28 -28
  756. data/spec/unit/user_spec.rb +2 -2
  757. data/spec/unit/user_v1_spec.rb +25 -25
  758. data/spec/unit/util/diff_spec.rb +1 -1
  759. data/spec/unit/util/dsc/configuration_generator_spec.rb +4 -4
  760. data/spec/unit/util/dsc/lcm_output_parser_spec.rb +105 -105
  761. data/spec/unit/util/dsc/local_configuration_manager_spec.rb +16 -16
  762. data/spec/unit/util/file_edit_spec.rb +38 -38
  763. data/spec/unit/util/powershell/cmdlet_spec.rb +1 -1
  764. data/spec/unit/util/selinux_spec.rb +10 -10
  765. data/spec/unit/win32/registry_spec.rb +3 -3
  766. data/spec/unit/windows_service_spec.rb +2 -2
  767. data/tasks/cbgb.rb +3 -3
  768. data/tasks/dependencies.rb +6 -8
  769. data/tasks/maintainers.rb +7 -7
  770. data/tasks/rspec.rb +2 -2
  771. metadata +24 -83
  772. data/acceptance/.shared/kitchen_acceptance/.kitchen.digitalocean.yml +0 -33
  773. data/acceptance/.shared/kitchen_acceptance/.kitchen.ec2.yml +0 -272
  774. data/acceptance/.shared/kitchen_acceptance/.kitchen.vagrant.yml +0 -57
  775. data/acceptance/.shared/kitchen_acceptance/libraries/kitchen.rb +0 -68
  776. data/acceptance/.shared/kitchen_acceptance/metadata.rb +0 -1
  777. data/acceptance/Gemfile +0 -19
  778. data/acceptance/Gemfile.lock +0 -266
  779. data/acceptance/README.md +0 -137
  780. data/acceptance/basics/.acceptance/acceptance-cookbook/.gitignore +0 -2
  781. data/acceptance/basics/.acceptance/acceptance-cookbook/metadata.rb +0 -3
  782. data/acceptance/basics/.acceptance/acceptance-cookbook/recipes/destroy.rb +0 -1
  783. data/acceptance/basics/.acceptance/acceptance-cookbook/recipes/provision.rb +0 -1
  784. data/acceptance/basics/.acceptance/acceptance-cookbook/recipes/verify.rb +0 -1
  785. data/acceptance/basics/.kitchen.yml +0 -4
  786. data/acceptance/basics/test/integration/chef-current-install/serverspec/chef_client_spec.rb +0 -19
  787. data/acceptance/basics/test/integration/chef-current-install/serverspec/spec_helper.rb +0 -6
  788. data/acceptance/basics/test/integration/helpers/serverspec/Gemfile +0 -8
  789. data/acceptance/data-collector/.acceptance/acceptance-cookbook/.gitignore +0 -2
  790. data/acceptance/data-collector/.acceptance/acceptance-cookbook/metadata.rb +0 -3
  791. data/acceptance/data-collector/.acceptance/acceptance-cookbook/recipes/destroy.rb +0 -2
  792. data/acceptance/data-collector/.acceptance/acceptance-cookbook/recipes/provision.rb +0 -2
  793. data/acceptance/data-collector/.acceptance/acceptance-cookbook/recipes/verify.rb +0 -2
  794. data/acceptance/data-collector/.acceptance/data-collector-test/.gitignore +0 -16
  795. data/acceptance/data-collector/.acceptance/data-collector-test/Berksfile +0 -3
  796. data/acceptance/data-collector/.acceptance/data-collector-test/files/default/api.rb +0 -101
  797. data/acceptance/data-collector/.acceptance/data-collector-test/files/default/apigemfile +0 -3
  798. data/acceptance/data-collector/.acceptance/data-collector-test/files/default/client-rb-both-mode.rb +0 -4
  799. data/acceptance/data-collector/.acceptance/data-collector-test/files/default/client-rb-client-mode.rb +0 -4
  800. data/acceptance/data-collector/.acceptance/data-collector-test/files/default/client-rb-no-endpoint.rb +0 -2
  801. data/acceptance/data-collector/.acceptance/data-collector-test/files/default/client-rb-solo-mode.rb +0 -4
  802. data/acceptance/data-collector/.acceptance/data-collector-test/files/default/config.ru +0 -2
  803. data/acceptance/data-collector/.acceptance/data-collector-test/metadata.rb +0 -7
  804. data/acceptance/data-collector/.acceptance/data-collector-test/recipes/default.rb +0 -44
  805. data/acceptance/data-collector/.kitchen.yml +0 -9
  806. data/acceptance/data-collector/Berksfile +0 -3
  807. data/acceptance/data-collector/test/integration/default/serverspec/default_spec.rb +0 -208
  808. data/acceptance/data-collector/test/integration/helpers/serverspec/Gemfile +0 -8
  809. data/acceptance/omnitruck/.acceptance/acceptance-cookbook/.gitignore +0 -2
  810. data/acceptance/omnitruck/.acceptance/acceptance-cookbook/metadata.rb +0 -1
  811. data/acceptance/omnitruck/.acceptance/acceptance-cookbook/recipes/destroy.rb +0 -1
  812. data/acceptance/omnitruck/.acceptance/acceptance-cookbook/recipes/provision.rb +0 -1
  813. data/acceptance/omnitruck/.acceptance/acceptance-cookbook/recipes/verify.rb +0 -61
  814. data/acceptance/top-cookbooks/.acceptance/acceptance-cookbook/.gitignore +0 -2
  815. data/acceptance/top-cookbooks/.acceptance/acceptance-cookbook/libraries/cookbook_kitchen.rb +0 -43
  816. data/acceptance/top-cookbooks/.acceptance/acceptance-cookbook/libraries/top_cookbooks.rb +0 -41
  817. data/acceptance/top-cookbooks/.acceptance/acceptance-cookbook/metadata.rb +0 -3
  818. data/acceptance/top-cookbooks/.acceptance/acceptance-cookbook/recipes/destroy.rb +0 -1
  819. data/acceptance/top-cookbooks/.acceptance/acceptance-cookbook/recipes/provision.rb +0 -1
  820. data/acceptance/top-cookbooks/.acceptance/acceptance-cookbook/recipes/verify.rb +0 -1
  821. data/acceptance/top-cookbooks/.gitignore +0 -1
  822. data/acceptance/top-cookbooks/.kitchen.chocolatey.yml +0 -6
  823. data/acceptance/top-cookbooks/.kitchen.iis.yml +0 -4
  824. data/acceptance/top-cookbooks/.kitchen.learn-the-basics-rhel.yml +0 -7
  825. data/acceptance/top-cookbooks/.kitchen.learn-the-basics-ubuntu.yml +0 -7
  826. data/acceptance/top-cookbooks/.kitchen.learn-the-basics-windows.yml +0 -7
  827. data/acceptance/top-cookbooks/.kitchen.powershell.yml +0 -4
  828. data/acceptance/top-cookbooks/.kitchen.sql_server.yml +0 -5
  829. data/acceptance/top-cookbooks/.kitchen.winbox.yml +0 -8
  830. data/acceptance/top-cookbooks/.kitchen.windows.yml +0 -38
  831. data/acceptance/trivial/.acceptance/acceptance-cookbook/.gitignore +0 -2
  832. data/acceptance/trivial/.acceptance/acceptance-cookbook/metadata.rb +0 -2
  833. data/acceptance/trivial/.acceptance/acceptance-cookbook/recipes/destroy.rb +0 -1
  834. data/acceptance/trivial/.acceptance/acceptance-cookbook/recipes/provision.rb +0 -1
  835. data/acceptance/trivial/.acceptance/acceptance-cookbook/recipes/verify.rb +0 -1
  836. data/acceptance/trivial/.kitchen.yml +0 -7
  837. data/acceptance/trivial/test/integration/chef-current-install/inspec/chef_client_spec.rb +0 -5
  838. data/acceptance/windows-service/.acceptance/acceptance-cookbook/.gitignore +0 -2
  839. data/acceptance/windows-service/.acceptance/acceptance-cookbook/metadata.rb +0 -2
  840. data/acceptance/windows-service/.acceptance/acceptance-cookbook/recipes/destroy.rb +0 -1
  841. data/acceptance/windows-service/.acceptance/acceptance-cookbook/recipes/provision.rb +0 -1
  842. data/acceptance/windows-service/.acceptance/acceptance-cookbook/recipes/verify.rb +0 -1
  843. data/acceptance/windows-service/.kitchen.yml +0 -7
  844. data/acceptance/windows-service/test/integration/chef-windows-service/inspec/chef_windows_service_spec.rb +0 -58
  845. data/distro/powershell/chef/Chef.PowerShell.dll +0 -0
data/spec/integration/knife/diff_spec.rb CHANGED
@@ -46,18 +46,18 @@ describe "knife diff", :workstation do
46
46
  end
47
47
 
48
48
  it "knife diff reports everything as deleted" do
49
- knife("diff --name-status /").should_succeed <<EOM
50
- D\t/clients/chef-validator.json
51
- D\t/clients/chef-webui.json
52
- D\t/clients/x.json
53
- D\t/cookbooks/x
54
- D\t/data_bags/x
55
- D\t/environments/_default.json
56
- D\t/environments/x.json
57
- D\t/nodes/x.json
58
- D\t/roles/x.json
59
- D\t/users/admin.json
60
- D\t/users/x.json
49
+ knife("diff --name-status /").should_succeed <<~EOM
50
+ D\t/clients/chef-validator.json
51
+ D\t/clients/chef-webui.json
52
+ D\t/clients/x.json
53
+ D\t/cookbooks/x
54
+ D\t/data_bags/x
55
+ D\t/environments/_default.json
56
+ D\t/environments/x.json
57
+ D\t/nodes/x.json
58
+ D\t/roles/x.json
59
+ D\t/users/admin.json
60
+ D\t/users/x.json
61
61
  EOM
62
62
  end
63
63
  end
@@ -92,16 +92,16 @@ EOM
92
92
 
93
93
  context "except the role file" do
94
94
  before do
95
- file "roles/x.json", <<EOM
96
- {
97
- "foo": "bar"
98
- }
95
+ file "roles/x.json", <<~EOM
96
+ {
97
+ "foo": "bar"
98
+ }
99
99
  EOM
100
100
  end
101
101
 
102
102
  it "knife diff reports the role as different" do
103
- knife("diff --name-status /").should_succeed <<EOM
104
- M\t/roles/x.json
103
+ knife("diff --name-status /").should_succeed <<~EOM
104
+ M\t/roles/x.json
105
105
  EOM
106
106
  end
107
107
  end
@@ -120,31 +120,31 @@ EOM
120
120
  end
121
121
 
122
122
  it "knife diff reports the new files as added" do
123
- knife("diff --name-status /").should_succeed <<EOM
124
- A\t/clients/y.json
125
- A\t/cookbooks/x/blah.rb
126
- A\t/cookbooks/y
127
- A\t/data_bags/x/z.json
128
- A\t/data_bags/y
129
- A\t/environments/y.json
130
- A\t/nodes/y.json
131
- A\t/roles/y.json
132
- A\t/users/y.json
123
+ knife("diff --name-status /").should_succeed <<~EOM
124
+ A\t/clients/y.json
125
+ A\t/cookbooks/x/blah.rb
126
+ A\t/cookbooks/y
127
+ A\t/data_bags/x/z.json
128
+ A\t/data_bags/y
129
+ A\t/environments/y.json
130
+ A\t/nodes/y.json
131
+ A\t/roles/y.json
132
+ A\t/users/y.json
133
133
  EOM
134
134
  end
135
135
 
136
136
  context "when cwd is the data_bags directory" do
137
137
  before { cwd "data_bags" }
138
138
  it "knife diff reports different data bags" do
139
- knife("diff --name-status").should_succeed <<EOM
140
- A\tx/z.json
141
- A\ty
139
+ knife("diff --name-status").should_succeed <<~EOM
140
+ A\tx/z.json
141
+ A\ty
142
142
  EOM
143
143
  end
144
144
  it "knife diff * reports different data bags" do
145
- knife("diff --name-status *").should_succeed <<EOM
146
- A\tx/z.json
147
- A\ty
145
+ knife("diff --name-status *").should_succeed <<~EOM
146
+ A\tx/z.json
147
+ A\ty
148
148
  EOM
149
149
  end
150
150
  end
@@ -153,14 +153,14 @@ EOM
153
153
 
154
154
  when_the_repository "is empty" do
155
155
  it "knife diff reports everything as deleted" do
156
- knife("diff --name-status /").should_succeed <<EOM
157
- D\t/clients
158
- D\t/cookbooks
159
- D\t/data_bags
160
- D\t/environments
161
- D\t/nodes
162
- D\t/roles
163
- D\t/users
156
+ knife("diff --name-status /").should_succeed <<~EOM
157
+ D\t/clients
158
+ D\t/cookbooks
159
+ D\t/data_bags
160
+ D\t/environments
161
+ D\t/nodes
162
+ D\t/roles
163
+ D\t/users
164
164
  EOM
165
165
  end
166
166
  end
@@ -179,17 +179,17 @@ EOM
179
179
  end
180
180
 
181
181
  it "knife diff /cookbooks/x shows differences" do
182
- knife("diff --name-status /cookbooks/x").should_succeed <<EOM
183
- M\t/cookbooks/x/metadata.rb
184
- D\t/cookbooks/x/onlyin1.0.1.rb
185
- A\t/cookbooks/x/onlyin1.0.0.rb
182
+ knife("diff --name-status /cookbooks/x").should_succeed <<~EOM
183
+ M\t/cookbooks/x/metadata.rb
184
+ D\t/cookbooks/x/onlyin1.0.1.rb
185
+ A\t/cookbooks/x/onlyin1.0.0.rb
186
186
  EOM
187
187
  end
188
188
 
189
189
  it "knife diff --diff-filter=MAT does not show deleted files" do
190
- knife("diff --diff-filter=MAT --name-status /cookbooks/x").should_succeed <<EOM
191
- M\t/cookbooks/x/metadata.rb
192
- A\t/cookbooks/x/onlyin1.0.0.rb
190
+ knife("diff --diff-filter=MAT --name-status /cookbooks/x").should_succeed <<~EOM
191
+ M\t/cookbooks/x/metadata.rb
192
+ A\t/cookbooks/x/onlyin1.0.0.rb
193
193
  EOM
194
194
  end
195
195
  end
@@ -210,10 +210,10 @@ EOM
210
210
  end
211
211
 
212
212
  it "knife diff /cookbooks/x shows the differences" do
213
- knife("diff --name-status /cookbooks/x").should_succeed <<EOM
214
- M\t/cookbooks/x/metadata.rb
215
- D\t/cookbooks/x/onlyin1.0.1.rb
216
- A\t/cookbooks/x/onlyin1.0.0.rb
213
+ knife("diff --name-status /cookbooks/x").should_succeed <<~EOM
214
+ M\t/cookbooks/x/metadata.rb
215
+ D\t/cookbooks/x/onlyin1.0.1.rb
216
+ A\t/cookbooks/x/onlyin1.0.0.rb
217
217
  EOM
218
218
  end
219
219
  end
@@ -224,10 +224,10 @@ EOM
224
224
  end
225
225
 
226
226
  it "knife diff /cookbooks/x shows the differences" do
227
- knife("diff --name-status /cookbooks/x").should_succeed <<EOM
228
- M\t/cookbooks/x/metadata.rb
229
- D\t/cookbooks/x/onlyin0.9.9.rb
230
- A\t/cookbooks/x/onlyin1.0.0.rb
227
+ knife("diff --name-status /cookbooks/x").should_succeed <<~EOM
228
+ M\t/cookbooks/x/metadata.rb
229
+ D\t/cookbooks/x/onlyin0.9.9.rb
230
+ A\t/cookbooks/x/onlyin1.0.0.rb
231
231
  EOM
232
232
  end
233
233
  end
@@ -247,7 +247,7 @@ EOM
247
247
  end
248
248
  when_the_chef_server "has an environment with a different value" do
249
249
  before { environment "x", { "description" => "hi" } }
250
- it "knife diff reports the difference", :skip => (RUBY_VERSION < "1.9") do
250
+ it "knife diff reports the difference", skip: (RUBY_VERSION < "1.9") do
251
251
  knife("diff /environments/x.json").should_succeed(/
252
252
  {
253
253
  - "name": "x",
@@ -277,7 +277,7 @@ EOM
277
277
  environment "x", {}
278
278
  end
279
279
 
280
- it "knife diff reports the difference", :skip => (RUBY_VERSION < "1.9") do
280
+ it "knife diff reports the difference", skip: (RUBY_VERSION < "1.9") do
281
281
  knife("diff /environments/x.json").should_succeed(/
282
282
  {
283
283
  - "name": "x"
@@ -291,7 +291,7 @@ EOM
291
291
  before do
292
292
  environment "x", { "description" => "lo" }
293
293
  end
294
- it "knife diff reports the difference", :skip => (RUBY_VERSION < "1.9") do
294
+ it "knife diff reports the difference", skip: (RUBY_VERSION < "1.9") do
295
295
  knife("diff /environments/x.json").should_succeed(/
296
296
  {
297
297
  "name": "x",
@@ -311,7 +311,7 @@ EOM
311
311
  it "knife diff reports an error and does a textual diff" do
312
312
  error_text = "WARN: Parse error reading #{path_to('environments/x.json')} as JSON: parse error: premature EOF"
313
313
  error_match = Regexp.new(Regexp.escape(error_text))
314
- knife("diff /environments/x.json").should_succeed(/- "name": "x"/, :stderr => error_match)
314
+ knife("diff /environments/x.json").should_succeed(/- "name": "x"/, stderr: error_match)
315
315
  end
316
316
  end
317
317
  end
@@ -341,18 +341,18 @@ EOM
341
341
  end
342
342
 
343
343
  it "knife diff reports everything as deleted" do
344
- knife("diff --name-status /").should_succeed <<EOM
345
- D\t/clients/chef-validator.json
346
- D\t/clients/chef-webui.json
347
- D\t/clients/x.json
348
- D\t/cookbooks/x-1.0.0
349
- D\t/data_bags/x
350
- D\t/environments/_default.json
351
- D\t/environments/x.json
352
- D\t/nodes/x.json
353
- D\t/roles/x.json
354
- D\t/users/admin.json
355
- D\t/users/x.json
344
+ knife("diff --name-status /").should_succeed <<~EOM
345
+ D\t/clients/chef-validator.json
346
+ D\t/clients/chef-webui.json
347
+ D\t/clients/x.json
348
+ D\t/cookbooks/x-1.0.0
349
+ D\t/data_bags/x
350
+ D\t/environments/_default.json
351
+ D\t/environments/x.json
352
+ D\t/nodes/x.json
353
+ D\t/roles/x.json
354
+ D\t/users/admin.json
355
+ D\t/users/x.json
356
356
  EOM
357
357
  end
358
358
  end
@@ -386,16 +386,16 @@ EOM
386
386
 
387
387
  context "except the role file" do
388
388
  before do
389
- file "roles/x.json", <<EOM
390
- {
391
- "foo": "bar"
392
- }
389
+ file "roles/x.json", <<~EOM
390
+ {
391
+ "foo": "bar"
392
+ }
393
393
  EOM
394
394
  end
395
395
 
396
396
  it "knife diff reports the role as different" do
397
- knife("diff --name-status /").should_succeed <<EOM
398
- M\t/roles/x.json
397
+ knife("diff --name-status /").should_succeed <<~EOM
398
+ M\t/roles/x.json
399
399
  EOM
400
400
  end
401
401
  end
@@ -415,32 +415,32 @@ EOM
415
415
  end
416
416
 
417
417
  it "knife diff reports the new files as added" do
418
- knife("diff --name-status /").should_succeed <<EOM
419
- A\t/clients/y.json
420
- A\t/cookbooks/x-1.0.0/blah.rb
421
- A\t/cookbooks/x-2.0.0
422
- A\t/cookbooks/y-1.0.0
423
- A\t/data_bags/x/z.json
424
- A\t/data_bags/y
425
- A\t/environments/y.json
426
- A\t/nodes/y.json
427
- A\t/roles/y.json
428
- A\t/users/y.json
418
+ knife("diff --name-status /").should_succeed <<~EOM
419
+ A\t/clients/y.json
420
+ A\t/cookbooks/x-1.0.0/blah.rb
421
+ A\t/cookbooks/x-2.0.0
422
+ A\t/cookbooks/y-1.0.0
423
+ A\t/data_bags/x/z.json
424
+ A\t/data_bags/y
425
+ A\t/environments/y.json
426
+ A\t/nodes/y.json
427
+ A\t/roles/y.json
428
+ A\t/users/y.json
429
429
  EOM
430
430
  end
431
431
 
432
432
  context "when cwd is the data_bags directory" do
433
433
  before { cwd "data_bags" }
434
434
  it "knife diff reports different data bags" do
435
- knife("diff --name-status").should_succeed <<EOM
436
- A\tx/z.json
437
- A\ty
435
+ knife("diff --name-status").should_succeed <<~EOM
436
+ A\tx/z.json
437
+ A\ty
438
438
  EOM
439
439
  end
440
440
  it "knife diff * reports different data bags" do
441
- knife("diff --name-status *").should_succeed <<EOM
442
- A\tx/z.json
443
- A\ty
441
+ knife("diff --name-status *").should_succeed <<~EOM
442
+ A\tx/z.json
443
+ A\ty
444
444
  EOM
445
445
  end
446
446
  end
@@ -449,14 +449,14 @@ EOM
449
449
 
450
450
  when_the_repository "is empty" do
451
451
  it "knife diff reports everything as deleted" do
452
- knife("diff --name-status /").should_succeed <<EOM
453
- D\t/clients
454
- D\t/cookbooks
455
- D\t/data_bags
456
- D\t/environments
457
- D\t/nodes
458
- D\t/roles
459
- D\t/users
452
+ knife("diff --name-status /").should_succeed <<~EOM
453
+ D\t/clients
454
+ D\t/cookbooks
455
+ D\t/data_bags
456
+ D\t/environments
457
+ D\t/nodes
458
+ D\t/roles
459
+ D\t/users
460
460
  EOM
461
461
  end
462
462
  end
@@ -475,8 +475,8 @@ EOM
475
475
  end
476
476
 
477
477
  it "knife diff /cookbooks shows differences" do
478
- knife("diff --name-status /cookbooks").should_succeed <<EOM
479
- D\t/cookbooks/x-1.0.1
478
+ knife("diff --name-status /cookbooks").should_succeed <<~EOM
479
+ D\t/cookbooks/x-1.0.1
480
480
  EOM
481
481
  end
482
482
 
@@ -501,9 +501,9 @@ EOM
501
501
  end
502
502
 
503
503
  it "knife diff /cookbooks shows the differences" do
504
- knife("diff --name-status /cookbooks").should_succeed <<EOM
505
- D\t/cookbooks/x-1.0.1
506
- A\t/cookbooks/x-1.0.0
504
+ knife("diff --name-status /cookbooks").should_succeed <<~EOM
505
+ D\t/cookbooks/x-1.0.1
506
+ A\t/cookbooks/x-1.0.0
507
507
  EOM
508
508
  end
509
509
  end
@@ -514,9 +514,9 @@ EOM
514
514
  end
515
515
 
516
516
  it "knife diff /cookbooks shows the differences" do
517
- knife("diff --name-status /cookbooks").should_succeed <<EOM
518
- D\t/cookbooks/x-0.9.9
519
- A\t/cookbooks/x-1.0.0
517
+ knife("diff --name-status /cookbooks").should_succeed <<~EOM
518
+ D\t/cookbooks/x-0.9.9
519
+ A\t/cookbooks/x-1.0.0
520
520
  EOM
521
521
  end
522
522
  end
@@ -533,7 +533,7 @@ EOM
533
533
  end
534
534
  when_the_chef_server "has an environment with a different value" do
535
535
  before { environment "x", { "description" => "hi" } }
536
- it "knife diff reports the difference", :skip => (RUBY_VERSION < "1.9") do
536
+ it "knife diff reports the difference", skip: (RUBY_VERSION < "1.9") do
537
537
  knife("diff /environments/x.json").should_succeed(/
538
538
  {
539
539
  - "name": "x",
@@ -560,7 +560,7 @@ EOM
560
560
  end
561
561
  when_the_chef_server "has an environment with no value" do
562
562
  before { environment "x", {} }
563
- it "knife diff reports the difference", :skip => (RUBY_VERSION < "1.9") do
563
+ it "knife diff reports the difference", skip: (RUBY_VERSION < "1.9") do
564
564
  knife("diff /environments/x.json").should_succeed(/
565
565
  {
566
566
  - "name": "x"
@@ -574,7 +574,7 @@ EOM
574
574
  before do
575
575
  environment "x", { "description" => "lo" }
576
576
  end
577
- it "knife diff reports the difference", :skip => (RUBY_VERSION < "1.9") do
577
+ it "knife diff reports the difference", skip: (RUBY_VERSION < "1.9") do
578
578
  knife("diff /environments/x.json").should_succeed(/
579
579
  {
580
580
  "name": "x",
@@ -594,7 +594,7 @@ EOM
594
594
  it "knife diff reports an error and does a textual diff" do
595
595
  error_text = "WARN: Parse error reading #{path_to('environments/x.json')} as JSON: parse error: premature EOF"
596
596
  error_match = Regexp.new(Regexp.escape(error_text))
597
- knife("diff /environments/x.json").should_succeed(/- "name": "x"/, :stderr => error_match)
597
+ knife("diff /environments/x.json").should_succeed(/- "name": "x"/, stderr: error_match)
598
598
  end
599
599
  end
600
600
  end
data/spec/integration/knife/download_spec.rb CHANGED
@@ -48,20 +48,20 @@ describe "knife download", :workstation do
48
48
  end
49
49
 
50
50
  it "knife download downloads everything" do
51
- knife("download /").should_succeed <<EOM
52
- Created /clients/chef-validator.json
53
- Created /clients/chef-webui.json
54
- Created /clients/x.json
55
- Created /cookbooks/x
56
- Created /cookbooks/x/metadata.rb
57
- Created /data_bags/x
58
- Created /data_bags/x/y.json
59
- Created /environments/_default.json
60
- Created /environments/x.json
61
- Created /nodes/x.json
62
- Created /roles/x.json
63
- Created /users/admin.json
64
- Created /users/x.json
51
+ knife("download /").should_succeed <<~EOM
52
+ Created /clients/chef-validator.json
53
+ Created /clients/chef-webui.json
54
+ Created /clients/x.json
55
+ Created /cookbooks/x
56
+ Created /cookbooks/x/metadata.rb
57
+ Created /data_bags/x
58
+ Created /data_bags/x/y.json
59
+ Created /environments/_default.json
60
+ Created /environments/x.json
61
+ Created /nodes/x.json
62
+ Created /roles/x.json
63
+ Created /users/admin.json
64
+ Created /users/x.json
65
65
  EOM
66
66
  knife("diff --name-status /").should_succeed ""
67
67
  end
@@ -94,22 +94,22 @@ EOM
94
94
 
95
95
  context "except the role file" do
96
96
  before do
97
- file "roles/x.json", <<EOM
98
- {
99
- "chef_type": "role",
100
- "default_attributes": {
101
- },
102
- "description": "blarghle",
103
- "env_run_lists": {
104
- },
105
- "json_class": "Chef::Role",
106
- "name": "x",
107
- "override_attributes": {
108
- },
109
- "run_list": [
110
-
111
- ]
112
- }
97
+ file "roles/x.json", <<~EOM
98
+ {
99
+ "chef_type": "role",
100
+ "default_attributes": {
101
+ },
102
+ "description": "blarghle",
103
+ "env_run_lists": {
104
+ },
105
+ "json_class": "Chef::Role",
106
+ "name": "x",
107
+ "override_attributes": {
108
+ },
109
+ "run_list": [
110
+
111
+ ]
112
+ }
113
113
  EOM
114
114
  end
115
115
 
@@ -126,22 +126,22 @@ EOM
126
126
 
127
127
  context "except the role file is textually different, but not ACTUALLY different" do
128
128
  before do
129
- file "roles/x.json", <<EOM
130
- {
131
- "chef_type": "role",
132
- "default_attributes": {
133
- },
134
- "env_run_lists": {
135
- },
136
- "json_class": "Chef::Role",
137
- "name": "x",
138
- "description": "",
139
- "override_attributes": {
140
- },
141
- "run_list": [
142
-
143
- ]
144
- }
129
+ file "roles/x.json", <<~EOM
130
+ {
131
+ "chef_type": "role",
132
+ "default_attributes": {
133
+ },
134
+ "env_run_lists": {
135
+ },
136
+ "json_class": "Chef::Role",
137
+ "name": "x",
138
+ "description": "",
139
+ "override_attributes": {
140
+ },
141
+ "run_list": [
142
+
143
+ ]
144
+ }
145
145
  EOM
146
146
  end
147
147
 
@@ -166,30 +166,30 @@ EOM
166
166
 
167
167
  it "knife download does nothing" do
168
168
  knife("download /").should_succeed ""
169
- knife("diff --name-status /").should_succeed <<EOM
170
- A\t/clients/y.json
171
- A\t/cookbooks/x/blah.rb
172
- A\t/cookbooks/y
173
- A\t/data_bags/x/z.json
174
- A\t/data_bags/y
175
- A\t/environments/y.json
176
- A\t/nodes/y.json
177
- A\t/roles/y.json
178
- A\t/users/y.json
169
+ knife("diff --name-status /").should_succeed <<~EOM
170
+ A\t/clients/y.json
171
+ A\t/cookbooks/x/blah.rb
172
+ A\t/cookbooks/y
173
+ A\t/data_bags/x/z.json
174
+ A\t/data_bags/y
175
+ A\t/environments/y.json
176
+ A\t/nodes/y.json
177
+ A\t/roles/y.json
178
+ A\t/users/y.json
179
179
  EOM
180
180
  end
181
181
 
182
182
  it "knife download --purge deletes the extra files" do
183
- knife("download --purge /").should_succeed <<EOM
184
- Deleted extra entry /clients/y.json (purge is on)
185
- Deleted extra entry /cookbooks/x/blah.rb (purge is on)
186
- Deleted extra entry /cookbooks/y (purge is on)
187
- Deleted extra entry /data_bags/x/z.json (purge is on)
188
- Deleted extra entry /data_bags/y (purge is on)
189
- Deleted extra entry /environments/y.json (purge is on)
190
- Deleted extra entry /nodes/y.json (purge is on)
191
- Deleted extra entry /roles/y.json (purge is on)
192
- Deleted extra entry /users/y.json (purge is on)
183
+ knife("download --purge /").should_succeed <<~EOM
184
+ Deleted extra entry /clients/y.json (purge is on)
185
+ Deleted extra entry /cookbooks/x/blah.rb (purge is on)
186
+ Deleted extra entry /cookbooks/y (purge is on)
187
+ Deleted extra entry /data_bags/x/z.json (purge is on)
188
+ Deleted extra entry /data_bags/y (purge is on)
189
+ Deleted extra entry /environments/y.json (purge is on)
190
+ Deleted extra entry /nodes/y.json (purge is on)
191
+ Deleted extra entry /roles/y.json (purge is on)
192
+ Deleted extra entry /users/y.json (purge is on)
193
193
  EOM
194
194
  knife("diff --name-status /").should_succeed ""
195
195
  end
@@ -198,53 +198,53 @@ EOM
198
198
 
199
199
  when_the_repository "is empty" do
200
200
  it "knife download creates the extra files" do
201
- knife("download /").should_succeed <<EOM
202
- Created /clients
203
- Created /clients/chef-validator.json
204
- Created /clients/chef-webui.json
205
- Created /clients/x.json
206
- Created /cookbooks
207
- Created /cookbooks/x
208
- Created /cookbooks/x/metadata.rb
209
- Created /data_bags
210
- Created /data_bags/x
211
- Created /data_bags/x/y.json
212
- Created /environments
213
- Created /environments/_default.json
214
- Created /environments/x.json
215
- Created /nodes
216
- Created /nodes/x.json
217
- Created /roles
218
- Created /roles/x.json
219
- Created /users
220
- Created /users/admin.json
221
- Created /users/x.json
201
+ knife("download /").should_succeed <<~EOM
202
+ Created /clients
203
+ Created /clients/chef-validator.json
204
+ Created /clients/chef-webui.json
205
+ Created /clients/x.json
206
+ Created /cookbooks
207
+ Created /cookbooks/x
208
+ Created /cookbooks/x/metadata.rb
209
+ Created /data_bags
210
+ Created /data_bags/x
211
+ Created /data_bags/x/y.json
212
+ Created /environments
213
+ Created /environments/_default.json
214
+ Created /environments/x.json
215
+ Created /nodes
216
+ Created /nodes/x.json
217
+ Created /roles
218
+ Created /roles/x.json
219
+ Created /users
220
+ Created /users/admin.json
221
+ Created /users/x.json
222
222
  EOM
223
223
  knife("diff --name-status /").should_succeed ""
224
224
  end
225
225
 
226
226
  it "knife download --no-diff creates the extra files" do
227
- knife("download --no-diff /").should_succeed <<EOM
228
- Created /clients
229
- Created /clients/chef-validator.json
230
- Created /clients/chef-webui.json
231
- Created /clients/x.json
232
- Created /cookbooks
233
- Created /cookbooks/x
234
- Created /cookbooks/x/metadata.rb
235
- Created /data_bags
236
- Created /data_bags/x
237
- Created /data_bags/x/y.json
238
- Created /environments
239
- Created /environments/_default.json
240
- Created /environments/x.json
241
- Created /nodes
242
- Created /nodes/x.json
243
- Created /roles
244
- Created /roles/x.json
245
- Created /users
246
- Created /users/admin.json
247
- Created /users/x.json
227
+ knife("download --no-diff /").should_succeed <<~EOM
228
+ Created /clients
229
+ Created /clients/chef-validator.json
230
+ Created /clients/chef-webui.json
231
+ Created /clients/x.json
232
+ Created /cookbooks
233
+ Created /cookbooks/x
234
+ Created /cookbooks/x/metadata.rb
235
+ Created /data_bags
236
+ Created /data_bags/x
237
+ Created /data_bags/x/y.json
238
+ Created /environments
239
+ Created /environments/_default.json
240
+ Created /environments/x.json
241
+ Created /nodes
242
+ Created /nodes/x.json
243
+ Created /roles
244
+ Created /roles/x.json
245
+ Created /users
246
+ Created /users/admin.json
247
+ Created /users/x.json
248
248
  EOM
249
249
  knife("diff --name-status /").should_succeed ""
250
250
  end
@@ -255,7 +255,7 @@ EOM
255
255
  end
256
256
 
257
257
  it "knife download with no parameters reports an error" do
258
- knife("download").should_fail "FATAL: You must specify at least one argument. If you want to download everything in this directory, run \"knife download .\"\n", :stdout => /USAGE/
258
+ knife("download").should_fail "FATAL: You must specify at least one argument. If you want to download everything in this directory, run \"knife download .\"\n", stdout: /USAGE/
259
259
  end
260
260
  end
261
261
  end
@@ -269,22 +269,22 @@ EOM
269
269
  end
270
270
 
271
271
  it "knife download of one data bag item itself succeeds" do
272
- knife("download /data_bags/x/y.json").should_succeed <<EOM
273
- Created /data_bags
274
- Created /data_bags/x
275
- Created /data_bags/x/y.json
272
+ knife("download /data_bags/x/y.json").should_succeed <<~EOM
273
+ Created /data_bags
274
+ Created /data_bags/x
275
+ Created /data_bags/x/y.json
276
276
  EOM
277
- knife("diff --name-status /data_bags").should_succeed <<EOM
278
- D\t/data_bags/x/z.json
277
+ knife("diff --name-status /data_bags").should_succeed <<~EOM
278
+ D\t/data_bags/x/z.json
279
279
  EOM
280
280
  end
281
281
 
282
282
  it "knife download /data_bags/x /data_bags/x/y.json downloads x once" do
283
- knife("download /data_bags/x /data_bags/x/y.json").should_succeed <<EOM
284
- Created /data_bags
285
- Created /data_bags/x
286
- Created /data_bags/x/y.json
287
- Created /data_bags/x/z.json
283
+ knife("download /data_bags/x /data_bags/x/y.json").should_succeed <<~EOM
284
+ Created /data_bags
285
+ Created /data_bags/x
286
+ Created /data_bags/x/y.json
287
+ Created /data_bags/x/z.json
288
288
  EOM
289
289
  end
290
290
  end
@@ -292,20 +292,20 @@ EOM
292
292
 
293
293
  when_the_repository "has three data bag items" do
294
294
  before do
295
- file "data_bags/x/deleted.json", <<EOM
296
- {
297
- "id": "deleted"
298
- }
295
+ file "data_bags/x/deleted.json", <<~EOM
296
+ {
297
+ "id": "deleted"
298
+ }
299
299
  EOM
300
- file "data_bags/x/modified.json", <<EOM
301
- {
302
- "id": "modified"
303
- }
300
+ file "data_bags/x/modified.json", <<~EOM
301
+ {
302
+ "id": "modified"
303
+ }
304
304
  EOM
305
- file "data_bags/x/unmodified.json", <<EOM
306
- {
307
- "id": "unmodified"
308
- }
305
+ file "data_bags/x/unmodified.json", <<~EOM
306
+ {
307
+ "id": "unmodified"
308
+ }
309
309
  EOM
310
310
  end
311
311
 
@@ -319,62 +319,62 @@ EOM
319
319
  end
320
320
 
321
321
  it "knife download of the modified file succeeds" do
322
- knife("download /data_bags/x/modified.json").should_succeed <<EOM
323
- Updated /data_bags/x/modified.json
322
+ knife("download /data_bags/x/modified.json").should_succeed <<~EOM
323
+ Updated /data_bags/x/modified.json
324
324
  EOM
325
- knife("diff --name-status /data_bags").should_succeed <<EOM
326
- D\t/data_bags/x/added.json
327
- A\t/data_bags/x/deleted.json
325
+ knife("diff --name-status /data_bags").should_succeed <<~EOM
326
+ D\t/data_bags/x/added.json
327
+ A\t/data_bags/x/deleted.json
328
328
  EOM
329
329
  end
330
330
  it "knife download of the unmodified file does nothing" do
331
331
  knife("download /data_bags/x/unmodified.json").should_succeed ""
332
- knife("diff --name-status /data_bags").should_succeed <<EOM
333
- D\t/data_bags/x/added.json
334
- M\t/data_bags/x/modified.json
335
- A\t/data_bags/x/deleted.json
332
+ knife("diff --name-status /data_bags").should_succeed <<~EOM
333
+ D\t/data_bags/x/added.json
334
+ M\t/data_bags/x/modified.json
335
+ A\t/data_bags/x/deleted.json
336
336
  EOM
337
337
  end
338
338
  it "knife download of the added file succeeds" do
339
- knife("download /data_bags/x/added.json").should_succeed <<EOM
340
- Created /data_bags/x/added.json
339
+ knife("download /data_bags/x/added.json").should_succeed <<~EOM
340
+ Created /data_bags/x/added.json
341
341
  EOM
342
- knife("diff --name-status /data_bags").should_succeed <<EOM
343
- M\t/data_bags/x/modified.json
344
- A\t/data_bags/x/deleted.json
342
+ knife("diff --name-status /data_bags").should_succeed <<~EOM
343
+ M\t/data_bags/x/modified.json
344
+ A\t/data_bags/x/deleted.json
345
345
  EOM
346
346
  end
347
347
  it "knife download of the deleted file does nothing" do
348
348
  knife("download /data_bags/x/deleted.json").should_succeed ""
349
- knife("diff --name-status /data_bags").should_succeed <<EOM
350
- D\t/data_bags/x/added.json
351
- M\t/data_bags/x/modified.json
352
- A\t/data_bags/x/deleted.json
349
+ knife("diff --name-status /data_bags").should_succeed <<~EOM
350
+ D\t/data_bags/x/added.json
351
+ M\t/data_bags/x/modified.json
352
+ A\t/data_bags/x/deleted.json
353
353
  EOM
354
354
  end
355
355
  it "knife download --purge of the deleted file deletes it" do
356
- knife("download --purge /data_bags/x/deleted.json").should_succeed <<EOM
357
- Deleted extra entry /data_bags/x/deleted.json (purge is on)
356
+ knife("download --purge /data_bags/x/deleted.json").should_succeed <<~EOM
357
+ Deleted extra entry /data_bags/x/deleted.json (purge is on)
358
358
  EOM
359
- knife("diff --name-status /data_bags").should_succeed <<EOM
360
- D\t/data_bags/x/added.json
361
- M\t/data_bags/x/modified.json
359
+ knife("diff --name-status /data_bags").should_succeed <<~EOM
360
+ D\t/data_bags/x/added.json
361
+ M\t/data_bags/x/modified.json
362
362
  EOM
363
363
  end
364
364
  it "knife download of the entire data bag downloads everything" do
365
- knife("download /data_bags/x").should_succeed <<EOM
366
- Created /data_bags/x/added.json
367
- Updated /data_bags/x/modified.json
365
+ knife("download /data_bags/x").should_succeed <<~EOM
366
+ Created /data_bags/x/added.json
367
+ Updated /data_bags/x/modified.json
368
368
  EOM
369
- knife("diff --name-status /data_bags").should_succeed <<EOM
370
- A\t/data_bags/x/deleted.json
369
+ knife("diff --name-status /data_bags").should_succeed <<~EOM
370
+ A\t/data_bags/x/deleted.json
371
371
  EOM
372
372
  end
373
373
  it "knife download --purge of the entire data bag downloads everything" do
374
- knife("download --purge /data_bags/x").should_succeed <<EOM
375
- Created /data_bags/x/added.json
376
- Updated /data_bags/x/modified.json
377
- Deleted extra entry /data_bags/x/deleted.json (purge is on)
374
+ knife("download --purge /data_bags/x").should_succeed <<~EOM
375
+ Created /data_bags/x/added.json
376
+ Updated /data_bags/x/modified.json
377
+ Deleted extra entry /data_bags/x/deleted.json (purge is on)
378
378
  EOM
379
379
  knife("diff --name-status /data_bags").should_succeed ""
380
380
  end
@@ -383,21 +383,21 @@ EOM
383
383
  cwd "data_bags"
384
384
  end
385
385
  it "knife download fails" do
386
- knife("download").should_fail "FATAL: You must specify at least one argument. If you want to download everything in this directory, run \"knife download .\"\n", :stdout => /USAGE/
386
+ knife("download").should_fail "FATAL: You must specify at least one argument. If you want to download everything in this directory, run \"knife download .\"\n", stdout: /USAGE/
387
387
  end
388
388
  it "knife download --purge . downloads everything" do
389
- knife("download --purge .").should_succeed <<EOM
390
- Created x/added.json
391
- Updated x/modified.json
392
- Deleted extra entry x/deleted.json (purge is on)
389
+ knife("download --purge .").should_succeed <<~EOM
390
+ Created x/added.json
391
+ Updated x/modified.json
392
+ Deleted extra entry x/deleted.json (purge is on)
393
393
  EOM
394
394
  knife("diff --name-status /data_bags").should_succeed ""
395
395
  end
396
396
  it "knife download --purge * downloads everything" do
397
- knife("download --purge *").should_succeed <<EOM
398
- Created x/added.json
399
- Updated x/modified.json
400
- Deleted extra entry x/deleted.json (purge is on)
397
+ knife("download --purge *").should_succeed <<~EOM
398
+ Created x/added.json
399
+ Updated x/modified.json
400
+ Deleted extra entry x/deleted.json (purge is on)
401
401
  EOM
402
402
  knife("diff --name-status /data_bags").should_succeed ""
403
403
  end
@@ -418,47 +418,47 @@ EOM
418
418
 
419
419
  it "knife download of a modified file succeeds" do
420
420
  knife("download /cookbooks/x/metadata.rb").should_succeed "Updated /cookbooks/x/metadata.rb\n"
421
- knife("diff --name-status /cookbooks").should_succeed <<EOM
422
- D\t/cookbooks/x/y.rb
423
- A\t/cookbooks/x/z.rb
421
+ knife("diff --name-status /cookbooks").should_succeed <<~EOM
422
+ D\t/cookbooks/x/y.rb
423
+ A\t/cookbooks/x/z.rb
424
424
  EOM
425
425
  end
426
426
  it "knife download of a deleted file does nothing" do
427
427
  knife("download /cookbooks/x/z.rb").should_succeed ""
428
- knife("diff --name-status /cookbooks").should_succeed <<EOM
429
- M\t/cookbooks/x/metadata.rb
430
- D\t/cookbooks/x/y.rb
431
- A\t/cookbooks/x/z.rb
428
+ knife("diff --name-status /cookbooks").should_succeed <<~EOM
429
+ M\t/cookbooks/x/metadata.rb
430
+ D\t/cookbooks/x/y.rb
431
+ A\t/cookbooks/x/z.rb
432
432
  EOM
433
433
  end
434
434
  it "knife download --purge of a deleted file succeeds" do
435
435
  knife("download --purge /cookbooks/x/z.rb").should_succeed "Deleted extra entry /cookbooks/x/z.rb (purge is on)\n"
436
- knife("diff --name-status /cookbooks").should_succeed <<EOM
437
- M\t/cookbooks/x/metadata.rb
438
- D\t/cookbooks/x/y.rb
436
+ knife("diff --name-status /cookbooks").should_succeed <<~EOM
437
+ M\t/cookbooks/x/metadata.rb
438
+ D\t/cookbooks/x/y.rb
439
439
  EOM
440
440
  end
441
441
  it "knife download of an added file succeeds" do
442
442
  knife("download /cookbooks/x/y.rb").should_succeed "Created /cookbooks/x/y.rb\n"
443
- knife("diff --name-status /cookbooks").should_succeed <<EOM
444
- M\t/cookbooks/x/metadata.rb
445
- A\t/cookbooks/x/z.rb
443
+ knife("diff --name-status /cookbooks").should_succeed <<~EOM
444
+ M\t/cookbooks/x/metadata.rb
445
+ A\t/cookbooks/x/z.rb
446
446
  EOM
447
447
  end
448
448
  it "knife download of the cookbook itself succeeds" do
449
- knife("download /cookbooks/x").should_succeed <<EOM
450
- Updated /cookbooks/x/metadata.rb
451
- Created /cookbooks/x/y.rb
449
+ knife("download /cookbooks/x").should_succeed <<~EOM
450
+ Updated /cookbooks/x/metadata.rb
451
+ Created /cookbooks/x/y.rb
452
452
  EOM
453
- knife("diff --name-status /cookbooks").should_succeed <<EOM
454
- A\t/cookbooks/x/z.rb
453
+ knife("diff --name-status /cookbooks").should_succeed <<~EOM
454
+ A\t/cookbooks/x/z.rb
455
455
  EOM
456
456
  end
457
457
  it "knife download --purge of the cookbook itself succeeds" do
458
- knife("download --purge /cookbooks/x").should_succeed <<EOM
459
- Updated /cookbooks/x/metadata.rb
460
- Created /cookbooks/x/y.rb
461
- Deleted extra entry /cookbooks/x/z.rb (purge is on)
458
+ knife("download --purge /cookbooks/x").should_succeed <<~EOM
459
+ Updated /cookbooks/x/metadata.rb
460
+ Created /cookbooks/x/y.rb
461
+ Deleted extra entry /cookbooks/x/z.rb (purge is on)
462
462
  EOM
463
463
  knife("diff --name-status /cookbooks").should_succeed ""
464
464
  end
@@ -478,10 +478,10 @@ EOM
478
478
  end
479
479
 
480
480
  it "knife download /cookbooks/x downloads the latest version" do
481
- knife("download --purge /cookbooks/x").should_succeed <<EOM
482
- Updated /cookbooks/x/metadata.rb
483
- Created /cookbooks/x/onlyin1.0.1.rb
484
- Deleted extra entry /cookbooks/x/onlyin1.0.0.rb (purge is on)
481
+ knife("download --purge /cookbooks/x").should_succeed <<~EOM
482
+ Updated /cookbooks/x/metadata.rb
483
+ Created /cookbooks/x/onlyin1.0.1.rb
484
+ Deleted extra entry /cookbooks/x/onlyin1.0.0.rb (purge is on)
485
485
  EOM
486
486
  knife("diff --name-status /cookbooks").should_succeed ""
487
487
  end
@@ -494,8 +494,8 @@ EOM
494
494
  end
495
495
 
496
496
  it "knife download /cookbooks/x downloads the updated file" do
497
- knife("download --purge /cookbooks/x").should_succeed <<EOM
498
- Updated /cookbooks/x/onlyin1.0.0.rb
497
+ knife("download --purge /cookbooks/x").should_succeed <<~EOM
498
+ Updated /cookbooks/x/onlyin1.0.0.rb
499
499
  EOM
500
500
  knife("diff --name-status /cookbooks").should_succeed ""
501
501
  end
@@ -507,10 +507,10 @@ EOM
507
507
  end
508
508
 
509
509
  it "knife download /cookbooks/x downloads the latest version" do
510
- knife("download --purge /cookbooks/x").should_succeed <<EOM
511
- Updated /cookbooks/x/metadata.rb
512
- Created /cookbooks/x/onlyin1.0.1.rb
513
- Deleted extra entry /cookbooks/x/onlyin1.0.0.rb (purge is on)
510
+ knife("download --purge /cookbooks/x").should_succeed <<~EOM
511
+ Updated /cookbooks/x/metadata.rb
512
+ Created /cookbooks/x/onlyin1.0.1.rb
513
+ Deleted extra entry /cookbooks/x/onlyin1.0.0.rb (purge is on)
514
514
  EOM
515
515
  knife("diff --name-status /cookbooks").should_succeed ""
516
516
  end
@@ -522,10 +522,10 @@ EOM
522
522
  end
523
523
 
524
524
  it "knife download /cookbooks/x downloads the old version" do
525
- knife("download --purge /cookbooks/x").should_succeed <<EOM
526
- Updated /cookbooks/x/metadata.rb
527
- Created /cookbooks/x/onlyin0.9.9.rb
528
- Deleted extra entry /cookbooks/x/onlyin1.0.0.rb (purge is on)
525
+ knife("download --purge /cookbooks/x").should_succeed <<~EOM
526
+ Updated /cookbooks/x/metadata.rb
527
+ Created /cookbooks/x/onlyin0.9.9.rb
528
+ Deleted extra entry /cookbooks/x/onlyin1.0.0.rb (purge is on)
529
529
  EOM
530
530
  knife("diff --name-status /cookbooks").should_succeed ""
531
531
  end
@@ -538,14 +538,14 @@ EOM
538
538
  end
539
539
  when_the_repository "has the role in ruby" do
540
540
  before do
541
- file "roles/x.rb", <<EOM
542
- name "x"
543
- description "x"
541
+ file "roles/x.rb", <<~EOM
542
+ name "x"
543
+ description "x"
544
544
  EOM
545
545
  end
546
546
 
547
547
  it "knife download refuses to change the role" do
548
- knife("download /roles/x.json").should_succeed "", :stderr => "WARNING: /roles/x.rb cannot be updated (can't safely update ruby files).\n"
548
+ knife("download /roles/x.json").should_succeed "", stderr: "WARNING: /roles/x.rb cannot be updated (can't safely update ruby files).\n"
549
549
  knife("diff --name-status /roles/x.json").should_succeed "M\t/roles/x.rb\n"
550
550
  end
551
551
  end
@@ -560,13 +560,13 @@ EOM
560
560
  file "environments/x.json", "{"
561
561
  end
562
562
  it "knife download succeeds" do
563
- warning = <<-EOH
564
- WARN: Parse error reading #{path_to('environments/x.json')} as JSON: parse error: premature EOF
565
- {
566
- (right here) ------^
563
+ warning = <<~EOH
564
+ WARN: Parse error reading #{path_to('environments/x.json')} as JSON: parse error: premature EOF
565
+ {
566
+ (right here) ------^
567
567
 
568
568
  EOH
569
- knife("download /environments/x.json").should_succeed "Updated /environments/x.json\n", :stderr => warning
569
+ knife("download /environments/x.json").should_succeed "Updated /environments/x.json\n", stderr: warning
570
570
  knife("diff --name-status /environments/x.json").should_succeed ""
571
571
  end
572
572
  end
@@ -617,20 +617,20 @@ EOH
617
617
  end
618
618
 
619
619
  it "knife download downloads everything" do
620
- knife("download /").should_succeed <<EOM
621
- Created /clients/chef-validator.json
622
- Created /clients/chef-webui.json
623
- Created /clients/x.json
624
- Created /cookbooks/x-1.0.0
625
- Created /cookbooks/x-1.0.0/metadata.rb
626
- Created /data_bags/x
627
- Created /data_bags/x/y.json
628
- Created /environments/_default.json
629
- Created /environments/x.json
630
- Created /nodes/x.json
631
- Created /roles/x.json
632
- Created /users/admin.json
633
- Created /users/x.json
620
+ knife("download /").should_succeed <<~EOM
621
+ Created /clients/chef-validator.json
622
+ Created /clients/chef-webui.json
623
+ Created /clients/x.json
624
+ Created /cookbooks/x-1.0.0
625
+ Created /cookbooks/x-1.0.0/metadata.rb
626
+ Created /data_bags/x
627
+ Created /data_bags/x/y.json
628
+ Created /environments/_default.json
629
+ Created /environments/x.json
630
+ Created /nodes/x.json
631
+ Created /roles/x.json
632
+ Created /users/admin.json
633
+ Created /users/x.json
634
634
  EOM
635
635
  knife("diff --name-status /").should_succeed ""
636
636
  end
@@ -674,22 +674,22 @@ EOM
674
674
 
675
675
  context "except the role file is textually different, but not ACTUALLY different" do
676
676
  before do
677
- file "roles/x.json", <<EOM
678
- {
679
- "chef_type": "role" ,
680
- "default_attributes": {
681
- },
682
- "env_run_lists": {
683
- },
684
- "json_class": "Chef::Role",
685
- "name": "x",
686
- "description": "",
687
- "override_attributes": {
688
- },
689
- "run_list": [
690
-
691
- ]
692
- }
677
+ file "roles/x.json", <<~EOM
678
+ {
679
+ "chef_type": "role" ,
680
+ "default_attributes": {
681
+ },
682
+ "env_run_lists": {
683
+ },
684
+ "json_class": "Chef::Role",
685
+ "name": "x",
686
+ "description": "",
687
+ "override_attributes": {
688
+ },
689
+ "run_list": [
690
+
691
+ ]
692
+ }
693
693
  EOM
694
694
  end
695
695
 
@@ -715,32 +715,32 @@ EOM
715
715
 
716
716
  it "knife download does nothing" do
717
717
  knife("download /").should_succeed ""
718
- knife("diff --name-status /").should_succeed <<EOM
719
- A\t/clients/y.json
720
- A\t/cookbooks/x-1.0.0/blah.rb
721
- A\t/cookbooks/x-2.0.0
722
- A\t/cookbooks/y-1.0.0
723
- A\t/data_bags/x/z.json
724
- A\t/data_bags/y
725
- A\t/environments/y.json
726
- A\t/nodes/y.json
727
- A\t/roles/y.json
728
- A\t/users/y.json
718
+ knife("diff --name-status /").should_succeed <<~EOM
719
+ A\t/clients/y.json
720
+ A\t/cookbooks/x-1.0.0/blah.rb
721
+ A\t/cookbooks/x-2.0.0
722
+ A\t/cookbooks/y-1.0.0
723
+ A\t/data_bags/x/z.json
724
+ A\t/data_bags/y
725
+ A\t/environments/y.json
726
+ A\t/nodes/y.json
727
+ A\t/roles/y.json
728
+ A\t/users/y.json
729
729
  EOM
730
730
  end
731
731
 
732
732
  it "knife download --purge deletes the extra files" do
733
- knife("download --purge /").should_succeed <<EOM
734
- Deleted extra entry /clients/y.json (purge is on)
735
- Deleted extra entry /cookbooks/x-1.0.0/blah.rb (purge is on)
736
- Deleted extra entry /cookbooks/x-2.0.0 (purge is on)
737
- Deleted extra entry /cookbooks/y-1.0.0 (purge is on)
738
- Deleted extra entry /data_bags/x/z.json (purge is on)
739
- Deleted extra entry /data_bags/y (purge is on)
740
- Deleted extra entry /environments/y.json (purge is on)
741
- Deleted extra entry /nodes/y.json (purge is on)
742
- Deleted extra entry /roles/y.json (purge is on)
743
- Deleted extra entry /users/y.json (purge is on)
733
+ knife("download --purge /").should_succeed <<~EOM
734
+ Deleted extra entry /clients/y.json (purge is on)
735
+ Deleted extra entry /cookbooks/x-1.0.0/blah.rb (purge is on)
736
+ Deleted extra entry /cookbooks/x-2.0.0 (purge is on)
737
+ Deleted extra entry /cookbooks/y-1.0.0 (purge is on)
738
+ Deleted extra entry /data_bags/x/z.json (purge is on)
739
+ Deleted extra entry /data_bags/y (purge is on)
740
+ Deleted extra entry /environments/y.json (purge is on)
741
+ Deleted extra entry /nodes/y.json (purge is on)
742
+ Deleted extra entry /roles/y.json (purge is on)
743
+ Deleted extra entry /users/y.json (purge is on)
744
744
  EOM
745
745
  knife("diff --name-status /").should_succeed ""
746
746
  end
@@ -749,27 +749,27 @@ EOM
749
749
 
750
750
  when_the_repository "is empty" do
751
751
  it "knife download creates the extra files" do
752
- knife("download /").should_succeed <<EOM
753
- Created /clients
754
- Created /clients/chef-validator.json
755
- Created /clients/chef-webui.json
756
- Created /clients/x.json
757
- Created /cookbooks
758
- Created /cookbooks/x-1.0.0
759
- Created /cookbooks/x-1.0.0/metadata.rb
760
- Created /data_bags
761
- Created /data_bags/x
762
- Created /data_bags/x/y.json
763
- Created /environments
764
- Created /environments/_default.json
765
- Created /environments/x.json
766
- Created /nodes
767
- Created /nodes/x.json
768
- Created /roles
769
- Created /roles/x.json
770
- Created /users
771
- Created /users/admin.json
772
- Created /users/x.json
752
+ knife("download /").should_succeed <<~EOM
753
+ Created /clients
754
+ Created /clients/chef-validator.json
755
+ Created /clients/chef-webui.json
756
+ Created /clients/x.json
757
+ Created /cookbooks
758
+ Created /cookbooks/x-1.0.0
759
+ Created /cookbooks/x-1.0.0/metadata.rb
760
+ Created /data_bags
761
+ Created /data_bags/x
762
+ Created /data_bags/x/y.json
763
+ Created /environments
764
+ Created /environments/_default.json
765
+ Created /environments/x.json
766
+ Created /nodes
767
+ Created /nodes/x.json
768
+ Created /roles
769
+ Created /roles/x.json
770
+ Created /users
771
+ Created /users/admin.json
772
+ Created /users/x.json
773
773
  EOM
774
774
  knife("diff --name-status /").should_succeed ""
775
775
  end
@@ -779,7 +779,7 @@ EOM
779
779
  cwd "."
780
780
  end
781
781
  it "knife download with no parameters reports an error" do
782
- knife("download").should_fail "FATAL: You must specify at least one argument. If you want to download everything in this directory, run \"knife download .\"\n", :stdout => /USAGE/
782
+ knife("download").should_fail "FATAL: You must specify at least one argument. If you want to download everything in this directory, run \"knife download .\"\n", stdout: /USAGE/
783
783
  end
784
784
  end
785
785
  end
@@ -793,13 +793,13 @@ EOM
793
793
  end
794
794
 
795
795
  it "knife download of one data bag item itself succeeds" do
796
- knife("download /data_bags/x/y.json").should_succeed <<EOM
797
- Created /data_bags
798
- Created /data_bags/x
799
- Created /data_bags/x/y.json
796
+ knife("download /data_bags/x/y.json").should_succeed <<~EOM
797
+ Created /data_bags
798
+ Created /data_bags/x
799
+ Created /data_bags/x/y.json
800
800
  EOM
801
- knife("diff --name-status /data_bags").should_succeed <<EOM
802
- D\t/data_bags/x/z.json
801
+ knife("diff --name-status /data_bags").should_succeed <<~EOM
802
+ D\t/data_bags/x/z.json
803
803
  EOM
804
804
  end
805
805
  end
@@ -807,20 +807,20 @@ EOM
807
807
 
808
808
  when_the_repository "has three data bag items" do
809
809
  before do
810
- file "data_bags/x/deleted.json", <<EOM
811
- {
812
- "id": "deleted"
813
- }
810
+ file "data_bags/x/deleted.json", <<~EOM
811
+ {
812
+ "id": "deleted"
813
+ }
814
814
  EOM
815
- file "data_bags/x/modified.json", <<EOM
816
- {
817
- "id": "modified"
818
- }
815
+ file "data_bags/x/modified.json", <<~EOM
816
+ {
817
+ "id": "modified"
818
+ }
819
819
  EOM
820
- file "data_bags/x/unmodified.json", <<EOM
821
- {
822
- "id": "unmodified"
823
- }
820
+ file "data_bags/x/unmodified.json", <<~EOM
821
+ {
822
+ "id": "unmodified"
823
+ }
824
824
  EOM
825
825
  end
826
826
 
@@ -834,62 +834,62 @@ EOM
834
834
  end
835
835
 
836
836
  it "knife download of the modified file succeeds" do
837
- knife("download /data_bags/x/modified.json").should_succeed <<EOM
838
- Updated /data_bags/x/modified.json
837
+ knife("download /data_bags/x/modified.json").should_succeed <<~EOM
838
+ Updated /data_bags/x/modified.json
839
839
  EOM
840
- knife("diff --name-status /data_bags").should_succeed <<EOM
841
- D\t/data_bags/x/added.json
842
- A\t/data_bags/x/deleted.json
840
+ knife("diff --name-status /data_bags").should_succeed <<~EOM
841
+ D\t/data_bags/x/added.json
842
+ A\t/data_bags/x/deleted.json
843
843
  EOM
844
844
  end
845
845
  it "knife download of the unmodified file does nothing" do
846
846
  knife("download /data_bags/x/unmodified.json").should_succeed ""
847
- knife("diff --name-status /data_bags").should_succeed <<EOM
848
- D\t/data_bags/x/added.json
849
- M\t/data_bags/x/modified.json
850
- A\t/data_bags/x/deleted.json
847
+ knife("diff --name-status /data_bags").should_succeed <<~EOM
848
+ D\t/data_bags/x/added.json
849
+ M\t/data_bags/x/modified.json
850
+ A\t/data_bags/x/deleted.json
851
851
  EOM
852
852
  end
853
853
  it "knife download of the added file succeeds" do
854
- knife("download /data_bags/x/added.json").should_succeed <<EOM
855
- Created /data_bags/x/added.json
854
+ knife("download /data_bags/x/added.json").should_succeed <<~EOM
855
+ Created /data_bags/x/added.json
856
856
  EOM
857
- knife("diff --name-status /data_bags").should_succeed <<EOM
858
- M\t/data_bags/x/modified.json
859
- A\t/data_bags/x/deleted.json
857
+ knife("diff --name-status /data_bags").should_succeed <<~EOM
858
+ M\t/data_bags/x/modified.json
859
+ A\t/data_bags/x/deleted.json
860
860
  EOM
861
861
  end
862
862
  it "knife download of the deleted file does nothing" do
863
863
  knife("download /data_bags/x/deleted.json").should_succeed ""
864
- knife("diff --name-status /data_bags").should_succeed <<EOM
865
- D\t/data_bags/x/added.json
866
- M\t/data_bags/x/modified.json
867
- A\t/data_bags/x/deleted.json
864
+ knife("diff --name-status /data_bags").should_succeed <<~EOM
865
+ D\t/data_bags/x/added.json
866
+ M\t/data_bags/x/modified.json
867
+ A\t/data_bags/x/deleted.json
868
868
  EOM
869
869
  end
870
870
  it "knife download --purge of the deleted file deletes it" do
871
- knife("download --purge /data_bags/x/deleted.json").should_succeed <<EOM
872
- Deleted extra entry /data_bags/x/deleted.json (purge is on)
871
+ knife("download --purge /data_bags/x/deleted.json").should_succeed <<~EOM
872
+ Deleted extra entry /data_bags/x/deleted.json (purge is on)
873
873
  EOM
874
- knife("diff --name-status /data_bags").should_succeed <<EOM
875
- D\t/data_bags/x/added.json
876
- M\t/data_bags/x/modified.json
874
+ knife("diff --name-status /data_bags").should_succeed <<~EOM
875
+ D\t/data_bags/x/added.json
876
+ M\t/data_bags/x/modified.json
877
877
  EOM
878
878
  end
879
879
  it "knife download of the entire data bag downloads everything" do
880
- knife("download /data_bags/x").should_succeed <<EOM
881
- Created /data_bags/x/added.json
882
- Updated /data_bags/x/modified.json
880
+ knife("download /data_bags/x").should_succeed <<~EOM
881
+ Created /data_bags/x/added.json
882
+ Updated /data_bags/x/modified.json
883
883
  EOM
884
- knife("diff --name-status /data_bags").should_succeed <<EOM
885
- A\t/data_bags/x/deleted.json
884
+ knife("diff --name-status /data_bags").should_succeed <<~EOM
885
+ A\t/data_bags/x/deleted.json
886
886
  EOM
887
887
  end
888
888
  it "knife download --purge of the entire data bag downloads everything" do
889
- knife("download --purge /data_bags/x").should_succeed <<EOM
890
- Created /data_bags/x/added.json
891
- Updated /data_bags/x/modified.json
892
- Deleted extra entry /data_bags/x/deleted.json (purge is on)
889
+ knife("download --purge /data_bags/x").should_succeed <<~EOM
890
+ Created /data_bags/x/added.json
891
+ Updated /data_bags/x/modified.json
892
+ Deleted extra entry /data_bags/x/deleted.json (purge is on)
893
893
  EOM
894
894
  knife("diff --name-status /data_bags").should_succeed ""
895
895
  end
@@ -898,21 +898,21 @@ EOM
898
898
  cwd "data_bags"
899
899
  end
900
900
  it "knife download fails" do
901
- knife("download").should_fail "FATAL: You must specify at least one argument. If you want to download everything in this directory, run \"knife download .\"\n", :stdout => /USAGE/
901
+ knife("download").should_fail "FATAL: You must specify at least one argument. If you want to download everything in this directory, run \"knife download .\"\n", stdout: /USAGE/
902
902
  end
903
903
  it "knife download --purge . downloads everything" do
904
- knife("download --purge .").should_succeed <<EOM
905
- Created x/added.json
906
- Updated x/modified.json
907
- Deleted extra entry x/deleted.json (purge is on)
904
+ knife("download --purge .").should_succeed <<~EOM
905
+ Created x/added.json
906
+ Updated x/modified.json
907
+ Deleted extra entry x/deleted.json (purge is on)
908
908
  EOM
909
909
  knife("diff --name-status /data_bags").should_succeed ""
910
910
  end
911
911
  it "knife download --purge * downloads everything" do
912
- knife("download --purge *").should_succeed <<EOM
913
- Created x/added.json
914
- Updated x/modified.json
915
- Deleted extra entry x/deleted.json (purge is on)
912
+ knife("download --purge *").should_succeed <<~EOM
913
+ Created x/added.json
914
+ Updated x/modified.json
915
+ Deleted extra entry x/deleted.json (purge is on)
916
916
  EOM
917
917
  knife("diff --name-status /data_bags").should_succeed ""
918
918
  end
@@ -933,47 +933,47 @@ EOM
933
933
 
934
934
  it "knife download of a modified file succeeds" do
935
935
  knife("download /cookbooks/x-1.0.0/metadata.rb").should_succeed "Updated /cookbooks/x-1.0.0/metadata.rb\n"
936
- knife("diff --name-status /cookbooks").should_succeed <<EOM
937
- D\t/cookbooks/x-1.0.0/y.rb
938
- A\t/cookbooks/x-1.0.0/z.rb
936
+ knife("diff --name-status /cookbooks").should_succeed <<~EOM
937
+ D\t/cookbooks/x-1.0.0/y.rb
938
+ A\t/cookbooks/x-1.0.0/z.rb
939
939
  EOM
940
940
  end
941
941
  it "knife download of a deleted file does nothing" do
942
942
  knife("download /cookbooks/x-1.0.0/z.rb").should_succeed ""
943
- knife("diff --name-status /cookbooks").should_succeed <<EOM
944
- M\t/cookbooks/x-1.0.0/metadata.rb
945
- D\t/cookbooks/x-1.0.0/y.rb
946
- A\t/cookbooks/x-1.0.0/z.rb
943
+ knife("diff --name-status /cookbooks").should_succeed <<~EOM
944
+ M\t/cookbooks/x-1.0.0/metadata.rb
945
+ D\t/cookbooks/x-1.0.0/y.rb
946
+ A\t/cookbooks/x-1.0.0/z.rb
947
947
  EOM
948
948
  end
949
949
  it "knife download --purge of a deleted file succeeds" do
950
950
  knife("download --purge /cookbooks/x-1.0.0/z.rb").should_succeed "Deleted extra entry /cookbooks/x-1.0.0/z.rb (purge is on)\n"
951
- knife("diff --name-status /cookbooks").should_succeed <<EOM
952
- M\t/cookbooks/x-1.0.0/metadata.rb
953
- D\t/cookbooks/x-1.0.0/y.rb
951
+ knife("diff --name-status /cookbooks").should_succeed <<~EOM
952
+ M\t/cookbooks/x-1.0.0/metadata.rb
953
+ D\t/cookbooks/x-1.0.0/y.rb
954
954
  EOM
955
955
  end
956
956
  it "knife download of an added file succeeds" do
957
957
  knife("download /cookbooks/x-1.0.0/y.rb").should_succeed "Created /cookbooks/x-1.0.0/y.rb\n"
958
- knife("diff --name-status /cookbooks").should_succeed <<EOM
959
- M\t/cookbooks/x-1.0.0/metadata.rb
960
- A\t/cookbooks/x-1.0.0/z.rb
958
+ knife("diff --name-status /cookbooks").should_succeed <<~EOM
959
+ M\t/cookbooks/x-1.0.0/metadata.rb
960
+ A\t/cookbooks/x-1.0.0/z.rb
961
961
  EOM
962
962
  end
963
963
  it "knife download of the cookbook itself succeeds" do
964
- knife("download /cookbooks/x-1.0.0").should_succeed <<EOM
965
- Updated /cookbooks/x-1.0.0/metadata.rb
966
- Created /cookbooks/x-1.0.0/y.rb
964
+ knife("download /cookbooks/x-1.0.0").should_succeed <<~EOM
965
+ Updated /cookbooks/x-1.0.0/metadata.rb
966
+ Created /cookbooks/x-1.0.0/y.rb
967
967
  EOM
968
- knife("diff --name-status /cookbooks").should_succeed <<EOM
969
- A\t/cookbooks/x-1.0.0/z.rb
968
+ knife("diff --name-status /cookbooks").should_succeed <<~EOM
969
+ A\t/cookbooks/x-1.0.0/z.rb
970
970
  EOM
971
971
  end
972
972
  it "knife download --purge of the cookbook itself succeeds" do
973
- knife("download --purge /cookbooks/x-1.0.0").should_succeed <<EOM
974
- Updated /cookbooks/x-1.0.0/metadata.rb
975
- Created /cookbooks/x-1.0.0/y.rb
976
- Deleted extra entry /cookbooks/x-1.0.0/z.rb (purge is on)
973
+ knife("download --purge /cookbooks/x-1.0.0").should_succeed <<~EOM
974
+ Updated /cookbooks/x-1.0.0/metadata.rb
975
+ Created /cookbooks/x-1.0.0/y.rb
976
+ Deleted extra entry /cookbooks/x-1.0.0/z.rb (purge is on)
977
977
  EOM
978
978
  knife("diff --name-status /cookbooks").should_succeed ""
979
979
  end
@@ -993,11 +993,11 @@ EOM
993
993
  end
994
994
 
995
995
  it "knife download /cookbooks/x downloads the latest version" do
996
- knife("download --purge /cookbooks").should_succeed <<EOM
997
- Updated /cookbooks/x-1.0.0/onlyin1.0.0.rb
998
- Created /cookbooks/x-1.0.1
999
- Created /cookbooks/x-1.0.1/metadata.rb
1000
- Created /cookbooks/x-1.0.1/onlyin1.0.1.rb
996
+ knife("download --purge /cookbooks").should_succeed <<~EOM
997
+ Updated /cookbooks/x-1.0.0/onlyin1.0.0.rb
998
+ Created /cookbooks/x-1.0.1
999
+ Created /cookbooks/x-1.0.1/metadata.rb
1000
+ Created /cookbooks/x-1.0.1/onlyin1.0.1.rb
1001
1001
  EOM
1002
1002
  knife("diff --name-status /cookbooks").should_succeed ""
1003
1003
  end
@@ -1010,11 +1010,11 @@ EOM
1010
1010
  end
1011
1011
 
1012
1012
  it "knife download /cookbooks downloads the updated file" do
1013
- knife("download --purge /cookbooks").should_succeed <<EOM
1014
- Created /cookbooks/x-0.9.9
1015
- Created /cookbooks/x-0.9.9/metadata.rb
1016
- Created /cookbooks/x-0.9.9/onlyin0.9.9.rb
1017
- Updated /cookbooks/x-1.0.0/onlyin1.0.0.rb
1013
+ knife("download --purge /cookbooks").should_succeed <<~EOM
1014
+ Created /cookbooks/x-0.9.9
1015
+ Created /cookbooks/x-0.9.9/metadata.rb
1016
+ Created /cookbooks/x-0.9.9/onlyin0.9.9.rb
1017
+ Updated /cookbooks/x-1.0.0/onlyin1.0.0.rb
1018
1018
  EOM
1019
1019
  knife("diff --name-status /cookbooks").should_succeed ""
1020
1020
  end
@@ -1026,11 +1026,11 @@ EOM
1026
1026
  end
1027
1027
 
1028
1028
  it "knife download /cookbooks/x downloads the latest version" do
1029
- knife("download --purge /cookbooks").should_succeed <<EOM
1030
- Created /cookbooks/x-1.0.1
1031
- Created /cookbooks/x-1.0.1/metadata.rb
1032
- Created /cookbooks/x-1.0.1/onlyin1.0.1.rb
1033
- Deleted extra entry /cookbooks/x-1.0.0 (purge is on)
1029
+ knife("download --purge /cookbooks").should_succeed <<~EOM
1030
+ Created /cookbooks/x-1.0.1
1031
+ Created /cookbooks/x-1.0.1/metadata.rb
1032
+ Created /cookbooks/x-1.0.1/onlyin1.0.1.rb
1033
+ Deleted extra entry /cookbooks/x-1.0.0 (purge is on)
1034
1034
  EOM
1035
1035
  knife("diff --name-status /cookbooks").should_succeed ""
1036
1036
  end
@@ -1042,11 +1042,11 @@ EOM
1042
1042
  end
1043
1043
 
1044
1044
  it "knife download --purge /cookbooks downloads the old version and deletes the new version" do
1045
- knife("download --purge /cookbooks").should_succeed <<EOM
1046
- Created /cookbooks/x-0.9.9
1047
- Created /cookbooks/x-0.9.9/metadata.rb
1048
- Created /cookbooks/x-0.9.9/onlyin0.9.9.rb
1049
- Deleted extra entry /cookbooks/x-1.0.0 (purge is on)
1045
+ knife("download --purge /cookbooks").should_succeed <<~EOM
1046
+ Created /cookbooks/x-0.9.9
1047
+ Created /cookbooks/x-0.9.9/metadata.rb
1048
+ Created /cookbooks/x-0.9.9/onlyin0.9.9.rb
1049
+ Deleted extra entry /cookbooks/x-1.0.0 (purge is on)
1050
1050
  EOM
1051
1051
  knife("diff --name-status /cookbooks").should_succeed ""
1052
1052
  end
@@ -1102,16 +1102,16 @@ EOM
1102
1102
  new_result
1103
1103
  }.at_least(:once)
1104
1104
 
1105
- knife("download /cookbooks/x").should_succeed <<EOM
1106
- Created /cookbooks
1107
- Created /cookbooks/x
1108
- Created /cookbooks/x/metadata.rb
1105
+ knife("download /cookbooks/x").should_succeed <<~EOM
1106
+ Created /cookbooks
1107
+ Created /cookbooks/x
1108
+ Created /cookbooks/x/metadata.rb
1109
1109
  EOM
1110
1110
  end
1111
1111
  end
1112
1112
  end
1113
1113
 
1114
- when_the_chef_server "is in Enterprise mode", :osc_compat => false, :single_org => false do
1114
+ when_the_chef_server "is in Enterprise mode", osc_compat: false, single_org: false do
1115
1115
  before do
1116
1116
  user "foo", {}
1117
1117
  user "bar", {}
@@ -1125,70 +1125,70 @@ EOM
1125
1125
 
1126
1126
  when_the_repository "has all the default stuff" do
1127
1127
  before do
1128
- knife("download /").should_succeed <<EOM
1129
- Created /acls
1130
- Created /acls/clients
1131
- Created /acls/clients/foo-validator.json
1132
- Created /acls/containers
1133
- Created /acls/containers/clients.json
1134
- Created /acls/containers/containers.json
1135
- Created /acls/containers/cookbook_artifacts.json
1136
- Created /acls/containers/cookbooks.json
1137
- Created /acls/containers/data.json
1138
- Created /acls/containers/environments.json
1139
- Created /acls/containers/groups.json
1140
- Created /acls/containers/nodes.json
1141
- Created /acls/containers/policies.json
1142
- Created /acls/containers/policy_groups.json
1143
- Created /acls/containers/roles.json
1144
- Created /acls/containers/sandboxes.json
1145
- Created /acls/cookbook_artifacts
1146
- Created /acls/cookbooks
1147
- Created /acls/data_bags
1148
- Created /acls/environments
1149
- Created /acls/environments/_default.json
1150
- Created /acls/groups
1151
- Created /acls/groups/admins.json
1152
- Created /acls/groups/billing-admins.json
1153
- Created /acls/groups/clients.json
1154
- Created /acls/groups/users.json
1155
- Created /acls/nodes
1156
- Created /acls/policies
1157
- Created /acls/policy_groups
1158
- Created /acls/roles
1159
- Created /acls/organization.json
1160
- Created /clients
1161
- Created /clients/foo-validator.json
1162
- Created /containers
1163
- Created /containers/clients.json
1164
- Created /containers/containers.json
1165
- Created /containers/cookbook_artifacts.json
1166
- Created /containers/cookbooks.json
1167
- Created /containers/data.json
1168
- Created /containers/environments.json
1169
- Created /containers/groups.json
1170
- Created /containers/nodes.json
1171
- Created /containers/policies.json
1172
- Created /containers/policy_groups.json
1173
- Created /containers/roles.json
1174
- Created /containers/sandboxes.json
1175
- Created /cookbook_artifacts
1176
- Created /cookbooks
1177
- Created /data_bags
1178
- Created /environments
1179
- Created /environments/_default.json
1180
- Created /groups
1181
- Created /groups/admins.json
1182
- Created /groups/billing-admins.json
1183
- Created /groups/clients.json
1184
- Created /groups/users.json
1185
- Created /invitations.json
1186
- Created /members.json
1187
- Created /nodes
1188
- Created /org.json
1189
- Created /policies
1190
- Created /policy_groups
1191
- Created /roles
1128
+ knife("download /").should_succeed <<~EOM
1129
+ Created /acls
1130
+ Created /acls/clients
1131
+ Created /acls/clients/foo-validator.json
1132
+ Created /acls/containers
1133
+ Created /acls/containers/clients.json
1134
+ Created /acls/containers/containers.json
1135
+ Created /acls/containers/cookbook_artifacts.json
1136
+ Created /acls/containers/cookbooks.json
1137
+ Created /acls/containers/data.json
1138
+ Created /acls/containers/environments.json
1139
+ Created /acls/containers/groups.json
1140
+ Created /acls/containers/nodes.json
1141
+ Created /acls/containers/policies.json
1142
+ Created /acls/containers/policy_groups.json
1143
+ Created /acls/containers/roles.json
1144
+ Created /acls/containers/sandboxes.json
1145
+ Created /acls/cookbook_artifacts
1146
+ Created /acls/cookbooks
1147
+ Created /acls/data_bags
1148
+ Created /acls/environments
1149
+ Created /acls/environments/_default.json
1150
+ Created /acls/groups
1151
+ Created /acls/groups/admins.json
1152
+ Created /acls/groups/billing-admins.json
1153
+ Created /acls/groups/clients.json
1154
+ Created /acls/groups/users.json
1155
+ Created /acls/nodes
1156
+ Created /acls/policies
1157
+ Created /acls/policy_groups
1158
+ Created /acls/roles
1159
+ Created /acls/organization.json
1160
+ Created /clients
1161
+ Created /clients/foo-validator.json
1162
+ Created /containers
1163
+ Created /containers/clients.json
1164
+ Created /containers/containers.json
1165
+ Created /containers/cookbook_artifacts.json
1166
+ Created /containers/cookbooks.json
1167
+ Created /containers/data.json
1168
+ Created /containers/environments.json
1169
+ Created /containers/groups.json
1170
+ Created /containers/nodes.json
1171
+ Created /containers/policies.json
1172
+ Created /containers/policy_groups.json
1173
+ Created /containers/roles.json
1174
+ Created /containers/sandboxes.json
1175
+ Created /cookbook_artifacts
1176
+ Created /cookbooks
1177
+ Created /data_bags
1178
+ Created /environments
1179
+ Created /environments/_default.json
1180
+ Created /groups
1181
+ Created /groups/admins.json
1182
+ Created /groups/billing-admins.json
1183
+ Created /groups/clients.json
1184
+ Created /groups/users.json
1185
+ Created /invitations.json
1186
+ Created /members.json
1187
+ Created /nodes
1188
+ Created /org.json
1189
+ Created /policies
1190
+ Created /policy_groups
1191
+ Created /roles
1192
1192
  EOM
1193
1193
  end
1194
1194
 
@@ -1217,43 +1217,43 @@ EOM
1217
1217
  end
1218
1218
 
1219
1219
  before do
1220
- knife("download /acls /groups/clients.json /groups/users.json").should_succeed <<-EOM
1221
- Created /acls/clients/x.json
1222
- Created /acls/containers/x.json
1223
- Created /acls/cookbook_artifacts/x.json
1224
- Created /acls/cookbooks/x.json
1225
- Created /acls/data_bags/x.json
1226
- Created /acls/environments/x.json
1227
- Created /acls/groups/x.json
1228
- Created /acls/nodes/x.json
1229
- Created /acls/policies/blah.json
1230
- Created /acls/policies/x.json
1231
- Created /acls/policy_groups/x.json
1232
- Created /acls/roles/x.json
1233
- Updated /groups/clients.json
1234
- Updated /groups/users.json
1220
+ knife("download /acls /groups/clients.json /groups/users.json").should_succeed <<~EOM
1221
+ Created /acls/clients/x.json
1222
+ Created /acls/containers/x.json
1223
+ Created /acls/cookbook_artifacts/x.json
1224
+ Created /acls/cookbooks/x.json
1225
+ Created /acls/data_bags/x.json
1226
+ Created /acls/environments/x.json
1227
+ Created /acls/groups/x.json
1228
+ Created /acls/nodes/x.json
1229
+ Created /acls/policies/blah.json
1230
+ Created /acls/policies/x.json
1231
+ Created /acls/policy_groups/x.json
1232
+ Created /acls/roles/x.json
1233
+ Updated /groups/clients.json
1234
+ Updated /groups/users.json
1235
1235
  EOM
1236
1236
  end
1237
1237
 
1238
1238
  it "knife download / downloads everything" do
1239
- knife("download /").should_succeed <<EOM
1240
- Created /clients/x.json
1241
- Created /containers/x.json
1242
- Created /cookbook_artifacts/x-1x1
1243
- Created /cookbook_artifacts/x-1x1/metadata.rb
1244
- Created /cookbooks/x
1245
- Created /cookbooks/x/metadata.rb
1246
- Created /data_bags/x
1247
- Created /data_bags/x/y.json
1248
- Created /environments/x.json
1249
- Created /groups/x.json
1250
- Updated /invitations.json
1251
- Updated /members.json
1252
- Created /nodes/x.json
1253
- Created /policies/blah-1.0.0.json
1254
- Created /policies/x-1.0.0.json
1255
- Created /policy_groups/x.json
1256
- Created /roles/x.json
1239
+ knife("download /").should_succeed <<~EOM
1240
+ Created /clients/x.json
1241
+ Created /containers/x.json
1242
+ Created /cookbook_artifacts/x-1x1
1243
+ Created /cookbook_artifacts/x-1x1/metadata.rb
1244
+ Created /cookbooks/x
1245
+ Created /cookbooks/x/metadata.rb
1246
+ Created /data_bags/x
1247
+ Created /data_bags/x/y.json
1248
+ Created /environments/x.json
1249
+ Created /groups/x.json
1250
+ Updated /invitations.json
1251
+ Updated /members.json
1252
+ Created /nodes/x.json
1253
+ Created /policies/blah-1.0.0.json
1254
+ Created /policies/x-1.0.0.json
1255
+ Created /policy_groups/x.json
1256
+ Created /roles/x.json
1257
1257
  EOM
1258
1258
  knife("diff --name-status /").should_succeed ""
1259
1259
  end
@@ -1308,21 +1308,21 @@ EOM
1308
1308
  end
1309
1309
 
1310
1310
  it "knife download updates everything" do
1311
- knife("download /").should_succeed <<EOM
1312
- Updated /clients/x.json
1313
- Updated /cookbook_artifacts/x-1x1/metadata.rb
1314
- Updated /cookbooks/x/metadata.rb
1315
- Updated /data_bags/x/y.json
1316
- Updated /environments/x.json
1317
- Updated /groups/x.json
1318
- Updated /invitations.json
1319
- Updated /members.json
1320
- Updated /nodes/x.json
1321
- Updated /org.json
1322
- Created /policies/blah-1.0.0.json
1323
- Updated /policies/x-1.0.0.json
1324
- Updated /policy_groups/x.json
1325
- Updated /roles/x.json
1311
+ knife("download /").should_succeed <<~EOM
1312
+ Updated /clients/x.json
1313
+ Updated /cookbook_artifacts/x-1x1/metadata.rb
1314
+ Updated /cookbooks/x/metadata.rb
1315
+ Updated /data_bags/x/y.json
1316
+ Updated /environments/x.json
1317
+ Updated /groups/x.json
1318
+ Updated /invitations.json
1319
+ Updated /members.json
1320
+ Updated /nodes/x.json
1321
+ Updated /org.json
1322
+ Created /policies/blah-1.0.0.json
1323
+ Updated /policies/x-1.0.0.json
1324
+ Updated /policy_groups/x.json
1325
+ Updated /roles/x.json
1326
1326
  EOM
1327
1327
  knife("diff --name-status /").should_succeed ""
1328
1328
  end