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
@@ -7,19 +7,19 @@ describe Chef::Knife::Configure do
7
7
  Chef::Config[:node_name] = "webmonkey.example.com"
8
8
  @knife = Chef::Knife::Configure.new
9
9
  @rest_client = double("null rest client", :post_rest => { :result => :true })
10
- @knife.stub(:rest).and_return(@rest_client)
10
+ allow(@knife).to receive(:rest).and_return(@rest_client)
11
11
 
12
12
  @out = StringIO.new
13
- @knife.ui.stub(:stdout).and_return(@out)
13
+ allow(@knife.ui).to receive(:stdout).and_return(@out)
14
14
  @knife.config[:config_file] = '/home/you/.chef/knife.rb'
15
15
 
16
16
  @in = StringIO.new("\n" * 7)
17
- @knife.ui.stub(:stdin).and_return(@in)
17
+ allow(@knife.ui).to receive(:stdin).and_return(@in)
18
18
 
19
19
  @err = StringIO.new
20
- @knife.ui.stub(:stderr).and_return(@err)
20
+ allow(@knife.ui).to receive(:stderr).and_return(@err)
21
21
 
22
- Ohai::System.stub(:new).and_return(ohai)
22
+ allow(Ohai::System).to receive(:new).and_return(ohai)
23
23
  end
24
24
 
25
25
 
@@ -27,8 +27,8 @@ describe Chef::Knife::Configure do
27
27
 
28
28
  let(:ohai) do
29
29
  o = {}
30
- o.stub(:require_plugin)
31
- o.stub(:load_plugins)
30
+ allow(o).to receive(:require_plugin)
31
+ allow(o).to receive(:load_plugins)
32
32
  o[:fqdn] = fqdn
33
33
  o
34
34
  end
@@ -44,63 +44,63 @@ describe Chef::Knife::Configure do
44
44
 
45
45
  it "asks the user for the URL of the chef server" do
46
46
  @knife.ask_user_for_config
47
- @out.string.should match(Regexp.escape("Please enter the chef server URL: [#{default_server_url}]"))
48
- @knife.chef_server.should == default_server_url
47
+ expect(@out.string).to match(Regexp.escape("Please enter the chef server URL: [#{default_server_url}]"))
48
+ expect(@knife.chef_server).to eq(default_server_url)
49
49
  end
50
50
 
51
51
  it "asks the user for the clientname they want for the new client if -i is specified" do
52
52
  @knife.config[:initial] = true
53
- Etc.stub(:getlogin).and_return("a-new-user")
53
+ allow(Etc).to receive(:getlogin).and_return("a-new-user")
54
54
  @knife.ask_user_for_config
55
- @out.string.should match(Regexp.escape("Please enter a name for the new user: [a-new-user]"))
56
- @knife.new_client_name.should == Etc.getlogin
55
+ expect(@out.string).to match(Regexp.escape("Please enter a name for the new user: [a-new-user]"))
56
+ expect(@knife.new_client_name).to eq(Etc.getlogin)
57
57
  end
58
58
 
59
59
  it "should not ask the user for the clientname they want for the new client if -i and --node_name are specified" do
60
60
  @knife.config[:initial] = true
61
61
  @knife.config[:node_name] = 'testnode'
62
- Etc.stub(:getlogin).and_return("a-new-user")
62
+ allow(Etc).to receive(:getlogin).and_return("a-new-user")
63
63
  @knife.ask_user_for_config
64
- @out.string.should_not match(Regexp.escape("Please enter a name for the new user"))
65
- @knife.new_client_name.should == 'testnode'
64
+ expect(@out.string).not_to match(Regexp.escape("Please enter a name for the new user"))
65
+ expect(@knife.new_client_name).to eq('testnode')
66
66
  end
67
67
 
68
68
  it "asks the user for the existing API username or clientname if -i is not specified" do
69
- Etc.stub(:getlogin).and_return("a-new-user")
69
+ allow(Etc).to receive(:getlogin).and_return("a-new-user")
70
70
  @knife.ask_user_for_config
71
- @out.string.should match(Regexp.escape("Please enter an existing username or clientname for the API: [a-new-user]"))
72
- @knife.new_client_name.should == Etc.getlogin
71
+ expect(@out.string).to match(Regexp.escape("Please enter an existing username or clientname for the API: [a-new-user]"))
72
+ expect(@knife.new_client_name).to eq(Etc.getlogin)
73
73
  end
74
74
 
75
75
  it "asks the user for the existing admin client's name if -i is specified" do
76
76
  @knife.config[:initial] = true
77
77
  @knife.ask_user_for_config
78
- @out.string.should match(Regexp.escape("Please enter the existing admin name: [admin]"))
79
- @knife.admin_client_name.should == 'admin'
78
+ expect(@out.string).to match(Regexp.escape("Please enter the existing admin name: [admin]"))
79
+ expect(@knife.admin_client_name).to eq('admin')
80
80
  end
81
81
 
82
82
  it "should not ask the user for the existing admin client's name if -i and --admin-client_name are specified" do
83
83
  @knife.config[:initial] = true
84
84
  @knife.config[:admin_client_name] = 'my-webui'
85
85
  @knife.ask_user_for_config
86
- @out.string.should_not match(Regexp.escape("Please enter the existing admin:"))
87
- @knife.admin_client_name.should == 'my-webui'
86
+ expect(@out.string).not_to match(Regexp.escape("Please enter the existing admin:"))
87
+ expect(@knife.admin_client_name).to eq('my-webui')
88
88
  end
89
89
 
90
90
  it "should not ask the user for the existing admin client's name if -i is not specified" do
91
91
  @knife.ask_user_for_config
92
- @out.string.should_not match(Regexp.escape("Please enter the existing admin: [admin]"))
93
- @knife.admin_client_name.should_not == 'admin'
92
+ expect(@out.string).not_to match(Regexp.escape("Please enter the existing admin: [admin]"))
93
+ expect(@knife.admin_client_name).not_to eq('admin')
94
94
  end
95
95
 
96
96
  it "asks the user for the location of the existing admin key if -i is specified" do
97
97
  @knife.config[:initial] = true
98
98
  @knife.ask_user_for_config
99
- @out.string.should match(Regexp.escape("Please enter the location of the existing admin's private key: [#{default_admin_key}]"))
99
+ expect(@out.string).to match(Regexp.escape("Please enter the location of the existing admin's private key: [#{default_admin_key}]"))
100
100
  if windows?
101
- @knife.admin_client_key.capitalize.should == default_admin_key_win32.capitalize
101
+ expect(@knife.admin_client_key.capitalize).to eq(default_admin_key_win32.capitalize)
102
102
  else
103
- @knife.admin_client_key.should == default_admin_key
103
+ expect(@knife.admin_client_key).to eq(default_admin_key)
104
104
  end
105
105
  end
106
106
 
@@ -108,61 +108,61 @@ describe Chef::Knife::Configure do
108
108
  @knife.config[:initial] = true
109
109
  @knife.config[:admin_client_key] = '/home/you/.chef/my-webui.pem'
110
110
  @knife.ask_user_for_config
111
- @out.string.should_not match(Regexp.escape("Please enter the location of the existing admin client's private key:"))
111
+ expect(@out.string).not_to match(Regexp.escape("Please enter the location of the existing admin client's private key:"))
112
112
  if windows?
113
- @knife.admin_client_key.should match %r{^[A-Za-z]:/home/you/\.chef/my-webui\.pem$}
113
+ expect(@knife.admin_client_key).to match %r{^[A-Za-z]:/home/you/\.chef/my-webui\.pem$}
114
114
  else
115
- @knife.admin_client_key.should == '/home/you/.chef/my-webui.pem'
115
+ expect(@knife.admin_client_key).to eq('/home/you/.chef/my-webui.pem')
116
116
  end
117
117
  end
118
118
 
119
119
  it "should not ask the user for the location of the existing admin key if -i is not specified" do
120
120
  @knife.ask_user_for_config
121
- @out.string.should_not match(Regexp.escape("Please enter the location of the existing admin client's private key: [#{default_admin_key}]"))
121
+ expect(@out.string).not_to match(Regexp.escape("Please enter the location of the existing admin client's private key: [#{default_admin_key}]"))
122
122
  if windows?
123
- @knife.admin_client_key.should_not == default_admin_key_win32
123
+ expect(@knife.admin_client_key).not_to eq(default_admin_key_win32)
124
124
  else
125
- @knife.admin_client_key.should_not == default_admin_key
125
+ expect(@knife.admin_client_key).not_to eq(default_admin_key)
126
126
  end
127
127
  end
128
128
 
129
129
  it "asks the user for the location of a chef repo" do
130
130
  @knife.ask_user_for_config
131
- @out.string.should match(Regexp.escape("Please enter the path to a chef repository (or leave blank):"))
132
- @knife.chef_repo.should == ''
131
+ expect(@out.string).to match(Regexp.escape("Please enter the path to a chef repository (or leave blank):"))
132
+ expect(@knife.chef_repo).to eq('')
133
133
  end
134
134
 
135
135
  it "asks the users for the name of the validation client" do
136
136
  @knife.ask_user_for_config
137
- @out.string.should match(Regexp.escape("Please enter the validation clientname: [chef-validator]"))
138
- @knife.validation_client_name.should == 'chef-validator'
137
+ expect(@out.string).to match(Regexp.escape("Please enter the validation clientname: [chef-validator]"))
138
+ expect(@knife.validation_client_name).to eq('chef-validator')
139
139
  end
140
140
 
141
141
  it "should not ask the users for the name of the validation client if --validation_client_name is specified" do
142
142
  @knife.config[:validation_client_name] = 'my-validator'
143
143
  @knife.ask_user_for_config
144
- @out.string.should_not match(Regexp.escape("Please enter the validation clientname:"))
145
- @knife.validation_client_name.should == 'my-validator'
144
+ expect(@out.string).not_to match(Regexp.escape("Please enter the validation clientname:"))
145
+ expect(@knife.validation_client_name).to eq('my-validator')
146
146
  end
147
147
 
148
148
  it "asks the users for the location of the validation key" do
149
149
  @knife.ask_user_for_config
150
- @out.string.should match(Regexp.escape("Please enter the location of the validation key: [#{default_validator_key}]"))
150
+ expect(@out.string).to match(Regexp.escape("Please enter the location of the validation key: [#{default_validator_key}]"))
151
151
  if windows?
152
- @knife.validation_key.capitalize.should == default_validator_key_win32.capitalize
152
+ expect(@knife.validation_key.capitalize).to eq(default_validator_key_win32.capitalize)
153
153
  else
154
- @knife.validation_key.should == default_validator_key
154
+ expect(@knife.validation_key).to eq(default_validator_key)
155
155
  end
156
156
  end
157
157
 
158
158
  it "should not ask the users for the location of the validation key if --validation_key is specified" do
159
159
  @knife.config[:validation_key] = '/home/you/.chef/my-validation.pem'
160
160
  @knife.ask_user_for_config
161
- @out.string.should_not match(Regexp.escape("Please enter the location of the validation key:"))
161
+ expect(@out.string).not_to match(Regexp.escape("Please enter the location of the validation key:"))
162
162
  if windows?
163
- @knife.validation_key.should match %r{^[A-Za-z]:/home/you/\.chef/my-validation\.pem$}
163
+ expect(@knife.validation_key).to match %r{^[A-Za-z]:/home/you/\.chef/my-validation\.pem$}
164
164
  else
165
- @knife.validation_key.should == '/home/you/.chef/my-validation.pem'
165
+ expect(@knife.validation_key).to eq('/home/you/.chef/my-validation.pem')
166
166
  end
167
167
  end
168
168
 
@@ -176,68 +176,68 @@ describe Chef::Knife::Configure do
176
176
  @knife.config[:validation_key] = '/home/you/.chef/my-validation.pem'
177
177
  @knife.config[:repository] = ''
178
178
  @knife.config[:client_key] = '/home/you/a-new-user.pem'
179
- Etc.stub(:getlogin).and_return('a-new-user')
179
+ allow(Etc).to receive(:getlogin).and_return('a-new-user')
180
180
 
181
181
  @knife.ask_user_for_config
182
- @out.string.should match(/\s*/)
182
+ expect(@out.string).to match(/\s*/)
183
183
 
184
- @knife.new_client_name.should == 'testnode'
185
- @knife.chef_server.should == 'http://localhost:5000'
186
- @knife.admin_client_name.should == 'my-webui'
184
+ expect(@knife.new_client_name).to eq('testnode')
185
+ expect(@knife.chef_server).to eq('http://localhost:5000')
186
+ expect(@knife.admin_client_name).to eq('my-webui')
187
187
  if windows?
188
- @knife.admin_client_key.should match %r{^[A-Za-z]:/home/you/\.chef/my-webui\.pem$}
189
- @knife.validation_key.should match %r{^[A-Za-z]:/home/you/\.chef/my-validation\.pem$}
190
- @knife.new_client_key.should match %r{^[A-Za-z]:/home/you/a-new-user\.pem$}
188
+ expect(@knife.admin_client_key).to match %r{^[A-Za-z]:/home/you/\.chef/my-webui\.pem$}
189
+ expect(@knife.validation_key).to match %r{^[A-Za-z]:/home/you/\.chef/my-validation\.pem$}
190
+ expect(@knife.new_client_key).to match %r{^[A-Za-z]:/home/you/a-new-user\.pem$}
191
191
  else
192
- @knife.admin_client_key.should == '/home/you/.chef/my-webui.pem'
193
- @knife.validation_key.should == '/home/you/.chef/my-validation.pem'
194
- @knife.new_client_key.should == '/home/you/a-new-user.pem'
192
+ expect(@knife.admin_client_key).to eq('/home/you/.chef/my-webui.pem')
193
+ expect(@knife.validation_key).to eq('/home/you/.chef/my-validation.pem')
194
+ expect(@knife.new_client_key).to eq('/home/you/a-new-user.pem')
195
195
  end
196
- @knife.validation_client_name.should == 'my-validator'
197
- @knife.chef_repo.should == ''
196
+ expect(@knife.validation_client_name).to eq('my-validator')
197
+ expect(@knife.chef_repo).to eq('')
198
198
  end
199
199
 
200
200
  it "writes the new data to a config file" do
201
- File.stub(:expand_path).with("/home/you/.chef/knife.rb").and_return("/home/you/.chef/knife.rb")
202
- File.stub(:expand_path).with("/home/you/.chef/#{Etc.getlogin}.pem").and_return("/home/you/.chef/#{Etc.getlogin}.pem")
203
- File.stub(:expand_path).with(default_validator_key).and_return(default_validator_key)
204
- File.stub(:expand_path).with(default_admin_key).and_return(default_admin_key)
205
- FileUtils.should_receive(:mkdir_p).with("/home/you/.chef")
201
+ allow(File).to receive(:expand_path).with("/home/you/.chef/knife.rb").and_return("/home/you/.chef/knife.rb")
202
+ allow(File).to receive(:expand_path).with("/home/you/.chef/#{Etc.getlogin}.pem").and_return("/home/you/.chef/#{Etc.getlogin}.pem")
203
+ allow(File).to receive(:expand_path).with(default_validator_key).and_return(default_validator_key)
204
+ allow(File).to receive(:expand_path).with(default_admin_key).and_return(default_admin_key)
205
+ expect(FileUtils).to receive(:mkdir_p).with("/home/you/.chef")
206
206
  config_file = StringIO.new
207
- ::File.should_receive(:open).with("/home/you/.chef/knife.rb", "w").and_yield config_file
207
+ expect(::File).to receive(:open).with("/home/you/.chef/knife.rb", "w").and_yield config_file
208
208
  @knife.config[:repository] = '/home/you/chef-repo'
209
209
  @knife.run
210
- config_file.string.should match(/^node_name[\s]+'#{Etc.getlogin}'$/)
211
- config_file.string.should match(%r{^client_key[\s]+'/home/you/.chef/#{Etc.getlogin}.pem'$})
212
- config_file.string.should match(/^validation_client_name\s+'chef-validator'$/)
213
- config_file.string.should match(%r{^validation_key\s+'#{default_validator_key}'$})
214
- config_file.string.should match(%r{^chef_server_url\s+'#{default_server_url}'$})
215
- config_file.string.should match(%r{cookbook_path\s+\[ '/home/you/chef-repo/cookbooks' \]})
210
+ expect(config_file.string).to match(/^node_name[\s]+'#{Etc.getlogin}'$/)
211
+ expect(config_file.string).to match(%r{^client_key[\s]+'/home/you/.chef/#{Etc.getlogin}.pem'$})
212
+ expect(config_file.string).to match(/^validation_client_name\s+'chef-validator'$/)
213
+ expect(config_file.string).to match(%r{^validation_key\s+'#{default_validator_key}'$})
214
+ expect(config_file.string).to match(%r{^chef_server_url\s+'#{default_server_url}'$})
215
+ expect(config_file.string).to match(%r{cookbook_path\s+\[ '/home/you/chef-repo/cookbooks' \]})
216
216
  end
217
217
 
218
218
  it "creates a new client when given the --initial option" do
219
- File.should_receive(:expand_path).with("/home/you/.chef/knife.rb").and_return("/home/you/.chef/knife.rb")
220
- File.should_receive(:expand_path).with("/home/you/.chef/a-new-user.pem").and_return("/home/you/.chef/a-new-user.pem")
221
- File.should_receive(:expand_path).with(default_validator_key).and_return(default_validator_key)
222
- File.should_receive(:expand_path).with(default_admin_key).and_return(default_admin_key)
219
+ expect(File).to receive(:expand_path).with("/home/you/.chef/knife.rb").and_return("/home/you/.chef/knife.rb")
220
+ expect(File).to receive(:expand_path).with("/home/you/.chef/a-new-user.pem").and_return("/home/you/.chef/a-new-user.pem")
221
+ expect(File).to receive(:expand_path).with(default_validator_key).and_return(default_validator_key)
222
+ expect(File).to receive(:expand_path).with(default_admin_key).and_return(default_admin_key)
223
223
  Chef::Config[:node_name] = "webmonkey.example.com"
224
224
 
225
225
  user_command = Chef::Knife::UserCreate.new
226
- user_command.should_receive(:run)
226
+ expect(user_command).to receive(:run)
227
227
 
228
- Etc.stub(:getlogin).and_return("a-new-user")
228
+ allow(Etc).to receive(:getlogin).and_return("a-new-user")
229
229
 
230
- Chef::Knife::UserCreate.stub(:new).and_return(user_command)
231
- FileUtils.should_receive(:mkdir_p).with("/home/you/.chef")
232
- ::File.should_receive(:open).with("/home/you/.chef/knife.rb", "w")
230
+ allow(Chef::Knife::UserCreate).to receive(:new).and_return(user_command)
231
+ expect(FileUtils).to receive(:mkdir_p).with("/home/you/.chef")
232
+ expect(::File).to receive(:open).with("/home/you/.chef/knife.rb", "w")
233
233
  @knife.config[:initial] = true
234
234
  @knife.config[:user_password] = "blah"
235
235
  @knife.run
236
- user_command.name_args.should == Array("a-new-user")
237
- user_command.config[:user_password].should == "blah"
238
- user_command.config[:admin].should be_true
239
- user_command.config[:file].should == "/home/you/.chef/a-new-user.pem"
240
- user_command.config[:yes].should be_true
241
- user_command.config[:disable_editing].should be_true
236
+ expect(user_command.name_args).to eq(Array("a-new-user"))
237
+ expect(user_command.config[:user_password]).to eq("blah")
238
+ expect(user_command.config[:admin]).to be_truthy
239
+ expect(user_command.config[:file]).to eq("/home/you/.chef/a-new-user.pem")
240
+ expect(user_command.config[:yes]).to be_truthy
241
+ expect(user_command.config[:disable_editing]).to be_truthy
242
242
  end
243
243
  end
@@ -28,19 +28,19 @@ describe Chef::Knife::CookbookBulkDelete do
28
28
  @knife.name_args = ["."]
29
29
  @stdout = StringIO.new
30
30
  @stderr = StringIO.new
31
- @knife.ui.stub(:stdout).and_return(@stdout)
32
- @knife.ui.stub(:stderr).and_return(@stderr)
33
- @knife.ui.stub(:confirm).and_return(true)
31
+ allow(@knife.ui).to receive(:stdout).and_return(@stdout)
32
+ allow(@knife.ui).to receive(:stderr).and_return(@stderr)
33
+ allow(@knife.ui).to receive(:confirm).and_return(true)
34
34
  @cookbooks = Hash.new
35
35
  %w{cheezburger pizza lasagna}.each do |cookbook_name|
36
36
  cookbook = Chef::CookbookVersion.new(cookbook_name)
37
37
  @cookbooks[cookbook_name] = cookbook
38
38
  end
39
39
  @rest = double("Chef::REST")
40
- @rest.stub(:get_rest).and_return(@cookbooks)
41
- @rest.stub(:delete_rest).and_return(true)
42
- @knife.stub(:rest).and_return(@rest)
43
- Chef::CookbookVersion.stub(:list).and_return(@cookbooks)
40
+ allow(@rest).to receive(:get_rest).and_return(@cookbooks)
41
+ allow(@rest).to receive(:delete_rest).and_return(true)
42
+ allow(@knife).to receive(:rest).and_return(@rest)
43
+ allow(Chef::CookbookVersion).to receive(:list).and_return(@cookbooks)
44
44
 
45
45
  end
46
46
 
@@ -49,41 +49,41 @@ describe Chef::Knife::CookbookBulkDelete do
49
49
  describe "when there are several cookbooks on the server" do
50
50
  before do
51
51
  @cheezburger = {'cheezburger' => {"url" => "file:///dev/null", "versions" => [{"url" => "file:///dev/null-cheez", "version" => "1.0.0"}]}}
52
- @rest.stub(:get_rest).with('cookbooks/cheezburger').and_return(@cheezburger)
52
+ allow(@rest).to receive(:get_rest).with('cookbooks/cheezburger').and_return(@cheezburger)
53
53
  @pizza = {'pizza' => {"url" => "file:///dev/null", "versions" => [{"url" => "file:///dev/null-pizza", "version" => "2.0.0"}]}}
54
- @rest.stub(:get_rest).with('cookbooks/pizza').and_return(@pizza)
54
+ allow(@rest).to receive(:get_rest).with('cookbooks/pizza').and_return(@pizza)
55
55
  @lasagna = {'lasagna' => {"url" => "file:///dev/null", "versions" => [{"url" => "file:///dev/null-lasagna", "version" => "3.0.0"}]}}
56
- @rest.stub(:get_rest).with('cookbooks/lasagna').and_return(@lasagna)
56
+ allow(@rest).to receive(:get_rest).with('cookbooks/lasagna').and_return(@lasagna)
57
57
  end
58
58
 
59
59
  it "should print the cookbooks you are about to delete" do
60
60
  expected = @knife.ui.list(@cookbooks.keys.sort, :columns_down)
61
61
  @knife.run
62
- @stdout.string.should match(/#{expected}/)
62
+ expect(@stdout.string).to match(/#{expected}/)
63
63
  end
64
64
 
65
65
  it "should confirm you really want to delete them" do
66
- @knife.ui.should_receive(:confirm)
66
+ expect(@knife.ui).to receive(:confirm)
67
67
  @knife.run
68
68
  end
69
69
 
70
70
  it "should delete each cookbook" do
71
71
  {"cheezburger" => "1.0.0", "pizza" => "2.0.0", "lasagna" => '3.0.0'}.each do |cookbook_name, version|
72
- @rest.should_receive(:delete_rest).with("cookbooks/#{cookbook_name}/#{version}")
72
+ expect(@rest).to receive(:delete_rest).with("cookbooks/#{cookbook_name}/#{version}")
73
73
  end
74
74
  @knife.run
75
75
  end
76
76
 
77
77
  it "should only delete cookbooks that match the regex" do
78
78
  @knife.name_args = ["cheezburger"]
79
- @rest.should_receive(:delete_rest).with('cookbooks/cheezburger/1.0.0')
79
+ expect(@rest).to receive(:delete_rest).with('cookbooks/cheezburger/1.0.0')
80
80
  @knife.run
81
81
  end
82
82
  end
83
83
 
84
84
  it "should exit if the regex is not provided" do
85
85
  @knife.name_args = []
86
- lambda { @knife.run }.should raise_error(SystemExit)
86
+ expect { @knife.run }.to raise_error(SystemExit)
87
87
  end
88
88
 
89
89
  end
@@ -26,29 +26,29 @@ describe Chef::Knife::CookbookCreate do
26
26
  @knife.config = {}
27
27
  @knife.name_args = ["foobar"]
28
28
  @stdout = StringIO.new
29
- @knife.stub(:stdout).and_return(@stdout)
29
+ allow(@knife).to receive(:stdout).and_return(@stdout)
30
30
  end
31
31
 
32
32
  describe "run" do
33
33
 
34
34
  # Fixes CHEF-2579
35
35
  it "should expand the path of the cookbook directory" do
36
- File.should_receive(:expand_path).with("~/tmp/monkeypants")
36
+ expect(File).to receive(:expand_path).with("~/tmp/monkeypants")
37
37
  @knife.config = {:cookbook_path => "~/tmp/monkeypants"}
38
- @knife.stub(:create_cookbook)
39
- @knife.stub(:create_readme)
40
- @knife.stub(:create_changelog)
41
- @knife.stub(:create_metadata)
38
+ allow(@knife).to receive(:create_cookbook)
39
+ allow(@knife).to receive(:create_readme)
40
+ allow(@knife).to receive(:create_changelog)
41
+ allow(@knife).to receive(:create_metadata)
42
42
  @knife.run
43
43
  end
44
44
 
45
45
  it "should create a new cookbook with default values to copyright name, email, readme format and license if those are not supplied" do
46
46
  @dir = Dir.tmpdir
47
47
  @knife.config = {:cookbook_path => @dir}
48
- @knife.should_receive(:create_cookbook).with(@dir, @knife.name_args.first, "YOUR_COMPANY_NAME", "none")
49
- @knife.should_receive(:create_readme).with(@dir, @knife.name_args.first, "md")
50
- @knife.should_receive(:create_changelog).with(@dir, @knife.name_args.first)
51
- @knife.should_receive(:create_metadata).with(@dir, @knife.name_args.first, "YOUR_COMPANY_NAME", "YOUR_EMAIL", "none", "md")
48
+ expect(@knife).to receive(:create_cookbook).with(@dir, @knife.name_args.first, "YOUR_COMPANY_NAME", "none")
49
+ expect(@knife).to receive(:create_readme).with(@dir, @knife.name_args.first, "md")
50
+ expect(@knife).to receive(:create_changelog).with(@dir, @knife.name_args.first)
51
+ expect(@knife).to receive(:create_metadata).with(@dir, @knife.name_args.first, "YOUR_COMPANY_NAME", "YOUR_EMAIL", "none", "md")
52
52
  @knife.run
53
53
  end
54
54
 
@@ -59,10 +59,10 @@ describe Chef::Knife::CookbookCreate do
59
59
  :cookbook_copyright => "Opscode, Inc"
60
60
  }
61
61
  @knife.name_args=["foobar"]
62
- @knife.should_receive(:create_cookbook).with(@dir, @knife.name_args.first, "Opscode, Inc", "none")
63
- @knife.should_receive(:create_readme).with(@dir, @knife.name_args.first, "md")
64
- @knife.should_receive(:create_changelog).with(@dir, @knife.name_args.first)
65
- @knife.should_receive(:create_metadata).with(@dir, @knife.name_args.first, "Opscode, Inc", "YOUR_EMAIL", "none", "md")
62
+ expect(@knife).to receive(:create_cookbook).with(@dir, @knife.name_args.first, "Opscode, Inc", "none")
63
+ expect(@knife).to receive(:create_readme).with(@dir, @knife.name_args.first, "md")
64
+ expect(@knife).to receive(:create_changelog).with(@dir, @knife.name_args.first)
65
+ expect(@knife).to receive(:create_metadata).with(@dir, @knife.name_args.first, "Opscode, Inc", "YOUR_EMAIL", "none", "md")
66
66
  @knife.run
67
67
  end
68
68
 
@@ -74,10 +74,10 @@ describe Chef::Knife::CookbookCreate do
74
74
  :cookbook_email => "nuo@opscode.com"
75
75
  }
76
76
  @knife.name_args=["foobar"]
77
- @knife.should_receive(:create_cookbook).with(@dir, @knife.name_args.first, "Opscode, Inc", "none")
78
- @knife.should_receive(:create_readme).with(@dir, @knife.name_args.first, "md")
79
- @knife.should_receive(:create_changelog).with(@dir, @knife.name_args.first)
80
- @knife.should_receive(:create_metadata).with(@dir, @knife.name_args.first, "Opscode, Inc", "nuo@opscode.com", "none", "md")
77
+ expect(@knife).to receive(:create_cookbook).with(@dir, @knife.name_args.first, "Opscode, Inc", "none")
78
+ expect(@knife).to receive(:create_readme).with(@dir, @knife.name_args.first, "md")
79
+ expect(@knife).to receive(:create_changelog).with(@dir, @knife.name_args.first)
80
+ expect(@knife).to receive(:create_metadata).with(@dir, @knife.name_args.first, "Opscode, Inc", "nuo@opscode.com", "none", "md")
81
81
  @knife.run
82
82
  end
83
83
 
@@ -90,10 +90,10 @@ describe Chef::Knife::CookbookCreate do
90
90
  :cookbook_license => "apachev2"
91
91
  }
92
92
  @knife.name_args=["foobar"]
93
- @knife.should_receive(:create_cookbook).with(@dir, @knife.name_args.first, "Opscode, Inc", "apachev2")
94
- @knife.should_receive(:create_readme).with(@dir, @knife.name_args.first, "md")
95
- @knife.should_receive(:create_changelog).with(@dir, @knife.name_args.first)
96
- @knife.should_receive(:create_metadata).with(@dir, @knife.name_args.first, "Opscode, Inc", "nuo@opscode.com", "apachev2", "md")
93
+ expect(@knife).to receive(:create_cookbook).with(@dir, @knife.name_args.first, "Opscode, Inc", "apachev2")
94
+ expect(@knife).to receive(:create_readme).with(@dir, @knife.name_args.first, "md")
95
+ expect(@knife).to receive(:create_changelog).with(@dir, @knife.name_args.first)
96
+ expect(@knife).to receive(:create_metadata).with(@dir, @knife.name_args.first, "Opscode, Inc", "nuo@opscode.com", "apachev2", "md")
97
97
  @knife.run
98
98
  end
99
99
 
@@ -106,10 +106,10 @@ describe Chef::Knife::CookbookCreate do
106
106
  :cookbook_license => false
107
107
  }
108
108
  @knife.name_args=["foobar"]
109
- @knife.should_receive(:create_cookbook).with(@dir, @knife.name_args.first, "Opscode, Inc", "none")
110
- @knife.should_receive(:create_readme).with(@dir, @knife.name_args.first, "md")
111
- @knife.should_receive(:create_changelog).with(@dir, @knife.name_args.first)
112
- @knife.should_receive(:create_metadata).with(@dir, @knife.name_args.first, "Opscode, Inc", "nuo@opscode.com", "none", "md")
109
+ expect(@knife).to receive(:create_cookbook).with(@dir, @knife.name_args.first, "Opscode, Inc", "none")
110
+ expect(@knife).to receive(:create_readme).with(@dir, @knife.name_args.first, "md")
111
+ expect(@knife).to receive(:create_changelog).with(@dir, @knife.name_args.first)
112
+ expect(@knife).to receive(:create_metadata).with(@dir, @knife.name_args.first, "Opscode, Inc", "nuo@opscode.com", "none", "md")
113
113
  @knife.run
114
114
  end
115
115
 
@@ -122,10 +122,10 @@ describe Chef::Knife::CookbookCreate do
122
122
  :cookbook_license => "false"
123
123
  }
124
124
  @knife.name_args=["foobar"]
125
- @knife.should_receive(:create_cookbook).with(@dir, @knife.name_args.first, "Opscode, Inc", "none")
126
- @knife.should_receive(:create_readme).with(@dir, @knife.name_args.first, "md")
127
- @knife.should_receive(:create_changelog).with(@dir, @knife.name_args.first)
128
- @knife.should_receive(:create_metadata).with(@dir, @knife.name_args.first, "Opscode, Inc", "nuo@opscode.com", "none", "md")
125
+ expect(@knife).to receive(:create_cookbook).with(@dir, @knife.name_args.first, "Opscode, Inc", "none")
126
+ expect(@knife).to receive(:create_readme).with(@dir, @knife.name_args.first, "md")
127
+ expect(@knife).to receive(:create_changelog).with(@dir, @knife.name_args.first)
128
+ expect(@knife).to receive(:create_metadata).with(@dir, @knife.name_args.first, "Opscode, Inc", "nuo@opscode.com", "none", "md")
129
129
  @knife.run
130
130
  end
131
131
 
@@ -138,10 +138,10 @@ describe Chef::Knife::CookbookCreate do
138
138
  :cookbook_license => "gplv2"
139
139
  }
140
140
  @knife.name_args=["foobar"]
141
- @knife.should_receive(:create_cookbook).with(@dir, @knife.name_args.first, "Opscode, Inc", "gplv2")
142
- @knife.should_receive(:create_readme).with(@dir, @knife.name_args.first, "md")
143
- @knife.should_receive(:create_changelog).with(@dir, @knife.name_args.first)
144
- @knife.should_receive(:create_metadata).with(@dir, @knife.name_args.first, "Opscode, Inc", "nuo@opscode.com", "gplv2", "md")
141
+ expect(@knife).to receive(:create_cookbook).with(@dir, @knife.name_args.first, "Opscode, Inc", "gplv2")
142
+ expect(@knife).to receive(:create_readme).with(@dir, @knife.name_args.first, "md")
143
+ expect(@knife).to receive(:create_changelog).with(@dir, @knife.name_args.first)
144
+ expect(@knife).to receive(:create_metadata).with(@dir, @knife.name_args.first, "Opscode, Inc", "nuo@opscode.com", "gplv2", "md")
145
145
  @knife.run
146
146
  end
147
147
 
@@ -154,10 +154,10 @@ describe Chef::Knife::CookbookCreate do
154
154
  :cookbook_license => "gplv3"
155
155
  }
156
156
  @knife.name_args=["foobar"]
157
- @knife.should_receive(:create_cookbook).with(@dir, @knife.name_args.first, "Opscode, Inc", "gplv3")
158
- @knife.should_receive(:create_readme).with(@dir, @knife.name_args.first, "md")
159
- @knife.should_receive(:create_changelog).with(@dir, @knife.name_args.first)
160
- @knife.should_receive(:create_metadata).with(@dir, @knife.name_args.first, "Opscode, Inc", "nuo@opscode.com", "gplv3", "md")
157
+ expect(@knife).to receive(:create_cookbook).with(@dir, @knife.name_args.first, "Opscode, Inc", "gplv3")
158
+ expect(@knife).to receive(:create_readme).with(@dir, @knife.name_args.first, "md")
159
+ expect(@knife).to receive(:create_changelog).with(@dir, @knife.name_args.first)
160
+ expect(@knife).to receive(:create_metadata).with(@dir, @knife.name_args.first, "Opscode, Inc", "nuo@opscode.com", "gplv3", "md")
161
161
  @knife.run
162
162
  end
163
163
 
@@ -170,10 +170,10 @@ describe Chef::Knife::CookbookCreate do
170
170
  :cookbook_license => "mit"
171
171
  }
172
172
  @knife.name_args=["foobar"]
173
- @knife.should_receive(:create_cookbook).with(@dir, @knife.name_args.first, "Opscode, Inc", "mit")
174
- @knife.should_receive(:create_readme).with(@dir, @knife.name_args.first, "md")
175
- @knife.should_receive(:create_changelog).with(@dir, @knife.name_args.first)
176
- @knife.should_receive(:create_metadata).with(@dir, @knife.name_args.first, "Opscode, Inc", "nuo@opscode.com", "mit", "md")
173
+ expect(@knife).to receive(:create_cookbook).with(@dir, @knife.name_args.first, "Opscode, Inc", "mit")
174
+ expect(@knife).to receive(:create_readme).with(@dir, @knife.name_args.first, "md")
175
+ expect(@knife).to receive(:create_changelog).with(@dir, @knife.name_args.first)
176
+ expect(@knife).to receive(:create_metadata).with(@dir, @knife.name_args.first, "Opscode, Inc", "nuo@opscode.com", "mit", "md")
177
177
  @knife.run
178
178
  end
179
179
 
@@ -187,10 +187,10 @@ describe Chef::Knife::CookbookCreate do
187
187
  :readme_format => "rdoc"
188
188
  }
189
189
  @knife.name_args=["foobar"]
190
- @knife.should_receive(:create_cookbook).with(@dir, @knife.name_args.first, "Opscode, Inc", "mit")
191
- @knife.should_receive(:create_readme).with(@dir, @knife.name_args.first, "rdoc")
192
- @knife.should_receive(:create_changelog).with(@dir, @knife.name_args.first)
193
- @knife.should_receive(:create_metadata).with(@dir, @knife.name_args.first, "Opscode, Inc", "nuo@opscode.com", "mit", "rdoc")
190
+ expect(@knife).to receive(:create_cookbook).with(@dir, @knife.name_args.first, "Opscode, Inc", "mit")
191
+ expect(@knife).to receive(:create_readme).with(@dir, @knife.name_args.first, "rdoc")
192
+ expect(@knife).to receive(:create_changelog).with(@dir, @knife.name_args.first)
193
+ expect(@knife).to receive(:create_metadata).with(@dir, @knife.name_args.first, "Opscode, Inc", "nuo@opscode.com", "mit", "rdoc")
194
194
  @knife.run
195
195
  end
196
196
 
@@ -204,10 +204,10 @@ describe Chef::Knife::CookbookCreate do
204
204
  :readme_format => "mkd"
205
205
  }
206
206
  @knife.name_args=["foobar"]
207
- @knife.should_receive(:create_cookbook).with(@dir, @knife.name_args.first, "Opscode, Inc", "mit")
208
- @knife.should_receive(:create_readme).with(@dir, @knife.name_args.first, "mkd")
209
- @knife.should_receive(:create_changelog).with(@dir, @knife.name_args.first)
210
- @knife.should_receive(:create_metadata).with(@dir, @knife.name_args.first, "Opscode, Inc", "nuo@opscode.com", "mit", "mkd")
207
+ expect(@knife).to receive(:create_cookbook).with(@dir, @knife.name_args.first, "Opscode, Inc", "mit")
208
+ expect(@knife).to receive(:create_readme).with(@dir, @knife.name_args.first, "mkd")
209
+ expect(@knife).to receive(:create_changelog).with(@dir, @knife.name_args.first)
210
+ expect(@knife).to receive(:create_metadata).with(@dir, @knife.name_args.first, "Opscode, Inc", "nuo@opscode.com", "mit", "mkd")
211
211
  @knife.run
212
212
  end
213
213
 
@@ -221,10 +221,10 @@ describe Chef::Knife::CookbookCreate do
221
221
  :readme_format => "txt"
222
222
  }
223
223
  @knife.name_args=["foobar"]
224
- @knife.should_receive(:create_cookbook).with(@dir, @knife.name_args.first, "Opscode, Inc", "mit")
225
- @knife.should_receive(:create_readme).with(@dir, @knife.name_args.first, "txt")
226
- @knife.should_receive(:create_changelog).with(@dir, @knife.name_args.first)
227
- @knife.should_receive(:create_metadata).with(@dir, @knife.name_args.first, "Opscode, Inc", "nuo@opscode.com", "mit", "txt")
224
+ expect(@knife).to receive(:create_cookbook).with(@dir, @knife.name_args.first, "Opscode, Inc", "mit")
225
+ expect(@knife).to receive(:create_readme).with(@dir, @knife.name_args.first, "txt")
226
+ expect(@knife).to receive(:create_changelog).with(@dir, @knife.name_args.first)
227
+ expect(@knife).to receive(:create_metadata).with(@dir, @knife.name_args.first, "Opscode, Inc", "nuo@opscode.com", "mit", "txt")
228
228
  @knife.run
229
229
  end
230
230
 
@@ -238,10 +238,10 @@ describe Chef::Knife::CookbookCreate do
238
238
  :readme_format => "foo"
239
239
  }
240
240
  @knife.name_args=["foobar"]
241
- @knife.should_receive(:create_cookbook).with(@dir, @knife.name_args.first, "Opscode, Inc", "mit")
242
- @knife.should_receive(:create_readme).with(@dir, @knife.name_args.first, "foo")
243
- @knife.should_receive(:create_changelog).with(@dir, @knife.name_args.first)
244
- @knife.should_receive(:create_metadata).with(@dir, @knife.name_args.first, "Opscode, Inc", "nuo@opscode.com", "mit", "foo")
241
+ expect(@knife).to receive(:create_cookbook).with(@dir, @knife.name_args.first, "Opscode, Inc", "mit")
242
+ expect(@knife).to receive(:create_readme).with(@dir, @knife.name_args.first, "foo")
243
+ expect(@knife).to receive(:create_changelog).with(@dir, @knife.name_args.first)
244
+ expect(@knife).to receive(:create_metadata).with(@dir, @knife.name_args.first, "Opscode, Inc", "nuo@opscode.com", "mit", "foo")
245
245
  @knife.run
246
246
  end
247
247
 
@@ -252,7 +252,7 @@ describe Chef::Knife::CookbookCreate do
252
252
 
253
253
  it "should throw an argument error" do
254
254
  @dir = Dir.tmpdir
255
- lambda{@knife.run}.should raise_error(ArgumentError)
255
+ expect{@knife.run}.to raise_error(ArgumentError)
256
256
  end
257
257
  end
258
258