chef 12.0.0.alpha.2-x86-mingw32 → 12.0.0.rc.0-x86-mingw32

Sign up to get free protection for your applications and to get access to all the features.
Files changed (628) hide show
  1. data/CONTRIBUTING.md +9 -0
  2. data/README.md +1 -1
  3. data/Rakefile +12 -0
  4. data/bin/chef-service-manager +1 -1
  5. data/bin/chef-windows-service +35 -0
  6. data/distro/common/html/_sources/ctl_chef_server.txt +307 -10
  7. data/distro/common/html/ctl_chef_client.html +3 -7
  8. data/distro/common/html/ctl_chef_server.html +609 -41
  9. data/distro/common/html/ctl_chef_shell.html +2 -2
  10. data/distro/common/html/ctl_chef_solo.html +1 -1
  11. data/distro/common/html/index.html +13 -13
  12. data/distro/common/html/knife.html +10 -10
  13. data/distro/common/html/knife_bootstrap.html +8 -8
  14. data/distro/common/html/knife_client.html +12 -12
  15. data/distro/common/html/knife_common_options.html +7 -7
  16. data/distro/common/html/knife_configure.html +3 -3
  17. data/distro/common/html/knife_cookbook.html +19 -19
  18. data/distro/common/html/knife_cookbook_site.html +28 -28
  19. data/distro/common/html/knife_data_bag.html +28 -13
  20. data/distro/common/html/knife_delete.html +2 -2
  21. data/distro/common/html/knife_deps.html +3 -3
  22. data/distro/common/html/knife_diff.html +4 -4
  23. data/distro/common/html/knife_download.html +3 -3
  24. data/distro/common/html/knife_edit.html +2 -2
  25. data/distro/common/html/knife_environment.html +14 -14
  26. data/distro/common/html/knife_exec.html +11 -11
  27. data/distro/common/html/knife_index_rebuild.html +2 -2
  28. data/distro/common/html/knife_list.html +3 -3
  29. data/distro/common/html/knife_node.html +23 -23
  30. data/distro/common/html/knife_raw.html +4 -4
  31. data/distro/common/html/knife_recipe_list.html +3 -3
  32. data/distro/common/html/knife_role.html +11 -11
  33. data/distro/common/html/knife_search.html +4 -4
  34. data/distro/common/html/knife_serve.html +3 -3
  35. data/distro/common/html/knife_show.html +3 -3
  36. data/distro/common/html/knife_ssh.html +7 -7
  37. data/distro/common/html/knife_ssl_check.html +7 -7
  38. data/distro/common/html/knife_ssl_fetch.html +9 -9
  39. data/distro/common/html/knife_status.html +3 -3
  40. data/distro/common/html/knife_tag.html +9 -9
  41. data/distro/common/html/knife_upload.html +3 -3
  42. data/distro/common/html/knife_user.html +9 -9
  43. data/distro/common/html/knife_using.html +11 -11
  44. data/distro/common/html/knife_xargs.html +14 -5
  45. data/distro/common/html/search.html +2 -2
  46. data/distro/common/html/searchindex.js +1 -1
  47. data/distro/common/man/man1/chef-shell.1 +2 -2
  48. data/distro/common/man/man1/knife-bootstrap.1 +7 -7
  49. data/distro/common/man/man1/knife-client.1 +10 -10
  50. data/distro/common/man/man1/knife-configure.1 +5 -5
  51. data/distro/common/man/man1/knife-cookbook-site.1 +24 -24
  52. data/distro/common/man/man1/knife-cookbook.1 +12 -12
  53. data/distro/common/man/man1/knife-data-bag.1 +34 -10
  54. data/distro/common/man/man1/knife-delete.1 +5 -5
  55. data/distro/common/man/man1/knife-deps.1 +5 -5
  56. data/distro/common/man/man1/knife-diff.1 +7 -7
  57. data/distro/common/man/man1/knife-download.1 +5 -5
  58. data/distro/common/man/man1/knife-edit.1 +5 -5
  59. data/distro/common/man/man1/knife-environment.1 +11 -11
  60. data/distro/common/man/man1/knife-exec.1 +11 -11
  61. data/distro/common/man/man1/knife-index-rebuild.1 +1 -1
  62. data/distro/common/man/man1/knife-list.1 +5 -5
  63. data/distro/common/man/man1/knife-node.1 +16 -16
  64. data/distro/common/man/man1/knife-raw.1 +6 -6
  65. data/distro/common/man/man1/knife-recipe-list.1 +1 -1
  66. data/distro/common/man/man1/knife-role.1 +7 -7
  67. data/distro/common/man/man1/knife-search.1 +6 -6
  68. data/distro/common/man/man1/knife-serve.1 +6 -6
  69. data/distro/common/man/man1/knife-show.1 +5 -5
  70. data/distro/common/man/man1/knife-ssh.1 +9 -9
  71. data/distro/common/man/man1/knife-ssl-check.1 +7 -7
  72. data/distro/common/man/man1/knife-ssl-fetch.1 +9 -9
  73. data/distro/common/man/man1/knife-status.1 +5 -5
  74. data/distro/common/man/man1/knife-tag.1 +8 -8
  75. data/distro/common/man/man1/knife-upload.1 +5 -5
  76. data/distro/common/man/man1/knife-user.1 +8 -8
  77. data/distro/common/man/man1/knife-xargs.1 +36 -10
  78. data/distro/common/man/man1/knife.1 +14 -14
  79. data/distro/common/man/man8/chef-client.8 +3 -10
  80. data/distro/common/man/man8/chef-solo.8 +1 -1
  81. data/ext/win32-eventlog/Rakefile +50 -0
  82. data/ext/win32-eventlog/chef-log.man +26 -0
  83. data/lib/chef/application.rb +313 -241
  84. data/lib/chef/application/apply.rb +10 -8
  85. data/lib/chef/application/client.rb +58 -33
  86. data/lib/chef/application/solo.rb +33 -12
  87. data/lib/chef/chef_fs/chef_fs_data_store.rb +1 -1
  88. data/lib/chef/chef_fs/command_line.rb +1 -1
  89. data/lib/chef/chef_fs/file_system/organization_invites_entry.rb +2 -1
  90. data/lib/chef/chef_fs/file_system/organization_members_entry.rb +2 -1
  91. data/lib/chef/chef_fs/file_system/rest_list_entry.rb +2 -1
  92. data/lib/chef/client.rb +18 -48
  93. data/lib/chef/config.rb +43 -11
  94. data/lib/chef/cookbook/cookbook_version_loader.rb +14 -7
  95. data/lib/chef/cookbook/metadata.rb +81 -38
  96. data/lib/chef/cookbook/syntax_check.rb +18 -52
  97. data/lib/chef/cookbook_loader.rb +1 -1
  98. data/lib/chef/cookbook_version.rb +58 -39
  99. data/lib/chef/data_bag.rb +2 -2
  100. data/lib/chef/deprecation/provider/file.rb +2 -1
  101. data/lib/chef/dsl/data_query.rb +2 -29
  102. data/lib/chef/dsl/recipe.rb +8 -22
  103. data/lib/chef/encrypted_data_bag_item/assertions.rb +1 -1
  104. data/lib/chef/encrypted_data_bag_item/check_encrypted.rb +56 -0
  105. data/lib/chef/encrypted_data_bag_item/encrypted_data_bag_item_assertions.rb +1 -1
  106. data/lib/chef/event_loggers/base.rb +62 -0
  107. data/lib/chef/event_loggers/windows_eventlog.rb +104 -0
  108. data/lib/chef/exceptions.rb +18 -1
  109. data/lib/chef/file_cache.rb +3 -2
  110. data/lib/chef/guard_interpreter/resource_guard_interpreter.rb +15 -6
  111. data/lib/chef/http.rb +20 -13
  112. data/lib/chef/http/ssl_policies.rb +2 -1
  113. data/lib/chef/json_compat.rb +9 -3
  114. data/lib/chef/knife.rb +2 -1
  115. data/lib/chef/knife/bootstrap.rb +12 -18
  116. data/lib/chef/knife/bootstrap/archlinux-gems.erb +2 -2
  117. data/lib/chef/knife/bootstrap/chef-aix.erb +2 -2
  118. data/lib/chef/knife/bootstrap/chef-full.erb +2 -2
  119. data/lib/chef/knife/cookbook_create.rb +1 -1
  120. data/lib/chef/knife/cookbook_site_share.rb +43 -8
  121. data/lib/chef/knife/core/bootstrap_context.rb +6 -11
  122. data/lib/chef/knife/core/object_loader.rb +5 -5
  123. data/lib/chef/knife/core/status_presenter.rb +156 -0
  124. data/lib/chef/knife/core/subcommand_loader.rb +6 -5
  125. data/lib/chef/knife/core/ui.rb +4 -4
  126. data/lib/chef/knife/data_bag_create.rb +7 -32
  127. data/lib/chef/knife/data_bag_edit.rb +24 -43
  128. data/lib/chef/knife/data_bag_from_file.rb +6 -31
  129. data/lib/chef/knife/data_bag_secret_options.rb +142 -0
  130. data/lib/chef/knife/data_bag_show.rb +19 -33
  131. data/lib/chef/knife/node_from_file.rb +9 -8
  132. data/lib/chef/knife/ssh.rb +0 -7
  133. data/lib/chef/knife/ssl_check.rb +70 -6
  134. data/lib/chef/knife/status.rb +11 -58
  135. data/lib/chef/mixin/command/unix.rb +2 -2
  136. data/lib/chef/mixin/convert_to_class_name.rb +54 -0
  137. data/lib/chef/mixin/descendants_tracker.rb +82 -0
  138. data/lib/chef/mixin/homebrew_user.rb +68 -0
  139. data/lib/chef/mixin/shell_out.rb +0 -4
  140. data/lib/chef/mixin/windows_architecture_helper.rb +16 -0
  141. data/lib/chef/mixin/windows_env_helper.rb +56 -0
  142. data/lib/chef/node.rb +2 -2
  143. data/lib/chef/node_map.rb +146 -0
  144. data/lib/chef/platform/provider_mapping.rb +11 -39
  145. data/lib/chef/platform/provider_priority_map.rb +80 -0
  146. data/lib/chef/platform/query_helpers.rb +5 -1
  147. data/lib/chef/platform/service_helpers.rb +113 -0
  148. data/lib/chef/provider.rb +24 -0
  149. data/lib/chef/provider/breakpoint.rb +2 -0
  150. data/lib/chef/provider/cookbook_file.rb +2 -0
  151. data/lib/chef/provider/cron.rb +1 -1
  152. data/lib/chef/provider/cron/unix.rb +13 -9
  153. data/lib/chef/provider/deploy.rb +3 -2
  154. data/lib/chef/provider/deploy/revision.rb +4 -2
  155. data/lib/chef/provider/deploy/timestamped.rb +2 -0
  156. data/lib/chef/provider/directory.rb +2 -0
  157. data/lib/chef/provider/dsc_script.rb +179 -0
  158. data/lib/chef/provider/env.rb +25 -10
  159. data/lib/chef/provider/env/windows.rb +9 -16
  160. data/lib/chef/provider/erl_call.rb +2 -0
  161. data/lib/chef/provider/execute.rb +5 -2
  162. data/lib/chef/provider/file.rb +2 -0
  163. data/lib/chef/provider/git.rb +51 -23
  164. data/lib/chef/provider/group/dscl.rb +2 -2
  165. data/lib/chef/provider/group/pw.rb +9 -13
  166. data/lib/chef/provider/http_request.rb +2 -0
  167. data/lib/chef/provider/link.rb +3 -0
  168. data/lib/chef/provider/log.rb +2 -0
  169. data/lib/chef/provider/lwrp_base.rb +11 -9
  170. data/lib/chef/provider/mount/mount.rb +1 -1
  171. data/lib/chef/provider/package/aix.rb +2 -0
  172. data/lib/chef/provider/package/apt.rb +2 -0
  173. data/lib/chef/provider/package/dpkg.rb +2 -0
  174. data/lib/chef/provider/package/easy_install.rb +2 -0
  175. data/lib/chef/provider/package/freebsd/pkg.rb +2 -1
  176. data/lib/chef/provider/package/freebsd/pkgng.rb +1 -1
  177. data/lib/chef/provider/package/freebsd/port.rb +1 -9
  178. data/lib/chef/provider/package/homebrew.rb +127 -0
  179. data/lib/chef/provider/package/ips.rb +2 -0
  180. data/lib/chef/provider/package/macports.rb +3 -0
  181. data/lib/chef/provider/package/pacman.rb +5 -4
  182. data/lib/chef/provider/package/paludis.rb +4 -2
  183. data/lib/chef/provider/package/portage.rb +4 -1
  184. data/lib/chef/provider/package/rpm.rb +2 -0
  185. data/lib/chef/provider/package/rubygems.rb +4 -0
  186. data/lib/chef/provider/package/smartos.rb +2 -0
  187. data/lib/chef/provider/package/solaris.rb +2 -0
  188. data/lib/chef/provider/package/windows.rb +5 -2
  189. data/lib/chef/provider/package/yum.rb +2 -0
  190. data/lib/chef/provider/powershell_script.rb +3 -1
  191. data/lib/chef/provider/remote_directory.rb +25 -10
  192. data/lib/chef/provider/route.rb +2 -0
  193. data/lib/chef/provider/ruby_block.rb +2 -0
  194. data/lib/chef/provider/script.rb +6 -0
  195. data/lib/chef/provider/service/aix.rb +128 -0
  196. data/lib/chef/provider/service/aixinit.rb +117 -0
  197. data/lib/chef/provider/service/arch.rb +6 -0
  198. data/lib/chef/provider/service/debian.rb +35 -29
  199. data/lib/chef/provider/service/freebsd.rb +7 -1
  200. data/lib/chef/provider/service/gentoo.rb +5 -1
  201. data/lib/chef/provider/service/init.rb +2 -0
  202. data/lib/chef/provider/service/insserv.rb +15 -8
  203. data/lib/chef/provider/service/invokercd.rb +6 -0
  204. data/lib/chef/provider/service/macosx.rb +4 -1
  205. data/lib/chef/provider/service/redhat.rb +9 -3
  206. data/lib/chef/provider/service/simple.rb +2 -0
  207. data/lib/chef/provider/service/solaris.rb +2 -0
  208. data/lib/chef/provider/service/systemd.rb +7 -0
  209. data/lib/chef/provider/service/upstart.rb +7 -0
  210. data/lib/chef/provider/service/windows.rb +5 -0
  211. data/lib/chef/provider/subversion.rb +2 -0
  212. data/lib/chef/provider/template.rb +1 -0
  213. data/lib/chef/provider/user/dscl.rb +3 -2
  214. data/lib/chef/provider/whyrun_safe_ruby_block.rb +2 -0
  215. data/lib/chef/provider_resolver.rb +103 -0
  216. data/lib/chef/providers.rb +6 -2
  217. data/lib/chef/recipe.rb +2 -0
  218. data/lib/chef/resource.rb +69 -78
  219. data/lib/chef/resource/apt_package.rb +3 -1
  220. data/lib/chef/resource/bash.rb +1 -0
  221. data/lib/chef/resource/bff_package.rb +0 -1
  222. data/lib/chef/resource/breakpoint.rb +1 -1
  223. data/lib/chef/resource/chef_gem.rb +1 -2
  224. data/lib/chef/resource/conditional.rb +26 -6
  225. data/lib/chef/resource/cookbook_file.rb +2 -3
  226. data/lib/chef/resource/csh.rb +1 -0
  227. data/lib/chef/resource/deploy.rb +0 -1
  228. data/lib/chef/resource/deploy_revision.rb +6 -1
  229. data/lib/chef/resource/directory.rb +1 -2
  230. data/lib/chef/resource/dpkg_package.rb +2 -1
  231. data/lib/chef/resource/dsc_script.rb +125 -0
  232. data/lib/chef/resource/easy_install_package.rb +2 -1
  233. data/lib/chef/resource/erl_call.rb +1 -0
  234. data/lib/chef/resource/execute.rb +26 -9
  235. data/lib/chef/resource/file.rb +1 -3
  236. data/lib/chef/resource/freebsd_package.rb +10 -23
  237. data/lib/chef/resource/gem_package.rb +2 -1
  238. data/lib/chef/resource/git.rb +2 -1
  239. data/lib/chef/resource/homebrew_package.rb +46 -0
  240. data/lib/chef/resource/http_request.rb +1 -0
  241. data/lib/chef/resource/ips_package.rb +3 -1
  242. data/lib/chef/resource/link.rb +1 -2
  243. data/lib/chef/resource/log.rb +4 -0
  244. data/lib/chef/resource/lwrp_base.rb +24 -15
  245. data/lib/chef/resource/macports_package.rb +3 -1
  246. data/lib/chef/resource/pacman_package.rb +2 -1
  247. data/lib/chef/resource/paludis_package.rb +3 -1
  248. data/lib/chef/resource/perl.rb +1 -0
  249. data/lib/chef/resource/powershell_script.rb +0 -2
  250. data/lib/chef/resource/python.rb +1 -1
  251. data/lib/chef/resource/remote_directory.rb +1 -2
  252. data/lib/chef/resource/remote_file.rb +1 -1
  253. data/lib/chef/resource/rpm_package.rb +2 -1
  254. data/lib/chef/resource/ruby.rb +1 -0
  255. data/lib/chef/resource/ruby_block.rb +3 -0
  256. data/lib/chef/resource/script.rb +2 -25
  257. data/lib/chef/resource/service.rb +0 -4
  258. data/lib/chef/resource/smartos_package.rb +3 -4
  259. data/lib/chef/resource/solaris_package.rb +7 -1
  260. data/lib/chef/resource/subversion.rb +0 -1
  261. data/lib/chef/resource/template.rb +2 -3
  262. data/lib/chef/resource/timestamped_deploy.rb +1 -2
  263. data/lib/chef/resource/whyrun_safe_ruby_block.rb +0 -1
  264. data/lib/chef/resource/windows_package.rb +3 -4
  265. data/lib/chef/resource/windows_script.rb +3 -0
  266. data/lib/chef/resource/windows_service.rb +2 -2
  267. data/lib/chef/resource/yum_package.rb +3 -1
  268. data/lib/chef/resource_collection.rb +50 -227
  269. data/lib/chef/resource_collection/resource_collection_serialization.rb +59 -0
  270. data/lib/chef/resource_collection/resource_list.rb +89 -0
  271. data/lib/chef/resource_collection/resource_set.rb +170 -0
  272. data/lib/chef/resources.rb +2 -0
  273. data/lib/chef/role.rb +1 -1
  274. data/lib/chef/run_context.rb +5 -1
  275. data/lib/chef/shell/ext.rb +1 -1
  276. data/lib/chef/util/backup.rb +3 -2
  277. data/lib/chef/util/dsc/configuration_generator.rb +115 -0
  278. data/lib/chef/util/dsc/lcm_output_parser.rb +133 -0
  279. data/lib/chef/util/dsc/local_configuration_manager.rb +141 -0
  280. data/lib/chef/util/dsc/resource_info.rb +26 -0
  281. data/lib/chef/util/path_helper.rb +12 -0
  282. data/lib/chef/util/powershell/cmdlet.rb +136 -0
  283. data/lib/chef/util/powershell/cmdlet_result.rb +46 -0
  284. data/lib/chef/version.rb +1 -1
  285. data/lib/chef/win32/api/system.rb +9 -0
  286. data/lib/chef/win32/version.rb +2 -0
  287. data/spec/.DS_Store +0 -0
  288. data/spec/data/.DS_Store +0 -0
  289. data/spec/data/bootstrap/test-hints.erb +1 -1
  290. data/spec/data/bootstrap/test.erb +1 -1
  291. data/spec/data/cb_version_cookbooks/cookbook2/files/test.txt +0 -0
  292. data/spec/data/cb_version_cookbooks/cookbook2/templates/test.erb +0 -0
  293. data/spec/data/cookbooks/ignorken/files/default/not_me.rb +2 -0
  294. data/spec/data/cookbooks/ignorken/templates/ubuntu-12.10/not_me.rb +2 -0
  295. data/spec/data/cookbooks/openldap/libraries/openldap.rb +4 -0
  296. data/spec/data/cookbooks/openldap/libraries/openldap/version.rb +3 -0
  297. data/spec/data/lwrp/.DS_Store +0 -0
  298. data/spec/data/lwrp/providers/.DS_Store +0 -0
  299. data/spec/data/lwrp/providers/buck_passer.rb +9 -2
  300. data/spec/data/lwrp/resources/.DS_Store +0 -0
  301. data/spec/data/lwrp/resources/foo.rb +3 -2
  302. data/spec/data/lwrp_override/.DS_Store +0 -0
  303. data/spec/data/lwrp_override/providers/.DS_Store +0 -0
  304. data/spec/data/lwrp_override/providers/buck_passer.rb +5 -10
  305. data/spec/data/lwrp_override/resources/.DS_Store +0 -0
  306. data/spec/data/lwrp_override/resources/foo.rb +4 -3
  307. data/spec/functional/assets/chefinittest +34 -0
  308. data/spec/functional/assets/testchefsubsys +11 -0
  309. data/spec/functional/dsl/reboot_pending_spec.rb +19 -16
  310. data/spec/functional/event_loggers/windows_eventlog_spec.rb +82 -0
  311. data/spec/functional/knife/cookbook_delete_spec.rb +3 -3
  312. data/spec/functional/knife/exec_spec.rb +1 -1
  313. data/spec/functional/resource/aix_service_spec.rb +136 -0
  314. data/spec/functional/resource/aixinit_service_spec.rb +211 -0
  315. data/spec/functional/resource/base.rb +1 -0
  316. data/spec/functional/resource/batch_spec.rb +4 -11
  317. data/spec/functional/resource/cron_spec.rb +7 -1
  318. data/spec/functional/resource/dsc_script_spec.rb +382 -0
  319. data/spec/functional/resource/env_spec.rb +54 -0
  320. data/spec/functional/resource/execute_spec.rb +113 -0
  321. data/spec/functional/resource/file_spec.rb +2 -0
  322. data/spec/functional/resource/group_spec.rb +7 -4
  323. data/spec/functional/resource/powershell_spec.rb +198 -185
  324. data/spec/functional/resource/rpm_spec.rb +5 -4
  325. data/spec/functional/resource/user/dscl_spec.rb +2 -1
  326. data/spec/functional/util/path_helper_spec.rb +37 -0
  327. data/spec/functional/util/powershell/cmdlet_spec.rb +114 -0
  328. data/spec/integration/client/client_spec.rb +1 -1
  329. data/spec/integration/client/ipv6_spec.rb +1 -1
  330. data/spec/integration/knife/chef_fs_data_store_spec.rb +1 -1
  331. data/spec/integration/knife/chef_repo_path_spec.rb +1 -1
  332. data/spec/integration/knife/chef_repository_file_system_spec.rb +1 -1
  333. data/spec/integration/knife/chefignore_spec.rb +1 -1
  334. data/spec/integration/knife/common_options_spec.rb +1 -1
  335. data/spec/integration/knife/cookbook_api_ipv6_spec.rb +2 -2
  336. data/spec/integration/knife/delete_spec.rb +1 -1
  337. data/spec/integration/knife/deps_spec.rb +1 -1
  338. data/spec/integration/knife/diff_spec.rb +1 -1
  339. data/spec/integration/knife/download_spec.rb +1 -1
  340. data/spec/integration/knife/list_spec.rb +1 -1
  341. data/spec/integration/knife/raw_spec.rb +1 -1
  342. data/spec/integration/knife/redirection_spec.rb +1 -1
  343. data/spec/integration/knife/serve_spec.rb +1 -1
  344. data/spec/integration/knife/show_spec.rb +1 -1
  345. data/spec/integration/knife/upload_spec.rb +4 -3
  346. data/spec/integration/recipes/lwrp_inline_resources_spec.rb +1 -1
  347. data/spec/spec_helper.rb +15 -0
  348. data/spec/support/chef_helpers.rb +1 -0
  349. data/spec/support/lib/chef/provider/snakeoil.rb +1 -0
  350. data/spec/support/lib/chef/resource/zen_follower.rb +1 -7
  351. data/spec/support/platform_helpers.rb +28 -0
  352. data/spec/support/shared/functional/file_resource.rb +6 -0
  353. data/spec/support/shared/functional/windows_script.rb +118 -0
  354. data/spec/support/shared/integration/integration_helper.rb +5 -2
  355. data/spec/support/shared/matchers/exit_with_code.rb +28 -0
  356. data/spec/support/shared/matchers/match_environment_variable.rb +17 -0
  357. data/spec/support/shared/shared_examples.rb +14 -0
  358. data/spec/support/shared/unit/execute_resource.rb +0 -7
  359. data/spec/support/shared/unit/resource/static_provider_resolution.rb +71 -0
  360. data/spec/support/shared/unit/script_resource.rb +1 -1
  361. data/spec/support/shared/unit/windows_script_resource.rb +35 -2
  362. data/spec/tiny_server.rb +1 -2
  363. data/spec/unit/api_client_spec.rb +5 -1
  364. data/spec/unit/application/{apply.rb → apply_spec.rb} +13 -5
  365. data/spec/unit/application/client_spec.rb +106 -13
  366. data/spec/unit/application/solo_spec.rb +25 -1
  367. data/spec/unit/client_spec.rb +1 -26
  368. data/spec/unit/config_fetcher_spec.rb +2 -1
  369. data/spec/unit/config_spec.rb +91 -2
  370. data/spec/unit/cookbook/cookbook_version_loader_spec.rb +8 -0
  371. data/spec/unit/cookbook/metadata_spec.rb +43 -6
  372. data/spec/unit/cookbook/syntax_check_spec.rb +8 -2
  373. data/spec/unit/cookbook_loader_spec.rb +4 -2
  374. data/spec/unit/cookbook_version_spec.rb +83 -2
  375. data/spec/unit/data_bag_item_spec.rb +5 -1
  376. data/spec/unit/data_bag_spec.rb +6 -1
  377. data/spec/unit/dsl/data_query_spec.rb +8 -110
  378. data/spec/unit/encrypted_data_bag_item/check_encrypted_spec.rb +95 -0
  379. data/spec/unit/encrypted_data_bag_item_spec.rb +16 -23
  380. data/spec/unit/environment_spec.rb +6 -2
  381. data/spec/unit/exceptions_spec.rb +6 -0
  382. data/spec/unit/guard_interpreter/resource_guard_interpreter_spec.rb +16 -15
  383. data/spec/unit/json_compat_spec.rb +12 -2
  384. data/spec/unit/knife/bootstrap_spec.rb +16 -63
  385. data/spec/unit/knife/cookbook_site_share_spec.rb +59 -6
  386. data/spec/unit/knife/core/bootstrap_context_spec.rb +8 -37
  387. data/spec/unit/knife/core/subcommand_loader_spec.rb +1 -1
  388. data/spec/unit/knife/core/ui_spec.rb +28 -0
  389. data/spec/unit/knife/data_bag_create_spec.rb +63 -71
  390. data/spec/unit/knife/data_bag_edit_spec.rb +83 -49
  391. data/spec/unit/knife/data_bag_from_file_spec.rb +104 -126
  392. data/spec/unit/knife/data_bag_secret_options_spec.rb +165 -0
  393. data/spec/unit/knife/data_bag_show_spec.rb +74 -72
  394. data/spec/unit/knife/environment_from_file_spec.rb +3 -2
  395. data/spec/unit/knife/ssl_check_spec.rb +46 -1
  396. data/spec/unit/knife/status_spec.rb +1 -2
  397. data/spec/unit/knife_spec.rb +18 -1
  398. data/spec/unit/lwrp_spec.rb +29 -8
  399. data/spec/unit/mixin/homebrew_user_spec.rb +100 -0
  400. data/spec/unit/node_map_spec.rb +155 -0
  401. data/spec/unit/node_spec.rb +11 -0
  402. data/spec/unit/platform/query_helpers_spec.rb +23 -0
  403. data/spec/unit/platform_spec.rb +23 -0
  404. data/spec/unit/provider/breakpoint_spec.rb +9 -9
  405. data/spec/unit/provider/cookbook_file/content_spec.rb +3 -3
  406. data/spec/unit/provider/cookbook_file_spec.rb +1 -1
  407. data/spec/unit/provider/cron/unix_spec.rb +78 -60
  408. data/spec/unit/provider/cron_spec.rb +175 -175
  409. data/spec/unit/provider/deploy/revision_spec.rb +22 -21
  410. data/spec/unit/provider/deploy/timestamped_spec.rb +3 -3
  411. data/spec/unit/provider/deploy_spec.rb +231 -230
  412. data/spec/unit/provider/directory_spec.rb +55 -55
  413. data/spec/unit/provider/dsc_script_spec.rb +174 -0
  414. data/spec/unit/provider/env/windows_spec.rb +70 -34
  415. data/spec/unit/provider/env_spec.rb +95 -49
  416. data/spec/unit/provider/erl_call_spec.rb +9 -9
  417. data/spec/unit/provider/execute_spec.rb +43 -27
  418. data/spec/unit/provider/file/content_spec.rb +9 -9
  419. data/spec/unit/provider/file_spec.rb +1 -1
  420. data/spec/unit/provider/git_spec.rb +221 -159
  421. data/spec/unit/provider/group/dscl_spec.rb +64 -63
  422. data/spec/unit/provider/group/gpasswd_spec.rb +14 -14
  423. data/spec/unit/provider/group/groupadd_spec.rb +33 -33
  424. data/spec/unit/provider/group/groupmod_spec.rb +23 -23
  425. data/spec/unit/provider/group/pw_spec.rb +21 -21
  426. data/spec/unit/provider/group/usermod_spec.rb +20 -20
  427. data/spec/unit/provider/group/windows_spec.rb +15 -15
  428. data/spec/unit/provider/group_spec.rb +76 -76
  429. data/spec/unit/provider/http_request_spec.rb +30 -30
  430. data/spec/unit/provider/ifconfig/aix_spec.rb +20 -20
  431. data/spec/unit/provider/ifconfig/debian_spec.rb +25 -9
  432. data/spec/unit/provider/ifconfig/redhat_spec.rb +13 -13
  433. data/spec/unit/provider/ifconfig_spec.rb +43 -43
  434. data/spec/unit/provider/link_spec.rb +60 -60
  435. data/spec/unit/provider/log_spec.rb +0 -4
  436. data/spec/unit/provider/mdadm_spec.rb +23 -23
  437. data/spec/unit/provider/mount/aix_spec.rb +17 -17
  438. data/spec/unit/provider/mount/mount_spec.rb +115 -119
  439. data/spec/unit/provider/mount/solaris_spec.rb +72 -72
  440. data/spec/unit/provider/mount/windows_spec.rb +24 -24
  441. data/spec/unit/provider/ohai_spec.rb +11 -11
  442. data/spec/unit/provider/package/aix_spec.rb +34 -34
  443. data/spec/unit/provider/package/apt_spec.rb +36 -36
  444. data/spec/unit/provider/package/dpkg_spec.rb +27 -27
  445. data/spec/unit/provider/package/easy_install_spec.rb +16 -16
  446. data/spec/unit/provider/package/freebsd/pkg_spec.rb +53 -53
  447. data/spec/unit/provider/package/freebsd/pkgng_spec.rb +24 -24
  448. data/spec/unit/provider/package/freebsd/port_spec.rb +45 -35
  449. data/spec/unit/provider/package/homebrew_spec.rb +266 -0
  450. data/spec/unit/provider/package/ips_spec.rb +34 -34
  451. data/spec/unit/provider/package/macports_spec.rb +49 -49
  452. data/spec/unit/provider/package/pacman_spec.rb +35 -39
  453. data/spec/unit/provider/package/paludis_spec.rb +20 -20
  454. data/spec/unit/provider/package/portage_spec.rb +38 -38
  455. data/spec/unit/provider/package/rpm_spec.rb +29 -29
  456. data/spec/unit/provider/package/rubygems_spec.rb +284 -270
  457. data/spec/unit/provider/package/smartos_spec.rb +15 -15
  458. data/spec/unit/provider/package/solaris_spec.rb +35 -35
  459. data/spec/unit/provider/package/windows/msi_spec.rb +3 -3
  460. data/spec/unit/provider/package/windows_spec.rb +6 -6
  461. data/spec/unit/provider/package/yum_spec.rb +416 -416
  462. data/spec/unit/provider/package/zypper_spec.rb +47 -47
  463. data/spec/unit/provider/package_spec.rb +107 -107
  464. data/spec/unit/provider/powershell_spec.rb +1 -1
  465. data/spec/unit/provider/registry_key_spec.rb +61 -61
  466. data/spec/unit/provider/remote_directory_spec.rb +36 -36
  467. data/spec/unit/provider/remote_file/cache_control_data_spec.rb +24 -24
  468. data/spec/unit/provider/remote_file/content_spec.rb +45 -45
  469. data/spec/unit/provider/remote_file/fetcher_spec.rb +9 -9
  470. data/spec/unit/provider/remote_file/ftp_spec.rb +32 -32
  471. data/spec/unit/provider/remote_file/http_spec.rb +44 -44
  472. data/spec/unit/provider/remote_file/local_file_spec.rb +9 -9
  473. data/spec/unit/provider/remote_file_spec.rb +3 -3
  474. data/spec/unit/provider/route_spec.rb +63 -63
  475. data/spec/unit/provider/ruby_block_spec.rb +4 -4
  476. data/spec/unit/provider/script_spec.rb +12 -12
  477. data/spec/unit/provider/service/aix_service_spec.rb +181 -0
  478. data/spec/unit/provider/service/aixinit_service_spec.rb +269 -0
  479. data/spec/unit/provider/service/arch_service_spec.rb +48 -48
  480. data/spec/unit/provider/service/debian_service_spec.rb +40 -40
  481. data/spec/unit/provider/service/gentoo_service_spec.rb +28 -28
  482. data/spec/unit/provider/service/init_service_spec.rb +39 -39
  483. data/spec/unit/provider/service/insserv_service_spec.rb +8 -8
  484. data/spec/unit/provider/service/invokercd_service_spec.rb +35 -35
  485. data/spec/unit/provider/service/macosx_spec.rb +49 -49
  486. data/spec/unit/provider/service/redhat_spec.rb +27 -27
  487. data/spec/unit/provider/service/simple_service_spec.rb +28 -28
  488. data/spec/unit/provider/service/solaris_smf_service_spec.rb +43 -46
  489. data/spec/unit/provider/service/systemd_service_spec.rb +63 -63
  490. data/spec/unit/provider/service/upstart_service_spec.rb +78 -78
  491. data/spec/unit/provider/service/windows_spec.rb +92 -92
  492. data/spec/unit/provider/service_spec.rb +40 -40
  493. data/spec/unit/provider/subversion_spec.rb +80 -80
  494. data/spec/unit/provider/template/content_spec.rb +9 -9
  495. data/spec/unit/provider/template_spec.rb +6 -6
  496. data/spec/unit/provider/user/dscl_spec.rb +170 -167
  497. data/spec/unit/provider/user/pw_spec.rb +48 -48
  498. data/spec/unit/provider/user/solaris_spec.rb +8 -8
  499. data/spec/unit/provider/user/useradd_spec.rb +1 -1
  500. data/spec/unit/provider/user/windows_spec.rb +26 -26
  501. data/spec/unit/provider/user_spec.rb +72 -72
  502. data/spec/unit/provider/whyrun_safe_ruby_block_spec.rb +4 -4
  503. data/spec/unit/provider_resolver_spec.rb +387 -0
  504. data/spec/unit/recipe_spec.rb +33 -12
  505. data/spec/unit/resource/apt_package_spec.rb +10 -13
  506. data/spec/unit/resource/bash_spec.rb +4 -4
  507. data/spec/unit/resource/batch_spec.rb +1 -1
  508. data/spec/unit/resource/breakpoint_spec.rb +11 -7
  509. data/spec/unit/resource/chef_gem_spec.rb +8 -15
  510. data/spec/unit/resource/conditional_action_not_nothing_spec.rb +2 -2
  511. data/spec/unit/resource/conditional_spec.rb +35 -16
  512. data/spec/unit/resource/cookbook_file_spec.rb +13 -13
  513. data/spec/unit/resource/cron_spec.rb +37 -37
  514. data/spec/unit/resource/csh_spec.rb +4 -4
  515. data/spec/unit/resource/deploy_revision_spec.rb +13 -18
  516. data/spec/unit/resource/deploy_spec.rb +60 -55
  517. data/spec/unit/resource/directory_spec.rb +18 -18
  518. data/spec/unit/resource/dpkg_package_spec.rb +8 -14
  519. data/spec/unit/resource/dsc_script_spec.rb +98 -0
  520. data/spec/unit/resource/easy_install_package_spec.rb +9 -18
  521. data/spec/unit/resource/env_spec.rb +12 -12
  522. data/spec/unit/resource/erl_call_spec.rb +11 -11
  523. data/spec/unit/resource/execute_spec.rb +5 -0
  524. data/spec/unit/resource/file_spec.rb +29 -29
  525. data/spec/unit/resource/freebsd_package_spec.rb +11 -12
  526. data/spec/unit/resource/gem_package_spec.rb +8 -15
  527. data/spec/unit/resource/git_spec.rb +12 -8
  528. data/spec/unit/resource/group_spec.rb +27 -27
  529. data/spec/unit/resource/homebrew_package_spec.rb +50 -0
  530. data/spec/unit/resource/http_request_spec.rb +6 -6
  531. data/spec/unit/resource/ifconfig_spec.rb +8 -8
  532. data/spec/unit/resource/ips_package_spec.rb +10 -13
  533. data/spec/unit/resource/link_spec.rb +25 -25
  534. data/spec/unit/resource/log_spec.rb +9 -9
  535. data/spec/unit/resource/macports_package_spec.rb +8 -13
  536. data/spec/unit/resource/mdadm_spec.rb +18 -18
  537. data/spec/unit/resource/mount_spec.rb +45 -45
  538. data/spec/unit/resource/ohai_spec.rb +7 -7
  539. data/spec/unit/resource/package_spec.rb +12 -12
  540. data/spec/unit/resource/pacman_package_spec.rb +8 -14
  541. data/spec/unit/resource/perl_spec.rb +4 -4
  542. data/spec/unit/resource/portage_package_spec.rb +3 -3
  543. data/spec/unit/resource/powershell_spec.rb +7 -7
  544. data/spec/unit/resource/python_spec.rb +4 -4
  545. data/spec/unit/resource/registry_key_spec.rb +32 -32
  546. data/spec/unit/resource/remote_directory_spec.rb +17 -17
  547. data/spec/unit/resource/remote_file_spec.rb +41 -41
  548. data/spec/unit/resource/route_spec.rb +19 -19
  549. data/spec/unit/resource/rpm_package_spec.rb +9 -13
  550. data/spec/unit/resource/ruby_block_spec.rb +8 -8
  551. data/spec/unit/resource/ruby_spec.rb +4 -4
  552. data/spec/unit/resource/scm_spec.rb +40 -40
  553. data/spec/unit/resource/script_spec.rb +2 -2
  554. data/spec/unit/resource/service_spec.rb +37 -47
  555. data/spec/unit/resource/smartos_package_spec.rb +10 -15
  556. data/spec/unit/resource/solaris_package_spec.rb +13 -28
  557. data/spec/unit/resource/subversion_spec.rb +16 -12
  558. data/spec/unit/resource/template_spec.rb +35 -35
  559. data/spec/unit/resource/timestamped_deploy_spec.rb +30 -4
  560. data/spec/unit/resource/user_spec.rb +23 -23
  561. data/spec/unit/resource/windows_package_spec.rb +17 -10
  562. data/spec/unit/resource/windows_service_spec.rb +9 -6
  563. data/spec/unit/resource/yum_package_spec.rb +16 -21
  564. data/spec/unit/resource_collection/resource_list_spec.rb +137 -0
  565. data/spec/unit/resource_collection/resource_set_spec.rb +199 -0
  566. data/spec/unit/resource_collection_spec.rb +73 -92
  567. data/spec/unit/resource_definition_spec.rb +38 -40
  568. data/spec/unit/resource_reporter_spec.rb +3 -3
  569. data/spec/unit/resource_spec.rb +68 -33
  570. data/spec/unit/rest_spec.rb +83 -76
  571. data/spec/unit/role_spec.rb +5 -0
  572. data/spec/unit/run_list_spec.rb +5 -1
  573. data/spec/unit/runner_spec.rb +245 -238
  574. data/spec/unit/shell/shell_ext_spec.rb +1 -1
  575. data/spec/unit/user_spec.rb +5 -1
  576. data/spec/unit/util/dsc/configuration_generator_spec.rb +171 -0
  577. data/spec/unit/util/dsc/lcm_output_parser_spec.rb +169 -0
  578. data/spec/unit/util/dsc/local_configuration_manager_spec.rb +139 -0
  579. data/spec/unit/util/path_helper_spec.rb +23 -1
  580. data/spec/unit/util/powershell/cmdlet_spec.rb +106 -0
  581. data/spec/unit/workstation_config_loader_spec.rb +1 -1
  582. metadata +303 -196
  583. checksums.yaml +0 -7
  584. data/distro/README +0 -2
  585. data/distro/arch/etc/conf.d/chef-client.conf +0 -5
  586. data/distro/arch/etc/conf.d/chef-expander.conf +0 -8
  587. data/distro/arch/etc/conf.d/chef-server-webui.conf +0 -10
  588. data/distro/arch/etc/conf.d/chef-server.conf +0 -10
  589. data/distro/arch/etc/conf.d/chef-solr.conf +0 -8
  590. data/distro/arch/etc/rc.d/chef-client +0 -90
  591. data/distro/arch/etc/rc.d/chef-expander +0 -78
  592. data/distro/arch/etc/rc.d/chef-server +0 -78
  593. data/distro/arch/etc/rc.d/chef-server-webui +0 -78
  594. data/distro/arch/etc/rc.d/chef-solr +0 -78
  595. data/distro/debian/etc/default/chef-client +0 -4
  596. data/distro/debian/etc/default/chef-expander +0 -8
  597. data/distro/debian/etc/default/chef-server +0 -9
  598. data/distro/debian/etc/default/chef-server-webui +0 -9
  599. data/distro/debian/etc/default/chef-solr +0 -8
  600. data/distro/debian/etc/init.d/chef-client +0 -212
  601. data/distro/debian/etc/init.d/chef-expander +0 -176
  602. data/distro/debian/etc/init.d/chef-server +0 -122
  603. data/distro/debian/etc/init.d/chef-server-webui +0 -123
  604. data/distro/debian/etc/init.d/chef-solr +0 -176
  605. data/distro/debian/etc/init/chef-client.conf +0 -17
  606. data/distro/debian/etc/init/chef-expander.conf +0 -17
  607. data/distro/debian/etc/init/chef-server-webui.conf +0 -17
  608. data/distro/debian/etc/init/chef-server.conf +0 -17
  609. data/distro/debian/etc/init/chef-solr.conf +0 -17
  610. data/distro/redhat/etc/init.d/chef-client +0 -121
  611. data/distro/redhat/etc/init.d/chef-expander +0 -104
  612. data/distro/redhat/etc/init.d/chef-server +0 -112
  613. data/distro/redhat/etc/init.d/chef-server-webui +0 -112
  614. data/distro/redhat/etc/init.d/chef-solr +0 -104
  615. data/distro/redhat/etc/logrotate.d/chef-client +0 -8
  616. data/distro/redhat/etc/logrotate.d/chef-expander +0 -8
  617. data/distro/redhat/etc/logrotate.d/chef-server +0 -8
  618. data/distro/redhat/etc/logrotate.d/chef-server-webui +0 -8
  619. data/distro/redhat/etc/logrotate.d/chef-solr +0 -8
  620. data/distro/redhat/etc/sysconfig/chef-client +0 -15
  621. data/distro/redhat/etc/sysconfig/chef-expander +0 -7
  622. data/distro/redhat/etc/sysconfig/chef-server +0 -14
  623. data/distro/redhat/etc/sysconfig/chef-server-webui +0 -14
  624. data/distro/redhat/etc/sysconfig/chef-solr +0 -8
  625. data/distro/windows/service_manager.rb +0 -20
  626. data/lib/chef/resource_platform_map.rb +0 -151
  627. data/spec/support/shared/matchers.rb +0 -17
  628. data/spec/unit/resource_platform_map_spec.rb +0 -164
@@ -92,37 +92,37 @@ describe Chef::Provider::Mount::Solaris, :unix_only do
92
92
 
93
93
  before do
94
94
  stub_const("Chef::Provider::Mount::Solaris::VFSTAB", vfstab_file.path )
95
- provider.stub(:shell_out!).with("mount -v").and_return(OpenStruct.new(:stdout => mount_output))
96
- File.stub(:symlink?).with(device).and_return(false)
97
- File.stub(:exist?).and_call_original # Tempfile.open on ruby 1.8.7 calls File.exist?
98
- File.stub(:exist?).with(device).and_return(true)
99
- File.stub(:exist?).with(mountpoint).and_return(true)
95
+ allow(provider).to receive(:shell_out!).with("mount -v").and_return(OpenStruct.new(:stdout => mount_output))
96
+ allow(File).to receive(:symlink?).with(device).and_return(false)
97
+ allow(File).to receive(:exist?).and_call_original # Tempfile.open on ruby 1.8.7 calls File.exist?
98
+ allow(File).to receive(:exist?).with(device).and_return(true)
99
+ allow(File).to receive(:exist?).with(mountpoint).and_return(true)
100
100
  expect(File).to_not receive(:exists?)
101
101
  end
102
102
 
103
103
  describe "#define_resource_requirements" do
104
104
  before do
105
105
  # we're not testing the actual actions so stub them all out
106
- [:mount_fs, :umount_fs, :remount_fs, :enable_fs, :disable_fs].each {|m| provider.stub(m) }
106
+ [:mount_fs, :umount_fs, :remount_fs, :enable_fs, :disable_fs].each {|m| allow(provider).to receive(m) }
107
107
  end
108
108
 
109
109
  it "run_action(:mount) should raise an error if the device does not exist" do
110
- File.stub(:exist?).with(device).and_return(false)
110
+ allow(File).to receive(:exist?).with(device).and_return(false)
111
111
  expect { provider.run_action(:mount) }.to raise_error(Chef::Exceptions::Mount)
112
112
  end
113
113
 
114
114
  it "run_action(:remount) should raise an error if the device does not exist" do
115
- File.stub(:exist?).with(device).and_return(false)
115
+ allow(File).to receive(:exist?).with(device).and_return(false)
116
116
  expect { provider.run_action(:remount) }.to raise_error(Chef::Exceptions::Mount)
117
117
  end
118
118
 
119
119
  it "run_action(:mount) should raise an error if the mountpoint does not exist" do
120
- File.stub(:exist?).with(mountpoint).and_return false
120
+ allow(File).to receive(:exist?).with(mountpoint).and_return false
121
121
  expect { provider.run_action(:mount) }.to raise_error(Chef::Exceptions::Mount)
122
122
  end
123
123
 
124
124
  it "run_action(:remount) should raise an error if the mountpoint does not exist" do
125
- File.stub(:exist?).with(mountpoint).and_return false
125
+ allow(File).to receive(:exist?).with(mountpoint).and_return false
126
126
  expect { provider.run_action(:remount) }.to raise_error(Chef::Exceptions::Mount)
127
127
  end
128
128
 
@@ -160,23 +160,23 @@ describe Chef::Provider::Mount::Solaris, :unix_only do
160
160
  end
161
161
 
162
162
  it "should set the name on the current_resource" do
163
- provider.current_resource.name.should == mountpoint
163
+ expect(provider.current_resource.name).to eq(mountpoint)
164
164
  end
165
165
 
166
166
  it "should set the mount_point on the current_resource" do
167
- provider.current_resource.mount_point.should == mountpoint
167
+ expect(provider.current_resource.mount_point).to eq(mountpoint)
168
168
  end
169
169
 
170
170
  it "should set the device on the current_resource" do
171
- provider.current_resource.device.should == device
171
+ expect(provider.current_resource.device).to eq(device)
172
172
  end
173
173
 
174
174
  it "should set the fsck_device on the current_resource" do
175
- provider.current_resource.fsck_device.should == fsck_device
175
+ expect(provider.current_resource.fsck_device).to eq(fsck_device)
176
176
  end
177
177
 
178
178
  it "should set the device_type on the current_resource" do
179
- provider.current_resource.device_type.should == device_type
179
+ expect(provider.current_resource.device_type).to eq(device_type)
180
180
  end
181
181
 
182
182
  it "should set the mounted status on the current_resource" do
@@ -200,12 +200,12 @@ describe Chef::Provider::Mount::Solaris, :unix_only do
200
200
  end
201
201
 
202
202
  it "should not throw an exception when the device does not exist - CHEF-1565" do
203
- File.stub(:exist?).with(device).and_return(false)
203
+ allow(File).to receive(:exist?).with(device).and_return(false)
204
204
  expect { provider.load_current_resource }.to_not raise_error
205
205
  end
206
206
 
207
207
  it "should not throw an exception when the mount point does not exist" do
208
- File.stub(:exist?).with(mountpoint).and_return false
208
+ allow(File).to receive(:exist?).with(mountpoint).and_return false
209
209
  expect { provider.load_current_resource }.to_not raise_error
210
210
  end
211
211
  end
@@ -288,19 +288,19 @@ describe Chef::Provider::Mount::Solaris, :unix_only do
288
288
  end
289
289
 
290
290
  it "should set the name on the current_resource" do
291
- provider.current_resource.name.should == mountpoint
291
+ expect(provider.current_resource.name).to eq(mountpoint)
292
292
  end
293
293
 
294
294
  it "should set the mount_point on the current_resource" do
295
- provider.current_resource.mount_point.should == mountpoint
295
+ expect(provider.current_resource.mount_point).to eq(mountpoint)
296
296
  end
297
297
 
298
298
  it "should set the device on the current_resource" do
299
- provider.current_resource.device.should == device
299
+ expect(provider.current_resource.device).to eq(device)
300
300
  end
301
301
 
302
302
  it "should set the device_type on the current_resource" do
303
- provider.current_resource.device_type.should == device_type
303
+ expect(provider.current_resource.device_type).to eq(device_type)
304
304
  end
305
305
 
306
306
  it "should set the mounted status on the current_resource" do
@@ -347,8 +347,8 @@ describe Chef::Provider::Mount::Solaris, :unix_only do
347
347
  }
348
348
 
349
349
  before do
350
- File.should_receive(:symlink?).with(device).at_least(:once).and_return(true)
351
- File.should_receive(:readlink).with(device).at_least(:once).and_return(target)
350
+ expect(File).to receive(:symlink?).with(device).at_least(:once).and_return(true)
351
+ expect(File).to receive(:readlink).with(device).at_least(:once).and_return(target)
352
352
 
353
353
  provider.load_current_resource()
354
354
  end
@@ -384,8 +384,8 @@ describe Chef::Provider::Mount::Solaris, :unix_only do
384
384
  }
385
385
 
386
386
  before do
387
- File.should_receive(:symlink?).with(device).at_least(:once).and_return(true)
388
- File.should_receive(:readlink).with(device).at_least(:once).and_return(target)
387
+ expect(File).to receive(:symlink?).with(device).at_least(:once).and_return(true)
388
+ expect(File).to receive(:readlink).with(device).at_least(:once).and_return(target)
389
389
 
390
390
  provider.load_current_resource()
391
391
  end
@@ -412,7 +412,7 @@ describe Chef::Provider::Mount::Solaris, :unix_only do
412
412
  }
413
413
  it "should set mounted true" do
414
414
  provider.load_current_resource()
415
- provider.current_resource.mounted.should be_true
415
+ expect(provider.current_resource.mounted).to be_true
416
416
  end
417
417
  end
418
418
 
@@ -425,7 +425,7 @@ describe Chef::Provider::Mount::Solaris, :unix_only do
425
425
  }
426
426
  it "should set mounted false" do
427
427
  provider.load_current_resource()
428
- provider.current_resource.mounted.should be_false
428
+ expect(provider.current_resource.mounted).to be_false
429
429
  end
430
430
  end
431
431
 
@@ -437,7 +437,7 @@ describe Chef::Provider::Mount::Solaris, :unix_only do
437
437
  }
438
438
  it "should set mounted false" do
439
439
  provider.load_current_resource()
440
- provider.current_resource.mounted.should be_false
440
+ expect(provider.current_resource.mounted).to be_false
441
441
  end
442
442
  end
443
443
 
@@ -449,7 +449,7 @@ describe Chef::Provider::Mount::Solaris, :unix_only do
449
449
  }
450
450
  it "should set mounted false" do
451
451
  provider.load_current_resource()
452
- provider.current_resource.mounted.should be_false
452
+ expect(provider.current_resource.mounted).to be_false
453
453
  end
454
454
  end
455
455
 
@@ -463,7 +463,7 @@ describe Chef::Provider::Mount::Solaris, :unix_only do
463
463
 
464
464
  it "should set enabled to true" do
465
465
  provider.load_current_resource
466
- provider.current_resource.enabled.should be_true
466
+ expect(provider.current_resource.enabled).to be_true
467
467
  end
468
468
  end
469
469
 
@@ -477,7 +477,7 @@ describe Chef::Provider::Mount::Solaris, :unix_only do
477
477
 
478
478
  it "should set enabled to true" do
479
479
  provider.load_current_resource
480
- provider.current_resource.enabled.should be_true
480
+ expect(provider.current_resource.enabled).to be_true
481
481
  end
482
482
  end
483
483
 
@@ -491,7 +491,7 @@ describe Chef::Provider::Mount::Solaris, :unix_only do
491
491
 
492
492
  it "should set enabled to false" do
493
493
  provider.load_current_resource
494
- provider.current_resource.enabled.should be_false
494
+ expect(provider.current_resource.enabled).to be_false
495
495
  end
496
496
  end
497
497
 
@@ -504,7 +504,7 @@ describe Chef::Provider::Mount::Solaris, :unix_only do
504
504
 
505
505
  it "should set enabled to false" do
506
506
  provider.load_current_resource
507
- provider.current_resource.enabled.should be_false
507
+ expect(provider.current_resource.enabled).to be_false
508
508
  end
509
509
  end
510
510
 
@@ -517,7 +517,7 @@ describe Chef::Provider::Mount::Solaris, :unix_only do
517
517
 
518
518
  it "should set enabled to false" do
519
519
  provider.load_current_resource
520
- provider.current_resource.enabled.should be_false
520
+ expect(provider.current_resource.enabled).to be_false
521
521
  end
522
522
  end
523
523
 
@@ -530,7 +530,7 @@ describe Chef::Provider::Mount::Solaris, :unix_only do
530
530
 
531
531
  it "should set enabled to false" do
532
532
  provider.load_current_resource
533
- provider.current_resource.enabled.should be_false
533
+ expect(provider.current_resource.enabled).to be_false
534
534
  end
535
535
  end
536
536
  end
@@ -538,28 +538,28 @@ describe Chef::Provider::Mount::Solaris, :unix_only do
538
538
  context "after the mount's state has been discovered" do
539
539
  describe "mount_fs" do
540
540
  it "should mount the filesystem" do
541
- provider.should_receive(:shell_out!).with("mount -F #{fstype} -o defaults #{device} #{mountpoint}")
541
+ expect(provider).to receive(:shell_out!).with("mount -F #{fstype} -o defaults #{device} #{mountpoint}")
542
542
  provider.mount_fs()
543
543
  end
544
544
 
545
545
  it "should mount the filesystem with options if options were passed" do
546
546
  options = "logging,noatime,largefiles,nosuid,rw,quota"
547
547
  new_resource.options(options.split(/,/))
548
- provider.should_receive(:shell_out!).with("mount -F #{fstype} -o #{options} #{device} #{mountpoint}")
548
+ expect(provider).to receive(:shell_out!).with("mount -F #{fstype} -o #{options} #{device} #{mountpoint}")
549
549
  provider.mount_fs()
550
550
  end
551
551
 
552
552
  it "should delete the 'noauto' magic option" do
553
553
  options = "rw,noauto"
554
554
  new_resource.options(%w{rw noauto})
555
- provider.should_receive(:shell_out!).with("mount -F #{fstype} -o rw #{device} #{mountpoint}")
555
+ expect(provider).to receive(:shell_out!).with("mount -F #{fstype} -o rw #{device} #{mountpoint}")
556
556
  provider.mount_fs()
557
557
  end
558
558
  end
559
559
 
560
560
  describe "umount_fs" do
561
561
  it "should umount the filesystem if it is mounted" do
562
- provider.should_receive(:shell_out!).with("umount #{mountpoint}")
562
+ expect(provider).to receive(:shell_out!).with("umount #{mountpoint}")
563
563
  provider.umount_fs()
564
564
  end
565
565
  end
@@ -567,7 +567,7 @@ describe Chef::Provider::Mount::Solaris, :unix_only do
567
567
  describe "remount_fs without options and do not mount at boot" do
568
568
  it "should use mount -o remount" do
569
569
  new_resource.options(%w{noauto})
570
- provider.should_receive(:shell_out!).with("mount -o remount #{new_resource.mount_point}")
570
+ expect(provider).to receive(:shell_out!).with("mount -o remount #{new_resource.mount_point}")
571
571
  provider.remount_fs
572
572
  end
573
573
  end
@@ -575,7 +575,7 @@ describe Chef::Provider::Mount::Solaris, :unix_only do
575
575
  describe "remount_fs with options and do not mount at boot" do
576
576
  it "should use mount -o remount,rw" do
577
577
  new_resource.options(%w{rw noauto})
578
- provider.should_receive(:shell_out!).with("mount -o remount,rw #{new_resource.mount_point}")
578
+ expect(provider).to receive(:shell_out!).with("mount -o remount,rw #{new_resource.mount_point}")
579
579
  provider.remount_fs
580
580
  end
581
581
  end
@@ -583,7 +583,7 @@ describe Chef::Provider::Mount::Solaris, :unix_only do
583
583
  describe "remount_fs with options and mount at boot" do
584
584
  it "should use mount -o remount,rw" do
585
585
  new_resource.options(%w{rw})
586
- provider.should_receive(:shell_out!).with("mount -o remount,rw #{new_resource.mount_point}")
586
+ expect(provider).to receive(:shell_out!).with("mount -o remount,rw #{new_resource.mount_point}")
587
587
  provider.remount_fs
588
588
  end
589
589
  end
@@ -591,7 +591,7 @@ describe Chef::Provider::Mount::Solaris, :unix_only do
591
591
  describe "remount_fs without options and mount at boot" do
592
592
  it "should use mount -o remount" do
593
593
  new_resource.options([])
594
- provider.should_receive(:shell_out!).with("mount -o remount #{new_resource.mount_point}")
594
+ expect(provider).to receive(:shell_out!).with("mount -o remount #{new_resource.mount_point}")
595
595
  provider.remount_fs
596
596
  end
597
597
  end
@@ -605,17 +605,17 @@ describe Chef::Provider::Mount::Solaris, :unix_only do
605
605
  let(:vfstab_file_contents) { [other_mount].join("\n") }
606
606
 
607
607
  before do
608
- provider.stub(:etc_tempfile).and_yield(Tempfile.open("vfstab"))
608
+ allow(provider).to receive(:etc_tempfile).and_yield(Tempfile.open("vfstab"))
609
609
  provider.load_current_resource
610
610
  provider.enable_fs
611
611
  end
612
612
 
613
613
  it "should leave the other mountpoint alone" do
614
- IO.read(vfstab_file.path).should match(/^#{Regexp.escape(other_mount)}/)
614
+ expect(IO.read(vfstab_file.path)).to match(/^#{Regexp.escape(other_mount)}/)
615
615
  end
616
616
 
617
617
  it "should enable the mountpoint we care about" do
618
- IO.read(vfstab_file.path).should match(/^#{Regexp.escape(this_mount)}/)
618
+ expect(IO.read(vfstab_file.path)).to match(/^#{Regexp.escape(this_mount)}/)
619
619
  end
620
620
  end
621
621
 
@@ -629,17 +629,17 @@ describe Chef::Provider::Mount::Solaris, :unix_only do
629
629
  let(:vfstab_file_contents) { [other_mount].join("\n") }
630
630
 
631
631
  before do
632
- provider.stub(:etc_tempfile).and_yield(Tempfile.open("vfstab"))
632
+ allow(provider).to receive(:etc_tempfile).and_yield(Tempfile.open("vfstab"))
633
633
  provider.load_current_resource
634
634
  provider.enable_fs
635
635
  end
636
636
 
637
637
  it "should leave the other mountpoint alone" do
638
- IO.read(vfstab_file.path).should match(/^#{Regexp.escape(other_mount)}/)
638
+ expect(IO.read(vfstab_file.path)).to match(/^#{Regexp.escape(other_mount)}/)
639
639
  end
640
640
 
641
641
  it "should enable the mountpoint we care about" do
642
- IO.read(vfstab_file.path).should match(/^#{Regexp.escape(this_mount)}/)
642
+ expect(IO.read(vfstab_file.path)).to match(/^#{Regexp.escape(this_mount)}/)
643
643
  end
644
644
  end
645
645
 
@@ -653,18 +653,18 @@ describe Chef::Provider::Mount::Solaris, :unix_only do
653
653
  let(:vfstab_file_contents) { [existing_mount].join("\n") }
654
654
 
655
655
  before do
656
- provider.stub(:etc_tempfile).and_yield(Tempfile.open("vfstab"))
656
+ allow(provider).to receive(:etc_tempfile).and_yield(Tempfile.open("vfstab"))
657
657
  provider.load_current_resource
658
658
  provider.mount_options_unchanged?
659
659
  provider.send(:vfstab_entry)
660
660
  end
661
661
 
662
662
  it "should detect a changed entry" do
663
- provider.mount_options_unchanged?.should == false
663
+ expect(provider.mount_options_unchanged?).to eq(false)
664
664
  end
665
665
 
666
666
  it "should change mount at boot to no" do
667
- provider.send(:vfstab_entry).should match(/^#{Regexp.escape(this_mount)}/)
667
+ expect(provider.send(:vfstab_entry)).to match(/^#{Regexp.escape(this_mount)}/)
668
668
  end
669
669
  end
670
670
 
@@ -678,18 +678,18 @@ describe Chef::Provider::Mount::Solaris, :unix_only do
678
678
  let(:vfstab_file_contents) { [existing_mount].join("\n") }
679
679
 
680
680
  before do
681
- provider.stub(:etc_tempfile).and_yield(Tempfile.open("vfstab"))
681
+ allow(provider).to receive(:etc_tempfile).and_yield(Tempfile.open("vfstab"))
682
682
  provider.load_current_resource
683
683
  provider.mount_options_unchanged?
684
684
  provider.send(:vfstab_entry)
685
685
  end
686
686
 
687
687
  it "should detect a changed entry" do
688
- provider.mount_options_unchanged?.should == false
688
+ expect(provider.mount_options_unchanged?).to eq(false)
689
689
  end
690
690
 
691
691
  it "should change mount at boot to yes" do
692
- provider.send(:vfstab_entry).should match(/^#{Regexp.escape(this_mount)}/)
692
+ expect(provider.send(:vfstab_entry)).to match(/^#{Regexp.escape(this_mount)}/)
693
693
  end
694
694
  end
695
695
 
@@ -703,18 +703,18 @@ describe Chef::Provider::Mount::Solaris, :unix_only do
703
703
  let(:vfstab_file_contents) { [existing_mount].join("\n") }
704
704
 
705
705
  before do
706
- provider.stub(:etc_tempfile).and_yield(Tempfile.open("vfstab"))
706
+ allow(provider).to receive(:etc_tempfile).and_yield(Tempfile.open("vfstab"))
707
707
  provider.load_current_resource
708
708
  provider.mount_options_unchanged?
709
709
  provider.send(:vfstab_entry)
710
710
  end
711
711
 
712
712
  it "should detect an unchanged entry" do
713
- provider.mount_options_unchanged?.should == true
713
+ expect(provider.mount_options_unchanged?).to eq(true)
714
714
  end
715
715
 
716
716
  it "should not change mount at boot" do
717
- provider.send(:vfstab_entry).should match(/^#{Regexp.escape(this_mount)}/)
717
+ expect(provider.send(:vfstab_entry)).to match(/^#{Regexp.escape(this_mount)}/)
718
718
  end
719
719
  end
720
720
 
@@ -728,18 +728,18 @@ describe Chef::Provider::Mount::Solaris, :unix_only do
728
728
  let(:vfstab_file_contents) { [existing_mount].join("\n") }
729
729
 
730
730
  before do
731
- provider.stub(:etc_tempfile).and_yield(Tempfile.open("vfstab"))
731
+ allow(provider).to receive(:etc_tempfile).and_yield(Tempfile.open("vfstab"))
732
732
  provider.load_current_resource
733
733
  provider.mount_options_unchanged?
734
734
  provider.send(:vfstab_entry)
735
735
  end
736
736
 
737
737
  it "should detect an unchanged entry" do
738
- provider.mount_options_unchanged?.should == true
738
+ expect(provider.mount_options_unchanged?).to eq(true)
739
739
  end
740
740
 
741
741
  it "should not change mount at boot" do
742
- provider.send(:vfstab_entry).should match(/^#{Regexp.escape(this_mount)}/)
742
+ expect(provider.send(:vfstab_entry)).to match(/^#{Regexp.escape(this_mount)}/)
743
743
  end
744
744
  end
745
745
  end
@@ -753,16 +753,16 @@ describe Chef::Provider::Mount::Solaris, :unix_only do
753
753
  let(:vfstab_file_contents) { [other_mount, this_mount].join("\n") }
754
754
 
755
755
  before do
756
- provider.stub(:etc_tempfile).and_yield(Tempfile.open("vfstab"))
756
+ allow(provider).to receive(:etc_tempfile).and_yield(Tempfile.open("vfstab"))
757
757
  provider.disable_fs
758
758
  end
759
759
 
760
760
  it "should leave the other mountpoint alone" do
761
- IO.read(vfstab_file.path).should match(/^#{Regexp.escape(other_mount)}/)
761
+ expect(IO.read(vfstab_file.path)).to match(/^#{Regexp.escape(other_mount)}/)
762
762
  end
763
763
 
764
764
  it "should disable the mountpoint we care about" do
765
- IO.read(vfstab_file.path).should_not match(/^#{Regexp.escape(this_mount)}/)
765
+ expect(IO.read(vfstab_file.path)).not_to match(/^#{Regexp.escape(this_mount)}/)
766
766
  end
767
767
  end
768
768
 
@@ -776,20 +776,20 @@ describe Chef::Provider::Mount::Solaris, :unix_only do
776
776
  let(:vfstab_file_contents) { [other_mount, this_mount, comment].join("\n") }
777
777
 
778
778
  before do
779
- provider.stub(:etc_tempfile).and_yield(Tempfile.open("vfstab"))
779
+ allow(provider).to receive(:etc_tempfile).and_yield(Tempfile.open("vfstab"))
780
780
  provider.disable_fs
781
781
  end
782
782
 
783
783
  it "should leave the other mountpoint alone" do
784
- IO.read(vfstab_file.path).should match(/^#{Regexp.escape(other_mount)}/)
784
+ expect(IO.read(vfstab_file.path)).to match(/^#{Regexp.escape(other_mount)}/)
785
785
  end
786
786
 
787
787
  it "should disable the mountpoint we care about" do
788
- IO.read(vfstab_file.path).should_not match(/^#{Regexp.escape(this_mount)}/)
788
+ expect(IO.read(vfstab_file.path)).not_to match(/^#{Regexp.escape(this_mount)}/)
789
789
  end
790
790
 
791
791
  it "should keep the comment" do
792
- IO.read(vfstab_file.path).should match(/^#{Regexp.escape(comment)}/)
792
+ expect(IO.read(vfstab_file.path)).to match(/^#{Regexp.escape(comment)}/)
793
793
  end
794
794
  end
795
795
 
@@ -801,20 +801,20 @@ describe Chef::Provider::Mount::Solaris, :unix_only do
801
801
  let(:vfstab_file_contents) { [this_mount, other_mount, this_mount].join("\n") }
802
802
 
803
803
  before do
804
- provider.stub(:etc_tempfile).and_yield(Tempfile.open("vfstab"))
804
+ allow(provider).to receive(:etc_tempfile).and_yield(Tempfile.open("vfstab"))
805
805
  provider.disable_fs
806
806
  end
807
807
 
808
808
  it "should leave the other mountpoint alone" do
809
- IO.read(vfstab_file.path).should match(/^#{Regexp.escape(other_mount)}/)
809
+ expect(IO.read(vfstab_file.path)).to match(/^#{Regexp.escape(other_mount)}/)
810
810
  end
811
811
 
812
812
  it "should still match the duplicated mountpoint" do
813
- IO.read(vfstab_file.path).should match(/^#{Regexp.escape(this_mount)}/)
813
+ expect(IO.read(vfstab_file.path)).to match(/^#{Regexp.escape(this_mount)}/)
814
814
  end
815
815
 
816
816
  it "should have removed the last line" do
817
- IO.read(vfstab_file.path).should eql( "#{this_mount}\n#{other_mount}\n" )
817
+ expect(IO.read(vfstab_file.path)).to eql( "#{this_mount}\n#{other_mount}\n" )
818
818
  end
819
819
  end
820
820
  end