chef 10.34.6 → 11.0.0.beta.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (506) hide show
  1. data/CONTRIBUTING.md +155 -0
  2. data/README.md +89 -0
  3. data/Rakefile +4 -12
  4. data/bin/chef-apply +25 -0
  5. data/bin/chef-shell +34 -0
  6. data/bin/shef +6 -5
  7. data/distro/common/html/chef-client.8.html +4 -4
  8. data/distro/common/html/chef-expander.8.html +4 -4
  9. data/distro/common/html/chef-expanderctl.8.html +4 -4
  10. data/distro/common/html/chef-server-webui.8.html +4 -4
  11. data/distro/common/html/chef-server.8.html +4 -4
  12. data/distro/common/html/{shef.1.html → chef-shell.1.html} +49 -46
  13. data/distro/common/html/chef-solo.8.html +18 -12
  14. data/distro/common/html/chef-solr.8.html +4 -4
  15. data/distro/common/html/knife-bootstrap.1.html +4 -4
  16. data/distro/common/html/knife-client.1.html +4 -4
  17. data/distro/common/html/knife-configure.1.html +4 -4
  18. data/distro/common/html/knife-cookbook-site.1.html +4 -4
  19. data/distro/common/html/knife-cookbook.1.html +10 -7
  20. data/distro/common/html/knife-data-bag.1.html +10 -7
  21. data/distro/common/html/knife-environment.1.html +8 -6
  22. data/distro/common/html/knife-exec.1.html +9 -9
  23. data/distro/common/html/knife-index.1.html +4 -4
  24. data/distro/common/html/knife-node.1.html +4 -4
  25. data/distro/common/html/knife-role.1.html +4 -4
  26. data/distro/common/html/knife-search.1.html +4 -4
  27. data/distro/common/html/knife-ssh.1.html +4 -4
  28. data/distro/common/html/knife-status.1.html +4 -4
  29. data/distro/common/html/knife-tag.1.html +4 -4
  30. data/distro/common/html/knife.1.html +8 -13
  31. data/distro/common/man/man1/{shef.1 → chef-shell.1} +21 -57
  32. data/distro/common/man/man1/knife-bootstrap.1 +1 -1
  33. data/distro/common/man/man1/knife-client.1 +1 -1
  34. data/distro/common/man/man1/knife-configure.1 +1 -1
  35. data/distro/common/man/man1/knife-cookbook-site.1 +1 -1
  36. data/distro/common/man/man1/knife-cookbook.1 +15 -2
  37. data/distro/common/man/man1/knife-data-bag.1 +15 -2
  38. data/distro/common/man/man1/knife-environment.1 +12 -2
  39. data/distro/common/man/man1/knife-exec.1 +4 -7
  40. data/distro/common/man/man1/knife-index.1 +1 -1
  41. data/distro/common/man/man1/knife-node.1 +1 -1
  42. data/distro/common/man/man1/knife-role.1 +1 -1
  43. data/distro/common/man/man1/knife-search.1 +1 -1
  44. data/distro/common/man/man1/knife-ssh.1 +1 -1
  45. data/distro/common/man/man1/knife-status.1 +1 -1
  46. data/distro/common/man/man1/knife-tag.1 +1 -1
  47. data/distro/common/man/man1/knife.1 +3 -6
  48. data/distro/common/man/man8/chef-client.8 +1 -1
  49. data/distro/common/man/man8/chef-expander.8 +1 -1
  50. data/distro/common/man/man8/chef-expanderctl.8 +1 -1
  51. data/distro/common/man/man8/chef-server-webui.8 +1 -1
  52. data/distro/common/man/man8/chef-server.8 +1 -1
  53. data/distro/common/man/man8/chef-solo.8 +36 -4
  54. data/distro/common/man/man8/chef-solr.8 +1 -1
  55. data/distro/common/markdown/man1/{shef.mkd → chef-shell.mkd} +49 -43
  56. data/distro/common/markdown/man1/knife-exec.mkd +11 -6
  57. data/distro/common/markdown/man1/knife.mkd +4 -9
  58. data/distro/debian/etc/default/chef-client +0 -1
  59. data/distro/debian/etc/init.d/chef-client +2 -2
  60. data/lib/chef.rb +2 -5
  61. data/lib/chef/api_client.rb +20 -130
  62. data/lib/chef/api_client/registration.rb +126 -0
  63. data/lib/chef/application.rb +71 -14
  64. data/lib/chef/application/apply.rb +160 -0
  65. data/lib/chef/application/client.rb +25 -18
  66. data/lib/chef/application/knife.rb +0 -2
  67. data/lib/chef/application/solo.rb +23 -8
  68. data/lib/chef/application/windows_service.rb +5 -2
  69. data/lib/chef/applications.rb +1 -0
  70. data/lib/chef/chef_fs.rb +11 -0
  71. data/lib/chef/chef_fs/command_line.rb +232 -0
  72. data/lib/chef/chef_fs/file_pattern.rb +312 -0
  73. data/lib/chef/chef_fs/file_system.rb +358 -0
  74. data/lib/chef/chef_fs/file_system/base_fs_dir.rb +47 -0
  75. data/lib/chef/chef_fs/file_system/base_fs_object.rb +121 -0
  76. data/lib/chef/chef_fs/file_system/chef_repository_file_system_entry.rb +109 -0
  77. data/{spec/unit/monkey_patches/uri_spec.rb → lib/chef/chef_fs/file_system/chef_repository_file_system_root_dir.rb} +12 -15
  78. data/lib/chef/chef_fs/file_system/chef_server_root_dir.rb +84 -0
  79. data/lib/chef/chef_fs/file_system/cookbook_dir.rb +188 -0
  80. data/lib/chef/chef_fs/file_system/cookbook_file.rb +78 -0
  81. data/lib/chef/chef_fs/file_system/cookbook_subdir.rb +54 -0
  82. data/lib/chef/chef_fs/file_system/cookbooks_dir.rb +68 -0
  83. data/lib/chef/chef_fs/file_system/data_bag_dir.rb +78 -0
  84. data/lib/chef/chef_fs/file_system/data_bag_item.rb +59 -0
  85. data/lib/chef/chef_fs/file_system/data_bags_dir.rb +66 -0
  86. data/lib/chef/chef_fs/file_system/file_system_entry.rb +90 -0
  87. data/lib/chef/{index_queue.rb → chef_fs/file_system/file_system_error.rb} +14 -12
  88. data/lib/chef/{resource/whyrun_safe_ruby_block.rb → chef_fs/file_system/file_system_root_dir.rb} +10 -10
  89. data/lib/chef/chef_fs/file_system/must_delete_recursively_error.rb +31 -0
  90. data/lib/chef/chef_fs/file_system/nodes_dir.rb +47 -0
  91. data/lib/chef/{provider/whyrun_safe_ruby_block.rb → chef_fs/file_system/nonexistent_fs_object.rb} +19 -9
  92. data/lib/chef/chef_fs/file_system/not_found_error.rb +31 -0
  93. data/lib/chef/chef_fs/file_system/rest_list_dir.rb +84 -0
  94. data/lib/chef/chef_fs/file_system/rest_list_entry.rb +123 -0
  95. data/lib/chef/chef_fs/knife.rb +77 -0
  96. data/lib/chef/chef_fs/path_utils.rb +64 -0
  97. data/lib/chef/client.rb +44 -21
  98. data/lib/chef/config.rb +52 -43
  99. data/lib/chef/cookbook/synchronizer.rb +6 -8
  100. data/lib/chef/cookbook/syntax_check.rb +61 -14
  101. data/lib/chef/cookbook_loader.rb +39 -26
  102. data/lib/chef/cookbook_uploader.rb +17 -19
  103. data/lib/chef/cookbook_version.rb +3 -302
  104. data/lib/chef/daemon.rb +3 -18
  105. data/lib/chef/data_bag.rb +4 -97
  106. data/lib/chef/data_bag_item.rb +2 -65
  107. data/lib/chef/digester.rb +73 -0
  108. data/lib/chef/dsl.rb +6 -0
  109. data/lib/chef/dsl/data_query.rb +66 -0
  110. data/lib/chef/dsl/include_attribute.rb +60 -0
  111. data/lib/chef/dsl/include_recipe.rb +42 -0
  112. data/lib/chef/dsl/platform_introspection.rb +213 -0
  113. data/lib/chef/dsl/recipe.rb +84 -0
  114. data/lib/chef/dsl/registry_helper.rb +59 -0
  115. data/lib/chef/encrypted_data_bag_item.rb +74 -19
  116. data/lib/chef/environment.rb +9 -180
  117. data/lib/chef/exceptions.rb +87 -14
  118. data/lib/chef/formatters/base.rb +4 -1
  119. data/lib/chef/formatters/error_inspectors/registration_error_inspector.rb +0 -4
  120. data/lib/chef/json_compat.rb +1 -97
  121. data/lib/chef/knife.rb +90 -41
  122. data/lib/chef/knife/bootstrap/archlinux-gems.erb +2 -2
  123. data/lib/chef/knife/bootstrap/centos5-gems.erb +2 -2
  124. data/lib/chef/knife/bootstrap/chef-full.erb +3 -3
  125. data/lib/chef/knife/bootstrap/fedora13-gems.erb +2 -2
  126. data/lib/chef/knife/bootstrap/ubuntu10.04-apt.erb +2 -2
  127. data/lib/chef/knife/bootstrap/ubuntu10.04-gems.erb +2 -2
  128. data/lib/chef/knife/bootstrap/ubuntu12.04-gems.erb +2 -2
  129. data/lib/chef/knife/configure.rb +1 -2
  130. data/lib/chef/knife/cookbook_metadata.rb +1 -0
  131. data/lib/chef/knife/cookbook_test.rb +3 -2
  132. data/lib/chef/knife/cookbook_upload.rb +12 -7
  133. data/lib/chef/knife/core/bootstrap_context.rb +1 -1
  134. data/lib/chef/knife/core/generic_presenter.rb +26 -13
  135. data/lib/chef/knife/core/node_editor.rb +36 -16
  136. data/lib/chef/knife/core/node_presenter.rb +1 -1
  137. data/lib/chef/knife/core/text_formatter.rb +23 -37
  138. data/lib/chef/knife/core/ui.rb +15 -9
  139. data/lib/chef/knife/delete.rb +39 -0
  140. data/lib/chef/knife/diff.rb +46 -0
  141. data/lib/chef/knife/download.rb +50 -0
  142. data/lib/chef/knife/environment_show.rb +7 -0
  143. data/lib/chef/knife/exec.rb +5 -5
  144. data/lib/chef/knife/help_topics.rb +1 -1
  145. data/lib/chef/knife/index_rebuild.rb +91 -7
  146. data/lib/chef/knife/list.rb +109 -0
  147. data/lib/chef/knife/raw.rb +108 -0
  148. data/lib/chef/knife/search.rb +40 -22
  149. data/lib/chef/knife/show.rb +32 -0
  150. data/lib/chef/knife/ssh.rb +6 -2
  151. data/lib/chef/knife/upload.rb +50 -0
  152. data/lib/chef/mixin/checksum.rb +3 -3
  153. data/lib/chef/mixin/deep_merge.rb +55 -197
  154. data/lib/chef/mixin/language.rb +9 -222
  155. data/lib/chef/mixin/language_include_attribute.rb +6 -38
  156. data/lib/chef/mixin/language_include_recipe.rb +3 -35
  157. data/lib/chef/mixin/params_validate.rb +6 -19
  158. data/lib/chef/mixin/recipe_definition_dsl_core.rb +8 -61
  159. data/lib/chef/mixin/securable.rb +32 -7
  160. data/lib/chef/mixin/template.rb +40 -0
  161. data/lib/chef/mixins.rb +0 -4
  162. data/lib/chef/monkey_patches/net_http.rb +0 -34
  163. data/lib/chef/node.rb +133 -309
  164. data/lib/chef/node/attribute.rb +333 -473
  165. data/lib/chef/node/attribute_collections.rb +199 -0
  166. data/lib/chef/node/immutable_collections.rb +186 -0
  167. data/lib/chef/platform.rb +7 -22
  168. data/lib/chef/provider.rb +2 -49
  169. data/lib/chef/provider/breakpoint.rb +6 -6
  170. data/lib/chef/provider/cookbook_file.rb +5 -33
  171. data/lib/chef/provider/deploy.rb +2 -1
  172. data/lib/chef/provider/directory.rb +14 -17
  173. data/lib/chef/provider/file.rb +19 -52
  174. data/lib/chef/provider/group.rb +31 -51
  175. data/lib/chef/provider/group/dscl.rb +13 -53
  176. data/lib/chef/provider/group/gpasswd.rb +19 -14
  177. data/lib/chef/provider/group/groupadd.rb +1 -41
  178. data/lib/chef/provider/group/groupmod.rb +36 -46
  179. data/lib/chef/provider/group/pw.rb +16 -59
  180. data/lib/chef/provider/group/suse.rb +13 -16
  181. data/lib/chef/provider/group/usermod.rb +18 -40
  182. data/lib/chef/provider/group/windows.rb +6 -13
  183. data/lib/chef/provider/http_request.rb +25 -42
  184. data/lib/chef/provider/link.rb +2 -0
  185. data/lib/chef/provider/lwrp_base.rb +150 -0
  186. data/lib/chef/provider/package/portage.rb +4 -9
  187. data/lib/chef/provider/package/rpm.rb +2 -2
  188. data/lib/chef/provider/package/rubygems.rb +9 -41
  189. data/lib/chef/provider/package/yum.rb +12 -19
  190. data/lib/chef/provider/registry_key.rb +156 -0
  191. data/lib/chef/provider/remote_directory.rb +2 -0
  192. data/lib/chef/provider/remote_file.rb +21 -12
  193. data/lib/chef/provider/ruby_block.rb +5 -2
  194. data/lib/chef/provider/service.rb +15 -0
  195. data/lib/chef/provider/service/init.rb +9 -7
  196. data/lib/chef/provider/service/macosx.rb +15 -73
  197. data/lib/chef/provider/service/simple.rb +1 -1
  198. data/lib/chef/provider/service/solaris.rb +3 -3
  199. data/lib/chef/provider/template.rb +22 -25
  200. data/lib/chef/provider/template_finder.rb +61 -0
  201. data/lib/chef/provider/user.rb +0 -1
  202. data/lib/chef/provider/user/dscl.rb +175 -568
  203. data/lib/chef/provider/user/useradd.rb +30 -47
  204. data/lib/chef/providers.rb +3 -2
  205. data/lib/chef/recipe.rb +14 -8
  206. data/lib/chef/resource.rb +13 -154
  207. data/lib/chef/resource/group.rb +1 -11
  208. data/lib/chef/resource/http_request.rb +2 -1
  209. data/lib/chef/resource/lwrp_base.rb +127 -0
  210. data/lib/chef/resource/mount.rb +10 -11
  211. data/lib/chef/resource/registry_key.rb +86 -0
  212. data/lib/chef/resource/remote_directory.rb +6 -5
  213. data/lib/chef/resource/remote_file.rb +22 -31
  214. data/lib/chef/resource/ruby_block.rb +2 -2
  215. data/lib/chef/resource/service.rb +14 -0
  216. data/lib/chef/resource/user.rb +0 -18
  217. data/lib/chef/resource_collection.rb +25 -21
  218. data/lib/chef/resources.rb +2 -1
  219. data/lib/chef/rest.rb +50 -131
  220. data/lib/chef/rest/auth_credentials.rb +4 -20
  221. data/lib/chef/rest/rest_request.rb +2 -7
  222. data/lib/chef/role.rb +1 -97
  223. data/lib/chef/run_context.rb +108 -130
  224. data/lib/chef/run_context/cookbook_compiler.rb +280 -0
  225. data/lib/chef/run_list.rb +0 -2
  226. data/lib/chef/run_list/run_list_expansion.rb +0 -15
  227. data/lib/chef/run_lock.rb +90 -0
  228. data/lib/chef/runner.rb +28 -5
  229. data/lib/chef/sandbox.rb +15 -148
  230. data/lib/chef/scan_access_control.rb +2 -4
  231. data/lib/chef/shef/ext.rb +3 -575
  232. data/lib/chef/{shef.rb → shell.rb} +35 -40
  233. data/lib/chef/shell/ext.rb +593 -0
  234. data/lib/chef/{shef → shell}/model_wrapper.rb +3 -3
  235. data/lib/chef/{shef/shef_rest.rb → shell/shell_rest.rb} +4 -4
  236. data/lib/chef/{shef/shef_session.rb → shell/shell_session.rb} +17 -15
  237. data/lib/chef/shell_out.rb +7 -0
  238. data/lib/chef/util/windows/net_group.rb +1 -5
  239. data/lib/chef/version.rb +3 -3
  240. data/lib/chef/win32/api/process.rb +0 -1
  241. data/lib/chef/win32/handle.rb +1 -8
  242. data/lib/chef/win32/registry.rb +371 -0
  243. data/spec/data/big_json.json +1 -2
  244. data/spec/data/big_json_plus_one.json +1 -2
  245. data/spec/data/cookbooks/openldap/attributes/default.rb +10 -9
  246. data/spec/data/cookbooks/openldap/attributes/smokey.rb +1 -1
  247. data/spec/data/lwrp/providers/inline_compiler.rb +26 -0
  248. data/spec/data/nodes/default.rb +3 -3
  249. data/spec/data/nodes/test.example.com.rb +3 -3
  250. data/spec/data/nodes/test.rb +3 -3
  251. data/spec/data/partial_one.erb +1 -0
  252. data/spec/data/run_context/cookbooks/circular-dep1/attributes/default.rb +4 -0
  253. data/spec/data/run_context/cookbooks/circular-dep1/definitions/circular_dep1_res.rb +1 -0
  254. data/spec/data/run_context/cookbooks/circular-dep1/libraries/lib.rb +2 -0
  255. data/spec/data/run_context/cookbooks/circular-dep1/metadata.rb +2 -0
  256. data/spec/data/run_context/cookbooks/circular-dep1/providers/provider.rb +1 -0
  257. data/spec/data/{knife-home/.chef/plugins/knife/example_home_subcommand.rb → run_context/cookbooks/circular-dep1/recipes/default.rb} +0 -0
  258. data/spec/data/run_context/cookbooks/circular-dep1/resources/resource.rb +1 -0
  259. data/spec/data/run_context/cookbooks/circular-dep2/attributes/default.rb +3 -0
  260. data/spec/data/run_context/cookbooks/circular-dep2/definitions/circular_dep2_res.rb +1 -0
  261. data/spec/data/run_context/cookbooks/circular-dep2/libraries/lib.rb +2 -0
  262. data/spec/data/run_context/cookbooks/circular-dep2/metadata.rb +2 -0
  263. data/spec/data/run_context/cookbooks/circular-dep2/providers/provider.rb +1 -0
  264. data/spec/data/{lwrp_const_scoping/resources/conflict.rb → run_context/cookbooks/circular-dep2/recipes/default.rb} +0 -0
  265. data/spec/data/run_context/cookbooks/circular-dep2/resources/resource.rb +1 -0
  266. data/spec/data/run_context/cookbooks/dependency1/attributes/aa_first.rb +2 -0
  267. data/spec/data/run_context/cookbooks/dependency1/attributes/default.rb +2 -0
  268. data/spec/data/run_context/cookbooks/dependency1/attributes/zz_last.rb +3 -0
  269. data/spec/data/run_context/cookbooks/dependency1/definitions/dependency1_res.rb +1 -0
  270. data/spec/data/run_context/cookbooks/dependency1/libraries/lib.rb +2 -0
  271. data/spec/data/run_context/cookbooks/dependency1/providers/provider.rb +1 -0
  272. data/spec/data/run_context/cookbooks/dependency1/recipes/default.rb +0 -0
  273. data/spec/data/run_context/cookbooks/dependency1/resources/resource.rb +1 -0
  274. data/spec/data/run_context/cookbooks/dependency2/attributes/default.rb +3 -0
  275. data/spec/data/run_context/cookbooks/dependency2/definitions/dependency2_res.rb +1 -0
  276. data/spec/data/run_context/cookbooks/dependency2/libraries/lib.rb +2 -0
  277. data/spec/data/run_context/cookbooks/dependency2/providers/provider.rb +1 -0
  278. data/spec/data/run_context/cookbooks/dependency2/recipes/default.rb +0 -0
  279. data/spec/data/run_context/cookbooks/dependency2/resources/resource.rb +1 -0
  280. data/spec/data/run_context/cookbooks/no-default-attr/attributes/server.rb +3 -0
  281. data/spec/data/run_context/cookbooks/no-default-attr/definitions/no_default-attr_res.rb +1 -0
  282. data/spec/data/run_context/cookbooks/no-default-attr/providers/provider.rb +1 -0
  283. data/spec/data/run_context/cookbooks/no-default-attr/recipes/default.rb +0 -0
  284. data/spec/data/run_context/cookbooks/no-default-attr/resources/resource.rb +1 -0
  285. data/spec/data/run_context/cookbooks/test-with-circular-deps/attributes/default.rb +3 -0
  286. data/spec/data/run_context/cookbooks/test-with-circular-deps/definitions/test_with-circular-deps_res.rb +1 -0
  287. data/spec/data/run_context/cookbooks/test-with-circular-deps/libraries/lib.rb +2 -0
  288. data/spec/data/run_context/cookbooks/test-with-circular-deps/metadata.rb +2 -0
  289. data/spec/data/run_context/cookbooks/test-with-circular-deps/providers/provider.rb +1 -0
  290. data/spec/data/run_context/cookbooks/test-with-circular-deps/recipes/default.rb +0 -0
  291. data/spec/data/run_context/cookbooks/test-with-circular-deps/resources/resource.rb +1 -0
  292. data/spec/data/run_context/cookbooks/test-with-deps/attributes/default.rb +3 -0
  293. data/spec/data/run_context/cookbooks/test-with-deps/definitions/test_with-deps_res.rb +1 -0
  294. data/spec/data/run_context/cookbooks/test-with-deps/libraries/lib.rb +1 -0
  295. data/spec/data/run_context/cookbooks/test-with-deps/metadata.rb +3 -0
  296. data/spec/data/run_context/cookbooks/test-with-deps/providers/provider.rb +1 -0
  297. data/spec/data/run_context/cookbooks/test-with-deps/recipes/default.rb +0 -0
  298. data/spec/data/run_context/cookbooks/test-with-deps/recipes/server.rb +0 -0
  299. data/spec/data/run_context/cookbooks/test-with-deps/resources/resource.rb +1 -0
  300. data/spec/data/run_context/cookbooks/test/attributes/default.rb +0 -0
  301. data/spec/data/run_context/cookbooks/test/attributes/george.rb +1 -1
  302. data/spec/data/run_context/cookbooks/test/definitions/test_res.rb +1 -0
  303. data/spec/data/run_context/cookbooks/test/providers/provider.rb +1 -0
  304. data/spec/data/run_context/cookbooks/test/resources/resource.rb +1 -0
  305. data/spec/data/shef-config.rb +7 -0
  306. data/spec/functional/dsl/registry_helper_spec.rb +63 -0
  307. data/spec/functional/knife/cookbook_delete_spec.rb +1 -1
  308. data/spec/functional/knife/exec_spec.rb +2 -2
  309. data/spec/functional/knife/ssh_spec.rb +5 -1
  310. data/spec/functional/resource/cookbook_file_spec.rb +7 -19
  311. data/spec/functional/resource/directory_spec.rb +4 -0
  312. data/spec/functional/resource/file_spec.rb +56 -22
  313. data/spec/functional/resource/link_spec.rb +2 -0
  314. data/spec/functional/resource/registry_spec.rb +576 -0
  315. data/spec/functional/resource/remote_directory_spec.rb +142 -36
  316. data/spec/functional/resource/remote_file_spec.rb +18 -0
  317. data/spec/functional/resource/template_spec.rb +23 -2
  318. data/spec/functional/run_lock_spec.rb +106 -0
  319. data/spec/functional/shell_spec.rb +100 -0
  320. data/spec/functional/win32/registry_helper_spec.rb +632 -0
  321. data/spec/spec_helper.rb +5 -29
  322. data/spec/stress/win32/security_spec.rb +1 -1
  323. data/spec/support/chef_helpers.rb +0 -2
  324. data/spec/support/platform_helpers.rb +8 -15
  325. data/spec/support/shared/functional/directory_resource.rb +84 -22
  326. data/spec/support/shared/functional/file_resource.rb +169 -71
  327. data/spec/support/shared/functional/securable_resource.rb +143 -119
  328. data/spec/support/shared/functional/securable_resource_with_reporting.rb +375 -0
  329. data/spec/support/shared/unit/file_system_support.rb +110 -0
  330. data/spec/support/shared/unit/platform_introspector.rb +162 -0
  331. data/spec/unit/api_client/registration_spec.rb +175 -0
  332. data/spec/unit/api_client_spec.rb +78 -156
  333. data/spec/unit/application/apply.rb +84 -0
  334. data/spec/unit/application/client_spec.rb +1 -37
  335. data/spec/unit/application/knife_spec.rb +5 -0
  336. data/spec/unit/application_spec.rb +57 -2
  337. data/spec/unit/checksum/storage/filesystem_spec.rb +1 -1
  338. data/spec/unit/chef_fs/diff_spec.rb +328 -0
  339. data/spec/unit/chef_fs/file_pattern_spec.rb +526 -0
  340. data/spec/unit/chef_fs/file_system/chef_server_root_dir_spec.rb +237 -0
  341. data/spec/unit/chef_fs/file_system/cookbooks_dir_spec.rb +568 -0
  342. data/spec/unit/chef_fs/file_system/data_bags_dir_spec.rb +220 -0
  343. data/spec/unit/chef_fs/file_system_spec.rb +136 -0
  344. data/spec/unit/client_spec.rb +124 -33
  345. data/spec/unit/config_spec.rb +46 -13
  346. data/spec/unit/cookbook/synchronizer_spec.rb +1 -49
  347. data/spec/unit/cookbook/syntax_check_spec.rb +48 -109
  348. data/spec/unit/cookbook_loader_spec.rb +153 -91
  349. data/spec/unit/cookbook_manifest_spec.rb +81 -81
  350. data/spec/unit/cookbook_spec.rb +3 -20
  351. data/spec/unit/cookbook_version_spec.rb +23 -122
  352. data/spec/unit/daemon_spec.rb +3 -24
  353. data/spec/unit/data_bag_spec.rb +6 -4
  354. data/spec/unit/digester_spec.rb +50 -0
  355. data/spec/unit/dsl/data_query_spec.rb +66 -0
  356. data/spec/unit/dsl/platform_introspection_spec.rb +130 -0
  357. data/spec/unit/dsl/regsitry_helper_spec.rb +55 -0
  358. data/spec/unit/encrypted_data_bag_item_spec.rb +50 -105
  359. data/spec/unit/environment_spec.rb +0 -130
  360. data/spec/unit/exceptions_spec.rb +2 -3
  361. data/spec/unit/formatters/error_inspectors/resource_failure_inspector_spec.rb +3 -3
  362. data/spec/unit/json_compat_spec.rb +15 -7
  363. data/spec/unit/knife/bootstrap_spec.rb +2 -0
  364. data/spec/unit/knife/configure_spec.rb +20 -14
  365. data/spec/unit/knife/cookbook_metadata_spec.rb +11 -4
  366. data/spec/unit/knife/cookbook_test_spec.rb +1 -0
  367. data/spec/unit/knife/cookbook_upload_spec.rb +43 -8
  368. data/spec/unit/knife/core/bootstrap_context_spec.rb +1 -1
  369. data/spec/unit/knife/core/ui_spec.rb +156 -125
  370. data/spec/unit/knife/data_bag_create_spec.rb +9 -0
  371. data/spec/unit/knife/data_bag_edit_spec.rb +1 -4
  372. data/spec/unit/knife/data_bag_from_file_spec.rb +4 -6
  373. data/spec/unit/knife/data_bag_show_spec.rb +11 -4
  374. data/spec/unit/knife/index_rebuild_spec.rb +96 -33
  375. data/spec/unit/knife/knife_help.rb +7 -7
  376. data/spec/unit/knife/node_edit_spec.rb +6 -33
  377. data/spec/unit/knife/node_run_list_remove_spec.rb +2 -1
  378. data/spec/unit/knife/ssh_spec.rb +12 -15
  379. data/spec/unit/knife/status_spec.rb +2 -2
  380. data/spec/unit/knife_spec.rb +53 -0
  381. data/spec/unit/lwrp_spec.rb +59 -42
  382. data/spec/unit/mixin/checksum_spec.rb +2 -2
  383. data/spec/unit/mixin/deep_merge_spec.rb +101 -799
  384. data/spec/unit/mixin/enforce_ownership_and_permissions_spec.rb +6 -1
  385. data/spec/unit/mixin/params_validate_spec.rb +4 -37
  386. data/spec/unit/mixin/securable_spec.rb +5 -3
  387. data/spec/unit/mixin/template_spec.rb +119 -0
  388. data/spec/unit/node/attribute_spec.rb +195 -173
  389. data/spec/unit/node/immutable_collections_spec.rb +139 -0
  390. data/spec/unit/node_spec.rb +366 -370
  391. data/spec/unit/platform_spec.rb +9 -10
  392. data/spec/unit/provider/breakpoint_spec.rb +8 -8
  393. data/spec/unit/provider/cookbook_file_spec.rb +4 -8
  394. data/spec/unit/provider/directory_spec.rb +96 -64
  395. data/spec/unit/provider/env_spec.rb +2 -2
  396. data/spec/unit/provider/file_spec.rb +48 -39
  397. data/spec/unit/provider/group/dscl_spec.rb +0 -36
  398. data/spec/unit/provider/group/gpasswd_spec.rb +9 -16
  399. data/spec/unit/provider/group/groupadd_spec.rb +4 -3
  400. data/spec/unit/provider/group/groupmod_spec.rb +1 -0
  401. data/spec/unit/provider/group/pw_spec.rb +15 -12
  402. data/spec/unit/provider/group/usermod_spec.rb +6 -21
  403. data/spec/unit/provider/group/windows_spec.rb +8 -0
  404. data/spec/unit/provider/group_spec.rb +6 -28
  405. data/spec/unit/provider/http_request_spec.rb +28 -69
  406. data/spec/unit/provider/ifconfig_spec.rb +2 -2
  407. data/spec/unit/provider/ohai_spec.rb +4 -4
  408. data/spec/unit/provider/package/apt_spec.rb +0 -1
  409. data/spec/unit/provider/package/ips_spec.rb +0 -1
  410. data/spec/unit/provider/package/portage_spec.rb +0 -44
  411. data/spec/unit/provider/package/rpm_spec.rb +0 -12
  412. data/spec/unit/provider/package/rubygems_spec.rb +1 -44
  413. data/spec/unit/provider/package/yum_spec.rb +39 -36
  414. data/spec/unit/provider/package_spec.rb +7 -5
  415. data/spec/unit/provider/registry_key_spec.rb +269 -0
  416. data/spec/unit/provider/remote_directory_spec.rb +7 -3
  417. data/spec/unit/provider/remote_file_spec.rb +36 -0
  418. data/spec/unit/provider/route_spec.rb +4 -3
  419. data/spec/unit/provider/ruby_block_spec.rb +8 -0
  420. data/spec/unit/provider/service/arch_service_spec.rb +5 -5
  421. data/spec/unit/provider/service/debian_service_spec.rb +1 -1
  422. data/spec/unit/provider/service/freebsd_service_spec.rb +5 -5
  423. data/spec/unit/provider/service/init_service_spec.rb +27 -4
  424. data/spec/unit/provider/service/insserv_service_spec.rb +1 -1
  425. data/spec/unit/provider/service/invokercd_service_spec.rb +4 -4
  426. data/spec/unit/provider/service/macosx_spec.rb +11 -66
  427. data/spec/unit/provider/service/redhat_spec.rb +1 -1
  428. data/spec/unit/provider/service/simple_service_spec.rb +3 -3
  429. data/spec/unit/provider/service/upstart_service_spec.rb +9 -9
  430. data/spec/unit/provider/subversion_spec.rb +1 -1
  431. data/spec/unit/provider/template_spec.rb +35 -11
  432. data/spec/unit/provider/user/dscl_spec.rb +285 -681
  433. data/spec/unit/provider/user/useradd_spec.rb +1 -22
  434. data/spec/unit/provider/user_spec.rb +1 -1
  435. data/spec/unit/recipe_spec.rb +10 -8
  436. data/spec/unit/registry_helper_spec.rb +374 -0
  437. data/spec/unit/resource/mount_spec.rb +0 -11
  438. data/spec/unit/resource/registry_key_spec.rb +171 -0
  439. data/spec/unit/resource/remote_file_spec.rb +21 -23
  440. data/spec/unit/resource/ruby_block_spec.rb +7 -3
  441. data/spec/unit/resource/service_spec.rb +11 -0
  442. data/spec/unit/resource_spec.rb +4 -19
  443. data/spec/unit/rest/auth_credentials_spec.rb +2 -19
  444. data/spec/unit/rest_spec.rb +130 -284
  445. data/spec/unit/run_context/cookbook_compiler_spec.rb +181 -0
  446. data/spec/unit/run_context_spec.rb +18 -4
  447. data/spec/unit/run_list_spec.rb +0 -209
  448. data/spec/unit/run_lock_spec.rb +37 -0
  449. data/spec/unit/runner_spec.rb +101 -2
  450. data/spec/unit/scan_access_control_spec.rb +4 -4
  451. data/spec/unit/{shef → shell}/model_wrapper_spec.rb +5 -5
  452. data/spec/unit/{shef/shef_ext_spec.rb → shell/shell_ext_spec.rb} +21 -21
  453. data/spec/unit/{shef/shef_session_spec.rb → shell/shell_session_spec.rb} +14 -69
  454. data/spec/unit/shell_out_spec.rb +18 -0
  455. data/spec/unit/{shef_spec.rb → shell_spec.rb} +20 -20
  456. metadata +275 -234
  457. checksums.yaml +0 -15
  458. data/README.rdoc +0 -177
  459. data/distro/common/html/knife-recipe.1.html +0 -92
  460. data/lib/chef/certificate.rb +0 -161
  461. data/lib/chef/checksum.rb +0 -167
  462. data/lib/chef/checksum_cache.rb +0 -190
  463. data/lib/chef/cookbook_version_selector.rb +0 -168
  464. data/lib/chef/couchdb.rb +0 -246
  465. data/lib/chef/index_queue/amqp_client.rb +0 -116
  466. data/lib/chef/index_queue/consumer.rb +0 -76
  467. data/lib/chef/index_queue/indexable.rb +0 -109
  468. data/lib/chef/knife/bootstrap/ubuntu12.10-gems.erb +0 -60
  469. data/lib/chef/monkey_patches/moneta.rb +0 -50
  470. data/lib/chef/monkey_patches/uri.rb +0 -70
  471. data/lib/chef/openid_registration.rb +0 -187
  472. data/lib/chef/provider/user/solaris.rb +0 -90
  473. data/lib/chef/solr_query.rb +0 -187
  474. data/lib/chef/solr_query/lucene.treetop +0 -150
  475. data/lib/chef/solr_query/lucene_nodes.rb +0 -285
  476. data/lib/chef/solr_query/query_transform.rb +0 -65
  477. data/lib/chef/solr_query/solr_http_request.rb +0 -132
  478. data/lib/chef/webui_user.rb +0 -231
  479. data/spec/data/cookbooks/openldap/files/default/.dotfile +0 -1
  480. data/spec/data/cookbooks/openldap/files/default/.ssh/id_rsa +0 -1
  481. data/spec/data/cookbooks/openldap/files/default/remotedir/.a_dotdir/.a_dotfile_in_a_dotdir +0 -1
  482. data/spec/data/cookbooks/openldap/files/default/remotedir/remotesubdir/.a_dotfile +0 -1
  483. data/spec/data/mac_users/10.7-8.plist.xml +0 -559
  484. data/spec/data/mac_users/10.7-8.shadow.xml +0 -11
  485. data/spec/data/mac_users/10.7.plist.xml +0 -559
  486. data/spec/data/mac_users/10.7.shadow.xml +0 -11
  487. data/spec/data/mac_users/10.8.plist.xml +0 -559
  488. data/spec/data/mac_users/10.8.shadow.xml +0 -21
  489. data/spec/data/mac_users/10.9.plist.xml +0 -560
  490. data/spec/data/mac_users/10.9.shadow.xml +0 -21
  491. data/spec/functional/resource/base.rb +0 -40
  492. data/spec/functional/resource/group_spec.rb +0 -343
  493. data/spec/functional/resource/user/dscl_spec.rb +0 -199
  494. data/spec/unit/certificate_spec.rb +0 -76
  495. data/spec/unit/checksum_cache_spec.rb +0 -209
  496. data/spec/unit/checksum_spec.rb +0 -94
  497. data/spec/unit/couchdb_spec.rb +0 -274
  498. data/spec/unit/index_queue_spec.rb +0 -391
  499. data/spec/unit/mixin/language_spec.rb +0 -305
  500. data/spec/unit/openid_registration_spec.rb +0 -153
  501. data/spec/unit/provider/user/solaris_spec.rb +0 -414
  502. data/spec/unit/provider/whyrun_safe_ruby_block_spec.rb +0 -47
  503. data/spec/unit/solr_query/query_transform_spec.rb +0 -454
  504. data/spec/unit/solr_query/solr_http_request_spec.rb +0 -244
  505. data/spec/unit/solr_query_spec.rb +0 -203
  506. data/spec/unit/webui_user_spec.rb +0 -238
@@ -25,14 +25,14 @@ require 'chef/version'
25
25
  require 'chef/client'
26
26
  require 'chef/config'
27
27
 
28
- require 'chef/shef/shef_session'
29
- require 'chef/shef/ext'
28
+ require 'chef/shell/shell_session'
29
+ require 'chef/shell/ext'
30
30
  require 'chef/json_compat'
31
31
 
32
- # = Shef
33
- # Shef is Chef in an IRB session. Shef can interact with a Chef server via the
32
+ # = Shell
33
+ # Shell is Chef in an IRB session. Shell can interact with a Chef server via the
34
34
  # REST API, and run and debug recipes interactively.
35
- module Shef
35
+ module Shell
36
36
  LEADERS = Hash.new("")
37
37
  LEADERS[Chef::Recipe] = ":recipe"
38
38
  LEADERS[Chef::Node] = ":attributes"
@@ -44,7 +44,7 @@ module Shef
44
44
  attr_writer :editor
45
45
  end
46
46
 
47
- # Start the irb REPL with shef's customizations
47
+ # Start the irb REPL with chef-shell's customizations
48
48
  def self.start
49
49
  setup_logger
50
50
  # FUGLY HACK: irb gives us no other choice.
@@ -52,7 +52,6 @@ module Shef
52
52
  IRB::ExtendCommandBundle.instance_variable_get(:@ALIASES).delete(irb_help)
53
53
 
54
54
  parse_opts
55
- Chef::Config[:shell_config] = options.config
56
55
 
57
56
  # HACK: this duplicates the functions of IRB.start, but we have to do it
58
57
  # to get access to the main object before irb starts.
@@ -77,12 +76,14 @@ module Shef
77
76
 
78
77
  def self.setup_logger
79
78
  Chef::Config[:log_level] ||= :warn
79
+ # If log_level is auto, change it to warn
80
+ Chef::Config[:log_level] = :warn if Chef::Config[:log_level] == :auto
80
81
  Chef::Log.init(STDERR)
81
82
  Mixlib::Authentication::Log.logger = Ohai::Log.logger = Chef::Log.logger
82
83
  Chef::Log.level = Chef::Config[:log_level] || :warn
83
84
  end
84
85
 
85
- # Shef assumes it's running whenever it is defined
86
+ # Shell assumes it's running whenever it is defined
86
87
  def self.running?
87
88
  true
88
89
  end
@@ -98,7 +99,7 @@ module Shef
98
99
  end
99
100
 
100
101
  def self.configure_irb
101
- irb_conf[:HISTORY_FILE] = "~/.shef_history"
102
+ irb_conf[:HISTORY_FILE] = "~/.chef/chef_shell_history"
102
103
  irb_conf[:SAVE_HISTORY] = 1000
103
104
 
104
105
  irb_conf[:IRB_RC] = lambda do |conf|
@@ -113,7 +114,7 @@ module Shef
113
114
  end
114
115
 
115
116
  def self.leader(main_object)
116
- env_string = Shef.env ? " (#{Shef.env})" : ""
117
+ env_string = Shell.env ? " (#{Shell.env})" : ""
117
118
  LEADERS[main_object.class] + env_string
118
119
  end
119
120
 
@@ -144,7 +145,7 @@ module Shef
144
145
  end
145
146
 
146
147
  def self.greeting
147
- " #{Etc.getlogin}@#{Shef.session.node.fqdn}"
148
+ " #{Etc.getlogin}@#{Shell.session.node.fqdn}"
148
149
  rescue NameError, ArgumentError
149
150
  ""
150
151
  end
@@ -179,10 +180,10 @@ module Shef
179
180
  end
180
181
 
181
182
  def self.client_type
182
- type = Shef::StandAloneSession
183
- type = Shef::SoloSession if Chef::Config[:shef_solo]
184
- type = Shef::ClientSession if Chef::Config[:client]
185
- type = Shef::DoppelGangerSession if Chef::Config[:doppelganger]
183
+ type = Shell::StandAloneSession
184
+ type = Shell::SoloSession if Chef::Config[:shell_solo]
185
+ type = Shell::ClientSession if Chef::Config[:client]
186
+ type = Shell::DoppelGangerSession if Chef::Config[:doppelganger]
186
187
  type
187
188
  end
188
189
 
@@ -203,14 +204,14 @@ module Shef
203
204
  @footer
204
205
  end
205
206
 
206
- banner("shef #{Chef::VERSION}\n\nUsage: shef [NAMED_CONF] (OPTIONS)")
207
+ banner("chef-shell #{Chef::VERSION}\n\nUsage: chef-shell [NAMED_CONF] (OPTIONS)")
207
208
 
208
209
  footer(<<-FOOTER)
209
- When no CONFIG is specified, shef attempts to load a default configuration file:
210
- * If a NAMED_CONF is given, shef will load ~/.chef/NAMED_CONF/shef.rb
211
- * If no NAMED_CONF is given shef will load ~/.chef/shef.rb if it exists
212
- * Shef falls back to loading /etc/chef/client.rb or /etc/chef/solo.rb if -z or
213
- -s options are given and no shef.rb can be found.
210
+ When no CONFIG is specified, chef-shell attempts to load a default configuration file:
211
+ * If a NAMED_CONF is given, chef-shell will load ~/.chef/NAMED_CONF/chef_shell.rb
212
+ * If no NAMED_CONF is given chef-shell will load ~/.chef/chef_shell.rb if it exists
213
+ * chef-shell falls back to loading /etc/chef/client.rb or /etc/chef/solo.rb if -z or
214
+ -s options are given and no chef_shell.rb can be found.
214
215
  FOOTER
215
216
 
216
217
  option :config_file,
@@ -230,26 +231,26 @@ FOOTER
230
231
  :short => "-l LOG_LEVEL",
231
232
  :long => '--log-level LOG_LEVEL',
232
233
  :description => "Set the logging level",
233
- :proc => proc { |level| Chef::Log.level = level.to_sym }
234
+ :proc => proc { |level| Chef::Config.log_level = level.to_sym; Shell.setup_logger }
234
235
 
235
236
  option :standalone,
236
237
  :short => "-a",
237
238
  :long => "--standalone",
238
- :description => "standalone shef session",
239
+ :description => "standalone session",
239
240
  :default => true,
240
241
  :boolean => true
241
242
 
242
- option :shef_solo,
243
+ option :shell_solo,
243
244
  :short => "-s",
244
245
  :long => "--solo",
245
- :description => "chef-solo shef session",
246
+ :description => "chef-solo session",
246
247
  :boolean => true,
247
248
  :proc => proc {Chef::Config[:solo] = true}
248
249
 
249
250
  option :client,
250
251
  :short => "-z",
251
252
  :long => "--client",
252
- :description => "chef-client shef session",
253
+ :description => "chef-client session",
253
254
  :boolean => true
254
255
 
255
256
  option :json_attribs,
@@ -272,12 +273,6 @@ FOOTER
272
273
  :proc => lambda {|v| puts "Chef: #{::Chef::VERSION}"},
273
274
  :exit => 0
274
275
 
275
- option :override_runlist,
276
- :short => "-o RunlistItem,RunlistItem...",
277
- :long => "--override-runlist RunlistItem,RunlistItem...",
278
- :description => "Replace current run list with specified items",
279
- :proc => lambda { |items| items.split(',').map { |item| Chef::RunList::RunListItem.new(item) }}
280
-
281
276
  def self.print_help
282
277
  instance = new
283
278
  instance.parse_options([])
@@ -298,8 +293,8 @@ FOOTER
298
293
  # We have to nuke ARGV to make sure irb's option parser never sees it.
299
294
  # otherwise, IRB complains about command line switches it doesn't recognize.
300
295
  ARGV.clear
301
- config[:config_file] = config_file_for_shef_mode(environment)
302
- config_msg = config[:config_file] || "none (standalone shef session)"
296
+ config[:config_file] = config_file_for_shell_mode(environment)
297
+ config_msg = config[:config_file] || "none (standalone session)"
303
298
  puts "loading configuration: #{config_msg}"
304
299
  Chef::Config.from_file(config[:config_file]) if !config[:config_file].nil? && File.exists?(config[:config_file]) && File.readable?(config[:config_file])
305
300
  Chef::Config.merge!(config)
@@ -307,19 +302,19 @@ FOOTER
307
302
 
308
303
  private
309
304
 
310
- def config_file_for_shef_mode(environment)
305
+ def config_file_for_shell_mode(environment)
311
306
  if config[:config_file]
312
307
  config[:config_file]
313
308
  elsif environment && ENV['HOME']
314
- Shef.env = environment
315
- config_file_to_try = ::File.join(ENV['HOME'], '.chef', environment, 'shef.rb')
309
+ Shell.env = environment
310
+ config_file_to_try = ::File.join(ENV['HOME'], '.chef', environment, 'chef_shell.rb')
316
311
  unless ::File.exist?(config_file_to_try)
317
- puts "could not find shef config for environment #{environment} at #{config_file_to_try}"
312
+ puts "could not find chef-shell config for environment #{environment} at #{config_file_to_try}"
318
313
  exit 1
319
314
  end
320
315
  config_file_to_try
321
- elsif ENV['HOME'] && ::File.exist?(File.join(ENV['HOME'], '.chef', 'shef.rb'))
322
- File.join(ENV['HOME'], '.chef', 'shef.rb')
316
+ elsif ENV['HOME'] && ::File.exist?(File.join(ENV['HOME'], '.chef', 'chef_shell.rb'))
317
+ File.join(ENV['HOME'], '.chef', 'chef_shell.rb')
323
318
  elsif config[:solo]
324
319
  "/etc/chef/solo.rb"
325
320
  elsif config[:client]
@@ -0,0 +1,593 @@
1
+ #--
2
+ # Author:: Daniel DeLeo (<dan@kallistec.com>)
3
+ # Copyright:: Copyright (c) 2009 Daniel DeLeo
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 'tempfile'
20
+ require 'chef/recipe'
21
+ require 'fileutils'
22
+ require 'chef/dsl/platform_introspection'
23
+ require 'chef/version'
24
+ require 'chef/shell/shell_session'
25
+ require 'chef/shell/model_wrapper'
26
+ require 'chef/shell/shell_rest'
27
+ require 'chef/json_compat'
28
+
29
+ module Shell
30
+ module Extensions
31
+
32
+ Help = Struct.new(:cmd, :desc, :explanation)
33
+
34
+ # Extensions to be included in every 'main' object in chef-shell.
35
+ # These objects are extended with this module.
36
+ module ObjectCoreExtensions
37
+
38
+ def ensure_session_select_defined
39
+ # irb breaks if you prematurely define IRB::JobMangager
40
+ # so these methods need to be defined at the latest possible time.
41
+ unless jobs.respond_to?(:select_session_by_context)
42
+ def jobs.select_session_by_context(&block)
43
+ @jobs.select { |job| block.call(job[1].context.main)}
44
+ end
45
+ end
46
+
47
+ unless jobs.respond_to?(:session_select)
48
+ def jobs.select_shell_session(target_context)
49
+ session = if target_context.kind_of?(Class)
50
+ select_session_by_context { |main| main.kind_of?(target_context) }
51
+ else
52
+ select_session_by_context { |main| main.equal?(target_context) }
53
+ end
54
+ Array(session.first)[1]
55
+ end
56
+ end
57
+ end
58
+
59
+ def find_or_create_session_for(context_obj)
60
+ ensure_session_select_defined
61
+ if subsession = jobs.select_shell_session(context_obj)
62
+ jobs.switch(subsession)
63
+ else
64
+ irb(context_obj)
65
+ end
66
+ end
67
+
68
+ def help_banner
69
+ banner = []
70
+ banner << ""
71
+ banner << "chef-shell Help"
72
+ banner << "".ljust(80, "=")
73
+ banner << "| " + "Command".ljust(25) + "| " + "Description"
74
+ banner << "".ljust(80, "=")
75
+
76
+ self.all_help_descriptions.each do |help_text|
77
+ banner << "| " + help_text.cmd.ljust(25) + "| " + help_text.desc
78
+ end
79
+ banner << "".ljust(80, "=")
80
+ banner << "\n"
81
+ banner << "Use help(:command) to get detailed help with individual commands"
82
+ banner << "\n"
83
+ banner.join("\n")
84
+ end
85
+
86
+ def explain_command(method_name)
87
+ help = self.all_help_descriptions.find { |h| h.cmd.to_s == method_name.to_s }
88
+ if help
89
+ puts ""
90
+ puts "Command: #{method_name}"
91
+ puts "".ljust(80, "=")
92
+ puts help.explanation || help.desc
93
+ puts "".ljust(80, "=")
94
+ puts ""
95
+ else
96
+ puts ""
97
+ puts "command #{method_name} not found or no help available"
98
+ puts ""
99
+ end
100
+ end
101
+
102
+ # helpfully returns +:on+ so we can have sugary syntax like `tracing on'
103
+ def on
104
+ :on
105
+ end
106
+
107
+ # returns +:off+ so you can just do `tracing off'
108
+ def off
109
+ :off
110
+ end
111
+
112
+ def help_descriptions
113
+ @help_descriptions ||= []
114
+ end
115
+
116
+ def all_help_descriptions
117
+ help_descriptions
118
+ end
119
+
120
+ def desc(help_text)
121
+ @desc = help_text
122
+ end
123
+
124
+ def explain(explain_text)
125
+ @explain = explain_text
126
+ end
127
+
128
+ def subcommands(subcommand_help={})
129
+ @subcommand_help = subcommand_help
130
+ end
131
+
132
+ def singleton_method_added(mname)
133
+ if @desc
134
+ help_descriptions << Help.new(mname.to_s, @desc.to_s, @explain)
135
+ @desc, @explain = nil, nil
136
+ end
137
+ if @subcommand_help
138
+ @subcommand_help.each do |subcommand, text|
139
+ help_descriptions << Help.new("#{mname}.#{subcommand}", text.to_s, nil)
140
+ end
141
+ end
142
+ @subcommand_help = {}
143
+ end
144
+
145
+ end
146
+
147
+ module String
148
+ def on_off_to_bool
149
+ case self
150
+ when "on"
151
+ true
152
+ when "off"
153
+ false
154
+ else
155
+ self
156
+ end
157
+ end
158
+ end
159
+
160
+ module Symbol
161
+ def on_off_to_bool
162
+ self.to_s.on_off_to_bool
163
+ end
164
+ end
165
+
166
+ module TrueClass
167
+ def to_on_off_str
168
+ "on"
169
+ end
170
+
171
+ def on_off_to_bool
172
+ self
173
+ end
174
+ end
175
+
176
+ module FalseClass
177
+ def to_on_off_str
178
+ "off"
179
+ end
180
+
181
+ def on_off_to_bool
182
+ self
183
+ end
184
+ end
185
+
186
+ # Methods that have associated help text need to be dynamically added
187
+ # to the main irb objects, so we define them in a proc and later
188
+ # instance_eval the proc in the object.
189
+ ObjectUIExtensions = Proc.new do
190
+ extend Shell::Extensions::ObjectCoreExtensions
191
+
192
+ desc "prints this help message"
193
+ explain(<<-E)
194
+ ## SUMMARY ##
195
+ When called with no argument, +help+ prints a table of all
196
+ chef-shell commands. When called with an argument COMMAND, +help+
197
+ prints a detailed explanation of the command if available, or the
198
+ description if no explanation is available.
199
+ E
200
+ def help(commmand=nil)
201
+ if commmand
202
+ explain_command(commmand)
203
+ else
204
+ puts help_banner
205
+ end
206
+ :ucanhaz_halp
207
+ end
208
+ alias :halp :help
209
+
210
+ desc "prints information about chef"
211
+ def version
212
+ puts "This is the chef-shell.\n" +
213
+ " Chef Version: #{::Chef::VERSION}\n" +
214
+ " http://www.opscode.com/chef\n" +
215
+ " http://wiki.opscode.com/display/chef/Home"
216
+ :ucanhaz_automation
217
+ end
218
+ alias :shell :version
219
+
220
+ desc "switch to recipe mode"
221
+ def recipe_mode
222
+ find_or_create_session_for Shell.session.recipe
223
+ :recipe
224
+ end
225
+
226
+ desc "switch to attributes mode"
227
+ def attributes_mode
228
+ find_or_create_session_for Shell.session.node
229
+ :attributes
230
+ end
231
+
232
+ desc "run chef using the current recipe"
233
+ def run_chef
234
+ Chef::Log.level = :debug
235
+ session = Shell.session
236
+ runrun = Chef::Runner.new(session.run_context).converge
237
+ Chef::Log.level = :info
238
+ runrun
239
+ end
240
+
241
+ desc "returns an object to control a paused chef run"
242
+ subcommands :resume => "resume the chef run",
243
+ :step => "run only the next resource",
244
+ :skip_back => "move back in the run list",
245
+ :skip_forward => "move forward in the run list"
246
+ def chef_run
247
+ Shell.session.resource_collection.iterator
248
+ end
249
+
250
+ desc "resets the current recipe"
251
+ def reset
252
+ Shell.session.reset!
253
+ end
254
+
255
+ desc "assume the identity of another node."
256
+ def become_node(node_name)
257
+ Shell::DoppelGangerSession.instance.assume_identity(node_name)
258
+ :doppelganger
259
+ end
260
+ alias :doppelganger :become_node
261
+
262
+ desc "turns printout of return values on or off"
263
+ def echo(on_or_off)
264
+ conf.echo = on_or_off.on_off_to_bool
265
+ end
266
+
267
+ desc "says if echo is on or off"
268
+ def echo?
269
+ puts "echo is #{conf.echo.to_on_off_str}"
270
+ end
271
+
272
+ desc "turns on or off tracing of execution. *verbose*"
273
+ def tracing(on_or_off)
274
+ conf.use_tracer = on_or_off.on_off_to_bool
275
+ tracing?
276
+ end
277
+ alias :trace :tracing
278
+
279
+ desc "says if tracing is on or off"
280
+ def tracing?
281
+ puts "tracing is #{conf.use_tracer.to_on_off_str}"
282
+ end
283
+ alias :trace? :tracing?
284
+
285
+ desc "simple ls style command"
286
+ def ls(directory)
287
+ Dir.entries(directory)
288
+ end
289
+ end
290
+
291
+ MainContextExtensions = Proc.new do
292
+ desc "returns the current node (i.e., this host)"
293
+ def node
294
+ Shell.session.node
295
+ end
296
+
297
+ desc "pretty print the node's attributes"
298
+ def ohai(key=nil)
299
+ pp(key ? node.attribute[key] : node.attribute)
300
+ end
301
+ end
302
+
303
+ RESTApiExtensions = Proc.new do
304
+ desc "edit an object in your EDITOR"
305
+ explain(<<-E)
306
+ ## SUMMARY ##
307
+ +edit(object)+ allows you to edit any object that can be converted to JSON.
308
+ When finished editing, this method will return the edited object:
309
+
310
+ new_node = edit(existing_node)
311
+
312
+ ## EDITOR SELECTION ##
313
+ chef-shell looks for an editor using the following logic
314
+ 1. Looks for an EDITOR set by Shell.editor = "EDITOR"
315
+ 2. Looks for an EDITOR configured in your chef-shell config file
316
+ 3. Uses the value of the EDITOR environment variable
317
+ E
318
+ def edit(object)
319
+ unless Shell.editor
320
+ puts "Please set your editor with Shell.editor = \"vim|emacs|mate|ed\""
321
+ return :failburger
322
+ end
323
+
324
+ filename = "chef-shell-edit-#{object.class.name}-"
325
+ if object.respond_to?(:name)
326
+ filename += object.name
327
+ elsif object.respond_to?(:id)
328
+ filename += object.id
329
+ end
330
+
331
+ edited_data = Tempfile.open([filename, ".js"]) do |tempfile|
332
+ tempfile.sync = true
333
+ tempfile.puts Chef::JSONCompat.to_json(object)
334
+ system("#{Shell.editor.to_s} #{tempfile.path}")
335
+ tempfile.rewind
336
+ tempfile.read
337
+ end
338
+
339
+ Chef::JSONCompat.from_json(edited_data)
340
+ end
341
+
342
+ desc "Find and edit API clients"
343
+ explain(<<-E)
344
+ ## SUMMARY ##
345
+ +clients+ allows you to query you chef server for information about your api
346
+ clients.
347
+
348
+ ## LIST ALL CLIENTS ##
349
+ To see all clients on the system, use
350
+
351
+ clients.all #=> [<Chef::ApiClient...>, ...]
352
+
353
+ If the output from all is too verbose, or you're only interested in a specific
354
+ value from each of the objects, you can give a code block to +all+:
355
+
356
+ clients.all { |client| client.name } #=> [CLIENT1_NAME, CLIENT2_NAME, ...]
357
+
358
+ ## SHOW ONE CLIENT ##
359
+ To see a specific client, use
360
+
361
+ clients.show(CLIENT_NAME)
362
+
363
+ ## SEARCH FOR CLIENTS ##
364
+ You can also search for clients using +find+ or +search+. You can use the
365
+ familiar string search syntax:
366
+
367
+ clients.search("KEY:VALUE")
368
+
369
+ Just as the +all+ subcommand, the +search+ subcommand can use a code block to
370
+ filter or transform the information returned from the search:
371
+
372
+ clients.search("KEY:VALUE") { |c| c.name }
373
+
374
+ You can also use a Hash based syntax, multiple search conditions will be
375
+ joined with AND.
376
+
377
+ clients.find :KEY => :VALUE, :KEY2 => :VALUE2, ...
378
+
379
+ ## BULK-EDIT CLIENTS ##
380
+ **BE CAREFUL, THIS IS DESTRUCTIVE**
381
+ You can bulk edit API Clients using the +transform+ subcommand, which requires
382
+ a code block. Each client will be saved after the code block is run. If the
383
+ code block returns +nil+ or +false+, that client will be skipped:
384
+
385
+ clients.transform("*:*") do |client|
386
+ if client.name =~ /borat/i
387
+ client.admin(false)
388
+ true
389
+ else
390
+ nil
391
+ end
392
+ end
393
+
394
+ This will strip the admin privileges from any client named after borat.
395
+ E
396
+ subcommands :all => "list all api clients",
397
+ :show => "load an api client by name",
398
+ :search => "search for API clients",
399
+ :transform => "edit all api clients via a code block and save them"
400
+ def clients
401
+ @clients ||= Shell::ModelWrapper.new(Chef::ApiClient, :client)
402
+ end
403
+
404
+ desc "Find and edit cookbooks"
405
+ subcommands :all => "list all cookbooks",
406
+ :show => "load a cookbook by name",
407
+ :transform => "edit all cookbooks via a code block and save them"
408
+ def cookbooks
409
+ @cookbooks ||= Shell::ModelWrapper.new(Chef::CookbookVersion)
410
+ end
411
+
412
+ desc "Find and edit nodes via the API"
413
+ explain(<<-E)
414
+ ## SUMMARY ##
415
+ +nodes+ Allows you to query your chef server for information about your nodes.
416
+
417
+ ## LIST ALL NODES ##
418
+ You can list all nodes using +all+ or +list+
419
+
420
+ nodes.all #=> [<Chef::Node...>, <Chef::Node...>, ...]
421
+
422
+ To limit the information returned for each node, pass a code block to the +all+
423
+ subcommand:
424
+
425
+ nodes.all { |node| node.name } #=> [NODE1_NAME, NODE2_NAME, ...]
426
+
427
+ ## SHOW ONE NODE ##
428
+ You can show the data for a single node using the +show+ subcommand:
429
+
430
+ nodes.show("NODE_NAME") => <Chef::Node @name="NODE_NAME" ...>
431
+
432
+ ## SEARCH FOR NODES ##
433
+ You can search for nodes using the +search+ or +find+ subcommands:
434
+
435
+ nodes.find(:name => "app*") #=> [<Chef::Node @name="app1.example.com" ...>, ...]
436
+
437
+ Similarly to +all+, you can pass a code block to limit or transform the
438
+ information returned:
439
+
440
+ nodes.find(:name => "app#") { |node| node.ec2 }
441
+
442
+ ## BULK EDIT NODES ##
443
+ **BE CAREFUL, THIS OPERATION IS DESTRUCTIVE**
444
+
445
+ Bulk edit nodes by passing a code block to the +transform+ or +bulk_edit+
446
+ subcommand. The block will be applied to each matching node, and then the node
447
+ will be saved. If the block returns +nil+ or +false+, that node will be
448
+ skipped.
449
+
450
+ nodes.transform do |node|
451
+ if node.fqdn =~ /.*\\.preprod\\.example\\.com/
452
+ node.set[:environment] = "preprod"
453
+ end
454
+ end
455
+
456
+ This will assign the attribute to every node with a FQDN matching the regex.
457
+ E
458
+ subcommands :all => "list all nodes",
459
+ :show => "load a node by name",
460
+ :search => "search for nodes",
461
+ :transform => "edit all nodes via a code block and save them"
462
+ def nodes
463
+ @nodes ||= Shell::ModelWrapper.new(Chef::Node)
464
+ end
465
+
466
+ desc "Find and edit roles via the API"
467
+ explain(<<-E)
468
+ ## SUMMARY ##
469
+ +roles+ allows you to query and edit roles on your Chef server.
470
+
471
+ ## SUBCOMMANDS ##
472
+ * all (list)
473
+ * show (load)
474
+ * search (find)
475
+ * transform (bulk_edit)
476
+
477
+ ## SEE ALSO ##
478
+ See the help for +nodes+ for more information about the subcommands.
479
+ E
480
+ subcommands :all => "list all roles",
481
+ :show => "load a role by name",
482
+ :search => "search for roles",
483
+ :transform => "edit all roles via a code block and save them"
484
+ def roles
485
+ @roles ||= Shell::ModelWrapper.new(Chef::Role)
486
+ end
487
+
488
+ desc "Find and edit +databag_name+ via the api"
489
+ explain(<<-E)
490
+ ## SUMMARY ##
491
+ +databags(DATABAG_NAME)+ allows you to query and edit data bag items on your
492
+ Chef server. Unlike other commands for working with data on the server,
493
+ +databags+ requires the databag name as an argument, for example:
494
+ databags(:users).all
495
+
496
+ ## SUBCOMMANDS ##
497
+ * all (list)
498
+ * show (load)
499
+ * search (find)
500
+ * transform (bulk_edit)
501
+
502
+ ## SEE ALSO ##
503
+ See the help for +nodes+ for more information about the subcommands.
504
+
505
+ E
506
+ subcommands :all => "list all items in the data bag",
507
+ :show => "load a data bag item by id",
508
+ :search => "search for items in the data bag",
509
+ :transform => "edit all items via a code block and save them"
510
+ def databags(databag_name)
511
+ @named_databags_wrappers ||= {}
512
+ @named_databags_wrappers[databag_name] ||= Shell::NamedDataBagWrapper.new(databag_name)
513
+ end
514
+
515
+ desc "Find and edit environments via the API"
516
+ explain(<<-E)
517
+ ## SUMMARY ##
518
+ +environments+ allows you to query and edit environments on your Chef server.
519
+
520
+ ## SUBCOMMANDS ##
521
+ * all (list)
522
+ * show (load)
523
+ * search (find)
524
+ * transform (bulk_edit)
525
+
526
+ ## SEE ALSO ##
527
+ See the help for +nodes+ for more information about the subcommands.
528
+ E
529
+ subcommands :all => "list all environments",
530
+ :show => "load an environment by name",
531
+ :search => "search for environments",
532
+ :transform => "edit all environments via a code block and save them"
533
+ def environments
534
+ @environments ||= Shell::ModelWrapper.new(Chef::Environment)
535
+ end
536
+
537
+ desc "A REST Client configured to authenticate with the API"
538
+ def api
539
+ @rest = Shell::ShellREST.new(Chef::Config[:chef_server_url])
540
+ end
541
+
542
+ end
543
+
544
+ RecipeUIExtensions = Proc.new do
545
+ alias :original_resources :resources
546
+
547
+ desc "list all the resources on the current recipe"
548
+ def resources(*args)
549
+ if args.empty?
550
+ pp run_context.resource_collection.instance_variable_get(:@resources_by_name).keys
551
+ else
552
+ pp resources = original_resources(*args)
553
+ resources
554
+ end
555
+ end
556
+ end
557
+
558
+ def self.extend_context_object(obj)
559
+ obj.instance_eval(&ObjectUIExtensions)
560
+ obj.instance_eval(&MainContextExtensions)
561
+ obj.instance_eval(&RESTApiExtensions)
562
+ obj.extend(FileUtils)
563
+ obj.extend(Chef::DSL::PlatformIntrospection)
564
+ obj.extend(Chef::DSL::DataQuery)
565
+ end
566
+
567
+ def self.extend_context_node(node_obj)
568
+ node_obj.instance_eval(&ObjectUIExtensions)
569
+ end
570
+
571
+ def self.extend_context_recipe(recipe_obj)
572
+ recipe_obj.instance_eval(&ObjectUIExtensions)
573
+ recipe_obj.instance_eval(&RecipeUIExtensions)
574
+ end
575
+
576
+ end
577
+ end
578
+
579
+ class String
580
+ include Shell::Extensions::String
581
+ end
582
+
583
+ class Symbol
584
+ include Shell::Extensions::Symbol
585
+ end
586
+
587
+ class TrueClass
588
+ include Shell::Extensions::TrueClass
589
+ end
590
+
591
+ class FalseClass
592
+ include Shell::Extensions::FalseClass
593
+ end