chef 11.6.2-x86-mingw32 → 11.8.0.rc.1-x86-mingw32

Sign up to get free protection for your applications and to get access to all the features.
Files changed (628) hide show
  1. data/CONTRIBUTING.md +12 -12
  2. data/Rakefile +11 -14
  3. data/bin/chef-apply +2 -2
  4. data/bin/chef-client +2 -2
  5. data/bin/chef-service-manager +2 -2
  6. data/bin/chef-shell +3 -0
  7. data/bin/chef-solo +2 -2
  8. data/bin/knife +3 -3
  9. data/distro/arch/etc/rc.d/chef-client +2 -2
  10. data/distro/arch/etc/rc.d/chef-server +2 -2
  11. data/distro/arch/etc/rc.d/chef-server-webui +2 -2
  12. data/distro/arch/etc/rc.d/chef-solr +2 -2
  13. data/distro/common/html/chef-client.8.html +3 -3
  14. data/distro/common/html/chef-expander.8.html +3 -3
  15. data/distro/common/html/chef-expanderctl.8.html +3 -3
  16. data/distro/common/html/chef-server-webui.8.html +3 -3
  17. data/distro/common/html/chef-server.8.html +3 -3
  18. data/distro/common/html/chef-shell.1.html +3 -3
  19. data/distro/common/html/chef-solo.8.html +3 -3
  20. data/distro/common/html/chef-solr.8.html +4 -4
  21. data/distro/common/html/knife-bootstrap.1.html +3 -3
  22. data/distro/common/html/knife-client.1.html +3 -3
  23. data/distro/common/html/knife-configure.1.html +13 -13
  24. data/distro/common/html/knife-cookbook-site.1.html +3 -3
  25. data/distro/common/html/knife-cookbook.1.html +7 -7
  26. data/distro/common/html/knife-data-bag.1.html +3 -3
  27. data/distro/common/html/knife-environment.1.html +3 -3
  28. data/distro/common/html/knife-exec.1.html +3 -3
  29. data/distro/common/html/knife-index.1.html +3 -3
  30. data/distro/common/html/knife-node.1.html +3 -3
  31. data/distro/common/html/knife-role.1.html +3 -3
  32. data/distro/common/html/knife-search.1.html +3 -3
  33. data/distro/common/html/knife-ssh.1.html +3 -3
  34. data/distro/common/html/knife-status.1.html +3 -3
  35. data/distro/common/html/knife-tag.1.html +3 -3
  36. data/distro/common/html/knife.1.html +3 -3
  37. data/distro/common/man/man1/README.md +58 -0
  38. data/distro/common/man/man1/chef-shell.1 +114 -219
  39. data/distro/common/man/man1/knife-bootstrap.1 +176 -180
  40. data/distro/common/man/man1/knife-client.1 +368 -0
  41. data/distro/common/man/man1/knife-configure.1 +147 -85
  42. data/distro/common/man/man1/knife-cookbook-site.1 +465 -133
  43. data/distro/common/man/man1/knife-cookbook.1 +614 -304
  44. data/distro/common/man/man1/knife-data-bag.1 +476 -113
  45. data/distro/common/man/man1/knife-delete.1 +132 -0
  46. data/distro/common/man/man1/knife-deps.1 +219 -0
  47. data/distro/common/man/man1/knife-diff.1 +212 -0
  48. data/distro/common/man/man1/knife-download.1 +220 -0
  49. data/distro/common/man/man1/knife-edit.1 +126 -0
  50. data/distro/common/man/man1/knife-environment.1 +324 -0
  51. data/distro/common/man/man1/knife-exec.1 +317 -35
  52. data/distro/common/man/man1/knife-index-rebuild.1 +115 -0
  53. data/distro/common/man/man1/knife-list.1 +167 -0
  54. data/distro/common/man/man1/knife-node.1 +567 -123
  55. data/distro/common/man/man1/knife-raw.1 +170 -0
  56. data/distro/common/man/man1/knife-recipe-list.1 +133 -0
  57. data/distro/common/man/man1/knife-role.1 +367 -81
  58. data/distro/common/man/man1/knife-search.1 +267 -243
  59. data/distro/common/man/man1/knife-show.1 +138 -0
  60. data/distro/common/man/man1/knife-ssh.1 +241 -66
  61. data/distro/common/man/man1/knife-status.1 +202 -24
  62. data/distro/common/man/man1/knife-tag.1 +176 -39
  63. data/distro/common/man/man1/knife-upload.1 +239 -0
  64. data/distro/common/man/man1/knife-user.1 +317 -0
  65. data/distro/common/man/man1/knife-xargs.1 +166 -0
  66. data/distro/common/man/man1/knife.1 +227 -284
  67. data/distro/common/man/man8/chef-client.8 +247 -81
  68. data/distro/common/man/man8/chef-solo.8 +142 -110
  69. data/distro/common/markdown/man1/knife-bootstrap.mkd +1 -1
  70. data/distro/common/markdown/man1/knife-configure.mkd +11 -11
  71. data/distro/common/markdown/man1/knife-cookbook.mkd +4 -4
  72. data/distro/common/markdown/man8/chef-expander.mkd +1 -1
  73. data/distro/common/markdown/man8/chef-expanderctl.mkd +1 -1
  74. data/distro/debian/etc/init.d/chef-client +1 -1
  75. data/distro/debian/etc/init.d/chef-expander +1 -1
  76. data/distro/debian/etc/init.d/chef-server +1 -1
  77. data/distro/debian/etc/init.d/chef-server-webui +1 -1
  78. data/distro/debian/etc/init.d/chef-solr +1 -1
  79. data/distro/debian/etc/init/chef-client.conf +1 -1
  80. data/distro/debian/etc/init/chef-expander.conf +1 -1
  81. data/distro/debian/etc/init/chef-server-webui.conf +1 -1
  82. data/distro/debian/etc/init/chef-server.conf +1 -1
  83. data/distro/debian/etc/init/chef-solr.conf +1 -1
  84. data/distro/redhat/etc/init.d/chef-client +1 -1
  85. data/distro/redhat/etc/init.d/chef-server +2 -2
  86. data/distro/redhat/etc/init.d/chef-server-webui +2 -2
  87. data/distro/redhat/etc/init.d/chef-solr +2 -2
  88. data/lib/chef/api_client.rb +20 -5
  89. data/lib/chef/application.rb +53 -22
  90. data/lib/chef/application/agent.rb +2 -2
  91. data/lib/chef/application/client.rb +34 -24
  92. data/lib/chef/application/knife.rb +10 -0
  93. data/lib/chef/application/solo.rb +9 -27
  94. data/lib/chef/application/windows_service.rb +24 -10
  95. data/lib/chef/application/windows_service_manager.rb +8 -0
  96. data/lib/chef/checksum/storage.rb +2 -2
  97. data/lib/chef/checksum/storage/filesystem.rb +2 -2
  98. data/lib/chef/chef_fs/chef_fs_data_store.rb +1 -1
  99. data/lib/chef/chef_fs/command_line.rb +2 -1
  100. data/lib/chef/chef_fs/config.rb +19 -64
  101. data/lib/chef/chef_fs/data_handler/client_data_handler.rb +1 -2
  102. data/lib/chef/chef_fs/file_system.rb +2 -2
  103. data/lib/chef/chef_fs/file_system/acl_entry.rb +1 -1
  104. data/lib/chef/chef_fs/file_system/chef_repository_file_system_acls_dir.rb +37 -0
  105. data/lib/chef/chef_fs/file_system/chef_repository_file_system_cookbook_dir.rb +16 -8
  106. data/lib/chef/chef_fs/file_system/chef_repository_file_system_cookbook_entry.rb +19 -4
  107. data/lib/chef/chef_fs/file_system/chef_repository_file_system_cookbooks_dir.rb +27 -12
  108. data/lib/chef/chef_fs/file_system/chef_repository_file_system_entry.rb +31 -3
  109. data/lib/chef/chef_fs/file_system/chef_repository_file_system_root_dir.rb +12 -5
  110. data/lib/chef/chef_fs/file_system/chef_server_root_dir.rb +12 -2
  111. data/lib/chef/chef_fs/file_system/cookbook_dir.rb +3 -2
  112. data/lib/chef/chef_fs/file_system/cookbook_file.rb +2 -5
  113. data/lib/chef/chef_fs/file_system/cookbooks_dir.rb +21 -6
  114. data/lib/chef/chef_fs/file_system/data_bag_dir.rb +1 -1
  115. data/lib/chef/chef_fs/file_system/data_bags_dir.rb +3 -2
  116. data/lib/chef/chef_fs/file_system/file_system_entry.rb +15 -5
  117. data/lib/chef/chef_fs/file_system/multiplexed_dir.rb +2 -1
  118. data/lib/chef/chef_fs/file_system/nodes_dir.rb +1 -1
  119. data/lib/chef/chef_fs/file_system/operation_failed_error.rb +8 -0
  120. data/lib/chef/chef_fs/file_system/rest_list_dir.rb +4 -2
  121. data/lib/chef/chef_fs/file_system/rest_list_entry.rb +4 -6
  122. data/lib/chef/chef_fs/knife.rb +39 -22
  123. data/lib/chef/chef_fs/path_utils.rb +5 -0
  124. data/lib/chef/client.rb +9 -3
  125. data/lib/chef/config.rb +306 -115
  126. data/lib/chef/config_fetcher.rb +79 -0
  127. data/lib/chef/cookbook/file_vendor.rb +5 -5
  128. data/lib/chef/cookbook/metadata.rb +2 -2
  129. data/lib/chef/cookbook/syntax_check.rb +6 -16
  130. data/lib/chef/cookbook_site_streaming_uploader.rb +8 -4
  131. data/lib/chef/cookbook_uploader.rb +10 -8
  132. data/lib/chef/cookbook_version.rb +24 -8
  133. data/lib/chef/daemon.rb +14 -75
  134. data/lib/chef/data_bag.rb +2 -3
  135. data/lib/chef/dsl/include_recipe.rb +2 -2
  136. data/lib/chef/event_dispatch/base.rb +1 -1
  137. data/lib/chef/event_dispatch/dispatcher.rb +1 -1
  138. data/lib/chef/file_access_control/windows.rb +1 -1
  139. data/lib/chef/formatters/doc.rb +5 -5
  140. data/lib/chef/formatters/error_inspectors/api_error_formatting.rb +2 -2
  141. data/lib/chef/formatters/error_inspectors/compile_error_inspector.rb +2 -2
  142. data/lib/chef/formatters/error_inspectors/cookbook_sync_error_inspector.rb +2 -2
  143. data/lib/chef/formatters/error_inspectors/node_load_error_inspector.rb +2 -2
  144. data/lib/chef/formatters/error_inspectors/resource_failure_inspector.rb +2 -2
  145. data/lib/chef/handler/json_file.rb +2 -2
  146. data/lib/chef/http.rb +386 -0
  147. data/lib/chef/{rest → http}/auth_credentials.rb +1 -1
  148. data/lib/chef/http/authenticator.rb +89 -0
  149. data/lib/chef/http/basic_client.rb +114 -0
  150. data/lib/chef/{rest → http}/cookie_jar.rb +1 -1
  151. data/lib/chef/http/cookie_manager.rb +56 -0
  152. data/lib/chef/http/decompressor.rb +137 -0
  153. data/lib/chef/{rest/rest_request.rb → http/http_request.rb} +13 -74
  154. data/lib/chef/http/json_input.rb +53 -0
  155. data/lib/chef/http/json_output.rb +69 -0
  156. data/lib/chef/http/json_to_model_output.rb +34 -0
  157. data/lib/chef/http/simple.rb +16 -0
  158. data/lib/chef/http/ssl_policies.rb +129 -0
  159. data/lib/chef/knife.rb +45 -23
  160. data/lib/chef/knife/bootstrap.rb +10 -3
  161. data/lib/chef/knife/bootstrap/chef-full.erb +10 -1
  162. data/lib/chef/knife/client_create.rb +1 -1
  163. data/lib/chef/knife/configure.rb +1 -1
  164. data/lib/chef/knife/cookbook_create.rb +7 -7
  165. data/lib/chef/knife/cookbook_download.rb +2 -2
  166. data/lib/chef/knife/cookbook_metadata_from_file.rb +2 -2
  167. data/lib/chef/knife/cookbook_show.rb +3 -3
  168. data/lib/chef/knife/cookbook_site_install.rb +2 -2
  169. data/lib/chef/knife/cookbook_site_list.rb +2 -2
  170. data/lib/chef/knife/cookbook_site_search.rb +3 -3
  171. data/lib/chef/knife/cookbook_site_show.rb +5 -5
  172. data/lib/chef/knife/core/bootstrap_context.rb +7 -3
  173. data/lib/chef/knife/core/node_editor.rb +16 -36
  174. data/lib/chef/knife/core/node_presenter.rb +1 -1
  175. data/lib/chef/knife/core/subcommand_loader.rb +5 -5
  176. data/lib/chef/knife/core/ui.rb +9 -13
  177. data/lib/chef/knife/data_bag_create.rb +7 -5
  178. data/lib/chef/knife/data_bag_delete.rb +3 -3
  179. data/lib/chef/knife/data_bag_edit.rb +9 -7
  180. data/lib/chef/knife/data_bag_from_file.rb +10 -8
  181. data/lib/chef/knife/data_bag_list.rb +2 -2
  182. data/lib/chef/knife/data_bag_show.rb +9 -7
  183. data/lib/chef/knife/delete.rb +2 -0
  184. data/lib/chef/knife/deps.rb +2 -0
  185. data/lib/chef/knife/diff.rb +6 -0
  186. data/lib/chef/knife/download.rb +6 -0
  187. data/lib/chef/knife/edit.rb +5 -8
  188. data/lib/chef/knife/environment_from_file.rb +2 -2
  189. data/lib/chef/knife/help_topics.rb +1 -1
  190. data/lib/chef/knife/index_rebuild.rb +2 -2
  191. data/lib/chef/knife/list.rb +2 -0
  192. data/lib/chef/knife/raw.rb +31 -5
  193. data/lib/chef/knife/show.rb +2 -0
  194. data/lib/chef/knife/ssh.rb +21 -7
  195. data/lib/chef/knife/status.rb +1 -1
  196. data/lib/chef/knife/upload.rb +2 -0
  197. data/lib/chef/knife/xargs.rb +2 -0
  198. data/lib/chef/mixin/checksum.rb +2 -2
  199. data/lib/chef/mixin/command.rb +46 -17
  200. data/lib/chef/mixin/convert_to_class_name.rb +8 -8
  201. data/lib/chef/mixin/create_path.rb +9 -9
  202. data/lib/chef/mixin/deep_merge.rb +2 -2
  203. data/lib/chef/mixin/from_file.rb +6 -6
  204. data/lib/chef/mixin/language_include_recipe.rb +2 -2
  205. data/lib/chef/mixin/params_validate.rb +21 -21
  206. data/lib/chef/mixin/shell_out.rb +9 -0
  207. data/lib/chef/mixin/template.rb +13 -16
  208. data/lib/chef/mixin/why_run.rb +16 -16
  209. data/lib/chef/mixin/windows_architecture_helper.rb +5 -5
  210. data/lib/chef/mixin/xml_escape.rb +10 -10
  211. data/lib/chef/monkey_patches/numeric.rb +1 -1
  212. data/lib/chef/monkey_patches/regexp.rb +4 -4
  213. data/lib/chef/monkey_patches/string.rb +3 -3
  214. data/lib/chef/monkey_patches/tempfile.rb +2 -2
  215. data/lib/chef/node.rb +8 -0
  216. data/lib/chef/node/attribute.rb +1 -1
  217. data/lib/chef/platform/provider_mapping.rb +26 -1
  218. data/lib/chef/provider/batch.rb +3 -3
  219. data/lib/chef/provider/cron.rb +27 -13
  220. data/lib/chef/provider/cron/aix.rb +48 -0
  221. data/lib/chef/provider/cron/solaris.rb +6 -40
  222. data/lib/chef/provider/cron/unix.rb +76 -0
  223. data/lib/chef/provider/deploy/timestamped.rb +4 -4
  224. data/lib/chef/provider/erl_call.rb +1 -1
  225. data/lib/chef/provider/execute.rb +2 -2
  226. data/lib/chef/provider/git.rb +1 -0
  227. data/lib/chef/provider/group.rb +21 -21
  228. data/lib/chef/provider/group/dscl.rb +9 -9
  229. data/lib/chef/provider/group/gpasswd.rb +5 -5
  230. data/lib/chef/provider/group/groupadd.rb +11 -10
  231. data/lib/chef/provider/group/pw.rb +11 -11
  232. data/lib/chef/provider/group/suse.rb +4 -4
  233. data/lib/chef/provider/group/usermod.rb +8 -8
  234. data/lib/chef/provider/group/windows.rb +9 -9
  235. data/lib/chef/provider/http_request.rb +8 -8
  236. data/lib/chef/provider/ifconfig.rb +57 -37
  237. data/lib/chef/provider/ifconfig/aix.rb +99 -0
  238. data/lib/chef/provider/log.rb +3 -3
  239. data/lib/chef/provider/mdadm.rb +5 -4
  240. data/lib/chef/provider/mount.rb +12 -12
  241. data/lib/chef/provider/mount/aix.rb +179 -0
  242. data/lib/chef/provider/mount/mount.rb +29 -15
  243. data/lib/chef/provider/package.rb +26 -16
  244. data/lib/chef/provider/package/aix.rb +146 -0
  245. data/lib/chef/provider/package/apt.rb +16 -31
  246. data/lib/chef/provider/package/dpkg.rb +9 -9
  247. data/lib/chef/provider/package/freebsd.rb +2 -2
  248. data/lib/chef/provider/package/ips.rb +3 -3
  249. data/lib/chef/provider/package/macports.rb +1 -1
  250. data/lib/chef/provider/package/pacman.rb +8 -8
  251. data/lib/chef/provider/package/rpm.rb +14 -14
  252. data/lib/chef/provider/package/rubygems.rb +1 -1
  253. data/lib/chef/provider/package/smartos.rb +3 -3
  254. data/lib/chef/provider/package/solaris.rb +16 -6
  255. data/lib/chef/provider/package/yum-dump.py +4 -4
  256. data/lib/chef/provider/package/yum.rb +3 -3
  257. data/lib/chef/provider/powershell_script.rb +7 -7
  258. data/lib/chef/provider/remote_file/ftp.rb +1 -0
  259. data/lib/chef/provider/remote_file/http.rb +6 -13
  260. data/lib/chef/provider/remote_file/local_file.rb +1 -0
  261. data/lib/chef/provider/resource_update.rb +9 -9
  262. data/lib/chef/provider/ruby_block.rb +3 -3
  263. data/lib/chef/provider/script.rb +1 -1
  264. data/lib/chef/provider/service.rb +2 -2
  265. data/lib/chef/provider/service/debian.rb +35 -15
  266. data/lib/chef/provider/service/freebsd.rb +9 -9
  267. data/lib/chef/provider/service/gentoo.rb +4 -4
  268. data/lib/chef/provider/service/init.rb +1 -1
  269. data/lib/chef/provider/service/insserv.rb +2 -2
  270. data/lib/chef/provider/service/invokercd.rb +1 -1
  271. data/lib/chef/provider/service/redhat.rb +2 -2
  272. data/lib/chef/provider/service/simple.rb +6 -6
  273. data/lib/chef/provider/service/solaris.rb +1 -1
  274. data/lib/chef/provider/service/systemd.rb +3 -3
  275. data/lib/chef/provider/service/upstart.rb +15 -15
  276. data/lib/chef/provider/subversion.rb +6 -5
  277. data/lib/chef/provider/user.rb +13 -9
  278. data/lib/chef/provider/user/dscl.rb +28 -28
  279. data/lib/chef/provider/user/pw.rb +11 -11
  280. data/lib/chef/provider/user/useradd.rb +1 -1
  281. data/lib/chef/provider/user/windows.rb +7 -7
  282. data/lib/chef/provider/windows_script.rb +7 -7
  283. data/lib/chef/providers.rb +4 -0
  284. data/lib/chef/recipe.rb +2 -19
  285. data/lib/chef/resource/apt_package.rb +3 -3
  286. data/lib/chef/resource/bash.rb +3 -3
  287. data/lib/chef/resource/batch.rb +4 -4
  288. data/lib/chef/resource/bff_package.rb +36 -0
  289. data/lib/chef/resource/breakpoint.rb +3 -3
  290. data/lib/chef/resource/cron.rb +5 -5
  291. data/lib/chef/resource/csh.rb +3 -3
  292. data/lib/chef/resource/deploy.rb +16 -3
  293. data/lib/chef/resource/deploy_revision.rb +6 -6
  294. data/lib/chef/resource/directory.rb +2 -2
  295. data/lib/chef/resource/dpkg_package.rb +4 -4
  296. data/lib/chef/resource/easy_install_package.rb +1 -1
  297. data/lib/chef/resource/erl_call.rb +1 -1
  298. data/lib/chef/resource/freebsd_package.rb +4 -4
  299. data/lib/chef/resource/group.rb +15 -6
  300. data/lib/chef/resource/http_request.rb +6 -6
  301. data/lib/chef/resource/ifconfig.rb +4 -4
  302. data/lib/chef/resource/ips_package.rb +2 -2
  303. data/lib/chef/resource/log.rb +12 -11
  304. data/lib/chef/resource/macports_package.rb +2 -2
  305. data/lib/chef/resource/mount.rb +11 -12
  306. data/lib/chef/resource/ohai.rb +3 -3
  307. data/lib/chef/resource/pacman_package.rb +4 -4
  308. data/lib/chef/resource/perl.rb +3 -3
  309. data/lib/chef/resource/portage_package.rb +4 -4
  310. data/lib/chef/resource/powershell_script.rb +3 -3
  311. data/lib/chef/resource/python.rb +3 -3
  312. data/lib/chef/resource/route.rb +4 -4
  313. data/lib/chef/resource/rpm_package.rb +2 -2
  314. data/lib/chef/resource/ruby.rb +3 -3
  315. data/lib/chef/resource/ruby_block.rb +3 -3
  316. data/lib/chef/resource/scm.rb +10 -2
  317. data/lib/chef/resource/script.rb +5 -5
  318. data/lib/chef/resource/service.rb +5 -5
  319. data/lib/chef/resource/smartos_package.rb +8 -6
  320. data/lib/chef/resource/solaris_package.rb +8 -7
  321. data/lib/chef/resource/subversion.rb +3 -3
  322. data/lib/chef/resource/timestamped_deploy.rb +4 -4
  323. data/lib/chef/resource/user.rb +13 -13
  324. data/lib/chef/resource/windows_script.rb +6 -6
  325. data/lib/chef/resource/yum_package.rb +2 -2
  326. data/lib/chef/resource_collection.rb +1 -1
  327. data/lib/chef/resource_collection/stepable_iterator.rb +22 -22
  328. data/lib/chef/resource_definition.rb +8 -8
  329. data/lib/chef/resource_definition_list.rb +2 -2
  330. data/lib/chef/resource_reporter.rb +8 -2
  331. data/lib/chef/resources.rb +2 -0
  332. data/lib/chef/rest.rb +70 -334
  333. data/lib/chef/role.rb +17 -13
  334. data/lib/chef/run_context.rb +14 -0
  335. data/lib/chef/run_context/cookbook_compiler.rb +3 -3
  336. data/lib/chef/run_lock.rb +73 -20
  337. data/lib/chef/server_api.rb +41 -0
  338. data/lib/chef/shell.rb +3 -19
  339. data/lib/chef/shell/shell_session.rb +1 -1
  340. data/lib/chef/streaming_cookbook_uploader.rb +30 -26
  341. data/lib/chef/tasks/chef_repo.rake +17 -17
  342. data/lib/chef/util/backup.rb +2 -1
  343. data/lib/chef/util/diff.rb +76 -33
  344. data/lib/chef/util/windows.rb +2 -2
  345. data/lib/chef/util/windows/net_group.rb +2 -2
  346. data/lib/chef/util/windows/net_use.rb +2 -2
  347. data/lib/chef/util/windows/net_user.rb +3 -3
  348. data/lib/chef/util/windows/volume.rb +3 -3
  349. data/lib/chef/version.rb +1 -1
  350. data/lib/chef/win32/api/file.rb +1 -1
  351. data/lib/chef/win32/api/synchronization.rb +89 -0
  352. data/lib/chef/win32/handle.rb +1 -1
  353. data/lib/chef/win32/mutex.rb +94 -0
  354. data/lib/chef/win32/security/ace.rb +1 -1
  355. data/lib/chef/win32/security/sid.rb +1 -1
  356. data/lib/chef/win32/version.rb +5 -3
  357. data/spec/data/bootstrap/no_proxy.erb +2 -0
  358. data/spec/data/cookbooks/openldap/metadata.rb +8 -0
  359. data/spec/data/cookbooks/preseed/files/default/preseed-template.seed +4 -0
  360. data/spec/data/trusted_certs/example.crt +22 -0
  361. data/spec/data/trusted_certs/intermediate.pem +27 -0
  362. data/spec/data/trusted_certs/opscode.pem +38 -0
  363. data/spec/data/trusted_certs/root.pem +22 -0
  364. data/spec/functional/assets/PkgA.1.0.0.0.bff +0 -0
  365. data/spec/functional/assets/PkgA.2.0.0.0.bff +0 -0
  366. data/spec/functional/assets/dummy-1-0.aix6.1.noarch.rpm +0 -0
  367. data/spec/functional/assets/dummy-2-0.aix6.1.noarch.rpm +0 -0
  368. data/spec/functional/assets/mytest-1.0-1.noarch.rpm +0 -0
  369. data/spec/functional/assets/mytest-2.0-1.noarch.rpm +0 -0
  370. data/spec/functional/knife/cookbook_delete_spec.rb +4 -7
  371. data/spec/functional/knife/exec_spec.rb +0 -3
  372. data/spec/functional/knife/ssh_spec.rb +2 -6
  373. data/spec/functional/resource/base.rb +41 -0
  374. data/spec/functional/resource/batch_spec.rb +6 -33
  375. data/spec/functional/resource/bff_spec.rb +122 -0
  376. data/spec/functional/resource/cron_spec.rb +147 -0
  377. data/spec/functional/resource/group_spec.rb +204 -0
  378. data/spec/functional/resource/ifconfig_spec.rb +163 -0
  379. data/spec/functional/resource/link_spec.rb +4 -4
  380. data/spec/functional/resource/mount_spec.rb +207 -0
  381. data/spec/functional/resource/package_spec.rb +95 -17
  382. data/spec/functional/resource/powershell_spec.rb +21 -22
  383. data/spec/functional/resource/registry_spec.rb +5 -19
  384. data/spec/functional/resource/remote_file_spec.rb +14 -0
  385. data/spec/functional/resource/rpm_spec.rb +122 -0
  386. data/spec/functional/resource/template_spec.rb +11 -44
  387. data/spec/functional/resource/user_spec.rb +2 -1
  388. data/spec/functional/run_lock_spec.rb +48 -5
  389. data/spec/functional/shell_spec.rb +46 -26
  390. data/spec/functional/tiny_server_spec.rb +2 -2
  391. data/spec/functional/version_spec.rb +35 -0
  392. data/spec/functional/win32/versions_spec.rb +3 -3
  393. data/spec/integration/client/client_spec.rb +146 -0
  394. data/spec/integration/knife/chef_fs_data_store_spec.rb +353 -0
  395. data/spec/integration/knife/chef_repo_path_spec.rb +72 -19
  396. data/spec/integration/knife/common_options_spec.rb +103 -0
  397. data/spec/integration/knife/download_spec.rb +38 -2
  398. data/spec/integration/knife/raw_spec.rb +63 -0
  399. data/spec/integration/knife/upload_spec.rb +20 -4
  400. data/spec/integration/solo/solo_spec.rb +78 -25
  401. data/spec/spec_helper.rb +35 -1
  402. data/spec/support/lib/chef/provider/easy.rb +4 -4
  403. data/spec/support/lib/chef/provider/snakeoil.rb +4 -4
  404. data/spec/support/lib/chef/resource/cat.rb +5 -5
  405. data/spec/support/lib/chef/resource/with_state.rb +37 -0
  406. data/spec/support/lib/library_load_order.rb +22 -0
  407. data/spec/support/platform_helpers.rb +8 -0
  408. data/spec/support/shared/functional/file_resource.rb +4 -22
  409. data/spec/support/shared/functional/windows_script.rb +48 -0
  410. data/spec/support/shared/integration/integration_helper.rb +5 -22
  411. data/spec/support/shared/integration/knife_support.rb +3 -3
  412. data/spec/support/shared/unit/script_resource.rb +7 -7
  413. data/spec/support/shared/unit/windows_script_resource.rb +7 -7
  414. data/spec/tiny_server.rb +2 -2
  415. data/spec/unit/api_client/registration_spec.rb +1 -1
  416. data/spec/unit/api_client_spec.rb +25 -2
  417. data/spec/unit/application/apply.rb +1 -9
  418. data/spec/unit/application/client_spec.rb +19 -44
  419. data/spec/unit/application/solo_spec.rb +10 -50
  420. data/spec/unit/application_spec.rb +51 -80
  421. data/spec/unit/checksum/storage/filesystem_spec.rb +3 -2
  422. data/spec/unit/chef_fs/file_system/operation_failed_error_spec.rb +47 -0
  423. data/spec/unit/chef_spec.rb +2 -2
  424. data/spec/unit/client_spec.rb +2 -18
  425. data/spec/unit/config_fetcher_spec.rb +98 -0
  426. data/spec/unit/config_spec.rb +107 -29
  427. data/spec/unit/cookbook/metadata_spec.rb +50 -50
  428. data/spec/unit/cookbook/synchronizer_spec.rb +3 -3
  429. data/spec/unit/cookbook/syntax_check_spec.rb +1 -2
  430. data/spec/unit/cookbook_loader_spec.rb +28 -12
  431. data/spec/unit/cookbook_manifest_spec.rb +11 -11
  432. data/spec/unit/cookbook_site_streaming_uploader.rb +200 -0
  433. data/spec/unit/cookbook_version_spec.rb +16 -0
  434. data/spec/unit/daemon_spec.rb +0 -132
  435. data/spec/unit/data_bag_item_spec.rb +6 -6
  436. data/spec/unit/data_bag_spec.rb +6 -8
  437. data/spec/unit/digester_spec.rb +2 -2
  438. data/spec/unit/encrypted_data_bag_item_spec.rb +0 -15
  439. data/spec/unit/file_cache_spec.rb +1 -1
  440. data/spec/unit/formatters/error_inspectors/compile_error_inspector_spec.rb +4 -4
  441. data/spec/unit/formatters/error_inspectors/cookbook_resolve_error_inspector_spec.rb +2 -2
  442. data/spec/unit/formatters/error_inspectors/cookbook_sync_error_inspector_spec.rb +2 -2
  443. data/spec/unit/formatters/error_inspectors/node_load_error_inspector_spec.rb +2 -2
  444. data/spec/unit/formatters/error_inspectors/registration_error_inspector_spec.rb +2 -2
  445. data/spec/unit/formatters/error_inspectors/resource_failure_inspector_spec.rb +4 -4
  446. data/spec/unit/formatters/error_inspectors/run_list_expansion_error_inspector_spec.rb +2 -2
  447. data/spec/unit/handler_spec.rb +5 -5
  448. data/spec/unit/http/ssl_policies_spec.rb +170 -0
  449. data/spec/unit/knife/bootstrap_spec.rb +31 -14
  450. data/spec/unit/knife/client_bulk_delete_spec.rb +8 -8
  451. data/spec/unit/knife/client_create_spec.rb +2 -2
  452. data/spec/unit/knife/client_delete_spec.rb +2 -2
  453. data/spec/unit/knife/client_edit_spec.rb +2 -2
  454. data/spec/unit/knife/client_list_spec.rb +2 -2
  455. data/spec/unit/knife/client_reregister_spec.rb +2 -2
  456. data/spec/unit/knife/client_show_spec.rb +2 -2
  457. data/spec/unit/knife/config_file_selection_spec.rb +53 -36
  458. data/spec/unit/knife/configure_spec.rb +0 -6
  459. data/spec/unit/knife/cookbook_create_spec.rb +1 -12
  460. data/spec/unit/knife/cookbook_metadata_from_file_spec.rb +2 -2
  461. data/spec/unit/knife/cookbook_show_spec.rb +3 -3
  462. data/spec/unit/knife/cookbook_site_install_spec.rb +1 -1
  463. data/spec/unit/knife/core/bootstrap_context_spec.rb +10 -2
  464. data/spec/unit/knife/core/ui_spec.rb +118 -0
  465. data/spec/unit/knife/data_bag_show_spec.rb +2 -2
  466. data/spec/unit/knife/environment_from_file_spec.rb +2 -2
  467. data/spec/unit/knife/index_rebuild_spec.rb +1 -1
  468. data/spec/unit/knife/node_delete_spec.rb +3 -3
  469. data/spec/unit/knife/node_edit_spec.rb +35 -8
  470. data/spec/unit/knife/node_list_spec.rb +3 -3
  471. data/spec/unit/knife/node_run_list_add_spec.rb +3 -3
  472. data/spec/unit/knife/node_show_spec.rb +3 -3
  473. data/spec/unit/knife/role_create_spec.rb +3 -3
  474. data/spec/unit/knife/role_delete_spec.rb +3 -3
  475. data/spec/unit/knife/role_list_spec.rb +2 -2
  476. data/spec/unit/knife/ssh_spec.rb +1 -8
  477. data/spec/unit/knife_spec.rb +0 -2
  478. data/spec/unit/log_spec.rb +2 -2
  479. data/spec/unit/mash_spec.rb +2 -2
  480. data/spec/unit/mixin/checksum_spec.rb +3 -3
  481. data/spec/unit/mixin/command_spec.rb +1 -1
  482. data/spec/unit/mixin/convert_to_class_name_spec.rb +7 -7
  483. data/spec/unit/mixin/deprecation_spec.rb +2 -2
  484. data/spec/unit/mixin/params_validate_spec.rb +72 -72
  485. data/spec/unit/mixin/securable_spec.rb +0 -14
  486. data/spec/unit/mixin/shell_out_spec.rb +1 -1
  487. data/spec/unit/mixin/template_spec.rb +34 -0
  488. data/spec/unit/mixin/windows_architecture_helper_spec.rb +5 -5
  489. data/spec/unit/mixin/xml_escape_spec.rb +2 -2
  490. data/spec/unit/node/attribute_spec.rb +11 -11
  491. data/spec/unit/node/immutable_collections_spec.rb +2 -2
  492. data/spec/unit/node_spec.rb +5 -0
  493. data/spec/unit/platform_spec.rb +36 -35
  494. data/spec/unit/provider/cron/{solaris_spec.rb → unix_spec.rb} +6 -6
  495. data/spec/unit/provider/cron_spec.rb +21 -3
  496. data/spec/unit/provider/deploy/timestamped_spec.rb +5 -5
  497. data/spec/unit/provider/deploy_spec.rb +21 -7
  498. data/spec/unit/provider/env_spec.rb +2 -2
  499. data/spec/unit/provider/execute_spec.rb +2 -2
  500. data/spec/unit/provider/file/content_spec.rb +0 -8
  501. data/spec/unit/provider/git_spec.rb +29 -9
  502. data/spec/unit/provider/group/dscl_spec.rb +12 -12
  503. data/spec/unit/provider/group/gpasswd_spec.rb +2 -2
  504. data/spec/unit/provider/group/groupadd_spec.rb +14 -0
  505. data/spec/unit/provider/group/groupmod_spec.rb +13 -13
  506. data/spec/unit/provider/group/pw_spec.rb +16 -16
  507. data/spec/unit/provider/group/usermod_spec.rb +10 -9
  508. data/spec/unit/provider/group/windows_spec.rb +14 -0
  509. data/spec/unit/provider/group_spec.rb +29 -29
  510. data/spec/unit/provider/http_request_spec.rb +15 -15
  511. data/spec/unit/provider/ifconfig/aix_spec.rb +180 -0
  512. data/spec/unit/provider/ifconfig_spec.rb +9 -9
  513. data/spec/unit/provider/link_spec.rb +2 -2
  514. data/spec/unit/provider/log_spec.rb +8 -8
  515. data/spec/unit/provider/mdadm_spec.rb +14 -11
  516. data/spec/unit/provider/mount/aix_spec.rb +237 -0
  517. data/spec/unit/provider/mount/mount_spec.rb +2 -0
  518. data/spec/unit/provider/mount/windows_spec.rb +2 -2
  519. data/spec/unit/provider/mount_spec.rb +6 -6
  520. data/spec/unit/provider/package/aix_spec.rb +171 -0
  521. data/spec/unit/provider/package/apt_spec.rb +130 -171
  522. data/spec/unit/provider/package/dpkg_spec.rb +3 -3
  523. data/spec/unit/provider/package/freebsd_spec.rb +28 -0
  524. data/spec/unit/provider/package/ips_spec.rb +1 -1
  525. data/spec/unit/provider/package/rpm_spec.rb +15 -15
  526. data/spec/unit/provider/package/smartos_spec.rb +21 -3
  527. data/spec/unit/provider/package_spec.rb +4 -2
  528. data/spec/unit/provider/powershell_spec.rb +3 -3
  529. data/spec/unit/provider/remote_directory_spec.rb +2 -2
  530. data/spec/unit/provider/remote_file/ftp_spec.rb +0 -5
  531. data/spec/unit/provider/remote_file/http_spec.rb +12 -28
  532. data/spec/unit/provider/remote_file/local_file_spec.rb +2 -1
  533. data/spec/unit/provider/route_spec.rb +2 -2
  534. data/spec/unit/provider/ruby_block_spec.rb +2 -2
  535. data/spec/unit/provider/service/arch_service_spec.rb +17 -17
  536. data/spec/unit/provider/service/debian_service_spec.rb +242 -152
  537. data/spec/unit/provider/service/freebsd_service_spec.rb +9 -9
  538. data/spec/unit/provider/service/gentoo_service_spec.rb +9 -9
  539. data/spec/unit/provider/service/init_service_spec.rb +11 -11
  540. data/spec/unit/provider/service/insserv_service_spec.rb +5 -5
  541. data/spec/unit/provider/service/invokercd_service_spec.rb +10 -10
  542. data/spec/unit/provider/service/redhat_spec.rb +6 -6
  543. data/spec/unit/provider/service/simple_service_spec.rb +6 -6
  544. data/spec/unit/provider/service/solaris_smf_service_spec.rb +4 -4
  545. data/spec/unit/provider/service/systemd_service_spec.rb +3 -3
  546. data/spec/unit/provider/service/upstart_service_spec.rb +5 -5
  547. data/spec/unit/provider/service/windows_spec.rb +7 -7
  548. data/spec/unit/provider/subversion_spec.rb +1 -1
  549. data/spec/unit/provider/user/dscl_spec.rb +21 -21
  550. data/spec/unit/provider/user/pw_spec.rb +2 -2
  551. data/spec/unit/provider/user/windows_spec.rb +5 -5
  552. data/spec/unit/provider/user_spec.rb +39 -47
  553. data/spec/unit/resource/apt_package_spec.rb +6 -6
  554. data/spec/unit/resource/bash_spec.rb +5 -5
  555. data/spec/unit/resource/batch_spec.rb +7 -7
  556. data/spec/unit/resource/breakpoint_spec.rb +8 -8
  557. data/spec/unit/resource/chef_gem_spec.rb +6 -6
  558. data/spec/unit/resource/cookbook_file_spec.rb +11 -11
  559. data/spec/unit/resource/cron_spec.rb +15 -15
  560. data/spec/unit/resource/csh_spec.rb +5 -5
  561. data/spec/unit/resource/deploy_revision_spec.rb +6 -6
  562. data/spec/unit/resource/deploy_spec.rb +50 -36
  563. data/spec/unit/resource/directory_spec.rb +1 -1
  564. data/spec/unit/resource/dpkg_package_spec.rb +6 -6
  565. data/spec/unit/resource/env_spec.rb +1 -1
  566. data/spec/unit/resource/erl_call_spec.rb +1 -1
  567. data/spec/unit/resource/freebsd_package_spec.rb +6 -6
  568. data/spec/unit/resource/gem_package_spec.rb +6 -6
  569. data/spec/unit/resource/git_spec.rb +8 -8
  570. data/spec/unit/resource/group_spec.rb +11 -11
  571. data/spec/unit/resource/http_request_spec.rb +7 -7
  572. data/spec/unit/resource/ifconfig_spec.rb +1 -1
  573. data/spec/unit/resource/ips_package_spec.rb +6 -6
  574. data/spec/unit/resource/link_spec.rb +1 -1
  575. data/spec/unit/resource/log_spec.rb +13 -10
  576. data/spec/unit/resource/macports_package_spec.rb +2 -2
  577. data/spec/unit/resource/mdadm_spec.rb +3 -3
  578. data/spec/unit/resource/mount_spec.rb +13 -13
  579. data/spec/unit/resource/ohai_spec.rb +1 -1
  580. data/spec/unit/resource/package_spec.rb +6 -6
  581. data/spec/unit/resource/pacman_package_spec.rb +6 -6
  582. data/spec/unit/resource/perl_spec.rb +5 -5
  583. data/spec/unit/resource/portage_package_spec.rb +6 -6
  584. data/spec/unit/resource/powershell_spec.rb +5 -5
  585. data/spec/unit/resource/python_spec.rb +5 -5
  586. data/spec/unit/resource/registry_key_spec.rb +2 -2
  587. data/spec/unit/resource/remote_directory_spec.rb +9 -9
  588. data/spec/unit/resource/remote_file_spec.rb +4 -4
  589. data/spec/unit/resource/route_spec.rb +13 -13
  590. data/spec/unit/resource/rpm_package_spec.rb +2 -2
  591. data/spec/unit/resource/ruby_block_spec.rb +4 -4
  592. data/spec/unit/resource/ruby_spec.rb +5 -5
  593. data/spec/unit/resource/scm_spec.rb +14 -1
  594. data/spec/unit/resource/script_spec.rb +5 -5
  595. data/spec/unit/resource/service_spec.rb +18 -18
  596. data/spec/unit/resource/smartos_package_spec.rb +6 -6
  597. data/spec/unit/resource/solaris_package_spec.rb +57 -0
  598. data/spec/unit/resource/subversion_spec.rb +6 -6
  599. data/spec/unit/resource/timestamped_deploy_spec.rb +4 -4
  600. data/spec/unit/resource/user_spec.rb +13 -13
  601. data/spec/unit/resource/yum_package_spec.rb +7 -7
  602. data/spec/unit/resource_collection/stepable_iterator_spec.rb +21 -21
  603. data/spec/unit/resource_definition_spec.rb +23 -23
  604. data/spec/unit/resource_reporter_spec.rb +27 -0
  605. data/spec/unit/rest/auth_credentials_spec.rb +0 -94
  606. data/spec/unit/rest_spec.rb +117 -99
  607. data/spec/unit/role_spec.rb +57 -4
  608. data/spec/unit/run_context/cookbook_compiler_spec.rb +4 -20
  609. data/spec/unit/run_context_spec.rb +44 -3
  610. data/spec/unit/run_list/run_list_item_spec.rb +1 -1
  611. data/spec/unit/run_lock_spec.rb +6 -3
  612. data/spec/unit/scan_access_control_spec.rb +2 -2
  613. data/spec/unit/search/query_spec.rb +3 -3
  614. data/spec/unit/util/backup_spec.rb +6 -13
  615. data/spec/unit/util/diff_spec.rb +36 -53
  616. data/spec/unit/version/platform_spec.rb +3 -3
  617. data/spec/unit/version_class_spec.rb +5 -5
  618. data/spec/unit/version_constraint/platform_spec.rb +2 -2
  619. data/spec/unit/windows_service_spec.rb +54 -0
  620. metadata +290 -108
  621. checksums.yaml +0 -7
  622. data/distro/common/man/man1/knife-index.1 +0 -29
  623. data/distro/common/man/man8/chef-expander.8 +0 -97
  624. data/distro/common/man/man8/chef-expanderctl.8 +0 -62
  625. data/distro/common/man/man8/chef-server-webui.8 +0 -155
  626. data/distro/common/man/man8/chef-server.8 +0 -147
  627. data/distro/common/man/man8/chef-solr.8 +0 -122
  628. data/lib/chef/chef_fs/raw_request.rb +0 -79
@@ -6,9 +6,9 @@
6
6
  # Licensed under the Apache License, Version 2.0 (the "License");
7
7
  # you may not use this file except in compliance with the License.
8
8
  # You may obtain a copy of the License at
9
- #
9
+ #
10
10
  # http://www.apache.org/licenses/LICENSE-2.0
11
- #
11
+ #
12
12
  # Unless required by applicable law or agreed to in writing, software
13
13
  # distributed under the License is distributed on an "AS IS" BASIS,
14
14
  # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -27,14 +27,14 @@ class Chef
27
27
 
28
28
  def initialize(name, run_context, resource_name, interpreter_command)
29
29
  super(name, run_context)
30
- @interpreter = interpreter_command
30
+ @interpreter = interpreter_command
31
31
  @resource_name = resource_name
32
32
  end
33
33
 
34
34
  include Chef::Mixin::WindowsArchitectureHelper
35
35
 
36
36
  public
37
-
37
+
38
38
  def architecture(arg=nil)
39
39
  assert_architecture_compatible!(arg) if ! arg.nil?
40
40
  result = set_or_return(
@@ -43,7 +43,7 @@ class Chef
43
43
  :kind_of => Symbol
44
44
  )
45
45
  end
46
-
46
+
47
47
  protected
48
48
 
49
49
  def assert_architecture_compatible!(desired_architecture)
@@ -56,7 +56,7 @@ class Chef
56
56
  def node
57
57
  run_context && run_context.node
58
58
  end
59
-
59
+
60
60
  end
61
61
  end
62
62
  end
@@ -6,9 +6,9 @@
6
6
  # Licensed under the Apache License, Version 2.0 (the "License");
7
7
  # you may not use this file except in compliance with the License.
8
8
  # You may obtain a copy of the License at
9
- #
9
+ #
10
10
  # http://www.apache.org/licenses/LICENSE-2.0
11
- #
11
+ #
12
12
  # Unless required by applicable law or agreed to in writing, software
13
13
  # distributed under the License is distributed on an "AS IS" BASIS,
14
14
  # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -183,7 +183,7 @@ class Chef
183
183
  "The string `#{query_object}' is not valid for resource collection lookup. Correct syntax is `resource_type[resource_name]'"
184
184
  else
185
185
  raise Chef::Exceptions::InvalidResourceSpecification,
186
- "The object `#{query_object.inspect}' is not valid for resource collection lookup. " +
186
+ "The object `#{query_object.inspect}' is not valid for resource collection lookup. " +
187
187
  "Use a String like `resource_type[resource_name]' or a Chef::Resource object"
188
188
  end
189
189
  end
@@ -5,9 +5,9 @@
5
5
  # Licensed under the Apache License, Version 2.0 (the "License");
6
6
  # you may not use this file except in compliance with the License.
7
7
  # You may obtain a copy of the License at
8
- #
8
+ #
9
9
  # http://www.apache.org/licenses/LICENSE-2.0
10
- #
10
+ #
11
11
  # Unless required by applicable law or agreed to in writing, software
12
12
  # distributed under the License is distributed on an "AS IS" BASIS,
13
13
  # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,94 +18,94 @@
18
18
  class Chef
19
19
  class ResourceCollection
20
20
  class StepableIterator
21
-
21
+
22
22
  def self.for_collection(new_collection)
23
23
  instance = new(new_collection)
24
24
  instance
25
25
  end
26
-
26
+
27
27
  attr_accessor :collection
28
28
  attr_reader :position
29
-
29
+
30
30
  def initialize(collection=[])
31
31
  @position = 0
32
32
  @paused = false
33
33
  @collection = collection
34
34
  end
35
-
35
+
36
36
  def size
37
37
  collection.size
38
38
  end
39
-
39
+
40
40
  def each(&block)
41
41
  reset_iteration(block)
42
42
  @iterator_type = :element
43
43
  iterate
44
44
  end
45
-
45
+
46
46
  def each_index(&block)
47
47
  reset_iteration(block)
48
48
  @iterator_type = :index
49
49
  iterate
50
50
  end
51
-
51
+
52
52
  def each_with_index(&block)
53
53
  reset_iteration(block)
54
54
  @iterator_type = :element_with_index
55
55
  iterate
56
56
  end
57
-
57
+
58
58
  def paused?
59
59
  @paused
60
60
  end
61
-
61
+
62
62
  def pause
63
63
  @paused = true
64
64
  end
65
-
65
+
66
66
  def resume
67
67
  @paused = false
68
68
  iterate
69
69
  end
70
-
70
+
71
71
  def rewind
72
72
  @position = 0
73
73
  end
74
-
74
+
75
75
  def skip_back(skips=1)
76
76
  @position -= skips
77
77
  end
78
-
78
+
79
79
  def skip_forward(skips=1)
80
80
  @position += skips
81
81
  end
82
-
82
+
83
83
  def step
84
84
  return nil if @position == size
85
85
  call_iterator_block
86
86
  @position += 1
87
87
  end
88
-
88
+
89
89
  def iterate_on(iteration_type, &block)
90
90
  @iterator_type = iteration_type
91
91
  @iterator_block = block
92
92
  end
93
-
93
+
94
94
  private
95
-
95
+
96
96
  def reset_iteration(iterator_block)
97
97
  @iterator_block = iterator_block
98
98
  @position = 0
99
99
  @paused = false
100
100
  end
101
-
101
+
102
102
  def iterate
103
103
  while @position < size && !paused?
104
104
  step
105
105
  end
106
106
  collection
107
107
  end
108
-
108
+
109
109
  def call_iterator_block
110
110
  case @iterator_type
111
111
  when :element
@@ -118,7 +118,7 @@ class Chef
118
118
  raise "42error: someone forgot to set @iterator_type, wtf?"
119
119
  end
120
120
  end
121
-
121
+
122
122
  end
123
123
  end
124
124
  end
@@ -6,9 +6,9 @@
6
6
  # Licensed under the Apache License, Version 2.0 (the "License");
7
7
  # you may not use this file except in compliance with the License.
8
8
  # You may obtain a copy of the License at
9
- #
9
+ #
10
10
  # http://www.apache.org/licenses/LICENSE-2.0
11
- #
11
+ #
12
12
  # Unless required by applicable law or agreed to in writing, software
13
13
  # distributed under the License is distributed on an "AS IS" BASIS,
14
14
  # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -21,19 +21,19 @@ require 'chef/mixin/params_validate'
21
21
 
22
22
  class Chef
23
23
  class ResourceDefinition
24
-
24
+
25
25
  include Chef::Mixin::FromFile
26
26
  include Chef::Mixin::ParamsValidate
27
-
27
+
28
28
  attr_accessor :name, :params, :recipe, :node
29
-
29
+
30
30
  def initialize(node=nil)
31
31
  @name = nil
32
32
  @params = Hash.new
33
33
  @recipe = nil
34
34
  @node = node
35
35
  end
36
-
36
+
37
37
  def define(resource_name, prototype_params=nil, &block)
38
38
  unless resource_name.kind_of?(Symbol)
39
39
  raise ArgumentError, "You must use a symbol when defining a new resource!"
@@ -52,14 +52,14 @@ class Chef
52
52
  end
53
53
  true
54
54
  end
55
-
55
+
56
56
  # When we do the resource definition, we're really just setting new values for
57
57
  # the paramaters we prototyped at the top. This method missing is as simple as
58
58
  # it gets.
59
59
  def method_missing(symbol, *args)
60
60
  @params[symbol] = args.length == 1 ? args[0] : args
61
61
  end
62
-
62
+
63
63
  def to_s
64
64
  "#{name.to_s}"
65
65
  end
@@ -6,9 +6,9 @@
6
6
  # Licensed under the Apache License, Version 2.0 (the "License");
7
7
  # you may not use this file except in compliance with the License.
8
8
  # You may obtain a copy of the License at
9
- #
9
+ #
10
10
  # http://www.apache.org/licenses/LICENSE-2.0
11
- #
11
+ #
12
12
  # Unless required by applicable law or agreed to in writing, software
13
13
  # distributed under the License is distributed on an "AS IS" BASIS,
14
14
  # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -52,8 +52,8 @@ class Chef
52
52
  as_hash["type"] = new_resource.class.dsl_name
53
53
  as_hash["name"] = new_resource.name
54
54
  as_hash["id"] = new_resource.identity
55
- as_hash["after"] = new_resource.state
56
- as_hash["before"] = current_resource ? current_resource.state : {}
55
+ as_hash["after"] = state(new_resource)
56
+ as_hash["before"] = current_resource ? state(current_resource) : {}
57
57
  as_hash["duration"] = (elapsed_time * 1000).to_i.to_s
58
58
  as_hash["delta"] = new_resource.diff if new_resource.respond_to?("diff")
59
59
  as_hash["delta"] = "" if as_hash["delta"].nil?
@@ -80,6 +80,12 @@ class Chef
80
80
  !self.exception
81
81
  end
82
82
 
83
+ def state(r)
84
+ r.class.state_attrs.inject({}) do |state_attrs, attr_name|
85
+ state_attrs[attr_name] = r.send(attr_name)
86
+ state_attrs
87
+ end
88
+ end
83
89
  end # End class ResouceReport
84
90
 
85
91
  attr_reader :updated_resources
@@ -56,6 +56,7 @@ require 'chef/resource/registry_key'
56
56
  require 'chef/resource/remote_directory'
57
57
  require 'chef/resource/remote_file'
58
58
  require 'chef/resource/rpm_package'
59
+ require 'chef/resource/solaris_package'
59
60
  require 'chef/resource/route'
60
61
  require 'chef/resource/ruby'
61
62
  require 'chef/resource/ruby_block'
@@ -69,3 +70,4 @@ require 'chef/resource/timestamped_deploy'
69
70
  require 'chef/resource/user'
70
71
  require 'chef/resource/yum_package'
71
72
  require 'chef/resource/lwrp_base'
73
+ require 'chef/resource/bff_package'
@@ -20,15 +20,18 @@
20
20
  # limitations under the License.
21
21
  #
22
22
 
23
- require 'zlib'
24
- require 'net/https'
25
- require 'uri'
26
- require 'chef/json_compat'
27
23
  require 'tempfile'
28
- require 'chef/rest/auth_credentials'
29
- require 'chef/rest/rest_request'
30
- require 'chef/monkey_patches/string'
31
- require 'chef/monkey_patches/net_http'
24
+ require 'chef/http'
25
+ class Chef
26
+ class HTTP; end
27
+ class REST < HTTP; end
28
+ end
29
+
30
+ require 'chef/http/authenticator'
31
+ require 'chef/http/decompressor'
32
+ require 'chef/http/json_input'
33
+ require 'chef/http/json_to_model_output'
34
+ require 'chef/http/cookie_manager'
32
35
  require 'chef/config'
33
36
  require 'chef/exceptions'
34
37
  require 'chef/platform/query_helpers'
@@ -37,54 +40,53 @@ class Chef
37
40
  # == Chef::REST
38
41
  # Chef's custom REST client with built-in JSON support and RSA signed header
39
42
  # authentication.
40
- class REST
43
+ class REST < HTTP
41
44
 
42
- class NoopInflater
43
- def inflate(chunk)
44
- chunk
45
- end
46
- end
45
+ # Backwards compatibility for things that use
46
+ # Chef::REST::RESTRequest or its constants
47
+ RESTRequest = HTTP::HTTPRequest
47
48
 
48
- attr_reader :auth_credentials
49
49
  attr_accessor :url, :cookies, :sign_on_redirect, :redirect_limit
50
50
 
51
- CONTENT_ENCODING = "content-encoding".freeze
52
- GZIP = "gzip".freeze
53
- DEFLATE = "deflate".freeze
54
- IDENTITY = "identity".freeze
51
+ attr_reader :authenticator
55
52
 
56
53
  # Create a REST client object. The supplied +url+ is used as the base for
57
54
  # all subsequent requests. For example, when initialized with a base url
58
55
  # http://localhost:4000, a call to +get_rest+ with 'nodes' will make an
59
56
  # HTTP GET request to http://localhost:4000/nodes
60
57
  def initialize(url, client_name=Chef::Config[:node_name], signing_key_filename=Chef::Config[:client_key], options={})
61
- @url = url
62
- @cookies = CookieJar.instance
63
- @default_headers = options[:headers] || {}
64
- @signing_key_filename = signing_key_filename
65
- @key = load_signing_key(@signing_key_filename, options[:raw_key])
66
- @auth_credentials = AuthCredentials.new(client_name, @key)
67
- @sign_on_redirect, @sign_request = true, true
68
- @redirects_followed = 0
69
- @redirect_limit = 10
70
- @disable_gzip = false
71
- handle_options(options)
58
+ options[:client_name] = client_name
59
+ options[:signing_key_filename] = signing_key_filename
60
+ super(url, options)
61
+
62
+ @decompressor = Decompressor.new(options)
63
+ @authenticator = Authenticator.new(options)
64
+
65
+ @middlewares << JSONInput.new(options)
66
+ @middlewares << JSONToModelOutput.new(options)
67
+ @middlewares << CookieManager.new(options)
68
+ @middlewares << @decompressor
69
+ @middlewares << @authenticator
72
70
  end
73
71
 
74
72
  def signing_key_filename
75
- @signing_key_filename
73
+ authenticator.signing_key_filename
74
+ end
75
+
76
+ def auth_credentials
77
+ authenticator.auth_credentials
76
78
  end
77
79
 
78
80
  def client_name
79
- @auth_credentials.client_name
81
+ authenticator.client_name
80
82
  end
81
83
 
82
84
  def signing_key
83
- @raw_key
85
+ authenticator.raw_key
84
86
  end
85
87
 
86
- def last_response
87
- @last_response
88
+ def sign_requests?
89
+ authenticator.sign_requests?
88
90
  end
89
91
 
90
92
  # Send an HTTP GET request to the path
@@ -97,37 +99,18 @@ class Chef
97
99
  # to JSON inflated.
98
100
  def get(path, raw=false, headers={})
99
101
  if raw
100
- streaming_request(create_url(path), headers)
102
+ streaming_request(path, headers)
101
103
  else
102
- api_request(:GET, create_url(path), headers)
104
+ request(:GET, path, headers)
103
105
  end
104
106
  end
105
107
 
106
- def head(path, headers={})
107
- api_request(:HEAD, create_url(path), headers)
108
- end
109
-
110
108
  alias :get_rest :get
111
109
 
112
- # Send an HTTP DELETE request to the path
113
- def delete(path, headers={})
114
- api_request(:DELETE, create_url(path), headers)
115
- end
116
-
117
110
  alias :delete_rest :delete
118
111
 
119
- # Send an HTTP POST request to the path
120
- def post(path, json, headers={})
121
- api_request(:POST, create_url(path), headers, json)
122
- end
123
-
124
112
  alias :post_rest :post
125
113
 
126
- # Send an HTTP PUT request to the path
127
- def put(path, json, headers={})
128
- api_request(:PUT, create_url(path), headers, json)
129
- end
130
-
131
114
  alias :put_rest :put
132
115
 
133
116
  # Streams a download to a tempfile, then yields the tempfile to a block.
@@ -139,308 +122,61 @@ class Chef
139
122
  streaming_request(create_url(path), headers) {|tmp_file| yield tmp_file }
140
123
  end
141
124
 
142
- def create_url(path)
143
- if path =~ /^(http|https):\/\//
144
- URI.parse(path)
145
- else
146
- URI.parse("#{@url}/#{path}")
147
- end
148
- end
125
+ alias :api_request :request
149
126
 
150
- def sign_requests?
151
- auth_credentials.sign_requests? && @sign_request
152
- end
127
+ alias :raw_http_request :send_http_request
153
128
 
154
- # Runs an HTTP request to a JSON API with JSON body. File Download not supported.
155
- def api_request(method, url, headers={}, data=false)
156
- json_body = data ? Chef::JSONCompat.to_json(data) : nil
157
- # Force encoding to binary to fix SSL related EOFErrors
158
- # cf. http://tickets.opscode.com/browse/CHEF-2363
159
- # http://redmine.ruby-lang.org/issues/5233
160
- json_body.force_encoding(Encoding::BINARY) if json_body.respond_to?(:force_encoding)
161
- raw_http_request(method, url, headers, json_body)
162
- end
163
-
164
- # Runs an HTTP request to a JSON API with raw body. File Download not supported.
165
- def raw_http_request(method, url, headers, body)
166
- headers = build_headers(method, url, headers, body)
167
- retriable_rest_request(method, url, body, headers) do |rest_request|
168
- begin
169
- response = rest_request.call {|r| r.read_body}
170
- @last_response = response
171
-
172
- Chef::Log.debug("---- HTTP Status and Header Data: ----")
173
- Chef::Log.debug("HTTP #{response.http_version} #{response.code} #{response.msg}")
174
-
175
- response.each do |header, value|
176
- Chef::Log.debug("#{header}: #{value}")
177
- end
178
- Chef::Log.debug("---- End HTTP Status/Header Data ----")
179
-
180
- response_body = decompress_body(response)
181
-
182
- if response.kind_of?(Net::HTTPSuccess)
183
- if response['content-type'] =~ /json/
184
- Chef::JSONCompat.from_json(response_body.chomp)
185
- else
186
- Chef::Log.warn("Expected JSON response, but got content-type '#{response['content-type']}'")
187
- response_body.to_s
188
- end
189
- elsif response.kind_of?(Net::HTTPNotModified) # Must be tested before Net::HTTPRedirection because it's subclass.
190
- false
191
- elsif redirect_location = redirected_to(response)
192
- if [:GET, :HEAD].include?(method)
193
- follow_redirect {api_request(method, create_url(redirect_location))}
194
- else
195
- raise Exceptions::InvalidRedirect, "#{method} request was redirected from #{url} to #{redirect_location}. Only GET and HEAD support redirects."
196
- end
197
- else
198
- # have to decompress the body before making an exception for it. But the body could be nil.
199
- response.body.replace(response_body) if response.body.respond_to?(:replace)
200
-
201
- if response['content-type'] =~ /json/
202
- exception = Chef::JSONCompat.from_json(response_body)
203
- msg = "HTTP Request Returned #{response.code} #{response.message}: "
204
- msg << (exception["error"].respond_to?(:join) ? exception["error"].join(", ") : exception["error"].to_s)
205
- Chef::Log.info(msg)
206
- end
207
- response.error!
208
- end
209
- rescue Exception => e
210
- if e.respond_to?(:chef_rest_request=)
211
- e.chef_rest_request = rest_request
212
- end
213
- raise
214
- end
215
- end
216
- end
129
+ public :raw_http_request
217
130
 
218
- def decompress_body(response)
219
- if gzip_disabled? || response.body.nil?
220
- response.body
221
- else
222
- case response[CONTENT_ENCODING]
223
- when GZIP
224
- Chef::Log.debug "decompressing gzip response"
225
- Zlib::Inflate.new(Zlib::MAX_WBITS + 16).inflate(response.body)
226
- when DEFLATE
227
- Chef::Log.debug "decompressing deflate response"
228
- Zlib::Inflate.inflate(response.body)
229
- else
230
- response.body
231
- end
232
- end
233
- end
234
-
235
- # Makes a streaming download request. <b>Doesn't speak JSON.</b>
236
- # Streams the response body to a tempfile. If a block is given, it's
237
- # passed to Tempfile.open(), which means that the tempfile will automatically
238
- # be unlinked after the block is executed.
239
- #
240
- # If no block is given, the tempfile is returned, which means it's up to
241
- # you to unlink the tempfile when you're done with it.
242
- def streaming_request(url, headers, &block)
243
- headers = build_headers(:GET, url, headers, nil, true)
244
- retriable_rest_request(:GET, url, nil, headers) do |rest_request|
245
- begin
246
- tempfile = nil
247
- response = rest_request.call do |r|
248
- if block_given? && r.kind_of?(Net::HTTPSuccess)
249
- begin
250
- tempfile = stream_to_tempfile(url, r, &block)
251
- yield tempfile
252
- ensure
253
- tempfile.close!
254
- end
255
- else
256
- tempfile = stream_to_tempfile(url, r)
257
- end
258
- end
259
- @last_response = response
260
- if response.kind_of?(Net::HTTPSuccess)
261
- tempfile
262
- elsif redirect_location = redirected_to(response)
263
- # TODO: test tempfile unlinked when following redirects.
264
- tempfile && tempfile.close!
265
- follow_redirect {streaming_request(create_url(redirect_location), {}, &block)}
266
- else
267
- tempfile && tempfile.close!
268
- response.error!
269
- end
270
- rescue Exception => e
271
- if e.respond_to?(:chef_rest_request=)
272
- e.chef_rest_request = rest_request
273
- end
274
- raise
275
- end
276
- end
277
- end
278
-
279
- def retriable_rest_request(method, url, req_body, headers)
280
- rest_request = Chef::REST::RESTRequest.new(method, url, req_body, headers)
131
+ # Deprecated:
132
+ # Responsibilities of this method have been split up. The #http_client is
133
+ # now responsible for making individual requests, while
134
+ # #retrying_http_errors handles error/retry logic.
135
+ def retriable_http_request(method, url, req_body, headers)
136
+ rest_request = Chef::HTTP::HTTPRequest.new(method, url, req_body, headers)
281
137
 
282
138
  Chef::Log.debug("Sending HTTP Request via #{method} to #{url.host}:#{url.port}#{rest_request.path}")
283
139
 
284
- http_attempts = 0
285
-
286
- begin
287
- http_attempts += 1
288
-
140
+ retrying_http_errors(url) do
289
141
  yield rest_request
290
-
291
- rescue SocketError, Errno::ETIMEDOUT => e
292
- e.message.replace "Error connecting to #{url} - #{e.message}"
293
- raise e
294
- rescue Errno::ECONNREFUSED
295
- if http_retry_count - http_attempts + 1 > 0
296
- Chef::Log.error("Connection refused connecting to #{url.host}:#{url.port} for #{rest_request.path}, retry #{http_attempts}/#{http_retry_count}")
297
- sleep(http_retry_delay)
298
- retry
299
- end
300
- raise Errno::ECONNREFUSED, "Connection refused connecting to #{url.host}:#{url.port} for #{rest_request.path}, giving up"
301
- rescue Timeout::Error
302
- if http_retry_count - http_attempts + 1 > 0
303
- Chef::Log.error("Timeout connecting to #{url.host}:#{url.port} for #{rest_request.path}, retry #{http_attempts}/#{http_retry_count}")
304
- sleep(http_retry_delay)
305
- retry
306
- end
307
- raise Timeout::Error, "Timeout connecting to #{url.host}:#{url.port} for #{rest_request.path}, giving up"
308
- rescue Net::HTTPFatalError => e
309
- if http_retry_count - http_attempts + 1 > 0
310
- sleep_time = 1 + (2 ** http_attempts) + rand(2 ** http_attempts)
311
- Chef::Log.error("Server returned error for #{url}, retrying #{http_attempts}/#{http_retry_count} in #{sleep_time}s")
312
- sleep(sleep_time)
313
- retry
314
- end
315
- raise
316
142
  end
317
143
  end
318
144
 
319
- def authentication_headers(method, url, json_body=nil)
320
- request_params = {:http_method => method, :path => url.path, :body => json_body, :host => "#{url.host}:#{url.port}"}
321
- request_params[:body] ||= ""
322
- auth_credentials.signature_headers(request_params)
323
- end
324
-
325
- def http_retry_delay
326
- config[:http_retry_delay]
327
- end
328
-
329
- def http_retry_count
330
- config[:http_retry_count]
145
+ # Customized streaming behavior; sets the accepted content type to "*/*"
146
+ # if not otherwise specified for compatibility purposes
147
+ def streaming_request(url, headers, &block)
148
+ headers["Accept"] ||= "*/*"
149
+ super
331
150
  end
332
151
 
333
- def config
334
- Chef::Config
335
- end
152
+ alias :retriable_rest_request :retriable_http_request
336
153
 
337
154
  def follow_redirect
338
- raise Chef::Exceptions::RedirectLimitExceeded if @redirects_followed >= redirect_limit
339
- @redirects_followed += 1
340
- Chef::Log.debug("Following redirect #{@redirects_followed}/#{redirect_limit}")
341
- if @sign_on_redirect
342
- yield
343
- else
344
- @sign_request = false
345
- yield
155
+ unless @sign_on_redirect
156
+ @authenticator.sign_request = false
346
157
  end
158
+ super
347
159
  ensure
348
- @redirects_followed = 0
349
- @sign_request = true
160
+ @authenticator.sign_request = true
350
161
  end
351
162
 
352
- private
163
+ public :create_url
353
164
 
354
- def redirected_to(response)
355
- return nil unless response.kind_of?(Net::HTTPRedirection)
356
- # Net::HTTPNotModified is undesired subclass of Net::HTTPRedirection so test for this
357
- return nil if response.kind_of?(Net::HTTPNotModified)
358
- response['location']
165
+ def http_client(base_url=nil)
166
+ base_url ||= url
167
+ BasicClient.new(base_url, :ssl_policy => Chef::HTTP::APISSLPolicy)
359
168
  end
360
169
 
361
- def build_headers(method, url, headers={}, json_body=false, raw=false)
362
- headers = @default_headers.merge(headers)
363
- #headers['Accept'] = "application/json" unless raw
364
- headers['Accept'] = "application/json" unless raw
365
- headers["Content-Type"] = 'application/json' if json_body
366
- headers['Content-Length'] = json_body.bytesize.to_s if json_body
367
- headers[RESTRequest::ACCEPT_ENCODING] = RESTRequest::ENCODING_GZIP_DEFLATE unless gzip_disabled?
368
- headers.merge!(authentication_headers(method, url, json_body)) if sign_requests?
369
- headers.merge!(Chef::Config[:custom_http_headers]) if Chef::Config[:custom_http_headers]
370
- headers
371
- end
372
-
373
- def stream_to_tempfile(url, response)
374
- tf = Tempfile.open("chef-rest")
375
- if Chef::Platform.windows?
376
- tf.binmode # required for binary files on Windows platforms
377
- end
378
- Chef::Log.debug("Streaming download from #{url.to_s} to tempfile #{tf.path}")
379
- # Stolen from http://www.ruby-forum.com/topic/166423
380
- # Kudos to _why!
381
-
382
- inflater = if gzip_disabled?
383
- NoopInflater.new
384
- else
385
- case response[CONTENT_ENCODING]
386
- when GZIP
387
- Chef::Log.debug "decompressing gzip stream"
388
- Zlib::Inflate.new(Zlib::MAX_WBITS + 16)
389
- when DEFLATE
390
- Chef::Log.debug "decompressing inflate stream"
391
- Zlib::Inflate.new
392
- else
393
- NoopInflater.new
394
- end
395
- end
170
+ ############################################################################
171
+ # DEPRECATED
172
+ ############################################################################
396
173
 
397
- response.read_body do |chunk|
398
- tf.write(inflater.inflate(chunk))
399
- end
400
- tf.close
401
- tf
402
- rescue Exception
403
- tf.close!
404
- raise
174
+ def decompress_body(body)
175
+ @decompressor.decompress_body(body)
405
176
  end
406
177
 
407
- # gzip is disabled using the disable_gzip => true option in the
408
- # constructor. When gzip is disabled, no 'Accept-Encoding' header will be
409
- # set, and the response will not be decompressed, no matter what the
410
- # Content-Encoding header of the response is. The intended use case for
411
- # this is to work around situations where you request +file.tar.gz+, but
412
- # the server responds with a content type of tar and a content encoding of
413
- # gzip, tricking the client into decompressing the response so you end up
414
- # with a tar archive (no gzip) named file.tar.gz
415
- def gzip_disabled?
416
- @disable_gzip
417
- end
418
-
419
- def handle_options(opts)
420
- opts.each do |name, value|
421
- case name.to_s
422
- when 'disable_gzip'
423
- @disable_gzip = value
424
- end
425
- end
426
- end
427
-
428
- def load_signing_key(key_file, raw_key = nil)
429
- if (!!key_file)
430
- @raw_key = IO.read(key_file).strip
431
- elsif (!!raw_key)
432
- @raw_key = raw_key.strip
433
- else
434
- return nil
435
- end
436
- @key = OpenSSL::PKey::RSA.new(@raw_key)
437
- rescue SystemCallError, IOError => e
438
- Chef::Log.warn "Failed to read the private key #{key_file}: #{e.inspect}"
439
- raise Chef::Exceptions::PrivateKeyMissing, "I cannot read #{key_file}, which you told me to use to sign requests!"
440
- rescue OpenSSL::PKey::RSAError
441
- msg = "The file #{key_file} or :raw_key option does not contain a correctly formatted private key.\n"
442
- msg << "The key file should begin with '-----BEGIN RSA PRIVATE KEY-----' and end with '-----END RSA PRIVATE KEY-----'"
443
- raise Chef::Exceptions::InvalidPrivateKey, msg
178
+ def authentication_headers(method, url, json_body=nil)
179
+ authenticator.authentication_headers(method, url, json_body)
444
180
  end
445
181
 
446
182
  end