chef 10.12.0 → 10.14.0.beta.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (593) hide show
  1. data/Rakefile +120 -0
  2. data/distro/common/html/chef-client.8.html +4 -4
  3. data/distro/common/html/chef-expander.8.html +4 -4
  4. data/distro/common/html/chef-expanderctl.8.html +4 -4
  5. data/distro/common/html/chef-server-webui.8.html +4 -4
  6. data/distro/common/html/chef-server.8.html +4 -4
  7. data/distro/common/html/chef-solo.8.html +4 -4
  8. data/distro/common/html/chef-solr.8.html +4 -4
  9. data/distro/common/html/knife-bootstrap.1.html +7 -5
  10. data/distro/common/html/knife-client.1.html +4 -4
  11. data/distro/common/html/knife-configure.1.html +5 -5
  12. data/distro/common/html/knife-cookbook-site.1.html +7 -7
  13. data/distro/common/html/knife-cookbook.1.html +8 -8
  14. data/distro/common/html/knife-data-bag.1.html +4 -4
  15. data/distro/common/html/knife-environment.1.html +7 -7
  16. data/distro/common/html/knife-exec.1.html +4 -4
  17. data/distro/common/html/knife-index.1.html +4 -4
  18. data/distro/common/html/knife-node.1.html +5 -5
  19. data/distro/common/html/knife-role.1.html +4 -4
  20. data/distro/common/html/knife-search.1.html +6 -6
  21. data/distro/common/html/knife-ssh.1.html +4 -4
  22. data/distro/common/html/knife-status.1.html +4 -4
  23. data/distro/common/html/knife-tag.1.html +5 -5
  24. data/distro/common/html/knife.1.html +12 -12
  25. data/distro/common/html/shef.1.html +4 -4
  26. data/distro/common/man/man1/knife-bootstrap.1 +5 -1
  27. data/distro/common/man/man1/knife-client.1 +1 -1
  28. data/distro/common/man/man1/knife-configure.1 +1 -1
  29. data/distro/common/man/man1/knife-cookbook-site.1 +1 -1
  30. data/distro/common/man/man1/knife-cookbook.1 +1 -1
  31. data/distro/common/man/man1/knife-data-bag.1 +1 -1
  32. data/distro/common/man/man1/knife-environment.1 +1 -1
  33. data/distro/common/man/man1/knife-exec.1 +1 -1
  34. data/distro/common/man/man1/knife-index.1 +1 -1
  35. data/distro/common/man/man1/knife-node.1 +1 -1
  36. data/distro/common/man/man1/knife-role.1 +1 -1
  37. data/distro/common/man/man1/knife-search.1 +1 -1
  38. data/distro/common/man/man1/knife-ssh.1 +1 -1
  39. data/distro/common/man/man1/knife-status.1 +1 -1
  40. data/distro/common/man/man1/knife-tag.1 +1 -1
  41. data/distro/common/man/man1/knife.1 +1 -1
  42. data/distro/common/man/man1/shef.1 +1 -1
  43. data/distro/common/man/man8/chef-client.8 +1 -1
  44. data/distro/common/man/man8/chef-expander.8 +1 -1
  45. data/distro/common/man/man8/chef-expanderctl.8 +1 -1
  46. data/distro/common/man/man8/chef-server-webui.8 +1 -1
  47. data/distro/common/man/man8/chef-server.8 +1 -1
  48. data/distro/common/man/man8/chef-solo.8 +1 -1
  49. data/distro/common/man/man8/chef-solr.8 +1 -1
  50. data/distro/common/markdown/man1/knife-bootstrap.mkd +3 -0
  51. data/lib/chef/application.rb +5 -1
  52. data/lib/chef/application/client.rb +17 -0
  53. data/lib/chef/application/solo.rb +17 -0
  54. data/lib/chef/client.rb +105 -27
  55. data/lib/chef/config.rb +11 -0
  56. data/lib/chef/cookbook/remote_file_vendor.rb +1 -5
  57. data/lib/chef/cookbook/synchronizer.rb +216 -0
  58. data/lib/chef/cookbook_version.rb +6 -26
  59. data/lib/chef/data_bag.rb +6 -2
  60. data/lib/chef/data_bag_item.rb +5 -1
  61. data/lib/chef/event_dispatch/base.rb +303 -0
  62. data/lib/chef/event_dispatch/dispatcher.rb +42 -0
  63. data/lib/chef/exceptions.rb +29 -1
  64. data/lib/chef/file_access_control.rb +7 -2
  65. data/lib/chef/file_access_control/unix.rb +117 -35
  66. data/lib/chef/file_access_control/windows.rb +57 -4
  67. data/lib/chef/file_cache.rb +4 -2
  68. data/lib/chef/formatters/base.rb +260 -0
  69. data/lib/chef/formatters/doc.rb +236 -0
  70. data/lib/chef/formatters/error_inspectors.rb +19 -0
  71. data/lib/chef/formatters/error_inspectors/api_error_formatting.rb +111 -0
  72. data/lib/chef/formatters/error_inspectors/compile_error_inspector.rb +90 -0
  73. data/lib/chef/formatters/error_inspectors/cookbook_resolve_error_inspector.rb +147 -0
  74. data/lib/chef/formatters/error_inspectors/cookbook_sync_error_inspector.rb +80 -0
  75. data/lib/chef/formatters/error_inspectors/node_load_error_inspector.rb +125 -0
  76. data/lib/chef/formatters/error_inspectors/registration_error_inspector.rb +137 -0
  77. data/lib/chef/formatters/error_inspectors/resource_failure_inspector.rb +101 -0
  78. data/lib/chef/formatters/error_inspectors/run_list_expansion_error_inspector.rb +117 -0
  79. data/lib/chef/formatters/minimal.rb +235 -0
  80. data/lib/chef/handler.rb +8 -0
  81. data/lib/chef/handler/error_report.rb +1 -1
  82. data/lib/chef/knife/bootstrap.rb +10 -1
  83. data/lib/chef/knife/bootstrap/archlinux-gems.erb +14 -1
  84. data/lib/chef/knife/bootstrap/centos5-gems.erb +13 -0
  85. data/lib/chef/knife/bootstrap/chef-full.erb +13 -0
  86. data/lib/chef/knife/bootstrap/fedora13-gems.erb +13 -0
  87. data/lib/chef/knife/bootstrap/ubuntu10.04-apt.erb +13 -0
  88. data/lib/chef/knife/bootstrap/ubuntu10.04-gems.erb +13 -0
  89. data/lib/chef/knife/bootstrap/ubuntu12.04-gems.erb +13 -0
  90. data/lib/chef/knife/cookbook_site_install.rb +17 -5
  91. data/lib/chef/knife/cookbook_site_show.rb +6 -3
  92. data/lib/chef/knife/core/cookbook_scm_repo.rb +12 -0
  93. data/lib/chef/knife/exec.rb +37 -2
  94. data/lib/chef/knife/ssh.rb +29 -5
  95. data/lib/chef/knife/status.rb +19 -2
  96. data/lib/chef/mixin/enforce_ownership_and_permissions.rb +5 -5
  97. data/lib/chef/mixin/language_include_recipe.rb +7 -6
  98. data/lib/chef/mixin/securable.rb +38 -10
  99. data/lib/chef/mixin/why_run.rb +339 -0
  100. data/lib/chef/monkey_patches/net_http.rb +22 -0
  101. data/lib/chef/node.rb +6 -2
  102. data/lib/chef/platform.rb +6 -3
  103. data/lib/chef/provider.rb +105 -9
  104. data/lib/chef/provider/cookbook_file.rb +18 -34
  105. data/lib/chef/provider/cron.rb +21 -12
  106. data/lib/chef/provider/deploy.rb +131 -75
  107. data/lib/chef/provider/directory.rb +80 -25
  108. data/lib/chef/provider/erl_call.rb +33 -28
  109. data/lib/chef/provider/execute.rb +8 -5
  110. data/lib/chef/provider/file.rb +128 -26
  111. data/lib/chef/provider/git.rb +87 -72
  112. data/lib/chef/provider/group.rb +49 -23
  113. data/lib/chef/provider/group/dscl.rb +9 -1
  114. data/lib/chef/provider/group/gpasswd.rb +8 -1
  115. data/lib/chef/provider/group/groupadd.rb +9 -1
  116. data/lib/chef/provider/group/groupmod.rb +120 -0
  117. data/lib/chef/provider/group/pw.rb +10 -1
  118. data/lib/chef/provider/group/suse.rb +8 -1
  119. data/lib/chef/provider/group/usermod.rb +10 -2
  120. data/lib/chef/provider/http_request.rb +72 -61
  121. data/lib/chef/provider/ifconfig.rb +51 -32
  122. data/lib/chef/provider/link.rb +43 -34
  123. data/lib/chef/provider/mdadm.rb +27 -29
  124. data/lib/chef/provider/mount.rb +40 -26
  125. data/lib/chef/provider/ohai.rb +13 -8
  126. data/lib/chef/provider/package.rb +57 -41
  127. data/lib/chef/provider/package/apt.rb +8 -11
  128. data/lib/chef/provider/package/dpkg.rb +30 -17
  129. data/lib/chef/provider/package/rpm.rb +23 -6
  130. data/lib/chef/provider/remote_directory.rb +8 -4
  131. data/lib/chef/provider/remote_file.rb +16 -18
  132. data/lib/chef/provider/resource_update.rb +55 -0
  133. data/lib/chef/provider/route.rb +19 -12
  134. data/lib/chef/provider/ruby_block.rb +8 -3
  135. data/lib/chef/provider/script.rb +4 -2
  136. data/lib/chef/provider/service.rb +35 -21
  137. data/lib/chef/provider/service/arch.rb +2 -5
  138. data/lib/chef/provider/service/debian.rb +32 -10
  139. data/lib/chef/provider/service/freebsd.rb +50 -14
  140. data/lib/chef/provider/service/gentoo.rb +18 -4
  141. data/lib/chef/provider/service/init.rb +13 -0
  142. data/lib/chef/provider/service/macosx.rb +32 -13
  143. data/lib/chef/provider/service/redhat.rb +30 -13
  144. data/lib/chef/provider/service/simple.rb +68 -25
  145. data/lib/chef/provider/service/solaris.rb +4 -0
  146. data/lib/chef/provider/service/systemd.rb +13 -0
  147. data/lib/chef/provider/service/upstart.rb +27 -1
  148. data/lib/chef/provider/service/windows.rb +4 -0
  149. data/lib/chef/provider/subversion.rb +36 -22
  150. data/lib/chef/provider/template.rb +27 -22
  151. data/lib/chef/provider/user.rb +66 -45
  152. data/lib/chef/providers.rb +1 -0
  153. data/lib/chef/resource.rb +138 -24
  154. data/lib/chef/resource/conditional.rb +8 -0
  155. data/lib/chef/resource/deploy.rb +9 -0
  156. data/lib/chef/resource/execute.rb +1 -1
  157. data/lib/chef/resource/file.rb +11 -0
  158. data/lib/chef/resource/link.rb +20 -0
  159. data/lib/chef/resource/package.rb +4 -0
  160. data/lib/chef/resource/template.rb +0 -1
  161. data/lib/chef/resource_reporter.rb +195 -0
  162. data/lib/chef/rest.rb +55 -38
  163. data/lib/chef/run_context.rb +90 -19
  164. data/lib/chef/run_list/run_list_expansion.rb +33 -20
  165. data/lib/chef/run_status.rb +4 -1
  166. data/lib/chef/runner.rb +9 -23
  167. data/lib/chef/scan_access_control.rb +133 -0
  168. data/lib/chef/shef/shef_session.rb +17 -5
  169. data/lib/chef/version.rb +1 -1
  170. data/spec/data/bad-config.rb +1 -0
  171. data/spec/data/big_json.json +1 -0
  172. data/spec/data/big_json_plus_one.json +1 -0
  173. data/spec/data/bootstrap/test-hints.erb +12 -0
  174. data/spec/data/bootstrap/test.erb +1 -0
  175. data/spec/data/cb_version_cookbooks/tatft/README.rdoc +3 -0
  176. data/spec/data/cb_version_cookbooks/tatft/attributes/default.rb +1 -0
  177. data/spec/data/cb_version_cookbooks/tatft/definitions/runit_service.rb +1 -0
  178. data/spec/data/cb_version_cookbooks/tatft/files/default/giant_blob.tgz +1 -0
  179. data/spec/data/cb_version_cookbooks/tatft/libraries/ownage.rb +1 -0
  180. data/spec/data/cb_version_cookbooks/tatft/providers/lwp.rb +1 -0
  181. data/spec/data/cb_version_cookbooks/tatft/recipes/default.rb +1 -0
  182. data/spec/data/cb_version_cookbooks/tatft/resources/lwr.rb +1 -0
  183. data/spec/data/cb_version_cookbooks/tatft/templates/default/configuration.erb +0 -0
  184. data/spec/data/checksum/random.txt +1 -0
  185. data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-600hhz-0 +1 -0
  186. data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-6m8zdk-0 +0 -0
  187. data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-ahd2gq-0 +1 -0
  188. data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-api8ux-0 +1 -0
  189. data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-b0r1m1-0 +1 -0
  190. data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-bfygsi-0 +1 -0
  191. data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-el14l6-0 +1 -0
  192. data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-ivrl3y-0 +1 -0
  193. data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-kkbs85-0 +1 -0
  194. data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-ory1ux-0 +1 -0
  195. data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-pgsq76-0 +1 -0
  196. data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-ra8uim-0 +1 -0
  197. data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-t7k1g-0 +1 -0
  198. data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-t8g0sv-0 +1 -0
  199. data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-ufy6g3-0 +1 -0
  200. data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-x2d6j9-0 +1 -0
  201. data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-xi0l6h-0 +1 -0
  202. data/spec/data/config.rb +6 -0
  203. data/spec/data/cookbooks/apache2/files/default/apache2_module_conf_generate.pl +2 -0
  204. data/spec/data/cookbooks/apache2/recipes/default.rb +3 -0
  205. data/spec/data/cookbooks/borken/recipes/default.rb +2 -0
  206. data/spec/data/cookbooks/borken/templates/default/borken.erb +2 -0
  207. data/spec/data/cookbooks/chefignore +6 -0
  208. data/spec/data/cookbooks/java/files/default/java.response +2 -0
  209. data/spec/data/cookbooks/openldap/attributes/default.rb +15 -0
  210. data/spec/data/cookbooks/openldap/attributes/smokey.rb +1 -0
  211. data/spec/data/cookbooks/openldap/definitions/client.rb +5 -0
  212. data/spec/data/cookbooks/openldap/definitions/server.rb +5 -0
  213. data/spec/data/cookbooks/openldap/files/default/remotedir/remote_dir_file1.txt +3 -0
  214. data/spec/data/cookbooks/openldap/files/default/remotedir/remote_dir_file2.txt +3 -0
  215. data/spec/data/cookbooks/openldap/files/default/remotedir/remotesubdir/remote_subdir_file1.txt +3 -0
  216. data/spec/data/cookbooks/openldap/files/default/remotedir/remotesubdir/remote_subdir_file2.txt +3 -0
  217. data/spec/data/cookbooks/openldap/files/default/remotedir/subdir_with_no_file_just_a_subsubdir/the_subsubdir/some_file.txt +3 -0
  218. data/spec/data/cookbooks/openldap/recipes/default.rb +3 -0
  219. data/spec/data/cookbooks/openldap/recipes/gigantor.rb +3 -0
  220. data/spec/data/cookbooks/openldap/recipes/one.rb +15 -0
  221. data/spec/data/cookbooks/openldap/templates/default/openldap_stuff.conf.erb +1 -0
  222. data/spec/data/cookbooks/openldap/templates/default/openldap_variable_stuff.conf.erb +1 -0
  223. data/spec/data/cookbooks/openldap/templates/default/test.erb +1 -0
  224. data/spec/data/definitions/test.rb +5 -0
  225. data/spec/data/environment-config.rb +5 -0
  226. data/spec/data/fileedit/blank +0 -0
  227. data/spec/data/fileedit/hosts +4 -0
  228. data/spec/data/gems/chef-integration-test-0.1.0.gem +0 -0
  229. data/spec/data/kitchen/chefignore +6 -0
  230. data/spec/data/kitchen/openldap/attributes/default.rb +3 -0
  231. data/spec/data/kitchen/openldap/attributes/robinson.rb +3 -0
  232. data/spec/data/kitchen/openldap/definitions/client.rb +3 -0
  233. data/spec/data/kitchen/openldap/definitions/drewbarrymore.rb +3 -0
  234. data/spec/data/kitchen/openldap/recipes/gigantor.rb +3 -0
  235. data/spec/data/kitchen/openldap/recipes/ignoreme.rb +3 -0
  236. data/spec/data/kitchen/openldap/recipes/woot.rb +3 -0
  237. data/spec/data/knife-site-subcommands/plugins/knife/example_subcommand.rb +0 -0
  238. data/spec/data/knife_subcommand/test_explicit_category.rb +7 -0
  239. data/spec/data/knife_subcommand/test_name_mapping.rb +4 -0
  240. data/spec/data/knife_subcommand/test_yourself.rb +13 -0
  241. data/spec/data/lwrp/providers/buck_passer.rb +3 -0
  242. data/spec/data/lwrp/providers/buck_passer_2.rb +10 -0
  243. data/spec/data/lwrp/providers/embedded_resource_accesses_providers_scope.rb +16 -0
  244. data/spec/data/lwrp/providers/monkey_name_printer.rb +5 -0
  245. data/spec/data/lwrp/providers/paint_drying_watcher.rb +7 -0
  246. data/spec/data/lwrp/providers/thumb_twiddler.rb +7 -0
  247. data/spec/data/lwrp/resources/bar.rb +1 -0
  248. data/spec/data/lwrp/resources/foo.rb +3 -0
  249. data/spec/data/lwrp/resources_with_default_attributes/nodeattr.rb +1 -0
  250. data/spec/data/lwrp_override/providers/buck_passer.rb +10 -0
  251. data/spec/data/lwrp_override/resources/foo.rb +4 -0
  252. data/spec/data/metadata/quick_start/metadata.rb +19 -0
  253. data/spec/data/nodes/default.rb +15 -0
  254. data/spec/data/nodes/test.example.com.rb +17 -0
  255. data/spec/data/nodes/test.rb +15 -0
  256. data/spec/data/object_loader/environments/test.json +5 -0
  257. data/spec/data/object_loader/environments/test.rb +2 -0
  258. data/spec/data/object_loader/environments/test_json_class.json +6 -0
  259. data/spec/data/object_loader/nodes/test.json +5 -0
  260. data/spec/data/object_loader/nodes/test.rb +2 -0
  261. data/spec/data/object_loader/nodes/test_json_class.json +6 -0
  262. data/spec/data/object_loader/roles/test.json +5 -0
  263. data/spec/data/object_loader/roles/test.rb +2 -0
  264. data/spec/data/object_loader/roles/test_json_class.json +6 -0
  265. data/spec/data/old_home_dir/my-dot-emacs +0 -0
  266. data/spec/data/old_home_dir/my-dot-vim +0 -0
  267. data/spec/data/recipes/test.rb +7 -0
  268. data/spec/data/remote_directory_data/remote_dir_file.txt +1 -0
  269. data/spec/data/remote_directory_data/remote_subdirectory/remote_subdir_file.txt +1 -0
  270. data/spec/data/remote_file/nyan_cat.png +0 -0
  271. data/spec/data/run_context/cookbooks/test/attributes/george.rb +1 -0
  272. data/spec/data/run_context/cookbooks/test/definitions/new_animals.rb +9 -0
  273. data/spec/data/run_context/cookbooks/test/definitions/new_cat.rb +5 -0
  274. data/spec/data/run_context/cookbooks/test/recipes/default.rb +5 -0
  275. data/spec/data/run_context/cookbooks/test/recipes/one.rb +7 -0
  276. data/spec/data/run_context/cookbooks/test/recipes/two.rb +7 -0
  277. data/spec/data/run_context/nodes/run_context.rb +5 -0
  278. data/spec/data/search_queries_to_transform.txt +98 -0
  279. data/spec/data/ssl/5e707473.0 +18 -0
  280. data/spec/data/ssl/chef-rspec.cert +27 -0
  281. data/spec/data/ssl/chef-rspec.key +27 -0
  282. data/spec/data/ssl/key.pem +15 -0
  283. data/spec/data/ssl/private_key.pem +27 -0
  284. data/spec/data/ssl/private_key_with_whitespace.pem +32 -0
  285. data/spec/data/templates/seattle.txt +1 -0
  286. data/spec/functional/knife/cookbook_delete_spec.rb +159 -0
  287. data/spec/functional/knife/exec_spec.rb +59 -0
  288. data/spec/functional/knife/ssh_spec.rb +209 -0
  289. data/spec/functional/resource/directory_spec.rb +39 -0
  290. data/spec/functional/resource/file_spec.rb +69 -0
  291. data/spec/functional/resource/link_spec.rb +572 -0
  292. data/spec/functional/resource/remote_directory_spec.rb +114 -0
  293. data/spec/functional/resource/remote_file_spec.rb +42 -0
  294. data/spec/functional/resource/template_spec.rb +68 -0
  295. data/spec/functional/tiny_server_spec.rb +77 -0
  296. data/spec/rcov.opts +2 -0
  297. data/spec/spec_helper.rb +77 -0
  298. data/spec/stress/win32/file_spec.rb +37 -0
  299. data/spec/stress/win32/memory_spec.rb +22 -0
  300. data/spec/stress/win32/security_spec.rb +69 -0
  301. data/spec/support/chef_helpers.rb +52 -0
  302. data/spec/support/lib/chef/provider/easy.rb +35 -0
  303. data/spec/support/lib/chef/provider/snakeoil.rb +40 -0
  304. data/spec/support/lib/chef/resource/cat.rb +41 -0
  305. data/spec/support/lib/chef/resource/one_two_three_four.rb +43 -0
  306. data/spec/support/lib/chef/resource/zen_master.rb +46 -0
  307. data/spec/support/matchers/leak.rb +96 -0
  308. data/spec/support/mock/constant.rb +52 -0
  309. data/spec/support/mock/platform.rb +18 -0
  310. data/spec/support/platform_helpers.rb +23 -0
  311. data/spec/support/platforms/prof/gc.rb +54 -0
  312. data/spec/support/platforms/prof/win32.rb +46 -0
  313. data/spec/support/shared/functional/directory_resource.rb +85 -0
  314. data/spec/support/shared/functional/file_resource.rb +172 -0
  315. data/spec/support/shared/functional/knife.rb +37 -0
  316. data/spec/support/shared/functional/securable_resource.rb +378 -0
  317. data/spec/support/shared/unit/api_error_inspector.rb +180 -0
  318. data/spec/tiny_server.rb +179 -0
  319. data/spec/unit/api_client_spec.rb +184 -0
  320. data/spec/unit/application/agent_spec.rb +0 -0
  321. data/spec/unit/application/client_spec.rb +136 -0
  322. data/spec/unit/application/knife_spec.rb +152 -0
  323. data/spec/unit/application/server_spec.rb +0 -0
  324. data/spec/unit/application/solo_spec.rb +167 -0
  325. data/spec/unit/application_spec.rb +239 -0
  326. data/spec/unit/certificate_spec.rb +76 -0
  327. data/spec/unit/checksum/storage/filesystem_spec.rb +69 -0
  328. data/spec/unit/checksum_cache_spec.rb +209 -0
  329. data/spec/unit/checksum_spec.rb +94 -0
  330. data/spec/unit/chef_spec.rb +25 -0
  331. data/spec/unit/client_spec.rb +226 -0
  332. data/spec/unit/config_spec.rb +203 -0
  333. data/spec/unit/cookbook/chefignore_spec.rb +38 -0
  334. data/spec/unit/cookbook/metadata_spec.rb +627 -0
  335. data/spec/unit/cookbook/synchronizer_spec.rb +258 -0
  336. data/spec/unit/cookbook/syntax_check_spec.rb +211 -0
  337. data/spec/unit/cookbook_loader_spec.rb +144 -0
  338. data/spec/unit/cookbook_manifest_spec.rb +554 -0
  339. data/spec/unit/cookbook_spec.rb +101 -0
  340. data/spec/unit/cookbook_version_spec.rb +406 -0
  341. data/spec/unit/couchdb_spec.rb +274 -0
  342. data/spec/unit/daemon_spec.rb +281 -0
  343. data/spec/unit/data_bag_item_spec.rb +280 -0
  344. data/spec/unit/data_bag_spec.rb +169 -0
  345. data/spec/unit/encrypted_data_bag_item_spec.rb +122 -0
  346. data/spec/unit/environment_spec.rb +466 -0
  347. data/spec/unit/exceptions_spec.rb +74 -0
  348. data/spec/unit/file_access_control_spec.rb +282 -0
  349. data/spec/unit/file_cache_spec.rb +114 -0
  350. data/spec/unit/formatters/error_inspectors/compile_error_inspector_spec.rb +69 -0
  351. data/spec/unit/formatters/error_inspectors/cookbook_resolve_error_inspector_spec.rb +75 -0
  352. data/spec/unit/formatters/error_inspectors/cookbook_sync_error_inspector_spec.rb +43 -0
  353. data/spec/unit/formatters/error_inspectors/node_load_error_inspector_spec.rb +27 -0
  354. data/spec/unit/formatters/error_inspectors/registration_error_inspector_spec.rb +27 -0
  355. data/spec/unit/formatters/error_inspectors/resource_failure_inspector_spec.rb +71 -0
  356. data/spec/unit/formatters/error_inspectors/run_list_expansion_error_inspector_spec.rb +93 -0
  357. data/spec/unit/handler/json_file_spec.rb +64 -0
  358. data/spec/unit/handler_spec.rb +216 -0
  359. data/spec/unit/index_queue_spec.rb +391 -0
  360. data/spec/unit/json_compat_spect.rb +53 -0
  361. data/spec/unit/knife/bootstrap_spec.rb +191 -0
  362. data/spec/unit/knife/client_bulk_delete_spec.rb +78 -0
  363. data/spec/unit/knife/client_create_spec.rb +74 -0
  364. data/spec/unit/knife/client_delete_spec.rb +40 -0
  365. data/spec/unit/knife/client_edit_spec.rb +40 -0
  366. data/spec/unit/knife/client_list_spec.rb +34 -0
  367. data/spec/unit/knife/client_reregister_spec.rb +61 -0
  368. data/spec/unit/knife/client_show_spec.rb +42 -0
  369. data/spec/unit/knife/config_file_selection_spec.rb +117 -0
  370. data/spec/unit/knife/configure_client_spec.rb +83 -0
  371. data/spec/unit/knife/configure_spec.rb +127 -0
  372. data/spec/unit/knife/cookbook_bulk_delete_spec.rb +87 -0
  373. data/spec/unit/knife/cookbook_create_spec.rb +251 -0
  374. data/spec/unit/knife/cookbook_delete_spec.rb +239 -0
  375. data/spec/unit/knife/cookbook_download_spec.rb +217 -0
  376. data/spec/unit/knife/cookbook_list_spec.rb +88 -0
  377. data/spec/unit/knife/cookbook_metadata_from_file_spec.rb +65 -0
  378. data/spec/unit/knife/cookbook_metadata_spec.rb +172 -0
  379. data/spec/unit/knife/cookbook_show_spec.rb +223 -0
  380. data/spec/unit/knife/cookbook_site_download_spec.rb +151 -0
  381. data/spec/unit/knife/cookbook_site_install_spec.rb +138 -0
  382. data/spec/unit/knife/cookbook_site_share_spec.rb +146 -0
  383. data/spec/unit/knife/cookbook_site_unshare_spec.rb +77 -0
  384. data/spec/unit/knife/cookbook_test_spec.rb +83 -0
  385. data/spec/unit/knife/cookbook_upload_spec.rb +143 -0
  386. data/spec/unit/knife/core/bootstrap_context_spec.rb +128 -0
  387. data/spec/unit/knife/core/cookbook_scm_repo_spec.rb +187 -0
  388. data/spec/unit/knife/core/object_loader_spec.rb +81 -0
  389. data/spec/unit/knife/core/subcommand_loader_spec.rb +54 -0
  390. data/spec/unit/knife/core/ui_spec.rb +160 -0
  391. data/spec/unit/knife/data_bag_create_spec.rb +96 -0
  392. data/spec/unit/knife/data_bag_edit_spec.rb +83 -0
  393. data/spec/unit/knife/data_bag_from_file_spec.rb +182 -0
  394. data/spec/unit/knife/data_bag_show_spec.rb +105 -0
  395. data/spec/unit/knife/environment_create_spec.rb +91 -0
  396. data/spec/unit/knife/environment_delete_spec.rb +71 -0
  397. data/spec/unit/knife/environment_edit_spec.rb +79 -0
  398. data/spec/unit/knife/environment_from_file_spec.rb +66 -0
  399. data/spec/unit/knife/environment_list_spec.rb +54 -0
  400. data/spec/unit/knife/environment_show_spec.rb +52 -0
  401. data/spec/unit/knife/index_rebuild_spec.rb +65 -0
  402. data/spec/unit/knife/knife_help.rb +92 -0
  403. data/spec/unit/knife/node_bulk_delete_spec.rb +97 -0
  404. data/spec/unit/knife/node_delete_spec.rb +68 -0
  405. data/spec/unit/knife/node_edit_spec.rb +88 -0
  406. data/spec/unit/knife/node_from_file_spec.rb +59 -0
  407. data/spec/unit/knife/node_list_spec.rb +63 -0
  408. data/spec/unit/knife/node_run_list_add_spec.rb +125 -0
  409. data/spec/unit/knife/node_run_list_remove_spec.rb +73 -0
  410. data/spec/unit/knife/node_show_spec.rb +48 -0
  411. data/spec/unit/knife/role_bulk_delete_spec.rb +80 -0
  412. data/spec/unit/knife/role_create_spec.rb +80 -0
  413. data/spec/unit/knife/role_delete_spec.rb +67 -0
  414. data/spec/unit/knife/role_edit_spec.rb +79 -0
  415. data/spec/unit/knife/role_from_file_spec.rb +69 -0
  416. data/spec/unit/knife/role_list_spec.rb +56 -0
  417. data/spec/unit/knife/tag_create_spec.rb +23 -0
  418. data/spec/unit/knife/tag_delete_spec.rb +25 -0
  419. data/spec/unit/knife/tag_list_spec.rb +23 -0
  420. data/spec/unit/knife_spec.rb +295 -0
  421. data/spec/unit/log_spec.rb +24 -0
  422. data/spec/unit/lwrp_spec.rb +231 -0
  423. data/spec/unit/mash_spec.rb +51 -0
  424. data/spec/unit/mixin/checksum_spec.rb +41 -0
  425. data/spec/unit/mixin/command_spec.rb +101 -0
  426. data/spec/unit/mixin/convert_to_class_name_spec.rb +50 -0
  427. data/spec/unit/mixin/deep_merge_spec.rb +786 -0
  428. data/spec/unit/mixin/deprecation_spec.rb +34 -0
  429. data/spec/unit/mixin/enforce_ownership_and_permissions_spec.rb +66 -0
  430. data/spec/unit/mixin/language_spec.rb +305 -0
  431. data/spec/unit/mixin/params_validate_spec.rb +370 -0
  432. data/spec/unit/mixin/path_sanity_spec.rb +80 -0
  433. data/spec/unit/mixin/securable_spec.rb +254 -0
  434. data/spec/unit/mixin/shell_out_spec.rb +109 -0
  435. data/spec/unit/mixin/template_spec.rb +104 -0
  436. data/spec/unit/mixin/xml_escape_spec.rb +54 -0
  437. data/spec/unit/monkey_patches/string_spec.rb +37 -0
  438. data/spec/unit/node/attribute_spec.rb +1033 -0
  439. data/spec/unit/node_spec.rb +744 -0
  440. data/spec/unit/openid_registration_spec.rb +153 -0
  441. data/spec/unit/platform_spec.rb +228 -0
  442. data/spec/unit/provider/breakpoint_spec.rb +54 -0
  443. data/spec/unit/provider/cookbook_file_spec.rb +209 -0
  444. data/spec/unit/provider/cron/solaris_spec.rb +121 -0
  445. data/spec/unit/provider/cron_spec.rb +766 -0
  446. data/spec/unit/provider/deploy/revision_spec.rb +108 -0
  447. data/spec/unit/provider/deploy/timestamped_spec.rb +40 -0
  448. data/spec/unit/provider/deploy_spec.rb +610 -0
  449. data/spec/unit/provider/directory_spec.rb +148 -0
  450. data/spec/unit/provider/env_spec.rb +232 -0
  451. data/spec/unit/provider/erl_call_spec.rb +88 -0
  452. data/spec/unit/provider/execute_spec.rb +60 -0
  453. data/spec/unit/provider/file_spec.rb +292 -0
  454. data/spec/unit/provider/git_spec.rb +352 -0
  455. data/spec/unit/provider/group/dscl_spec.rb +294 -0
  456. data/spec/unit/provider/group/gpasswd_spec.rb +108 -0
  457. data/spec/unit/provider/group/groupadd_spec.rb +161 -0
  458. data/spec/unit/provider/group/groupmod_spec.rb +134 -0
  459. data/spec/unit/provider/group/pw_spec.rb +140 -0
  460. data/spec/unit/provider/group/usermod_spec.rb +90 -0
  461. data/spec/unit/provider/group/windows_spec.rb +94 -0
  462. data/spec/unit/provider/group_spec.rb +259 -0
  463. data/spec/unit/provider/http_request_spec.rb +172 -0
  464. data/spec/unit/provider/ifconfig_spec.rb +213 -0
  465. data/spec/unit/provider/link_spec.rb +249 -0
  466. data/spec/unit/provider/log_spec.rb +81 -0
  467. data/spec/unit/provider/mdadm_spec.rb +131 -0
  468. data/spec/unit/provider/mount/mount_spec.rb +398 -0
  469. data/spec/unit/provider/mount/windows_spec.rb +134 -0
  470. data/spec/unit/provider/mount_spec.rb +160 -0
  471. data/spec/unit/provider/ohai_spec.rb +85 -0
  472. data/spec/unit/provider/package/apt_spec.rb +339 -0
  473. data/spec/unit/provider/package/dpkg_spec.rb +216 -0
  474. data/spec/unit/provider/package/easy_install_spec.rb +112 -0
  475. data/spec/unit/provider/package/freebsd_spec.rb +259 -0
  476. data/spec/unit/provider/package/macports_spec.rb +203 -0
  477. data/spec/unit/provider/package/pacman_spec.rb +177 -0
  478. data/spec/unit/provider/package/portage_spec.rb +276 -0
  479. data/spec/unit/provider/package/rpm_spec.rb +152 -0
  480. data/spec/unit/provider/package/rubygems_spec.rb +614 -0
  481. data/spec/unit/provider/package/smartos_spec.rb +83 -0
  482. data/spec/unit/provider/package/solaris_spec.rb +179 -0
  483. data/spec/unit/provider/package/yum_spec.rb +1795 -0
  484. data/spec/unit/provider/package/zypper_spec.rb +159 -0
  485. data/spec/unit/provider/package_spec.rb +423 -0
  486. data/spec/unit/provider/remote_directory_spec.rb +186 -0
  487. data/spec/unit/provider/remote_file_spec.rb +274 -0
  488. data/spec/unit/provider/route_spec.rb +230 -0
  489. data/spec/unit/provider/ruby_block_spec.rb +38 -0
  490. data/spec/unit/provider/script_spec.rb +96 -0
  491. data/spec/unit/provider/service/arch_service_spec.rb +330 -0
  492. data/spec/unit/provider/service/debian_service_spec.rb +254 -0
  493. data/spec/unit/provider/service/freebsd_service_spec.rb +351 -0
  494. data/spec/unit/provider/service/gentoo_service_spec.rb +144 -0
  495. data/spec/unit/provider/service/init_service_spec.rb +212 -0
  496. data/spec/unit/provider/service/insserv_service_spec.rb +76 -0
  497. data/spec/unit/provider/service/invokercd_service_spec.rb +212 -0
  498. data/spec/unit/provider/service/macosx_spec.rb +229 -0
  499. data/spec/unit/provider/service/redhat_spec.rb +155 -0
  500. data/spec/unit/provider/service/simple_service_spec.rb +171 -0
  501. data/spec/unit/provider/service/solaris_smf_service_spec.rb +140 -0
  502. data/spec/unit/provider/service/systemd_service_spec.rb +239 -0
  503. data/spec/unit/provider/service/upstart_service_spec.rb +314 -0
  504. data/spec/unit/provider/service/windows_spec.rb +235 -0
  505. data/spec/unit/provider/service_spec.rb +169 -0
  506. data/spec/unit/provider/subversion_spec.rb +281 -0
  507. data/spec/unit/provider/template_spec.rb +186 -0
  508. data/spec/unit/provider/user/dscl_spec.rb +439 -0
  509. data/spec/unit/provider/user/pw_spec.rb +235 -0
  510. data/spec/unit/provider/user/useradd_spec.rb +380 -0
  511. data/spec/unit/provider/user/windows_spec.rb +178 -0
  512. data/spec/unit/provider/user_spec.rb +466 -0
  513. data/spec/unit/provider_spec.rb +168 -0
  514. data/spec/unit/recipe_spec.rb +268 -0
  515. data/spec/unit/resource/apt_package_spec.rb +43 -0
  516. data/spec/unit/resource/bash_spec.rb +40 -0
  517. data/spec/unit/resource/breakpoint_spec.rb +43 -0
  518. data/spec/unit/resource/chef_gem_spec.rb +49 -0
  519. data/spec/unit/resource/conditional_spec.rb +147 -0
  520. data/spec/unit/resource/cookbook_file_spec.rb +48 -0
  521. data/spec/unit/resource/cron_spec.rb +154 -0
  522. data/spec/unit/resource/csh_spec.rb +40 -0
  523. data/spec/unit/resource/deploy_revision_spec.rb +47 -0
  524. data/spec/unit/resource/deploy_spec.rb +232 -0
  525. data/spec/unit/resource/directory_spec.rb +62 -0
  526. data/spec/unit/resource/dpkg_package_spec.rb +38 -0
  527. data/spec/unit/resource/easy_install_package_spec.rb +48 -0
  528. data/spec/unit/resource/env_spec.rb +66 -0
  529. data/spec/unit/resource/erl_call_spec.rb +69 -0
  530. data/spec/unit/resource/execute_spec.rb +108 -0
  531. data/spec/unit/resource/file_spec.rb +114 -0
  532. data/spec/unit/resource/freebsd_package_spec.rb +39 -0
  533. data/spec/unit/resource/gem_package_spec.rb +49 -0
  534. data/spec/unit/resource/git_spec.rb +46 -0
  535. data/spec/unit/resource/group_spec.rb +132 -0
  536. data/spec/unit/resource/http_request_spec.rb +46 -0
  537. data/spec/unit/resource/link_spec.rb +97 -0
  538. data/spec/unit/resource/log_spec.rb +51 -0
  539. data/spec/unit/resource/macports_package_spec.rb +37 -0
  540. data/spec/unit/resource/mdadm_spec.rb +80 -0
  541. data/spec/unit/resource/mount_spec.rb +138 -0
  542. data/spec/unit/resource/ohai_spec.rb +44 -0
  543. data/spec/unit/resource/package_spec.rb +77 -0
  544. data/spec/unit/resource/pacman_package_spec.rb +38 -0
  545. data/spec/unit/resource/perl_spec.rb +40 -0
  546. data/spec/unit/resource/portage_package_spec.rb +38 -0
  547. data/spec/unit/resource/python_spec.rb +40 -0
  548. data/spec/unit/resource/remote_directory_spec.rb +75 -0
  549. data/spec/unit/resource/remote_file_spec.rb +85 -0
  550. data/spec/unit/resource/route_spec.rb +88 -0
  551. data/spec/unit/resource/rpm_package_spec.rb +38 -0
  552. data/spec/unit/resource/ruby_block_spec.rb +46 -0
  553. data/spec/unit/resource/ruby_spec.rb +40 -0
  554. data/spec/unit/resource/scm_spec.rb +139 -0
  555. data/spec/unit/resource/script_spec.rb +55 -0
  556. data/spec/unit/resource/service_spec.rb +144 -0
  557. data/spec/unit/resource/smartos_package_spec.rb +38 -0
  558. data/spec/unit/resource/subversion_spec.rb +58 -0
  559. data/spec/unit/resource/template_spec.rb +101 -0
  560. data/spec/unit/resource/timestamped_deploy_spec.rb +28 -0
  561. data/spec/unit/resource/user_spec.rb +101 -0
  562. data/spec/unit/resource/yum_package_spec.rb +85 -0
  563. data/spec/unit/resource_collection/stepable_iterator_spec.rb +144 -0
  564. data/spec/unit/resource_collection_spec.rb +257 -0
  565. data/spec/unit/resource_definition_spec.rb +119 -0
  566. data/spec/unit/resource_platform_map_spec.rb +164 -0
  567. data/spec/unit/resource_reporter_spec.rb +425 -0
  568. data/spec/unit/resource_spec.rb +611 -0
  569. data/spec/unit/rest/auth_credentials_spec.rb +409 -0
  570. data/spec/unit/rest_spec.rb +644 -0
  571. data/spec/unit/role_spec.rb +275 -0
  572. data/spec/unit/run_context_spec.rb +64 -0
  573. data/spec/unit/run_list/run_list_expansion_spec.rb +129 -0
  574. data/spec/unit/run_list/run_list_item_spec.rb +117 -0
  575. data/spec/unit/run_list/versioned_recipe_list_spec.rb +123 -0
  576. data/spec/unit/run_list_spec.rb +507 -0
  577. data/spec/unit/run_status_spec.rb +145 -0
  578. data/spec/unit/runner_spec.rb +303 -0
  579. data/spec/unit/scan_access_control_spec.rb +151 -0
  580. data/spec/unit/search/query_spec.rb +99 -0
  581. data/spec/unit/shef/model_wrapper_spec.rb +97 -0
  582. data/spec/unit/shef/shef_ext_spec.rb +153 -0
  583. data/spec/unit/shef/shef_session_spec.rb +141 -0
  584. data/spec/unit/shef_spec.rb +161 -0
  585. data/spec/unit/solr_query/query_transform_spec.rb +450 -0
  586. data/spec/unit/solr_query/solr_http_request_spec.rb +244 -0
  587. data/spec/unit/solr_query_spec.rb +203 -0
  588. data/spec/unit/util/file_edit_spec.rb +135 -0
  589. data/spec/unit/version_class_spec.rb +172 -0
  590. data/spec/unit/version_constraint_spec.rb +134 -0
  591. data/spec/unit/webui_user_spec.rb +238 -0
  592. data/tasks/rspec.rb +75 -0
  593. metadata +884 -435
@@ -28,23 +28,57 @@ class Chef
28
28
  class Git < Chef::Provider
29
29
 
30
30
  include Chef::Mixin::ShellOut
31
+
32
+ def whyrun_supported?
33
+ true
34
+ end
31
35
 
32
36
  def load_current_resource
37
+ @resolved_reference = nil
33
38
  @current_resource = Chef::Resource::Git.new(@new_resource.name)
34
39
  if current_revision = find_current_revision
35
40
  @current_resource.revision current_revision
36
41
  end
37
42
  end
38
43
 
39
- def action_checkout
40
- assert_target_directory_valid!
44
+ def define_resource_requirements
45
+ # Parent directory of the target must exist.
46
+ requirements.assert(:checkout, :sync) do |a|
47
+ dirname = ::File.dirname(@new_resource.destination)
48
+ a.assertion { ::File.directory?(dirname) }
49
+ a.whyrun("Directory #{dirname} does not exist, this run will fail unless it has been previously created. Assuming it would have been created.")
50
+ a.failure_message(Chef::Exceptions::MissingParentDirectory,
51
+ "Cannot clone #{@new_resource} to #{@new_resource.destination}, the enclosing directory #{dirname} does not exist")
52
+ end
53
+
54
+
55
+ requirements.assert(:all_actions) do |a|
56
+ a.assertion { !(@new_resource.revision =~ /^origin\//) }
57
+ a.failure_message Chef::Exceptions::InvalidRemoteGitReference,
58
+ "Deploying remote branches is not supported. " +
59
+ "Specify the remote branch as a local branch for " +
60
+ "the git repository you're deploying from " +
61
+ "(ie: '#{@new_resource.revision.gsub('origin/', '')}' rather than '#{@new_resource.revision}')."
62
+ end
63
+
64
+ requirements.assert(:all_actions) do |a|
65
+ # this can't be recovered from in why-run mode, because nothing that
66
+ # we do in the course of a run is likely to create a valid target_revision
67
+ # if we can't resolve it up front.
68
+ a.assertion { target_revision != nil }
69
+ a.failure_message Chef::Exceptions::UnresolvableGitReference,
70
+ "Unable to parse SHA reference for '#{@new_resource.revision}' in repository '#{@new_resource.repository}'. " +
71
+ "Verify your (case-sensitive) repository URL and revision.\n" +
72
+ "`git ls-remote` output: #{@resolved_reference}"
73
+ end
74
+ end
41
75
 
76
+ def action_checkout
42
77
  if target_dir_non_existent_or_empty?
43
78
  clone
44
79
  checkout
45
80
  enable_submodules
46
81
  add_remotes
47
- @new_resource.updated_by_last_action(true)
48
82
  else
49
83
  Chef::Log.debug "#{@new_resource} checkout destination #{@new_resource.destination} already exists or is a non-empty directory"
50
84
  end
@@ -52,13 +86,12 @@ class Chef
52
86
 
53
87
  def action_export
54
88
  action_checkout
55
- FileUtils.rm_rf(::File.join(@new_resource.destination,".git"))
56
- @new_resource.updated_by_last_action(true)
89
+ converge_by("complete the export by removing #{@new_resource.destination}.git after checkout") do
90
+ FileUtils.rm_rf(::File.join(@new_resource.destination,".git"))
91
+ end
57
92
  end
58
93
 
59
94
  def action_sync
60
- assert_target_directory_valid!
61
-
62
95
  if existing_git_clone?
63
96
  current_rev = find_current_revision
64
97
  Chef::Log.debug "#{@new_resource} current revision: #{current_rev} target revision: #{target_revision}"
@@ -66,22 +99,13 @@ class Chef
66
99
  fetch_updates
67
100
  enable_submodules
68
101
  Chef::Log.info "#{@new_resource} updated to revision #{target_revision}"
69
- @new_resource.updated_by_last_action(true)
70
102
  end
71
103
  add_remotes
72
104
  else
73
105
  action_checkout
74
- @new_resource.updated_by_last_action(true)
75
106
  end
76
107
  end
77
108
 
78
- def assert_target_directory_valid!
79
- target_parent_directory = ::File.dirname(@new_resource.destination)
80
- unless ::File.directory?(target_parent_directory)
81
- msg = "Cannot clone #{@new_resource} to #{@new_resource.destination}, the enclosing directory #{target_parent_directory} does not exist"
82
- raise Chef::Exceptions::MissingParentDirectory, msg
83
- end
84
- end
85
109
 
86
110
  def existing_git_clone?
87
111
  ::File.exist?(::File.join(@new_resource.destination, ".git"))
@@ -103,51 +127,60 @@ class Chef
103
127
  def add_remotes
104
128
  if (@new_resource.additional_remotes.length > 0)
105
129
  @new_resource.additional_remotes.each_pair do |remote_name, remote_url|
106
- Chef::Log.info "#{@new_resource} adding git remote #{remote_name} = #{remote_url}"
107
- command = "git remote add #{remote_name} #{remote_url}"
108
- if shell_out(command, run_options(:cwd => @new_resource.destination, :log_level => :info)).exitstatus != 0
109
- @new_resource.updated_by_last_action(true)
130
+ converge_by("add remote #{remote_name} from #{remote_url}") do
131
+ Chef::Log.info "#{@new_resource} adding git remote #{remote_name} = #{remote_url}"
132
+ command = "git remote add #{remote_name} #{remote_url}"
133
+ if shell_out(command, run_options(:cwd => @new_resource.destination, :log_level => :info)).exitstatus != 0
134
+ @new_resource.updated_by_last_action(true)
135
+ end
110
136
  end
111
137
  end
112
138
  end
113
139
  end
114
140
 
115
- def clone
116
- remote = @new_resource.remote
141
+ def clone
142
+ converge_by("clone from #{@new_resource.repository} into #{@new_resource.destination}") do
143
+ remote = @new_resource.remote
117
144
 
118
- args = []
119
- args << "-o #{remote}" unless remote == 'origin'
120
- args << "--depth #{@new_resource.depth}" if @new_resource.depth
145
+ args = []
146
+ args << "-o #{remote}" unless remote == 'origin'
147
+ args << "--depth #{@new_resource.depth}" if @new_resource.depth
121
148
 
122
- Chef::Log.info "#{@new_resource} cloning repo #{@new_resource.repository} to #{@new_resource.destination}"
149
+ Chef::Log.info "#{@new_resource} cloning repo #{@new_resource.repository} to #{@new_resource.destination}"
123
150
 
124
- clone_cmd = "git clone #{args.join(' ')} #{@new_resource.repository} #{Shellwords.escape @new_resource.destination}"
125
- shell_out!(clone_cmd, run_options(:log_level => :info))
151
+ clone_cmd = "git clone #{args.join(' ')} #{@new_resource.repository} #{Shellwords.escape @new_resource.destination}"
152
+ shell_out!(clone_cmd, run_options(:log_level => :info))
153
+ end
126
154
  end
127
155
 
128
156
  def checkout
129
157
  sha_ref = target_revision
130
- # checkout into a local branch rather than a detached HEAD
131
- shell_out!("git checkout -b deploy #{sha_ref}", run_options(:cwd => @new_resource.destination))
132
- Chef::Log.info "#{@new_resource} checked out branch: #{@new_resource.revision} reference: #{sha_ref}"
158
+ converge_by("checkout ref #{sha_ref} branch #{@new_resource.revision}") do
159
+ # checkout into a local branch rather than a detached HEAD
160
+ shell_out!("git checkout -b deploy #{sha_ref}", run_options(:cwd => @new_resource.destination))
161
+ Chef::Log.info "#{@new_resource} checked out branch: #{@new_resource.revision} reference: #{sha_ref}"
162
+ end
133
163
  end
134
164
 
135
165
  def enable_submodules
136
166
  if @new_resource.enable_submodules
137
- Chef::Log.info "#{@new_resource} enabling git submodules"
138
- # the --recursive flag means we require git 1.6.5+ now, see CHEF-1827
139
- command = "git submodule update --init --recursive"
140
- shell_out!(command, run_options(:cwd => @new_resource.destination, :log_level => :info))
167
+ converge_by("enable git submodules for #{@new_resource}") do
168
+ Chef::Log.info "#{@new_resource} enabling git submodules"
169
+ # the --recursive flag means we require git 1.6.5+ now, see CHEF-1827
170
+ command = "git submodule update --init --recursive"
171
+ shell_out!(command, run_options(:cwd => @new_resource.destination, :log_level => :info))
172
+ end
141
173
  end
142
174
  end
143
175
 
144
176
  def fetch_updates
145
177
  setup_remote_tracking_branches if @new_resource.remote != 'origin'
146
-
147
- # since we're in a local branch already, just reset to specified revision rather than merge
148
- fetch_command = "git fetch #{@new_resource.remote} && git fetch #{@new_resource.remote} --tags && git reset --hard #{target_revision}"
149
- Chef::Log.debug "Fetching updates from #{new_resource.remote} and resetting to revision #{target_revision}"
150
- shell_out!(fetch_command, run_options(:cwd => @new_resource.destination))
178
+ converge_by("fetch updates for #{@new_resource.remote}") do
179
+ # since we're in a local branch already, just reset to specified revision rather than merge
180
+ fetch_command = "git fetch #{@new_resource.remote} && git fetch #{@new_resource.remote} --tags && git reset --hard #{target_revision}"
181
+ Chef::Log.debug "Fetching updates from #{new_resource.remote} and resetting to revision #{target_revision}"
182
+ shell_out!(fetch_command, run_options(:cwd => @new_resource.destination))
183
+ end
151
184
  end
152
185
 
153
186
  # Use git-config to setup a remote tracking branches. Could use
@@ -158,12 +191,13 @@ class Chef
158
191
  # based from each other it should still work fine.
159
192
  def setup_remote_tracking_branches
160
193
  command = []
161
-
162
- Chef::Log.debug "#{@new_resource} configuring remote tracking branches for repository #{@new_resource.repository} "+
163
- "at remote #{@new_resource.remote}"
164
- command << "git config remote.#{@new_resource.remote}.url #{@new_resource.repository}"
165
- command << "git config remote.#{@new_resource.remote}.fetch +refs/heads/*:refs/remotes/#{@new_resource.remote}/*"
166
- shell_out!(command.join(" && "), run_options(:cwd => @new_resource.destination))
194
+ converge_by("set up remote tracking branches for #{@new_resource.repository} at #{@new_resource.remote}") do
195
+ Chef::Log.debug "#{@new_resource} configuring remote tracking branches for repository #{@new_resource.repository} "+
196
+ "at remote #{@new_resource.remote}"
197
+ command << "git config remote.#{@new_resource.remote}.url #{@new_resource.repository}"
198
+ command << "git config remote.#{@new_resource.remote}.fetch +refs/heads/*:refs/remotes/#{@new_resource.remote}/*"
199
+ shell_out!(command.join(" && "), run_options(:cwd => @new_resource.destination))
200
+ end
167
201
  end
168
202
 
169
203
  def current_revision_matches_target_revision?
@@ -172,13 +206,10 @@ class Chef
172
206
 
173
207
  def target_revision
174
208
  @target_revision ||= begin
175
- assert_revision_not_remote
176
-
177
209
  if sha_hash?(@new_resource.revision)
178
210
  @target_revision = @new_resource.revision
179
211
  else
180
- resolved_reference = remote_resolve_reference
181
- @target_revision = extract_revision(resolved_reference)
212
+ @target_revision = remote_resolve_reference
182
213
  end
183
214
  end
184
215
  end
@@ -188,7 +219,12 @@ class Chef
188
219
  def remote_resolve_reference
189
220
  Chef::Log.debug("#{@new_resource} resolving remote reference")
190
221
  command = git('ls-remote', @new_resource.repository, @new_resource.revision)
191
- shell_out!(command, run_options).stdout
222
+ @resolved_reference = shell_out!(command, run_options).stdout
223
+ if @resolved_reference =~ /^([0-9a-f]{40})\s+(\S+)/
224
+ $1
225
+ else
226
+ nil
227
+ end
192
228
  end
193
229
 
194
230
  private
@@ -219,27 +255,6 @@ class Chef
219
255
  string =~ /^[0-9a-f]{40}$/
220
256
  end
221
257
 
222
- def assert_revision_not_remote
223
- if @new_resource.revision =~ /^origin\//
224
- reference = @new_resource.revision
225
- error_text = "Deploying remote branches is not supported. " +
226
- "Specify the remote branch as a local branch for " +
227
- "the git repository you're deploying from " +
228
- "(ie: '#{reference.gsub('origin/', '')}' rather than '#{reference}')."
229
- raise RuntimeError, error_text
230
- end
231
- end
232
-
233
- def extract_revision(resolved_reference)
234
- unless resolved_reference =~ /^([0-9a-f]{40})\s+(\S+)/
235
- msg = "Unable to parse SHA reference for '#{@new_resource.revision}' in repository '#{@new_resource.repository}'. "
236
- msg << "Verify your (case-sensitive) repository URL and revision.\n"
237
- msg << "`git ls-remote` output: #{resolved_reference}"
238
- raise Chef::Exceptions::UnresolvableGitReference, msg
239
- end
240
- $1
241
- end
242
-
243
258
  end
244
259
  end
245
260
  end
@@ -26,7 +26,12 @@ class Chef
26
26
  class Group < Chef::Provider
27
27
  include Chef::Mixin::Command
28
28
  attr_accessor :group_exists
29
-
29
+ attr_accessor :change_desc
30
+
31
+ def whyrun_supported?
32
+ true
33
+ end
34
+
30
35
  def initialize(new_resource, run_context)
31
36
  super
32
37
  @group_exists = true
@@ -52,67 +57,88 @@ class Chef
52
57
 
53
58
  @current_resource
54
59
  end
60
+
61
+ def define_resource_requirements
62
+ requirements.assert(:modify) do |a|
63
+ a.assertion { @group_exists }
64
+ a.failure_message(Chef::Exceptions::Group, "Cannot modify #{@new_resource} - group does not exist!")
65
+ a.whyrun("Group #{@new_resource} does not exist. Unless it would have been created earlier in this run, this attempt to modify it would fail.")
66
+ end
67
+ end
55
68
 
56
- # Check to see if a group needs any changes
69
+ # Check to see if a group needs any changes. Populate
70
+ # @change_desc with a description of why a change must occur
57
71
  #
58
72
  # ==== Returns
59
73
  # <true>:: If a change is required
60
74
  # <false>:: If a change is not required
61
75
  def compare_group
62
- return true if @new_resource.gid != @current_resource.gid
63
-
76
+ @change_desc = nil
77
+ if @new_resource.gid != @current_resource.gid
78
+ @change_desc = "change gid #{@current_resource.gid} to #{@new_resource.gid}"
79
+ return true
80
+ end
81
+
64
82
  if(@new_resource.append)
83
+ missing_members = []
65
84
  @new_resource.members.each do |member|
66
85
  next if @current_resource.members.include?(member)
86
+ missing_members << member
87
+ end
88
+ if missing_members.length > 0
89
+ @change_desc = "add missing member(s): #{missing_members.join(", ")}"
67
90
  return true
68
91
  end
69
92
  else
70
- return true if @new_resource.members != @current_resource.members
93
+ if @new_resource.members != @current_resource.members
94
+ @change_desc = "replace group members with new list of members"
95
+ return true
96
+ end
71
97
  end
72
-
73
98
  return false
74
99
  end
75
100
 
76
101
  def action_create
77
102
  case @group_exists
78
103
  when false
79
- create_group
80
- Chef::Log.info("#{@new_resource} created")
81
- @new_resource.updated_by_last_action(true)
104
+ converge_by("create #{@new_resource}") do
105
+ create_group
106
+ Chef::Log.info("#{@new_resource} created")
107
+ end
82
108
  else
83
109
  if compare_group
84
- manage_group
85
- Chef::Log.info("#{@new_resource} altered")
86
- @new_resource.updated_by_last_action(true)
110
+ converge_by(["alter group #{@new_resource}", @change_desc ]) do
111
+ manage_group
112
+ Chef::Log.info("#{@new_resource} altered")
113
+ end
87
114
  end
88
115
  end
89
116
  end
90
117
 
91
118
  def action_remove
92
119
  if @group_exists
93
- remove_group
94
- @new_resource.updated_by_last_action(true)
95
- Chef::Log.info("#{@new_resource} removed")
120
+ converge_by("remove group #{@new_resource}") do
121
+ remove_group
122
+ Chef::Log.info("#{@new_resource} removed")
123
+ end
96
124
  end
97
125
  end
98
126
 
99
127
  def action_manage
100
128
  if @group_exists && compare_group
101
- manage_group
102
- @new_resource.updated_by_last_action(true)
103
- Chef::Log.info("#{@new_resource} managed")
129
+ converge_by(["manage group #{@new_resource}", @change_desc]) do
130
+ manage_group
131
+ Chef::Log.info("#{@new_resource} managed")
132
+ end
104
133
  end
105
134
  end
106
135
 
107
136
  def action_modify
108
- if @group_exists
109
- if compare_group
137
+ if compare_group
138
+ converge_by(["modify group #{@new_resource}", @change_desc]) do
110
139
  manage_group
111
- @new_resource.updated_by_last_action(true)
112
140
  Chef::Log.info("#{@new_resource} modified")
113
141
  end
114
- else
115
- raise Chef::Exceptions::Group, "Cannot modify #{@new_resource} - group does not exist!"
116
142
  end
117
143
  end
118
144
 
@@ -84,9 +84,17 @@ class Chef
84
84
  end
85
85
  end
86
86
 
87
+ def define_resource_requirements
88
+ super
89
+ requirements.assert(:all_actions) do |a|
90
+ a.assertion { ::File.exists?("/usr/bin/dscl") }
91
+ a.failure_message Chef::Exceptions::Group, "Could not find binary /usr/bin/dscl for #{@new_resource.name}"
92
+ # No whyrun alternative: this component should be available in the base install of any given system that uses it
93
+ end
94
+ end
95
+
87
96
  def load_current_resource
88
97
  super
89
- raise Chef::Exceptions::Group, "Could not find binary /usr/bin/dscl for #{@new_resource}" unless ::File.exists?("/usr/bin/dscl")
90
98
  end
91
99
 
92
100
  def create_group
@@ -28,8 +28,15 @@ class Chef
28
28
 
29
29
  def load_current_resource
30
30
  super
31
+ end
31
32
 
32
- raise Chef::Exceptions::Group, "Could not find binary /usr/bin/gpasswd for #{@new_resource}" unless ::File.exists?("/usr/bin/gpasswd")
33
+ def define_resource_requirements
34
+ super
35
+ requirements.assert(:all_actions) do |a|
36
+ a.assertion { ::File.exists?("/usr/bin/gpasswd") }
37
+ a.failure_message Chef::Exceptions::Group, "Could not find binary /usr/bin/gpasswd for #{@new_resource}"
38
+ # No whyrun alternative: this component should be available in the base install of any given system that uses it
39
+ end
33
40
  end
34
41
 
35
42
  def modify_group_members
@@ -29,8 +29,16 @@ class Chef
29
29
 
30
30
  def load_current_resource
31
31
  super
32
+ end
33
+
34
+ def define_resource_requirements
35
+ super
32
36
  required_binaries.each do |required_binary|
33
- raise Chef::Exceptions::Group, "Could not find binary #{required_binary} for #{@new_resource}" unless ::File.exists?(required_binary)
37
+ requirements.assert(:all_actions) do |a|
38
+ a.assertion { ::File.exists?(required_binary) }
39
+ a.failure_message Chef::Exceptions::Group, "Could not find binary #{required_binary} for #{@new_resource}"
40
+ # No whyrun alternative: this component should be available in the base install of any given system that uses it
41
+ end
34
42
  end
35
43
  end
36
44
 
@@ -0,0 +1,120 @@
1
+ #
2
+ # Author:: Dan Crosta (<dcrosta@late.am>)
3
+ # Copyright:: Copyright (c) 2012 Opscode, Inc.
4
+ # License:: Apache License, Version 2.0
5
+ #
6
+ # Licensed under the Apache License, Version 2.0 (the "License");
7
+ # you may not use this file except in compliance with the License.
8
+ # You may obtain a copy of the License at
9
+ #
10
+ # http://www.apache.org/licenses/LICENSE-2.0
11
+ #
12
+ # Unless required by applicable law or agreed to in writing, software
13
+ # distributed under the License is distributed on an "AS IS" BASIS,
14
+ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15
+ # See the License for the specific language governing permissions and
16
+ # limitations under the License.
17
+ #
18
+
19
+ require 'chef/mixin/shell_out'
20
+
21
+ class Chef
22
+ class Provider
23
+ class Group
24
+ class Groupmod < Chef::Provider::Group
25
+
26
+ include Chef::Mixin::ShellOut
27
+
28
+ def load_current_resource
29
+ super
30
+ [ "group", "user" ].each do |binary|
31
+ raise Chef::Exceptions::Group, "Could not find binary /usr/sbin/#{binary} for #{@new_resource}" unless ::File.exists?("/usr/sbin/#{binary}")
32
+ end
33
+ end
34
+
35
+ # Create the group
36
+ def create_group
37
+ command = "group add"
38
+ command << set_options
39
+ shell_out!(command)
40
+
41
+ add_group_members(@new_resource.members)
42
+ end
43
+
44
+ # Manage the group when it already exists
45
+ def manage_group
46
+ if @new_resource.append
47
+ to_add = @new_resource.members.dup
48
+ to_add.reject! { |user| @current_resource.members.include?(user) }
49
+
50
+ to_delete = Array.new
51
+
52
+ Chef::Log.debug("#{@new_resource} not changing group members, the group has no members to add") if to_add.empty?
53
+ else
54
+ to_add = @new_resource.members.dup
55
+ to_add.reject! { |user| @current_resource.members.include?(user) }
56
+
57
+ to_delete = @current_resource.members.dup
58
+ to_delete.reject! { |user| @new_resource.members.include?(user) }
59
+
60
+ Chef::Log.debug("#{@new_resource} setting group members to: none") if @new_resource.members.empty?
61
+ end
62
+
63
+ if to_delete.empty?
64
+ # If we are only adding new members to this group, then
65
+ # call add_group_members with only those users
66
+ add_group_members(to_add)
67
+ else
68
+ Chef::Log.debug("#{@new_resource} removing members #{to_delete.join(', ')}")
69
+
70
+ # This is tricky, but works: rename the existing group to
71
+ # "<name>_bak", create a new group with the same GID and
72
+ # "<name>", then set correct members on that group
73
+ rename = "group mod -n #{@new_resource.group_name}_bak #{@new_resource.group_name}"
74
+ shell_out!(rename)
75
+
76
+ create = "group add"
77
+ create << set_options(:overwrite_gid => true)
78
+ shell_out!(create)
79
+
80
+ # Ignore to_add here, since we're replacing the group we
81
+ # have to add all members who should be in the group.
82
+ add_group_members(@new_resource.members)
83
+
84
+ remove = "group del #{@new_resource.group_name}_bak"
85
+ shell_out!(remove)
86
+ end
87
+ end
88
+
89
+ # Remove the group
90
+ def remove_group
91
+ shell_out!("group del #{@new_resource.group_name}")
92
+ end
93
+
94
+ # Adds a list of usernames to the group using `user mod`
95
+ def add_group_members(members)
96
+ Chef::Log.debug("#{@new_resource} adding members #{members.join(', ')}") if !members.empty?
97
+ members.each do |user|
98
+ shell_out!("user mod -G #{@new_resource.group_name} #{user}")
99
+ end
100
+ end
101
+
102
+ # Little bit of magic as per Adam's useradd provider to pull and assign the command line flags
103
+ #
104
+ # ==== Returns
105
+ # <string>:: A string containing the option and then the quoted value
106
+ def set_options(overwrite_gid=false)
107
+ opts = ""
108
+ if overwrite_gid || @new_resource.gid && (@current_resource.gid != @new_resource.gid)
109
+ opts << " -g '#{@new_resource.gid}'"
110
+ end
111
+ if overwrite_gid
112
+ opts << " -o"
113
+ end
114
+ opts << " #{@new_resource.group_name}"
115
+ opts
116
+ end
117
+ end
118
+ end
119
+ end
120
+ end