chef 12.0.3 → 12.1.0.rc.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (655) hide show
  1. checksums.yaml +4 -4
  2. data/CONTRIBUTING.md +4 -1
  3. data/README.md +42 -18
  4. data/distro/common/html/_sources/ctl_chef_client.txt +1 -1
  5. data/distro/common/html/_sources/ctl_chef_server.txt +53 -35
  6. data/distro/common/html/_sources/ctl_chef_solo.txt +1 -1
  7. data/distro/common/html/_sources/knife_bootstrap.txt +1 -1
  8. data/distro/common/html/_sources/knife_cookbook_site.txt +1 -1
  9. data/distro/common/html/_sources/knife_data_bag.txt +4 -4
  10. data/distro/common/html/_sources/knife_status.txt +1 -1
  11. data/distro/common/html/_static/searchtools.js +1 -1
  12. data/distro/common/html/ctl_chef_client.html +55 -7
  13. data/distro/common/html/ctl_chef_server.html +84 -41
  14. data/distro/common/html/ctl_chef_shell.html +45 -1
  15. data/distro/common/html/ctl_chef_solo.html +51 -5
  16. data/distro/common/html/index.html +2 -2
  17. data/distro/common/html/knife.html +1 -1
  18. data/distro/common/html/knife_bootstrap.html +30 -10
  19. data/distro/common/html/knife_cookbook_site.html +2 -0
  20. data/distro/common/html/knife_data_bag.html +4 -4
  21. data/distro/common/html/knife_node.html +2 -2
  22. data/distro/common/html/knife_raw.html +1 -1
  23. data/distro/common/html/knife_role.html +1 -1
  24. data/distro/common/html/knife_search.html +3 -3
  25. data/distro/common/html/knife_status.html +4 -0
  26. data/distro/common/html/searchindex.js +1 -1
  27. data/distro/common/man/man1/chef-shell.1 +72 -1
  28. data/distro/common/man/man1/knife-bootstrap.1 +71 -63
  29. data/distro/common/man/man1/knife-client.1 +1 -1
  30. data/distro/common/man/man1/knife-configure.1 +1 -1
  31. data/distro/common/man/man1/knife-cookbook-site.1 +4 -1
  32. data/distro/common/man/man1/knife-cookbook.1 +1 -1
  33. data/distro/common/man/man1/knife-data-bag.1 +5 -5
  34. data/distro/common/man/man1/knife-delete.1 +1 -1
  35. data/distro/common/man/man1/knife-deps.1 +1 -1
  36. data/distro/common/man/man1/knife-diff.1 +1 -1
  37. data/distro/common/man/man1/knife-download.1 +1 -1
  38. data/distro/common/man/man1/knife-edit.1 +1 -1
  39. data/distro/common/man/man1/knife-environment.1 +1 -1
  40. data/distro/common/man/man1/knife-exec.1 +1 -1
  41. data/distro/common/man/man1/knife-index-rebuild.1 +1 -1
  42. data/distro/common/man/man1/knife-list.1 +1 -1
  43. data/distro/common/man/man1/knife-node.1 +3 -3
  44. data/distro/common/man/man1/knife-raw.1 +2 -2
  45. data/distro/common/man/man1/knife-recipe-list.1 +1 -1
  46. data/distro/common/man/man1/knife-role.1 +2 -2
  47. data/distro/common/man/man1/knife-search.1 +4 -4
  48. data/distro/common/man/man1/knife-serve.1 +1 -1
  49. data/distro/common/man/man1/knife-show.1 +1 -1
  50. data/distro/common/man/man1/knife-ssh.1 +1 -1
  51. data/distro/common/man/man1/knife-ssl-check.1 +1 -1
  52. data/distro/common/man/man1/knife-ssl-fetch.1 +1 -1
  53. data/distro/common/man/man1/knife-status.1 +1 -1
  54. data/distro/common/man/man1/knife-tag.1 +1 -1
  55. data/distro/common/man/man1/knife-upload.1 +1 -1
  56. data/distro/common/man/man1/knife-user.1 +1 -1
  57. data/distro/common/man/man1/knife-xargs.1 +1 -1
  58. data/distro/common/man/man1/knife.1 +1 -1
  59. data/distro/common/man/man8/chef-apply.8 +86 -0
  60. data/distro/common/man/man8/chef-client.8 +76 -5
  61. data/distro/common/man/man8/chef-solo.8 +79 -6
  62. data/distro/common/markdown/man1/knife-bootstrap.mkd +1 -1
  63. data/distro/common/markdown/man1/knife-cookbook-site.mkd +1 -1
  64. data/distro/common/markdown/man1/knife-data-bag.mkd +1 -1
  65. data/distro/common/markdown/man1/knife-environment.mkd +1 -1
  66. data/distro/common/markdown/man1/knife.mkd +1 -1
  67. data/lib/chef.rb +0 -7
  68. data/lib/chef/api_client.rb +10 -2
  69. data/lib/chef/api_client/registration.rb +7 -9
  70. data/lib/chef/application.rb +28 -12
  71. data/lib/chef/application/apply.rb +17 -1
  72. data/lib/chef/application/client.rb +74 -6
  73. data/lib/chef/application/knife.rb +1 -2
  74. data/lib/chef/application/solo.rb +30 -0
  75. data/lib/chef/application/windows_service.rb +1 -0
  76. data/lib/chef/application/windows_service_manager.rb +8 -2
  77. data/lib/chef/applications.rb +0 -1
  78. data/lib/chef/audit/audit_event_proxy.rb +93 -0
  79. data/lib/chef/audit/audit_reporter.rb +169 -0
  80. data/lib/chef/audit/control_group_data.rb +140 -0
  81. data/lib/chef/audit/rspec_formatter.rb +37 -0
  82. data/lib/chef/audit/runner.rb +178 -0
  83. data/lib/chef/chef_fs/chef_fs_data_store.rb +11 -2
  84. data/lib/chef/chef_fs/config.rb +25 -4
  85. data/lib/chef/chef_fs/data_handler/policy_data_handler.rb +15 -0
  86. data/lib/chef/chef_fs/data_handler/user_data_handler.rb +1 -0
  87. data/lib/chef/chef_fs/file_system.rb +1 -1
  88. data/lib/chef/chef_fs/file_system/base_fs_dir.rb +5 -0
  89. data/lib/chef/chef_fs/file_system/chef_repository_file_system_cookbook_entry.rb +3 -2
  90. data/lib/chef/{shef/ext.rb → chef_fs/file_system/chef_repository_file_system_policies_dir.rb} +22 -3
  91. data/lib/chef/chef_fs/file_system/chef_repository_file_system_root_dir.rb +4 -0
  92. data/lib/chef/client.rb +81 -52
  93. data/lib/chef/config.rb +35 -3
  94. data/lib/chef/cookbook/metadata.rb +3 -3
  95. data/lib/chef/cookbook_manifest.rb +275 -0
  96. data/lib/chef/cookbook_site_streaming_uploader.rb +24 -23
  97. data/lib/chef/cookbook_uploader.rb +11 -2
  98. data/lib/chef/cookbook_version.rb +71 -194
  99. data/lib/chef/data_bag.rb +5 -2
  100. data/lib/chef/data_bag_item.rb +6 -3
  101. data/lib/chef/deprecation/warnings.rb +5 -4
  102. data/lib/chef/dsl/audit.rb +51 -0
  103. data/lib/chef/dsl/include_recipe.rb +2 -3
  104. data/lib/chef/dsl/reboot_pending.rb +1 -1
  105. data/lib/chef/dsl/recipe.rb +49 -31
  106. data/lib/chef/encrypted_data_bag_item/assertions.rb +0 -3
  107. data/lib/chef/environment.rb +5 -2
  108. data/lib/chef/event_dispatch/base.rb +36 -1
  109. data/lib/chef/event_dispatch/dispatcher.rb +3 -5
  110. data/lib/chef/exceptions.rb +61 -2
  111. data/lib/chef/file_access_control/unix.rb +12 -0
  112. data/lib/chef/file_access_control/windows.rb +14 -0
  113. data/lib/chef/formatters/doc.rb +47 -1
  114. data/{spec/unit/monkey_patches/string_spec.rb → lib/chef/guard_interpreter.rb} +11 -16
  115. data/lib/chef/guard_interpreter/resource_guard_interpreter.rb +3 -2
  116. data/lib/chef/http.rb +1 -2
  117. data/lib/chef/knife.rb +5 -3
  118. data/lib/chef/knife/bootstrap.rb +84 -15
  119. data/lib/chef/knife/bootstrap/chef_vault_handler.rb +165 -0
  120. data/lib/chef/knife/bootstrap/client_builder.rb +190 -0
  121. data/lib/chef/knife/bootstrap/{README.md → templates/README.md} +0 -0
  122. data/lib/chef/knife/bootstrap/{archlinux-gems.erb → templates/archlinux-gems.erb} +9 -0
  123. data/lib/chef/knife/bootstrap/{chef-aix.erb → templates/chef-aix.erb} +9 -0
  124. data/lib/chef/knife/bootstrap/{chef-full.erb → templates/chef-full.erb} +10 -1
  125. data/lib/chef/knife/client_create.rb +8 -7
  126. data/lib/chef/knife/cookbook_site_download.rb +1 -1
  127. data/lib/chef/knife/cookbook_site_install.rb +1 -1
  128. data/lib/chef/knife/cookbook_site_list.rb +1 -1
  129. data/lib/chef/knife/cookbook_site_search.rb +1 -1
  130. data/lib/chef/knife/cookbook_site_share.rb +39 -28
  131. data/lib/chef/knife/cookbook_site_show.rb +3 -3
  132. data/lib/chef/knife/cookbook_site_unshare.rb +1 -1
  133. data/lib/chef/knife/cookbook_test.rb +1 -0
  134. data/lib/chef/knife/cookbook_upload.rb +13 -8
  135. data/lib/chef/knife/core/bootstrap_context.rb +14 -3
  136. data/lib/chef/knife/core/generic_presenter.rb +5 -2
  137. data/lib/chef/knife/core/object_loader.rb +1 -1
  138. data/lib/chef/knife/core/subcommand_loader.rb +24 -0
  139. data/lib/chef/knife/core/ui.rb +9 -1
  140. data/lib/chef/knife/node_run_list_remove.rb +11 -3
  141. data/lib/chef/knife/raw.rb +14 -3
  142. data/lib/chef/knife/role_env_run_list_add.rb +86 -0
  143. data/lib/chef/knife/role_env_run_list_clear.rb +55 -0
  144. data/lib/chef/knife/role_env_run_list_remove.rb +57 -0
  145. data/lib/chef/knife/role_env_run_list_replace.rb +59 -0
  146. data/lib/chef/knife/role_env_run_list_set.rb +70 -0
  147. data/lib/chef/knife/role_run_list_add.rb +86 -0
  148. data/lib/chef/knife/role_run_list_clear.rb +55 -0
  149. data/lib/chef/knife/role_run_list_remove.rb +57 -0
  150. data/lib/chef/knife/role_run_list_replace.rb +59 -0
  151. data/lib/chef/knife/role_run_list_set.rb +70 -0
  152. data/lib/chef/knife/search.rb +4 -4
  153. data/lib/chef/knife/serve.rb +3 -0
  154. data/lib/chef/knife/ssh.rb +1 -1
  155. data/lib/chef/knife/ssl_check.rb +2 -2
  156. data/lib/chef/knife/ssl_fetch.rb +14 -1
  157. data/lib/chef/log.rb +10 -1
  158. data/lib/chef/mixin/command.rb +1 -1
  159. data/lib/chef/mixin/command/windows.rb +1 -5
  160. data/lib/chef/mixin/get_source_from_package.rb +1 -0
  161. data/lib/chef/mixin/params_validate.rb +2 -2
  162. data/lib/chef/mixin/securable.rb +1 -7
  163. data/lib/chef/mixin/shell_out.rb +7 -1
  164. data/lib/chef/mixin/template.rb +2 -14
  165. data/lib/chef/mixin/why_run.rb +1 -1
  166. data/lib/chef/monkey_patches/net_http.rb +4 -0
  167. data/lib/chef/monologger.rb +0 -2
  168. data/lib/chef/node.rb +5 -2
  169. data/lib/chef/node/attribute.rb +11 -9
  170. data/lib/chef/node/attribute_collections.rb +8 -12
  171. data/lib/chef/node/immutable_collections.rb +4 -10
  172. data/lib/chef/org.rb +148 -0
  173. data/lib/chef/platform/provider_mapping.rb +3 -2
  174. data/lib/chef/platform/provider_priority_map.rb +2 -0
  175. data/lib/chef/platform/query_helpers.rb +0 -3
  176. data/lib/chef/policy_builder/policyfile.rb +51 -8
  177. data/lib/chef/provider/deploy.rb +1 -2
  178. data/lib/chef/provider/directory.rb +3 -3
  179. data/lib/chef/provider/dsc_script.rb +13 -7
  180. data/lib/chef/provider/env.rb +8 -8
  181. data/lib/chef/provider/execute.rb +55 -36
  182. data/lib/chef/provider/file.rb +8 -0
  183. data/lib/chef/provider/group.rb +2 -0
  184. data/lib/chef/provider/group/dscl.rb +3 -4
  185. data/lib/chef/provider/ifconfig.rb +25 -25
  186. data/lib/chef/provider/ifconfig/aix.rb +25 -27
  187. data/lib/chef/provider/lwrp_base.rb +1 -1
  188. data/lib/chef/provider/mount.rb +2 -2
  189. data/lib/chef/provider/mount/mount.rb +3 -4
  190. data/lib/chef/provider/mount/solaris.rb +1 -1
  191. data/lib/chef/provider/package.rb +297 -48
  192. data/lib/chef/provider/package/aix.rb +25 -30
  193. data/lib/chef/provider/package/apt.rb +63 -19
  194. data/lib/chef/provider/package/dpkg.rb +15 -16
  195. data/lib/chef/provider/package/macports.rb +7 -7
  196. data/lib/chef/provider/package/openbsd.rb +107 -0
  197. data/lib/chef/provider/package/pacman.rb +13 -15
  198. data/lib/chef/provider/package/portage.rb +3 -4
  199. data/lib/chef/provider/package/rpm.rb +28 -17
  200. data/lib/chef/provider/package/rubygems.rb +9 -9
  201. data/lib/chef/provider/package/solaris.rb +17 -21
  202. data/lib/chef/provider/package/windows/msi.rb +1 -1
  203. data/lib/chef/provider/package/yum-dump.py +2 -2
  204. data/lib/chef/provider/package/yum.rb +117 -51
  205. data/lib/chef/provider/package/zypper.rb +17 -18
  206. data/lib/chef/provider/powershell_script.rb +4 -4
  207. data/lib/chef/provider/registry_key.rb +2 -2
  208. data/lib/chef/provider/remote_directory.rb +1 -1
  209. data/lib/chef/provider/script.rb +25 -16
  210. data/lib/chef/provider/service.rb +1 -1
  211. data/lib/chef/provider/service/freebsd.rb +1 -1
  212. data/lib/chef/provider/service/openbsd.rb +216 -0
  213. data/lib/chef/provider/service/upstart.rb +1 -1
  214. data/lib/chef/provider/service/windows.rb +99 -1
  215. data/lib/chef/provider/user.rb +1 -1
  216. data/lib/chef/provider/user/dscl.rb +19 -4
  217. data/lib/chef/providers.rb +2 -0
  218. data/lib/chef/recipe.rb +11 -5
  219. data/lib/chef/request_id.rb +1 -1
  220. data/lib/chef/resource.rb +839 -444
  221. data/lib/chef/resource/chef_gem.rb +20 -3
  222. data/lib/chef/resource/conditional.rb +3 -14
  223. data/lib/chef/resource/dsc_script.rb +14 -0
  224. data/lib/chef/resource/execute.rb +14 -7
  225. data/lib/chef/resource/file.rb +14 -0
  226. data/lib/chef/resource/file/verification.rb +122 -0
  227. data/lib/chef/resource/ips_package.rb +1 -1
  228. data/lib/chef/resource/lwrp_base.rb +2 -11
  229. data/lib/chef/resource/macports_package.rb +2 -1
  230. data/lib/chef/resource/openbsd_package.rb +51 -0
  231. data/lib/chef/resource/package.rb +2 -2
  232. data/lib/chef/resource/paludis_package.rb +1 -1
  233. data/lib/chef/resource/reboot.rb +1 -1
  234. data/lib/chef/resource/remote_file.rb +1 -0
  235. data/lib/chef/resource/rpm_package.rb +9 -0
  236. data/lib/chef/resource/script.rb +11 -0
  237. data/lib/chef/resource/template.rb +2 -3
  238. data/lib/chef/resource/windows_package.rb +1 -1
  239. data/lib/chef/resource/windows_service.rb +18 -0
  240. data/lib/chef/resource_builder.rb +137 -0
  241. data/lib/chef/resource_definition.rb +1 -1
  242. data/lib/chef/resource_reporter.rb +1 -1
  243. data/lib/chef/resources.rb +1 -0
  244. data/lib/chef/role.rb +17 -4
  245. data/lib/chef/run_context.rb +10 -6
  246. data/lib/chef/search/query.rb +66 -87
  247. data/lib/chef/shell/ext.rb +2 -2
  248. data/lib/chef/util/diff.rb +1 -4
  249. data/lib/chef/util/dsc/configuration_generator.rb +30 -6
  250. data/lib/chef/util/dsc/lcm_output_parser.rb +7 -3
  251. data/lib/chef/util/dsc/local_configuration_manager.rb +8 -8
  252. data/lib/chef/util/file_edit.rb +2 -2
  253. data/lib/chef/util/path_helper.rb +1 -4
  254. data/lib/chef/util/windows/net_use.rb +3 -3
  255. data/lib/chef/version.rb +1 -1
  256. data/lib/chef/win32/api.rb +1 -0
  257. data/lib/chef/win32/api/security.rb +26 -0
  258. data/lib/chef/win32/file.rb +21 -0
  259. data/lib/chef/win32/security.rb +46 -0
  260. data/lib/chef/win32/security/token.rb +8 -0
  261. data/lib/chef/win32/version.rb +0 -4
  262. data/spec/data/recipes.tgz +0 -0
  263. data/spec/functional/application_spec.rb +1 -1
  264. data/spec/functional/audit/rspec_formatter_spec.rb +54 -0
  265. data/spec/functional/audit/runner_spec.rb +137 -0
  266. data/spec/functional/dsl/reboot_pending_spec.rb +10 -10
  267. data/spec/functional/dsl/registry_helper_spec.rb +6 -6
  268. data/spec/functional/event_loggers/windows_eventlog_spec.rb +5 -5
  269. data/spec/functional/file_content_management/deploy_strategies_spec.rb +12 -21
  270. data/spec/functional/http/simple_spec.rb +1 -1
  271. data/spec/functional/knife/cookbook_delete_spec.rb +24 -24
  272. data/spec/functional/knife/exec_spec.rb +2 -4
  273. data/spec/functional/knife/smoke_test.rb +1 -1
  274. data/spec/functional/knife/ssh_spec.rb +23 -23
  275. data/spec/functional/provider/remote_file/cache_control_data_spec.rb +8 -8
  276. data/spec/functional/provider/whyrun_safe_ruby_block_spec.rb +2 -2
  277. data/spec/functional/rebooter_spec.rb +1 -1
  278. data/spec/functional/resource/aix_service_spec.rb +3 -0
  279. data/spec/functional/resource/aixinit_service_spec.rb +3 -3
  280. data/spec/functional/resource/bash_spec.rb +88 -0
  281. data/spec/functional/resource/deploy_revision_spec.rb +99 -100
  282. data/spec/functional/resource/env_spec.rb +3 -3
  283. data/spec/functional/resource/execute_spec.rb +97 -63
  284. data/spec/functional/resource/file_spec.rb +7 -7
  285. data/spec/functional/resource/git_spec.rb +13 -13
  286. data/spec/functional/resource/group_spec.rb +28 -25
  287. data/spec/functional/resource/ifconfig_spec.rb +2 -2
  288. data/spec/functional/resource/link_spec.rb +77 -78
  289. data/spec/functional/resource/mount_spec.rb +5 -5
  290. data/spec/functional/resource/ohai_spec.rb +1 -1
  291. data/spec/functional/resource/package_spec.rb +22 -22
  292. data/spec/functional/resource/powershell_spec.rb +57 -42
  293. data/spec/functional/resource/reboot_spec.rb +2 -2
  294. data/spec/functional/resource/registry_spec.rb +91 -91
  295. data/spec/functional/resource/remote_directory_spec.rb +19 -19
  296. data/spec/functional/resource/remote_file_spec.rb +18 -18
  297. data/spec/functional/resource/template_spec.rb +4 -4
  298. data/spec/functional/resource/user/dscl_spec.rb +4 -4
  299. data/spec/functional/resource/user/useradd_spec.rb +64 -51
  300. data/spec/functional/resource/windows_service_spec.rb +98 -0
  301. data/spec/functional/run_lock_spec.rb +9 -9
  302. data/spec/functional/shell_spec.rb +3 -3
  303. data/spec/functional/tiny_server_spec.rb +12 -12
  304. data/spec/functional/util/path_helper_spec.rb +1 -1
  305. data/spec/functional/version_spec.rb +1 -1
  306. data/spec/functional/win32/registry_helper_spec.rb +125 -125
  307. data/spec/functional/win32/security_spec.rb +65 -2
  308. data/spec/functional/win32/service_manager_spec.rb +30 -84
  309. data/spec/functional/win32/versions_spec.rb +6 -6
  310. data/spec/integration/client/client_spec.rb +102 -9
  311. data/spec/integration/knife/chef_fs_data_store_spec.rb +12 -8
  312. data/spec/integration/knife/common_options_spec.rb +3 -3
  313. data/spec/integration/knife/cookbook_api_ipv6_spec.rb +2 -2
  314. data/spec/integration/knife/deps_spec.rb +4 -4
  315. data/spec/integration/knife/diff_spec.rb +6 -6
  316. data/spec/integration/knife/download_spec.rb +6 -6
  317. data/spec/integration/knife/list_spec.rb +2 -2
  318. data/spec/integration/knife/raw_spec.rb +5 -5
  319. data/spec/integration/knife/serve_spec.rb +3 -3
  320. data/spec/integration/knife/show_spec.rb +3 -3
  321. data/spec/integration/knife/upload_spec.rb +18 -18
  322. data/spec/integration/recipes/lwrp_inline_resources_spec.rb +1 -1
  323. data/spec/integration/solo/solo_spec.rb +11 -12
  324. data/spec/spec_helper.rb +27 -15
  325. data/spec/stress/win32/file_spec.rb +4 -4
  326. data/spec/stress/win32/security_spec.rb +4 -4
  327. data/spec/support/chef_helpers.rb +3 -3
  328. data/spec/support/matchers/leak.rb +2 -2
  329. data/spec/support/mock/platform.rb +1 -1
  330. data/spec/support/pedant/Gemfile +3 -0
  331. data/spec/support/pedant/pedant_config.rb +9 -2
  332. data/spec/support/pedant/run_pedant.rb +15 -16
  333. data/spec/support/platform_helpers.rb +8 -12
  334. data/spec/support/shared/functional/directory_resource.rb +13 -13
  335. data/spec/support/shared/functional/file_resource.rb +83 -83
  336. data/spec/support/shared/functional/http.rb +1 -1
  337. data/spec/support/shared/functional/securable_resource.rb +64 -64
  338. data/spec/support/shared/functional/securable_resource_with_reporting.rb +43 -41
  339. data/spec/support/shared/functional/win32_service.rb +60 -0
  340. data/spec/support/shared/functional/windows_script.rb +8 -8
  341. data/spec/support/shared/integration/knife_support.rb +8 -5
  342. data/spec/support/shared/matchers/exit_with_code.rb +6 -2
  343. data/spec/support/shared/unit/api_error_inspector.rb +8 -8
  344. data/spec/support/shared/unit/execute_resource.rb +24 -20
  345. data/spec/support/shared/unit/file_system_support.rb +2 -2
  346. data/spec/support/shared/unit/platform_introspector.rb +21 -21
  347. data/spec/support/shared/unit/provider/file.rb +239 -210
  348. data/spec/support/shared/unit/provider/useradd_based_user_provider.rb +69 -69
  349. data/spec/support/shared/unit/script_resource.rb +40 -32
  350. data/spec/support/shared/unit/windows_script_resource.rb +8 -8
  351. data/spec/unit/api_client/registration_spec.rb +47 -47
  352. data/spec/unit/api_client_spec.rb +107 -69
  353. data/spec/unit/application/apply_spec.rb +31 -15
  354. data/spec/unit/application/client_spec.rb +146 -45
  355. data/spec/unit/application/knife_spec.rb +31 -31
  356. data/spec/unit/application/solo_spec.rb +59 -43
  357. data/spec/unit/application_spec.rb +109 -74
  358. data/spec/unit/audit/audit_event_proxy_spec.rb +311 -0
  359. data/spec/unit/audit/audit_reporter_spec.rb +393 -0
  360. data/spec/unit/audit/control_group_data_spec.rb +478 -0
  361. data/{lib/chef/monkey_patches/file.rb → spec/unit/audit/rspec_formatter_spec.rb} +11 -8
  362. data/spec/unit/audit/runner_spec.rb +135 -0
  363. data/spec/unit/chef_fs/config_spec.rb +52 -0
  364. data/spec/unit/chef_fs/diff_spec.rb +12 -12
  365. data/spec/unit/chef_fs/file_pattern_spec.rb +276 -277
  366. data/spec/unit/chef_fs/file_system/operation_failed_error_spec.rb +6 -6
  367. data/spec/unit/chef_fs/file_system_spec.rb +26 -13
  368. data/spec/unit/chef_fs/parallelizer.rb +87 -87
  369. data/spec/unit/chef_spec.rb +1 -1
  370. data/spec/unit/client_spec.rb +263 -97
  371. data/spec/unit/config_fetcher_spec.rb +13 -13
  372. data/spec/unit/config_spec.rb +105 -66
  373. data/spec/unit/cookbook/chefignore_spec.rb +6 -6
  374. data/spec/unit/cookbook/cookbook_version_loader_spec.rb +3 -3
  375. data/spec/unit/cookbook/metadata_spec.rb +149 -149
  376. data/spec/unit/cookbook/syntax_check_spec.rb +36 -31
  377. data/spec/unit/cookbook_loader_spec.rb +62 -58
  378. data/spec/unit/cookbook_manifest_spec.rb +141 -468
  379. data/spec/unit/cookbook_site_streaming_uploader_spec.rb +27 -27
  380. data/spec/unit/cookbook_spec.rb +15 -15
  381. data/spec/unit/cookbook_uploader_spec.rb +37 -3
  382. data/spec/unit/cookbook_version_file_specificity_spec.rb +554 -0
  383. data/spec/unit/cookbook_version_spec.rb +98 -240
  384. data/spec/unit/daemon_spec.rb +31 -31
  385. data/spec/unit/data_bag_item_spec.rb +121 -89
  386. data/spec/unit/data_bag_spec.rb +35 -35
  387. data/spec/unit/deprecation_spec.rb +27 -14
  388. data/spec/unit/digester_spec.rb +3 -3
  389. data/spec/unit/dsl/audit_spec.rb +43 -0
  390. data/spec/unit/dsl/data_query_spec.rb +1 -1
  391. data/spec/unit/dsl/platform_introspection_spec.rb +14 -14
  392. data/spec/unit/dsl/reboot_pending_spec.rb +18 -18
  393. data/spec/unit/dsl/regsitry_helper_spec.rb +6 -6
  394. data/spec/unit/encrypted_data_bag_item_spec.rb +58 -82
  395. data/spec/unit/environment_spec.rb +105 -105
  396. data/spec/unit/exceptions_spec.rb +47 -1
  397. data/spec/unit/file_access_control_spec.rb +62 -56
  398. data/spec/unit/file_cache_spec.rb +11 -11
  399. data/spec/unit/file_content_management/deploy/cp_spec.rb +2 -2
  400. data/spec/unit/file_content_management/deploy/mv_unix_spec.rb +10 -10
  401. data/spec/unit/file_content_management/deploy/mv_windows_spec.rb +23 -23
  402. data/spec/unit/formatters/error_inspectors/compile_error_inspector_spec.rb +14 -14
  403. data/spec/unit/formatters/error_inspectors/cookbook_resolve_error_inspector_spec.rb +12 -12
  404. data/spec/unit/formatters/error_inspectors/cookbook_sync_error_inspector_spec.rb +1 -1
  405. data/spec/unit/formatters/error_inspectors/resource_failure_inspector_spec.rb +16 -16
  406. data/spec/unit/formatters/error_inspectors/run_list_expansion_error_inspector_spec.rb +4 -4
  407. data/spec/unit/guard_interpreter/resource_guard_interpreter_spec.rb +103 -13
  408. data/spec/unit/guard_interpreter_spec.rb +41 -0
  409. data/spec/unit/handler/json_file_spec.rb +10 -10
  410. data/spec/unit/handler_spec.rb +39 -39
  411. data/spec/unit/http/basic_client_spec.rb +3 -3
  412. data/spec/unit/http/http_request_spec.rb +10 -10
  413. data/spec/unit/http/simple_spec.rb +3 -3
  414. data/spec/unit/http/ssl_policies_spec.rb +15 -15
  415. data/spec/unit/http/validate_content_length_spec.rb +18 -13
  416. data/spec/unit/http_spec.rb +16 -9
  417. data/spec/unit/knife/bootstrap/chef_vault_handler_spec.rb +153 -0
  418. data/spec/unit/knife/bootstrap/client_builder_spec.rb +178 -0
  419. data/spec/unit/knife/bootstrap_spec.rb +144 -91
  420. data/spec/unit/knife/client_bulk_delete_spec.rb +24 -24
  421. data/spec/unit/knife/client_create_spec.rb +57 -43
  422. data/spec/unit/knife/client_delete_spec.rb +15 -15
  423. data/spec/unit/knife/client_edit_spec.rb +4 -4
  424. data/spec/unit/knife/client_list_spec.rb +2 -2
  425. data/spec/unit/knife/client_reregister_spec.rb +9 -9
  426. data/spec/unit/knife/configure_client_spec.rb +20 -20
  427. data/spec/unit/knife/configure_spec.rb +85 -85
  428. data/spec/unit/knife/cookbook_bulk_delete_spec.rb +15 -15
  429. data/spec/unit/knife/cookbook_create_spec.rb +59 -59
  430. data/spec/unit/knife/cookbook_delete_spec.rb +49 -49
  431. data/spec/unit/knife/cookbook_download_spec.rb +56 -56
  432. data/spec/unit/knife/cookbook_list_spec.rb +9 -9
  433. data/spec/unit/knife/cookbook_metadata_from_file_spec.rb +8 -8
  434. data/spec/unit/knife/cookbook_metadata_spec.rb +44 -44
  435. data/spec/unit/knife/cookbook_show_spec.rb +29 -29
  436. data/spec/unit/knife/cookbook_site_download_spec.rb +26 -26
  437. data/spec/unit/knife/cookbook_site_install_spec.rb +5 -1
  438. data/spec/unit/knife/cookbook_site_share_spec.rb +68 -59
  439. data/spec/unit/knife/cookbook_site_unshare_spec.rb +15 -15
  440. data/spec/unit/knife/cookbook_test_spec.rb +16 -16
  441. data/spec/unit/knife/cookbook_upload_spec.rb +105 -71
  442. data/spec/unit/knife/core/bootstrap_context_spec.rb +37 -22
  443. data/spec/unit/knife/core/cookbook_scm_repo_spec.rb +36 -36
  444. data/spec/unit/knife/core/object_loader_spec.rb +3 -3
  445. data/spec/unit/knife/core/subcommand_loader_spec.rb +107 -33
  446. data/spec/unit/knife/core/ui_spec.rb +84 -72
  447. data/spec/unit/knife/data_bag_from_file_spec.rb +1 -1
  448. data/spec/unit/knife/environment_compare_spec.rb +12 -12
  449. data/spec/unit/knife/environment_create_spec.rb +16 -16
  450. data/spec/unit/knife/environment_delete_spec.rb +14 -14
  451. data/spec/unit/knife/environment_edit_spec.rb +15 -15
  452. data/spec/unit/knife/environment_from_file_spec.rb +17 -17
  453. data/spec/unit/knife/environment_list_spec.rb +7 -7
  454. data/spec/unit/knife/environment_show_spec.rb +10 -10
  455. data/spec/unit/knife/index_rebuild_spec.rb +17 -17
  456. data/spec/unit/knife/knife_help.rb +24 -24
  457. data/spec/unit/knife/node_bulk_delete_spec.rb +14 -14
  458. data/spec/unit/knife/node_delete_spec.rb +11 -11
  459. data/spec/unit/knife/node_edit_spec.rb +17 -17
  460. data/spec/unit/knife/node_environment_set_spec.rb +12 -12
  461. data/spec/unit/knife/node_from_file_spec.rb +8 -8
  462. data/spec/unit/knife/node_list_spec.rb +9 -9
  463. data/spec/unit/knife/node_run_list_add_spec.rb +29 -29
  464. data/spec/unit/knife/node_run_list_remove_spec.rb +28 -13
  465. data/spec/unit/knife/node_run_list_set_spec.rb +27 -27
  466. data/spec/unit/knife/raw_spec.rb +43 -0
  467. data/spec/unit/knife/role_bulk_delete_spec.rb +12 -12
  468. data/spec/unit/knife/role_create_spec.rb +12 -12
  469. data/spec/unit/knife/role_delete_spec.rb +10 -10
  470. data/spec/unit/knife/role_edit_spec.rb +13 -13
  471. data/spec/unit/knife/role_env_run_list_add_spec.rb +217 -0
  472. data/spec/unit/knife/role_env_run_list_clear_spec.rb +100 -0
  473. data/spec/unit/knife/role_env_run_list_remove_spec.rb +108 -0
  474. data/spec/unit/knife/role_env_run_list_replace_spec.rb +108 -0
  475. data/spec/unit/knife/role_env_run_list_set_spec.rb +102 -0
  476. data/spec/unit/knife/role_from_file_spec.rb +10 -10
  477. data/spec/unit/knife/role_list_spec.rb +7 -7
  478. data/spec/unit/knife/role_run_list_add_spec.rb +179 -0
  479. data/spec/unit/knife/role_run_list_clear_spec.rb +90 -0
  480. data/spec/unit/knife/role_run_list_remove_spec.rb +98 -0
  481. data/spec/unit/knife/role_run_list_replace_spec.rb +101 -0
  482. data/spec/unit/knife/role_run_list_set_spec.rb +92 -0
  483. data/spec/unit/knife/ssh_spec.rb +66 -66
  484. data/spec/unit/knife/ssl_check_spec.rb +27 -27
  485. data/spec/unit/knife/ssl_fetch_spec.rb +45 -12
  486. data/spec/unit/knife/status_spec.rb +5 -5
  487. data/spec/unit/knife/tag_create_spec.rb +5 -5
  488. data/spec/unit/knife/tag_delete_spec.rb +6 -6
  489. data/spec/unit/knife/tag_list_spec.rb +4 -4
  490. data/spec/unit/knife/user_create_spec.rb +18 -18
  491. data/spec/unit/knife/user_delete_spec.rb +4 -4
  492. data/spec/unit/knife/user_edit_spec.rb +7 -7
  493. data/spec/unit/knife/user_list_spec.rb +2 -2
  494. data/spec/unit/knife/user_reregister_spec.rb +10 -10
  495. data/spec/unit/knife/user_show_spec.rb +5 -5
  496. data/spec/unit/knife_spec.rb +36 -36
  497. data/spec/unit/lwrp_spec.rb +63 -39
  498. data/spec/unit/mash_spec.rb +6 -6
  499. data/spec/unit/mixin/checksum_spec.rb +2 -2
  500. data/spec/unit/mixin/command_spec.rb +13 -13
  501. data/spec/unit/mixin/convert_to_class_name_spec.rb +6 -6
  502. data/spec/unit/mixin/deep_merge_spec.rb +49 -49
  503. data/spec/unit/mixin/deprecation_spec.rb +5 -5
  504. data/spec/unit/mixin/enforce_ownership_and_permissions_spec.rb +14 -14
  505. data/spec/unit/mixin/homebrew_user_spec.rb +3 -3
  506. data/spec/unit/mixin/params_validate_spec.rb +71 -71
  507. data/spec/unit/mixin/path_sanity_spec.rb +14 -14
  508. data/spec/unit/mixin/securable_spec.rb +177 -177
  509. data/spec/unit/mixin/shell_out_spec.rb +56 -27
  510. data/spec/unit/mixin/template_spec.rb +31 -31
  511. data/spec/unit/mixin/windows_architecture_helper_spec.rb +5 -5
  512. data/spec/unit/mixin/xml_escape_spec.rb +7 -7
  513. data/spec/unit/monkey_patches/uri_spec.rb +1 -1
  514. data/spec/unit/monologger_spec.rb +3 -3
  515. data/spec/unit/node/attribute_spec.rb +185 -136
  516. data/spec/unit/node/immutable_collections_spec.rb +22 -22
  517. data/spec/unit/node_spec.rb +210 -179
  518. data/spec/unit/org_spec.rb +196 -0
  519. data/spec/unit/platform/query_helpers_spec.rb +5 -5
  520. data/spec/unit/platform_spec.rb +46 -46
  521. data/spec/unit/policy_builder/expand_node_object_spec.rb +17 -18
  522. data/spec/unit/policy_builder/policyfile_spec.rb +159 -71
  523. data/spec/unit/provider/directory_spec.rb +5 -5
  524. data/spec/unit/provider/dsc_script_spec.rb +6 -6
  525. data/spec/unit/provider/env_spec.rb +27 -14
  526. data/spec/unit/provider/execute_spec.rb +139 -68
  527. data/spec/unit/provider/file/content_spec.rb +8 -8
  528. data/spec/unit/provider/git_spec.rb +10 -5
  529. data/spec/unit/provider/group/dscl_spec.rb +8 -11
  530. data/spec/unit/provider/group_spec.rb +13 -13
  531. data/spec/unit/provider/ifconfig/aix_spec.rb +3 -2
  532. data/spec/unit/provider/ifconfig/debian_spec.rb +19 -19
  533. data/spec/unit/provider/ifconfig_spec.rb +2 -2
  534. data/spec/unit/provider/mdadm_spec.rb +2 -2
  535. data/spec/unit/provider/mount/aix_spec.rb +5 -5
  536. data/spec/unit/provider/mount/mount_spec.rb +22 -22
  537. data/spec/unit/provider/mount/solaris_spec.rb +20 -20
  538. data/spec/unit/provider/package/aix_spec.rb +23 -22
  539. data/spec/unit/provider/package/apt_spec.rb +23 -4
  540. data/spec/unit/provider/package/dpkg_spec.rb +14 -15
  541. data/spec/unit/provider/package/freebsd/pkgng_spec.rb +1 -1
  542. data/spec/unit/provider/package/freebsd/port_spec.rb +1 -1
  543. data/spec/unit/provider/package/ips_spec.rb +1 -2
  544. data/spec/unit/provider/package/macports_spec.rb +14 -14
  545. data/spec/unit/provider/package/openbsd_spec.rb +66 -0
  546. data/spec/unit/provider/package/pacman_spec.rb +15 -14
  547. data/spec/unit/provider/package/portage_spec.rb +11 -11
  548. data/spec/unit/provider/package/rpm_spec.rb +132 -84
  549. data/spec/unit/provider/package/rubygems_spec.rb +54 -25
  550. data/spec/unit/provider/package/solaris_spec.rb +22 -25
  551. data/spec/unit/provider/package/yum_spec.rb +237 -36
  552. data/spec/unit/provider/package/zypper_spec.rb +9 -12
  553. data/spec/unit/provider/package_spec.rb +276 -2
  554. data/spec/unit/provider/package_spec.rbe +0 -0
  555. data/spec/unit/provider/remote_directory_spec.rb +25 -25
  556. data/spec/unit/provider/remote_file/ftp_spec.rb +3 -3
  557. data/spec/unit/provider/route_spec.rb +3 -3
  558. data/spec/unit/provider/script_spec.rb +61 -43
  559. data/spec/unit/provider/service/aix_service_spec.rb +5 -5
  560. data/spec/unit/provider/service/arch_service_spec.rb +5 -5
  561. data/spec/unit/provider/service/debian_service_spec.rb +8 -8
  562. data/spec/unit/provider/service/freebsd_service_spec.rb +16 -2
  563. data/spec/unit/provider/service/gentoo_service_spec.rb +8 -8
  564. data/spec/unit/provider/service/init_service_spec.rb +5 -5
  565. data/spec/unit/provider/service/insserv_service_spec.rb +2 -2
  566. data/spec/unit/provider/service/invokercd_service_spec.rb +5 -5
  567. data/spec/unit/provider/service/macosx_spec.rb +7 -7
  568. data/spec/unit/provider/service/openbsd_service_spec.rb +543 -0
  569. data/spec/unit/provider/service/redhat_spec.rb +4 -4
  570. data/spec/unit/provider/service/simple_service_spec.rb +2 -2
  571. data/spec/unit/provider/service/solaris_smf_service_spec.rb +14 -14
  572. data/spec/unit/provider/service/systemd_service_spec.rb +15 -7
  573. data/spec/unit/provider/service/upstart_service_spec.rb +4 -4
  574. data/spec/unit/provider/service/windows_spec.rb +119 -25
  575. data/spec/unit/provider/service_spec.rb +1 -1
  576. data/spec/unit/provider/user/dscl_spec.rb +38 -30
  577. data/spec/unit/provider/user_spec.rb +1 -1
  578. data/spec/unit/provider_resolver_spec.rb +7 -7
  579. data/spec/unit/provider_spec.rb +23 -23
  580. data/spec/unit/recipe_spec.rb +194 -83
  581. data/spec/unit/registry_helper_spec.rb +143 -143
  582. data/spec/unit/resource/chef_gem_spec.rb +117 -3
  583. data/spec/unit/resource/conditional_action_not_nothing_spec.rb +2 -2
  584. data/spec/unit/resource/conditional_spec.rb +56 -15
  585. data/spec/unit/resource/deploy_spec.rb +2 -2
  586. data/spec/unit/resource/dsc_script_spec.rb +32 -0
  587. data/spec/unit/resource/execute_spec.rb +4 -0
  588. data/spec/unit/resource/file/verification_spec.rb +111 -0
  589. data/spec/unit/resource/file_spec.rb +14 -0
  590. data/spec/unit/resource/openbsd_package_spec.rb +49 -0
  591. data/spec/unit/resource/remote_file_spec.rb +12 -12
  592. data/spec/unit/resource/resource_notification_spec.rb +18 -18
  593. data/spec/unit/resource/rpm_package_spec.rb +12 -0
  594. data/spec/unit/resource/scm_spec.rb +4 -4
  595. data/spec/unit/resource/script_spec.rb +3 -5
  596. data/spec/unit/resource/subversion_spec.rb +1 -1
  597. data/spec/unit/resource_builder_spec.rb +1 -0
  598. data/spec/unit/resource_collection/resource_list_spec.rb +2 -2
  599. data/spec/unit/resource_collection/resource_set_spec.rb +3 -3
  600. data/spec/unit/resource_collection/stepable_iterator_spec.rb +24 -24
  601. data/spec/unit/resource_collection_spec.rb +52 -52
  602. data/spec/unit/resource_definition_spec.rb +1 -1
  603. data/spec/unit/resource_reporter_spec.rb +118 -118
  604. data/spec/unit/resource_spec.rb +131 -125
  605. data/spec/unit/rest/auth_credentials_spec.rb +73 -73
  606. data/spec/unit/rest_spec.rb +12 -12
  607. data/spec/unit/role_spec.rb +85 -84
  608. data/spec/unit/run_context/cookbook_compiler_spec.rb +18 -18
  609. data/spec/unit/run_context_spec.rb +39 -68
  610. data/spec/unit/run_list/run_list_expansion_spec.rb +21 -21
  611. data/spec/unit/run_list/run_list_item_spec.rb +28 -28
  612. data/spec/unit/run_list/versioned_recipe_list_spec.rb +14 -14
  613. data/spec/unit/run_list_spec.rb +55 -55
  614. data/spec/unit/run_lock_spec.rb +14 -14
  615. data/spec/unit/run_status_spec.rb +24 -24
  616. data/spec/unit/scan_access_control_spec.rb +23 -23
  617. data/spec/unit/search/query_spec.rb +54 -66
  618. data/spec/unit/shell/model_wrapper_spec.rb +13 -13
  619. data/spec/unit/shell/shell_ext_spec.rb +32 -32
  620. data/spec/unit/shell/shell_session_spec.rb +24 -24
  621. data/spec/unit/shell_out_spec.rb +4 -4
  622. data/spec/unit/shell_spec.rb +27 -27
  623. data/spec/unit/user_spec.rb +50 -50
  624. data/spec/unit/util/backup_spec.rb +32 -32
  625. data/spec/unit/util/diff_spec.rb +31 -31
  626. data/spec/unit/util/dsc/configuration_generator_spec.rb +38 -16
  627. data/spec/unit/util/dsc/lcm_output_parser_spec.rb +21 -26
  628. data/spec/unit/util/dsc/local_configuration_manager_spec.rb +10 -10
  629. data/spec/unit/util/editor_spec.rb +10 -10
  630. data/spec/unit/util/file_edit_spec.rb +10 -10
  631. data/spec/unit/util/path_helper_spec.rb +38 -46
  632. data/spec/unit/util/powershell/cmdlet_spec.rb +9 -9
  633. data/spec/unit/util/selinux_spec.rb +30 -30
  634. data/spec/unit/util/threaded_job_queue_spec.rb +6 -6
  635. data/spec/unit/version/platform_spec.rb +5 -5
  636. data/spec/unit/version_class_spec.rb +15 -15
  637. data/spec/unit/version_constraint/platform_spec.rb +7 -7
  638. data/spec/unit/version_constraint_spec.rb +43 -43
  639. data/spec/unit/windows_service_spec.rb +15 -15
  640. data/spec/unit/workstation_config_loader_spec.rb +2 -2
  641. data/tasks/rspec.rb +16 -18
  642. metadata +126 -53
  643. data/bin/chef-service-manager +0 -37
  644. data/bin/chef-windows-service +0 -35
  645. data/bin/shef +0 -35
  646. data/lib/chef/application/agent.rb +0 -18
  647. data/lib/chef/monkey_patches/fileutils.rb +0 -65
  648. data/lib/chef/monkey_patches/numeric.rb +0 -15
  649. data/lib/chef/monkey_patches/object.rb +0 -9
  650. data/lib/chef/monkey_patches/pathname.rb +0 -32
  651. data/lib/chef/monkey_patches/regexp.rb +0 -34
  652. data/lib/chef/monkey_patches/securerandom.rb +0 -44
  653. data/lib/chef/monkey_patches/string.rb +0 -49
  654. data/lib/chef/monkey_patches/tempfile.rb +0 -64
  655. data/lib/chef/monkey_patches/uri.rb +0 -70
@@ -29,39 +29,39 @@ describe Chef::ResourceCollection do
29
29
 
30
30
  describe "initialize" do
31
31
  it "should return a Chef::ResourceCollection" do
32
- rc.should be_kind_of(Chef::ResourceCollection)
32
+ expect(rc).to be_kind_of(Chef::ResourceCollection)
33
33
  end
34
34
  end
35
35
 
36
36
  describe "[]" do
37
37
  it "should accept Chef::Resources through [index]" do
38
- lambda { rc[0] = resource }.should_not raise_error
39
- lambda { rc[0] = "string" }.should raise_error(ArgumentError)
38
+ expect { rc[0] = resource }.not_to raise_error
39
+ expect { rc[0] = "string" }.to raise_error(ArgumentError)
40
40
  end
41
41
 
42
42
  it "should allow you to fetch Chef::Resources by position" do
43
43
  rc[0] = resource
44
- rc[0].should eql(resource)
44
+ expect(rc[0]).to eql(resource)
45
45
  end
46
46
  end
47
47
 
48
48
  describe "push" do
49
49
  it "should accept Chef::Resources through pushing" do
50
- lambda { rc.push(resource) }.should_not raise_error
51
- lambda { rc.push("string") }.should raise_error(ArgumentError)
50
+ expect { rc.push(resource) }.not_to raise_error
51
+ expect { rc.push("string") }.to raise_error(ArgumentError)
52
52
  end
53
53
  end
54
54
 
55
55
  describe "<<" do
56
56
  it "should accept the << operator" do
57
- lambda { rc << resource }.should_not raise_error
57
+ expect { rc << resource }.not_to raise_error
58
58
  end
59
59
  end
60
60
 
61
61
  describe "insert" do
62
62
  it "should accept only Chef::Resources" do
63
- lambda { rc.insert(resource) }.should_not raise_error
64
- lambda { rc.insert("string") }.should raise_error(ArgumentError)
63
+ expect { rc.insert(resource) }.not_to raise_error
64
+ expect { rc.insert("string") }.to raise_error(ArgumentError)
65
65
  end
66
66
 
67
67
  it "should accept named arguments in any order" do
@@ -73,8 +73,8 @@ describe Chef::ResourceCollection do
73
73
  zmr = Chef::Resource::ZenMaster.new("there is no spoon")
74
74
  rc.insert(resource)
75
75
  rc.insert(zmr)
76
- rc[0].should eql(resource)
77
- rc[1].should eql(zmr)
76
+ expect(rc[0]).to eql(resource)
77
+ expect(rc[1]).to eql(zmr)
78
78
  end
79
79
 
80
80
  it "should insert resources to the middle of the collection if called while executing a run" do
@@ -88,9 +88,9 @@ describe Chef::ResourceCollection do
88
88
  rc.insert(resource_to_inject) if resource == zmr
89
89
  end
90
90
 
91
- rc[0].should eql(zmr)
92
- rc[1].should eql(resource_to_inject)
93
- rc[2].should eql(dummy)
91
+ expect(rc[0]).to eql(zmr)
92
+ expect(rc[1]).to eql(resource_to_inject)
93
+ expect(rc[2]).to eql(dummy)
94
94
  end
95
95
  end
96
96
 
@@ -98,19 +98,19 @@ describe Chef::ResourceCollection do
98
98
  it "should allow you to iterate over every resource in the collection" do
99
99
  load_up_resources
100
100
  results = Array.new
101
- lambda {
101
+ expect {
102
102
  rc.each do |r|
103
103
  results << r.name
104
104
  end
105
- }.should_not raise_error
105
+ }.not_to raise_error
106
106
  results.each_index do |i|
107
107
  case i
108
108
  when 0
109
- results[i].should eql("dog")
109
+ expect(results[i]).to eql("dog")
110
110
  when 1
111
- results[i].should eql("cat")
111
+ expect(results[i]).to eql("cat")
112
112
  when 2
113
- results[i].should eql("monkey")
113
+ expect(results[i]).to eql("monkey")
114
114
  end
115
115
  end
116
116
  end
@@ -120,19 +120,19 @@ describe Chef::ResourceCollection do
120
120
  it "should allow you to iterate over every resource by index" do
121
121
  load_up_resources
122
122
  results = Array.new
123
- lambda {
123
+ expect {
124
124
  rc.each_index do |i|
125
125
  results << rc[i].name
126
126
  end
127
- }.should_not raise_error
127
+ }.not_to raise_error
128
128
  results.each_index do |i|
129
129
  case i
130
130
  when 0
131
- results[i].should eql("dog")
131
+ expect(results[i]).to eql("dog")
132
132
  when 1
133
- results[i].should eql("cat")
133
+ expect(results[i]).to eql("cat")
134
134
  when 2
135
- results[i].should eql("monkey")
135
+ expect(results[i]).to eql("monkey")
136
136
  end
137
137
  end
138
138
  end
@@ -142,23 +142,23 @@ describe Chef::ResourceCollection do
142
142
  it "should allow you to find resources by name via lookup" do
143
143
  zmr = Chef::Resource::ZenMaster.new("dog")
144
144
  rc << zmr
145
- rc.lookup(zmr.to_s).should eql(zmr)
145
+ expect(rc.lookup(zmr.to_s)).to eql(zmr)
146
146
 
147
147
  zmr = Chef::Resource::ZenMaster.new("cat")
148
148
  rc[0] = zmr
149
- rc.lookup(zmr).should eql(zmr)
149
+ expect(rc.lookup(zmr)).to eql(zmr)
150
150
 
151
151
  zmr = Chef::Resource::ZenMaster.new("monkey")
152
152
  rc.push(zmr)
153
- rc.lookup(zmr).should eql(zmr)
153
+ expect(rc.lookup(zmr)).to eql(zmr)
154
154
  end
155
155
 
156
156
  it "should raise an exception if you send something strange to lookup" do
157
- lambda { rc.lookup(:symbol) }.should raise_error(ArgumentError)
157
+ expect { rc.lookup(:symbol) }.to raise_error(ArgumentError)
158
158
  end
159
159
 
160
160
  it "should raise an exception if it cannot find a resource with lookup" do
161
- lambda { rc.lookup("zen_master[dog]") }.should raise_error(Chef::Exceptions::ResourceNotFound)
161
+ expect { rc.lookup("zen_master[dog]") }.to raise_error(Chef::Exceptions::ResourceNotFound)
162
162
  end
163
163
  end
164
164
 
@@ -166,81 +166,81 @@ describe Chef::ResourceCollection do
166
166
 
167
167
  it "should find a resource by symbol and name (:zen_master => monkey)" do
168
168
  load_up_resources
169
- rc.resources(:zen_master => "monkey").name.should eql("monkey")
169
+ expect(rc.resources(:zen_master => "monkey").name).to eql("monkey")
170
170
  end
171
171
 
172
172
  it "should find a resource by symbol and array of names (:zen_master => [a,b])" do
173
173
  load_up_resources
174
174
  results = rc.resources(:zen_master => [ "monkey", "dog" ])
175
- results.length.should eql(2)
175
+ expect(results.length).to eql(2)
176
176
  check_by_names(results, "monkey", "dog")
177
177
  end
178
178
 
179
179
  it "should find resources of multiple kinds (:zen_master => a, :file => b)" do
180
180
  load_up_resources
181
181
  results = rc.resources(:zen_master => "monkey", :file => "something")
182
- results.length.should eql(2)
182
+ expect(results.length).to eql(2)
183
183
  check_by_names(results, "monkey", "something")
184
184
  end
185
185
 
186
186
  it "should find a resource by string zen_master[a]" do
187
187
  load_up_resources
188
- rc.resources("zen_master[monkey]").name.should eql("monkey")
188
+ expect(rc.resources("zen_master[monkey]").name).to eql("monkey")
189
189
  end
190
190
 
191
191
  it "should find resources by strings of zen_master[a,b]" do
192
192
  load_up_resources
193
193
  results = rc.resources("zen_master[monkey,dog]")
194
- results.length.should eql(2)
194
+ expect(results.length).to eql(2)
195
195
  check_by_names(results, "monkey", "dog")
196
196
  end
197
197
 
198
198
  it "should find resources of multiple types by strings of zen_master[a]" do
199
199
  load_up_resources
200
200
  results = rc.resources("zen_master[monkey]", "file[something]")
201
- results.length.should eql(2)
201
+ expect(results.length).to eql(2)
202
202
  check_by_names(results, "monkey", "something")
203
203
  end
204
204
 
205
205
  it "should raise an exception if you pass a bad name to resources" do
206
- lambda { rc.resources("michael jackson") }.should raise_error(ArgumentError)
206
+ expect { rc.resources("michael jackson") }.to raise_error(ArgumentError)
207
207
  end
208
208
 
209
209
  it "should raise an exception if you pass something other than a string or hash to resource" do
210
- lambda { rc.resources([Array.new]) }.should raise_error(ArgumentError)
210
+ expect { rc.resources([Array.new]) }.to raise_error(ArgumentError)
211
211
  end
212
212
 
213
213
  it "raises an error when attempting to find a resource that does not exist" do
214
- lambda {rc.find("script[nonesuch]")}.should raise_error(Chef::Exceptions::ResourceNotFound)
214
+ expect {rc.find("script[nonesuch]")}.to raise_error(Chef::Exceptions::ResourceNotFound)
215
215
  end
216
216
 
217
217
  end
218
218
 
219
219
  describe "when validating a resource query object" do
220
220
  it "accepts a string of the form 'resource_type[resource_name]'" do
221
- rc.validate_lookup_spec!("resource_type[resource_name]").should be_true
221
+ expect(rc.validate_lookup_spec!("resource_type[resource_name]")).to be_truthy
222
222
  end
223
223
 
224
224
  it "accepts a single-element :resource_type => 'resource_name' Hash" do
225
- rc.validate_lookup_spec!(:service => "apache2").should be_true
225
+ expect(rc.validate_lookup_spec!(:service => "apache2")).to be_truthy
226
226
  end
227
227
 
228
228
 
229
229
  it "accepts a chef resource object" do
230
230
  res = Chef::Resource.new("foo", nil)
231
- rc.validate_lookup_spec!(res).should be_true
231
+ expect(rc.validate_lookup_spec!(res)).to be_truthy
232
232
  end
233
233
 
234
234
  it "rejects a malformed query string" do
235
- lambda do
235
+ expect do
236
236
  rc.validate_lookup_spec!("resource_type[missing-end-bracket")
237
- end.should raise_error(Chef::Exceptions::InvalidResourceSpecification)
237
+ end.to raise_error(Chef::Exceptions::InvalidResourceSpecification)
238
238
  end
239
239
 
240
240
  it "rejects an argument that is not a String, Hash, or Chef::Resource" do
241
- lambda do
241
+ expect do
242
242
  rc.validate_lookup_spec!(Object.new)
243
- end.should raise_error(Chef::Exceptions::InvalidResourceSpecification)
243
+ end.to raise_error(Chef::Exceptions::InvalidResourceSpecification)
244
244
  end
245
245
 
246
246
  end
@@ -248,8 +248,8 @@ describe Chef::ResourceCollection do
248
248
  describe "to_json" do
249
249
  it "should serialize to json" do
250
250
  json = rc.to_json
251
- json.should =~ /json_class/
252
- json.should =~ /instance_vars/
251
+ expect(json).to match(/json_class/)
252
+ expect(json).to match(/instance_vars/)
253
253
  end
254
254
 
255
255
  include_examples "to_json equalivent to Chef::JSONCompat.to_json" do
@@ -266,27 +266,27 @@ describe Chef::ResourceCollection do
266
266
  rc << resource
267
267
  json = Chef::JSONCompat.to_json(rc)
268
268
  s_rc = Chef::JSONCompat.from_json(json)
269
- s_rc.should be_a_kind_of(Chef::ResourceCollection)
270
- s_rc[0].name.should eql(resource.name)
269
+ expect(s_rc).to be_a_kind_of(Chef::ResourceCollection)
270
+ expect(s_rc[0].name).to eql(resource.name)
271
271
  end
272
272
  end
273
273
 
274
274
  describe "provides access to the raw resources array" do
275
275
  it "returns the resources via the all_resources method" do
276
- rc.all_resources.should equal(rc.instance_variable_get(:@resource_list).instance_variable_get(:@resources))
276
+ expect(rc.all_resources).to equal(rc.instance_variable_get(:@resource_list).instance_variable_get(:@resources))
277
277
  end
278
278
  end
279
279
 
280
280
  describe "provides access to stepable iterator" do
281
281
  it "returns the iterator object" do
282
282
  rc.instance_variable_get(:@resource_list).instance_variable_set(:@iterator, :fooboar)
283
- rc.iterator.should == :fooboar
283
+ expect(rc.iterator).to eq(:fooboar)
284
284
  end
285
285
  end
286
286
 
287
287
  def check_by_names(results, *names)
288
288
  names.each do |res_name|
289
- results.detect{ |res| res.name == res_name }.should_not eql(nil)
289
+ expect(results.detect{ |res| res.name == res_name }).not_to eql(nil)
290
290
  end
291
291
  end
292
292
 
@@ -85,7 +85,7 @@ describe Chef::ResourceDefinition do
85
85
  expect(defn.recipe.call).to eql("I am what I am")
86
86
  end
87
87
 
88
- it "should set paramaters based on method_missing" do
88
+ it "should set parameters based on method_missing" do
89
89
  defn.mind "to fly"
90
90
  expect(defn.params[:mind]).to eql("to fly")
91
91
  end
@@ -37,13 +37,13 @@ describe Chef::ResourceReporter do
37
37
  @node = Chef::Node.new
38
38
  @node.name("spitfire")
39
39
  @rest_client = double("Chef::REST (mock)")
40
- @rest_client.stub(:post_rest).and_return(true)
40
+ allow(@rest_client).to receive(:post_rest).and_return(true)
41
41
  @resource_reporter = Chef::ResourceReporter.new(@rest_client)
42
42
  @new_resource = Chef::Resource::File.new("/tmp/a-file.txt")
43
43
  @cookbook_name = "monkey"
44
44
  @new_resource.cookbook_name = @cookbook_name
45
45
  @cookbook_version = double("Cookbook::Version", :version => "1.2.3")
46
- @new_resource.stub(:cookbook_version).and_return(@cookbook_version)
46
+ allow(@new_resource).to receive(:cookbook_version).and_return(@cookbook_version)
47
47
  @current_resource = Chef::Resource::File.new("/tmp/a-file.txt")
48
48
  @start_time = Time.new
49
49
  @end_time = Time.new + 20
@@ -51,25 +51,25 @@ describe Chef::ResourceReporter do
51
51
  @run_context = Chef::RunContext.new(@node, {}, @events)
52
52
  @run_status = Chef::RunStatus.new(@node, @events)
53
53
  @run_id = @run_status.run_id
54
- Time.stub(:now).and_return(@start_time, @end_time)
54
+ allow(Time).to receive(:now).and_return(@start_time, @end_time)
55
55
  end
56
56
 
57
57
  context "when first created" do
58
58
 
59
59
  it "has no updated resources" do
60
- @resource_reporter.should have(0).updated_resources
60
+ expect(@resource_reporter.updated_resources.size).to eq(0)
61
61
  end
62
62
 
63
63
  it "reports a successful run" do
64
- @resource_reporter.status.should == "success"
64
+ expect(@resource_reporter.status).to eq("success")
65
65
  end
66
66
 
67
67
  it "assumes the resource history feature is supported" do
68
- @resource_reporter.reporting_enabled?.should be_true
68
+ expect(@resource_reporter.reporting_enabled?).to be_truthy
69
69
  end
70
70
 
71
71
  it "should have no error_descriptions" do
72
- @resource_reporter.error_descriptions.should eq({})
72
+ expect(@resource_reporter.error_descriptions).to eq({})
73
73
  # @resource_reporter.error_descriptions.should be_empty
74
74
  # @resource_reporter.should have(0).error_descriptions
75
75
  end
@@ -82,16 +82,16 @@ describe Chef::ResourceReporter do
82
82
  end
83
83
 
84
84
  it "reports a successful run" do
85
- pending "refactor how node gets set."
86
- @resource_reporter.status.should == "success"
85
+ skip "refactor how node gets set."
86
+ expect(@resource_reporter.status).to eq("success")
87
87
  end
88
88
  end
89
89
 
90
90
  context "when chef fails" do
91
91
  before do
92
- @rest_client.stub(:create_url).and_return("reports/nodes/spitfire/runs/#{@run_id}");
93
- @rest_client.stub(:raw_http_request).and_return({"result"=>"ok"});
94
- @rest_client.stub(:post_rest).and_return({"uri"=>"https://example.com/reports/nodes/spitfire/runs/#{@run_id}"});
92
+ allow(@rest_client).to receive(:create_url).and_return("reports/nodes/spitfire/runs/#{@run_id}");
93
+ allow(@rest_client).to receive(:raw_http_request).and_return({"result"=>"ok"});
94
+ allow(@rest_client).to receive(:post_rest).and_return({"uri"=>"https://example.com/reports/nodes/spitfire/runs/#{@run_id}"});
95
95
 
96
96
  end
97
97
 
@@ -103,11 +103,11 @@ describe Chef::ResourceReporter do
103
103
  end
104
104
 
105
105
  it "sets the run status to 'failure'" do
106
- @resource_reporter.status.should == "failure"
106
+ expect(@resource_reporter.status).to eq("failure")
107
107
  end
108
108
 
109
109
  it "keeps the exception data" do
110
- @resource_reporter.exception.should == @exception
110
+ expect(@resource_reporter.exception).to eq(@exception)
111
111
  end
112
112
  end
113
113
 
@@ -121,12 +121,12 @@ describe Chef::ResourceReporter do
121
121
  end
122
122
 
123
123
  it "collects the resource as an updated resource" do
124
- @resource_reporter.should have(1).updated_resources
124
+ expect(@resource_reporter.updated_resources.size).to eq(1)
125
125
  end
126
126
 
127
127
  it "collects the desired state of the resource" do
128
128
  update_record = @resource_reporter.updated_resources.first
129
- update_record.new_resource.should == @new_resource
129
+ expect(update_record.new_resource).to eq(@new_resource)
130
130
  end
131
131
  end
132
132
 
@@ -145,7 +145,7 @@ describe Chef::ResourceReporter do
145
145
  end
146
146
 
147
147
  it "has no updated resources" do
148
- @resource_reporter.should have(0).updated_resources
148
+ expect(@resource_reporter.updated_resources.size).to eq(0)
149
149
  end
150
150
  end
151
151
 
@@ -158,17 +158,17 @@ describe Chef::ResourceReporter do
158
158
  end
159
159
 
160
160
  it "collects the updated resource" do
161
- @resource_reporter.should have(1).updated_resources
161
+ expect(@resource_reporter.updated_resources.size).to eq(1)
162
162
  end
163
163
 
164
164
  it "collects the old state of the resource" do
165
165
  update_record = @resource_reporter.updated_resources.first
166
- update_record.current_resource.should == @current_resource
166
+ expect(update_record.current_resource).to eq(@current_resource)
167
167
  end
168
168
 
169
169
  it "collects the new state of the resource" do
170
170
  update_record = @resource_reporter.updated_resources.first
171
- update_record.new_resource.should == @new_resource
171
+ expect(update_record.new_resource).to eq(@new_resource)
172
172
  end
173
173
 
174
174
  context "and a subsequent resource fails before loading current resource" do
@@ -182,12 +182,12 @@ describe Chef::ResourceReporter do
182
182
 
183
183
  it "collects the desired state of the failed resource" do
184
184
  failed_resource_update = @resource_reporter.updated_resources.last
185
- failed_resource_update.new_resource.should == @next_new_resource
185
+ expect(failed_resource_update.new_resource).to eq(@next_new_resource)
186
186
  end
187
187
 
188
188
  it "does not have the current state of the failed resource" do
189
189
  failed_resource_update = @resource_reporter.updated_resources.last
190
- failed_resource_update.current_resource.should be_nil
190
+ expect(failed_resource_update.current_resource).to be_nil
191
191
  end
192
192
  end
193
193
  end
@@ -208,7 +208,7 @@ describe Chef::ResourceReporter do
208
208
  end
209
209
 
210
210
  it "does not collect data about the nested resource" do
211
- @resource_reporter.should have(1).updated_resources
211
+ expect(@resource_reporter.updated_resources.size).to eq(1)
212
212
  end
213
213
  end
214
214
 
@@ -224,7 +224,7 @@ describe Chef::ResourceReporter do
224
224
  end
225
225
 
226
226
  it "does not collect data about the nested resource" do
227
- @resource_reporter.should have(1).updated_resources
227
+ expect(@resource_reporter.updated_resources.size).to eq(1)
228
228
  end
229
229
  end
230
230
 
@@ -237,17 +237,17 @@ describe Chef::ResourceReporter do
237
237
  end
238
238
 
239
239
  it "collects the resource as an updated resource" do
240
- @resource_reporter.should have(1).updated_resources
240
+ expect(@resource_reporter.updated_resources.size).to eq(1)
241
241
  end
242
242
 
243
243
  it "collects the desired state of the resource" do
244
244
  update_record = @resource_reporter.updated_resources.first
245
- update_record.new_resource.should == @new_resource
245
+ expect(update_record.new_resource).to eq(@new_resource)
246
246
  end
247
247
 
248
248
  it "collects the current state of the resource" do
249
249
  update_record = @resource_reporter.updated_resources.first
250
- update_record.current_resource.should == @current_resource
250
+ expect(update_record.current_resource).to eq(@current_resource)
251
251
  end
252
252
  end
253
253
 
@@ -257,9 +257,9 @@ describe Chef::ResourceReporter do
257
257
  describe "when generating a report for the server" do
258
258
 
259
259
  before do
260
- @rest_client.stub(:create_url).and_return("reports/nodes/spitfire/runs/#{@run_id}");
261
- @rest_client.stub(:raw_http_request).and_return({"result"=>"ok"});
262
- @rest_client.stub(:post_rest).and_return({"uri"=>"https://example.com/reports/nodes/spitfire/runs/#{@run_id}"});
260
+ allow(@rest_client).to receive(:create_url).and_return("reports/nodes/spitfire/runs/#{@run_id}");
261
+ allow(@rest_client).to receive(:raw_http_request).and_return({"result"=>"ok"});
262
+ allow(@rest_client).to receive(:post_rest).and_return({"uri"=>"https://example.com/reports/nodes/spitfire/runs/#{@run_id}"});
263
263
 
264
264
  @resource_reporter.run_started(@run_status)
265
265
  end
@@ -268,8 +268,8 @@ describe Chef::ResourceReporter do
268
268
  context "the new_resource name and id are nil" do
269
269
  before do
270
270
  @bad_resource = Chef::Resource::File.new("/tmp/nameless_file.txt")
271
- @bad_resource.stub(:name).and_return(nil)
272
- @bad_resource.stub(:identity).and_return(nil)
271
+ allow(@bad_resource).to receive(:name).and_return(nil)
272
+ allow(@bad_resource).to receive(:identity).and_return(nil)
273
273
  @resource_reporter.resource_action_start(@bad_resource, :create)
274
274
  @resource_reporter.resource_current_state_loaded(@bad_resource, :create, @current_resource)
275
275
  @resource_reporter.resource_updated(@bad_resource, :create)
@@ -280,19 +280,19 @@ describe Chef::ResourceReporter do
280
280
  end
281
281
 
282
282
  it "resource_name in prepared_run_data is a string" do
283
- @first_update_report["name"].class.should == String
283
+ expect(@first_update_report["name"].class).to eq(String)
284
284
  end
285
285
 
286
286
  it "resource_id in prepared_run_data is a string" do
287
- @first_update_report["id"].class.should == String
287
+ expect(@first_update_report["id"].class).to eq(String)
288
288
  end
289
289
  end
290
290
 
291
291
  context "the new_resource name and id are hashes" do
292
292
  before do
293
293
  @bad_resource = Chef::Resource::File.new("/tmp/filename_as_hash.txt")
294
- @bad_resource.stub(:name).and_return({:foo=>:bar})
295
- @bad_resource.stub(:identity).and_return({:foo=>:bar})
294
+ allow(@bad_resource).to receive(:name).and_return({:foo=>:bar})
295
+ allow(@bad_resource).to receive(:identity).and_return({:foo=>:bar})
296
296
  @resource_reporter.resource_action_start(@bad_resource, :create)
297
297
  @resource_reporter.resource_current_state_loaded(@bad_resource, :create, @current_resource)
298
298
  @resource_reporter.resource_updated(@bad_resource, :create)
@@ -309,11 +309,11 @@ describe Chef::ResourceReporter do
309
309
  # => "{:foo=>:bar}"
310
310
  # Hence checking for the class instead of the actual value.
311
311
  it "resource_name in prepared_run_data is a string" do
312
- @first_update_report["name"].class.should == String
312
+ expect(@first_update_report["name"].class).to eq(String)
313
313
  end
314
314
 
315
315
  it "resource_id in prepared_run_data is a string" do
316
- @first_update_report["id"].class.should == String
316
+ expect(@first_update_report["id"].class).to eq(String)
317
317
  end
318
318
  end
319
319
  end
@@ -360,73 +360,73 @@ describe Chef::ResourceReporter do
360
360
  end
361
361
 
362
362
  it "includes the run's status" do
363
- @report.should have_key("status")
363
+ expect(@report).to have_key("status")
364
364
  end
365
365
 
366
366
  it "includes a list of updated resources" do
367
- @report.should have_key("resources")
367
+ expect(@report).to have_key("resources")
368
368
  end
369
369
 
370
370
  it "includes an updated resource's type" do
371
- @first_update_report.should have_key("type")
371
+ expect(@first_update_report).to have_key("type")
372
372
  end
373
373
 
374
374
  it "includes an updated resource's initial state" do
375
- @first_update_report["before"].should == current_resource.state
375
+ expect(@first_update_report["before"]).to eq(current_resource.state)
376
376
  end
377
377
 
378
378
  it "includes an updated resource's final state" do
379
- @first_update_report["after"].should == new_resource.state
379
+ expect(@first_update_report["after"]).to eq(new_resource.state)
380
380
  end
381
381
 
382
382
  it "includes the resource's name" do
383
- @first_update_report["name"].should == new_resource.name
383
+ expect(@first_update_report["name"]).to eq(new_resource.name)
384
384
  end
385
385
 
386
386
  it "includes the resource's id attribute" do
387
- @first_update_report["id"].should == new_resource.identity
387
+ expect(@first_update_report["id"]).to eq(new_resource.identity)
388
388
  end
389
389
 
390
390
  it "includes the elapsed time for the resource to converge" do
391
391
  # TODO: API takes integer number of milliseconds as a string. This
392
392
  # should be an int.
393
- @first_update_report.should have_key("duration")
394
- @first_update_report["duration"].to_i.should be_within(100).of(0)
393
+ expect(@first_update_report).to have_key("duration")
394
+ expect(@first_update_report["duration"].to_i).to be_within(100).of(0)
395
395
  end
396
396
 
397
397
  it "includes the action executed by the resource" do
398
398
  # TODO: rename as "action"
399
- @first_update_report["result"].should == "create"
399
+ expect(@first_update_report["result"]).to eq("create")
400
400
  end
401
401
 
402
402
  it "includes the cookbook name of the resource" do
403
- @first_update_report.should have_key("cookbook_name")
404
- @first_update_report["cookbook_name"].should == @cookbook_name
403
+ expect(@first_update_report).to have_key("cookbook_name")
404
+ expect(@first_update_report["cookbook_name"]).to eq(@cookbook_name)
405
405
  end
406
406
 
407
407
  it "includes the cookbook version of the resource" do
408
- @first_update_report.should have_key("cookbook_version")
409
- @first_update_report["cookbook_version"].should == "1.2.3"
408
+ expect(@first_update_report).to have_key("cookbook_version")
409
+ expect(@first_update_report["cookbook_version"]).to eq("1.2.3")
410
410
  end
411
411
 
412
412
  it "includes the total resource count" do
413
- @report.should have_key("total_res_count")
414
- @report["total_res_count"].should == "1"
413
+ expect(@report).to have_key("total_res_count")
414
+ expect(@report["total_res_count"]).to eq("1")
415
415
  end
416
416
 
417
417
  it "includes the data hash" do
418
- @report.should have_key("data")
419
- @report["data"].should == {}
418
+ expect(@report).to have_key("data")
419
+ expect(@report["data"]).to eq({})
420
420
  end
421
421
 
422
422
  it "includes the run_list" do
423
- @report.should have_key("run_list")
424
- @report["run_list"].should == Chef::JSONCompat.to_json(@run_status.node.run_list)
423
+ expect(@report).to have_key("run_list")
424
+ expect(@report["run_list"]).to eq(Chef::JSONCompat.to_json(@run_status.node.run_list))
425
425
  end
426
426
 
427
427
  it "includes the end_time" do
428
- @report.should have_key("end_time")
429
- @report["end_time"].should == @run_status.end_time.to_s
428
+ expect(@report).to have_key("end_time")
429
+ expect(@report["end_time"]).to eq(@run_status.end_time.to_s)
430
430
  end
431
431
 
432
432
  end
@@ -442,8 +442,8 @@ describe Chef::ResourceReporter do
442
442
  let(:new_resource) do
443
443
  resource = Chef::Resource::RegistryKey.new('Wubba\Lubba\Dub\Dubs')
444
444
  resource.values([ { :name => 'rick', :type => :binary, :data => 255.chr * 1 } ])
445
- resource.stub(:cookbook_name).and_return(@cookbook_name)
446
- resource.stub(:cookbook_version).and_return(@cookbook_version)
445
+ allow(resource).to receive(:cookbook_name).and_return(@cookbook_name)
446
+ allow(resource).to receive(:cookbook_version).and_return(@cookbook_version)
447
447
  resource
448
448
  end
449
449
 
@@ -463,33 +463,33 @@ describe Chef::ResourceReporter do
463
463
  @node = Chef::Node.new
464
464
  @node.name("spitfire")
465
465
  @exception = ArgumentError.new
466
- @exception.stub(:inspect).and_return("Net::HTTPServerException")
467
- @exception.stub(:message).and_return("Object not found")
468
- @exception.stub(:backtrace).and_return(@backtrace)
466
+ allow(@exception).to receive(:inspect).and_return("Net::HTTPServerException")
467
+ allow(@exception).to receive(:message).and_return("Object not found")
468
+ allow(@exception).to receive(:backtrace).and_return(@backtrace)
469
469
  @resource_reporter.run_list_expand_failed(@node, @exception)
470
470
  @resource_reporter.run_failed(@exception)
471
471
  @report = @resource_reporter.prepare_run_data
472
472
  end
473
473
 
474
474
  it "includes the exception type in the event data" do
475
- @report.should have_key("data")
476
- @report["data"]["exception"].should have_key("class")
477
- @report["data"]["exception"]["class"].should == "Net::HTTPServerException"
475
+ expect(@report).to have_key("data")
476
+ expect(@report["data"]["exception"]).to have_key("class")
477
+ expect(@report["data"]["exception"]["class"]).to eq("Net::HTTPServerException")
478
478
  end
479
479
 
480
480
  it "includes the exception message in the event data" do
481
- @report["data"]["exception"].should have_key("message")
482
- @report["data"]["exception"]["message"].should == "Object not found"
481
+ expect(@report["data"]["exception"]).to have_key("message")
482
+ expect(@report["data"]["exception"]["message"]).to eq("Object not found")
483
483
  end
484
484
 
485
485
  it "includes the exception trace in the event data" do
486
- @report["data"]["exception"].should have_key("backtrace")
487
- @report["data"]["exception"]["backtrace"].should == Chef::JSONCompat.to_json(@backtrace)
486
+ expect(@report["data"]["exception"]).to have_key("backtrace")
487
+ expect(@report["data"]["exception"]["backtrace"]).to eq(Chef::JSONCompat.to_json(@backtrace))
488
488
  end
489
489
 
490
490
  it "includes the error inspector output in the event data" do
491
- @report["data"]["exception"].should have_key("description")
492
- @report["data"]["exception"]["description"].should include({"title"=>"Error expanding the run_list:", "sections"=>[{"Unexpected Error:" => "ArgumentError: Object not found"}]})
491
+ expect(@report["data"]["exception"]).to have_key("description")
492
+ expect(@report["data"]["exception"]["description"]).to include({"title"=>"Error expanding the run_list:", "sections"=>[{"Unexpected Error:" => "ArgumentError: Object not found"}]})
493
493
  end
494
494
 
495
495
  end
@@ -509,39 +509,39 @@ describe Chef::ResourceReporter do
509
509
  end
510
510
 
511
511
  it "includes an updated resource's initial state" do
512
- @first_update_report["before"].should == @current_resource.state
512
+ expect(@first_update_report["before"]).to eq(@current_resource.state)
513
513
  end
514
514
 
515
515
  it "includes an updated resource's final state" do
516
- @first_update_report["after"].should == @new_resource.state
516
+ expect(@first_update_report["after"]).to eq(@new_resource.state)
517
517
  end
518
518
 
519
519
  it "includes the resource's name" do
520
- @first_update_report["name"].should == @new_resource.name
520
+ expect(@first_update_report["name"]).to eq(@new_resource.name)
521
521
  end
522
522
 
523
523
  it "includes the resource's id attribute" do
524
- @first_update_report["id"].should == @new_resource.identity
524
+ expect(@first_update_report["id"]).to eq(@new_resource.identity)
525
525
  end
526
526
 
527
527
  it "includes the elapsed time for the resource to converge" do
528
528
  # TODO: API takes integer number of milliseconds as a string. This
529
529
  # should be an int.
530
- @first_update_report.should have_key("duration")
531
- @first_update_report["duration"].to_i.should be_within(100).of(0)
530
+ expect(@first_update_report).to have_key("duration")
531
+ expect(@first_update_report["duration"].to_i).to be_within(100).of(0)
532
532
  end
533
533
 
534
534
  it "includes the action executed by the resource" do
535
535
  # TODO: rename as "action"
536
- @first_update_report["result"].should == "create"
536
+ expect(@first_update_report["result"]).to eq("create")
537
537
  end
538
538
 
539
539
  it "does not include a cookbook name for the resource" do
540
- @first_update_report.should_not have_key("cookbook_name")
540
+ expect(@first_update_report).not_to have_key("cookbook_name")
541
541
  end
542
542
 
543
543
  it "does not include a cookbook version for the resource" do
544
- @first_update_report.should_not have_key("cookbook_version")
544
+ expect(@first_update_report).not_to have_key("cookbook_version")
545
545
  end
546
546
  end
547
547
 
@@ -562,13 +562,13 @@ describe Chef::ResourceReporter do
562
562
  end
563
563
 
564
564
  it "sets before to {} instead of nil" do
565
- @first_update_report.should have_key("before")
566
- @first_update_report['before'].should eq({})
565
+ expect(@first_update_report).to have_key("before")
566
+ expect(@first_update_report['before']).to eq({})
567
567
  end
568
568
 
569
569
  it "sets after to {} instead of 'Running'" do
570
- @first_update_report.should have_key("after")
571
- @first_update_report['after'].should eq({})
570
+ expect(@first_update_report).to have_key("after")
571
+ expect(@first_update_report['after']).to eq({})
572
572
  end
573
573
  end
574
574
 
@@ -585,7 +585,7 @@ describe Chef::ResourceReporter do
585
585
  # 404 getting the run_id
586
586
  @response = Net::HTTPNotFound.new("a response body", "404", "Not Found")
587
587
  @error = Net::HTTPServerException.new("404 message", @response)
588
- @rest_client.should_receive(:post_rest).
588
+ expect(@rest_client).to receive(:post_rest).
589
589
  with("reports/nodes/spitfire/runs", {:action => :start, :run_id => @run_id,
590
590
  :start_time => @start_time.to_s},
591
591
  {'X-Ops-Reporting-Protocol-Version' => Chef::ResourceReporter::PROTOCOL_VERSION}).
@@ -594,17 +594,17 @@ describe Chef::ResourceReporter do
594
594
 
595
595
  it "assumes the feature is not enabled" do
596
596
  @resource_reporter.run_started(@run_status)
597
- @resource_reporter.reporting_enabled?.should be_false
597
+ expect(@resource_reporter.reporting_enabled?).to be_falsey
598
598
  end
599
599
 
600
600
  it "does not send a resource report to the server" do
601
601
  @resource_reporter.run_started(@run_status)
602
- @rest_client.should_not_receive(:post_rest)
602
+ expect(@rest_client).not_to receive(:post_rest)
603
603
  @resource_reporter.run_completed(@node)
604
604
  end
605
605
 
606
606
  it "prints an error about the 404" do
607
- Chef::Log.should_receive(:debug).with(/404/)
607
+ expect(Chef::Log).to receive(:debug).with(/404/)
608
608
  @resource_reporter.run_started(@run_status)
609
609
  end
610
610
 
@@ -615,7 +615,7 @@ describe Chef::ResourceReporter do
615
615
  # 500 getting the run_id
616
616
  @response = Net::HTTPInternalServerError.new("a response body", "500", "Internal Server Error")
617
617
  @error = Net::HTTPServerException.new("500 message", @response)
618
- @rest_client.should_receive(:post_rest).
618
+ expect(@rest_client).to receive(:post_rest).
619
619
  with("reports/nodes/spitfire/runs", {:action => :start, :run_id => @run_id, :start_time => @start_time.to_s},
620
620
  {'X-Ops-Reporting-Protocol-Version' => Chef::ResourceReporter::PROTOCOL_VERSION}).
621
621
  and_raise(@error)
@@ -623,17 +623,17 @@ describe Chef::ResourceReporter do
623
623
 
624
624
  it "assumes the feature is not enabled" do
625
625
  @resource_reporter.run_started(@run_status)
626
- @resource_reporter.reporting_enabled?.should be_false
626
+ expect(@resource_reporter.reporting_enabled?).to be_falsey
627
627
  end
628
628
 
629
629
  it "does not send a resource report to the server" do
630
630
  @resource_reporter.run_started(@run_status)
631
- @rest_client.should_not_receive(:post_rest)
631
+ expect(@rest_client).not_to receive(:post_rest)
632
632
  @resource_reporter.run_completed(@node)
633
633
  end
634
634
 
635
635
  it "prints an error about the error" do
636
- Chef::Log.should_receive(:info).with(/500/)
636
+ expect(Chef::Log).to receive(:info).with(/500/)
637
637
  @resource_reporter.run_started(@run_status)
638
638
  end
639
639
  end
@@ -645,7 +645,7 @@ describe Chef::ResourceReporter do
645
645
  # 500 getting the run_id
646
646
  @response = Net::HTTPInternalServerError.new("a response body", "500", "Internal Server Error")
647
647
  @error = Net::HTTPServerException.new("500 message", @response)
648
- @rest_client.should_receive(:post_rest).
648
+ expect(@rest_client).to receive(:post_rest).
649
649
  with("reports/nodes/spitfire/runs", {:action => :start, :run_id => @run_id, :start_time => @start_time.to_s},
650
650
  {'X-Ops-Reporting-Protocol-Version' => Chef::ResourceReporter::PROTOCOL_VERSION}).
651
651
  and_raise(@error)
@@ -656,17 +656,17 @@ describe Chef::ResourceReporter do
656
656
  end
657
657
 
658
658
  it "fails the run and prints an message about the error" do
659
- Chef::Log.should_receive(:error).with(/500/)
660
- lambda {
659
+ expect(Chef::Log).to receive(:error).with(/500/)
660
+ expect {
661
661
  @resource_reporter.run_started(@run_status)
662
- }.should raise_error(Net::HTTPServerException)
662
+ }.to raise_error(Net::HTTPServerException)
663
663
  end
664
664
  end
665
665
 
666
666
  context "after creating the run history document" do
667
667
  before do
668
668
  response = {"uri"=>"https://example.com/reports/nodes/spitfire/runs/@run_id"}
669
- @rest_client.should_receive(:post_rest).
669
+ expect(@rest_client).to receive(:post_rest).
670
670
  with("reports/nodes/spitfire/runs", {:action => :start, :run_id => @run_id, :start_time => @start_time.to_s},
671
671
  {'X-Ops-Reporting-Protocol-Version' => Chef::ResourceReporter::PROTOCOL_VERSION}).
672
672
  and_return(response)
@@ -674,7 +674,7 @@ describe Chef::ResourceReporter do
674
674
  end
675
675
 
676
676
  it "creates a run document on the server at the start of the run" do
677
- @resource_reporter.run_id.should == @run_id
677
+ expect(@resource_reporter.run_id).to eq(@run_id)
678
678
  end
679
679
 
680
680
  it "updates the run document with resource updates at the end of the run" do
@@ -683,25 +683,25 @@ describe Chef::ResourceReporter do
683
683
  @resource_reporter.resource_current_state_loaded(@new_resource, :create, @current_resource)
684
684
  @resource_reporter.resource_updated(@new_resource, :create)
685
685
 
686
- @resource_reporter.stub(:end_time).and_return(@end_time)
686
+ allow(@resource_reporter).to receive(:end_time).and_return(@end_time)
687
687
  @expected_data = @resource_reporter.prepare_run_data
688
688
 
689
689
  post_url = "https://chef_server/example_url"
690
690
  response = {"result"=>"ok"}
691
691
 
692
- @rest_client.should_receive(:create_url).
692
+ expect(@rest_client).to receive(:create_url).
693
693
  with("reports/nodes/spitfire/runs/#{@run_id}").
694
694
  ordered.
695
695
  and_return(post_url)
696
- @rest_client.should_receive(:raw_http_request).ordered do |method, url, headers, data|
697
- method.should eq(:POST)
698
- url.should eq(post_url)
699
- headers.should eq({'Content-Encoding' => 'gzip',
696
+ expect(@rest_client).to receive(:raw_http_request).ordered do |method, url, headers, data|
697
+ expect(method).to eq(:POST)
698
+ expect(url).to eq(post_url)
699
+ expect(headers).to eq({'Content-Encoding' => 'gzip',
700
700
  'X-Ops-Reporting-Protocol-Version' => Chef::ResourceReporter::PROTOCOL_VERSION
701
701
  })
702
702
  data_stream = Zlib::GzipReader.new(StringIO.new(data))
703
703
  data = data_stream.read
704
- data.should eq(Chef::JSONCompat.to_json(@expected_data))
704
+ expect(data).to eq(Chef::JSONCompat.to_json(@expected_data))
705
705
  response
706
706
  end
707
707
 
@@ -714,7 +714,7 @@ describe Chef::ResourceReporter do
714
714
  @enable_reporting_url_fatals = Chef::Config[:enable_reporting_url_fatals]
715
715
  Chef::Config[:enable_reporting_url_fatals] = true
716
716
  # this call doesn't matter for this context
717
- @rest_client.stub(:create_url)
717
+ allow(@rest_client).to receive(:create_url)
718
718
  end
719
719
 
720
720
  after do
@@ -724,8 +724,8 @@ describe Chef::ResourceReporter do
724
724
  it "should log 4xx errors" do
725
725
  response = Net::HTTPClientError.new("forbidden", "403", "Forbidden")
726
726
  error = Net::HTTPServerException.new("403 message", response)
727
- @rest_client.stub(:raw_http_request).and_raise(error)
728
- Chef::Log.should_receive(:error).with(/403/)
727
+ allow(@rest_client).to receive(:raw_http_request).and_raise(error)
728
+ expect(Chef::Log).to receive(:error).with(/403/)
729
729
 
730
730
  @resource_reporter.post_reporting_data
731
731
  end
@@ -733,26 +733,26 @@ describe Chef::ResourceReporter do
733
733
  it "should log error 5xx errors" do
734
734
  response = Net::HTTPServerError.new("internal error", "500", "Internal Server Error")
735
735
  error = Net::HTTPFatalError.new("500 message", response)
736
- @rest_client.stub(:raw_http_request).and_raise(error)
737
- Chef::Log.should_receive(:error).with(/500/)
736
+ allow(@rest_client).to receive(:raw_http_request).and_raise(error)
737
+ expect(Chef::Log).to receive(:error).with(/500/)
738
738
 
739
739
  @resource_reporter.post_reporting_data
740
740
  end
741
741
 
742
742
  it "should log if a socket error happens" do
743
- @rest_client.stub(:raw_http_request).and_raise(SocketError.new("test socket error"))
744
- Chef::Log.should_receive(:error).with(/test socket error/)
743
+ allow(@rest_client).to receive(:raw_http_request).and_raise(SocketError.new("test socket error"))
744
+ expect(Chef::Log).to receive(:error).with(/test socket error/)
745
745
 
746
746
  @resource_reporter.post_reporting_data
747
747
 
748
748
  end
749
749
 
750
750
  it "should raise if an unkwown error happens" do
751
- @rest_client.stub(:raw_http_request).and_raise(Exception.new)
751
+ allow(@rest_client).to receive(:raw_http_request).and_raise(Exception.new)
752
752
 
753
- lambda {
753
+ expect {
754
754
  @resource_reporter.post_reporting_data
755
- }.should raise_error(Exception)
755
+ }.to raise_error(Exception)
756
756
  end
757
757
  end
758
758
  end