chef 12.6.0 → 12.7.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (1449) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +26 -19
  3. data/README.md +26 -23
  4. data/Rakefile +28 -17
  5. data/VERSION +1 -0
  6. data/acceptance/.gitignore +1 -0
  7. data/acceptance/.shared/kitchen_acceptance/.kitchen.digitalocean.yml +27 -0
  8. data/acceptance/.shared/kitchen_acceptance/.kitchen.ec2.yml +281 -0
  9. data/acceptance/.shared/kitchen_acceptance/.kitchen.vagrant.yml +49 -0
  10. data/acceptance/.shared/kitchen_acceptance/libraries/kitchen.rb +46 -0
  11. data/acceptance/.shared/kitchen_acceptance/metadata.rb +1 -0
  12. data/acceptance/Gemfile +11 -0
  13. data/acceptance/README.md +86 -0
  14. data/acceptance/basics/.acceptance/acceptance-cookbook/.gitignore +2 -0
  15. data/acceptance/basics/.acceptance/acceptance-cookbook/metadata.rb +3 -0
  16. data/acceptance/basics/.acceptance/acceptance-cookbook/recipes/destroy.rb +1 -0
  17. data/acceptance/basics/.acceptance/acceptance-cookbook/recipes/provision.rb +1 -0
  18. data/acceptance/basics/.acceptance/acceptance-cookbook/recipes/verify.rb +1 -0
  19. data/acceptance/basics/.kitchen.yml +4 -0
  20. data/acceptance/basics/test/integration/chef-current-install/serverspec/chef_client_spec.rb +19 -0
  21. data/acceptance/basics/test/integration/chef-current-install/serverspec/spec_helper.rb +6 -0
  22. data/acceptance/top-cookbooks/.acceptance/acceptance-cookbook/.gitignore +2 -0
  23. data/acceptance/top-cookbooks/.acceptance/acceptance-cookbook/libraries/cookbook_kitchen.rb +43 -0
  24. data/acceptance/top-cookbooks/.acceptance/acceptance-cookbook/libraries/top_cookbooks.rb +21 -0
  25. data/acceptance/top-cookbooks/.acceptance/acceptance-cookbook/metadata.rb +3 -0
  26. data/acceptance/top-cookbooks/.acceptance/acceptance-cookbook/recipes/destroy.rb +1 -0
  27. data/acceptance/top-cookbooks/.acceptance/acceptance-cookbook/recipes/provision.rb +1 -0
  28. data/acceptance/top-cookbooks/.acceptance/acceptance-cookbook/recipes/verify.rb +1 -0
  29. data/acceptance/top-cookbooks/.gitignore +1 -0
  30. data/acceptance/top-cookbooks/.kitchen.git.yml +10 -0
  31. data/acceptance/top-cookbooks/.kitchen.learn-the-basics-rhel.yml +4 -0
  32. data/acceptance/top-cookbooks/.kitchen.learn-the-basics-ubuntu.yml +4 -0
  33. data/acceptance/top-cookbooks/.kitchen.learn-the-basics-windows.yml +4 -0
  34. data/acceptance/trivial/.acceptance/acceptance-cookbook/.gitignore +2 -0
  35. data/acceptance/trivial/.acceptance/acceptance-cookbook/metadata.rb +2 -0
  36. data/acceptance/trivial/.acceptance/acceptance-cookbook/recipes/destroy.rb +1 -0
  37. data/acceptance/trivial/.acceptance/acceptance-cookbook/recipes/provision.rb +1 -0
  38. data/acceptance/trivial/.acceptance/acceptance-cookbook/recipes/verify.rb +1 -0
  39. data/acceptance/trivial/.kitchen.yml +7 -0
  40. data/acceptance/trivial/test/integration/chef-current-install/inspec/chef_client_spec.rb +5 -0
  41. data/acceptance/windows-service/.acceptance/acceptance-cookbook/.gitignore +2 -0
  42. data/acceptance/windows-service/.acceptance/acceptance-cookbook/metadata.rb +2 -0
  43. data/acceptance/windows-service/.acceptance/acceptance-cookbook/recipes/destroy.rb +1 -0
  44. data/acceptance/windows-service/.acceptance/acceptance-cookbook/recipes/provision.rb +1 -0
  45. data/acceptance/windows-service/.acceptance/acceptance-cookbook/recipes/verify.rb +1 -0
  46. data/acceptance/windows-service/.kitchen.yml +7 -0
  47. data/acceptance/windows-service/test/integration/chef-windows-service/inspec/chef_windows_service_spec.rb +58 -0
  48. data/bin/chef-apply +3 -3
  49. data/bin/chef-client +5 -5
  50. data/bin/chef-shell +1 -1
  51. data/bin/chef-solo +4 -4
  52. data/bin/knife +4 -5
  53. data/chef-windows.gemspec +5 -2
  54. data/chef.gemspec +13 -13
  55. data/distro/common/html/_static/basic.css +1 -1
  56. data/distro/common/html/_static/doctools.js +1 -1
  57. data/distro/common/html/_static/searchtools.js +1 -1
  58. data/distro/common/html/_static/websupport.js +1 -1
  59. data/lib-backcompat/chef/chef_fs/file_system/acl_entry.rb +5 -0
  60. data/lib-backcompat/chef/chef_fs/file_system/chef_repository_file_system_root_dir.rb +5 -0
  61. data/lib-backcompat/chef/chef_fs/file_system/chef_server_root_dir.rb +5 -0
  62. data/lib/chef.rb +17 -17
  63. data/lib/chef/api_client.rb +31 -30
  64. data/lib/chef/api_client/registration.rb +34 -10
  65. data/lib/chef/api_client_v1.rb +36 -36
  66. data/lib/chef/application.rb +32 -23
  67. data/lib/chef/application/apply.rb +20 -20
  68. data/lib/chef/application/client.rb +63 -43
  69. data/lib/chef/application/knife.rb +21 -15
  70. data/lib/chef/application/solo.rb +52 -41
  71. data/lib/chef/application/windows_service.rb +25 -25
  72. data/lib/chef/application/windows_service_manager.rb +22 -22
  73. data/lib/chef/applications.rb +4 -4
  74. data/lib/chef/audit/audit_event_proxy.rb +3 -3
  75. data/lib/chef/audit/audit_reporter.rb +8 -10
  76. data/lib/chef/audit/control_group_data.rb +9 -10
  77. data/lib/chef/audit/logger.rb +3 -3
  78. data/lib/chef/audit/rspec_formatter.rb +2 -2
  79. data/lib/chef/audit/runner.rb +15 -14
  80. data/lib/chef/chef_class.rb +10 -7
  81. data/lib/chef/chef_fs.rb +51 -1
  82. data/lib/chef/chef_fs/chef_fs_data_store.rb +320 -125
  83. data/lib/chef/chef_fs/command_line.rb +8 -8
  84. data/lib/chef/chef_fs/config.rb +52 -23
  85. data/lib/chef/chef_fs/data_handler/acl_data_handler.rb +10 -10
  86. data/lib/chef/chef_fs/data_handler/client_data_handler.rb +12 -12
  87. data/lib/chef/chef_fs/data_handler/container_data_handler.rb +6 -6
  88. data/lib/chef/chef_fs/data_handler/cookbook_data_handler.rb +15 -15
  89. data/lib/chef/chef_fs/data_handler/data_bag_item_data_handler.rb +11 -11
  90. data/lib/chef/chef_fs/data_handler/data_handler_base.rb +8 -8
  91. data/lib/chef/chef_fs/data_handler/environment_data_handler.rb +14 -14
  92. data/lib/chef/chef_fs/data_handler/group_data_handler.rb +18 -18
  93. data/lib/chef/chef_fs/data_handler/node_data_handler.rb +14 -14
  94. data/lib/chef/chef_fs/data_handler/organization_data_handler.rb +9 -9
  95. data/lib/chef/chef_fs/data_handler/organization_invites_data_handler.rb +2 -2
  96. data/lib/chef/chef_fs/data_handler/organization_members_data_handler.rb +2 -2
  97. data/lib/chef/chef_fs/data_handler/policy_data_handler.rb +30 -3
  98. data/lib/chef/chef_fs/data_handler/policy_group_data_handler.rb +27 -0
  99. data/lib/chef/chef_fs/data_handler/role_data_handler.rb +16 -16
  100. data/lib/chef/chef_fs/data_handler/user_data_handler.rb +12 -12
  101. data/lib/chef/chef_fs/file_pattern.rb +25 -25
  102. data/lib/chef/chef_fs/file_system.rb +10 -10
  103. data/lib/chef/chef_fs/file_system/already_exists_error.rb +3 -6
  104. data/lib/chef/chef_fs/file_system/base_fs_dir.rb +4 -4
  105. data/lib/chef/chef_fs/file_system/base_fs_object.rb +8 -8
  106. data/lib/chef/chef_fs/file_system/chef_server/acl_dir.rb +65 -0
  107. data/lib/chef/chef_fs/file_system/chef_server/acl_entry.rb +60 -0
  108. data/lib/chef/chef_fs/file_system/chef_server/acls_dir.rb +75 -0
  109. data/lib/chef/chef_fs/file_system/chef_server/chef_server_root_dir.rb +196 -0
  110. data/lib/chef/chef_fs/file_system/{chef_repository_file_system_acls_dir.rb → chef_server/cookbook_artifact_dir.rb} +13 -12
  111. data/lib/chef/chef_fs/file_system/chef_server/cookbook_artifacts_dir.rb +102 -0
  112. data/lib/chef/chef_fs/file_system/chef_server/cookbook_dir.rb +222 -0
  113. data/lib/chef/chef_fs/file_system/chef_server/cookbook_file.rb +84 -0
  114. data/lib/chef/chef_fs/file_system/chef_server/cookbook_subdir.rb +61 -0
  115. data/lib/chef/chef_fs/file_system/chef_server/cookbooks_acl_dir.rb +42 -0
  116. data/lib/chef/chef_fs/file_system/chef_server/cookbooks_dir.rb +102 -0
  117. data/lib/chef/chef_fs/file_system/chef_server/data_bag_dir.rb +71 -0
  118. data/lib/chef/chef_fs/file_system/chef_server/data_bags_dir.rb +69 -0
  119. data/lib/chef/chef_fs/file_system/chef_server/environments_dir.rb +57 -0
  120. data/lib/chef/chef_fs/file_system/chef_server/nodes_dir.rb +53 -0
  121. data/lib/chef/chef_fs/file_system/chef_server/org_entry.rb +31 -0
  122. data/lib/chef/chef_fs/file_system/chef_server/organization_invites_entry.rb +61 -0
  123. data/lib/chef/chef_fs/file_system/chef_server/organization_members_entry.rb +60 -0
  124. data/lib/chef/chef_fs/file_system/chef_server/policies_acl_dir.rb +41 -0
  125. data/lib/chef/chef_fs/file_system/chef_server/policies_dir.rb +160 -0
  126. data/lib/chef/chef_fs/file_system/chef_server/policy_group_entry.rb +137 -0
  127. data/lib/chef/chef_fs/file_system/chef_server/policy_groups_dir.rb +43 -0
  128. data/lib/chef/chef_fs/file_system/chef_server/policy_revision_entry.rb +34 -0
  129. data/lib/chef/chef_fs/file_system/chef_server/rest_list_dir.rb +178 -0
  130. data/lib/chef/chef_fs/file_system/chef_server/rest_list_entry.rb +187 -0
  131. data/lib/chef/chef_fs/file_system/chef_server/versioned_cookbook_dir.rb +45 -0
  132. data/lib/chef/chef_fs/file_system/chef_server/versioned_cookbooks_dir.rb +107 -0
  133. data/lib/chef/chef_fs/file_system/cookbook_frozen_error.rb +3 -6
  134. data/lib/chef/chef_fs/file_system/default_environment_cannot_be_modified_error.rb +3 -7
  135. data/lib/chef/chef_fs/file_system/file_system_error.rb +14 -3
  136. data/lib/chef/chef_fs/file_system/memory/memory_dir.rb +53 -0
  137. data/lib/chef/chef_fs/file_system/memory/memory_file.rb +20 -0
  138. data/lib/chef/chef_fs/file_system/memory/memory_root.rb +23 -0
  139. data/lib/chef/chef_fs/file_system/multiplexed_dir.rb +2 -2
  140. data/lib/chef/chef_fs/file_system/must_delete_recursively_error.rb +3 -6
  141. data/lib/chef/chef_fs/file_system/nonexistent_fs_object.rb +4 -4
  142. data/lib/chef/chef_fs/file_system/not_found_error.rb +3 -6
  143. data/lib/chef/chef_fs/file_system/operation_failed_error.rb +5 -5
  144. data/lib/chef/chef_fs/file_system/operation_not_allowed_error.rb +16 -18
  145. data/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_acls_dir.rb +39 -0
  146. data/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_artifact_dir.rb +41 -0
  147. data/lib/chef/chef_fs/file_system/{chef_repository_file_system_policies_dir.rb → repository/chef_repository_file_system_cookbook_artifacts_dir.rb} +9 -13
  148. data/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_dir.rb +95 -0
  149. data/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_entry.rb +82 -0
  150. data/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbooks_dir.rb +84 -0
  151. data/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_data_bags_dir.rb +38 -0
  152. data/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_entry.rb +83 -0
  153. data/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_policies_dir.rb +38 -0
  154. data/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_root_dir.rb +210 -0
  155. data/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_versioned_cookbook_dir.rb +42 -0
  156. data/lib/chef/chef_fs/file_system/{chef_repository_file_system_data_bags_dir.rb → repository/chef_repository_file_system_versioned_cookbooks_dir.rb} +9 -11
  157. data/lib/chef/chef_fs/file_system/repository/file_system_entry.rb +117 -0
  158. data/lib/chef/chef_fs/file_system/{file_system_root_dir.rb → repository/file_system_root_dir.rb} +8 -6
  159. data/lib/chef/chef_fs/knife.rb +16 -16
  160. data/lib/chef/chef_fs/parallelizer.rb +3 -3
  161. data/lib/chef/chef_fs/parallelizer/flatten_enumerable.rb +1 -1
  162. data/lib/chef/chef_fs/parallelizer/parallel_enumerable.rb +3 -3
  163. data/lib/chef/chef_fs/path_utils.rb +11 -10
  164. data/lib/chef/client.rb +80 -71
  165. data/lib/chef/config.rb +10 -10
  166. data/lib/chef/config_fetcher.rb +12 -4
  167. data/lib/chef/constants.rb +2 -1
  168. data/lib/chef/cookbook/chefignore.rb +4 -5
  169. data/lib/chef/cookbook/cookbook_collection.rb +6 -6
  170. data/lib/chef/cookbook/cookbook_version_loader.rb +15 -15
  171. data/lib/chef/cookbook/file_system_file_vendor.rb +4 -4
  172. data/lib/chef/cookbook/file_vendor.rb +3 -4
  173. data/lib/chef/cookbook/metadata.rb +108 -107
  174. data/lib/chef/cookbook/remote_file_vendor.rb +7 -7
  175. data/lib/chef/cookbook/synchronizer.rb +11 -10
  176. data/lib/chef/cookbook/syntax_check.rb +14 -14
  177. data/lib/chef/cookbook_loader.rb +14 -14
  178. data/lib/chef/cookbook_manifest.rb +16 -15
  179. data/lib/chef/cookbook_site_streaming_uploader.rb +22 -22
  180. data/lib/chef/cookbook_uploader.rb +22 -21
  181. data/lib/chef/cookbook_version.rb +87 -87
  182. data/lib/chef/daemon.rb +6 -6
  183. data/lib/chef/data_bag.rb +32 -26
  184. data/lib/chef/data_bag_item.rb +43 -40
  185. data/lib/chef/delayed_evaluator.rb +1 -1
  186. data/lib/chef/deprecation/mixin/template.rb +4 -4
  187. data/lib/chef/deprecation/provider/cookbook_file.rb +2 -3
  188. data/lib/chef/deprecation/provider/file.rb +10 -10
  189. data/lib/chef/deprecation/provider/remote_directory.rb +5 -5
  190. data/lib/chef/deprecation/provider/remote_file.rb +3 -3
  191. data/lib/chef/deprecation/provider/template.rb +3 -3
  192. data/lib/chef/deprecation/warnings.rb +2 -2
  193. data/lib/chef/digester.rb +6 -6
  194. data/lib/chef/dsl.rb +6 -6
  195. data/lib/chef/dsl/audit.rb +4 -4
  196. data/lib/chef/dsl/chef_provisioning.rb +5 -5
  197. data/lib/chef/dsl/cheffish.rb +5 -5
  198. data/lib/chef/dsl/data_query.rb +10 -10
  199. data/lib/chef/dsl/declare_resource.rb +8 -8
  200. data/lib/chef/dsl/definitions.rb +1 -2
  201. data/lib/chef/dsl/include_attribute.rb +4 -6
  202. data/lib/chef/dsl/include_recipe.rb +4 -4
  203. data/lib/chef/dsl/platform_introspection.rb +8 -14
  204. data/lib/chef/dsl/powershell.rb +3 -3
  205. data/lib/chef/dsl/reboot_pending.rb +12 -13
  206. data/lib/chef/dsl/recipe.rb +20 -20
  207. data/lib/chef/dsl/registry_helper.rb +7 -3
  208. data/lib/chef/dsl/resources.rb +6 -5
  209. data/lib/chef/encrypted_data_bag_item.rb +10 -10
  210. data/lib/chef/encrypted_data_bag_item/assertions.rb +4 -4
  211. data/lib/chef/encrypted_data_bag_item/check_encrypted.rb +3 -3
  212. data/lib/chef/encrypted_data_bag_item/decryption_failure.rb +2 -2
  213. data/lib/chef/encrypted_data_bag_item/decryptor.rb +16 -14
  214. data/lib/chef/encrypted_data_bag_item/encrypted_data_bag_item_assertions.rb +1 -1
  215. data/lib/chef/encrypted_data_bag_item/encryption_failure.rb +1 -1
  216. data/lib/chef/encrypted_data_bag_item/encryptor.rb +20 -20
  217. data/lib/chef/encrypted_data_bag_item/unacceptable_encrypted_data_bag_item_format.rb +2 -2
  218. data/lib/chef/encrypted_data_bag_item/unsupported_cipher.rb +2 -2
  219. data/lib/chef/encrypted_data_bag_item/unsupported_encrypted_data_bag_item_format.rb +2 -2
  220. data/lib/chef/environment.rb +41 -34
  221. data/lib/chef/event_dispatch/base.rb +2 -2
  222. data/lib/chef/event_dispatch/dispatcher.rb +2 -2
  223. data/lib/chef/event_dispatch/dsl.rb +6 -5
  224. data/lib/chef/event_loggers/base.rb +3 -3
  225. data/lib/chef/event_loggers/windows_eventlog.rb +11 -11
  226. data/lib/chef/exceptions.rb +23 -34
  227. data/lib/chef/file_access_control.rb +6 -6
  228. data/lib/chef/file_access_control/unix.rb +5 -5
  229. data/lib/chef/file_access_control/windows.rb +5 -5
  230. data/lib/chef/file_cache.rb +21 -21
  231. data/lib/chef/file_content_management/content_base.rb +2 -2
  232. data/lib/chef/file_content_management/deploy.rb +5 -6
  233. data/lib/chef/file_content_management/deploy/cp.rb +2 -2
  234. data/lib/chef/file_content_management/deploy/mv_unix.rb +2 -3
  235. data/lib/chef/file_content_management/deploy/mv_windows.rb +4 -6
  236. data/lib/chef/file_content_management/tempfile.rb +3 -3
  237. data/lib/chef/formatters/base.rb +8 -9
  238. data/lib/chef/formatters/doc.rb +7 -7
  239. data/lib/chef/formatters/error_descriptor.rb +5 -5
  240. data/lib/chef/formatters/error_inspectors.rb +5 -5
  241. data/lib/chef/formatters/error_inspectors/api_error_formatting.rb +50 -15
  242. data/lib/chef/formatters/error_inspectors/compile_error_inspector.rb +11 -11
  243. data/lib/chef/formatters/error_inspectors/cookbook_resolve_error_inspector.rb +8 -8
  244. data/lib/chef/formatters/error_inspectors/cookbook_sync_error_inspector.rb +8 -6
  245. data/lib/chef/formatters/error_inspectors/node_load_error_inspector.rb +14 -13
  246. data/lib/chef/formatters/error_inspectors/registration_error_inspector.rb +19 -17
  247. data/lib/chef/formatters/error_inspectors/resource_failure_inspector.rb +8 -11
  248. data/lib/chef/formatters/error_inspectors/run_list_expansion_error_inspector.rb +15 -14
  249. data/lib/chef/formatters/error_mapper.rb +2 -2
  250. data/lib/chef/formatters/indentable_output_stream.rb +5 -5
  251. data/lib/chef/formatters/minimal.rb +7 -9
  252. data/lib/chef/guard_interpreter.rb +3 -3
  253. data/lib/chef/guard_interpreter/default_guard_interpreter.rb +3 -4
  254. data/lib/chef/guard_interpreter/resource_guard_interpreter.rb +9 -9
  255. data/lib/chef/handler.rb +4 -4
  256. data/lib/chef/handler/error_report.rb +4 -4
  257. data/lib/chef/handler/json_file.rb +5 -5
  258. data/lib/chef/http.rb +32 -35
  259. data/lib/chef/http/auth_credentials.rb +12 -12
  260. data/lib/chef/http/authenticator.rb +17 -12
  261. data/lib/chef/http/basic_client.rb +20 -20
  262. data/lib/chef/http/cookie_jar.rb +7 -7
  263. data/lib/chef/http/cookie_manager.rb +8 -8
  264. data/lib/chef/http/decompressor.rb +7 -9
  265. data/lib/chef/http/http_request.rb +31 -32
  266. data/lib/chef/http/json_input.rb +9 -9
  267. data/lib/chef/http/json_output.rb +9 -9
  268. data/lib/chef/http/json_to_model_output.rb +4 -4
  269. data/lib/chef/http/remote_request_id.rb +6 -6
  270. data/lib/chef/http/simple.rb +23 -5
  271. data/lib/chef/http/simple_json.rb +43 -0
  272. data/lib/chef/http/socketless_chef_zero_client.rb +56 -57
  273. data/lib/chef/http/ssl_policies.rb +9 -9
  274. data/lib/chef/http/validate_content_length.rb +12 -12
  275. data/lib/chef/json_compat.rb +6 -6
  276. data/lib/chef/key.rb +44 -42
  277. data/lib/chef/knife.rb +47 -44
  278. data/lib/chef/knife/bootstrap.rb +32 -32
  279. data/lib/chef/knife/bootstrap/chef_vault_handler.rb +16 -23
  280. data/lib/chef/knife/bootstrap/client_builder.rb +15 -13
  281. data/lib/chef/knife/bootstrap/templates/chef-full.erb +1 -1
  282. data/lib/chef/knife/client_bulk_delete.rb +5 -5
  283. data/lib/chef/knife/client_create.rb +5 -5
  284. data/lib/chef/knife/client_delete.rb +6 -6
  285. data/lib/chef/knife/client_edit.rb +5 -5
  286. data/lib/chef/knife/client_key_create.rb +6 -6
  287. data/lib/chef/knife/client_key_delete.rb +6 -6
  288. data/lib/chef/knife/client_key_edit.rb +8 -9
  289. data/lib/chef/knife/client_key_list.rb +5 -5
  290. data/lib/chef/knife/client_key_show.rb +5 -5
  291. data/lib/chef/knife/client_list.rb +5 -5
  292. data/lib/chef/knife/client_reregister.rb +5 -5
  293. data/lib/chef/knife/client_show.rb +5 -5
  294. data/lib/chef/knife/configure.rb +14 -14
  295. data/lib/chef/knife/configure_client.rb +6 -6
  296. data/lib/chef/knife/cookbook_bulk_delete.rb +9 -10
  297. data/lib/chef/knife/cookbook_create.rb +12 -12
  298. data/lib/chef/knife/cookbook_delete.rb +10 -10
  299. data/lib/chef/knife/cookbook_download.rb +8 -10
  300. data/lib/chef/knife/cookbook_list.rb +5 -5
  301. data/lib/chef/knife/cookbook_metadata.rb +8 -8
  302. data/lib/chef/knife/cookbook_metadata_from_file.rb +5 -5
  303. data/lib/chef/knife/cookbook_show.rb +14 -18
  304. data/lib/chef/knife/cookbook_site_download.rb +22 -22
  305. data/lib/chef/knife/cookbook_site_install.rb +10 -10
  306. data/lib/chef/knife/cookbook_site_list.rb +6 -10
  307. data/lib/chef/knife/cookbook_site_search.rb +5 -10
  308. data/lib/chef/knife/cookbook_site_share.rb +17 -18
  309. data/lib/chef/knife/cookbook_site_show.rb +7 -12
  310. data/lib/chef/knife/cookbook_site_unshare.rb +6 -6
  311. data/lib/chef/knife/cookbook_site_vendor.rb +5 -5
  312. data/lib/chef/knife/cookbook_test.rb +6 -7
  313. data/lib/chef/knife/cookbook_upload.rb +19 -20
  314. data/lib/chef/knife/core/bootstrap_context.rb +25 -21
  315. data/lib/chef/knife/core/cookbook_scm_repo.rb +11 -12
  316. data/lib/chef/knife/core/custom_manifest_loader.rb +2 -2
  317. data/lib/chef/knife/core/gem_glob_loader.rb +11 -11
  318. data/lib/chef/knife/core/generic_presenter.rb +33 -34
  319. data/lib/chef/knife/core/hashed_command_loader.rb +6 -6
  320. data/lib/chef/knife/core/node_editor.rb +59 -38
  321. data/lib/chef/knife/core/node_presenter.rb +13 -14
  322. data/lib/chef/knife/core/object_loader.rb +9 -9
  323. data/lib/chef/knife/core/status_presenter.rb +17 -17
  324. data/lib/chef/knife/core/subcommand_loader.rb +19 -20
  325. data/lib/chef/knife/core/text_formatter.rb +13 -14
  326. data/lib/chef/knife/core/ui.rb +17 -18
  327. data/lib/chef/knife/data_bag_create.rb +11 -10
  328. data/lib/chef/knife/data_bag_delete.rb +6 -8
  329. data/lib/chef/knife/data_bag_edit.rb +8 -11
  330. data/lib/chef/knife/data_bag_from_file.rb +12 -11
  331. data/lib/chef/knife/data_bag_list.rb +4 -8
  332. data/lib/chef/knife/data_bag_secret_options.rb +6 -6
  333. data/lib/chef/knife/data_bag_show.rb +31 -31
  334. data/lib/chef/knife/delete.rb +6 -7
  335. data/lib/chef/knife/deps.rb +18 -18
  336. data/lib/chef/knife/diff.rb +8 -9
  337. data/lib/chef/knife/download.rb +11 -12
  338. data/lib/chef/knife/edit.rb +5 -6
  339. data/lib/chef/knife/environment_compare.rb +23 -23
  340. data/lib/chef/knife/environment_create.rb +5 -5
  341. data/lib/chef/knife/environment_delete.rb +5 -5
  342. data/lib/chef/knife/environment_edit.rb +5 -5
  343. data/lib/chef/knife/environment_from_file.rb +4 -5
  344. data/lib/chef/knife/environment_list.rb +5 -5
  345. data/lib/chef/knife/environment_show.rb +5 -5
  346. data/lib/chef/knife/exec.rb +7 -7
  347. data/lib/chef/knife/help.rb +7 -9
  348. data/lib/chef/knife/index_rebuild.rb +4 -5
  349. data/lib/chef/knife/key_create.rb +5 -5
  350. data/lib/chef/knife/key_create_base.rb +1 -1
  351. data/lib/chef/knife/key_delete.rb +2 -2
  352. data/lib/chef/knife/key_edit.rb +5 -5
  353. data/lib/chef/knife/key_edit_base.rb +1 -1
  354. data/lib/chef/knife/key_list.rb +12 -12
  355. data/lib/chef/knife/key_list_base.rb +1 -1
  356. data/lib/chef/knife/key_show.rb +4 -4
  357. data/lib/chef/knife/list.rb +14 -13
  358. data/lib/chef/knife/node_bulk_delete.rb +6 -12
  359. data/lib/chef/knife/node_create.rb +5 -8
  360. data/lib/chef/knife/node_delete.rb +5 -6
  361. data/lib/chef/knife/node_edit.rb +6 -8
  362. data/lib/chef/knife/node_environment_set.rb +4 -4
  363. data/lib/chef/knife/node_from_file.rb +10 -10
  364. data/lib/chef/knife/node_list.rb +5 -7
  365. data/lib/chef/knife/node_run_list_add.rb +8 -8
  366. data/lib/chef/knife/node_run_list_remove.rb +8 -8
  367. data/lib/chef/knife/node_run_list_set.rb +6 -6
  368. data/lib/chef/knife/node_show.rb +6 -7
  369. data/lib/chef/knife/osc_user_create.rb +5 -5
  370. data/lib/chef/knife/osc_user_delete.rb +5 -5
  371. data/lib/chef/knife/osc_user_edit.rb +5 -5
  372. data/lib/chef/knife/osc_user_list.rb +5 -5
  373. data/lib/chef/knife/osc_user_reregister.rb +5 -5
  374. data/lib/chef/knife/osc_user_show.rb +5 -5
  375. data/lib/chef/knife/raw.rb +18 -17
  376. data/lib/chef/knife/recipe_list.rb +4 -4
  377. data/lib/chef/knife/rehash.rb +9 -9
  378. data/lib/chef/knife/role_bulk_delete.rb +5 -10
  379. data/lib/chef/knife/role_create.rb +5 -7
  380. data/lib/chef/knife/role_delete.rb +5 -6
  381. data/lib/chef/knife/role_edit.rb +5 -8
  382. data/lib/chef/knife/role_env_run_list_add.rb +9 -9
  383. data/lib/chef/knife/role_env_run_list_clear.rb +4 -4
  384. data/lib/chef/knife/role_env_run_list_remove.rb +13 -13
  385. data/lib/chef/knife/role_env_run_list_replace.rb +6 -6
  386. data/lib/chef/knife/role_env_run_list_set.rb +6 -6
  387. data/lib/chef/knife/role_from_file.rb +6 -11
  388. data/lib/chef/knife/role_list.rb +5 -6
  389. data/lib/chef/knife/role_run_list_add.rb +9 -9
  390. data/lib/chef/knife/role_run_list_clear.rb +4 -4
  391. data/lib/chef/knife/role_run_list_remove.rb +13 -13
  392. data/lib/chef/knife/role_run_list_replace.rb +6 -6
  393. data/lib/chef/knife/role_run_list_set.rb +6 -6
  394. data/lib/chef/knife/role_show.rb +5 -8
  395. data/lib/chef/knife/search.rb +11 -11
  396. data/lib/chef/knife/serve.rb +10 -10
  397. data/lib/chef/knife/show.rb +4 -4
  398. data/lib/chef/knife/ssh.rb +34 -34
  399. data/lib/chef/knife/ssl_check.rb +12 -11
  400. data/lib/chef/knife/ssl_fetch.rb +13 -15
  401. data/lib/chef/knife/status.rb +10 -10
  402. data/lib/chef/knife/tag_create.rb +5 -5
  403. data/lib/chef/knife/tag_delete.rb +5 -5
  404. data/lib/chef/knife/tag_list.rb +5 -5
  405. data/lib/chef/knife/upload.rb +10 -11
  406. data/lib/chef/knife/user_create.rb +6 -8
  407. data/lib/chef/knife/user_delete.rb +6 -7
  408. data/lib/chef/knife/user_edit.rb +6 -7
  409. data/lib/chef/knife/user_key_create.rb +7 -7
  410. data/lib/chef/knife/user_key_delete.rb +6 -6
  411. data/lib/chef/knife/user_key_edit.rb +8 -9
  412. data/lib/chef/knife/user_key_list.rb +5 -5
  413. data/lib/chef/knife/user_key_show.rb +5 -5
  414. data/lib/chef/knife/user_list.rb +5 -5
  415. data/lib/chef/knife/user_reregister.rb +6 -7
  416. data/lib/chef/knife/user_show.rb +6 -6
  417. data/lib/chef/knife/xargs.rb +22 -23
  418. data/lib/chef/local_mode.rb +13 -11
  419. data/lib/chef/log.rb +10 -10
  420. data/lib/chef/log/syslog.rb +5 -6
  421. data/lib/chef/log/winevt.rb +12 -12
  422. data/lib/chef/mash.rb +6 -5
  423. data/lib/chef/mixin/api_version_request_handling.rb +1 -1
  424. data/lib/chef/mixin/checksum.rb +4 -4
  425. data/lib/chef/mixin/command.rb +13 -13
  426. data/lib/chef/mixin/command/unix.rb +7 -7
  427. data/lib/chef/mixin/command/windows.rb +6 -7
  428. data/lib/chef/mixin/convert_to_class_name.rb +11 -11
  429. data/lib/chef/mixin/create_path.rb +3 -3
  430. data/lib/chef/mixin/deep_merge.rb +3 -3
  431. data/lib/chef/mixin/deprecation.rb +24 -25
  432. data/lib/chef/mixin/descendants_tracker.rb +2 -3
  433. data/lib/chef/mixin/enforce_ownership_and_permissions.rb +3 -3
  434. data/lib/chef/mixin/file_class.rb +9 -11
  435. data/lib/chef/mixin/from_file.rb +3 -3
  436. data/lib/chef/mixin/get_source_from_package.rb +2 -3
  437. data/lib/chef/mixin/homebrew_user.rb +6 -6
  438. data/lib/chef/mixin/language.rb +5 -5
  439. data/lib/chef/mixin/language_include_attribute.rb +4 -5
  440. data/lib/chef/mixin/language_include_recipe.rb +4 -5
  441. data/lib/chef/mixin/params_validate.rb +38 -18
  442. data/lib/chef/mixin/path_sanity.rb +7 -7
  443. data/lib/chef/mixin/powershell_out.rb +5 -5
  444. data/lib/chef/mixin/powershell_type_coercions.rb +12 -10
  445. data/lib/chef/mixin/properties.rb +8 -8
  446. data/lib/chef/mixin/provides.rb +2 -2
  447. data/lib/chef/mixin/proxified_socket.rb +4 -4
  448. data/lib/chef/mixin/recipe_definition_dsl_core.rb +4 -4
  449. data/lib/chef/mixin/securable.rb +24 -27
  450. data/lib/chef/mixin/shell_out.rb +10 -10
  451. data/lib/chef/mixin/subclass_directive.rb +2 -2
  452. data/lib/chef/mixin/template.rb +8 -9
  453. data/lib/chef/mixin/unformatter.rb +1 -1
  454. data/lib/chef/mixin/uris.rb +2 -3
  455. data/lib/chef/mixin/which.rb +3 -3
  456. data/lib/chef/mixin/why_run.rb +6 -7
  457. data/lib/chef/mixin/wide_string.rb +7 -7
  458. data/lib/chef/mixin/windows_architecture_helper.rb +9 -10
  459. data/lib/chef/mixin/windows_env_helper.rb +10 -11
  460. data/lib/chef/mixin/xml_escape.rb +13 -13
  461. data/lib/chef/mixins.rb +13 -14
  462. data/lib/chef/monkey_patches/net-ssh-multi.rb +6 -6
  463. data/lib/chef/monkey_patches/net_http.rb +2 -2
  464. data/lib/chef/monkey_patches/webrick-utils.rb +6 -6
  465. data/lib/chef/monkey_patches/win32/registry.rb +6 -6
  466. data/lib/chef/monologger.rb +2 -4
  467. data/lib/chef/node.rb +66 -60
  468. data/lib/chef/node/attribute.rb +289 -289
  469. data/lib/chef/node/attribute_collections.rb +8 -8
  470. data/lib/chef/node/immutable_collections.rb +3 -3
  471. data/lib/chef/node_map.rb +11 -11
  472. data/lib/chef/null_logger.rb +3 -3
  473. data/lib/chef/org.rb +31 -30
  474. data/lib/chef/platform.rb +4 -4
  475. data/lib/chef/platform/handler_map.rb +2 -2
  476. data/lib/chef/platform/priority_map.rb +2 -2
  477. data/lib/chef/platform/provider_handler_map.rb +3 -3
  478. data/lib/chef/platform/provider_mapping.rb +33 -33
  479. data/lib/chef/platform/provider_priority_map.rb +2 -2
  480. data/lib/chef/platform/query_helpers.rb +10 -11
  481. data/lib/chef/platform/rebooter.rb +11 -11
  482. data/lib/chef/platform/resource_handler_map.rb +3 -3
  483. data/lib/chef/platform/resource_priority_map.rb +2 -2
  484. data/lib/chef/platform/service_helpers.rb +5 -5
  485. data/lib/chef/policy_builder.rb +5 -5
  486. data/lib/chef/policy_builder/dynamic.rb +10 -11
  487. data/lib/chef/policy_builder/expand_node_object.rb +24 -19
  488. data/lib/chef/policy_builder/policyfile.rb +13 -14
  489. data/lib/chef/property.rb +115 -49
  490. data/lib/chef/provider.rb +43 -43
  491. data/lib/chef/provider/apt_update.rb +79 -0
  492. data/lib/chef/provider/batch.rb +6 -6
  493. data/lib/chef/provider/breakpoint.rb +1 -1
  494. data/lib/chef/provider/cookbook_file.rb +5 -5
  495. data/lib/chef/provider/cookbook_file/content.rb +4 -4
  496. data/lib/chef/provider/cron.rb +8 -8
  497. data/lib/chef/provider/cron/aix.rb +1 -1
  498. data/lib/chef/provider/cron/solaris.rb +1 -1
  499. data/lib/chef/provider/cron/unix.rb +7 -7
  500. data/lib/chef/provider/deploy.rb +7 -8
  501. data/lib/chef/provider/deploy/revision.rb +9 -9
  502. data/lib/chef/provider/deploy/timestamped.rb +1 -1
  503. data/lib/chef/provider/directory.rb +8 -8
  504. data/lib/chef/provider/dsc_resource.rb +33 -27
  505. data/lib/chef/provider/dsc_script.rb +17 -17
  506. data/lib/chef/provider/env.rb +8 -8
  507. data/lib/chef/provider/env/windows.rb +3 -3
  508. data/lib/chef/provider/erl_call.rb +5 -5
  509. data/lib/chef/provider/execute.rb +8 -8
  510. data/lib/chef/provider/file.rb +24 -24
  511. data/lib/chef/provider/file/content.rb +4 -4
  512. data/lib/chef/provider/git.rb +33 -35
  513. data/lib/chef/provider/group.rb +7 -7
  514. data/lib/chef/provider/group/aix.rb +6 -6
  515. data/lib/chef/provider/group/dscl.rb +11 -11
  516. data/lib/chef/provider/group/gpasswd.rb +3 -3
  517. data/lib/chef/provider/group/groupadd.rb +8 -8
  518. data/lib/chef/provider/group/groupmod.rb +3 -3
  519. data/lib/chef/provider/group/pw.rb +2 -2
  520. data/lib/chef/provider/group/suse.rb +5 -5
  521. data/lib/chef/provider/group/usermod.rb +8 -8
  522. data/lib/chef/provider/group/windows.rb +5 -5
  523. data/lib/chef/provider/http_request.rb +15 -15
  524. data/lib/chef/provider/ifconfig.rb +15 -14
  525. data/lib/chef/provider/ifconfig/aix.rb +5 -4
  526. data/lib/chef/provider/ifconfig/debian.rb +6 -6
  527. data/lib/chef/provider/ifconfig/redhat.rb +3 -3
  528. data/lib/chef/provider/link.rb +13 -13
  529. data/lib/chef/provider/log.rb +1 -1
  530. data/lib/chef/provider/lwrp_base.rb +8 -8
  531. data/lib/chef/provider/mdadm.rb +4 -4
  532. data/lib/chef/provider/mount.rb +13 -13
  533. data/lib/chef/provider/mount/aix.rb +14 -14
  534. data/lib/chef/provider/mount/mount.rb +18 -18
  535. data/lib/chef/provider/mount/solaris.rb +30 -30
  536. data/lib/chef/provider/mount/windows.rb +4 -4
  537. data/lib/chef/provider/ohai.rb +2 -2
  538. data/lib/chef/provider/osx_profile.rb +256 -0
  539. data/lib/chef/provider/package.rb +19 -19
  540. data/lib/chef/provider/package/aix.rb +8 -9
  541. data/lib/chef/provider/package/apt.rb +12 -12
  542. data/lib/chef/provider/package/chocolatey.rb +277 -0
  543. data/lib/chef/provider/package/dpkg.rb +7 -7
  544. data/lib/chef/provider/package/easy_install.rb +14 -15
  545. data/lib/chef/provider/package/freebsd/base.rb +7 -7
  546. data/lib/chef/provider/package/freebsd/pkg.rb +8 -8
  547. data/lib/chef/provider/package/freebsd/pkgng.rb +6 -6
  548. data/lib/chef/provider/package/freebsd/port.rb +4 -4
  549. data/lib/chef/provider/package/homebrew.rb +16 -16
  550. data/lib/chef/provider/package/ips.rb +8 -8
  551. data/lib/chef/provider/package/macports.rb +1 -0
  552. data/lib/chef/provider/package/openbsd.rb +13 -13
  553. data/lib/chef/provider/package/pacman.rb +6 -9
  554. data/lib/chef/provider/package/paludis.rb +7 -10
  555. data/lib/chef/provider/package/portage.rb +10 -13
  556. data/lib/chef/provider/package/rpm.rb +7 -8
  557. data/lib/chef/provider/package/rubygems.rb +64 -64
  558. data/lib/chef/provider/package/smartos.rb +7 -10
  559. data/lib/chef/provider/package/solaris.rb +6 -11
  560. data/lib/chef/provider/package/windows.rb +38 -29
  561. data/lib/chef/provider/package/windows/exe.rb +9 -21
  562. data/lib/chef/provider/package/windows/msi.rb +12 -12
  563. data/lib/chef/provider/package/windows/registry_uninstall_entry.rb +7 -7
  564. data/lib/chef/provider/package/yum-dump.py +1 -1
  565. data/lib/chef/provider/package/yum.rb +43 -44
  566. data/lib/chef/provider/package/zypper.rb +57 -47
  567. data/lib/chef/provider/powershell_script.rb +14 -14
  568. data/lib/chef/provider/reboot.rb +5 -5
  569. data/lib/chef/provider/registry_key.rb +16 -16
  570. data/lib/chef/provider/remote_directory.rb +15 -15
  571. data/lib/chef/provider/remote_file.rb +5 -5
  572. data/lib/chef/provider/remote_file/cache_control_data.rb +11 -12
  573. data/lib/chef/provider/remote_file/content.rb +11 -11
  574. data/lib/chef/provider/remote_file/fetcher.rb +2 -2
  575. data/lib/chef/provider/remote_file/ftp.rb +11 -11
  576. data/lib/chef/provider/remote_file/http.rb +9 -9
  577. data/lib/chef/provider/remote_file/local_file.rb +5 -5
  578. data/lib/chef/provider/remote_file/network_file.rb +4 -4
  579. data/lib/chef/provider/route.rb +188 -188
  580. data/lib/chef/provider/ruby_block.rb +3 -3
  581. data/lib/chef/provider/script.rb +5 -5
  582. data/lib/chef/provider/service.rb +30 -30
  583. data/lib/chef/provider/service/aix.rb +4 -4
  584. data/lib/chef/provider/service/aixinit.rb +12 -12
  585. data/lib/chef/provider/service/arch.rb +5 -5
  586. data/lib/chef/provider/service/debian.rb +12 -13
  587. data/lib/chef/provider/service/freebsd.rb +7 -7
  588. data/lib/chef/provider/service/gentoo.rb +5 -5
  589. data/lib/chef/provider/service/init.rb +4 -4
  590. data/lib/chef/provider/service/insserv.rb +4 -4
  591. data/lib/chef/provider/service/invokercd.rb +3 -3
  592. data/lib/chef/provider/service/macosx.rb +19 -19
  593. data/lib/chef/provider/service/openbsd.rb +14 -14
  594. data/lib/chef/provider/service/redhat.rb +6 -6
  595. data/lib/chef/provider/service/simple.rb +10 -9
  596. data/lib/chef/provider/service/solaris.rb +8 -8
  597. data/lib/chef/provider/service/systemd.rb +4 -4
  598. data/lib/chef/provider/service/upstart.rb +8 -8
  599. data/lib/chef/provider/service/windows.rb +32 -78
  600. data/lib/chef/provider/subversion.rb +13 -13
  601. data/lib/chef/provider/template.rb +7 -7
  602. data/lib/chef/provider/template/content.rb +4 -4
  603. data/lib/chef/provider/template_finder.rb +2 -1
  604. data/lib/chef/provider/user.rb +9 -10
  605. data/lib/chef/provider/user/aix.rb +4 -3
  606. data/lib/chef/provider/user/dscl.rb +39 -40
  607. data/lib/chef/provider/user/pw.rb +9 -9
  608. data/lib/chef/provider/user/solaris.rb +9 -9
  609. data/lib/chef/provider/user/useradd.rb +9 -9
  610. data/lib/chef/provider/user/windows.rb +13 -13
  611. data/lib/chef/provider/whyrun_safe_ruby_block.rb +1 -1
  612. data/lib/chef/provider/windows_script.rb +5 -5
  613. data/lib/chef/provider_resolver.rb +3 -3
  614. data/lib/chef/providers.rb +113 -110
  615. data/lib/chef/recipe.rb +13 -14
  616. data/lib/chef/request_id.rb +4 -4
  617. data/lib/chef/resource.rb +103 -93
  618. data/lib/chef/resource/action_class.rb +3 -3
  619. data/lib/chef/resource/apt_package.rb +6 -17
  620. data/lib/chef/{shell/shell_rest.rb → resource/apt_update.rb} +14 -9
  621. data/lib/chef/resource/bash.rb +5 -5
  622. data/lib/chef/resource/batch.rb +4 -4
  623. data/lib/chef/resource/bff_package.rb +3 -3
  624. data/lib/chef/resource/breakpoint.rb +3 -4
  625. data/lib/chef/resource/chef_gem.rb +9 -25
  626. data/lib/chef/resource/chocolatey_package.rb +39 -0
  627. data/lib/chef/resource/conditional.rb +8 -8
  628. data/lib/chef/resource/conditional_action_not_nothing.rb +1 -1
  629. data/lib/chef/resource/cookbook_file.rb +10 -10
  630. data/lib/chef/resource/cron.rb +33 -33
  631. data/lib/chef/resource/csh.rb +5 -5
  632. data/lib/chef/resource/deploy.rb +76 -76
  633. data/lib/chef/resource/deploy_revision.rb +1 -1
  634. data/lib/chef/resource/directory.rb +12 -12
  635. data/lib/chef/resource/dpkg_package.rb +5 -6
  636. data/lib/chef/resource/dsc_resource.rb +121 -120
  637. data/lib/chef/resource/dsc_script.rb +25 -25
  638. data/lib/chef/resource/easy_install_package.rb +6 -25
  639. data/lib/chef/resource/env.rb +9 -9
  640. data/lib/chef/resource/erl_call.rb +15 -15
  641. data/lib/chef/resource/execute.rb +28 -28
  642. data/lib/chef/resource/file.rb +20 -87
  643. data/lib/chef/resource/file/verification.rb +11 -11
  644. data/lib/chef/resource/freebsd_package.rb +10 -9
  645. data/lib/chef/resource/gem_package.rb +8 -23
  646. data/lib/chef/resource/git.rb +4 -4
  647. data/lib/chef/resource/group.rb +18 -19
  648. data/lib/chef/resource/homebrew_package.rb +7 -18
  649. data/lib/chef/resource/http_request.rb +12 -12
  650. data/lib/chef/resource/ifconfig.rb +28 -28
  651. data/lib/chef/resource/ips_package.rb +5 -16
  652. data/lib/chef/resource/ksh.rb +3 -3
  653. data/lib/chef/resource/link.rb +18 -17
  654. data/lib/chef/resource/log.rb +9 -9
  655. data/lib/chef/resource/lwrp_base.rb +10 -10
  656. data/lib/chef/resource/macosx_service.rb +7 -7
  657. data/lib/chef/resource/macports_package.rb +3 -2
  658. data/lib/chef/resource/mdadm.rb +18 -19
  659. data/lib/chef/resource/mount.rb +34 -34
  660. data/lib/chef/resource/ohai.rb +7 -7
  661. data/lib/chef/resource/openbsd_package.rb +7 -6
  662. data/lib/chef/resource/osx_profile.rb +74 -0
  663. data/lib/chef/resource/package.rb +15 -69
  664. data/lib/chef/resource/pacman_package.rb +3 -2
  665. data/lib/chef/resource/paludis_package.rb +5 -7
  666. data/lib/chef/resource/perl.rb +5 -5
  667. data/lib/chef/resource/portage_package.rb +5 -4
  668. data/lib/chef/resource/powershell_script.rb +7 -7
  669. data/lib/chef/resource/python.rb +5 -5
  670. data/lib/chef/resource/reboot.rb +6 -6
  671. data/lib/chef/resource/registry_key.rb +15 -15
  672. data/lib/chef/resource/remote_directory.rb +23 -24
  673. data/lib/chef/resource/remote_file.rb +21 -21
  674. data/lib/chef/resource/resource_notification.rb +2 -2
  675. data/lib/chef/resource/route.rb +26 -26
  676. data/lib/chef/resource/rpm_package.rb +5 -15
  677. data/lib/chef/resource/ruby.rb +5 -5
  678. data/lib/chef/resource/ruby_block.rb +8 -8
  679. data/lib/chef/resource/scm.rb +36 -37
  680. data/lib/chef/resource/script.rb +13 -13
  681. data/lib/chef/resource/service.rb +32 -32
  682. data/lib/chef/resource/smartos_package.rb +4 -3
  683. data/lib/chef/resource/solaris_package.rb +4 -3
  684. data/lib/chef/resource/subversion.rb +6 -6
  685. data/lib/chef/resource/template.rb +19 -19
  686. data/lib/chef/resource/timestamped_deploy.rb +1 -1
  687. data/lib/chef/resource/user.rb +31 -31
  688. data/lib/chef/resource/whyrun_safe_ruby_block.rb +1 -1
  689. data/lib/chef/resource/windows_package.rb +21 -66
  690. data/lib/chef/resource/windows_script.rb +8 -8
  691. data/lib/chef/resource/windows_service.rb +9 -9
  692. data/lib/chef/resource/yum_package.rb +18 -42
  693. data/lib/chef/resource/zypper_package.rb +3 -2
  694. data/lib/chef/resource_builder.rb +4 -4
  695. data/lib/chef/resource_collection.rb +11 -11
  696. data/lib/chef/resource_collection/resource_collection_serialization.rb +5 -5
  697. data/lib/chef/resource_collection/resource_list.rb +6 -6
  698. data/lib/chef/resource_collection/resource_set.rb +6 -6
  699. data/lib/chef/resource_collection/stepable_iterator.rb +4 -4
  700. data/lib/chef/resource_definition.rb +7 -7
  701. data/lib/chef/resource_definition_list.rb +5 -5
  702. data/lib/chef/resource_reporter.rb +14 -15
  703. data/lib/chef/resource_resolver.rb +4 -5
  704. data/lib/chef/resources.rb +71 -68
  705. data/lib/chef/rest.rb +23 -23
  706. data/lib/chef/role.rb +49 -43
  707. data/lib/chef/run_context.rb +21 -23
  708. data/lib/chef/run_context/cookbook_compiler.rb +10 -13
  709. data/lib/chef/run_list.rb +17 -17
  710. data/lib/chef/run_list/run_list_expansion.rb +22 -26
  711. data/lib/chef/run_list/run_list_item.rb +8 -9
  712. data/lib/chef/run_list/versioned_recipe_list.rb +13 -13
  713. data/lib/chef/run_lock.rb +12 -12
  714. data/lib/chef/run_status.rb +3 -3
  715. data/lib/chef/runner.rb +11 -12
  716. data/lib/chef/scan_access_control.rb +7 -7
  717. data/lib/chef/search/query.rb +30 -16
  718. data/lib/chef/server_api.rb +42 -10
  719. data/lib/chef/shell.rb +24 -25
  720. data/lib/chef/shell/ext.rb +31 -31
  721. data/lib/chef/shell/model_wrapper.rb +7 -8
  722. data/lib/chef/shell/shell_session.rb +20 -19
  723. data/lib/chef/shell_out.rb +2 -2
  724. data/lib/chef/tasks/chef_repo.rake +62 -63
  725. data/lib/chef/user.rb +38 -37
  726. data/lib/chef/user_v1.rb +53 -58
  727. data/lib/chef/util/backup.rb +6 -6
  728. data/lib/chef/util/diff.rb +8 -8
  729. data/lib/chef/util/dsc/configuration_generator.rb +11 -11
  730. data/lib/chef/util/dsc/lcm_output_parser.rb +8 -8
  731. data/lib/chef/util/dsc/local_configuration_manager.rb +9 -9
  732. data/lib/chef/util/dsc/resource_info.rb +15 -15
  733. data/lib/chef/util/dsc/resource_store.rb +73 -74
  734. data/lib/chef/util/editor.rb +1 -2
  735. data/lib/chef/util/file_edit.rb +5 -5
  736. data/lib/chef/util/path_helper.rb +2 -2
  737. data/lib/chef/util/powershell/cmdlet.rb +119 -119
  738. data/lib/chef/util/powershell/cmdlet_result.rb +36 -36
  739. data/lib/chef/util/powershell/ps_credential.rb +2 -2
  740. data/lib/chef/util/selinux.rb +6 -6
  741. data/lib/chef/util/threaded_job_queue.rb +2 -2
  742. data/lib/chef/util/windows.rb +1 -1
  743. data/lib/chef/util/windows/net_group.rb +84 -85
  744. data/lib/chef/util/windows/net_use.rb +6 -6
  745. data/lib/chef/util/windows/net_user.rb +9 -8
  746. data/lib/chef/util/windows/volume.rb +3 -3
  747. data/lib/chef/version.rb +2 -2
  748. data/lib/chef/version/platform.rb +5 -5
  749. data/lib/chef/version_class.rb +6 -6
  750. data/lib/chef/version_constraint.rb +13 -13
  751. data/lib/chef/version_constraint/platform.rb +3 -3
  752. data/lib/chef/whitelist.rb +2 -2
  753. data/lib/chef/win32/api.rb +13 -8
  754. data/lib/chef/win32/api/crypto.rb +63 -63
  755. data/lib/chef/win32/api/error.rb +11 -10
  756. data/lib/chef/win32/api/file.rb +17 -16
  757. data/lib/chef/win32/api/installer.rb +15 -16
  758. data/lib/chef/win32/api/memory.rb +4 -4
  759. data/lib/chef/win32/api/net.rb +111 -123
  760. data/lib/chef/win32/api/process.rb +4 -4
  761. data/lib/chef/win32/api/psapi.rb +4 -4
  762. data/lib/chef/win32/api/registry.rb +4 -4
  763. data/lib/chef/win32/api/security.rb +51 -26
  764. data/lib/chef/win32/api/synchronization.rb +4 -4
  765. data/lib/chef/win32/api/system.rb +4 -4
  766. data/lib/chef/win32/api/unicode.rb +4 -4
  767. data/lib/chef/win32/crypto.rb +50 -50
  768. data/lib/chef/win32/error.rb +18 -15
  769. data/lib/chef/win32/eventlog.rb +2 -2
  770. data/lib/chef/win32/file.rb +14 -14
  771. data/lib/chef/win32/file/info.rb +3 -4
  772. data/lib/chef/win32/file/version_info.rb +4 -4
  773. data/lib/chef/win32/handle.rb +6 -6
  774. data/lib/chef/win32/memory.rb +4 -4
  775. data/lib/chef/win32/mutex.rb +4 -4
  776. data/lib/chef/win32/net.rb +26 -59
  777. data/lib/chef/win32/process.rb +7 -7
  778. data/lib/chef/win32/registry.rb +19 -33
  779. data/lib/chef/win32/security.rb +82 -20
  780. data/lib/chef/win32/security/ace.rb +6 -6
  781. data/lib/chef/win32/security/acl.rb +8 -8
  782. data/lib/chef/win32/security/securable_object.rb +5 -5
  783. data/lib/chef/win32/security/security_descriptor.rb +5 -5
  784. data/lib/chef/win32/security/sid.rb +81 -43
  785. data/lib/chef/win32/security/token.rb +6 -6
  786. data/lib/chef/win32/system.rb +4 -4
  787. data/lib/chef/win32/unicode.rb +7 -7
  788. data/lib/chef/win32/version.rb +26 -26
  789. data/lib/chef/workstation_config_loader.rb +2 -2
  790. data/spec/data/apt/chef-integration-test-1.0/debian/copyright +2 -2
  791. data/spec/data/apt/chef-integration-test-1.1/debian/copyright +2 -2
  792. data/spec/data/apt/chef-integration-test2-1.0/debian/copyright +2 -2
  793. data/spec/data/cookbooks/name-mismatch-versionnumber/recipes/default.rb +1 -1
  794. data/spec/data/cookbooks/supports-platform-constraints/metadata.rb +5 -0
  795. data/spec/data/incomplete-metadata-chef-repo/incomplete-metadata/recipes/default.rb +1 -1
  796. data/spec/data/invalid-metadata-chef-repo/invalid-metadata/metadata.rb +1 -2
  797. data/spec/data/invalid-metadata-chef-repo/invalid-metadata/recipes/default.rb +1 -1
  798. data/spec/functional/application_spec.rb +7 -7
  799. data/spec/functional/assets/chocolatey_feed/test-A.1.0.nupkg +0 -0
  800. data/spec/functional/assets/chocolatey_feed/test-A.1.5.nupkg +0 -0
  801. data/spec/functional/assets/chocolatey_feed/test-A.2.0.nupkg +0 -0
  802. data/spec/functional/assets/chocolatey_feed/test-B.1.0.nupkg +0 -0
  803. data/spec/functional/audit/rspec_formatter_spec.rb +8 -8
  804. data/spec/functional/audit/runner_spec.rb +9 -9
  805. data/spec/functional/dsl/reboot_pending_spec.rb +10 -15
  806. data/spec/functional/dsl/registry_helper_spec.rb +8 -10
  807. data/spec/functional/event_loggers/windows_eventlog_spec.rb +27 -22
  808. data/spec/functional/file_content_management/deploy_strategies_spec.rb +9 -10
  809. data/spec/functional/http/simple_spec.rb +11 -11
  810. data/spec/functional/knife/configure_spec.rb +5 -10
  811. data/spec/functional/knife/cookbook_delete_spec.rb +11 -11
  812. data/spec/functional/knife/exec_spec.rb +6 -6
  813. data/spec/functional/knife/smoke_test.rb +11 -3
  814. data/spec/functional/knife/ssh_spec.rb +22 -22
  815. data/spec/functional/mixin/powershell_out_spec.rb +3 -3
  816. data/spec/functional/mixin/shell_out_spec.rb +12 -12
  817. data/spec/functional/notifications_spec.rb +6 -7
  818. data/spec/functional/provider/remote_file/cache_control_data_spec.rb +11 -12
  819. data/spec/functional/provider/whyrun_safe_ruby_block_spec.rb +4 -4
  820. data/spec/functional/rebooter_spec.rb +12 -12
  821. data/spec/functional/resource/aix_service_spec.rb +7 -8
  822. data/spec/functional/resource/aixinit_service_spec.rb +20 -20
  823. data/spec/functional/resource/base.rb +1 -3
  824. data/spec/functional/resource/bash_spec.rb +6 -6
  825. data/spec/functional/resource/batch_spec.rb +5 -5
  826. data/spec/functional/resource/bff_spec.rb +10 -12
  827. data/spec/functional/resource/chocolatey_package_spec.rb +124 -0
  828. data/spec/functional/resource/cookbook_file_spec.rb +9 -9
  829. data/spec/functional/resource/cron_spec.rb +13 -13
  830. data/spec/functional/resource/deploy_revision_spec.rb +18 -18
  831. data/spec/functional/resource/directory_spec.rb +4 -4
  832. data/spec/functional/resource/dpkg_package_spec.rb +38 -38
  833. data/spec/functional/resource/dsc_resource_spec.rb +17 -22
  834. data/spec/functional/resource/dsc_script_spec.rb +104 -106
  835. data/spec/functional/resource/env_spec.rb +30 -30
  836. data/spec/functional/resource/execute_spec.rb +10 -10
  837. data/spec/functional/resource/file_spec.rb +12 -13
  838. data/spec/functional/resource/git_spec.rb +20 -20
  839. data/spec/functional/resource/group_spec.rb +21 -21
  840. data/spec/functional/resource/ifconfig_spec.rb +11 -11
  841. data/spec/functional/resource/link_spec.rb +140 -135
  842. data/spec/functional/resource/mount_spec.rb +17 -29
  843. data/spec/functional/resource/ohai_spec.rb +5 -8
  844. data/spec/functional/resource/package_spec.rb +11 -13
  845. data/spec/functional/resource/powershell_script_spec.rb +60 -60
  846. data/spec/functional/resource/reboot_spec.rb +12 -12
  847. data/spec/functional/resource/registry_spec.rb +71 -72
  848. data/spec/functional/resource/remote_directory_spec.rb +23 -23
  849. data/spec/functional/resource/remote_file_spec.rb +17 -17
  850. data/spec/functional/resource/rpm_spec.rb +14 -14
  851. data/spec/functional/resource/template_spec.rb +8 -8
  852. data/spec/functional/resource/user/dscl_spec.rb +3 -3
  853. data/spec/functional/resource/user/useradd_spec.rb +31 -37
  854. data/spec/functional/resource/user/windows_spec.rb +20 -20
  855. data/spec/functional/resource/windows_package_spec.rb +26 -35
  856. data/spec/functional/resource/windows_service_spec.rb +12 -8
  857. data/spec/functional/rest_spec.rb +6 -5
  858. data/spec/functional/run_lock_spec.rb +15 -14
  859. data/spec/functional/shell_spec.rb +11 -10
  860. data/spec/functional/tiny_server_spec.rb +18 -18
  861. data/spec/functional/util/path_helper_spec.rb +5 -5
  862. data/spec/functional/util/powershell/cmdlet_spec.rb +24 -27
  863. data/spec/functional/version_spec.rb +6 -6
  864. data/spec/functional/win32/crypto_spec.rb +7 -10
  865. data/spec/functional/win32/registry_spec.rb +105 -107
  866. data/spec/functional/win32/security_spec.rb +17 -17
  867. data/spec/functional/win32/service_manager_spec.rb +7 -8
  868. data/spec/functional/win32/sid_spec.rb +13 -13
  869. data/spec/functional/win32/version_info_spec.rb +7 -7
  870. data/spec/functional/win32/versions_spec.rb +13 -13
  871. data/spec/integration/client/client_spec.rb +65 -66
  872. data/spec/integration/client/ipv6_spec.rb +15 -16
  873. data/spec/integration/knife/chef_fs_data_store_spec.rb +432 -246
  874. data/spec/integration/knife/chef_repo_path_spec.rb +261 -261
  875. data/spec/integration/knife/chef_repository_file_system_spec.rb +84 -84
  876. data/spec/integration/knife/chefignore_spec.rb +82 -82
  877. data/spec/integration/knife/common_options_spec.rb +41 -41
  878. data/spec/integration/knife/cookbook_api_ipv6_spec.rb +9 -9
  879. data/spec/integration/knife/delete_spec.rb +262 -248
  880. data/spec/integration/knife/deps_spec.rb +301 -301
  881. data/spec/integration/knife/diff_spec.rb +237 -237
  882. data/spec/integration/knife/download_spec.rb +532 -401
  883. data/spec/integration/knife/list_spec.rb +310 -116
  884. data/spec/integration/knife/raw_spec.rb +39 -39
  885. data/spec/integration/knife/redirection_spec.rb +12 -12
  886. data/spec/integration/knife/serve_spec.rb +12 -12
  887. data/spec/integration/knife/show_spec.rb +59 -59
  888. data/spec/integration/knife/upload_spec.rb +661 -550
  889. data/spec/integration/recipes/lwrp_inline_resources_spec.rb +18 -18
  890. data/spec/integration/recipes/lwrp_spec.rb +7 -7
  891. data/spec/integration/recipes/provider_choice.rb +3 -2
  892. data/spec/integration/recipes/recipe_dsl_spec.rb +151 -124
  893. data/spec/integration/recipes/remote_directory.rb +2 -2
  894. data/spec/integration/recipes/resource_action_spec.rb +439 -328
  895. data/spec/integration/recipes/resource_converge_if_changed_spec.rb +12 -11
  896. data/spec/integration/recipes/resource_load_spec.rb +35 -33
  897. data/spec/integration/solo/solo_spec.rb +31 -32
  898. data/spec/scripts/ssl-serve.rb +12 -17
  899. data/spec/spec_helper.rb +48 -43
  900. data/spec/stress/win32/file_spec.rb +5 -5
  901. data/spec/stress/win32/memory_spec.rb +4 -4
  902. data/spec/stress/win32/security_spec.rb +8 -8
  903. data/spec/support/chef_helpers.rb +5 -6
  904. data/spec/support/key_helpers.rb +2 -2
  905. data/spec/support/lib/chef/provider/easy.rb +2 -2
  906. data/spec/support/lib/chef/provider/openldap_includer.rb +2 -2
  907. data/spec/support/lib/chef/provider/snakeoil.rb +2 -2
  908. data/spec/support/lib/chef/resource/cat.rb +4 -4
  909. data/spec/support/lib/chef/resource/one_two_three_four.rb +2 -2
  910. data/spec/support/lib/chef/resource/openldap_includer.rb +2 -3
  911. data/spec/support/lib/chef/resource/with_state.rb +4 -4
  912. data/spec/support/lib/chef/resource/zen_follower.rb +4 -4
  913. data/spec/support/lib/chef/resource/zen_master.rb +5 -6
  914. data/spec/support/lib/library_load_order.rb +0 -2
  915. data/spec/support/matchers/leak.rb +7 -5
  916. data/spec/support/mock/constant.rb +3 -3
  917. data/spec/support/mock/platform.rb +5 -5
  918. data/spec/support/platform_helpers.rb +36 -23
  919. data/spec/support/platforms/prof/gc.rb +2 -3
  920. data/spec/support/platforms/prof/win32.rb +3 -4
  921. data/spec/support/platforms/win32/spec_service.rb +3 -3
  922. data/spec/support/shared/context/client.rb +22 -14
  923. data/spec/support/shared/context/config.rb +3 -3
  924. data/spec/support/shared/context/win32.rb +9 -9
  925. data/spec/support/shared/examples/client.rb +4 -4
  926. data/spec/support/shared/functional/diff_disabled.rb +1 -1
  927. data/spec/support/shared/functional/directory_resource.rb +8 -8
  928. data/spec/support/shared/functional/file_resource.rb +20 -23
  929. data/spec/support/shared/functional/http.rb +33 -34
  930. data/spec/support/shared/functional/knife.rb +3 -3
  931. data/spec/support/shared/functional/securable_resource.rb +48 -48
  932. data/spec/support/shared/functional/securable_resource_with_reporting.rb +8 -12
  933. data/spec/support/shared/functional/win32_service.rb +3 -5
  934. data/spec/support/shared/functional/windows_script.rb +13 -13
  935. data/spec/support/shared/integration/app_server_support.rb +7 -7
  936. data/spec/support/shared/integration/integration_helper.rb +21 -21
  937. data/spec/support/shared/integration/knife_support.rb +13 -13
  938. data/spec/support/shared/matchers/exit_with_code.rb +2 -2
  939. data/spec/support/shared/matchers/match_environment_variable.rb +2 -2
  940. data/spec/support/shared/unit/api_error_inspector.rb +3 -5
  941. data/spec/support/shared/unit/api_versioning.rb +8 -8
  942. data/spec/support/shared/unit/execute_resource.rb +4 -4
  943. data/spec/support/shared/unit/file_system_support.rb +12 -13
  944. data/spec/support/shared/unit/knife_shared.rb +1 -2
  945. data/spec/support/shared/unit/mock_shellout.rb +5 -2
  946. data/spec/support/shared/unit/platform_introspector.rb +35 -37
  947. data/spec/support/shared/unit/provider/file.rb +29 -40
  948. data/spec/support/shared/unit/provider/useradd_based_user_provider.rb +50 -51
  949. data/spec/support/shared/unit/resource/static_provider_resolution.rb +2 -5
  950. data/spec/support/shared/unit/script_resource.rb +10 -10
  951. data/spec/support/shared/unit/user_and_client_shared.rb +5 -6
  952. data/spec/support/shared/unit/windows_script_resource.rb +6 -7
  953. data/spec/tiny_server.rb +24 -24
  954. data/spec/unit/api_client/registration_spec.rb +41 -38
  955. data/spec/unit/api_client_spec.rb +13 -16
  956. data/spec/unit/api_client_v1_spec.rb +17 -19
  957. data/spec/unit/application/apply_spec.rb +3 -3
  958. data/spec/unit/application/client_spec.rb +12 -9
  959. data/spec/unit/application/knife_spec.rb +69 -17
  960. data/spec/unit/application/solo_spec.rb +29 -48
  961. data/spec/unit/application_spec.rb +171 -151
  962. data/spec/unit/audit/audit_event_proxy_spec.rb +13 -13
  963. data/spec/unit/audit/audit_reporter_spec.rb +18 -25
  964. data/spec/unit/audit/control_group_data_spec.rb +16 -17
  965. data/spec/unit/audit/logger_spec.rb +5 -5
  966. data/spec/unit/audit/rspec_formatter_spec.rb +4 -4
  967. data/spec/unit/audit/runner_spec.rb +11 -12
  968. data/spec/unit/chef_class_spec.rb +5 -5
  969. data/spec/unit/chef_fs/config_spec.rb +14 -18
  970. data/spec/unit/chef_fs/data_handler/group_handler_spec.rb +17 -17
  971. data/spec/unit/chef_fs/diff_spec.rb +75 -75
  972. data/spec/unit/chef_fs/file_pattern_spec.rb +368 -369
  973. data/spec/unit/chef_fs/file_system/cookbook_subdir_spec.rb +9 -9
  974. data/spec/unit/chef_fs/file_system/operation_failed_error_spec.rb +9 -9
  975. data/spec/unit/chef_fs/file_system_spec.rb +74 -74
  976. data/spec/unit/chef_fs/parallelizer.rb +63 -66
  977. data/spec/unit/chef_fs/path_util_spec.rb +45 -45
  978. data/spec/unit/chef_spec.rb +3 -3
  979. data/spec/unit/client_spec.rb +44 -44
  980. data/spec/unit/config_fetcher_spec.rb +56 -28
  981. data/spec/unit/config_spec.rb +2 -2
  982. data/spec/unit/cookbook/chefignore_spec.rb +12 -12
  983. data/spec/unit/cookbook/cookbook_version_loader_spec.rb +5 -6
  984. data/spec/unit/cookbook/file_vendor_spec.rb +8 -9
  985. data/spec/unit/cookbook/metadata_spec.rb +73 -76
  986. data/spec/unit/cookbook/synchronizer_spec.rb +31 -32
  987. data/spec/unit/cookbook/syntax_check_spec.rb +22 -22
  988. data/spec/unit/cookbook_loader_spec.rb +9 -10
  989. data/spec/unit/cookbook_manifest_spec.rb +27 -28
  990. data/spec/unit/cookbook_site_streaming_uploader_spec.rb +24 -24
  991. data/spec/unit/cookbook_spec.rb +3 -3
  992. data/spec/unit/cookbook_uploader_spec.rb +10 -11
  993. data/spec/unit/cookbook_version_file_specificity_spec.rb +49 -50
  994. data/spec/unit/cookbook_version_spec.rb +45 -48
  995. data/spec/unit/daemon_spec.rb +5 -5
  996. data/spec/unit/data_bag_item_spec.rb +29 -30
  997. data/spec/unit/data_bag_spec.rb +47 -47
  998. data/spec/unit/deprecation_spec.rb +11 -11
  999. data/spec/unit/digester_spec.rb +5 -6
  1000. data/spec/unit/dsl/audit_spec.rb +5 -5
  1001. data/spec/unit/dsl/data_query_spec.rb +12 -12
  1002. data/spec/unit/dsl/platform_introspection_spec.rb +19 -20
  1003. data/spec/unit/dsl/reboot_pending_spec.rb +17 -17
  1004. data/spec/unit/dsl/recipe_spec.rb +4 -6
  1005. data/spec/unit/dsl/regsitry_helper_spec.rb +9 -12
  1006. data/spec/unit/dsl/resources_spec.rb +13 -13
  1007. data/spec/unit/encrypted_data_bag_item/check_encrypted_spec.rb +7 -7
  1008. data/spec/unit/encrypted_data_bag_item_spec.rb +11 -11
  1009. data/spec/unit/environment_spec.rb +53 -53
  1010. data/spec/unit/event_dispatch/dispatcher_spec.rb +3 -4
  1011. data/spec/unit/event_dispatch/dsl_spec.rb +16 -16
  1012. data/spec/unit/exceptions_spec.rb +10 -10
  1013. data/spec/unit/file_access_control_spec.rb +32 -32
  1014. data/spec/unit/file_cache_spec.rb +19 -19
  1015. data/spec/unit/file_content_management/deploy/cp_spec.rb +3 -5
  1016. data/spec/unit/file_content_management/deploy/mv_unix_spec.rb +3 -5
  1017. data/spec/unit/file_content_management/deploy/mv_windows_spec.rb +5 -12
  1018. data/spec/unit/formatters/base_spec.rb +29 -6
  1019. data/spec/unit/formatters/doc_spec.rb +7 -7
  1020. data/spec/unit/formatters/error_inspectors/api_error_formatting_spec.rb +9 -10
  1021. data/spec/unit/formatters/error_inspectors/compile_error_inspector_spec.rb +11 -11
  1022. data/spec/unit/formatters/error_inspectors/cookbook_resolve_error_inspector_spec.rb +4 -7
  1023. data/spec/unit/formatters/error_inspectors/cookbook_sync_error_inspector_spec.rb +3 -3
  1024. data/spec/unit/formatters/error_inspectors/node_load_error_inspector_spec.rb +3 -4
  1025. data/spec/unit/formatters/error_inspectors/registration_error_inspector_spec.rb +3 -4
  1026. data/spec/unit/formatters/error_inspectors/resource_failure_inspector_spec.rb +4 -6
  1027. data/spec/unit/formatters/error_inspectors/run_list_expansion_error_inspector_spec.rb +5 -7
  1028. data/spec/unit/guard_interpreter/resource_guard_interpreter_spec.rb +9 -9
  1029. data/spec/unit/guard_interpreter_spec.rb +3 -3
  1030. data/spec/unit/handler/json_file_spec.rb +11 -12
  1031. data/spec/unit/handler_spec.rb +7 -7
  1032. data/spec/unit/http/authenticator_spec.rb +9 -7
  1033. data/spec/unit/http/basic_client_spec.rb +3 -3
  1034. data/spec/unit/http/http_request_spec.rb +22 -22
  1035. data/spec/unit/http/json_input_spec.rb +7 -7
  1036. data/spec/unit/http/simple_spec.rb +3 -3
  1037. data/spec/unit/http/socketless_chef_zero_client_spec.rb +3 -4
  1038. data/spec/unit/http/ssl_policies_spec.rb +18 -19
  1039. data/spec/unit/http/validate_content_length_spec.rb +9 -9
  1040. data/spec/unit/http_spec.rb +18 -18
  1041. data/spec/unit/json_compat_spec.rb +16 -9
  1042. data/spec/unit/key_spec.rb +41 -44
  1043. data/spec/unit/knife/bootstrap/chef_vault_handler_spec.rb +41 -42
  1044. data/spec/unit/knife/bootstrap/client_builder_spec.rb +30 -28
  1045. data/spec/unit/knife/bootstrap_spec.rb +75 -37
  1046. data/spec/unit/knife/client_bulk_delete_spec.rb +6 -6
  1047. data/spec/unit/knife/client_create_spec.rb +11 -12
  1048. data/spec/unit/knife/client_delete_spec.rb +13 -13
  1049. data/spec/unit/knife/client_edit_spec.rb +9 -9
  1050. data/spec/unit/knife/client_list_spec.rb +5 -5
  1051. data/spec/unit/knife/client_reregister_spec.rb +13 -13
  1052. data/spec/unit/knife/client_show_spec.rb +12 -12
  1053. data/spec/unit/knife/configure_client_spec.rb +19 -20
  1054. data/spec/unit/knife/configure_spec.rb +37 -39
  1055. data/spec/unit/knife/cookbook_bulk_delete_spec.rb +17 -19
  1056. data/spec/unit/knife/cookbook_create_spec.rb +32 -32
  1057. data/spec/unit/knife/cookbook_delete_spec.rb +79 -79
  1058. data/spec/unit/knife/cookbook_download_spec.rb +84 -85
  1059. data/spec/unit/knife/cookbook_list_spec.rb +26 -26
  1060. data/spec/unit/knife/cookbook_metadata_from_file_spec.rb +5 -5
  1061. data/spec/unit/knife/cookbook_metadata_spec.rb +55 -55
  1062. data/spec/unit/knife/cookbook_show_spec.rb +33 -34
  1063. data/spec/unit/knife/cookbook_site_download_spec.rb +51 -53
  1064. data/spec/unit/knife/cookbook_site_install_spec.rb +10 -8
  1065. data/spec/unit/knife/cookbook_site_share_spec.rb +42 -42
  1066. data/spec/unit/knife/cookbook_site_unshare_spec.rb +20 -20
  1067. data/spec/unit/knife/cookbook_test_spec.rb +6 -6
  1068. data/spec/unit/knife/cookbook_upload_spec.rb +69 -69
  1069. data/spec/unit/knife/core/bootstrap_context_spec.rb +39 -33
  1070. data/spec/unit/knife/core/cookbook_scm_repo_spec.rb +32 -32
  1071. data/spec/unit/knife/core/custom_manifest_loader_spec.rb +3 -3
  1072. data/spec/unit/knife/core/gem_glob_loader_spec.rb +23 -24
  1073. data/spec/unit/knife/core/hashed_command_loader_spec.rb +8 -8
  1074. data/spec/unit/knife/core/node_editor_spec.rb +211 -0
  1075. data/spec/unit/knife/core/object_loader_spec.rb +12 -12
  1076. data/spec/unit/knife/core/subcommand_loader_spec.rb +10 -10
  1077. data/spec/unit/knife/core/ui_spec.rb +45 -45
  1078. data/spec/unit/knife/data_bag_create_spec.rb +14 -14
  1079. data/spec/unit/knife/data_bag_edit_spec.rb +12 -12
  1080. data/spec/unit/knife/data_bag_from_file_spec.rb +9 -9
  1081. data/spec/unit/knife/data_bag_secret_options_spec.rb +6 -6
  1082. data/spec/unit/knife/data_bag_show_spec.rb +19 -19
  1083. data/spec/unit/knife/environment_compare_spec.rb +32 -32
  1084. data/spec/unit/knife/environment_create_spec.rb +2 -2
  1085. data/spec/unit/knife/environment_delete_spec.rb +2 -2
  1086. data/spec/unit/knife/environment_edit_spec.rb +2 -2
  1087. data/spec/unit/knife/environment_from_file_spec.rb +5 -5
  1088. data/spec/unit/knife/environment_list_spec.rb +4 -4
  1089. data/spec/unit/knife/environment_show_spec.rb +2 -2
  1090. data/spec/unit/knife/index_rebuild_spec.rb +14 -17
  1091. data/spec/unit/knife/key_create_spec.rb +11 -12
  1092. data/spec/unit/knife/key_delete_spec.rb +8 -10
  1093. data/spec/unit/knife/key_edit_spec.rb +14 -17
  1094. data/spec/unit/knife/key_helper.rb +2 -2
  1095. data/spec/unit/knife/key_list_spec.rb +13 -13
  1096. data/spec/unit/knife/key_show_spec.rb +11 -11
  1097. data/spec/unit/knife/knife_help.rb +2 -2
  1098. data/spec/unit/knife/node_bulk_delete_spec.rb +10 -13
  1099. data/spec/unit/knife/node_delete_spec.rb +4 -4
  1100. data/spec/unit/knife/node_edit_spec.rb +17 -18
  1101. data/spec/unit/knife/node_environment_set_spec.rb +4 -4
  1102. data/spec/unit/knife/node_from_file_spec.rb +5 -5
  1103. data/spec/unit/knife/node_list_spec.rb +5 -6
  1104. data/spec/unit/knife/node_run_list_add_spec.rb +5 -8
  1105. data/spec/unit/knife/node_run_list_remove_spec.rb +27 -27
  1106. data/spec/unit/knife/node_run_list_set_spec.rb +4 -4
  1107. data/spec/unit/knife/node_show_spec.rb +6 -6
  1108. data/spec/unit/knife/osc_user_create_spec.rb +7 -7
  1109. data/spec/unit/knife/osc_user_delete_spec.rb +7 -7
  1110. data/spec/unit/knife/osc_user_edit_spec.rb +6 -6
  1111. data/spec/unit/knife/osc_user_list_spec.rb +3 -3
  1112. data/spec/unit/knife/osc_user_reregister_spec.rb +10 -10
  1113. data/spec/unit/knife/osc_user_show_spec.rb +8 -8
  1114. data/spec/unit/knife/raw_spec.rb +6 -6
  1115. data/spec/unit/knife/role_bulk_delete_spec.rb +4 -4
  1116. data/spec/unit/knife/role_create_spec.rb +4 -4
  1117. data/spec/unit/knife/role_delete_spec.rb +4 -4
  1118. data/spec/unit/knife/role_edit_spec.rb +4 -6
  1119. data/spec/unit/knife/role_env_run_list_add_spec.rb +9 -9
  1120. data/spec/unit/knife/role_env_run_list_clear_spec.rb +38 -44
  1121. data/spec/unit/knife/role_env_run_list_remove_spec.rb +46 -52
  1122. data/spec/unit/knife/role_env_run_list_replace_spec.rb +49 -52
  1123. data/spec/unit/knife/role_env_run_list_set_spec.rb +17 -20
  1124. data/spec/unit/knife/role_from_file_spec.rb +7 -7
  1125. data/spec/unit/knife/role_list_spec.rb +5 -7
  1126. data/spec/unit/knife/role_run_list_add_spec.rb +7 -7
  1127. data/spec/unit/knife/role_run_list_clear_spec.rb +28 -34
  1128. data/spec/unit/knife/role_run_list_remove_spec.rb +36 -42
  1129. data/spec/unit/knife/role_run_list_replace_spec.rb +42 -45
  1130. data/spec/unit/knife/role_run_list_set_spec.rb +6 -9
  1131. data/spec/unit/knife/role_show_spec.rb +14 -14
  1132. data/spec/unit/knife/ssh_spec.rb +36 -36
  1133. data/spec/unit/knife/ssl_check_spec.rb +7 -7
  1134. data/spec/unit/knife/ssl_fetch_spec.rb +8 -8
  1135. data/spec/unit/knife/status_spec.rb +5 -5
  1136. data/spec/unit/knife/tag_create_spec.rb +1 -1
  1137. data/spec/unit/knife/tag_delete_spec.rb +1 -1
  1138. data/spec/unit/knife/tag_list_spec.rb +2 -2
  1139. data/spec/unit/knife/user_create_spec.rb +30 -30
  1140. data/spec/unit/knife/user_delete_spec.rb +11 -11
  1141. data/spec/unit/knife/user_edit_spec.rb +9 -9
  1142. data/spec/unit/knife/user_list_spec.rb +3 -3
  1143. data/spec/unit/knife/user_reregister_spec.rb +13 -13
  1144. data/spec/unit/knife/user_show_spec.rb +12 -12
  1145. data/spec/unit/knife_spec.rb +61 -61
  1146. data/spec/unit/lib_backcompat_spec.rb +34 -0
  1147. data/spec/unit/log/syslog_spec.rb +3 -3
  1148. data/spec/unit/log/winevt_spec.rb +3 -3
  1149. data/spec/unit/log_spec.rb +5 -5
  1150. data/spec/unit/lwrp_spec.rb +41 -43
  1151. data/spec/unit/mash_spec.rb +8 -8
  1152. data/spec/unit/mixin/api_version_request_handling_spec.rb +13 -14
  1153. data/spec/unit/mixin/checksum_spec.rb +5 -6
  1154. data/spec/unit/mixin/command_spec.rb +9 -9
  1155. data/spec/unit/mixin/convert_to_class_name_spec.rb +2 -2
  1156. data/spec/unit/mixin/deep_merge_spec.rb +107 -107
  1157. data/spec/unit/mixin/deprecation_spec.rb +5 -5
  1158. data/spec/unit/mixin/enforce_ownership_and_permissions_spec.rb +9 -9
  1159. data/spec/unit/mixin/homebrew_user_spec.rb +13 -13
  1160. data/spec/unit/mixin/params_validate_spec.rb +71 -71
  1161. data/spec/unit/mixin/path_sanity_spec.rb +16 -16
  1162. data/spec/unit/mixin/powershell_out_spec.rb +9 -9
  1163. data/spec/unit/mixin/powershell_type_coercions_spec.rb +34 -23
  1164. data/spec/unit/mixin/properties_spec.rb +27 -27
  1165. data/spec/unit/mixin/proxified_socket_spec.rb +6 -6
  1166. data/spec/unit/mixin/securable_spec.rb +37 -37
  1167. data/spec/unit/mixin/shell_out_spec.rb +68 -68
  1168. data/spec/unit/mixin/subclass_directive_spec.rb +2 -2
  1169. data/spec/unit/mixin/template_spec.rb +15 -12
  1170. data/spec/unit/mixin/unformatter_spec.rb +3 -3
  1171. data/spec/unit/mixin/uris_spec.rb +8 -8
  1172. data/spec/unit/mixin/windows_architecture_helper_spec.rb +14 -17
  1173. data/spec/unit/mixin/xml_escape_spec.rb +3 -3
  1174. data/spec/unit/monkey_patches/uri_spec.rb +3 -3
  1175. data/spec/unit/monologger_spec.rb +4 -4
  1176. data/spec/unit/node/attribute_spec.rb +203 -248
  1177. data/spec/unit/node/immutable_collections_spec.rb +20 -21
  1178. data/spec/unit/node_map_spec.rb +5 -5
  1179. data/spec/unit/node_spec.rb +165 -135
  1180. data/spec/unit/org_spec.rb +17 -17
  1181. data/spec/unit/platform/query_helpers_spec.rb +23 -23
  1182. data/spec/unit/platform_spec.rb +17 -17
  1183. data/spec/unit/policy_builder/dynamic_spec.rb +8 -10
  1184. data/spec/unit/policy_builder/expand_node_object_spec.rb +16 -14
  1185. data/spec/unit/policy_builder/policyfile_spec.rb +30 -37
  1186. data/spec/unit/policy_builder_spec.rb +4 -4
  1187. data/spec/unit/property/state_spec.rb +58 -56
  1188. data/spec/unit/property/validation_spec.rb +255 -216
  1189. data/spec/unit/property_spec.rb +206 -129
  1190. data/spec/unit/provider/apt_update_spec.rb +113 -0
  1191. data/spec/unit/provider/breakpoint_spec.rb +2 -3
  1192. data/spec/unit/provider/cookbook_file/content_spec.rb +9 -10
  1193. data/spec/unit/provider/cookbook_file_spec.rb +11 -11
  1194. data/spec/unit/provider/cron/unix_spec.rb +7 -7
  1195. data/spec/unit/provider/cron_spec.rb +67 -67
  1196. data/spec/unit/provider/deploy/revision_spec.rb +6 -7
  1197. data/spec/unit/provider/deploy/timestamped_spec.rb +2 -2
  1198. data/spec/unit/provider/deploy_spec.rb +24 -25
  1199. data/spec/unit/provider/directory_spec.rb +12 -12
  1200. data/spec/unit/provider/dsc_resource_spec.rb +29 -27
  1201. data/spec/unit/provider/dsc_script_spec.rb +47 -48
  1202. data/spec/unit/provider/env/windows_spec.rb +21 -21
  1203. data/spec/unit/provider/env_spec.rb +5 -5
  1204. data/spec/unit/provider/erl_call_spec.rb +3 -4
  1205. data/spec/unit/provider/execute_spec.rb +5 -5
  1206. data/spec/unit/provider/file/content_spec.rb +4 -4
  1207. data/spec/unit/provider/file_spec.rb +8 -9
  1208. data/spec/unit/provider/git_spec.rb +64 -65
  1209. data/spec/unit/provider/group/dscl_spec.rb +7 -7
  1210. data/spec/unit/provider/group/gpasswd_spec.rb +3 -3
  1211. data/spec/unit/provider/group/groupadd_spec.rb +9 -9
  1212. data/spec/unit/provider/group/groupmod_spec.rb +12 -12
  1213. data/spec/unit/provider/group/pw_spec.rb +3 -3
  1214. data/spec/unit/provider/group/usermod_spec.rb +6 -6
  1215. data/spec/unit/provider/group/windows_spec.rb +3 -3
  1216. data/spec/unit/provider/group_spec.rb +16 -16
  1217. data/spec/unit/provider/http_request_spec.rb +7 -7
  1218. data/spec/unit/provider/ifconfig/aix_spec.rb +4 -5
  1219. data/spec/unit/provider/ifconfig/debian_spec.rb +6 -6
  1220. data/spec/unit/provider/ifconfig/redhat_spec.rb +3 -3
  1221. data/spec/unit/provider/ifconfig_spec.rb +5 -5
  1222. data/spec/unit/provider/link_spec.rb +12 -12
  1223. data/spec/unit/provider/log_spec.rb +2 -2
  1224. data/spec/unit/provider/mdadm_spec.rb +12 -12
  1225. data/spec/unit/provider/mount/aix_spec.rb +7 -7
  1226. data/spec/unit/provider/mount/mount_spec.rb +20 -20
  1227. data/spec/unit/provider/mount/solaris_spec.rb +26 -26
  1228. data/spec/unit/provider/mount/windows_spec.rb +8 -8
  1229. data/spec/unit/provider/mount_spec.rb +7 -8
  1230. data/spec/unit/provider/ohai_spec.rb +13 -13
  1231. data/spec/unit/provider/osx_profile_spec.rb +249 -0
  1232. data/spec/unit/provider/package/aix_spec.rb +5 -5
  1233. data/spec/unit/provider/package/apt_spec.rb +49 -49
  1234. data/spec/unit/provider/package/chocolatey_spec.rb +504 -0
  1235. data/spec/unit/provider/package/dpkg_spec.rb +32 -36
  1236. data/spec/unit/provider/package/easy_install_spec.rb +11 -15
  1237. data/spec/unit/provider/package/freebsd/pkg_spec.rb +10 -10
  1238. data/spec/unit/provider/package/freebsd/pkgng_spec.rb +12 -19
  1239. data/spec/unit/provider/package/freebsd/port_spec.rb +12 -19
  1240. data/spec/unit/provider/package/homebrew_spec.rb +139 -139
  1241. data/spec/unit/provider/package/ips_spec.rb +10 -11
  1242. data/spec/unit/provider/package/macports_spec.rb +3 -3
  1243. data/spec/unit/provider/package/openbsd_spec.rb +38 -38
  1244. data/spec/unit/provider/package/pacman_spec.rb +8 -9
  1245. data/spec/unit/provider/package/paludis_spec.rb +9 -10
  1246. data/spec/unit/provider/package/portage_spec.rb +2 -2
  1247. data/spec/unit/provider/package/rpm_spec.rb +7 -11
  1248. data/spec/unit/provider/package/rubygems_spec.rb +386 -289
  1249. data/spec/unit/provider/package/smartos_spec.rb +8 -10
  1250. data/spec/unit/provider/package/solaris_spec.rb +4 -4
  1251. data/spec/unit/provider/package/windows/exe_spec.rb +17 -81
  1252. data/spec/unit/provider/package/windows/msi_spec.rb +16 -16
  1253. data/spec/unit/provider/package/windows_spec.rb +50 -40
  1254. data/spec/unit/provider/package/yum_spec.rb +179 -181
  1255. data/spec/unit/provider/package/zypper_spec.rb +53 -50
  1256. data/spec/unit/provider/package_spec.rb +104 -104
  1257. data/spec/unit/provider/powershell_script_spec.rb +20 -20
  1258. data/spec/unit/provider/registry_key_spec.rb +3 -3
  1259. data/spec/unit/provider/remote_directory_spec.rb +46 -46
  1260. data/spec/unit/provider/remote_file/cache_control_data_spec.rb +9 -10
  1261. data/spec/unit/provider/remote_file/content_spec.rb +5 -6
  1262. data/spec/unit/provider/remote_file/fetcher_spec.rb +3 -3
  1263. data/spec/unit/provider/remote_file/ftp_spec.rb +3 -3
  1264. data/spec/unit/provider/remote_file/http_spec.rb +10 -12
  1265. data/spec/unit/provider/remote_file/local_file_spec.rb +2 -2
  1266. data/spec/unit/provider/remote_file/network_file_spec.rb +2 -2
  1267. data/spec/unit/provider/remote_file_spec.rb +9 -11
  1268. data/spec/unit/provider/route_spec.rb +26 -27
  1269. data/spec/unit/provider/ruby_block_spec.rb +4 -5
  1270. data/spec/unit/provider/script_spec.rb +11 -11
  1271. data/spec/unit/provider/service/aix_service_spec.rb +5 -6
  1272. data/spec/unit/provider/service/aixinit_service_spec.rb +26 -23
  1273. data/spec/unit/provider/service/arch_service_spec.rb +15 -15
  1274. data/spec/unit/provider/service/debian_service_spec.rb +37 -37
  1275. data/spec/unit/provider/service/freebsd_service_spec.rb +9 -9
  1276. data/spec/unit/provider/service/gentoo_service_spec.rb +4 -4
  1277. data/spec/unit/provider/service/init_service_spec.rb +9 -9
  1278. data/spec/unit/provider/service/insserv_service_spec.rb +3 -3
  1279. data/spec/unit/provider/service/invokercd_service_spec.rb +9 -9
  1280. data/spec/unit/provider/service/macosx_spec.rb +26 -26
  1281. data/spec/unit/provider/service/openbsd_service_spec.rb +26 -26
  1282. data/spec/unit/provider/service/redhat_spec.rb +16 -16
  1283. data/spec/unit/provider/service/simple_service_spec.rb +5 -5
  1284. data/spec/unit/provider/service/solaris_smf_service_spec.rb +51 -51
  1285. data/spec/unit/provider/service/systemd_service_spec.rb +4 -4
  1286. data/spec/unit/provider/service/upstart_service_spec.rb +13 -13
  1287. data/spec/unit/provider/service/windows_spec.rb +28 -37
  1288. data/spec/unit/provider/service_spec.rb +2 -3
  1289. data/spec/unit/provider/subversion_spec.rb +27 -28
  1290. data/spec/unit/provider/template/content_spec.rb +21 -21
  1291. data/spec/unit/provider/template_spec.rb +15 -16
  1292. data/spec/unit/provider/user/dscl_spec.rb +36 -37
  1293. data/spec/unit/provider/user/pw_spec.rb +12 -12
  1294. data/spec/unit/provider/user/solaris_spec.rb +31 -31
  1295. data/spec/unit/provider/user/useradd_spec.rb +10 -10
  1296. data/spec/unit/provider/user/windows_spec.rb +9 -9
  1297. data/spec/unit/provider/user_spec.rb +19 -20
  1298. data/spec/unit/provider/whyrun_safe_ruby_block_spec.rb +3 -4
  1299. data/spec/unit/provider_resolver_spec.rb +63 -62
  1300. data/spec/unit/provider_spec.rb +7 -8
  1301. data/spec/unit/pure_application_spec.rb +3 -3
  1302. data/spec/unit/recipe_spec.rb +13 -16
  1303. data/spec/unit/resource/apt_package_spec.rb +4 -4
  1304. data/spec/unit/resource/apt_update_spec.rb +38 -0
  1305. data/spec/unit/resource/bash_spec.rb +3 -3
  1306. data/spec/unit/resource/batch_spec.rb +5 -5
  1307. data/spec/unit/resource/breakpoint_spec.rb +3 -3
  1308. data/spec/unit/resource/chef_gem_spec.rb +5 -9
  1309. data/spec/unit/resource/chocolatey_package_spec.rb +67 -0
  1310. data/spec/unit/resource/conditional_action_not_nothing_spec.rb +2 -2
  1311. data/spec/unit/resource/conditional_spec.rb +12 -12
  1312. data/spec/unit/resource/cookbook_file_spec.rb +23 -24
  1313. data/spec/unit/resource/cron_spec.rb +4 -4
  1314. data/spec/unit/resource/csh_spec.rb +3 -3
  1315. data/spec/unit/resource/deploy_revision_spec.rb +3 -3
  1316. data/spec/unit/resource/deploy_spec.rb +23 -24
  1317. data/spec/unit/resource/directory_spec.rb +4 -4
  1318. data/spec/unit/resource/dpkg_package_spec.rb +5 -5
  1319. data/spec/unit/resource/dsc_resource_spec.rb +11 -11
  1320. data/spec/unit/resource/dsc_script_spec.rb +15 -15
  1321. data/spec/unit/resource/easy_install_package_spec.rb +3 -3
  1322. data/spec/unit/resource/env_spec.rb +5 -5
  1323. data/spec/unit/resource/erl_call_spec.rb +3 -3
  1324. data/spec/unit/resource/execute_spec.rb +4 -4
  1325. data/spec/unit/resource/file/verification_spec.rb +11 -11
  1326. data/spec/unit/resource/file_spec.rb +10 -10
  1327. data/spec/unit/resource/freebsd_package_spec.rb +6 -9
  1328. data/spec/unit/resource/gem_package_spec.rb +4 -4
  1329. data/spec/unit/resource/git_spec.rb +3 -3
  1330. data/spec/unit/resource/group_spec.rb +4 -4
  1331. data/spec/unit/resource/homebrew_package_spec.rb +13 -13
  1332. data/spec/unit/resource/http_request_spec.rb +5 -5
  1333. data/spec/unit/resource/ifconfig_spec.rb +9 -9
  1334. data/spec/unit/resource/ips_package_spec.rb +4 -4
  1335. data/spec/unit/resource/ksh_spec.rb +2 -2
  1336. data/spec/unit/resource/link_spec.rb +6 -6
  1337. data/spec/unit/resource/log_spec.rb +3 -3
  1338. data/spec/unit/resource/macports_package_spec.rb +3 -3
  1339. data/spec/unit/resource/mdadm_spec.rb +3 -3
  1340. data/spec/unit/resource/mount_spec.rb +7 -7
  1341. data/spec/unit/resource/ohai_spec.rb +2 -3
  1342. data/spec/unit/resource/openbsd_package_spec.rb +5 -6
  1343. data/spec/unit/resource/osx_profile_spec.rb +61 -0
  1344. data/spec/unit/resource/package_spec.rb +6 -6
  1345. data/spec/unit/resource/pacman_package_spec.rb +3 -3
  1346. data/spec/unit/resource/perl_spec.rb +3 -3
  1347. data/spec/unit/resource/portage_package_spec.rb +2 -2
  1348. data/spec/unit/resource/powershell_script_spec.rb +16 -16
  1349. data/spec/unit/resource/python_spec.rb +3 -3
  1350. data/spec/unit/resource/registry_key_spec.rb +21 -21
  1351. data/spec/unit/resource/remote_directory_spec.rb +3 -3
  1352. data/spec/unit/resource/remote_file_spec.rb +15 -15
  1353. data/spec/unit/resource/resource_notification_spec.rb +18 -18
  1354. data/spec/unit/resource/route_spec.rb +3 -3
  1355. data/spec/unit/resource/rpm_package_spec.rb +4 -4
  1356. data/spec/unit/resource/ruby_block_spec.rb +4 -4
  1357. data/spec/unit/resource/ruby_spec.rb +3 -3
  1358. data/spec/unit/resource/scm_spec.rb +8 -8
  1359. data/spec/unit/resource/script_spec.rb +4 -4
  1360. data/spec/unit/resource/service_spec.rb +4 -5
  1361. data/spec/unit/resource/smartos_package_spec.rb +3 -3
  1362. data/spec/unit/resource/solaris_package_spec.rb +3 -3
  1363. data/spec/unit/resource/subversion_spec.rb +5 -5
  1364. data/spec/unit/resource/template_spec.rb +7 -8
  1365. data/spec/unit/resource/timestamped_deploy_spec.rb +4 -4
  1366. data/spec/unit/resource/user_spec.rb +4 -4
  1367. data/spec/unit/resource/windows_package_spec.rb +7 -7
  1368. data/spec/unit/resource/windows_service_spec.rb +3 -3
  1369. data/spec/unit/resource/yum_package_spec.rb +6 -6
  1370. data/spec/unit/resource_collection/resource_list_spec.rb +7 -7
  1371. data/spec/unit/resource_collection/resource_set_spec.rb +9 -9
  1372. data/spec/unit/resource_collection/stepable_iterator_spec.rb +6 -6
  1373. data/spec/unit/resource_collection_spec.rb +8 -9
  1374. data/spec/unit/resource_definition_spec.rb +3 -3
  1375. data/spec/unit/resource_reporter_spec.rb +56 -64
  1376. data/spec/unit/resource_resolver_spec.rb +5 -6
  1377. data/spec/unit/resource_spec.rb +80 -60
  1378. data/spec/unit/rest/auth_credentials_spec.rb +39 -71
  1379. data/spec/unit/rest_spec.rb +96 -90
  1380. data/spec/unit/role_spec.rb +64 -68
  1381. data/spec/unit/run_context/child_run_context_spec.rb +23 -23
  1382. data/spec/unit/run_context/cookbook_compiler_spec.rb +5 -7
  1383. data/spec/unit/run_context_spec.rb +19 -19
  1384. data/spec/unit/run_list/run_list_expansion_spec.rb +24 -24
  1385. data/spec/unit/run_list/run_list_item_spec.rb +28 -28
  1386. data/spec/unit/run_list/versioned_recipe_list_spec.rb +22 -23
  1387. data/spec/unit/run_list_spec.rb +37 -41
  1388. data/spec/unit/run_lock_spec.rb +10 -10
  1389. data/spec/unit/run_status_spec.rb +4 -5
  1390. data/spec/unit/runner_spec.rb +8 -8
  1391. data/spec/unit/scan_access_control_spec.rb +4 -5
  1392. data/spec/unit/search/query_spec.rb +50 -46
  1393. data/spec/unit/shell/model_wrapper_spec.rb +12 -13
  1394. data/spec/unit/shell/shell_ext_spec.rb +5 -5
  1395. data/spec/unit/shell/shell_session_spec.rb +8 -9
  1396. data/spec/unit/shell_out_spec.rb +1 -1
  1397. data/spec/unit/shell_spec.rb +9 -9
  1398. data/spec/unit/user_spec.rb +14 -15
  1399. data/spec/unit/user_v1_spec.rb +22 -23
  1400. data/spec/unit/util/backup_spec.rb +17 -18
  1401. data/spec/unit/util/diff_spec.rb +6 -9
  1402. data/spec/unit/util/dsc/configuration_generator_spec.rb +48 -48
  1403. data/spec/unit/util/dsc/lcm_output_parser_spec.rb +22 -22
  1404. data/spec/unit/util/dsc/local_configuration_manager_spec.rb +30 -31
  1405. data/spec/unit/util/dsc/resource_store.rb +22 -22
  1406. data/spec/unit/util/editor_spec.rb +65 -65
  1407. data/spec/unit/util/file_edit_spec.rb +7 -7
  1408. data/spec/unit/util/powershell/cmdlet_spec.rb +27 -27
  1409. data/spec/unit/util/powershell/ps_credential_spec.rb +13 -13
  1410. data/spec/unit/util/selinux_spec.rb +8 -9
  1411. data/spec/unit/util/threaded_job_queue_spec.rb +2 -2
  1412. data/spec/unit/version/platform_spec.rb +5 -6
  1413. data/spec/unit/version_class_spec.rb +8 -9
  1414. data/spec/unit/version_constraint/platform_spec.rb +3 -4
  1415. data/spec/unit/version_constraint_spec.rb +19 -19
  1416. data/spec/unit/win32/registry_spec.rb +25 -25
  1417. data/spec/unit/windows_service_spec.rb +20 -20
  1418. data/tasks/cbgb.rb +84 -0
  1419. data/tasks/external_tests.rb +12 -11
  1420. data/tasks/maintainers.rb +15 -15
  1421. data/tasks/rspec.rb +18 -15
  1422. metadata +250 -67
  1423. data/lib/chef/chef_fs/file_system/acl_dir.rb +0 -63
  1424. data/lib/chef/chef_fs/file_system/acl_entry.rb +0 -58
  1425. data/lib/chef/chef_fs/file_system/acls_dir.rb +0 -72
  1426. data/lib/chef/chef_fs/file_system/chef_repository_file_system_cookbook_dir.rb +0 -102
  1427. data/lib/chef/chef_fs/file_system/chef_repository_file_system_cookbook_entry.rb +0 -80
  1428. data/lib/chef/chef_fs/file_system/chef_repository_file_system_cookbooks_dir.rb +0 -82
  1429. data/lib/chef/chef_fs/file_system/chef_repository_file_system_entry.rb +0 -81
  1430. data/lib/chef/chef_fs/file_system/chef_repository_file_system_root_dir.rb +0 -196
  1431. data/lib/chef/chef_fs/file_system/chef_server_root_dir.rb +0 -165
  1432. data/lib/chef/chef_fs/file_system/cookbook_dir.rb +0 -224
  1433. data/lib/chef/chef_fs/file_system/cookbook_file.rb +0 -82
  1434. data/lib/chef/chef_fs/file_system/cookbook_subdir.rb +0 -59
  1435. data/lib/chef/chef_fs/file_system/cookbooks_acl_dir.rb +0 -41
  1436. data/lib/chef/chef_fs/file_system/cookbooks_dir.rb +0 -156
  1437. data/lib/chef/chef_fs/file_system/data_bag_dir.rb +0 -69
  1438. data/lib/chef/chef_fs/file_system/data_bags_dir.rb +0 -71
  1439. data/lib/chef/chef_fs/file_system/environments_dir.rb +0 -60
  1440. data/lib/chef/chef_fs/file_system/file_system_entry.rb +0 -115
  1441. data/lib/chef/chef_fs/file_system/memory_dir.rb +0 -51
  1442. data/lib/chef/chef_fs/file_system/memory_file.rb +0 -17
  1443. data/lib/chef/chef_fs/file_system/memory_root.rb +0 -21
  1444. data/lib/chef/chef_fs/file_system/nodes_dir.rb +0 -55
  1445. data/lib/chef/chef_fs/file_system/org_entry.rb +0 -34
  1446. data/lib/chef/chef_fs/file_system/organization_invites_entry.rb +0 -59
  1447. data/lib/chef/chef_fs/file_system/organization_members_entry.rb +0 -58
  1448. data/lib/chef/chef_fs/file_system/rest_list_dir.rb +0 -110
  1449. data/lib/chef/chef_fs/file_system/rest_list_entry.rb +0 -185
@@ -1,14 +1,15 @@
1
1
 
2
- require 'set'
3
- require 'chef/exceptions'
4
- require 'chef/knife/cookbook_metadata'
5
- require 'chef/digester'
6
- require 'chef/cookbook_manifest'
7
- require 'chef/cookbook_version'
8
- require 'chef/cookbook/syntax_check'
9
- require 'chef/cookbook/file_system_file_vendor'
10
- require 'chef/util/threaded_job_queue'
11
- require 'chef/sandbox'
2
+ require "set"
3
+ require "chef/exceptions"
4
+ require "chef/knife/cookbook_metadata"
5
+ require "chef/digester"
6
+ require "chef/cookbook_manifest"
7
+ require "chef/cookbook_version"
8
+ require "chef/cookbook/syntax_check"
9
+ require "chef/cookbook/file_system_file_vendor"
10
+ require "chef/util/threaded_job_queue"
11
+ require "chef/sandbox"
12
+ require "chef/server_api"
12
13
 
13
14
  class Chef
14
15
  class CookbookUploader
@@ -31,15 +32,15 @@ class Chef
31
32
  # uploading the cookbook. This allows frozen CookbookVersion
32
33
  # documents on the server to be overwritten (otherwise a 409 is
33
34
  # returned by the server)
34
- # * :rest A Chef::REST object that you have configured the way you like it.
35
+ # * :rest A Chef::ServerAPI object that you have configured the way you like it.
35
36
  # If you don't provide this, one will be created using the values
36
37
  # in Chef::Config.
37
38
  # * :concurrency An integer that decided how many threads will be used to
38
39
  # perform concurrent uploads
39
- def initialize(cookbooks, opts={})
40
+ def initialize(cookbooks, opts = {})
40
41
  @opts = opts
41
42
  @cookbooks = Array(cookbooks)
42
- @rest = opts[:rest] || Chef::REST.new(Chef::Config[:chef_server_url])
43
+ @rest = opts[:rest] || Chef::ServerAPI.new(Chef::Config[:chef_server_url])
43
44
  @concurrency = opts[:concurrency] || 10
44
45
  @policy_mode = opts[:policy_mode] || false
45
46
  end
@@ -54,7 +55,7 @@ class Chef
54
55
  checksum_files.merge!(cb.checksums)
55
56
  end
56
57
 
57
- checksums = checksum_files.inject({}){|memo,elt| memo[elt.first]=nil ; memo}
58
+ checksums = checksum_files.inject({}) { |memo, elt| memo[elt.first] = nil ; memo }
58
59
  new_sandbox = rest.post("sandboxes", { :checksums => checksums })
59
60
 
60
61
  Chef::Log.info("Uploading files")
@@ -64,11 +65,11 @@ class Chef
64
65
  checksums_to_upload = Set.new
65
66
 
66
67
  # upload the new checksums and commit the sandbox
67
- new_sandbox['checksums'].each do |checksum, info|
68
- if info['needs_upload'] == true
68
+ new_sandbox["checksums"].each do |checksum, info|
69
+ if info["needs_upload"] == true
69
70
  checksums_to_upload << checksum
70
71
  Chef::Log.info("Uploading #{checksum_files[checksum]} (checksum hex = #{checksum}) to #{info['url']}")
71
- queue << uploader_function_for(checksum_files[checksum], checksum, info['url'], checksums_to_upload)
72
+ queue << uploader_function_for(checksum_files[checksum], checksum, info["url"], checksums_to_upload)
72
73
  else
73
74
  Chef::Log.debug("#{checksum_files[checksum]} has not changed")
74
75
  end
@@ -76,13 +77,13 @@ class Chef
76
77
 
77
78
  queue.process(@concurrency)
78
79
 
79
- sandbox_url = new_sandbox['uri']
80
+ sandbox_url = new_sandbox["uri"]
80
81
  Chef::Log.debug("Committing sandbox")
81
82
  # Retry if S3 is claims a checksum doesn't exist (the eventual
82
83
  # in eventual consistency)
83
84
  retries = 0
84
85
  begin
85
- rest.put(sandbox_url, {:is_completed => true})
86
+ rest.put(sandbox_url, { :is_completed => true })
86
87
  rescue Net::HTTPServerException => e
87
88
  if e.message =~ /^400/ && (retries += 1) <= 5
88
89
  sleep 2
@@ -119,10 +120,10 @@ class Chef
119
120
  # but we need the base64 encoding for the content-md5
120
121
  # header
121
122
  checksum64 = Base64.encode64([checksum].pack("H*")).strip
122
- file_contents = File.open(file, "rb") {|f| f.read}
123
+ file_contents = File.open(file, "rb") { |f| f.read }
123
124
 
124
125
  # Custom headers. 'content-type' disables JSON serialization of the request body.
125
- headers = { 'content-type' => 'application/x-binary', 'content-md5' => checksum64, "accept" => 'application/json' }
126
+ headers = { "content-type" => "application/x-binary", "content-md5" => checksum64, "accept" => "application/json" }
126
127
 
127
128
  begin
128
129
  rest.put(url, file_contents, headers)
@@ -1,10 +1,10 @@
1
- # Author:: Adam Jacob (<adam@opscode.com>)
2
- # Author:: Nuo Yan (<nuo@opscode.com>)
3
- # Author:: Christopher Walters (<cw@opscode.com>)
4
- # Author:: Tim Hinderliter (<tim@opscode.com>)
5
- # Author:: Seth Falcon (<seth@opscode.com>)
6
- # Author:: Daniel DeLeo (<dan@opscode.com>)
7
- # Copyright:: Copyright 2008-2015 Chef Software, Inc.
1
+ # Author:: Adam Jacob (<adam@chef.io>)
2
+ # Author:: Nuo Yan (<nuo@chef.io>)
3
+ # Author:: Christopher Walters (<cw@chef.io>)
4
+ # Author:: Tim Hinderliter (<tim@chef.io>)
5
+ # Author:: Seth Falcon (<seth@chef.io>)
6
+ # Author:: Daniel DeLeo (<dan@chef.io>)
7
+ # Copyright:: Copyright 2008-2016, Chef Software, Inc.
8
8
  # License:: Apache License, Version 2.0
9
9
  #
10
10
  # Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,12 +19,13 @@
19
19
  # See the License for the specific language governing permissions and
20
20
  # limitations under the License.
21
21
 
22
- require 'chef/log'
23
- require 'chef/cookbook/file_vendor'
24
- require 'chef/cookbook/metadata'
25
- require 'chef/version_class'
26
- require 'chef/digester'
27
- require 'chef/cookbook_manifest'
22
+ require "chef/log"
23
+ require "chef/cookbook/file_vendor"
24
+ require "chef/cookbook/metadata"
25
+ require "chef/version_class"
26
+ require "chef/digester"
27
+ require "chef/cookbook_manifest"
28
+ require "chef/server_api"
28
29
 
29
30
  class Chef
30
31
 
@@ -299,19 +300,19 @@ class Chef
299
300
  if segment == :files || segment == :templates
300
301
  error_message = "Cookbook '#{name}' (#{version}) does not contain a file at any of these locations:\n"
301
302
  error_locations = if filename.is_a?(Array)
302
- filename.map{|name| " #{File.join(segment.to_s, name)}"}
303
- else
304
- [
305
- " #{segment}/#{node[:platform]}-#{node[:platform_version]}/#{filename}",
306
- " #{segment}/#{node[:platform]}/#{filename}",
307
- " #{segment}/default/#{filename}",
308
- " #{segment}/#{filename}",
309
- ]
310
- end
303
+ filename.map { |name| " #{File.join(segment.to_s, name)}" }
304
+ else
305
+ [
306
+ " #{segment}/#{node[:platform]}-#{node[:platform_version]}/#{filename}",
307
+ " #{segment}/#{node[:platform]}/#{filename}",
308
+ " #{segment}/default/#{filename}",
309
+ " #{segment}/#{filename}",
310
+ ]
311
+ end
311
312
  error_message << error_locations.join("\n")
312
313
  existing_files = segment_filenames(segment)
313
314
  # Strip the root_dir prefix off all files for readability
314
- existing_files.map!{|path| path[root_dir.length+1..-1]} if root_dir
315
+ existing_files.map! { |path| path[root_dir.length + 1..-1] } if root_dir
315
316
  # Show the files that the cookbook does have. If the user made a typo,
316
317
  # hopefully they'll see it here.
317
318
  unless existing_files.empty?
@@ -324,12 +325,12 @@ class Chef
324
325
  end
325
326
  end
326
327
 
327
- def preferred_filename_on_disk_location(node, segment, filename, current_filepath=nil)
328
+ def preferred_filename_on_disk_location(node, segment, filename, current_filepath = nil)
328
329
  manifest_record = preferred_manifest_record(node, segment, filename)
329
- if current_filepath && (manifest_record['checksum'] == self.class.checksum_cookbook_file(current_filepath))
330
+ if current_filepath && (manifest_record["checksum"] == self.class.checksum_cookbook_file(current_filepath))
330
331
  nil
331
332
  else
332
- file_vendor.get_filename(manifest_record['path'])
333
+ file_vendor.get_filename(manifest_record["path"])
333
334
  end
334
335
  end
335
336
 
@@ -368,7 +369,6 @@ class Chef
368
369
  raise Chef::Exceptions::FileNotFound, "cookbook #{name} has no directory #{segment}/default/#{dirname}" unless best_pref
369
370
 
370
371
  filenames_by_pref[best_pref]
371
-
372
372
  end
373
373
 
374
374
  # Determine the manifest records from the most specific directory
@@ -384,10 +384,10 @@ class Chef
384
384
 
385
385
  # extract the preference part from the path.
386
386
  if manifest_record_path =~ /(#{Regexp.escape(segment.to_s)}\/[^\/]+\/#{Regexp.escape(dirname)})\/.+$/
387
- # Note the specificy_dirname includes the segment and
388
- # dirname argument as above, which is what
389
- # preferences_for_path returns. It could be
390
- # "files/ubuntu-9.10/dirname", for example.
387
+ # Note the specificy_dirname includes the segment and
388
+ # dirname argument as above, which is what
389
+ # preferences_for_path returns. It could be
390
+ # "files/ubuntu-9.10/dirname", for example.
391
391
  specificity_dirname = $1
392
392
 
393
393
  # Record the specificity_dirname only if it's in the list of
@@ -412,43 +412,43 @@ class Chef
412
412
  # only files and templates can be platform-specific
413
413
  if segment.to_sym == :files || segment.to_sym == :templates
414
414
  relative_search_path = if path.is_a?(Array)
415
- path
416
- else
417
- begin
418
- platform, version = Chef::Platform.find_platform_and_version(node)
419
- rescue ArgumentError => e
420
- # Skip platform/version if they were not found by find_platform_and_version
421
- if e.message =~ /Cannot find a (?:platform|version)/
422
- platform = "/unknown_platform/"
423
- version = "/unknown_platform_version/"
424
- else
425
- raise
426
- end
427
- end
428
-
429
- fqdn = node[:fqdn]
430
-
431
- # Break version into components, eg: "5.7.1" => [ "5.7.1", "5.7", "5" ]
432
- search_versions = []
433
- parts = version.to_s.split('.')
434
-
435
- parts.size.times do
436
- search_versions << parts.join('.')
437
- parts.pop
438
- end
439
-
440
- # Most specific to least specific places to find the path
441
- search_path = [ File.join("host-#{fqdn}", path) ]
442
- search_versions.each do |v|
443
- search_path << File.join("#{platform}-#{v}", path)
444
- end
445
- search_path << File.join(platform.to_s, path)
446
- search_path << File.join("default", path)
447
- search_path << path
448
-
449
- search_path
450
- end
451
- relative_search_path.map {|relative_path| File.join(segment.to_s, relative_path)}
415
+ path
416
+ else
417
+ begin
418
+ platform, version = Chef::Platform.find_platform_and_version(node)
419
+ rescue ArgumentError => e
420
+ # Skip platform/version if they were not found by find_platform_and_version
421
+ if e.message =~ /Cannot find a (?:platform|version)/
422
+ platform = "/unknown_platform/"
423
+ version = "/unknown_platform_version/"
424
+ else
425
+ raise
426
+ end
427
+ end
428
+
429
+ fqdn = node[:fqdn]
430
+
431
+ # Break version into components, eg: "5.7.1" => [ "5.7.1", "5.7", "5" ]
432
+ search_versions = []
433
+ parts = version.to_s.split(".")
434
+
435
+ parts.size.times do
436
+ search_versions << parts.join(".")
437
+ parts.pop
438
+ end
439
+
440
+ # Most specific to least specific places to find the path
441
+ search_path = [ File.join("host-#{fqdn}", path) ]
442
+ search_versions.each do |v|
443
+ search_path << File.join("#{platform}-#{v}", path)
444
+ end
445
+ search_path << File.join(platform.to_s, path)
446
+ search_path << File.join("default", path)
447
+ search_path << path
448
+
449
+ search_path
450
+ end
451
+ relative_search_path.map { |relative_path| File.join(segment.to_s, relative_path) }
452
452
  else
453
453
  if segment.to_sym == :root_files
454
454
  [path]
@@ -459,11 +459,13 @@ class Chef
459
459
  end
460
460
  private :preferences_for_path
461
461
 
462
- def self.json_create(o)
463
- cookbook_version = new(o["cookbook_name"])
462
+ def self.from_hash(o)
463
+ cookbook_version = new(o["cookbook_name"] || o["name"])
464
+
464
465
  # We want the Chef::Cookbook::Metadata object to always be inflated
465
466
  cookbook_version.metadata = Chef::Cookbook::Metadata.from_hash(o["metadata"])
466
467
  cookbook_version.manifest = o
468
+ cookbook_version.identifier = o["identifier"] if o.key?("identifier")
467
469
 
468
470
  # We don't need the following step when we decide to stop supporting deprecated operators in the metadata (e.g. <<, >>)
469
471
  cookbook_version.manifest["metadata"] = Chef::JSONCompat.from_json(Chef::JSONCompat.to_json(cookbook_version.metadata))
@@ -472,13 +474,13 @@ class Chef
472
474
  cookbook_version
473
475
  end
474
476
 
477
+ def self.json_create(o)
478
+ Chef.log_deprecation("Auto inflation of JSON data is deprecated. Please use Chef::CookbookVersion#from_hash")
479
+ from_hash(o)
480
+ end
481
+
475
482
  def self.from_cb_artifact_data(o)
476
- cookbook_version = new(o["name"])
477
- # We want the Chef::Cookbook::Metadata object to always be inflated
478
- cookbook_version.metadata = Chef::Cookbook::Metadata.from_hash(o["metadata"])
479
- cookbook_version.manifest = o
480
- cookbook_version.identifier = o["identifier"]
481
- cookbook_version
483
+ from_hash(o)
482
484
  end
483
485
 
484
486
  # @deprecated This method was used by the Ruby Chef Server and is no longer
@@ -498,7 +500,6 @@ class Chef
498
500
  rendered_manifest
499
501
  end
500
502
 
501
-
502
503
  def to_hash
503
504
  # TODO: this should become deprecated when the API for CookbookManifest becomes stable
504
505
  cookbook_manifest.to_hash
@@ -509,7 +510,6 @@ class Chef
509
510
  cookbook_manifest.to_json
510
511
  end
511
512
 
512
-
513
513
  def metadata_json_file
514
514
  File.join(root_paths[0], "metadata.json")
515
515
  end
@@ -543,22 +543,22 @@ class Chef
543
543
  end
544
544
 
545
545
  def self.chef_server_rest
546
- Chef::REST.new(Chef::Config[:chef_server_url])
546
+ Chef::ServerAPI.new(Chef::Config[:chef_server_url])
547
547
  end
548
548
 
549
549
  def destroy
550
- chef_server_rest.delete_rest("cookbooks/#{name}/#{version}")
550
+ chef_server_rest.delete("cookbooks/#{name}/#{version}")
551
551
  self
552
552
  end
553
553
 
554
- def self.load(name, version="_latest")
554
+ def self.load(name, version = "_latest")
555
555
  version = "_latest" if version == "latest"
556
- chef_server_rest.get_rest("cookbooks/#{name}/#{version}")
556
+ from_hash(chef_server_rest.get("cookbooks/#{name}/#{version}"))
557
557
  end
558
558
 
559
559
  # The API returns only a single version of each cookbook in the result from the cookbooks method
560
560
  def self.list
561
- chef_server_rest.get_rest('cookbooks')
561
+ chef_server_rest.get("cookbooks")
562
562
  end
563
563
 
564
564
  # Alias latest_cookbooks as list
@@ -567,7 +567,7 @@ class Chef
567
567
  end
568
568
 
569
569
  def self.list_all_versions
570
- chef_server_rest.get_rest('cookbooks?num_versions=all')
570
+ chef_server_rest.get("cookbooks?num_versions=all")
571
571
  end
572
572
 
573
573
  ##
@@ -577,7 +577,7 @@ class Chef
577
577
  # [String]:: Array of cookbook versions, which are strings like 'x.y.z'
578
578
  # nil:: if the cookbook doesn't exist. an error will also be logged.
579
579
  def self.available_versions(cookbook_name)
580
- chef_server_rest.get_rest("cookbooks/#{cookbook_name}")[cookbook_name]["versions"].map do |cb|
580
+ chef_server_rest.get("cookbooks/#{cookbook_name}")[cookbook_name]["versions"].map do |cb|
581
581
  cb["version"]
582
582
  end
583
583
  rescue Net::HTTPServerException => e
@@ -607,13 +607,13 @@ class Chef
607
607
  preferences = preferences_for_path(node, segment, filename)
608
608
 
609
609
  # in order of prefernce, look for the filename in the manifest
610
- preferences.find {|preferred_filename| manifest_records_by_path[preferred_filename] }
610
+ preferences.find { |preferred_filename| manifest_records_by_path[preferred_filename] }
611
611
  end
612
612
 
613
613
  # For each filename, produce a mapping of base filename (i.e. recipe name
614
614
  # or attribute file) to on disk location
615
615
  def filenames_by_name(filenames)
616
- filenames.select{|filename| filename =~ /\.rb$/}.inject({}){|memo, filename| memo[File.basename(filename, '.rb')] = filename ; memo }
616
+ filenames.select { |filename| filename =~ /\.rb$/ }.inject({}) { |memo, filename| memo[File.basename(filename, ".rb")] = filename ; memo }
617
617
  end
618
618
 
619
619
  def file_vendor
@@ -1,6 +1,6 @@
1
1
  #
2
2
  # Author:: AJ Christensen (<aj@junglist.gen.nz>)
3
- # Copyright:: Copyright (c) 2008 Opscode, Inc.
3
+ # Copyright:: Copyright 2008-2016, Chef Software Inc.
4
4
  # License:: Apache License, Version 2.0
5
5
  #
6
6
  # Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,9 +17,9 @@
17
17
 
18
18
  # I love you Merb (lib/merb-core/server.rb)
19
19
 
20
- require 'chef/config'
21
- require 'chef/run_lock'
22
- require 'etc'
20
+ require "chef/config"
21
+ require "chef/run_lock"
22
+ require "etc"
23
23
 
24
24
  class Chef
25
25
  class Daemon
@@ -61,7 +61,7 @@ class Chef
61
61
  # String::
62
62
  # Location of the pid file for @name
63
63
  def pid_file
64
- Chef::Config[:pid_file] or "/tmp/#{@name}.pid"
64
+ Chef::Config[:pid_file] or "/tmp/#{@name}.pid"
65
65
  end
66
66
 
67
67
  # Suck the pid out of pid_file
@@ -100,7 +100,7 @@ class Chef
100
100
  # ==== Alternatives
101
101
  # If group is left out, the user will be used (changing to user:user)
102
102
  #
103
- def _change_privilege(user, group=user)
103
+ def _change_privilege(user, group = user)
104
104
  uid, gid = Process.euid, Process.egid
105
105
 
106
106
  begin
@@ -1,8 +1,8 @@
1
1
  #
2
- # Author:: Adam Jacob (<adam@opscode.com>)
3
- # Author:: Nuo Yan (<nuo@opscode.com>)
4
- # Author:: Christopher Brown (<cb@opscode.com>)
5
- # Copyright:: Copyright (c) 2009 Opscode, Inc.
2
+ # Author:: Adam Jacob (<adam@chef.io>)
3
+ # Author:: Nuo Yan (<nuo@chef.io>)
4
+ # Author:: Christopher Brown (<cb@chef.io>)
5
+ # Copyright:: Copyright 2009-2016, Chef Software Inc.
6
6
  # License:: Apache License, Version 2.0
7
7
  #
8
8
  # Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,12 +18,13 @@
18
18
  # limitations under the License.
19
19
  #
20
20
 
21
- require 'chef/config'
22
- require 'chef/mixin/params_validate'
23
- require 'chef/mixin/from_file'
24
- require 'chef/data_bag_item'
25
- require 'chef/mash'
26
- require 'chef/json_compat'
21
+ require "chef/config"
22
+ require "chef/mixin/params_validate"
23
+ require "chef/mixin/from_file"
24
+ require "chef/data_bag_item"
25
+ require "chef/mash"
26
+ require "chef/json_compat"
27
+ require "chef/server_api"
27
28
 
28
29
  class Chef
29
30
  class DataBag
@@ -43,23 +44,23 @@ class Chef
43
44
 
44
45
  # Create a new Chef::DataBag
45
46
  def initialize(chef_server_rest: nil)
46
- @name = ''
47
+ @name = ""
47
48
  @chef_server_rest = chef_server_rest
48
49
  end
49
50
 
50
- def name(arg=nil)
51
+ def name(arg = nil)
51
52
  set_or_return(
52
53
  :name,
53
54
  arg,
54
- :regex => VALID_NAME
55
+ :regex => VALID_NAME,
55
56
  )
56
57
  end
57
58
 
58
59
  def to_hash
59
60
  result = {
60
- 'name' => @name,
61
- 'json_class' => self.class.name,
62
- 'chef_type' => 'data_bag',
61
+ "name" => @name,
62
+ "json_class" => self.class.name,
63
+ "chef_type" => "data_bag",
63
64
  }
64
65
  result
65
66
  end
@@ -70,21 +71,26 @@ class Chef
70
71
  end
71
72
 
72
73
  def chef_server_rest
73
- @chef_server_rest ||= Chef::REST.new(Chef::Config[:chef_server_url])
74
+ @chef_server_rest ||= Chef::ServerAPI.new(Chef::Config[:chef_server_url])
74
75
  end
75
76
 
76
77
  def self.chef_server_rest
77
- Chef::REST.new(Chef::Config[:chef_server_url])
78
+ Chef::ServerAPI.new(Chef::Config[:chef_server_url])
78
79
  end
79
80
 
80
81
  # Create a Chef::Role from JSON
81
82
  def self.json_create(o)
83
+ Chef.log_deprecation("Auto inflation of JSON data is deprecated. Please use Chef::DataBag#from_hash")
84
+ from_hash(o)
85
+ end
86
+
87
+ def self.from_hash(o)
82
88
  bag = new
83
89
  bag.name(o["name"])
84
90
  bag
85
91
  end
86
92
 
87
- def self.list(inflate=false)
93
+ def self.list(inflate = false)
88
94
  if Chef::Config[:solo]
89
95
  paths = Array(Chef::Config[:data_bag_path])
90
96
  names = []
@@ -93,9 +99,9 @@ class Chef
93
99
  raise Chef::Exceptions::InvalidDataBagPath, "Data bag path '#{path}' is invalid"
94
100
  end
95
101
 
96
- names += Dir.glob(File.join(Chef::Util::PathHelper.escape_glob(path), "*")).map{|f|File.basename(f)}.sort
102
+ names += Dir.glob(File.join(Chef::Util::PathHelper.escape_glob(path), "*")).map { |f| File.basename(f) }.sort
97
103
  end
98
- names.inject({}) {|h, n| h[n] = n; h}
104
+ names.inject({}) { |h, n| h[n] = n; h }
99
105
  else
100
106
  if inflate
101
107
  # Can't search for all data bags like other objects, fall back to N+1 :(
@@ -104,7 +110,7 @@ class Chef
104
110
  response
105
111
  end
106
112
  else
107
- Chef::REST.new(Chef::Config[:chef_server_url]).get_rest("data")
113
+ Chef::ServerAPI.new(Chef::Config[:chef_server_url]).get("data")
108
114
  end
109
115
  end
110
116
  end
@@ -120,7 +126,7 @@ class Chef
120
126
  end
121
127
 
122
128
  Dir.glob(File.join(Chef::Util::PathHelper.escape_glob(path, name.to_s), "*.json")).inject({}) do |bag, f|
123
- item = Chef::JSONCompat.from_json(IO.read(f))
129
+ item = Chef::JSONCompat.parse(IO.read(f))
124
130
 
125
131
  # Check if we have multiple items with similar names (ids) and raise if their content differs
126
132
  if data_bag.has_key?(item["id"]) && data_bag[item["id"]] != item
@@ -132,12 +138,12 @@ class Chef
132
138
  end
133
139
  return data_bag
134
140
  else
135
- Chef::REST.new(Chef::Config[:chef_server_url]).get_rest("data/#{name}")
141
+ Chef::ServerAPI.new(Chef::Config[:chef_server_url]).get("data/#{name}")
136
142
  end
137
143
  end
138
144
 
139
145
  def destroy
140
- chef_server_rest.delete_rest("data/#{@name}")
146
+ chef_server_rest.delete("data/#{@name}")
141
147
  end
142
148
 
143
149
  # Save the Data Bag via RESTful API
@@ -156,7 +162,7 @@ class Chef
156
162
 
157
163
  #create a data bag via RESTful API
158
164
  def create
159
- chef_server_rest.post_rest("data", self)
165
+ chef_server_rest.post("data", self)
160
166
  self
161
167
  end
162
168