chef 15.17.4 → 16.0.257

Sign up to get free protection for your applications and to get access to all the features.
Files changed (569) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +14 -20
  3. data/README.md +6 -6
  4. data/Rakefile +18 -23
  5. data/chef-universal-mingw32.gemspec +4 -4
  6. data/chef.gemspec +10 -26
  7. data/lib/chef/action_collection.rb +16 -5
  8. data/lib/chef/api_client/registration.rb +2 -2
  9. data/lib/chef/application.rb +33 -54
  10. data/lib/chef/application/apply.rb +20 -3
  11. data/lib/chef/application/base.rb +8 -3
  12. data/lib/chef/application/exit_code.rb +2 -2
  13. data/lib/chef/application/knife.rb +1 -1
  14. data/lib/chef/chef_class.rb +4 -4
  15. data/lib/chef/chef_fs/chef_fs_data_store.rb +3 -3
  16. data/lib/chef/chef_fs/file_system/chef_server/policies_dir.rb +1 -1
  17. data/lib/chef/chef_fs/file_system/chef_server/rest_list_dir.rb +1 -1
  18. data/lib/chef/chef_fs/file_system/chef_server/rest_list_entry.rb +6 -2
  19. data/lib/chef/chef_fs/file_system/multiplexed_dir.rb +1 -1
  20. data/lib/chef/chef_fs/file_system/repository/base_file.rb +0 -1
  21. data/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_dir.rb +2 -2
  22. data/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_entry.rb +1 -1
  23. data/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_root_dir.rb +5 -5
  24. data/lib/chef/chef_fs/file_system/repository/directory.rb +1 -1
  25. data/lib/chef/chef_fs/file_system/repository/file_system_entry.rb +1 -1
  26. data/lib/chef/chef_fs/path_utils.rb +3 -3
  27. data/lib/chef/client.rb +16 -14
  28. data/lib/chef/config.rb +1 -1
  29. data/lib/chef/cookbook/file_system_file_vendor.rb +1 -1
  30. data/lib/chef/cookbook/gem_installer.rb +1 -1
  31. data/lib/chef/cookbook/metadata.rb +45 -22
  32. data/lib/chef/cookbook_version.rb +40 -5
  33. data/lib/chef/data_bag.rb +2 -2
  34. data/lib/chef/data_collector/error_handlers.rb +1 -1
  35. data/lib/chef/data_collector/run_end_message.rb +7 -1
  36. data/lib/chef/deprecated.rb +1 -9
  37. data/lib/chef/dist.rb +8 -0
  38. data/lib/chef/dsl/chef_vault.rb +84 -0
  39. data/lib/chef/dsl/declare_resource.rb +7 -5
  40. data/lib/chef/dsl/platform_introspection.rb +2 -3
  41. data/lib/chef/dsl/recipe.rb +7 -12
  42. data/lib/chef/dsl/universal.rb +3 -7
  43. data/lib/chef/environment.rb +2 -2
  44. data/lib/chef/event_dispatch/base.rb +3 -0
  45. data/lib/chef/exceptions.rb +0 -3
  46. data/lib/chef/formatters/doc.rb +1 -1
  47. data/lib/chef/formatters/error_inspectors/node_load_error_inspector.rb +2 -2
  48. data/lib/chef/formatters/error_inspectors/registration_error_inspector.rb +7 -7
  49. data/lib/chef/formatters/indentable_output_stream.rb +7 -16
  50. data/lib/chef/http.rb +1 -2
  51. data/lib/chef/http/http_request.rb +3 -2
  52. data/lib/chef/knife.rb +1 -3
  53. data/lib/chef/knife/acl_add.rb +57 -0
  54. data/lib/chef/knife/acl_base.rb +183 -0
  55. data/lib/chef/knife/acl_bulk_add.rb +78 -0
  56. data/lib/chef/knife/acl_bulk_remove.rb +83 -0
  57. data/lib/chef/knife/acl_remove.rb +62 -0
  58. data/lib/chef/knife/acl_show.rb +56 -0
  59. data/lib/chef/knife/bootstrap.rb +93 -97
  60. data/lib/chef/knife/bootstrap/chef_vault_handler.rb +1 -1
  61. data/lib/chef/knife/bootstrap/client_builder.rb +1 -1
  62. data/lib/chef/knife/bootstrap/templates/chef-full.erb +20 -20
  63. data/lib/chef/knife/bootstrap/templates/windows-chef-client-msi.erb +13 -15
  64. data/lib/chef/knife/bootstrap/train_connector.rb +0 -1
  65. data/lib/chef/knife/cookbook_download.rb +1 -1
  66. data/lib/chef/knife/cookbook_metadata.rb +1 -1
  67. data/lib/chef/knife/core/bootstrap_context.rb +63 -60
  68. data/lib/chef/knife/core/gem_glob_loader.rb +1 -1
  69. data/lib/chef/knife/core/generic_presenter.rb +4 -3
  70. data/lib/chef/knife/core/hashed_command_loader.rb +2 -3
  71. data/lib/chef/knife/core/node_presenter.rb +2 -2
  72. data/lib/chef/knife/core/status_presenter.rb +5 -5
  73. data/lib/chef/knife/core/subcommand_loader.rb +1 -1
  74. data/lib/chef/knife/core/ui.rb +17 -1
  75. data/lib/chef/knife/core/windows_bootstrap_context.rb +45 -58
  76. data/lib/chef/knife/data_bag_secret_options.rb +18 -45
  77. data/lib/chef/knife/environment_compare.rb +1 -1
  78. data/lib/chef/knife/exec.rb +2 -2
  79. data/lib/chef/knife/group_add.rb +55 -0
  80. data/lib/chef/knife/{cookbook_site_download.rb → group_create.rb} +21 -12
  81. data/lib/chef/knife/group_destroy.rb +53 -0
  82. data/lib/chef/knife/{cookbook_site_list.rb → group_list.rb} +14 -11
  83. data/lib/chef/knife/group_remove.rb +56 -0
  84. data/lib/chef/knife/{cookbook_site_install.rb → group_show.rb} +21 -12
  85. data/lib/chef/knife/list.rb +1 -1
  86. data/lib/chef/knife/ssh.rb +12 -50
  87. data/lib/chef/knife/status.rb +3 -3
  88. data/lib/chef/knife/supermarket_download.rb +1 -2
  89. data/lib/chef/knife/supermarket_install.rb +1 -2
  90. data/lib/chef/knife/supermarket_list.rb +1 -2
  91. data/lib/chef/knife/supermarket_search.rb +1 -2
  92. data/lib/chef/knife/supermarket_share.rb +1 -2
  93. data/lib/chef/knife/supermarket_show.rb +1 -2
  94. data/lib/chef/knife/supermarket_unshare.rb +1 -2
  95. data/lib/chef/knife/{cookbook_site_show.rb → user_dissociate.rb} +15 -13
  96. data/lib/chef/knife/{cookbook_site_search.rb → user_invite_add.rb} +16 -13
  97. data/lib/chef/knife/user_invite_list.rb +34 -0
  98. data/lib/chef/knife/user_invite_recind.rb +63 -0
  99. data/lib/chef/knife/yaml_convert.rb +91 -0
  100. data/lib/chef/log.rb +1 -1
  101. data/lib/chef/mixin/create_path.rb +8 -8
  102. data/lib/chef/mixin/openssl_helper.rb +3 -26
  103. data/lib/chef/mixin/powershell_exec.rb +10 -1
  104. data/lib/chef/mixin/powershell_out.rb +1 -1
  105. data/lib/chef/mixin/properties.rb +13 -1
  106. data/lib/chef/mixin/shell_out.rb +0 -4
  107. data/lib/chef/mixin/template.rb +0 -1
  108. data/lib/chef/monkey_patches/net_http.rb +0 -4
  109. data/lib/chef/node.rb +18 -6
  110. data/lib/chef/node/mixin/deep_merge_cache.rb +7 -7
  111. data/lib/chef/node/mixin/immutablize_array.rb +4 -0
  112. data/lib/chef/node/mixin/immutablize_hash.rb +3 -0
  113. data/lib/chef/node_map.rb +7 -36
  114. data/lib/chef/platform/priority_map.rb +4 -4
  115. data/lib/chef/platform/query_helpers.rb +6 -34
  116. data/lib/chef/powershell.rb +14 -0
  117. data/lib/chef/property.rb +22 -4
  118. data/lib/chef/provider.rb +40 -6
  119. data/lib/chef/provider/cron.rb +2 -2
  120. data/lib/chef/provider/directory.rb +2 -2
  121. data/lib/chef/provider/dsc_resource.rb +1 -1
  122. data/lib/chef/provider/dsc_script.rb +1 -1
  123. data/lib/chef/provider/execute.rb +2 -8
  124. data/lib/chef/provider/file.rb +5 -5
  125. data/lib/chef/provider/git.rb +84 -27
  126. data/lib/chef/provider/group.rb +4 -4
  127. data/lib/chef/provider/http_request.rb +6 -6
  128. data/lib/chef/provider/ifconfig.rb +4 -4
  129. data/lib/chef/provider/launchd.rb +36 -51
  130. data/lib/chef/provider/link.rb +2 -2
  131. data/lib/chef/provider/mount.rb +5 -5
  132. data/lib/chef/provider/mount/solaris.rb +1 -0
  133. data/lib/chef/provider/osx_profile.rb +7 -3
  134. data/lib/chef/provider/package.rb +2 -2
  135. data/lib/chef/provider/package/cab.rb +3 -4
  136. data/lib/chef/provider/package/chocolatey.rb +1 -3
  137. data/lib/chef/provider/package/dnf.rb +66 -10
  138. data/lib/chef/provider/package/dnf/dnf_helper.py +84 -30
  139. data/lib/chef/provider/package/dnf/python_helper.rb +79 -36
  140. data/lib/chef/provider/package/dnf/version.rb +5 -1
  141. data/lib/chef/provider/package/freebsd/pkgng.rb +1 -3
  142. data/lib/chef/provider/package/homebrew.rb +106 -42
  143. data/lib/chef/provider/package/msu.rb +3 -1
  144. data/lib/chef/provider/package/pacman.rb +25 -34
  145. data/lib/chef/provider/package/powershell.rb +2 -6
  146. data/lib/chef/provider/package/rubygems.rb +29 -2
  147. data/lib/chef/provider/package/snap.rb +27 -96
  148. data/lib/chef/provider/package/windows.rb +3 -2
  149. data/lib/chef/provider/package/windows/msi.rb +2 -2
  150. data/lib/chef/provider/package/yum.rb +0 -8
  151. data/lib/chef/provider/package/yum/yum_helper.py +0 -4
  152. data/lib/chef/provider/package/zypper.rb +1 -1
  153. data/lib/chef/provider/powershell_script.rb +4 -10
  154. data/lib/chef/provider/registry_key.rb +4 -4
  155. data/lib/chef/provider/remote_directory.rb +3 -3
  156. data/lib/chef/provider/remote_file/ftp.rb +3 -2
  157. data/lib/chef/provider/remote_file/local_file.rb +2 -1
  158. data/lib/chef/provider/remote_file/sftp.rb +3 -2
  159. data/lib/chef/provider/route.rb +5 -3
  160. data/lib/chef/provider/ruby_block.rb +1 -1
  161. data/lib/chef/provider/script.rb +2 -2
  162. data/lib/chef/provider/service.rb +8 -8
  163. data/lib/chef/provider/service/aixinit.rb +1 -1
  164. data/lib/chef/provider/service/arch.rb +2 -2
  165. data/lib/chef/provider/service/debian.rb +31 -29
  166. data/lib/chef/provider/service/gentoo.rb +2 -2
  167. data/lib/chef/provider/service/macosx.rb +7 -12
  168. data/lib/chef/provider/service/openbsd.rb +1 -1
  169. data/lib/chef/provider/service/redhat.rb +2 -2
  170. data/lib/chef/provider/service/simple.rb +3 -3
  171. data/lib/chef/provider/service/systemd.rb +12 -12
  172. data/lib/chef/provider/service/upstart.rb +1 -1
  173. data/lib/chef/provider/service/windows.rb +5 -11
  174. data/lib/chef/provider/subversion.rb +25 -5
  175. data/lib/chef/provider/systemd_unit.rb +26 -25
  176. data/lib/chef/provider/user.rb +6 -6
  177. data/lib/chef/provider/user/dscl.rb +3 -3
  178. data/lib/chef/provider/user/mac.rb +10 -9
  179. data/lib/chef/provider/whyrun_safe_ruby_block.rb +1 -1
  180. data/lib/chef/provider/windows_env.rb +3 -3
  181. data/lib/chef/provider/windows_script.rb +2 -2
  182. data/lib/chef/provider/windows_task.rb +7 -9
  183. data/lib/chef/provider/yum_repository.rb +1 -1
  184. data/lib/chef/provider/zypper_repository.rb +11 -31
  185. data/lib/chef/providers.rb +0 -6
  186. data/lib/chef/recipe.rb +36 -0
  187. data/lib/chef/resource.rb +41 -56
  188. data/lib/chef/resource/action_class.rb +24 -22
  189. data/lib/chef/resource/alternatives.rb +149 -0
  190. data/lib/chef/resource/apt_package.rb +2 -1
  191. data/lib/chef/resource/apt_preference.rb +69 -2
  192. data/lib/chef/resource/apt_repository.rb +337 -5
  193. data/lib/chef/resource/apt_update.rb +52 -1
  194. data/lib/chef/resource/archive_file.rb +9 -29
  195. data/lib/chef/resource/bash.rb +2 -0
  196. data/lib/chef/resource/bff_package.rb +9 -1
  197. data/lib/chef/resource/breakpoint.rb +0 -1
  198. data/lib/chef/resource/build_essential.rb +42 -48
  199. data/lib/chef/resource/cab_package.rb +8 -1
  200. data/lib/chef/resource/chef_client_cron.rb +225 -0
  201. data/lib/chef/resource/chef_client_scheduled_task.rb +198 -0
  202. data/lib/chef/resource/chef_client_systemd_timer.rb +177 -0
  203. data/lib/chef/resource/chef_gem.rb +9 -16
  204. data/lib/chef/resource/chef_handler.rb +2 -1
  205. data/lib/chef/resource/chef_sleep.rb +0 -1
  206. data/lib/chef/resource/chef_vault_secret.rb +135 -0
  207. data/lib/chef/resource/chocolatey_config.rb +3 -1
  208. data/lib/chef/resource/chocolatey_feature.rb +2 -1
  209. data/lib/chef/resource/chocolatey_package.rb +2 -1
  210. data/lib/chef/resource/chocolatey_source.rb +2 -1
  211. data/lib/chef/resource/cookbook_file.rb +1 -1
  212. data/lib/chef/resource/cron.rb +22 -68
  213. data/lib/chef/resource/cron_access.rb +8 -15
  214. data/lib/chef/resource/cron_d.rb +9 -75
  215. data/lib/chef/resource/csh.rb +2 -0
  216. data/lib/chef/resource/directory.rb +2 -2
  217. data/lib/chef/resource/dmg_package.rb +4 -4
  218. data/lib/chef/resource/dnf_package.rb +2 -3
  219. data/lib/chef/resource/dpkg_package.rb +2 -1
  220. data/lib/chef/resource/dsc_resource.rb +6 -4
  221. data/lib/chef/resource/dsc_script.rb +3 -2
  222. data/lib/chef/resource/execute.rb +13 -12
  223. data/lib/chef/resource/file.rb +3 -1
  224. data/lib/chef/resource/freebsd_package.rb +2 -1
  225. data/lib/chef/resource/gem_package.rb +14 -6
  226. data/lib/chef/resource/group.rb +4 -1
  227. data/lib/chef/resource/helpers/cron_validations.rb +98 -0
  228. data/lib/chef/resource/homebrew_cask.rb +5 -4
  229. data/lib/chef/resource/homebrew_package.rb +4 -2
  230. data/lib/chef/resource/homebrew_tap.rb +2 -1
  231. data/lib/chef/resource/hostname.rb +41 -36
  232. data/lib/chef/resource/http_request.rb +0 -1
  233. data/lib/chef/resource/ifconfig.rb +1 -1
  234. data/lib/chef/resource/ips_package.rb +10 -2
  235. data/lib/chef/resource/kernel_module.rb +29 -29
  236. data/lib/chef/resource/ksh.rb +2 -0
  237. data/lib/chef/resource/launchd.rb +6 -6
  238. data/lib/chef/resource/link.rb +1 -23
  239. data/lib/chef/resource/locale.rb +58 -24
  240. data/lib/chef/resource/log.rb +12 -1
  241. data/lib/chef/resource/lwrp_base.rb +1 -8
  242. data/lib/chef/resource/macos_userdefaults.rb +9 -6
  243. data/lib/chef/resource/macosx_service.rb +2 -1
  244. data/lib/chef/resource/macports_package.rb +10 -2
  245. data/lib/chef/resource/mdadm.rb +62 -2
  246. data/lib/chef/resource/mount.rb +3 -0
  247. data/lib/chef/resource/msu_package.rb +13 -1
  248. data/lib/chef/resource/notify_group.rb +8 -3
  249. data/lib/chef/resource/ohai.rb +19 -3
  250. data/lib/chef/resource/ohai_hint.rb +3 -12
  251. data/lib/chef/resource/openbsd_package.rb +9 -1
  252. data/lib/chef/resource/openssl_dhparam.rb +10 -1
  253. data/lib/chef/resource/openssl_ec_private_key.rb +23 -1
  254. data/lib/chef/resource/openssl_ec_public_key.rb +21 -1
  255. data/lib/chef/resource/openssl_rsa_private_key.rb +20 -1
  256. data/lib/chef/resource/openssl_rsa_public_key.rb +22 -1
  257. data/lib/chef/resource/openssl_x509_certificate.rb +37 -1
  258. data/lib/chef/resource/openssl_x509_crl.rb +12 -1
  259. data/lib/chef/resource/openssl_x509_request.rb +37 -1
  260. data/lib/chef/resource/osx_profile.rb +3 -2
  261. data/lib/chef/resource/package.rb +2 -1
  262. data/lib/chef/resource/pacman_package.rb +2 -1
  263. data/lib/chef/resource/paludis_package.rb +12 -3
  264. data/lib/chef/resource/perl.rb +2 -0
  265. data/lib/chef/resource/plist.rb +207 -0
  266. data/lib/chef/resource/portage_package.rb +13 -3
  267. data/lib/chef/resource/powershell_package.rb +1 -3
  268. data/lib/chef/resource/powershell_package_source.rb +3 -1
  269. data/lib/chef/resource/powershell_script.rb +7 -17
  270. data/lib/chef/resource/python.rb +2 -0
  271. data/lib/chef/resource/reboot.rb +0 -1
  272. data/lib/chef/resource/registry_key.rb +1 -2
  273. data/lib/chef/resource/remote_directory.rb +2 -0
  274. data/lib/chef/resource/remote_file.rb +2 -0
  275. data/lib/chef/resource/rhsm_errata.rb +0 -1
  276. data/lib/chef/resource/rhsm_errata_level.rb +0 -1
  277. data/lib/chef/resource/rhsm_register.rb +2 -1
  278. data/lib/chef/resource/rhsm_repo.rb +3 -1
  279. data/lib/chef/resource/rhsm_subscription.rb +4 -1
  280. data/lib/chef/resource/route.rb +5 -1
  281. data/lib/chef/resource/rpm_package.rb +9 -2
  282. data/lib/chef/resource/ruby.rb +2 -0
  283. data/lib/chef/resource/ruby_block.rb +1 -1
  284. data/lib/chef/resource/scm/_scm.rb +48 -0
  285. data/lib/chef/resource/{scm.rb → scm/git.rb} +16 -30
  286. data/lib/chef/resource/{subversion.rb → scm/subversion.rb} +8 -5
  287. data/lib/chef/resource/script.rb +6 -3
  288. data/lib/chef/resource/service.rb +6 -7
  289. data/lib/chef/resource/smartos_package.rb +9 -1
  290. data/lib/chef/resource/snap_package.rb +3 -1
  291. data/lib/chef/resource/solaris_package.rb +9 -1
  292. data/lib/chef/resource/ssh_known_hosts_entry.rb +6 -3
  293. data/lib/chef/resource/sudo.rb +9 -9
  294. data/lib/chef/resource/support/cron.d.erb +1 -1
  295. data/lib/chef/resource/support/cron_access.erb +1 -1
  296. data/lib/chef/resource/support/sudoer.erb +1 -2
  297. data/lib/chef/resource/support/ulimit.erb +41 -0
  298. data/lib/chef/resource/swap_file.rb +5 -3
  299. data/lib/chef/resource/sysctl.rb +2 -2
  300. data/lib/chef/resource/systemd_unit.rb +4 -2
  301. data/lib/chef/resource/template.rb +0 -1
  302. data/lib/chef/resource/timezone.rb +7 -18
  303. data/lib/chef/resource/user.rb +1 -3
  304. data/lib/chef/resource/user/aix_user.rb +0 -2
  305. data/lib/chef/resource/user/dscl_user.rb +1 -1
  306. data/lib/chef/resource/user/linux_user.rb +0 -2
  307. data/lib/chef/resource/user/mac_user.rb +1 -1
  308. data/lib/chef/resource/user/pw_user.rb +0 -2
  309. data/lib/chef/resource/user/solaris_user.rb +0 -2
  310. data/lib/chef/resource/user/windows_user.rb +0 -2
  311. data/lib/chef/resource/user_ulimit.rb +114 -0
  312. data/lib/chef/resource/whyrun_safe_ruby_block.rb +1 -0
  313. data/lib/chef/resource/windows_ad_join.rb +19 -6
  314. data/lib/chef/resource/windows_auto_run.rb +0 -1
  315. data/lib/chef/resource/windows_certificate.rb +1 -1
  316. data/lib/chef/resource/windows_dfs_folder.rb +0 -1
  317. data/lib/chef/resource/windows_dfs_namespace.rb +0 -1
  318. data/lib/chef/resource/windows_dfs_server.rb +0 -1
  319. data/lib/chef/resource/windows_dns_record.rb +0 -1
  320. data/lib/chef/resource/windows_dns_zone.rb +0 -1
  321. data/lib/chef/resource/windows_env.rb +2 -3
  322. data/lib/chef/resource/windows_feature.rb +2 -2
  323. data/lib/chef/resource/windows_feature_dism.rb +9 -22
  324. data/lib/chef/resource/windows_feature_powershell.rb +17 -82
  325. data/lib/chef/resource/windows_firewall_rule.rb +119 -10
  326. data/lib/chef/resource/windows_font.rb +1 -3
  327. data/lib/chef/resource/windows_package.rb +13 -4
  328. data/lib/chef/resource/windows_pagefile.rb +0 -1
  329. data/lib/chef/resource/windows_path.rb +0 -1
  330. data/lib/chef/resource/windows_printer.rb +0 -1
  331. data/lib/chef/resource/windows_printer_port.rb +0 -1
  332. data/lib/chef/resource/windows_script.rb +3 -4
  333. data/lib/chef/resource/windows_security_policy.rb +90 -0
  334. data/lib/chef/resource/windows_service.rb +45 -31
  335. data/lib/chef/resource/windows_share.rb +3 -7
  336. data/lib/chef/resource/windows_shortcut.rb +0 -1
  337. data/lib/chef/resource/windows_task.rb +14 -15
  338. data/lib/chef/resource/windows_uac.rb +0 -1
  339. data/lib/chef/resource/windows_user_privilege.rb +157 -0
  340. data/lib/chef/resource/windows_workgroup.rb +0 -1
  341. data/lib/chef/resource/yum_package.rb +3 -1
  342. data/lib/chef/resource/yum_repository.rb +2 -1
  343. data/lib/chef/resource/zypper_package.rb +3 -2
  344. data/lib/chef/resource/zypper_repository.rb +2 -1
  345. data/lib/chef/resource_builder.rb +8 -0
  346. data/lib/chef/resource_inspector.rb +6 -6
  347. data/lib/chef/resource_resolver.rb +7 -14
  348. data/lib/chef/resources.rb +11 -3
  349. data/lib/chef/role.rb +2 -2
  350. data/lib/chef/run_context/cookbook_compiler.rb +29 -5
  351. data/lib/chef/shell.rb +23 -32
  352. data/lib/chef/shell/shell_session.rb +0 -2
  353. data/lib/chef/util/diff.rb +1 -1
  354. data/lib/chef/util/dsc/configuration_generator.rb +1 -1
  355. data/lib/chef/util/dsc/lcm_output_parser.rb +3 -3
  356. data/lib/chef/util/powershell/cmdlet.rb +1 -1
  357. data/lib/chef/version.rb +2 -2
  358. data/lib/chef/version_string.rb +1 -1
  359. data/lib/chef/win32/api/file.rb +18 -18
  360. data/lib/chef/win32/api/security.rb +6 -0
  361. data/lib/chef/win32/file.rb +3 -11
  362. data/lib/chef/win32/process.rb +2 -2
  363. data/lib/chef/win32/security.rb +40 -2
  364. data/spec/functional/assets/inittest +8 -7
  365. data/spec/functional/knife/ssh_spec.rb +27 -23
  366. data/spec/functional/resource/aix_service_spec.rb +1 -0
  367. data/spec/functional/resource/aixinit_service_spec.rb +8 -7
  368. data/spec/functional/resource/apt_package_spec.rb +1 -0
  369. data/spec/functional/resource/bff_spec.rb +2 -2
  370. data/spec/functional/resource/cookbook_file_spec.rb +1 -1
  371. data/spec/functional/resource/cron_spec.rb +11 -29
  372. data/spec/functional/resource/dnf_package_spec.rb +441 -156
  373. data/spec/functional/resource/dsc_resource_spec.rb +1 -1
  374. data/spec/functional/resource/git_spec.rb +184 -134
  375. data/spec/functional/resource/insserv_spec.rb +6 -5
  376. data/spec/functional/resource/link_spec.rb +17 -17
  377. data/spec/functional/resource/locale_spec.rb +13 -2
  378. data/spec/functional/resource/powershell_script_spec.rb +7 -68
  379. data/spec/functional/resource/rpm_spec.rb +2 -2
  380. data/spec/functional/resource/user/dscl_spec.rb +2 -2
  381. data/spec/functional/resource/user/mac_user_spec.rb +2 -2
  382. data/spec/functional/resource/windows_certificate_spec.rb +3 -3
  383. data/spec/functional/resource/windows_security_policy_spec.rb +90 -0
  384. data/spec/functional/resource/windows_task_spec.rb +8 -8
  385. data/spec/functional/resource/windows_user_privilege_spec.rb +193 -0
  386. data/spec/functional/run_lock_spec.rb +1 -2
  387. data/spec/functional/shell_spec.rb +6 -6
  388. data/spec/functional/util/powershell/cmdlet_spec.rb +1 -1
  389. data/spec/functional/version_spec.rb +1 -1
  390. data/spec/functional/win32/registry_spec.rb +0 -6
  391. data/spec/functional/win32/security_spec.rb +22 -0
  392. data/spec/functional/win32/service_manager_spec.rb +1 -1
  393. data/spec/integration/client/client_spec.rb +123 -2
  394. data/spec/integration/knife/cookbook_show_spec.rb +28 -26
  395. data/spec/integration/knife/data_bag_show_spec.rb +1 -1
  396. data/spec/integration/knife/raw_spec.rb +30 -2
  397. data/spec/integration/knife/show_spec.rb +32 -3
  398. data/spec/integration/recipes/accumulator_spec.rb +1 -1
  399. data/spec/integration/recipes/lwrp_inline_resources_spec.rb +5 -5
  400. data/spec/integration/recipes/lwrp_spec.rb +1 -1
  401. data/spec/integration/recipes/noop_resource_spec.rb +1 -1
  402. data/spec/integration/recipes/notifies_spec.rb +50 -21
  403. data/spec/integration/recipes/notifying_block_spec.rb +9 -6
  404. data/spec/integration/recipes/provider_choice.rb +2 -0
  405. data/spec/integration/recipes/recipe_dsl_spec.rb +46 -144
  406. data/spec/integration/recipes/resource_action_spec.rb +16 -11
  407. data/spec/integration/recipes/resource_converge_if_changed_spec.rb +1 -3
  408. data/spec/integration/recipes/resource_load_spec.rb +133 -13
  409. data/spec/integration/recipes/unified_mode_spec.rb +1 -1
  410. data/spec/integration/recipes/use_partial_spec.rb +112 -0
  411. data/spec/integration/solo/solo_spec.rb +3 -3
  412. data/spec/scripts/ssl-serve.rb +1 -1
  413. data/spec/spec_helper.rb +11 -14
  414. data/spec/support/chef_helpers.rb +2 -2
  415. data/spec/support/lib/chef/resource/zen_follower.rb +2 -0
  416. data/spec/support/platform_helpers.rb +44 -19
  417. data/spec/support/platforms/win32/spec_service.rb +1 -1
  418. data/spec/support/recipe_dsl_helper.rb +83 -0
  419. data/spec/support/shared/functional/directory_resource.rb +1 -1
  420. data/spec/support/shared/functional/execute_resource.rb +1 -1
  421. data/spec/support/shared/functional/file_resource.rb +3 -3
  422. data/spec/support/shared/functional/win32_service.rb +1 -1
  423. data/spec/support/shared/functional/windows_script.rb +5 -18
  424. data/spec/support/shared/integration/knife_support.rb +14 -8
  425. data/spec/unit/application/apply_spec.rb +3 -0
  426. data/spec/unit/application/client_spec.rb +5 -1
  427. data/spec/unit/application_spec.rb +1 -9
  428. data/spec/unit/chef_fs/file_system/operation_failed_error_spec.rb +4 -2
  429. data/spec/unit/client_spec.rb +7 -5
  430. data/spec/unit/cookbook/gem_installer_spec.rb +3 -4
  431. data/spec/unit/cookbook/metadata_spec.rb +38 -19
  432. data/spec/unit/data_bag_spec.rb +1 -1
  433. data/spec/unit/data_collector_spec.rb +38 -17
  434. data/spec/unit/dsl/platform_introspection_spec.rb +0 -1
  435. data/spec/unit/environment_spec.rb +7 -7
  436. data/spec/unit/event_dispatch/dispatcher_spec.rb +0 -3
  437. data/spec/unit/file_access_control_spec.rb +1 -1
  438. data/spec/unit/knife/bootstrap/chef_vault_handler_spec.rb +15 -15
  439. data/spec/unit/knife/bootstrap/client_builder_spec.rb +9 -9
  440. data/spec/unit/knife/bootstrap_spec.rb +36 -54
  441. data/spec/unit/knife/cookbook_download_spec.rb +4 -4
  442. data/spec/unit/knife/cookbook_metadata_from_file_spec.rb +1 -1
  443. data/spec/unit/knife/cookbook_show_spec.rb +1 -0
  444. data/spec/unit/knife/cookbook_upload_spec.rb +6 -5
  445. data/spec/unit/knife/core/bootstrap_context_spec.rb +23 -43
  446. data/spec/unit/knife/core/hashed_command_loader_spec.rb +3 -3
  447. data/spec/unit/knife/core/ui_spec.rb +16 -0
  448. data/spec/unit/knife/core/windows_bootstrap_context_spec.rb +8 -68
  449. data/spec/unit/knife/data_bag_secret_options_spec.rb +22 -14
  450. data/spec/unit/knife/role_env_run_list_add_spec.rb +6 -6
  451. data/spec/unit/knife/role_env_run_list_clear_spec.rb +4 -4
  452. data/spec/unit/knife/role_env_run_list_remove_spec.rb +4 -4
  453. data/spec/unit/knife/role_env_run_list_replace_spec.rb +4 -4
  454. data/spec/unit/knife/role_env_run_list_set_spec.rb +4 -4
  455. data/spec/unit/knife/role_run_list_add_spec.rb +6 -6
  456. data/spec/unit/knife/role_run_list_clear_spec.rb +4 -4
  457. data/spec/unit/knife/role_run_list_remove_spec.rb +4 -4
  458. data/spec/unit/knife/role_run_list_replace_spec.rb +4 -4
  459. data/spec/unit/knife/role_run_list_set_spec.rb +4 -4
  460. data/spec/unit/knife/ssh_spec.rb +10 -113
  461. data/spec/unit/knife/status_spec.rb +1 -1
  462. data/spec/unit/knife/supermarket_share_spec.rb +3 -5
  463. data/spec/unit/knife_spec.rb +18 -0
  464. data/spec/unit/lwrp_spec.rb +4 -4
  465. data/spec/unit/mixin/powershell_exec_spec.rb +10 -0
  466. data/spec/unit/mixin/securable_spec.rb +1 -0
  467. data/spec/unit/mixin/user_context_spec.rb +9 -1
  468. data/spec/unit/node/attribute_spec.rb +2 -2
  469. data/spec/unit/node_spec.rb +24 -0
  470. data/spec/unit/platform/query_helpers_spec.rb +0 -143
  471. data/spec/unit/property/state_spec.rb +12 -7
  472. data/spec/unit/property/validation_spec.rb +25 -1
  473. data/spec/unit/property_spec.rb +18 -15
  474. data/spec/unit/provider/apt_preference_spec.rb +14 -10
  475. data/spec/unit/provider/apt_repository_spec.rb +9 -11
  476. data/spec/unit/provider/apt_update_spec.rb +12 -11
  477. data/spec/unit/provider/cookbook_file_spec.rb +4 -4
  478. data/spec/unit/provider/cron_spec.rb +2 -2
  479. data/spec/unit/provider/directory_spec.rb +4 -15
  480. data/spec/unit/provider/file_spec.rb +4 -4
  481. data/spec/unit/provider/git_spec.rb +44 -4
  482. data/spec/unit/provider/link_spec.rb +0 -1
  483. data/spec/unit/provider/log_spec.rb +3 -3
  484. data/spec/unit/provider/mdadm_spec.rb +3 -3
  485. data/spec/unit/provider/osx_profile_spec.rb +2 -2
  486. data/spec/unit/provider/package/dnf/python_helper_spec.rb +2 -2
  487. data/spec/unit/provider/package/freebsd/pkgng_spec.rb +1 -1
  488. data/spec/unit/provider/package/homebrew_spec.rb +280 -174
  489. data/spec/unit/provider/package/msu_spec.rb +3 -3
  490. data/spec/unit/provider/package/pacman_spec.rb +65 -147
  491. data/spec/unit/provider/package/powershell_spec.rb +88 -96
  492. data/spec/unit/provider/package/rubygems_spec.rb +221 -31
  493. data/spec/unit/provider/package/snap_spec.rb +1 -1
  494. data/spec/unit/provider/package/windows/exe_spec.rb +1 -1
  495. data/spec/unit/provider/package/windows_spec.rb +53 -30
  496. data/spec/unit/provider/powershell_script_spec.rb +21 -61
  497. data/spec/unit/provider/remote_file_spec.rb +3 -4
  498. data/spec/unit/provider/service/arch_service_spec.rb +2 -3
  499. data/spec/unit/provider/service/debian_service_spec.rb +35 -14
  500. data/spec/unit/provider/service/gentoo_service_spec.rb +8 -8
  501. data/spec/unit/provider/service/macosx_spec.rb +210 -214
  502. data/spec/unit/provider/service/redhat_spec.rb +2 -2
  503. data/spec/unit/provider/service/systemd_service_spec.rb +23 -23
  504. data/spec/unit/provider/service/upstart_service_spec.rb +3 -3
  505. data/spec/unit/provider/service/windows_spec.rb +6 -2
  506. data/spec/unit/provider/subversion_spec.rb +4 -2
  507. data/spec/unit/provider/systemd_unit_spec.rb +24 -28
  508. data/spec/unit/provider/template_spec.rb +3 -4
  509. data/spec/unit/provider/zypper_repository_spec.rb +25 -75
  510. data/spec/unit/provider_resolver_spec.rb +11 -11
  511. data/spec/unit/provider_spec.rb +0 -1
  512. data/spec/unit/recipe_spec.rb +68 -0
  513. data/spec/unit/resource/alternatives_spec.rb +120 -0
  514. data/spec/unit/resource/apt_preference_spec.rb +0 -18
  515. data/spec/unit/resource/apt_repository_spec.rb +0 -18
  516. data/spec/unit/resource/apt_update_spec.rb +0 -18
  517. data/spec/unit/resource/archive_file_spec.rb +2 -11
  518. data/spec/unit/resource/chef_client_cron_spec.rb +119 -0
  519. data/spec/unit/resource/chef_client_scheduled_task_spec.rb +102 -0
  520. data/spec/unit/resource/chef_client_systemd_timer_spec.rb +70 -0
  521. data/spec/unit/resource/chef_vault_secret_spec.rb +40 -0
  522. data/spec/unit/resource/chocolatey_source_spec.rb +2 -1
  523. data/spec/unit/resource/cron_d_spec.rb +6 -48
  524. data/spec/unit/resource/cron_spec.rb +4 -10
  525. data/spec/unit/resource/gem_package_spec.rb +3 -3
  526. data/spec/unit/resource/helpers/cron_validations_spec.rb +77 -0
  527. data/spec/unit/resource/link_spec.rb +0 -4
  528. data/spec/unit/resource/locale_spec.rb +0 -34
  529. data/spec/unit/resource/ohai_spec.rb +56 -2
  530. data/spec/unit/resource/plist_spec.rb +130 -0
  531. data/spec/unit/resource/powershell_script_spec.rb +0 -5
  532. data/spec/unit/resource/{git_spec.rb → scm/git_spec.rb} +50 -2
  533. data/spec/unit/resource/{scm_spec.rb → scm/scm.rb} +1 -52
  534. data/spec/unit/resource/{subversion_spec.rb → scm/subversion_spec.rb} +2 -3
  535. data/spec/unit/resource/service_spec.rb +4 -0
  536. data/spec/unit/resource/user_spec.rb +2 -2
  537. data/spec/unit/resource/user_ulimit_spec.rb +53 -0
  538. data/spec/unit/resource/windows_dns_record_spec.rb +3 -3
  539. data/spec/unit/resource/windows_dns_zone_spec.rb +2 -2
  540. data/spec/unit/resource/windows_feature_dism_spec.rb +2 -17
  541. data/spec/unit/resource/windows_feature_powershell_spec.rb +6 -47
  542. data/spec/unit/resource/windows_firewall_rule_spec.rb +88 -41
  543. data/spec/unit/resource/windows_package_spec.rb +4 -1
  544. data/spec/unit/resource/windows_service_spec.rb +9 -0
  545. data/spec/unit/resource/windows_task_spec.rb +1 -1
  546. data/spec/unit/resource/windows_uac_spec.rb +2 -2
  547. data/spec/unit/resource/yum_repository_spec.rb +21 -21
  548. data/spec/unit/resource_reporter_spec.rb +1 -5
  549. data/spec/unit/resource_spec.rb +11 -4
  550. data/spec/unit/role_spec.rb +11 -11
  551. data/spec/unit/run_context/cookbook_compiler_spec.rb +1 -1
  552. data/spec/unit/run_context_spec.rb +1 -1
  553. data/spec/unit/search/query_spec.rb +1 -1
  554. data/spec/unit/util/threaded_job_queue_spec.rb +0 -9
  555. data/spec/unit/win32/security_spec.rb +3 -4
  556. data/tasks/rspec.rb +1 -1
  557. metadata +110 -75
  558. data/lib/chef/dsl/core.rb +0 -52
  559. data/lib/chef/knife/cookbook_site_share.rb +0 -41
  560. data/lib/chef/knife/cookbook_site_unshare.rb +0 -41
  561. data/lib/chef/provider/apt_preference.rb +0 -93
  562. data/lib/chef/provider/apt_repository.rb +0 -358
  563. data/lib/chef/provider/apt_update.rb +0 -79
  564. data/lib/chef/provider/log.rb +0 -43
  565. data/lib/chef/provider/mdadm.rb +0 -85
  566. data/lib/chef/provider/ohai.rb +0 -45
  567. data/lib/chef/resource/git.rb +0 -37
  568. data/spec/functional/resource/windows_font_spec.rb +0 -49
  569. data/spec/unit/provider/ohai_spec.rb +0 -84
@@ -53,73 +53,33 @@ describe Chef::Provider::PowershellScript, "action_run" do
53
53
  end
54
54
 
55
55
  context "when setting interpreter flags" do
56
- context "on nano" do
57
- before(:each) do
58
- allow(Chef::Platform).to receive(:windows_nano_server?).and_return(true)
59
- allow(provider).to receive(:is_forced_32bit).and_return(false)
60
- os_info_double = double("os_info")
61
- allow(provider.run_context.node["kernel"]).to receive(:[]).with("os_info").and_return(os_info_double)
62
- allow(os_info_double).to receive(:[]).with("system_directory").and_return("C:\\Windows\\system32")
63
- end
64
-
65
- it "sets the -Command flag as the last flag" do
66
- flags = provider.command.split(" ").keep_if { |flag| flag =~ /^-/ }
67
- expect(flags.pop).to eq("-Command")
68
- end
56
+ before(:each) do
57
+ allow(provider).to receive(:is_forced_32bit).and_return(false)
58
+ os_info_double = double("os_info")
59
+ allow(provider.run_context.node["kernel"]).to receive(:[]).with("os_info").and_return(os_info_double)
60
+ allow(os_info_double).to receive(:[]).with("system_directory").and_return("C:\\Windows\\system32")
69
61
  end
70
62
 
71
- context "not on nano" do
72
- before(:each) do
73
- allow(Chef::Platform).to receive(:windows_nano_server?).and_return(false)
74
- allow(provider).to receive(:is_forced_32bit).and_return(false)
75
- os_info_double = double("os_info")
76
- allow(provider.run_context.node["kernel"]).to receive(:[]).with("os_info").and_return(os_info_double)
77
- allow(os_info_double).to receive(:[]).with("system_directory").and_return("C:\\Windows\\system32")
78
- end
79
-
80
- it "sets the -File flag as the last flag" do
81
- flags = provider.command.split(" ").keep_if { |flag| flag =~ /^-/ }
82
- expect(flags.pop).to eq("-File")
83
- end
84
-
85
- let(:execution_policy_flag) do
86
- provider_flags = provider.flags.split(" ")
87
- # Last occurance of "executionpolicy"
88
- execution_policy_index = provider_flags.map(&:downcase).rindex("-executionpolicy")
63
+ it "sets the -File flag as the last flag" do
64
+ flags = provider.command.split(" ").keep_if { |flag| flag =~ /^-/ }
65
+ expect(flags.pop).to eq("-File")
66
+ end
89
67
 
90
- execution_policy_index ? provider_flags[execution_policy_index + 1] : nil
91
- end
68
+ let(:execution_policy_flag) do
69
+ provider_flags = provider.flags.split(" ")
70
+ # Last occurance of "executionpolicy"
71
+ execution_policy_index = provider_flags.map(&:downcase).rindex("-executionpolicy")
92
72
 
93
- context "when running with an unspecified PowerShell version" do
94
- let(:powershell_version) { nil }
95
- it "sets default -ExecutionPolicy flag to 'Unrestricted'" do
96
- expect(execution_policy_flag.downcase).to eq("unrestricted".downcase)
97
- end
98
- it "sets user defined -ExecutionPolicy flag to 'RemoteSigned'" do
99
- set_user_defined_flag
100
- expect(execution_policy_flag.downcase).to eq("RemoteSigned".downcase)
101
- end
102
- end
73
+ execution_policy_index ? provider_flags[execution_policy_index + 1] : nil
74
+ end
103
75
 
104
- { "2.0" => "Unrestricted",
105
- "2.5" => "Unrestricted",
106
- "3.0" => "Bypass",
107
- "3.6" => "Bypass",
108
- "4.0" => "Bypass",
109
- "5.0" => "Bypass" }.each do |version_policy|
110
- let(:powershell_version) { version_policy[0].to_f }
111
- context "when running PowerShell version #{version_policy[0]}" do
112
- let(:powershell_version) { version_policy[0].to_f }
76
+ it "sets default -ExecutionPolicy flag to 'Bypass'" do
77
+ expect(execution_policy_flag).to eq("Bypass")
78
+ end
113
79
 
114
- it "sets default -ExecutionPolicy flag to '#{version_policy[1]}'" do
115
- expect(execution_policy_flag.downcase).to eq(version_policy[1].downcase)
116
- end
117
- it "sets user defined -ExecutionPolicy flag to 'RemoteSigned'" do
118
- set_user_defined_flag
119
- expect(execution_policy_flag.downcase).to eq("RemoteSigned".downcase)
120
- end
121
- end
122
- end
80
+ it "sets user defined -ExecutionPolicy flag to 'RemoteSigned'" do
81
+ set_user_defined_flag
82
+ expect(execution_policy_flag).to eq("RemoteSigned")
123
83
  end
124
84
  end
125
85
  end
@@ -34,10 +34,9 @@ describe Chef::Provider::RemoteFile do
34
34
  content = double("Chef::Provider::File::Content::RemoteFile")
35
35
  end
36
36
 
37
- let(:node) { double("Chef::Node") }
38
- let(:events) { double("Chef::Events").as_null_object } # mock all the methods
39
- let(:logger) { double("Mixlib::Log::Child").as_null_object }
40
- let(:run_context) { double("Chef::RunContext", node: node, events: events, logger: logger) }
37
+ let(:node) { Chef::Node.new }
38
+ let(:events) { Chef::EventDispatch::Dispatcher.new }
39
+ let(:run_context) { Chef::RunContext.new(node, {}, events) }
41
40
  let(:enclosing_directory) do
42
41
  canonicalize_path(File.expand_path(File.join(CHEF_SPEC_DATA, "templates")))
43
42
  end
@@ -37,8 +37,7 @@ describe Chef::Provider::Service::Arch, "load_current_resource" do
37
37
 
38
38
  @provider = Chef::Provider::Service::Arch.new(@new_resource, @run_context)
39
39
 
40
- allow(::File).to receive(:exist?).with("/etc/rc.d/chef").and_return(false)
41
- allow(::File).to receive(:exist?).with("/etc/rc.conf").and_return(true)
40
+ allow(::File).to receive(:exists?).with("/etc/rc.conf").and_return(true)
42
41
  allow(::File).to receive(:read).with("/etc/rc.conf").and_return("DAEMONS=(network apache sshd)")
43
42
  end
44
43
 
@@ -107,7 +106,7 @@ describe Chef::Provider::Service::Arch, "load_current_resource" do
107
106
  end
108
107
 
109
108
  it "should fail if file /etc/rc.conf does not exist" do
110
- allow(::File).to receive(:exist?).with("/etc/rc.conf").and_return(false)
109
+ allow(::File).to receive(:exists?).with("/etc/rc.conf").and_return(false)
111
110
  expect { @provider.load_current_resource }.to raise_error(Chef::Exceptions::Service)
112
111
  end
113
112
 
@@ -1,6 +1,6 @@
1
1
  #
2
2
  # Author:: AJ Christensen (<aj@hjksolutions.com>)
3
- # Copyright:: Copyright 2008-2016, HJK Solutions, LLC
3
+ # Copyright:: Copyright (c) Chef Software Inc.
4
4
  # License:: Apache License, Version 2.0
5
5
  #
6
6
  # Licensed under the Apache License, Version 2.0 (the "License");
@@ -47,7 +47,7 @@ describe Chef::Provider::Service::Debian do
47
47
 
48
48
  describe "load_current_resource" do
49
49
  it "ensures /usr/sbin/update-rc.d is available" do
50
- expect(File).to receive(:exist?).with("/usr/sbin/update-rc.d").and_return(false)
50
+ expect(File).to receive(:exists?).with("/usr/sbin/update-rc.d") .and_return(false)
51
51
 
52
52
  @provider.define_resource_requirements
53
53
  expect do
@@ -183,21 +183,21 @@ describe Chef::Provider::Service::Debian do
183
183
  describe "enable_service" do
184
184
  let(:service_name) { @new_resource.service_name }
185
185
  context "when the service doesn't set a priority" do
186
- it "calls update-rc.d 'service_name' defaults" do
186
+ it "assumes default priority 20 and calls update-rc.d remove => defaults 20 80" do
187
187
  expect_commands(@provider, [
188
188
  "/usr/sbin/update-rc.d -f #{service_name} remove",
189
- "/usr/sbin/update-rc.d #{service_name} defaults",
189
+ "/usr/sbin/update-rc.d #{service_name} defaults 20 80",
190
190
  ])
191
191
  @provider.enable_service
192
192
  end
193
193
  end
194
194
 
195
- context "when the service sets a simple priority" do
195
+ context "when the service sets a simple priority 75" do
196
196
  before do
197
197
  @new_resource.priority(75)
198
198
  end
199
199
 
200
- it "calls update-rc.d 'service_name' defaults" do
200
+ it "calls update-rc.d remove => defaults 75 25" do
201
201
  expect_commands(@provider, [
202
202
  "/usr/sbin/update-rc.d -f #{service_name} remove",
203
203
  "/usr/sbin/update-rc.d #{service_name} defaults 75 25",
@@ -206,15 +206,17 @@ describe Chef::Provider::Service::Debian do
206
206
  end
207
207
  end
208
208
 
209
- context "when the service sets complex priorities" do
209
+ context "when the service sets complex priorities using Hash" do
210
210
  before do
211
211
  @new_resource.priority(2 => [:start, 20], 3 => [:stop, 55])
212
212
  end
213
213
 
214
- it "calls update-rc.d 'service_name' with those priorities" do
214
+ it "calls update-rc.d remove => defaults => enable|disable <runlevel>" do
215
215
  expect_commands(@provider, [
216
216
  "/usr/sbin/update-rc.d -f #{service_name} remove",
217
- "/usr/sbin/update-rc.d #{service_name} start 20 2 . stop 55 3 . ",
217
+ "/usr/sbin/update-rc.d #{service_name} defaults",
218
+ "/usr/sbin/update-rc.d #{service_name} enable 2",
219
+ "/usr/sbin/update-rc.d #{service_name} disable 3",
218
220
  ])
219
221
  @provider.enable_service
220
222
  end
@@ -223,25 +225,44 @@ describe Chef::Provider::Service::Debian do
223
225
 
224
226
  describe "disable_service" do
225
227
  let(:service_name) { @new_resource.service_name }
228
+
226
229
  context "when the service doesn't set a priority" do
227
- it "calls update-rc.d -f 'service_name' remove + stop with default priority" do
230
+ it "calls update-rc.d remove => defaults => disable" do
228
231
  expect_commands(@provider, [
229
232
  "/usr/sbin/update-rc.d -f #{service_name} remove",
230
- "/usr/sbin/update-rc.d -f #{service_name} stop 80 2 3 4 5 .",
233
+ "/usr/sbin/update-rc.d #{service_name} defaults",
234
+ "/usr/sbin/update-rc.d #{service_name} disable",
231
235
  ])
232
236
  @provider.disable_service
233
237
  end
234
238
  end
235
239
 
236
- context "when the service sets a simple priority" do
240
+ context "when the service sets a simple priority 75" do
237
241
  before do
238
242
  @new_resource.priority(75)
239
243
  end
240
244
 
241
- it "calls update-rc.d -f 'service_name' remove + stop with the specified priority" do
245
+ it "ignores priority and calls update-rc.d remove => defaults => disable" do
242
246
  expect_commands(@provider, [
243
247
  "/usr/sbin/update-rc.d -f #{service_name} remove",
244
- "/usr/sbin/update-rc.d -f #{service_name} stop #{100 - @new_resource.priority} 2 3 4 5 .",
248
+ "/usr/sbin/update-rc.d #{service_name} defaults",
249
+ "/usr/sbin/update-rc.d #{service_name} disable",
250
+ ])
251
+ @provider.disable_service
252
+ end
253
+ end
254
+
255
+ context "when the service sets complex priorities using Hash" do
256
+ before do
257
+ @new_resource.priority(2 => [:start, 20], 3 => [:stop, 55])
258
+ end
259
+
260
+ it "ignores priority and calls update-rc.d remove => defaults => enable|disable <runlevel>" do
261
+ expect_commands(@provider, [
262
+ "/usr/sbin/update-rc.d -f #{service_name} remove",
263
+ "/usr/sbin/update-rc.d #{service_name} defaults",
264
+ "/usr/sbin/update-rc.d #{service_name} enable 2",
265
+ "/usr/sbin/update-rc.d #{service_name} disable 3",
245
266
  ])
246
267
  @provider.disable_service
247
268
  end
@@ -32,16 +32,16 @@ describe Chef::Provider::Service::Gentoo do
32
32
  allow(Chef::Resource::Service).to receive(:new).and_return(@current_resource)
33
33
  @status = double("Status", exitstatus: 0, stdout: @stdout)
34
34
  allow(@provider).to receive(:shell_out).and_return(@status)
35
- allow(File).to receive(:exist?).with("/etc/init.d/chef").and_return(true)
36
- allow(File).to receive(:exist?).with("/sbin/rc-update").and_return(true)
37
- allow(File).to receive(:exist?).with("/etc/runlevels/default/chef").and_return(false)
35
+ allow(File).to receive(:exists?).with("/etc/init.d/chef").and_return(true)
36
+ allow(File).to receive(:exists?).with("/sbin/rc-update").and_return(true)
37
+ allow(File).to receive(:exists?).with("/etc/runlevels/default/chef").and_return(false)
38
38
  allow(File).to receive(:readable?).with("/etc/runlevels/default/chef").and_return(false)
39
39
  end
40
- # new test: found_enabled state
40
+ # new test: found_enabled state
41
41
  #
42
42
  describe "load_current_resource" do
43
43
  it "should raise Chef::Exceptions::Service if /sbin/rc-update does not exist" do
44
- expect(File).to receive(:exist?).with("/sbin/rc-update").and_return(false)
44
+ expect(File).to receive(:exists?).with("/sbin/rc-update").and_return(false)
45
45
  @provider.define_resource_requirements
46
46
  expect { @provider.process_resource_requirements }.to raise_error(Chef::Exceptions::Service)
47
47
  end
@@ -65,7 +65,7 @@ describe Chef::Provider::Service::Gentoo do
65
65
 
66
66
  describe "and the file exists and is readable" do
67
67
  before do
68
- allow(File).to receive(:exist?).with("/etc/runlevels/default/chef").and_return(true)
68
+ allow(File).to receive(:exists?).with("/etc/runlevels/default/chef").and_return(true)
69
69
  allow(File).to receive(:readable?).with("/etc/runlevels/default/chef").and_return(true)
70
70
  end
71
71
  it "should set enabled to true" do
@@ -76,7 +76,7 @@ describe Chef::Provider::Service::Gentoo do
76
76
 
77
77
  describe "and the file exists but is not readable" do
78
78
  before do
79
- allow(File).to receive(:exist?).with("/etc/runlevels/default/chef").and_return(true)
79
+ allow(File).to receive(:exists?).with("/etc/runlevels/default/chef").and_return(true)
80
80
  allow(File).to receive(:readable?).with("/etc/runlevels/default/chef").and_return(false)
81
81
  end
82
82
 
@@ -88,7 +88,7 @@ describe Chef::Provider::Service::Gentoo do
88
88
 
89
89
  describe "and the file does not exist" do
90
90
  before do
91
- allow(File).to receive(:exist?).with("/etc/runlevels/default/chef").and_return(false)
91
+ allow(File).to receive(:exists?).with("/etc/runlevels/default/chef").and_return(false)
92
92
  allow(File).to receive(:readable?).with("/etc/runlevels/default/chef").and_return("foobarbaz")
93
93
  end
94
94
 
@@ -1,6 +1,7 @@
1
1
  #
2
2
  # Author:: Igor Afonov <afonov@gmail.com>
3
3
  # Copyright:: Copyright 2011-2016, Igor Afonov
4
+ # Copyright:: Copyright (c) Chef Software Inc.
4
5
  # License:: Apache License, Version 2.0
5
6
  #
6
7
  # Licensed under the Apache License, Version 2.0 (the "License");
@@ -61,276 +62,271 @@ describe Chef::Provider::Service::Macosx do
61
62
 
62
63
  %w{Daemon Agent}.each do |service_type|
63
64
  ["redis-server", "io.redis.redis-server"].each do |service_name|
64
- ["10.9", "10.10", "10.11"].each do |platform_version|
65
- let(:plist) { "/Library/LaunchDaemons/io.redis.redis-server.plist" }
66
- let(:session) { StringIO.new }
67
- if service_type == "Agent"
68
- let(:plist) { "/Library/LaunchAgents/io.redis.redis-server.plist" }
69
- let(:session) { "-S Aqua " }
70
- let(:su_cmd) { "su -l igor -c" }
71
- if platform_version == "10.9"
72
- let(:su_cmd) { "su igor -c" }
73
- end
74
- end
75
- let(:service_label) { "io.redis.redis-server" }
76
- before do
77
- allow(run_context).to receive(:logger).and_return(logger)
78
- allow(Dir).to receive(:glob).and_return([plist], [])
79
- @stat = double("File::Stat", { uid: 501 })
80
- allow(File).to receive(:stat).and_return(@stat)
81
- @getpwuid = double("Etc::Passwd", { name: "mikedodge04" })
82
- allow(Etc).to receive(:getpwuid).and_return(@getpwuid)
83
- allow(node).to receive(:[]).with("platform_version").and_return(platform_version)
84
- cmd = "launchctl list #{service_label}"
85
- allow(provider).to receive(:shell_out)
86
- .with(/(#{su_cmd} '#{cmd}'|#{cmd})/, default_env: false)
87
- .and_return(double("Status",
88
- stdout: launchctl_stdout, exitstatus: 0))
89
- allow(File).to receive(:exist?).and_return([true], [])
90
- allow(provider).to receive(:shell_out!)
91
- .with(/plutil -convert xml1 -o/, default_env: false)
92
- .and_return(double("Status", stdout: plutil_stdout))
93
- end
65
+ let(:plist) { "/Library/LaunchDaemons/io.redis.redis-server.plist" }
66
+ let(:session) { StringIO.new }
67
+ if service_type == "Agent"
68
+ let(:plist) { "/Library/LaunchAgents/io.redis.redis-server.plist" }
69
+ let(:session) { "-S Aqua " }
70
+ let(:su_cmd) { "su -l igor -c" }
71
+ end
72
+ let(:service_label) { "io.redis.redis-server" }
73
+ before do
74
+ allow(run_context).to receive(:logger).and_return(logger)
75
+ allow(Dir).to receive(:glob).and_return([plist], [])
76
+ @stat = double("File::Stat", { uid: 501 })
77
+ allow(File).to receive(:stat).and_return(@stat)
78
+ @getpwuid = double("Etc::Passwd", { name: "mikedodge04" })
79
+ allow(Etc).to receive(:getpwuid).and_return(@getpwuid)
80
+ allow(node).to receive(:[]).with("platform_version").and_return("10.11.1")
81
+ cmd = "launchctl list #{service_label}"
82
+ allow(provider).to receive(:shell_out)
83
+ .with(/(#{su_cmd} '#{cmd}'|#{cmd})/, default_env: false)
84
+ .and_return(double("Status",
85
+ stdout: launchctl_stdout, exitstatus: 0))
86
+ allow(File).to receive(:exists?).and_return([true], [])
87
+ allow(provider).to receive(:shell_out!)
88
+ .with(/plutil -convert xml1 -o/, default_env: false)
89
+ .and_return(double("Status", stdout: plutil_stdout))
90
+ end
94
91
 
95
- context "#{service_name} that is a #{service_type} running Osx #{platform_version}" do
96
- let(:new_resource) { Chef::Resource::MacosxService.new(service_name) }
97
- let!(:current_resource) { Chef::Resource::MacosxService.new(service_name) }
92
+ context "#{service_name} that is a #{service_type}" do
93
+ let(:new_resource) { Chef::Resource::MacosxService.new(service_name) }
94
+ let!(:current_resource) { Chef::Resource::MacosxService.new(service_name) }
98
95
 
99
- describe "#load_current_resource" do
96
+ describe "#load_current_resource" do
100
97
 
101
- # CHEF-5223 "you can't glob for a file that hasn't been converged
102
- # onto the node yet."
103
- context "when the plist doesn't exist" do
98
+ # CHEF-5223 "you can't glob for a file that hasn't been converged
99
+ # onto the node yet."
100
+ context "when the plist doesn't exist" do
104
101
 
105
- def run_resource_setup_for_action(action)
106
- new_resource.action(action)
107
- provider.action = action
108
- provider.load_current_resource
109
- provider.define_resource_requirements
110
- provider.process_resource_requirements
111
- end
102
+ def run_resource_setup_for_action(action)
103
+ new_resource.action(action)
104
+ provider.action = action
105
+ provider.load_current_resource
106
+ provider.define_resource_requirements
107
+ provider.process_resource_requirements
108
+ end
112
109
 
113
- before do
114
- allow(Dir).to receive(:glob).and_return([])
115
- allow(File).to receive(:exist?).and_return([true], [])
116
- allow(provider).to receive(:shell_out!)
117
- .with(/plutil -convert xml1 -o/)
118
- .and_raise(Mixlib::ShellOut::ShellCommandFailed)
119
- end
110
+ before do
111
+ allow(Dir).to receive(:glob).and_return([])
112
+ allow(File).to receive(:exists?).and_return([true], [])
113
+ allow(provider).to receive(:shell_out!)
114
+ .with(/plutil -convert xml1 -o/)
115
+ .and_raise(Mixlib::ShellOut::ShellCommandFailed)
116
+ end
120
117
 
121
- it "works for action :nothing" do
122
- expect { run_resource_setup_for_action(:nothing) }.not_to raise_error
123
- end
118
+ it "works for action :nothing" do
119
+ expect { run_resource_setup_for_action(:nothing) }.not_to raise_error
120
+ end
124
121
 
125
- it "works for action :start" do
126
- expect { run_resource_setup_for_action(:start) }.not_to raise_error
127
- end
122
+ it "works for action :start" do
123
+ expect { run_resource_setup_for_action(:start) }.not_to raise_error
124
+ end
128
125
 
129
- it "errors if action is :enable" do
130
- expect { run_resource_setup_for_action(:enable) }.to raise_error(Chef::Exceptions::Service)
131
- end
126
+ it "errors if action is :enable" do
127
+ expect { run_resource_setup_for_action(:enable) }.to raise_error(Chef::Exceptions::Service)
128
+ end
132
129
 
133
- it "errors if action is :disable" do
134
- expect { run_resource_setup_for_action(:disable) }.to raise_error(Chef::Exceptions::Service)
135
- end
130
+ it "errors if action is :disable" do
131
+ expect { run_resource_setup_for_action(:disable) }.to raise_error(Chef::Exceptions::Service)
136
132
  end
133
+ end
137
134
 
138
- context "when launchctl returns pid in service list" do
139
- let(:launchctl_stdout) { StringIO.new <<~SVC_LIST }
140
- {
141
- "LimitLoadToSessionType" = "System";
142
- "Label" = "io.redis.redis-server";
143
- "TimeOut" = 30;
144
- "OnDemand" = false;
145
- "LastExitStatus" = 0;
146
- "PID" = 62803;
147
- "Program" = "do_some.sh";
148
- "ProgramArguments" = (
149
- "path/to/do_something.sh";
150
- "-f";
151
- );
152
- };
153
- SVC_LIST
135
+ context "when launchctl returns pid in service list" do
136
+ let(:launchctl_stdout) { StringIO.new <<~SVC_LIST }
137
+ {
138
+ "LimitLoadToSessionType" = "System";
139
+ "Label" = "io.redis.redis-server";
140
+ "TimeOut" = 30;
141
+ "OnDemand" = false;
142
+ "LastExitStatus" = 0;
143
+ "PID" = 62803;
144
+ "Program" = "do_some.sh";
145
+ "ProgramArguments" = (
146
+ "path/to/do_something.sh";
147
+ "-f";
148
+ );
149
+ };
150
+ SVC_LIST
154
151
 
155
- before do
156
- provider.load_current_resource
157
- end
152
+ before do
153
+ provider.load_current_resource
154
+ end
158
155
 
159
- it "sets resource running state to true" do
160
- expect(provider.current_resource.running).to be_truthy
161
- end
156
+ it "sets resource running state to true" do
157
+ expect(provider.current_resource.running).to be_truthy
158
+ end
162
159
 
163
- it "sets resouce enabled state to true" do
164
- expect(provider.current_resource.enabled).to be_truthy
165
- end
160
+ it "sets resouce enabled state to true" do
161
+ expect(provider.current_resource.enabled).to be_truthy
166
162
  end
163
+ end
167
164
 
168
- describe "running unsupported actions" do
169
- before do
170
- allow(Dir).to receive(:glob).and_return([(plist).to_s], [])
171
- allow(File).to receive(:exist?).and_return([true], [])
172
- end
173
- it "should throw an exception when reload action is attempted" do
174
- expect { provider.run_action(:reload) }.to raise_error(Chef::Exceptions::UnsupportedAction)
175
- end
165
+ describe "running unsupported actions" do
166
+ before do
167
+ allow(Dir).to receive(:glob).and_return([(plist).to_s], [])
168
+ allow(File).to receive(:exists?).and_return([true], [])
176
169
  end
177
- context "when launchctl returns empty service pid" do
178
- let(:launchctl_stdout) { StringIO.new <<~SVC_LIST }
179
- {
180
- "LimitLoadToSessionType" = "System";
181
- "Label" = "io.redis.redis-server";
182
- "TimeOut" = 30;
183
- "OnDemand" = false;
184
- "LastExitStatus" = 0;
185
- "Program" = "do_some.sh";
186
- "ProgramArguments" = (
187
- "path/to/do_something.sh";
188
- "-f";
189
- );
190
- };
191
- SVC_LIST
170
+ it "should throw an exception when reload action is attempted" do
171
+ expect { provider.run_action(:reload) }.to raise_error(Chef::Exceptions::UnsupportedAction)
172
+ end
173
+ end
174
+ context "when launchctl returns empty service pid" do
175
+ let(:launchctl_stdout) { StringIO.new <<~SVC_LIST }
176
+ {
177
+ "LimitLoadToSessionType" = "System";
178
+ "Label" = "io.redis.redis-server";
179
+ "TimeOut" = 30;
180
+ "OnDemand" = false;
181
+ "LastExitStatus" = 0;
182
+ "Program" = "do_some.sh";
183
+ "ProgramArguments" = (
184
+ "path/to/do_something.sh";
185
+ "-f";
186
+ );
187
+ };
188
+ SVC_LIST
192
189
 
193
- before do
194
- provider.load_current_resource
195
- end
190
+ before do
191
+ provider.load_current_resource
192
+ end
196
193
 
197
- it "sets resource running state to false" do
198
- expect(provider.current_resource.running).to be_falsey
199
- end
194
+ it "sets resource running state to false" do
195
+ expect(provider.current_resource.running).to be_falsey
196
+ end
200
197
 
201
- it "sets resouce enabled state to true" do
202
- expect(provider.current_resource.enabled).to be_truthy
203
- end
198
+ it "sets resouce enabled state to true" do
199
+ expect(provider.current_resource.enabled).to be_truthy
204
200
  end
201
+ end
205
202
 
206
- context "when launchctl doesn't return service entry at all" do
207
- let(:launchctl_stdout) { StringIO.new <<~SVC_LIST }
208
- Could not find service "io.redis.redis-server" in domain for system
209
- SVC_LIST
203
+ context "when launchctl doesn't return service entry at all" do
204
+ let(:launchctl_stdout) { StringIO.new <<~SVC_LIST }
205
+ Could not find service "io.redis.redis-server" in domain for system
206
+ SVC_LIST
210
207
 
211
- it "sets service running state to false" do
208
+ it "sets service running state to false" do
209
+ provider.load_current_resource
210
+ expect(provider.current_resource.running).to be_falsey
211
+ end
212
+
213
+ context "and plist for service is not available" do
214
+ before do
215
+ allow(Dir).to receive(:glob).and_return([])
212
216
  provider.load_current_resource
213
- expect(provider.current_resource.running).to be_falsey
214
217
  end
215
218
 
216
- context "and plist for service is not available" do
217
- before do
218
- allow(Dir).to receive(:glob).and_return([])
219
- provider.load_current_resource
220
- end
221
-
222
- it "sets resouce enabled state to false" do
223
- expect(provider.current_resource.enabled).to be_falsey
224
- end
219
+ it "sets resouce enabled state to false" do
220
+ expect(provider.current_resource.enabled).to be_falsey
225
221
  end
222
+ end
226
223
 
227
- context "and plist for service is available" do
228
- before do
229
- allow(Dir).to receive(:glob).and_return([(plist).to_s], [])
230
- provider.load_current_resource
231
- end
224
+ context "and plist for service is available" do
225
+ before do
226
+ allow(Dir).to receive(:glob).and_return([(plist).to_s], [])
227
+ provider.load_current_resource
228
+ end
232
229
 
233
- it "sets resouce enabled state to true" do
234
- expect(provider.current_resource.enabled).to be_truthy
235
- end
230
+ it "sets resouce enabled state to true" do
231
+ expect(provider.current_resource.enabled).to be_truthy
236
232
  end
233
+ end
237
234
 
238
- describe "and several plists match service name" do
239
- it "throws exception" do
240
- allow(Dir).to receive(:glob).and_return([(plist).to_s,
241
- "/Users/wtf/something.plist"])
242
- provider.load_current_resource
243
- provider.define_resource_requirements
244
- expect { provider.process_resource_requirements }.to raise_error(Chef::Exceptions::Service)
245
- end
235
+ describe "and several plists match service name" do
236
+ it "throws exception" do
237
+ allow(Dir).to receive(:glob).and_return([(plist).to_s,
238
+ "/Users/wtf/something.plist"])
239
+ provider.load_current_resource
240
+ provider.define_resource_requirements
241
+ expect { provider.process_resource_requirements }.to raise_error(Chef::Exceptions::Service)
246
242
  end
247
243
  end
248
244
  end
249
- describe "#start_service" do
250
- before do
251
- allow(Chef::Resource::MacosxService).to receive(:new).and_return(current_resource)
252
- provider.load_current_resource
253
- allow(current_resource).to receive(:running).and_return(false)
254
- end
245
+ end
246
+ describe "#start_service" do
247
+ before do
248
+ allow(Chef::Resource::MacosxService).to receive(:new).and_return(current_resource)
249
+ provider.load_current_resource
250
+ allow(current_resource).to receive(:running).and_return(false)
251
+ end
255
252
 
256
- it "calls the start command if one is specified and service is not running" do
257
- allow(new_resource).to receive(:start_command).and_return("cowsay dirty")
253
+ it "calls the start command if one is specified and service is not running" do
254
+ allow(new_resource).to receive(:start_command).and_return("cowsay dirty")
258
255
 
259
- expect(provider).to receive(:shell_out!).with("cowsay dirty", default_env: false)
260
- provider.start_service
261
- end
256
+ expect(provider).to receive(:shell_out!).with("cowsay dirty", default_env: false)
257
+ provider.start_service
258
+ end
262
259
 
263
- it "shows warning message if service is already running" do
264
- allow(current_resource).to receive(:running).and_return(true)
265
- expect(logger).to receive(:trace).with("macosx_service[#{service_name}] already running, not starting")
260
+ it "shows warning message if service is already running" do
261
+ allow(current_resource).to receive(:running).and_return(true)
262
+ expect(logger).to receive(:trace).with("macosx_service[#{service_name}] already running, not starting")
266
263
 
267
- provider.start_service
268
- end
264
+ provider.start_service
265
+ end
269
266
 
270
- it "starts service via launchctl if service found" do
271
- cmd = "launchctl load -w " + session + plist
272
- expect(provider).to receive(:shell_out)
273
- .with(/(#{su_cmd} .#{cmd}.|#{cmd})/, default_env: false)
274
- .and_return(0)
267
+ it "starts service via launchctl if service found" do
268
+ cmd = "launchctl load -w " + session + plist
269
+ expect(provider).to receive(:shell_out)
270
+ .with(/(#{su_cmd} .#{cmd}.|#{cmd})/, default_env: false)
271
+ .and_return(0)
275
272
 
276
- provider.start_service
277
- end
273
+ provider.start_service
278
274
  end
275
+ end
279
276
 
280
- describe "#stop_service" do
281
- before do
282
- allow(Chef::Resource::MacosxService).to receive(:new).and_return(current_resource)
277
+ describe "#stop_service" do
278
+ before do
279
+ allow(Chef::Resource::MacosxService).to receive(:new).and_return(current_resource)
283
280
 
284
- provider.load_current_resource
285
- allow(current_resource).to receive(:running).and_return(true)
286
- end
281
+ provider.load_current_resource
282
+ allow(current_resource).to receive(:running).and_return(true)
283
+ end
287
284
 
288
- it "calls the stop command if one is specified and service is running" do
289
- allow(new_resource).to receive(:stop_command).and_return("kill -9 123")
285
+ it "calls the stop command if one is specified and service is running" do
286
+ allow(new_resource).to receive(:stop_command).and_return("kill -9 123")
290
287
 
291
- expect(provider).to receive(:shell_out!).with("kill -9 123", default_env: false)
292
- provider.stop_service
293
- end
288
+ expect(provider).to receive(:shell_out!).with("kill -9 123", default_env: false)
289
+ provider.stop_service
290
+ end
294
291
 
295
- it "shows warning message if service is not running" do
296
- allow(current_resource).to receive(:running).and_return(false)
297
- expect(logger).to receive(:trace).with("macosx_service[#{service_name}] not running, not stopping")
292
+ it "shows warning message if service is not running" do
293
+ allow(current_resource).to receive(:running).and_return(false)
294
+ expect(logger).to receive(:trace).with("macosx_service[#{service_name}] not running, not stopping")
298
295
 
299
- provider.stop_service
300
- end
296
+ provider.stop_service
297
+ end
301
298
 
302
- it "stops the service via launchctl if service found" do
303
- cmd = "launchctl unload -w " + plist
304
- expect(provider).to receive(:shell_out)
305
- .with(/(#{su_cmd} .#{cmd}.|#{cmd})/, default_env: false)
306
- .and_return(0)
299
+ it "stops the service via launchctl if service found" do
300
+ cmd = "launchctl unload -w " + plist
301
+ expect(provider).to receive(:shell_out)
302
+ .with(/(#{su_cmd} .#{cmd}.|#{cmd})/, default_env: false)
303
+ .and_return(0)
307
304
 
308
- provider.stop_service
309
- end
305
+ provider.stop_service
310
306
  end
307
+ end
311
308
 
312
- describe "#restart_service" do
313
- before do
314
- allow(Chef::Resource::Service).to receive(:new).and_return(current_resource)
309
+ describe "#restart_service" do
310
+ before do
311
+ allow(Chef::Resource::Service).to receive(:new).and_return(current_resource)
315
312
 
316
- provider.load_current_resource
317
- allow(current_resource).to receive(:running).and_return(true)
318
- allow(provider).to receive(:sleep)
319
- end
313
+ provider.load_current_resource
314
+ allow(current_resource).to receive(:running).and_return(true)
315
+ allow(provider).to receive(:sleep)
316
+ end
320
317
 
321
- it "issues a command if given" do
322
- allow(new_resource).to receive(:restart_command).and_return("reload that thing")
318
+ it "issues a command if given" do
319
+ allow(new_resource).to receive(:restart_command).and_return("reload that thing")
323
320
 
324
- expect(provider).to receive(:shell_out!).with("reload that thing", default_env: false)
325
- provider.restart_service
326
- end
321
+ expect(provider).to receive(:shell_out!).with("reload that thing", default_env: false)
322
+ provider.restart_service
323
+ end
327
324
 
328
- it "stops and then starts service" do
329
- expect(provider).to receive(:unload_service)
330
- expect(provider).to receive(:load_service)
325
+ it "stops and then starts service" do
326
+ expect(provider).to receive(:unload_service)
327
+ expect(provider).to receive(:load_service)
331
328
 
332
- provider.restart_service
333
- end
329
+ provider.restart_service
334
330
  end
335
331
  end
336
332
  end