chef 11.10.0.rc.0 → 11.10.0.rc.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (401) hide show
  1. data/Rakefile +0 -75
  2. data/distro/common/html/_sources/ctl_chef_client.txt +36 -0
  3. data/distro/common/html/_sources/ctl_chef_server.txt +26 -0
  4. data/distro/common/html/_sources/ctl_chef_shell.txt +15 -0
  5. data/distro/common/html/_sources/ctl_chef_solo.txt +25 -0
  6. data/distro/common/html/_sources/index.txt +126 -0
  7. data/distro/common/html/_sources/knife.txt +74 -0
  8. data/distro/common/html/_sources/knife_bootstrap.txt +56 -0
  9. data/distro/common/html/_sources/knife_client.txt +151 -0
  10. data/distro/common/html/_sources/knife_common_options.txt +6 -0
  11. data/distro/common/html/_sources/knife_configure.txt +29 -0
  12. data/distro/common/html/_sources/knife_cookbook.txt +236 -0
  13. data/distro/common/html/_sources/knife_cookbook_site.txt +157 -0
  14. data/distro/common/html/_sources/knife_data_bag.txt +160 -0
  15. data/distro/common/html/_sources/knife_delete.txt +26 -0
  16. data/distro/common/html/_sources/knife_deps.txt +61 -0
  17. data/distro/common/html/_sources/knife_diff.txt +34 -0
  18. data/distro/common/html/_sources/knife_download.txt +44 -0
  19. data/distro/common/html/_sources/knife_edit.txt +26 -0
  20. data/distro/common/html/_sources/knife_environment.txt +158 -0
  21. data/distro/common/html/_sources/knife_exec.txt +47 -0
  22. data/distro/common/html/_sources/knife_index_rebuild.txt +21 -0
  23. data/distro/common/html/_sources/knife_list.txt +33 -0
  24. data/distro/common/html/_sources/knife_node.txt +250 -0
  25. data/distro/common/html/_sources/knife_raw.txt +35 -0
  26. data/distro/common/html/_sources/knife_recipe_list.txt +23 -0
  27. data/distro/common/html/_sources/knife_role.txt +157 -0
  28. data/distro/common/html/_sources/knife_search.txt +53 -0
  29. data/distro/common/html/_sources/knife_show.txt +27 -0
  30. data/distro/common/html/_sources/knife_ssh.txt +43 -0
  31. data/distro/common/html/_sources/knife_status.txt +37 -0
  32. data/distro/common/html/_sources/knife_tag.txt +69 -0
  33. data/distro/common/html/_sources/knife_upload.txt +49 -0
  34. data/distro/common/html/_sources/knife_user.txt +127 -0
  35. data/distro/common/html/_sources/knife_using.txt +43 -0
  36. data/distro/common/html/_sources/knife_xargs.txt +30 -0
  37. data/distro/common/html/_static/ajax-loader.gif +0 -0
  38. data/distro/common/html/_static/basic.css +540 -0
  39. data/distro/common/html/_static/chef.css +507 -0
  40. data/distro/common/html/_static/chef.ico +0 -0
  41. data/distro/common/html/_static/chef_html_logo.png +0 -0
  42. data/distro/common/html/_static/chef_logo.png +0 -0
  43. data/distro/common/html/_static/comment-bright.png +0 -0
  44. data/distro/common/html/_static/comment-close.png +0 -0
  45. data/distro/common/html/_static/comment.png +0 -0
  46. data/distro/common/html/_static/contents.png +0 -0
  47. data/distro/common/html/_static/doctools.js +247 -0
  48. data/distro/common/html/_static/down-pressed.png +0 -0
  49. data/distro/common/html/_static/down.png +0 -0
  50. data/distro/common/html/_static/file.png +0 -0
  51. data/distro/common/html/_static/guide.css +505 -0
  52. data/distro/common/html/_static/jquery.js +154 -0
  53. data/distro/common/html/_static/minus.png +0 -0
  54. data/distro/common/html/_static/navigation.png +0 -0
  55. data/distro/common/html/_static/plus.png +0 -0
  56. data/distro/common/html/_static/pygments.css +62 -0
  57. data/distro/common/html/_static/searchtools.js +560 -0
  58. data/distro/common/html/_static/underscore.js +23 -0
  59. data/distro/common/html/_static/up-pressed.png +0 -0
  60. data/distro/common/html/_static/up.png +0 -0
  61. data/distro/common/html/_static/websupport.js +808 -0
  62. data/distro/common/html/ctl_chef_client.html +219 -0
  63. data/distro/common/html/ctl_chef_server.html +111 -0
  64. data/distro/common/html/ctl_chef_shell.html +120 -0
  65. data/distro/common/html/ctl_chef_solo.html +144 -0
  66. data/distro/common/html/index.html +185 -0
  67. data/distro/common/html/knife.html +172 -0
  68. data/distro/common/html/knife_bootstrap.html +250 -0
  69. data/distro/common/html/knife_client.html +283 -0
  70. data/distro/common/html/knife_common_options.html +98 -0
  71. data/distro/common/html/knife_configure.html +107 -0
  72. data/distro/common/html/knife_cookbook.html +481 -0
  73. data/distro/common/html/knife_cookbook_site.html +372 -0
  74. data/distro/common/html/knife_data_bag.html +359 -0
  75. data/distro/common/html/knife_delete.html +95 -0
  76. data/distro/common/html/knife_deps.html +145 -0
  77. data/distro/common/html/knife_diff.html +125 -0
  78. data/distro/common/html/knife_download.html +147 -0
  79. data/distro/common/html/knife_edit.html +91 -0
  80. data/distro/common/html/knife_environment.html +328 -0
  81. data/distro/common/html/knife_exec.html +222 -0
  82. data/distro/common/html/knife_index_rebuild.html +85 -0
  83. data/distro/common/html/knife_list.html +116 -0
  84. data/distro/common/html/knife_node.html +450 -0
  85. data/distro/common/html/knife_raw.html +112 -0
  86. data/distro/common/html/knife_recipe_list.html +93 -0
  87. data/distro/common/html/knife_role.html +295 -0
  88. data/distro/common/html/knife_search.html +204 -0
  89. data/distro/common/html/knife_show.html +106 -0
  90. data/distro/common/html/knife_ssh.html +179 -0
  91. data/distro/common/html/knife_status.html +142 -0
  92. data/distro/common/html/knife_tag.html +140 -0
  93. data/distro/common/html/knife_upload.html +155 -0
  94. data/distro/common/html/knife_user.html +244 -0
  95. data/distro/common/html/knife_using.html +211 -0
  96. data/distro/common/html/knife_xargs.html +115 -0
  97. data/distro/common/html/objects.inv +0 -0
  98. data/distro/common/html/search.html +84 -0
  99. data/distro/common/html/searchindex.js +1 -0
  100. data/distro/common/man/man1/chef-shell.1 +5 -5
  101. data/distro/common/man/man1/knife-bootstrap.1 +6 -9
  102. data/distro/common/man/man1/knife-client.1 +1 -9
  103. data/distro/common/man/man1/knife-configure.1 +10 -6
  104. data/distro/common/man/man1/knife-cookbook-site.1 +1 -9
  105. data/distro/common/man/man1/knife-cookbook.1 +11 -21
  106. data/distro/common/man/man1/knife-data-bag.1 +8 -22
  107. data/distro/common/man/man1/knife-delete.1 +1 -1
  108. data/distro/common/man/man1/knife-deps.1 +4 -12
  109. data/distro/common/man/man1/knife-diff.1 +1 -1
  110. data/distro/common/man/man1/knife-download.1 +2 -2
  111. data/distro/common/man/man1/knife-edit.1 +1 -1
  112. data/distro/common/man/man1/knife-environment.1 +108 -9
  113. data/distro/common/man/man1/knife-exec.1 +1 -15
  114. data/distro/common/man/man1/knife-index-rebuild.1 +1 -1
  115. data/distro/common/man/man1/knife-list.1 +1 -1
  116. data/distro/common/man/man1/knife-node.1 +3 -13
  117. data/distro/common/man/man1/knife-raw.1 +1 -1
  118. data/distro/common/man/man1/knife-recipe-list.1 +1 -1
  119. data/distro/common/man/man1/knife-role.1 +2 -12
  120. data/distro/common/man/man1/knife-search.1 +5 -5
  121. data/distro/common/man/man1/knife-show.1 +1 -3
  122. data/distro/common/man/man1/knife-ssh.1 +1 -5
  123. data/distro/common/man/man1/knife-status.1 +1 -1
  124. data/distro/common/man/man1/knife-tag.1 +1 -9
  125. data/distro/common/man/man1/knife-upload.1 +7 -9
  126. data/distro/common/man/man1/knife-user.1 +3 -17
  127. data/distro/common/man/man1/knife-xargs.1 +1 -3
  128. data/distro/common/man/man8/chef-client.8 +18 -18
  129. data/distro/common/man/man8/chef-solo.8 +12 -6
  130. data/lib/chef/client.rb +9 -5
  131. data/lib/chef/cookbook_uploader.rb +1 -1
  132. data/lib/chef/dsl/recipe.rb +119 -38
  133. data/lib/chef/exceptions.rb +4 -0
  134. data/lib/chef/policy_builder/expand_node_object.rb +11 -4
  135. data/lib/chef/policy_builder/policyfile.rb +7 -1
  136. data/lib/chef/provider/file.rb +1 -0
  137. data/lib/chef/resource_platform_map.rb +1 -1
  138. data/lib/chef/resource_reporter.rb +2 -2
  139. data/lib/chef/version.rb +1 -1
  140. data/spec/functional/knife/cookbook_delete_spec.rb +9 -9
  141. data/spec/functional/knife/ssh_spec.rb +1 -1
  142. data/spec/functional/resource/link_spec.rb +6 -6
  143. data/spec/functional/resource/registry_spec.rb +7 -7
  144. data/spec/functional/run_lock_spec.rb +1 -1
  145. data/spec/integration/knife/download_spec.rb +1 -1
  146. data/spec/integration/solo/solo_spec.rb +1 -1
  147. data/spec/spec_helper.rb +0 -1
  148. data/spec/stress/win32/file_spec.rb +6 -0
  149. data/spec/support/lib/chef/resource/zen_master.rb +1 -1
  150. data/spec/support/mock/platform.rb +1 -1
  151. data/spec/support/shared/functional/file_resource.rb +0 -2
  152. data/spec/support/shared/functional/securable_resource.rb +2 -2
  153. data/spec/support/shared/unit/api_error_inspector.rb +7 -7
  154. data/spec/support/shared/unit/provider/file.rb +47 -8
  155. data/spec/support/shared/unit/provider/useradd_based_user_provider.rb +23 -23
  156. data/spec/unit/api_client/registration_spec.rb +5 -5
  157. data/spec/unit/api_client_spec.rb +2 -2
  158. data/spec/unit/application/apply.rb +6 -6
  159. data/spec/unit/application/client_spec.rb +6 -6
  160. data/spec/unit/application/knife_spec.rb +5 -5
  161. data/spec/unit/application/solo_spec.rb +13 -13
  162. data/spec/unit/application_spec.rb +19 -19
  163. data/spec/unit/checksum/storage/filesystem_spec.rb +2 -2
  164. data/spec/unit/client_spec.rb +23 -23
  165. data/spec/unit/config_spec.rb +4 -4
  166. data/spec/unit/cookbook/metadata_spec.rb +22 -22
  167. data/spec/unit/cookbook/synchronizer_spec.rb +17 -17
  168. data/spec/unit/daemon_spec.rb +21 -22
  169. data/spec/unit/data_bag_item_spec.rb +8 -8
  170. data/spec/unit/data_bag_spec.rb +6 -6
  171. data/spec/unit/deprecation_spec.rb +1 -1
  172. data/spec/unit/dsl/data_query_spec.rb +1 -1
  173. data/spec/unit/environment_spec.rb +5 -5
  174. data/spec/unit/file_access_control_spec.rb +5 -5
  175. data/spec/unit/file_cache_spec.rb +1 -1
  176. data/spec/unit/file_content_management/deploy/mv_unix_spec.rb +1 -1
  177. data/spec/unit/file_content_management/deploy/mv_windows_spec.rb +12 -12
  178. data/spec/unit/formatters/error_inspectors/compile_error_inspector_spec.rb +4 -4
  179. data/spec/unit/formatters/error_inspectors/cookbook_resolve_error_inspector_spec.rb +4 -4
  180. data/spec/unit/formatters/error_inspectors/cookbook_sync_error_inspector_spec.rb +1 -1
  181. data/spec/unit/formatters/error_inspectors/resource_failure_inspector_spec.rb +6 -6
  182. data/spec/unit/formatters/error_inspectors/run_list_expansion_error_inspector_spec.rb +4 -4
  183. data/spec/unit/handler/json_file_spec.rb +1 -1
  184. data/spec/unit/handler_spec.rb +3 -3
  185. data/spec/unit/knife/bootstrap_spec.rb +17 -17
  186. data/spec/unit/knife/client_bulk_delete_spec.rb +4 -4
  187. data/spec/unit/knife/client_create_spec.rb +7 -7
  188. data/spec/unit/knife/client_reregister_spec.rb +2 -2
  189. data/spec/unit/knife/client_show_spec.rb +1 -1
  190. data/spec/unit/knife/config_file_selection_spec.rb +4 -4
  191. data/spec/unit/knife/configure_client_spec.rb +4 -4
  192. data/spec/unit/knife/configure_spec.rb +16 -16
  193. data/spec/unit/knife/cookbook_bulk_delete_spec.rb +10 -10
  194. data/spec/unit/knife/cookbook_create_spec.rb +5 -5
  195. data/spec/unit/knife/cookbook_delete_spec.rb +6 -6
  196. data/spec/unit/knife/cookbook_download_spec.rb +10 -10
  197. data/spec/unit/knife/cookbook_list_spec.rb +3 -3
  198. data/spec/unit/knife/cookbook_metadata_from_file_spec.rb +2 -2
  199. data/spec/unit/knife/cookbook_metadata_spec.rb +8 -8
  200. data/spec/unit/knife/cookbook_show_spec.rb +4 -4
  201. data/spec/unit/knife/cookbook_site_download_spec.rb +3 -3
  202. data/spec/unit/knife/cookbook_site_install_spec.rb +8 -8
  203. data/spec/unit/knife/cookbook_site_share_spec.rb +22 -22
  204. data/spec/unit/knife/cookbook_site_unshare_spec.rb +8 -8
  205. data/spec/unit/knife/cookbook_test_spec.rb +7 -7
  206. data/spec/unit/knife/cookbook_upload_spec.rb +20 -20
  207. data/spec/unit/knife/core/cookbook_scm_repo_spec.rb +6 -6
  208. data/spec/unit/knife/core/object_loader_spec.rb +1 -1
  209. data/spec/unit/knife/core/ui_spec.rb +19 -21
  210. data/spec/unit/knife/data_bag_create_spec.rb +4 -4
  211. data/spec/unit/knife/data_bag_edit_spec.rb +7 -7
  212. data/spec/unit/knife/data_bag_from_file_spec.rb +15 -15
  213. data/spec/unit/knife/data_bag_show_spec.rb +5 -5
  214. data/spec/unit/knife/environment_create_spec.rb +6 -6
  215. data/spec/unit/knife/environment_delete_spec.rb +6 -6
  216. data/spec/unit/knife/environment_edit_spec.rb +5 -5
  217. data/spec/unit/knife/environment_from_file_spec.rb +7 -7
  218. data/spec/unit/knife/environment_list_spec.rb +4 -4
  219. data/spec/unit/knife/environment_show_spec.rb +4 -4
  220. data/spec/unit/knife/index_rebuild_spec.rb +2 -2
  221. data/spec/unit/knife/knife_help.rb +11 -11
  222. data/spec/unit/knife/node_bulk_delete_spec.rb +4 -4
  223. data/spec/unit/knife/node_delete_spec.rb +5 -5
  224. data/spec/unit/knife/node_edit_spec.rb +2 -2
  225. data/spec/unit/knife/node_from_file_spec.rb +5 -5
  226. data/spec/unit/knife/node_list_spec.rb +3 -3
  227. data/spec/unit/knife/node_run_list_add_spec.rb +3 -3
  228. data/spec/unit/knife/node_run_list_remove_spec.rb +4 -4
  229. data/spec/unit/knife/node_run_list_set_spec.rb +5 -5
  230. data/spec/unit/knife/node_show_spec.rb +2 -2
  231. data/spec/unit/knife/role_bulk_delete_spec.rb +4 -4
  232. data/spec/unit/knife/role_create_spec.rb +5 -5
  233. data/spec/unit/knife/role_delete_spec.rb +5 -5
  234. data/spec/unit/knife/role_edit_spec.rb +5 -5
  235. data/spec/unit/knife/role_from_file_spec.rb +5 -5
  236. data/spec/unit/knife/role_list_spec.rb +2 -2
  237. data/spec/unit/knife/ssh_spec.rb +6 -6
  238. data/spec/unit/knife/status_spec.rb +4 -4
  239. data/spec/unit/knife/tag_create_spec.rb +3 -3
  240. data/spec/unit/knife/tag_delete_spec.rb +3 -3
  241. data/spec/unit/knife/tag_list_spec.rb +2 -2
  242. data/spec/unit/knife/user_create_spec.rb +7 -7
  243. data/spec/unit/knife/user_reregister_spec.rb +3 -3
  244. data/spec/unit/knife/user_show_spec.rb +1 -1
  245. data/spec/unit/knife_spec.rb +29 -29
  246. data/spec/unit/lwrp_spec.rb +2 -2
  247. data/spec/unit/mixin/checksum_spec.rb +2 -2
  248. data/spec/unit/mixin/command_spec.rb +1 -1
  249. data/spec/unit/mixin/enforce_ownership_and_permissions_spec.rb +4 -4
  250. data/spec/unit/mixin/params_validate_spec.rb +17 -17
  251. data/spec/unit/mixin/path_sanity_spec.rb +8 -8
  252. data/spec/unit/mixin/securable_spec.rb +87 -87
  253. data/spec/unit/mixin/shell_out_spec.rb +1 -1
  254. data/spec/unit/mixin/template_spec.rb +2 -2
  255. data/spec/unit/node/attribute_spec.rb +3 -3
  256. data/spec/unit/node_spec.rb +12 -12
  257. data/spec/unit/platform_spec.rb +1 -1
  258. data/spec/unit/policy_builder/expand_node_object_spec.rb +16 -0
  259. data/spec/unit/policy_builder/policyfile_spec.rb +4 -0
  260. data/spec/unit/provider/breakpoint_spec.rb +8 -8
  261. data/spec/unit/provider/cookbook_file/content_spec.rb +4 -4
  262. data/spec/unit/provider/cookbook_file_spec.rb +1 -1
  263. data/spec/unit/provider/cron/unix_spec.rb +11 -11
  264. data/spec/unit/provider/cron_spec.rb +40 -40
  265. data/spec/unit/provider/deploy/revision_spec.rb +11 -12
  266. data/spec/unit/provider/deploy/timestamped_spec.rb +3 -3
  267. data/spec/unit/provider/deploy_spec.rb +50 -50
  268. data/spec/unit/provider/directory_spec.rb +18 -18
  269. data/spec/unit/provider/env_spec.rb +15 -15
  270. data/spec/unit/provider/erl_call_spec.rb +1 -1
  271. data/spec/unit/provider/execute_spec.rb +5 -5
  272. data/spec/unit/provider/file/content_spec.rb +5 -5
  273. data/spec/unit/provider/file_spec.rb +1 -1
  274. data/spec/unit/provider/git_spec.rb +47 -47
  275. data/spec/unit/provider/group/dscl_spec.rb +16 -15
  276. data/spec/unit/provider/group/gpasswd_spec.rb +6 -5
  277. data/spec/unit/provider/group/groupadd_spec.rb +10 -10
  278. data/spec/unit/provider/group/groupmod_spec.rb +3 -3
  279. data/spec/unit/provider/group/pw_spec.rb +9 -8
  280. data/spec/unit/provider/group/usermod_spec.rb +13 -12
  281. data/spec/unit/provider/group/windows_spec.rb +9 -9
  282. data/spec/unit/provider/group_spec.rb +31 -31
  283. data/spec/unit/provider/http_request_spec.rb +3 -3
  284. data/spec/unit/provider/ifconfig/aix_spec.rb +7 -7
  285. data/spec/unit/provider/ifconfig/debian_spec.rb +3 -3
  286. data/spec/unit/provider/ifconfig/redhat_spec.rb +5 -5
  287. data/spec/unit/provider/ifconfig_spec.rb +13 -13
  288. data/spec/unit/provider/link_spec.rb +33 -33
  289. data/spec/unit/provider/mdadm_spec.rb +4 -4
  290. data/spec/unit/provider/mount/aix_spec.rb +5 -5
  291. data/spec/unit/provider/mount/mount_spec.rb +49 -50
  292. data/spec/unit/provider/mount/windows_spec.rb +18 -18
  293. data/spec/unit/provider/mount_spec.rb +12 -12
  294. data/spec/unit/provider/ohai_spec.rb +6 -6
  295. data/spec/unit/provider/package/aix_spec.rb +14 -14
  296. data/spec/unit/provider/package/apt_spec.rb +10 -10
  297. data/spec/unit/provider/package/dpkg_spec.rb +13 -13
  298. data/spec/unit/provider/package/easy_install_spec.rb +6 -6
  299. data/spec/unit/provider/package/freebsd_spec.rb +29 -29
  300. data/spec/unit/provider/package/ips_spec.rb +4 -4
  301. data/spec/unit/provider/package/macports_spec.rb +6 -6
  302. data/spec/unit/provider/package/pacman_spec.rb +17 -17
  303. data/spec/unit/provider/package/portage_spec.rb +18 -18
  304. data/spec/unit/provider/package/rpm_spec.rb +7 -7
  305. data/spec/unit/provider/package/rubygems_spec.rb +31 -31
  306. data/spec/unit/provider/package/smartos_spec.rb +4 -4
  307. data/spec/unit/provider/package/solaris_spec.rb +15 -15
  308. data/spec/unit/provider/package/yum_spec.rb +100 -100
  309. data/spec/unit/provider/package/zypper_spec.rb +10 -10
  310. data/spec/unit/provider/package_spec.rb +21 -21
  311. data/spec/unit/provider/registry_key_spec.rb +2 -2
  312. data/spec/unit/provider/remote_file/content_spec.rb +31 -31
  313. data/spec/unit/provider/remote_file/fetcher_spec.rb +8 -8
  314. data/spec/unit/provider/remote_file/ftp_spec.rb +10 -10
  315. data/spec/unit/provider/remote_file/http_spec.rb +4 -4
  316. data/spec/unit/provider/remote_file/local_file_spec.rb +2 -2
  317. data/spec/unit/provider/remote_file_spec.rb +1 -1
  318. data/spec/unit/provider/route_spec.rb +23 -23
  319. data/spec/unit/provider/script_spec.rb +5 -5
  320. data/spec/unit/provider/service/arch_service_spec.rb +41 -41
  321. data/spec/unit/provider/service/debian_service_spec.rb +23 -23
  322. data/spec/unit/provider/service/freebsd_service_spec.rb +33 -33
  323. data/spec/unit/provider/service/gentoo_service_spec.rb +16 -16
  324. data/spec/unit/provider/service/init_service_spec.rb +13 -13
  325. data/spec/unit/provider/service/insserv_service_spec.rb +4 -4
  326. data/spec/unit/provider/service/invokercd_service_spec.rb +12 -12
  327. data/spec/unit/provider/service/macosx_spec.rb +20 -20
  328. data/spec/unit/provider/service/redhat_spec.rb +15 -15
  329. data/spec/unit/provider/service/simple_service_spec.rb +9 -9
  330. data/spec/unit/provider/service/solaris_smf_service_spec.rb +13 -13
  331. data/spec/unit/provider/service/systemd_service_spec.rb +28 -28
  332. data/spec/unit/provider/service/upstart_service_spec.rb +41 -41
  333. data/spec/unit/provider/service/windows_spec.rb +37 -37
  334. data/spec/unit/provider/service_spec.rb +9 -9
  335. data/spec/unit/provider/subversion_spec.rb +36 -36
  336. data/spec/unit/provider/template/content_spec.rb +8 -8
  337. data/spec/unit/provider/template_spec.rb +1 -1
  338. data/spec/unit/provider/user/dscl_spec.rb +9 -9
  339. data/spec/unit/provider/user/pw_spec.rb +20 -20
  340. data/spec/unit/provider/user/solaris_spec.rb +5 -5
  341. data/spec/unit/provider/user/windows_spec.rb +8 -8
  342. data/spec/unit/provider/user_spec.rb +34 -34
  343. data/spec/unit/provider_spec.rb +3 -3
  344. data/spec/unit/recipe_spec.rb +79 -4
  345. data/spec/unit/registry_helper_spec.rb +2 -2
  346. data/spec/unit/resource/cron_spec.rb +2 -2
  347. data/spec/unit/resource/directory_spec.rb +5 -5
  348. data/spec/unit/resource/env_spec.rb +2 -2
  349. data/spec/unit/resource/erl_call_spec.rb +1 -1
  350. data/spec/unit/resource/file_spec.rb +8 -8
  351. data/spec/unit/resource/group_spec.rb +3 -3
  352. data/spec/unit/resource/link_spec.rb +8 -8
  353. data/spec/unit/resource/mdadm_spec.rb +3 -3
  354. data/spec/unit/resource/mount_spec.rb +3 -3
  355. data/spec/unit/resource/route_spec.rb +2 -2
  356. data/spec/unit/resource/user_spec.rb +2 -2
  357. data/spec/unit/resource/yum_package_spec.rb +2 -2
  358. data/spec/unit/resource_collection_spec.rb +1 -1
  359. data/spec/unit/resource_definition_spec.rb +2 -2
  360. data/spec/unit/resource_reporter_spec.rb +71 -16
  361. data/spec/unit/resource_spec.rb +3 -3
  362. data/spec/unit/rest/auth_credentials_spec.rb +2 -2
  363. data/spec/unit/rest_spec.rb +3 -40
  364. data/spec/unit/run_list/run_list_expansion_spec.rb +3 -3
  365. data/spec/unit/run_list_spec.rb +9 -9
  366. data/spec/unit/run_status_spec.rb +1 -1
  367. data/spec/unit/runner_spec.rb +8 -8
  368. data/spec/unit/scan_access_control_spec.rb +3 -3
  369. data/spec/unit/search/query_spec.rb +7 -7
  370. data/spec/unit/shell/model_wrapper_spec.rb +2 -2
  371. data/spec/unit/shell/shell_ext_spec.rb +15 -15
  372. data/spec/unit/shell/shell_session_spec.rb +9 -9
  373. data/spec/unit/shell_spec.rb +1 -2
  374. data/spec/unit/user_spec.rb +4 -4
  375. data/spec/unit/util/backup_spec.rb +1 -1
  376. data/spec/unit/util/selinux_spec.rb +7 -7
  377. metadata +106 -51
  378. data/distro/common/html/chef-client.8.html +0 -145
  379. data/distro/common/html/chef-expander.8.html +0 -164
  380. data/distro/common/html/chef-expanderctl.8.html +0 -146
  381. data/distro/common/html/chef-server-webui.8.html +0 -185
  382. data/distro/common/html/chef-server.8.html +0 -182
  383. data/distro/common/html/chef-shell.1.html +0 -286
  384. data/distro/common/html/chef-solo.8.html +0 -185
  385. data/distro/common/html/chef-solr.8.html +0 -165
  386. data/distro/common/html/knife-bootstrap.1.html +0 -241
  387. data/distro/common/html/knife-client.1.html +0 -219
  388. data/distro/common/html/knife-configure.1.html +0 -170
  389. data/distro/common/html/knife-cookbook-site.1.html +0 -241
  390. data/distro/common/html/knife-cookbook.1.html +0 -381
  391. data/distro/common/html/knife-data-bag.1.html +0 -235
  392. data/distro/common/html/knife-environment.1.html +0 -265
  393. data/distro/common/html/knife-exec.1.html +0 -134
  394. data/distro/common/html/knife-index.1.html +0 -125
  395. data/distro/common/html/knife-node.1.html +0 -250
  396. data/distro/common/html/knife-role.1.html +0 -200
  397. data/distro/common/html/knife-search.1.html +0 -288
  398. data/distro/common/html/knife-ssh.1.html +0 -156
  399. data/distro/common/html/knife-status.1.html +0 -128
  400. data/distro/common/html/knife-tag.1.html +0 -137
  401. data/distro/common/html/knife.1.html +0 -315
@@ -36,10 +36,10 @@ describe Chef::Provider::Env do
36
36
  describe "when loading the current status" do
37
37
  before do
38
38
  #@current_resource = @new_resource.clone
39
- #Chef::Resource::Env.stub!(:new).and_return(@current_resource)
39
+ #Chef::Resource::Env.stub(:new).and_return(@current_resource)
40
40
  @provider.current_resource = @current_resource
41
- @provider.stub!(:env_value).with("FOO").and_return("bar")
42
- @provider.stub!(:env_key_exists).and_return(true)
41
+ @provider.stub(:env_value).with("FOO").and_return("bar")
42
+ @provider.stub(:env_key_exists).and_return(true)
43
43
  end
44
44
 
45
45
  it "should create a current resource with the same name as the new resource" do
@@ -72,8 +72,8 @@ describe Chef::Provider::Env do
72
72
  describe "action_create" do
73
73
  before do
74
74
  @provider.key_exists = false
75
- @provider.stub!(:create_env).and_return(true)
76
- @provider.stub!(:modify_env).and_return(true)
75
+ @provider.stub(:create_env).and_return(true)
76
+ @provider.stub(:modify_env).and_return(true)
77
77
  end
78
78
 
79
79
  it "should call create_env if the key does not exist" do
@@ -94,15 +94,15 @@ describe Chef::Provider::Env do
94
94
 
95
95
  it "should call modify_env if the key exists and values are not equal" do
96
96
  @provider.key_exists = true
97
- @provider.stub!(:compare_value).and_return(true)
97
+ @provider.stub(:compare_value).and_return(true)
98
98
  @provider.should_receive(:modify_env).and_return(true)
99
99
  @provider.action_create
100
100
  end
101
101
 
102
102
  it "should set the new_resources updated flag when it updates an existing value" do
103
103
  @provider.key_exists = true
104
- @provider.stub!(:compare_value).and_return(true)
105
- @provider.stub!(:modify_env).and_return(true)
104
+ @provider.stub(:compare_value).and_return(true)
105
+ @provider.stub(:modify_env).and_return(true)
106
106
  @provider.action_create
107
107
  @new_resource.should be_updated
108
108
  end
@@ -112,8 +112,8 @@ describe Chef::Provider::Env do
112
112
  before(:each) do
113
113
  @provider.current_resource = @current_resource
114
114
  @provider.key_exists = false
115
- @provider.stub!(:delete_element).and_return(false)
116
- @provider.stub!(:delete_env).and_return(true)
115
+ @provider.stub(:delete_element).and_return(false)
116
+ @provider.stub(:delete_env).and_return(true)
117
117
  end
118
118
 
119
119
  it "should not call delete_env if the key does not exist" do
@@ -143,7 +143,7 @@ describe Chef::Provider::Env do
143
143
  before(:each) do
144
144
  @provider.current_resource = @current_resource
145
145
  @provider.key_exists = true
146
- @provider.stub!(:modify_env).and_return(true)
146
+ @provider.stub(:modify_env).and_return(true)
147
147
  end
148
148
 
149
149
  it "should call modify_group if the key exists and values are not equal" do
@@ -153,8 +153,8 @@ describe Chef::Provider::Env do
153
153
  end
154
154
 
155
155
  it "should set the new resources updated flag to true if modify_env is called" do
156
- @provider.stub!(:compare_value).and_return(true)
157
- @provider.stub!(:modify_env).and_return(true)
156
+ @provider.stub(:compare_value).and_return(true)
157
+ @provider.stub(:modify_env).and_return(true)
158
158
  @provider.action_modify
159
159
  @new_resource.should be_updated
160
160
  end
@@ -183,12 +183,12 @@ describe Chef::Provider::Env do
183
183
  end
184
184
 
185
185
  it "should return true if the element is not found" do
186
- @new_resource.stub!(:value).and_return("C:/baz/bin")
186
+ @new_resource.stub(:value).and_return("C:/baz/bin")
187
187
  @provider.delete_element.should eql(true)
188
188
  end
189
189
 
190
190
  it "should return false if the delim not defined" do
191
- @new_resource.stub!(:delim).and_return(nil)
191
+ @new_resource.stub(:delim).and_return(nil)
192
192
  @provider.delete_element.should eql(false)
193
193
  end
194
194
 
@@ -31,7 +31,7 @@ describe Chef::Provider::ErlCall do
31
31
 
32
32
  @provider = Chef::Provider::ErlCall.new(@new_resource, @run_context)
33
33
 
34
- @provider.stub!(:popen4).and_return(@status)
34
+ @provider.stub(:popen4).and_return(@status)
35
35
  @stdin = StringIO.new
36
36
  @stdout = StringIO.new('{ok, woohoo}')
37
37
  @stderr = StringIO.new
@@ -33,12 +33,12 @@ describe Chef::Provider::Execute do
33
33
  @provider.current_resource = @current_resource
34
34
  Chef::Log.level = :info
35
35
  # FIXME: There should be a test for how STDOUT.tty? changes the live_stream option being passed
36
- STDOUT.stub!(:tty?).and_return(true)
36
+ STDOUT.stub(:tty?).and_return(true)
37
37
  end
38
38
 
39
39
 
40
40
  it "should execute foo_resource" do
41
- @provider.stub!(:load_current_resource)
41
+ @provider.stub(:load_current_resource)
42
42
  opts = {}
43
43
  opts[:timeout] = @new_resource.timeout
44
44
  opts[:returns] = @new_resource.returns
@@ -53,7 +53,7 @@ describe Chef::Provider::Execute do
53
53
  end
54
54
 
55
55
  it "should do nothing if the sentinel file exists" do
56
- @provider.stub!(:load_current_resource)
56
+ @provider.stub(:load_current_resource)
57
57
  File.should_receive(:exists?).with(@new_resource.creates).and_return(true)
58
58
  @provider.should_not_receive(:shell_out!)
59
59
  Chef::Log.should_not_receive(:warn)
@@ -65,7 +65,7 @@ describe Chef::Provider::Execute do
65
65
  it "should respect cwd options for 'creates'" do
66
66
  @new_resource.cwd "/tmp"
67
67
  @new_resource.creates "foo_resource"
68
- @provider.stub!(:load_current_resource)
68
+ @provider.stub(:load_current_resource)
69
69
  File.should_receive(:exists?).with(@new_resource.creates).and_return(false)
70
70
  File.should_receive(:exists?).with(File.join("/tmp", @new_resource.creates)).and_return(true)
71
71
  Chef::Log.should_not_receive(:warn)
@@ -77,7 +77,7 @@ describe Chef::Provider::Execute do
77
77
 
78
78
  it "should warn if user specified relative path without cwd" do
79
79
  @new_resource.creates "foo_resource"
80
- @provider.stub!(:load_current_resource)
80
+ @provider.stub(:load_current_resource)
81
81
  Chef::Log.should_receive(:warn).with(/relative path/)
82
82
  File.should_receive(:exists?).with(@new_resource.creates).and_return(true)
83
83
  @provider.should_not_receive(:shell_out!)
@@ -25,7 +25,7 @@ describe Chef::Provider::File::Content do
25
25
  #
26
26
 
27
27
  let(:current_resource) do
28
- mock("Chef::Provider::File::Resource (current)")
28
+ double("Chef::Provider::File::Resource (current)")
29
29
  end
30
30
 
31
31
  let(:enclosing_directory) {
@@ -36,11 +36,11 @@ describe Chef::Provider::File::Content do
36
36
  }
37
37
 
38
38
  let(:new_resource) do
39
- mock("Chef::Provider::File::Resource (new)", :name => "seattle.txt", :path => resource_path)
39
+ double("Chef::Provider::File::Resource (new)", :name => "seattle.txt", :path => resource_path)
40
40
  end
41
41
 
42
42
  let(:run_context) do
43
- mock("Chef::RunContext")
43
+ double("Chef::RunContext")
44
44
  end
45
45
 
46
46
  #
@@ -53,7 +53,7 @@ describe Chef::Provider::File::Content do
53
53
  describe "when the resource has a content attribute set" do
54
54
 
55
55
  before do
56
- new_resource.stub!(:content).and_return("Do do do do, do do do do, do do do do, do do do do")
56
+ new_resource.stub(:content).and_return("Do do do do, do do do do, do do do do, do do do do")
57
57
  end
58
58
 
59
59
  it "returns a tempfile" do
@@ -81,7 +81,7 @@ describe Chef::Provider::File::Content do
81
81
  describe "when the resource does not have a content attribute set" do
82
82
 
83
83
  before do
84
- new_resource.stub!(:content).and_return(nil)
84
+ new_resource.stub(:content).and_return(nil)
85
85
  end
86
86
 
87
87
  it "should return nil instead of a tempfile" do
@@ -29,7 +29,7 @@ describe Chef::Provider::File do
29
29
  end
30
30
 
31
31
  let(:content) do
32
- content = mock('Chef::Provider::File::Content')
32
+ content = double('Chef::Provider::File::Content')
33
33
  end
34
34
 
35
35
  let(:node) { double('Chef::Node') }
@@ -21,7 +21,7 @@ require 'spec_helper'
21
21
  describe Chef::Provider::Git do
22
22
 
23
23
  before(:each) do
24
- STDOUT.stub!(:tty?).and_return(true)
24
+ STDOUT.stub(:tty?).and_return(true)
25
25
  Chef::Log.level = :info
26
26
 
27
27
  @current_resource = Chef::Resource::Git.new("web2.0 app")
@@ -41,9 +41,9 @@ describe Chef::Provider::Git do
41
41
  context "determining the revision of the currently deployed checkout" do
42
42
 
43
43
  before do
44
- @stdout = mock("standard out")
45
- @stderr = mock("standard error")
46
- @exitstatus = mock("exitstatus")
44
+ @stdout = double("standard out")
45
+ @stderr = double("standard error")
46
+ @exitstatus = double("exitstatus")
47
47
  end
48
48
 
49
49
  it "sets the current revision to nil if the deploy dir does not exist" do
@@ -54,7 +54,7 @@ describe Chef::Provider::Git do
54
54
  it "determines the current revision when there is one" do
55
55
  ::File.should_receive(:exist?).with("/my/deploy/dir/.git").and_return(true)
56
56
  @stdout = "9b4d8dc38dd471246e7cfb1c3c1ad14b0f2bee13\n"
57
- @provider.should_receive(:shell_out!).with('git rev-parse HEAD', {:cwd => '/my/deploy/dir', :returns => [0,128]}).and_return(mock("ShellOut result", :stdout => @stdout))
57
+ @provider.should_receive(:shell_out!).with('git rev-parse HEAD', {:cwd => '/my/deploy/dir', :returns => [0,128]}).and_return(double("ShellOut result", :stdout => @stdout))
58
58
  @provider.find_current_revision.should eql("9b4d8dc38dd471246e7cfb1c3c1ad14b0f2bee13")
59
59
  end
60
60
 
@@ -62,13 +62,13 @@ describe Chef::Provider::Git do
62
62
  ::File.should_receive(:exist?).with("/my/deploy/dir/.git").and_return(true)
63
63
  @stderr = "fatal: Not a git repository (or any of the parent directories): .git"
64
64
  @stdout = ""
65
- @provider.should_receive(:shell_out!).with('git rev-parse HEAD', :cwd => '/my/deploy/dir', :returns => [0,128]).and_return(mock("ShellOut result", :stdout => "", :stderr => @stderr))
65
+ @provider.should_receive(:shell_out!).with('git rev-parse HEAD', :cwd => '/my/deploy/dir', :returns => [0,128]).and_return(double("ShellOut result", :stdout => "", :stderr => @stderr))
66
66
  @provider.find_current_revision.should be_nil
67
67
  end
68
68
  end
69
69
 
70
70
  it "creates a current_resource with the currently deployed revision when a clone exists in the destination dir" do
71
- @provider.stub!(:find_current_revision).and_return("681c9802d1c62a45b490786c18f0b8216b309440")
71
+ @provider.stub(:find_current_revision).and_return("681c9802d1c62a45b490786c18f0b8216b309440")
72
72
  @provider.load_current_resource
73
73
  @provider.current_resource.name.should eql(@resource.name)
74
74
  @provider.current_resource.revision.should eql("681c9802d1c62a45b490786c18f0b8216b309440")
@@ -93,7 +93,7 @@ describe Chef::Provider::Git do
93
93
  @resource.revision "v1.0"
94
94
  @stdout = ("d03c22a5e41f5ae3193460cca044ed1435029f53\trefs/heads/0.8-alpha\n" +
95
95
  "503c22a5e41f5ae3193460cca044ed1435029f53\trefs/heads/v1.0\n")
96
- @provider.should_receive(:shell_out!).with(@git_ls_remote + "v1.0*", {:log_tag=>"git[web2.0 app]"}).and_return(mock("ShellOut result", :stdout => @stdout))
96
+ @provider.should_receive(:shell_out!).with(@git_ls_remote + "v1.0*", {:log_tag=>"git[web2.0 app]"}).and_return(double("ShellOut result", :stdout => @stdout))
97
97
  @provider.target_revision.should eql("503c22a5e41f5ae3193460cca044ed1435029f53")
98
98
  end
99
99
 
@@ -102,7 +102,7 @@ describe Chef::Provider::Git do
102
102
  @stdout = ("d03c22a5e41f5ae3193460cca044ed1435029f53\trefs/heads/0.8-alpha\n" +
103
103
  "503c22a5e41f5ae3193460cca044ed1435029f53\trefs/heads/v1.0\n" +
104
104
  "663c22a5e41f5ae3193460cca044ed1435029f53\trefs/heads/v1.0^{}\n")
105
- @provider.should_receive(:shell_out!).with(@git_ls_remote + "v1.0*", {:log_tag=>"git[web2.0 app]"}).and_return(mock("ShellOut result", :stdout => @stdout))
105
+ @provider.should_receive(:shell_out!).with(@git_ls_remote + "v1.0*", {:log_tag=>"git[web2.0 app]"}).and_return(double("ShellOut result", :stdout => @stdout))
106
106
  @provider.target_revision.should eql("663c22a5e41f5ae3193460cca044ed1435029f53")
107
107
  end
108
108
 
@@ -110,32 +110,32 @@ describe Chef::Provider::Git do
110
110
  @resource.revision "origin/"
111
111
  @provider.action = :checkout
112
112
  @provider.define_resource_requirements
113
- ::File.stub!(:directory?).with("/my/deploy").and_return(true)
113
+ ::File.stub(:directory?).with("/my/deploy").and_return(true)
114
114
  lambda {@provider.process_resource_requirements}.should raise_error(Chef::Exceptions::InvalidRemoteGitReference)
115
115
  end
116
116
 
117
117
  it "raises an unresolvable git reference error if the revision can't be resolved to any revision and assertions are run" do
118
118
  @resource.revision "FAIL, that's the revision I want"
119
119
  @provider.action = :checkout
120
- @provider.should_receive(:shell_out!).and_return(mock("ShellOut result", :stdout => "\n"))
120
+ @provider.should_receive(:shell_out!).and_return(double("ShellOut result", :stdout => "\n"))
121
121
  @provider.define_resource_requirements
122
122
  lambda { @provider.process_resource_requirements }.should raise_error(Chef::Exceptions::UnresolvableGitReference)
123
123
  end
124
124
 
125
125
  it "does not raise an error if the revision can't be resolved when assertions are not run" do
126
126
  @resource.revision "FAIL, that's the revision I want"
127
- @provider.should_receive(:shell_out!).and_return(mock("ShellOut result", :stdout => "\n"))
127
+ @provider.should_receive(:shell_out!).and_return(double("ShellOut result", :stdout => "\n"))
128
128
  @provider.target_revision.should == nil
129
129
  end
130
130
 
131
131
  it "does not raise an error when the revision is valid and assertions are run." do
132
132
  @resource.revision "0.8-alpha"
133
133
  @stdout = "503c22a5e41f5ae3193460cca044ed1435029f53\trefs/heads/0.8-alpha\n"
134
- @provider.should_receive(:shell_out!).with(@git_ls_remote + "0.8-alpha*", {:log_tag=>"git[web2.0 app]"}).and_return(mock("ShellOut result", :stdout => @stdout))
134
+ @provider.should_receive(:shell_out!).with(@git_ls_remote + "0.8-alpha*", {:log_tag=>"git[web2.0 app]"}).and_return(double("ShellOut result", :stdout => @stdout))
135
135
  @provider.action = :checkout
136
- ::File.stub!(:directory?).with("/my/deploy").and_return(true)
136
+ ::File.stub(:directory?).with("/my/deploy").and_return(true)
137
137
  @provider.define_resource_requirements
138
- lambda { @provider.process_resource_requirements }.should_not raise_error(RuntimeError)
138
+ lambda { @provider.process_resource_requirements }.should_not raise_error
139
139
  end
140
140
 
141
141
  it "gives the latest HEAD revision SHA if nothing is specified" do
@@ -156,7 +156,7 @@ b7d19519a1c15f1c1a324e2683bd728b6198ce5a\trefs/tags/0.7.8^{}
156
156
  ebc1b392fe7e8f0fbabc305c299b4d365d2b4d9b\trefs/tags/chef-server-package
157
157
  SHAS
158
158
  @resource.revision ''
159
- @provider.should_receive(:shell_out!).with(@git_ls_remote + "HEAD", {:log_tag=>"git[web2.0 app]"}).and_return(mock("ShellOut result", :stdout => @stdout))
159
+ @provider.should_receive(:shell_out!).with(@git_ls_remote + "HEAD", {:log_tag=>"git[web2.0 app]"}).and_return(double("ShellOut result", :stdout => @stdout))
160
160
  @provider.target_revision.should eql("28af684d8460ba4793eda3e7ac238c864a5d029a")
161
161
  end
162
162
  end
@@ -179,7 +179,7 @@ SHAS
179
179
  before do
180
180
  @resource.user deploy_user
181
181
  @resource.ssh_wrapper wrapper
182
- Etc.stub!(:getpwnam).and_return(double("Struct::Passwd", :name => @resource.user, :dir => "/home/deployNinja"))
182
+ Etc.stub(:getpwnam).and_return(double("Struct::Passwd", :name => @resource.user, :dir => "/home/deployNinja"))
183
183
  end
184
184
  context "without a timeout set" do
185
185
  it "clones a repo with default git options" do
@@ -199,7 +199,7 @@ SHAS
199
199
 
200
200
  it "runs a clone command with escaped destination" do
201
201
  @resource.user "deployNinja"
202
- Etc.stub!(:getpwnam).and_return(double("Struct::Passwd", :name => @resource.user, :dir => "/home/deployNinja"))
202
+ Etc.stub(:getpwnam).and_return(double("Struct::Passwd", :name => @resource.user, :dir => "/home/deployNinja"))
203
203
  @resource.destination "/Application Support/with/space"
204
204
  @resource.ssh_wrapper "do_it_this_way.sh"
205
205
  expected_cmd = "git clone \"git://github.com/opscode/chef.git\" \"/Application Support/with/space\""
@@ -255,7 +255,7 @@ SHAS
255
255
 
256
256
  it "runs a sync command with the user and group specified in the resource" do
257
257
  @resource.user("whois")
258
- Etc.stub!(:getpwnam).and_return(double("Struct::Passwd", :name => @resource.user, :dir => "/home/whois"))
258
+ Etc.stub(:getpwnam).and_return(double("Struct::Passwd", :name => @resource.user, :dir => "/home/whois"))
259
259
  @resource.group("thisis")
260
260
  @provider.should_receive(:setup_remote_tracking_branches).with(@resource.remote, @resource.repository)
261
261
  expected_cmd = "git fetch origin && git fetch origin --tags && git reset --hard d35af14d41ae22b19da05d7d03a0bafc321b244c"
@@ -302,7 +302,7 @@ SHAS
302
302
  it "runs the config with the user and group specified in the resource" do
303
303
  @resource.user("whois")
304
304
  @resource.group("thisis")
305
- Etc.stub!(:getpwnam).and_return(double("Struct::Passwd", :name => @resource.user, :dir => "/home/whois"))
305
+ Etc.stub(:getpwnam).and_return(double("Struct::Passwd", :name => @resource.user, :dir => "/home/whois"))
306
306
  command_response = double('shell_out')
307
307
  command_response.stub(:exitstatus) { 1 }
308
308
  expected_command = "git config --get remote.#{@resource.remote}.url"
@@ -391,17 +391,17 @@ SHAS
391
391
  end
392
392
 
393
393
  it "raises an error if the git clone command would fail because the enclosing directory doesn't exist" do
394
- @provider.stub!(:shell_out!)
394
+ @provider.stub(:shell_out!)
395
395
  lambda {@provider.run_action(:sync)}.should raise_error(Chef::Exceptions::MissingParentDirectory)
396
396
  end
397
397
 
398
398
  it "does a checkout by cloning the repo and then enabling submodules" do
399
399
  # will be invoked in load_current_resource
400
- ::File.stub!(:exist?).with("/my/deploy/dir/.git").and_return(false)
400
+ ::File.stub(:exist?).with("/my/deploy/dir/.git").and_return(false)
401
401
 
402
- ::File.stub!(:exist?).with("/my/deploy/dir").and_return(true)
403
- ::File.stub!(:directory?).with("/my/deploy").and_return(true)
404
- ::Dir.stub!(:entries).with("/my/deploy/dir").and_return(['.','..'])
402
+ ::File.stub(:exist?).with("/my/deploy/dir").and_return(true)
403
+ ::File.stub(:directory?).with("/my/deploy").and_return(true)
404
+ ::Dir.stub(:entries).with("/my/deploy/dir").and_return(['.','..'])
405
405
  @provider.should_receive(:clone)
406
406
  @provider.should_receive(:checkout)
407
407
  @provider.should_receive(:enable_submodules)
@@ -413,11 +413,11 @@ SHAS
413
413
 
414
414
  it "does not call checkout if enable_checkout is false" do
415
415
  # will be invoked in load_current_resource
416
- ::File.stub!(:exist?).with("/my/deploy/dir/.git").and_return(false)
416
+ ::File.stub(:exist?).with("/my/deploy/dir/.git").and_return(false)
417
417
 
418
- ::File.stub!(:exist?).with("/my/deploy/dir").and_return(true)
419
- ::File.stub!(:directory?).with("/my/deploy").and_return(true)
420
- ::Dir.stub!(:entries).with("/my/deploy/dir").and_return(['.','..'])
418
+ ::File.stub(:exist?).with("/my/deploy/dir").and_return(true)
419
+ ::File.stub(:directory?).with("/my/deploy").and_return(true)
420
+ ::Dir.stub(:entries).with("/my/deploy/dir").and_return(['.','..'])
421
421
 
422
422
  @resource.enable_checkout false
423
423
  @provider.should_receive(:clone)
@@ -429,10 +429,10 @@ SHAS
429
429
  # REGRESSION TEST: on some OSes, the entries from an empty directory will be listed as
430
430
  # ['..', '.'] but this shouldn't change the behavior
431
431
  it "does a checkout by cloning the repo and then enabling submodules when the directory entries are listed as %w{.. .}" do
432
- ::File.stub!(:exist?).with("/my/deploy/dir/.git").and_return(false)
433
- ::File.stub!(:exist?).with("/my/deploy/dir").and_return(false)
434
- ::File.stub!(:directory?).with("/my/deploy").and_return(true)
435
- ::Dir.stub!(:entries).with("/my/deploy/dir").and_return(['..','.'])
432
+ ::File.stub(:exist?).with("/my/deploy/dir/.git").and_return(false)
433
+ ::File.stub(:exist?).with("/my/deploy/dir").and_return(false)
434
+ ::File.stub(:directory?).with("/my/deploy").and_return(true)
435
+ ::Dir.stub(:entries).with("/my/deploy/dir").and_return(['..','.'])
436
436
  @provider.should_receive(:clone)
437
437
  @provider.should_receive(:checkout)
438
438
  @provider.should_receive(:enable_submodules)
@@ -443,11 +443,11 @@ SHAS
443
443
 
444
444
  it "should not checkout if the destination exists or is a non empty directory" do
445
445
  # will be invoked in load_current_resource
446
- ::File.stub!(:exist?).with("/my/deploy/dir/.git").and_return(false)
446
+ ::File.stub(:exist?).with("/my/deploy/dir/.git").and_return(false)
447
447
 
448
- ::File.stub!(:exist?).with("/my/deploy/dir").and_return(true)
449
- ::File.stub!(:directory?).with("/my/deploy").and_return(true)
450
- ::Dir.stub!(:entries).with("/my/deploy/dir").and_return(['.','..','foo','bar'])
448
+ ::File.stub(:exist?).with("/my/deploy/dir").and_return(true)
449
+ ::File.stub(:directory?).with("/my/deploy").and_return(true)
450
+ ::Dir.stub(:entries).with("/my/deploy/dir").and_return(['.','..','foo','bar'])
451
451
  @provider.should_not_receive(:clone)
452
452
  @provider.should_not_receive(:checkout)
453
453
  @provider.should_not_receive(:enable_submodules)
@@ -458,7 +458,7 @@ SHAS
458
458
 
459
459
  it "syncs the code by updating the source when the repo has already been checked out" do
460
460
  ::File.should_receive(:exist?).with("/my/deploy/dir/.git").and_return(true)
461
- ::File.stub!(:directory?).with("/my/deploy").and_return(true)
461
+ ::File.stub(:directory?).with("/my/deploy").and_return(true)
462
462
  @provider.should_receive(:find_current_revision).exactly(2).and_return('d35af14d41ae22b19da05d7d03a0bafc321b244c')
463
463
  @provider.should_not_receive(:fetch_updates)
464
464
  @provider.should_receive(:add_remotes)
@@ -468,10 +468,10 @@ SHAS
468
468
 
469
469
  it "marks the resource as updated when the repo is updated and gets a new version" do
470
470
  ::File.should_receive(:exist?).with("/my/deploy/dir/.git").and_return(true)
471
- ::File.stub!(:directory?).with("/my/deploy").and_return(true)
471
+ ::File.stub(:directory?).with("/my/deploy").and_return(true)
472
472
  # invoked twice - first time from load_current_resource
473
473
  @provider.should_receive(:find_current_revision).exactly(2).and_return('d35af14d41ae22b19da05d7d03a0bafc321b244c')
474
- @provider.stub!(:target_revision).and_return('28af684d8460ba4793eda3e7ac238c864a5d029a')
474
+ @provider.stub(:target_revision).and_return('28af684d8460ba4793eda3e7ac238c864a5d029a')
475
475
  @provider.should_receive(:fetch_updates)
476
476
  @provider.should_receive(:enable_submodules)
477
477
  @provider.should_receive(:add_remotes)
@@ -481,9 +481,9 @@ SHAS
481
481
 
482
482
  it "does not fetch any updates if the remote revision matches the current revision" do
483
483
  ::File.should_receive(:exist?).with("/my/deploy/dir/.git").and_return(true)
484
- ::File.stub!(:directory?).with("/my/deploy").and_return(true)
485
- @provider.stub!(:find_current_revision).and_return('d35af14d41ae22b19da05d7d03a0bafc321b244c')
486
- @provider.stub!(:target_revision).and_return('d35af14d41ae22b19da05d7d03a0bafc321b244c')
484
+ ::File.stub(:directory?).with("/my/deploy").and_return(true)
485
+ @provider.stub(:find_current_revision).and_return('d35af14d41ae22b19da05d7d03a0bafc321b244c')
486
+ @provider.stub(:target_revision).and_return('d35af14d41ae22b19da05d7d03a0bafc321b244c')
487
487
  @provider.should_not_receive(:fetch_updates)
488
488
  @provider.should_receive(:add_remotes)
489
489
  @provider.run_action(:sync)
@@ -491,7 +491,7 @@ SHAS
491
491
  end
492
492
 
493
493
  it "clones the repo instead of fetching it if the deploy directory doesn't exist" do
494
- ::File.stub!(:directory?).with("/my/deploy").and_return(true)
494
+ ::File.stub(:directory?).with("/my/deploy").and_return(true)
495
495
  ::File.should_receive(:exist?).with("/my/deploy/dir/.git").exactly(2).and_return(false)
496
496
  @provider.should_receive(:action_checkout)
497
497
  @provider.should_not_receive(:shell_out!)
@@ -501,9 +501,9 @@ SHAS
501
501
 
502
502
  it "clones the repo instead of fetching updates if the deploy directory is empty" do
503
503
  ::File.should_receive(:exist?).with("/my/deploy/dir/.git").exactly(2).and_return(false)
504
- ::File.stub!(:directory?).with("/my/deploy").and_return(true)
505
- ::File.stub!(:directory?).with("/my/deploy/dir").and_return(true)
506
- @provider.stub!(:sync_command).and_return("huzzah!")
504
+ ::File.stub(:directory?).with("/my/deploy").and_return(true)
505
+ ::File.stub(:directory?).with("/my/deploy/dir").and_return(true)
506
+ @provider.stub(:sync_command).and_return("huzzah!")
507
507
  @provider.should_receive(:action_checkout)
508
508
  @provider.should_not_receive(:shell_out!).with("huzzah!", :cwd => "/my/deploy/dir")
509
509
  @provider.run_action(:sync)