chef 13.12.14-universal-mingw32 → 14.0.190-universal-mingw32

Sign up to get free protection for your applications and to get access to all the features.
Files changed (747) hide show
  1. checksums.yaml +4 -4
  2. data/CONTRIBUTING.md +151 -0
  3. data/Gemfile +12 -9
  4. data/README.md +34 -32
  5. data/Rakefile +22 -18
  6. data/VERSION +1 -0
  7. data/acceptance/.shared/kitchen_acceptance/.kitchen.digitalocean.yml +33 -0
  8. data/acceptance/.shared/kitchen_acceptance/.kitchen.ec2.yml +272 -0
  9. data/acceptance/.shared/kitchen_acceptance/.kitchen.vagrant.yml +57 -0
  10. data/acceptance/.shared/kitchen_acceptance/libraries/kitchen.rb +68 -0
  11. data/acceptance/.shared/kitchen_acceptance/metadata.rb +1 -0
  12. data/acceptance/Gemfile +19 -0
  13. data/acceptance/Gemfile.lock +266 -0
  14. data/acceptance/README.md +137 -0
  15. data/acceptance/basics/.acceptance/acceptance-cookbook/.gitignore +2 -0
  16. data/acceptance/basics/.acceptance/acceptance-cookbook/metadata.rb +3 -0
  17. data/acceptance/basics/.acceptance/acceptance-cookbook/recipes/destroy.rb +1 -0
  18. data/acceptance/basics/.acceptance/acceptance-cookbook/recipes/provision.rb +1 -0
  19. data/acceptance/basics/.acceptance/acceptance-cookbook/recipes/verify.rb +1 -0
  20. data/acceptance/basics/.kitchen.yml +4 -0
  21. data/acceptance/basics/test/integration/chef-current-install/serverspec/chef_client_spec.rb +19 -0
  22. data/acceptance/basics/test/integration/chef-current-install/serverspec/spec_helper.rb +6 -0
  23. data/acceptance/basics/test/integration/helpers/serverspec/Gemfile +8 -0
  24. data/acceptance/data-collector/.acceptance/acceptance-cookbook/.gitignore +2 -0
  25. data/acceptance/data-collector/.acceptance/acceptance-cookbook/metadata.rb +3 -0
  26. data/acceptance/data-collector/.acceptance/acceptance-cookbook/recipes/destroy.rb +2 -0
  27. data/acceptance/data-collector/.acceptance/acceptance-cookbook/recipes/provision.rb +2 -0
  28. data/acceptance/data-collector/.acceptance/acceptance-cookbook/recipes/verify.rb +2 -0
  29. data/acceptance/data-collector/.acceptance/data-collector-test/.gitignore +16 -0
  30. data/acceptance/data-collector/.acceptance/data-collector-test/Berksfile +3 -0
  31. data/acceptance/data-collector/.acceptance/data-collector-test/files/default/api.rb +101 -0
  32. data/acceptance/data-collector/.acceptance/data-collector-test/files/default/apigemfile +3 -0
  33. data/acceptance/data-collector/.acceptance/data-collector-test/files/default/client-rb-both-mode.rb +4 -0
  34. data/acceptance/data-collector/.acceptance/data-collector-test/files/default/client-rb-client-mode.rb +4 -0
  35. data/acceptance/data-collector/.acceptance/data-collector-test/files/default/client-rb-no-endpoint.rb +2 -0
  36. data/acceptance/data-collector/.acceptance/data-collector-test/files/default/client-rb-solo-mode.rb +4 -0
  37. data/acceptance/data-collector/.acceptance/data-collector-test/files/default/config.ru +2 -0
  38. data/acceptance/data-collector/.acceptance/data-collector-test/metadata.rb +7 -0
  39. data/acceptance/data-collector/.acceptance/data-collector-test/recipes/default.rb +44 -0
  40. data/acceptance/data-collector/.kitchen.yml +9 -0
  41. data/acceptance/data-collector/Berksfile +3 -0
  42. data/acceptance/data-collector/test/integration/default/serverspec/default_spec.rb +208 -0
  43. data/acceptance/data-collector/test/integration/helpers/serverspec/Gemfile +8 -0
  44. data/acceptance/omnitruck/.acceptance/acceptance-cookbook/.gitignore +2 -0
  45. data/acceptance/omnitruck/.acceptance/acceptance-cookbook/metadata.rb +1 -0
  46. data/acceptance/omnitruck/.acceptance/acceptance-cookbook/recipes/destroy.rb +1 -0
  47. data/acceptance/omnitruck/.acceptance/acceptance-cookbook/recipes/provision.rb +1 -0
  48. data/acceptance/omnitruck/.acceptance/acceptance-cookbook/recipes/verify.rb +61 -0
  49. data/acceptance/top-cookbooks/.acceptance/acceptance-cookbook/.gitignore +2 -0
  50. data/acceptance/top-cookbooks/.acceptance/acceptance-cookbook/libraries/cookbook_kitchen.rb +43 -0
  51. data/acceptance/top-cookbooks/.acceptance/acceptance-cookbook/libraries/top_cookbooks.rb +41 -0
  52. data/acceptance/top-cookbooks/.acceptance/acceptance-cookbook/metadata.rb +3 -0
  53. data/acceptance/top-cookbooks/.acceptance/acceptance-cookbook/recipes/destroy.rb +1 -0
  54. data/acceptance/top-cookbooks/.acceptance/acceptance-cookbook/recipes/provision.rb +1 -0
  55. data/acceptance/top-cookbooks/.acceptance/acceptance-cookbook/recipes/verify.rb +1 -0
  56. data/acceptance/top-cookbooks/.gitignore +1 -0
  57. data/acceptance/top-cookbooks/.kitchen.chocolatey.yml +6 -0
  58. data/acceptance/top-cookbooks/.kitchen.iis.yml +4 -0
  59. data/acceptance/top-cookbooks/.kitchen.learn-the-basics-rhel.yml +7 -0
  60. data/acceptance/top-cookbooks/.kitchen.learn-the-basics-ubuntu.yml +7 -0
  61. data/acceptance/top-cookbooks/.kitchen.learn-the-basics-windows.yml +7 -0
  62. data/acceptance/top-cookbooks/.kitchen.powershell.yml +4 -0
  63. data/acceptance/top-cookbooks/.kitchen.sql_server.yml +5 -0
  64. data/acceptance/top-cookbooks/.kitchen.winbox.yml +8 -0
  65. data/acceptance/top-cookbooks/.kitchen.windows.yml +38 -0
  66. data/acceptance/trivial/.acceptance/acceptance-cookbook/.gitignore +2 -0
  67. data/acceptance/trivial/.acceptance/acceptance-cookbook/metadata.rb +2 -0
  68. data/acceptance/trivial/.acceptance/acceptance-cookbook/recipes/destroy.rb +1 -0
  69. data/acceptance/trivial/.acceptance/acceptance-cookbook/recipes/provision.rb +1 -0
  70. data/acceptance/trivial/.acceptance/acceptance-cookbook/recipes/verify.rb +1 -0
  71. data/acceptance/trivial/.kitchen.yml +7 -0
  72. data/acceptance/trivial/test/integration/chef-current-install/inspec/chef_client_spec.rb +5 -0
  73. data/acceptance/windows-service/.acceptance/acceptance-cookbook/.gitignore +2 -0
  74. data/acceptance/windows-service/.acceptance/acceptance-cookbook/metadata.rb +2 -0
  75. data/acceptance/windows-service/.acceptance/acceptance-cookbook/recipes/destroy.rb +1 -0
  76. data/acceptance/windows-service/.acceptance/acceptance-cookbook/recipes/provision.rb +1 -0
  77. data/acceptance/windows-service/.acceptance/acceptance-cookbook/recipes/verify.rb +1 -0
  78. data/acceptance/windows-service/.kitchen.yml +7 -0
  79. data/acceptance/windows-service/test/integration/chef-windows-service/inspec/chef_windows_service_spec.rb +58 -0
  80. data/chef-universal-mingw32.gemspec +2 -2
  81. data/chef.gemspec +10 -10
  82. data/distro/powershell/chef/Chef.PowerShell.dll +0 -0
  83. data/distro/powershell/chef/Newtonsoft.Json.dll +0 -0
  84. data/lib/chef/api_client.rb +1 -1
  85. data/lib/chef/api_client/registration.rb +10 -2
  86. data/lib/chef/api_client_v1.rb +7 -6
  87. data/lib/chef/application.rb +75 -46
  88. data/lib/chef/application/client.rb +17 -19
  89. data/lib/chef/application/solo.rb +13 -16
  90. data/lib/chef/application/windows_service.rb +5 -5
  91. data/lib/chef/audit/audit_event_proxy.rb +1 -1
  92. data/lib/chef/audit/audit_reporter.rb +12 -12
  93. data/lib/chef/audit/runner.rb +2 -2
  94. data/lib/chef/chef_fs/chef_fs_data_store.rb +17 -31
  95. data/lib/chef/chef_fs/command_line.rb +9 -9
  96. data/lib/chef/chef_fs/data_handler/acl_data_handler.rb +1 -1
  97. data/lib/chef/chef_fs/data_handler/policy_data_handler.rb +1 -1
  98. data/lib/chef/chef_fs/data_handler/policy_group_data_handler.rb +1 -1
  99. data/lib/chef/chef_fs/file_system/chef_server/cookbook_dir.rb +2 -2
  100. data/lib/chef/chef_fs/file_system/chef_server/policies_dir.rb +2 -2
  101. data/lib/chef/chef_fs/file_system/multiplexed_dir.rb +1 -1
  102. data/lib/chef/chef_fs/file_system/repository/base_file.rb +2 -2
  103. data/lib/chef/chef_fs/file_system_cache.rb +1 -1
  104. data/lib/chef/chef_fs/path_utils.rb +2 -2
  105. data/lib/chef/client.rb +61 -41
  106. data/lib/chef/config.rb +1 -2
  107. data/lib/chef/config_fetcher.rb +1 -1
  108. data/lib/chef/cookbook/chefignore.rb +2 -2
  109. data/lib/chef/cookbook/cookbook_collection.rb +2 -2
  110. data/lib/chef/cookbook/cookbook_version_loader.rb +0 -1
  111. data/lib/chef/cookbook/gem_installer.rb +4 -4
  112. data/lib/chef/cookbook/manifest_v2.rb +1 -1
  113. data/lib/chef/cookbook/metadata.rb +2 -3
  114. data/lib/chef/cookbook/remote_file_vendor.rb +4 -4
  115. data/lib/chef/cookbook/synchronizer.rb +2 -2
  116. data/lib/chef/cookbook/syntax_check.rb +4 -4
  117. data/lib/chef/cookbook_loader.rb +10 -2
  118. data/lib/chef/cookbook_site_streaming_uploader.rb +4 -4
  119. data/lib/chef/cookbook_uploader.rb +2 -3
  120. data/lib/chef/cookbook_version.rb +5 -11
  121. data/lib/chef/data_bag.rb +1 -3
  122. data/lib/chef/data_bag_item.rb +1 -7
  123. data/lib/chef/data_collector.rb +111 -35
  124. data/lib/chef/data_collector/messages.rb +2 -2
  125. data/lib/chef/data_collector/messages/helpers.rb +2 -4
  126. data/lib/chef/deprecated.rb +0 -4
  127. data/lib/chef/dsl/data_query.rb +1 -5
  128. data/lib/chef/dsl/include_attribute.rb +3 -7
  129. data/lib/chef/dsl/include_recipe.rb +1 -5
  130. data/lib/chef/dsl/platform_introspection.rb +9 -13
  131. data/lib/chef/dsl/reboot_pending.rb +1 -8
  132. data/lib/chef/dsl/recipe.rb +2 -12
  133. data/lib/chef/dsl/universal.rb +3 -3
  134. data/lib/chef/environment.rb +2 -4
  135. data/lib/chef/event_dispatch/dsl.rb +2 -2
  136. data/lib/chef/exceptions.rb +1 -1
  137. data/lib/chef/file_access_control/unix.rb +14 -14
  138. data/lib/chef/file_content_management/content_base.rb +3 -1
  139. data/lib/chef/file_content_management/deploy/cp.rb +2 -2
  140. data/lib/chef/file_content_management/deploy/mv_unix.rb +4 -4
  141. data/lib/chef/file_content_management/deploy/mv_windows.rb +1 -1
  142. data/lib/chef/file_content_management/tempfile.rb +1 -1
  143. data/lib/chef/formatters/error_inspectors/compile_error_inspector.rb +3 -3
  144. data/lib/chef/guard_interpreter/default_guard_interpreter.rb +3 -1
  145. data/lib/chef/guard_interpreter/resource_guard_interpreter.rb +2 -2
  146. data/lib/chef/handler.rb +1 -3
  147. data/lib/chef/handler/json_file.rb +1 -2
  148. data/lib/chef/http.rb +23 -11
  149. data/lib/chef/http/auth_credentials.rb +1 -1
  150. data/lib/chef/http/basic_client.rb +16 -17
  151. data/lib/chef/http/decompressor.rb +6 -6
  152. data/lib/chef/http/http_request.rb +5 -5
  153. data/lib/chef/http/json_output.rb +2 -2
  154. data/lib/chef/http/socketless_chef_zero_client.rb +2 -2
  155. data/lib/chef/http/validate_content_length.rb +5 -5
  156. data/lib/chef/knife.rb +1 -1
  157. data/lib/chef/knife/bootstrap.rb +12 -37
  158. data/lib/chef/knife/bootstrap/templates/chef-full.erb +7 -1
  159. data/lib/chef/knife/client_reregister.rb +1 -1
  160. data/lib/chef/knife/configure.rb +1 -3
  161. data/lib/chef/knife/cookbook_download.rb +2 -2
  162. data/lib/chef/knife/cookbook_metadata.rb +3 -3
  163. data/lib/chef/knife/cookbook_site_install.rb +2 -2
  164. data/lib/chef/knife/cookbook_site_share.rb +5 -5
  165. data/lib/chef/knife/cookbook_test.rb +2 -2
  166. data/lib/chef/knife/cookbook_upload.rb +2 -2
  167. data/lib/chef/knife/core/status_presenter.rb +22 -17
  168. data/lib/chef/knife/core/subcommand_loader.rb +1 -1
  169. data/lib/chef/knife/deps.rb +1 -1
  170. data/lib/chef/knife/environment_compare.rb +4 -4
  171. data/lib/chef/knife/exec.rb +3 -3
  172. data/lib/chef/knife/list.rb +1 -1
  173. data/lib/chef/knife/node_policy_set.rb +79 -0
  174. data/lib/chef/knife/osc_user_reregister.rb +1 -1
  175. data/lib/chef/knife/ssh.rb +35 -22
  176. data/lib/chef/knife/ssl_check.rb +3 -3
  177. data/lib/chef/knife/ssl_fetch.rb +1 -1
  178. data/lib/chef/knife/user_reregister.rb +1 -1
  179. data/lib/chef/knife/xargs.rb +1 -1
  180. data/lib/chef/mixin/api_version_request_handling.rb +2 -4
  181. data/lib/chef/mixin/create_path.rb +1 -1
  182. data/lib/chef/mixin/deprecation.rb +14 -14
  183. data/lib/chef/mixin/from_file.rb +5 -0
  184. data/lib/chef/mixin/get_source_from_package.rb +2 -2
  185. data/lib/chef/mixin/homebrew_user.rb +13 -2
  186. data/lib/chef/mixin/openssl_helper.rb +119 -0
  187. data/lib/chef/mixin/params_validate.rb +2 -8
  188. data/lib/chef/mixin/powershell_exec.rb +105 -0
  189. data/lib/chef/mixin/provides.rb +3 -2
  190. data/lib/chef/mixin/securable.rb +1 -5
  191. data/lib/chef/mixin/shell_out.rb +2 -2
  192. data/lib/chef/mixin/template.rb +1 -3
  193. data/lib/chef/mixin/user_context.rb +6 -3
  194. data/lib/chef/mixin/why_run.rb +6 -11
  195. data/lib/chef/monkey_patches/net_http.rb +7 -7
  196. data/lib/chef/monologger.rb +2 -86
  197. data/lib/chef/node.rb +30 -20
  198. data/lib/chef/node/attribute.rb +1 -6
  199. data/lib/chef/node/attribute_collections.rb +2 -2
  200. data/lib/chef/node/immutable_collections.rb +1 -1
  201. data/lib/chef/node/mixin/immutablize_array.rb +110 -3
  202. data/lib/chef/node/mixin/immutablize_hash.rb +111 -5
  203. data/lib/chef/node_map.rb +5 -23
  204. data/lib/chef/platform/query_helpers.rb +0 -12
  205. data/lib/chef/policy_builder/dynamic.rb +1 -1
  206. data/lib/chef/policy_builder/expand_node_object.rb +1 -1
  207. data/lib/chef/policy_builder/policyfile.rb +17 -1
  208. data/lib/chef/powershell.rb +55 -0
  209. data/lib/chef/property.rb +12 -34
  210. data/lib/chef/provider.rb +16 -39
  211. data/lib/chef/provider/apt_preference.rb +3 -3
  212. data/lib/chef/provider/apt_repository.rb +116 -34
  213. data/lib/chef/provider/batch.rb +1 -1
  214. data/lib/chef/provider/cookbook_file/content.rb +1 -1
  215. data/lib/chef/provider/cron.rb +10 -10
  216. data/lib/chef/provider/cron/unix.rb +3 -3
  217. data/lib/chef/provider/directory.rb +3 -3
  218. data/lib/chef/provider/dsc_resource.rb +4 -4
  219. data/lib/chef/provider/dsc_script.rb +4 -4
  220. data/lib/chef/provider/execute.rb +9 -5
  221. data/lib/chef/provider/file.rb +12 -12
  222. data/lib/chef/provider/git.rb +14 -14
  223. data/lib/chef/provider/group.rb +6 -6
  224. data/lib/chef/provider/group/aix.rb +1 -1
  225. data/lib/chef/provider/group/dscl.rb +4 -4
  226. data/lib/chef/provider/group/groupadd.rb +4 -4
  227. data/lib/chef/provider/group/groupmod.rb +3 -3
  228. data/lib/chef/provider/group/pw.rb +4 -4
  229. data/lib/chef/provider/group/windows.rb +2 -2
  230. data/lib/chef/provider/http_request.rb +12 -12
  231. data/lib/chef/provider/ifconfig.rb +6 -6
  232. data/lib/chef/provider/ifconfig/aix.rb +1 -1
  233. data/lib/chef/provider/ifconfig/debian.rb +3 -5
  234. data/lib/chef/provider/launchd.rb +1 -1
  235. data/lib/chef/provider/link.rb +6 -6
  236. data/lib/chef/provider/log.rb +1 -1
  237. data/lib/chef/provider/lwrp_base.rb +2 -2
  238. data/lib/chef/provider/mdadm.rb +10 -10
  239. data/lib/chef/provider/mount.rb +12 -12
  240. data/lib/chef/provider/mount/aix.rb +20 -21
  241. data/lib/chef/provider/mount/mount.rb +20 -15
  242. data/lib/chef/provider/mount/solaris.rb +6 -6
  243. data/lib/chef/provider/mount/windows.rb +7 -7
  244. data/lib/chef/provider/noop.rb +1 -1
  245. data/lib/chef/provider/ohai.rb +1 -1
  246. data/lib/chef/provider/osx_profile.rb +8 -8
  247. data/lib/chef/provider/package.rb +56 -42
  248. data/lib/chef/provider/package/apt.rb +24 -14
  249. data/lib/chef/provider/package/{aix.rb → bff.rb} +12 -12
  250. data/lib/chef/provider/package/cab.rb +3 -3
  251. data/lib/chef/provider/package/chocolatey.rb +1 -9
  252. data/lib/chef/provider/package/dnf/python_helper.rb +6 -6
  253. data/lib/chef/provider/package/dpkg.rb +9 -9
  254. data/lib/chef/provider/package/freebsd/base.rb +2 -2
  255. data/lib/chef/provider/package/freebsd/pkg.rb +2 -2
  256. data/lib/chef/provider/package/freebsd/pkgng.rb +1 -1
  257. data/lib/chef/provider/package/homebrew.rb +3 -3
  258. data/lib/chef/provider/package/ips.rb +2 -2
  259. data/lib/chef/provider/package/macports.rb +3 -3
  260. data/lib/chef/provider/package/msu.rb +2 -2
  261. data/lib/chef/provider/package/openbsd.rb +3 -3
  262. data/lib/chef/provider/package/pacman.rb +3 -3
  263. data/lib/chef/provider/package/paludis.rb +2 -2
  264. data/lib/chef/provider/package/portage.rb +27 -33
  265. data/lib/chef/provider/package/powershell.rb +24 -9
  266. data/lib/chef/provider/package/rpm.rb +5 -6
  267. data/lib/chef/provider/package/rubygems.rb +32 -28
  268. data/lib/chef/provider/package/smartos.rb +6 -6
  269. data/lib/chef/provider/package/solaris.rb +10 -10
  270. data/lib/chef/provider/package/windows.rb +6 -15
  271. data/lib/chef/provider/package/windows/exe.rb +6 -4
  272. data/lib/chef/provider/package/windows/msi.rb +8 -6
  273. data/lib/chef/provider/package/windows/registry_uninstall_entry.rb +12 -6
  274. data/lib/chef/provider/package/yum.rb +167 -398
  275. data/lib/chef/provider/package/yum/python_helper.rb +221 -0
  276. data/lib/chef/provider/package/yum/rpm_utils.rb +10 -1
  277. data/lib/chef/provider/package/yum/simplejson/LICENSE.txt +79 -0
  278. data/lib/chef/provider/package/yum/simplejson/__init__.py +318 -0
  279. data/lib/chef/provider/package/yum/simplejson/__init__.pyc +0 -0
  280. data/lib/chef/provider/package/yum/simplejson/decoder.py +354 -0
  281. data/lib/chef/provider/package/yum/simplejson/decoder.pyc +0 -0
  282. data/lib/chef/provider/package/yum/simplejson/encoder.py +440 -0
  283. data/lib/chef/provider/package/yum/simplejson/encoder.pyc +0 -0
  284. data/lib/chef/provider/package/yum/simplejson/scanner.py +65 -0
  285. data/lib/chef/provider/package/yum/simplejson/scanner.pyc +0 -0
  286. data/lib/chef/provider/package/yum/simplejson/tool.py +37 -0
  287. data/lib/chef/provider/package/yum/version.rb +56 -0
  288. data/lib/chef/provider/package/yum/yum_cache.rb +33 -316
  289. data/lib/chef/provider/package/yum/yum_helper.py +198 -0
  290. data/lib/chef/provider/package/zypper.rb +9 -13
  291. data/lib/chef/provider/powershell_script.rb +3 -3
  292. data/lib/chef/provider/reboot.rb +3 -3
  293. data/lib/chef/provider/registry_key.rb +16 -4
  294. data/lib/chef/provider/remote_directory.rb +1 -3
  295. data/lib/chef/provider/remote_file/cache_control_data.rb +1 -1
  296. data/lib/chef/provider/remote_file/content.rb +4 -4
  297. data/lib/chef/provider/remote_file/http.rb +5 -3
  298. data/lib/chef/provider/remote_file/local_file.rb +1 -1
  299. data/lib/chef/provider/remote_file/network_file.rb +2 -2
  300. data/lib/chef/provider/route.rb +12 -11
  301. data/lib/chef/provider/ruby_block.rb +1 -1
  302. data/lib/chef/provider/script.rb +2 -2
  303. data/lib/chef/provider/service.rb +14 -14
  304. data/lib/chef/provider/service/aix.rb +3 -3
  305. data/lib/chef/provider/service/aixinit.rb +2 -2
  306. data/lib/chef/provider/service/debian.rb +5 -5
  307. data/lib/chef/provider/service/freebsd.rb +3 -3
  308. data/lib/chef/provider/service/gentoo.rb +2 -2
  309. data/lib/chef/provider/service/macosx.rb +8 -8
  310. data/lib/chef/provider/service/openbsd.rb +1 -1
  311. data/lib/chef/provider/service/simple.rb +7 -7
  312. data/lib/chef/provider/service/systemd.rb +4 -4
  313. data/lib/chef/provider/service/upstart.rb +10 -9
  314. data/lib/chef/provider/service/windows.rb +245 -70
  315. data/lib/chef/provider/subversion.rb +8 -8
  316. data/lib/chef/provider/systemd_unit.rb +25 -6
  317. data/lib/chef/provider/user.rb +10 -10
  318. data/lib/chef/provider/user/aix.rb +3 -3
  319. data/lib/chef/provider/user/dscl.rb +2 -2
  320. data/lib/chef/provider/user/pw.rb +4 -4
  321. data/lib/chef/provider/user/solaris.rb +1 -1
  322. data/lib/chef/provider/user/useradd.rb +3 -3
  323. data/lib/chef/provider/user/windows.rb +4 -4
  324. data/lib/chef/provider/whyrun_safe_ruby_block.rb +1 -1
  325. data/lib/chef/provider/{env.rb → windows_env.rb} +55 -19
  326. data/lib/chef/provider/windows_task.rb +27 -27
  327. data/lib/chef/provider/zypper_repository.rb +7 -7
  328. data/lib/chef/provider_resolver.rb +4 -4
  329. data/lib/chef/providers.rb +2 -9
  330. data/lib/chef/resource.rb +19 -13
  331. data/lib/chef/resource/action_class.rb +2 -2
  332. data/lib/chef/resource/apt_package.rb +10 -4
  333. data/lib/chef/resource/apt_preference.rb +20 -7
  334. data/lib/chef/resource/apt_repository.rb +21 -12
  335. data/lib/chef/resource/apt_update.rb +3 -3
  336. data/lib/chef/resource/bash.rb +6 -4
  337. data/lib/chef/resource/batch.rb +8 -6
  338. data/lib/chef/resource/bff_package.rb +8 -5
  339. data/lib/chef/resource/breakpoint.rb +9 -6
  340. data/lib/chef/resource/build_essential.rb +139 -0
  341. data/lib/chef/resource/cab_package.rb +5 -4
  342. data/lib/chef/resource/chef_gem.rb +1 -1
  343. data/lib/chef/resource/chef_handler.rb +130 -0
  344. data/lib/chef/resource/chocolatey_package.rb +6 -6
  345. data/lib/chef/resource/cookbook_file.rb +12 -9
  346. data/lib/chef/resource/cron.rb +14 -75
  347. data/lib/chef/resource/csh.rb +6 -4
  348. data/lib/chef/resource/directory.rb +7 -4
  349. data/lib/chef/resource/dmg_package.rb +161 -0
  350. data/lib/chef/resource/dnf_package.rb +10 -7
  351. data/lib/chef/resource/dpkg_package.rb +5 -3
  352. data/lib/chef/resource/dsc_resource.rb +11 -28
  353. data/lib/chef/resource/dsc_script.rb +14 -37
  354. data/lib/chef/resource/execute.rb +15 -78
  355. data/lib/chef/resource/file.rb +6 -5
  356. data/lib/chef/resource/file/verification.rb +5 -1
  357. data/lib/chef/resource/freebsd_package.rb +2 -1
  358. data/lib/chef/resource/gem_package.rb +6 -3
  359. data/lib/chef/resource/git.rb +4 -15
  360. data/lib/chef/resource/group.rb +7 -46
  361. data/lib/chef/resource/homebrew_cask.rb +98 -0
  362. data/lib/chef/resource/homebrew_package.rb +3 -3
  363. data/lib/chef/resource/homebrew_tap.rb +86 -0
  364. data/lib/chef/resource/hostname.rb +249 -0
  365. data/lib/chef/resource/http_request.rb +8 -22
  366. data/lib/chef/resource/ifconfig.rb +3 -2
  367. data/lib/chef/resource/ips_package.rb +4 -3
  368. data/lib/chef/resource/ksh.rb +7 -6
  369. data/lib/chef/resource/launchd.rb +4 -4
  370. data/lib/chef/resource/link.rb +18 -56
  371. data/lib/chef/resource/log.rb +6 -8
  372. data/lib/chef/resource/lwrp_base.rb +4 -5
  373. data/lib/chef/resource/macos_userdefaults.rb +133 -0
  374. data/lib/chef/resource/macosx_service.rb +7 -23
  375. data/lib/chef/resource/macports_package.rb +2 -1
  376. data/lib/chef/resource/mdadm.rb +13 -84
  377. data/lib/chef/resource/mount.rb +21 -127
  378. data/lib/chef/resource/msu_package.rb +4 -4
  379. data/lib/chef/resource/ohai.rb +5 -3
  380. data/lib/chef/resource/ohai_hint.rb +93 -0
  381. data/lib/chef/resource/openbsd_package.rb +3 -3
  382. data/lib/chef/resource/openssl_dhparam.rb +80 -0
  383. data/lib/chef/resource/openssl_rsa_private_key.rb +93 -0
  384. data/lib/chef/resource/openssl_rsa_public_key.rb +73 -0
  385. data/lib/chef/resource/osx_profile.rb +9 -10
  386. data/lib/chef/resource/package.rb +8 -6
  387. data/lib/chef/resource/pacman_package.rb +3 -2
  388. data/lib/chef/resource/paludis_package.rb +4 -4
  389. data/lib/chef/resource/perl.rb +6 -4
  390. data/lib/chef/resource/portage_package.rb +3 -6
  391. data/lib/chef/resource/powershell_package.rb +9 -13
  392. data/lib/chef/resource/powershell_script.rb +9 -8
  393. data/lib/chef/resource/python.rb +5 -4
  394. data/lib/chef/resource/reboot.rb +8 -9
  395. data/lib/chef/resource/registry_key.rb +9 -19
  396. data/lib/chef/resource/remote_directory.rb +5 -3
  397. data/lib/chef/resource/remote_file.rb +11 -50
  398. data/lib/chef/resource/resource_notification.rb +2 -2
  399. data/lib/chef/resource/rhsm_errata.rb +44 -0
  400. data/lib/chef/resource/rhsm_errata_level.rb +51 -0
  401. data/lib/chef/resource/rhsm_register.rb +162 -0
  402. data/lib/chef/resource/rhsm_repo.rb +62 -0
  403. data/lib/chef/resource/rhsm_subscription.rb +95 -0
  404. data/lib/chef/resource/route.rb +3 -1
  405. data/lib/chef/resource/rpm_package.rb +3 -3
  406. data/lib/chef/resource/ruby.rb +6 -4
  407. data/lib/chef/resource/ruby_block.rb +6 -17
  408. data/lib/chef/resource/scm.rb +14 -146
  409. data/lib/chef/resource/script.rb +7 -5
  410. data/lib/chef/resource/service.rb +2 -1
  411. data/lib/chef/resource/smartos_package.rb +4 -3
  412. data/lib/chef/resource/solaris_package.rb +3 -2
  413. data/lib/chef/resource/subversion.rb +20 -4
  414. data/lib/chef/resource/sudo.rb +231 -0
  415. data/lib/chef/resource/support/sudoer.erb +18 -0
  416. data/lib/chef/resource/swap_file.rb +209 -0
  417. data/lib/chef/resource/sysctl.rb +111 -0
  418. data/lib/chef/resource/systemd_unit.rb +6 -5
  419. data/lib/chef/resource/template.rb +6 -27
  420. data/lib/chef/resource/windows_ad_join.rb +92 -0
  421. data/lib/chef/resource/windows_auto_run.rb +87 -0
  422. data/lib/chef/resource/{env.rb → windows_env.rb} +11 -5
  423. data/lib/chef/resource/windows_feature.rb +95 -0
  424. data/lib/chef/resource/windows_feature_dism.rb +226 -0
  425. data/lib/chef/resource/windows_feature_powershell.rb +256 -0
  426. data/lib/chef/resource/windows_font.rb +127 -0
  427. data/lib/chef/resource/windows_package.rb +5 -3
  428. data/lib/chef/resource/windows_pagefile.rb +206 -0
  429. data/lib/chef/resource/windows_path.rb +3 -3
  430. data/lib/chef/resource/windows_printer.rb +148 -0
  431. data/lib/chef/resource/windows_printer_port.rb +136 -0
  432. data/lib/chef/resource/windows_service.rb +79 -38
  433. data/lib/chef/resource/windows_shortcut.rb +79 -0
  434. data/lib/chef/resource/windows_task.rb +5 -5
  435. data/lib/chef/resource/yum_package.rb +8 -2
  436. data/lib/chef/resource/yum_repository.rb +12 -5
  437. data/lib/chef/resource/zypper_package.rb +5 -3
  438. data/lib/chef/resource/zypper_repository.rb +17 -12
  439. data/lib/chef/resource_inspector.rb +89 -0
  440. data/lib/chef/resource_reporter.rb +5 -6
  441. data/lib/chef/resource_resolver.rb +4 -4
  442. data/lib/chef/resources.rb +31 -6
  443. data/lib/chef/role.rb +1 -3
  444. data/lib/chef/run_context.rb +21 -12
  445. data/lib/chef/run_context/cookbook_compiler.rb +18 -9
  446. data/lib/chef/search/query.rb +1 -2
  447. data/lib/chef/shell.rb +0 -1
  448. data/lib/chef/shell/model_wrapper.rb +1 -1
  449. data/lib/chef/shell/shell_session.rb +4 -3
  450. data/lib/chef/util/diff.rb +2 -2
  451. data/lib/chef/util/dsc/configuration_generator.rb +1 -1
  452. data/lib/chef/util/dsc/lcm_output_parser.rb +1 -1
  453. data/lib/chef/util/dsc/local_configuration_manager.rb +4 -4
  454. data/lib/chef/util/selinux.rb +1 -1
  455. data/lib/chef/util/windows/logon_session.rb +5 -2
  456. data/lib/chef/util/windows/net_user.rb +2 -2
  457. data/lib/chef/util/windows/volume.rb +0 -4
  458. data/lib/chef/version.rb +1 -1
  459. data/lib/chef/win32/api/error.rb +2 -2
  460. data/lib/chef/win32/api/net.rb +1 -1
  461. data/lib/chef/win32/api/security.rb +11 -0
  462. data/lib/chef/win32/eventlog.rb +2 -2
  463. data/lib/chef/win32/mutex.rb +1 -1
  464. data/lib/chef/win32/registry.rb +17 -17
  465. data/lib/chef/win32/security.rb +34 -12
  466. data/lib/chef/win32/security/sid.rb +1 -2
  467. data/lib/chef/win32/version.rb +2 -15
  468. data/lib/chef/win32_service_constants.rb +143 -0
  469. data/spec/data/mixin/invalid_data.rb +3 -0
  470. data/spec/data/mixin/real_data.rb +2 -0
  471. data/spec/functional/assets/yumrepo/chef_rpm-1.10-1.aarch64.rpm +0 -0
  472. data/spec/functional/assets/yumrepo/chef_rpm-1.10-1.i686.rpm +0 -0
  473. data/spec/functional/assets/yumrepo/chef_rpm-1.10-1.ppc64.rpm +0 -0
  474. data/spec/functional/assets/yumrepo/chef_rpm-1.10-1.ppc64le.rpm +0 -0
  475. data/spec/functional/assets/yumrepo/chef_rpm-1.10-1.s390x.rpm +0 -0
  476. data/spec/functional/assets/yumrepo/chef_rpm-1.10-1.src.rpm +0 -0
  477. data/spec/functional/assets/yumrepo/chef_rpm-1.10-1.x86_64.rpm +0 -0
  478. data/spec/functional/assets/yumrepo/chef_rpm-1.2-1.aarch64.rpm +0 -0
  479. data/spec/functional/assets/yumrepo/chef_rpm-1.2-1.i686.rpm +0 -0
  480. data/spec/functional/assets/yumrepo/chef_rpm-1.2-1.ppc64.rpm +0 -0
  481. data/spec/functional/assets/yumrepo/chef_rpm-1.2-1.ppc64le.rpm +0 -0
  482. data/spec/functional/assets/yumrepo/chef_rpm-1.2-1.s390x.rpm +0 -0
  483. data/spec/functional/assets/yumrepo/chef_rpm-1.2-1.src.rpm +0 -0
  484. data/spec/functional/assets/yumrepo/chef_rpm-1.2-1.x86_64.rpm +0 -0
  485. data/spec/functional/assets/yumrepo/repodata/4632d67cb92636e7575d911c24f0e04d3505a944e97c483abe0c3e73a7c62d33-filelists.sqlite.bz2 +0 -0
  486. data/spec/functional/assets/yumrepo/repodata/74599b793e54d877323837d2d81a1c3c594c44e4335f9528234bb490f7b9b439-other.xml.gz +0 -0
  487. data/spec/functional/assets/yumrepo/repodata/a845d418f919d2115ab95a56b2c76f6825ad0d0bede49181a55c04f58995d057-primary.sqlite.bz2 +0 -0
  488. data/spec/functional/assets/yumrepo/repodata/af9b7cf9ef23bd7b43068d74a460f3b5d06753d638e58e4a0c9edc35bfb9cdc4-other.sqlite.bz2 +0 -0
  489. data/spec/functional/assets/yumrepo/repodata/bdb4f5f1492a3b9532f22c43110a81500dd744f23da0aec5c33b2a41317c737d-filelists.xml.gz +0 -0
  490. data/spec/functional/assets/yumrepo/repodata/c10d1d34ce99e02f12ec96ef68360543ab1bb7c3cb81a4a2bf78df7d8597e9df-primary.xml.gz +0 -0
  491. data/spec/functional/assets/yumrepo/repodata/filelists.xml.gz +0 -0
  492. data/spec/functional/assets/yumrepo/repodata/other.xml.gz +0 -0
  493. data/spec/functional/assets/yumrepo/repodata/primary.xml.gz +0 -0
  494. data/spec/functional/assets/yumrepo/repodata/repomd.xml +19 -53
  495. data/spec/functional/event_loggers/windows_eventlog_spec.rb +2 -2
  496. data/spec/functional/http/simple_spec.rb +6 -6
  497. data/spec/functional/mixin/from_file_spec.rb +82 -0
  498. data/spec/functional/notifications_spec.rb +1 -1
  499. data/spec/functional/resource/{package_spec.rb → apt_package_spec.rb} +4 -4
  500. data/spec/functional/resource/dnf_package_spec.rb +115 -115
  501. data/spec/functional/resource/ifconfig_spec.rb +1 -2
  502. data/spec/functional/resource/link_spec.rb +9 -13
  503. data/spec/functional/resource/powershell_script_spec.rb +0 -2
  504. data/spec/functional/resource/registry_spec.rb +3 -3
  505. data/spec/functional/resource/remote_file_spec.rb +4 -4
  506. data/spec/functional/resource/user/windows_spec.rb +3 -1
  507. data/spec/functional/resource/windows_env_spec.rb +285 -0
  508. data/spec/functional/resource/windows_task_spec.rb +303 -2
  509. data/spec/functional/resource/yum_package_spec.rb +949 -0
  510. data/spec/functional/root_alias_spec.rb +1 -1
  511. data/spec/functional/win32/security_spec.rb +60 -7
  512. data/spec/functional/win32/versions_spec.rb +7 -9
  513. data/spec/integration/client/client_spec.rb +99 -7
  514. data/spec/integration/knife/chef_fs_data_store_spec.rb +23 -4
  515. data/spec/integration/recipes/recipe_dsl_spec.rb +26 -26
  516. data/spec/integration/recipes/resource_action_spec.rb +25 -120
  517. data/spec/spec_helper.rb +10 -2
  518. data/spec/support/lib/chef/resource/one_two_three_four.rb +0 -2
  519. data/spec/support/lib/chef/resource/zen_master.rb +1 -3
  520. data/spec/support/mock/constant.rb +1 -1
  521. data/spec/support/platform_helpers.rb +24 -7
  522. data/spec/support/shared/context/client.rb +13 -10
  523. data/spec/support/shared/examples/client.rb +50 -0
  524. data/spec/support/shared/functional/file_resource.rb +1 -1
  525. data/spec/support/shared/functional/securable_resource.rb +2 -2
  526. data/spec/support/shared/integration/knife_support.rb +5 -0
  527. data/spec/unit/application/client_spec.rb +39 -13
  528. data/spec/unit/application/solo_spec.rb +1 -8
  529. data/spec/unit/application_spec.rb +66 -2
  530. data/spec/unit/audit/audit_event_proxy_spec.rb +1 -1
  531. data/spec/unit/audit/audit_reporter_spec.rb +16 -16
  532. data/spec/unit/chef_fs/file_system_spec.rb +1 -1
  533. data/spec/unit/client_spec.rb +3 -4
  534. data/spec/unit/cookbook/metadata_spec.rb +1 -1
  535. data/spec/unit/cookbook_loader_spec.rb +6 -6
  536. data/spec/unit/cookbook_manifest_spec.rb +2 -2
  537. data/spec/unit/cookbook_version_file_specificity_spec.rb +5 -25
  538. data/spec/unit/data_collector/messages/helpers_spec.rb +9 -0
  539. data/spec/unit/data_collector/resource_report_spec.rb +3 -3
  540. data/spec/unit/data_collector_spec.rb +135 -1
  541. data/spec/unit/dsl/reboot_pending_spec.rb +0 -13
  542. data/spec/unit/dsl/recipe_spec.rb +0 -13
  543. data/spec/unit/environment_spec.rb +2 -2
  544. data/spec/unit/exceptions_spec.rb +1 -1
  545. data/spec/unit/http/validate_content_length_spec.rb +5 -5
  546. data/spec/unit/knife/bootstrap_spec.rb +11 -15
  547. data/spec/unit/knife/configure_spec.rb +1 -2
  548. data/spec/unit/knife/cookbook_test_spec.rb +2 -2
  549. data/spec/unit/knife/core/gem_glob_loader_spec.rb +2 -2
  550. data/spec/unit/knife/core/node_editor_spec.rb +6 -6
  551. data/spec/unit/knife/environment_compare_spec.rb +3 -3
  552. data/spec/unit/knife/node_edit_spec.rb +3 -1
  553. data/spec/unit/knife/node_policy_set_spec.rb +122 -0
  554. data/spec/unit/knife/osc_user_reregister_spec.rb +1 -1
  555. data/spec/unit/knife/osc_user_show_spec.rb +1 -1
  556. data/spec/unit/knife/ssh_spec.rb +18 -0
  557. data/spec/unit/log/syslog_spec.rb +2 -4
  558. data/spec/unit/log/winevt_spec.rb +2 -3
  559. data/spec/unit/lwrp_spec.rb +4 -4
  560. data/spec/unit/mixin/homebrew_user_spec.rb +1 -5
  561. data/spec/unit/mixin/openssl_helper_spec.rb +252 -0
  562. data/spec/unit/mixin/powershell_exec_spec.rb +43 -0
  563. data/spec/unit/node/attribute_spec.rb +3 -3
  564. data/spec/unit/node/immutable_collections_spec.rb +11 -1
  565. data/spec/unit/node_map_spec.rb +2 -2
  566. data/spec/unit/node_spec.rb +11 -16
  567. data/spec/unit/platform/query_helpers_spec.rb +0 -13
  568. data/spec/unit/policy_builder/policyfile_spec.rb +79 -2
  569. data/spec/unit/property/validation_spec.rb +51 -4
  570. data/spec/unit/provider/apt_repository_spec.rb +97 -32
  571. data/spec/unit/provider/cookbook_file_spec.rb +2 -1
  572. data/spec/unit/provider/cron/unix_spec.rb +8 -3
  573. data/spec/unit/provider/cron_spec.rb +27 -32
  574. data/spec/unit/provider/file_spec.rb +2 -1
  575. data/spec/unit/provider/group/dscl_spec.rb +7 -8
  576. data/spec/unit/provider/group/gpasswd_spec.rb +5 -2
  577. data/spec/unit/provider/group/groupmod_spec.rb +6 -3
  578. data/spec/unit/provider/group/pw_spec.rb +5 -2
  579. data/spec/unit/provider/link_spec.rb +6 -4
  580. data/spec/unit/provider/log_spec.rb +18 -13
  581. data/spec/unit/provider/mount/aix_spec.rb +1 -9
  582. data/spec/unit/provider/mount/mount_spec.rb +22 -0
  583. data/spec/unit/provider/osx_profile_spec.rb +3 -3
  584. data/spec/unit/provider/package/apt_spec.rb +431 -411
  585. data/spec/unit/provider/package/{aix_spec.rb → bff_spec.rb} +7 -5
  586. data/spec/unit/provider/package/chocolatey_spec.rb +0 -13
  587. data/spec/unit/provider/package/homebrew_spec.rb +2 -1
  588. data/spec/unit/provider/package/portage_spec.rb +11 -147
  589. data/spec/unit/provider/package/powershell_spec.rb +208 -57
  590. data/spec/unit/provider/package/rubygems_spec.rb +11 -2
  591. data/spec/unit/provider/package/windows_spec.rb +0 -19
  592. data/spec/unit/provider/package/yum/python_helper_spec.rb +29 -0
  593. data/spec/unit/provider/package/yum/yum_cache_spec.rb +86 -4
  594. data/spec/unit/provider/package/zypper_spec.rb +8 -0
  595. data/spec/unit/provider/package_spec.rb +47 -20
  596. data/spec/unit/provider/registry_key_spec.rb +7 -1
  597. data/spec/unit/provider/remote_directory_spec.rb +1 -1
  598. data/spec/unit/provider/remote_file_spec.rb +2 -1
  599. data/spec/unit/provider/service/macosx_spec.rb +4 -2
  600. data/spec/unit/provider/service/systemd_service_spec.rb +2 -10
  601. data/spec/unit/provider/service/windows_spec.rb +447 -30
  602. data/spec/unit/provider/systemd_unit_spec.rb +50 -13
  603. data/spec/unit/provider/template_spec.rb +2 -4
  604. data/spec/unit/provider/user/windows_spec.rb +3 -0
  605. data/spec/unit/provider/{env_spec.rb → windows_env_spec.rb} +102 -12
  606. data/spec/unit/provider/zypper_repository_spec.rb +4 -2
  607. data/spec/unit/provider_resolver_spec.rb +23 -38
  608. data/spec/unit/recipe_spec.rb +4 -4
  609. data/spec/unit/resource/apt_package_spec.rb +4 -0
  610. data/spec/unit/resource/apt_preference_spec.rb +0 -5
  611. data/spec/unit/resource/apt_repository_spec.rb +35 -10
  612. data/spec/unit/resource/apt_update_spec.rb +0 -5
  613. data/spec/unit/resource/bash_spec.rb +2 -3
  614. data/spec/unit/resource/batch_spec.rb +1 -4
  615. data/spec/unit/resource/{timestamped_deploy_spec.rb → build_essential_spec.rb} +10 -11
  616. data/spec/unit/resource/cab_package_spec.rb +1 -3
  617. data/{lib/chef/mixin/language_include_attribute.rb → spec/unit/resource/chef_handler_spec.rb} +13 -12
  618. data/spec/unit/resource/chocolatey_package_spec.rb +1 -3
  619. data/spec/unit/resource/cron_spec.rb +0 -5
  620. data/spec/unit/resource/csh_spec.rb +2 -3
  621. data/spec/unit/resource/directory_spec.rb +1 -6
  622. data/{lib/chef/resource/deploy_revision.rb → spec/unit/resource/dmg_package_spec.rb} +14 -10
  623. data/spec/unit/resource/dnf_package_spec.rb +20 -26
  624. data/spec/unit/resource/file_spec.rb +1 -1
  625. data/spec/unit/resource/freebsd_package_spec.rb +22 -23
  626. data/spec/unit/resource/gem_package_spec.rb +3 -5
  627. data/spec/unit/resource/git_spec.rb +1 -2
  628. data/spec/unit/resource/group_spec.rb +0 -5
  629. data/spec/unit/resource/homebrew_cask_spec.rb +35 -0
  630. data/spec/unit/resource/homebrew_package_spec.rb +4 -0
  631. data/spec/unit/resource/homebrew_tap_spec.rb +39 -0
  632. data/spec/unit/resource/hostname_spec.rb +43 -0
  633. data/spec/unit/resource/http_request_spec.rb +0 -5
  634. data/spec/unit/resource/ips_package_spec.rb +4 -0
  635. data/spec/unit/resource/ksh_spec.rb +2 -3
  636. data/spec/unit/resource/launchd_spec.rb +0 -5
  637. data/spec/unit/resource/link_spec.rb +1 -6
  638. data/spec/unit/resource/log_spec.rb +0 -5
  639. data/spec/unit/resource/macos_user_defaults_spec.rb +45 -0
  640. data/spec/unit/resource/mdadm_spec.rb +0 -5
  641. data/spec/unit/resource/mount_spec.rb +1 -6
  642. data/spec/unit/resource/msu_package_spec.rb +1 -3
  643. data/spec/unit/resource/ohai_hint_spec.rb +43 -0
  644. data/spec/unit/resource/ohai_spec.rb +0 -5
  645. data/spec/unit/resource/openbsd_package_spec.rb +8 -12
  646. data/spec/unit/resource/openssl_dhparam.rb +51 -0
  647. data/spec/unit/resource/openssl_rsa_private_key_spec.rb +59 -0
  648. data/spec/unit/resource/openssl_rsa_public_key_spec.rb +39 -0
  649. data/spec/unit/resource/osx_profile_spec.rb +0 -5
  650. data/spec/unit/resource/package_spec.rb +0 -5
  651. data/spec/unit/resource/perl_spec.rb +2 -3
  652. data/spec/unit/resource/portage_package_spec.rb +3 -7
  653. data/spec/unit/resource/powershell_package_spec.rb +11 -4
  654. data/spec/unit/resource/python_spec.rb +0 -5
  655. data/spec/unit/resource/reboot_spec.rb +0 -5
  656. data/spec/unit/resource/registry_key_spec.rb +5 -6
  657. data/spec/unit/resource/remote_directory_spec.rb +0 -5
  658. data/spec/unit/resource/remote_file_spec.rb +1 -5
  659. data/spec/unit/resource/rhsm_errata_level_spec.rb +46 -0
  660. data/{lib/chef/mixin/language_include_recipe.rb → spec/unit/resource/rhsm_errata_spec.rb} +14 -10
  661. data/spec/unit/resource/rhsm_register_spec.rb +199 -0
  662. data/spec/unit/resource/rhsm_repo_spec.rb +59 -0
  663. data/spec/unit/resource/rhsm_subscription_spec.rb +93 -0
  664. data/spec/unit/resource/route_spec.rb +1 -6
  665. data/spec/unit/resource/rpm_package_spec.rb +4 -0
  666. data/spec/unit/resource/ruby_block_spec.rb +0 -5
  667. data/spec/unit/resource/ruby_spec.rb +0 -5
  668. data/spec/unit/resource/scm_spec.rb +0 -15
  669. data/spec/unit/resource/service_spec.rb +0 -5
  670. data/spec/unit/resource/subversion_spec.rb +12 -0
  671. data/spec/unit/resource/sudo_spec.rb +92 -0
  672. data/spec/unit/resource/swap_file_spec.rb +40 -0
  673. data/spec/unit/resource/sysctl_spec.rb +56 -0
  674. data/spec/unit/resource/systemd_unit_spec.rb +5 -7
  675. data/spec/unit/resource/template_spec.rb +1 -3
  676. data/spec/unit/resource/user_spec.rb +0 -5
  677. data/spec/unit/resource/windows_ad_join.rb +45 -0
  678. data/spec/unit/resource/windows_auto_run_spec.rb +50 -0
  679. data/spec/unit/resource/{env_spec.rb → windows_env_spec.rb} +19 -21
  680. data/spec/unit/resource/windows_feature.rb +41 -0
  681. data/spec/unit/resource/windows_feature_dism.rb +51 -0
  682. data/spec/unit/resource/windows_feature_powershell.rb +51 -0
  683. data/spec/unit/resource/windows_font_spec.rb +44 -0
  684. data/spec/unit/resource/windows_package_spec.rb +2 -2
  685. data/spec/unit/resource/windows_pagefile_spec.rb +45 -0
  686. data/spec/unit/resource/windows_printer_port_spec.rb +45 -0
  687. data/spec/unit/resource/windows_printer_spec.rb +45 -0
  688. data/spec/unit/resource/windows_service_spec.rb +25 -4
  689. data/spec/unit/resource/windows_shortcut_spec.rb +39 -0
  690. data/spec/unit/resource/windows_task_spec.rb +0 -5
  691. data/spec/unit/resource/yum_repository_spec.rb +4 -0
  692. data/spec/unit/resource/zypper_repository_spec.rb +4 -0
  693. data/spec/unit/resource_inspector_spec.rb +60 -0
  694. data/spec/unit/resource_reporter_spec.rb +2 -2
  695. data/spec/unit/resource_spec.rb +0 -5
  696. data/spec/unit/shell/shell_session_spec.rb +0 -1
  697. data/spec/unit/user_spec.rb +1 -1
  698. data/spec/unit/util/windows/logon_session_spec.rb +2 -1
  699. data/spec/unit/win32/security_spec.rb +44 -1
  700. data/spec/unit/windows_service_spec.rb +4 -2
  701. data/tasks/announce.rb +1 -1
  702. data/tasks/cbgb.rb +84 -0
  703. data/tasks/dependencies.rb +38 -2
  704. data/tasks/maintainers.rb +7 -7
  705. data/tasks/rspec.rb +2 -2
  706. data/tasks/templates/prerelease.md.erb +2 -11
  707. data/tasks/templates/release.md.erb +1 -9
  708. metadata +225 -96
  709. data/lib/chef/knife/help.rb +0 -101
  710. data/lib/chef/knife/help_topics.rb +0 -4
  711. data/lib/chef/knife/index_rebuild.rb +0 -133
  712. data/lib/chef/mixin/language.rb +0 -48
  713. data/lib/chef/mixin/recipe_definition_dsl_core.rb +0 -35
  714. data/lib/chef/provider/deploy.rb +0 -470
  715. data/lib/chef/provider/deploy/revision.rb +0 -107
  716. data/lib/chef/provider/deploy/timestamped.rb +0 -34
  717. data/lib/chef/provider/env/windows.rb +0 -76
  718. data/lib/chef/provider/erl_call.rb +0 -76
  719. data/lib/chef/provider/package/yum/yum-dump.py +0 -307
  720. data/lib/chef/resource/deploy.rb +0 -449
  721. data/lib/chef/resource/erl_call.rb +0 -90
  722. data/lib/chef/resource/timestamped_deploy.rb +0 -26
  723. data/spec/functional/assets/yumrepo/chef_rpm-1.10-1.fc24.i686.rpm +0 -0
  724. data/spec/functional/assets/yumrepo/chef_rpm-1.10-1.fc24.src.rpm +0 -0
  725. data/spec/functional/assets/yumrepo/chef_rpm-1.10-1.fc24.x86_64.rpm +0 -0
  726. data/spec/functional/assets/yumrepo/chef_rpm-1.2-1.fc24.i686.rpm +0 -0
  727. data/spec/functional/assets/yumrepo/chef_rpm-1.2-1.fc24.src.rpm +0 -0
  728. data/spec/functional/assets/yumrepo/chef_rpm-1.2-1.fc24.x86_64.rpm +0 -0
  729. data/spec/functional/assets/yumrepo/repodata/313329137b55fd333b2dc66394a6661a2befa6cc535d8460d92a4a78a9c581f0-primary.sqlite.bz2 +0 -0
  730. data/spec/functional/assets/yumrepo/repodata/31ac4db5d5ac593728fcc26aef82b7b93c4cc4dbec843786b1845b939b658553-other.xml.gz +0 -0
  731. data/spec/functional/assets/yumrepo/repodata/4ac40fa3c6728c1401318e2e20a997436624e83dcf7a5f952b851ef422637773-filelists.sqlite.bz2 +0 -0
  732. data/spec/functional/assets/yumrepo/repodata/66391e53f0510b98b3f0b79f40ba1048026d9a1ef20905d9c40ba6f5411f3243-primary.xml.gz +0 -0
  733. data/spec/functional/assets/yumrepo/repodata/8b34697595fcc87928e12d24644dda9462c3857bd932861e28bc77ae1f31be16-filelists.xml.gz +0 -0
  734. data/spec/functional/assets/yumrepo/repodata/b97cca3fe14bcf06c52be4449b6108f7731239ff221111dcce8aada5467f60dc-other.sqlite.bz2 +0 -0
  735. data/spec/functional/resource/deploy_revision_spec.rb +0 -881
  736. data/spec/functional/resource/env_spec.rb +0 -192
  737. data/spec/unit/knife/index_rebuild_spec.rb +0 -125
  738. data/spec/unit/knife/knife_help.rb +0 -92
  739. data/spec/unit/provider/deploy/revision_spec.rb +0 -110
  740. data/spec/unit/provider/deploy/timestamped_spec.rb +0 -40
  741. data/spec/unit/provider/deploy_spec.rb +0 -641
  742. data/spec/unit/provider/env/windows_spec.rb +0 -103
  743. data/spec/unit/provider/erl_call_spec.rb +0 -77
  744. data/spec/unit/provider/package/yum_spec.rb +0 -2294
  745. data/spec/unit/resource/deploy_revision_spec.rb +0 -42
  746. data/spec/unit/resource/deploy_spec.rb +0 -283
  747. data/spec/unit/resource/erl_call_spec.rb +0 -81
@@ -0,0 +1,354 @@
1
+ """Implementation of JSONDecoder
2
+ """
3
+ import re
4
+ import sys
5
+ import struct
6
+
7
+ from simplejson.scanner import make_scanner
8
+ try:
9
+ from simplejson._speedups import scanstring as c_scanstring
10
+ except ImportError:
11
+ c_scanstring = None
12
+
13
+ __all__ = ['JSONDecoder']
14
+
15
+ FLAGS = re.VERBOSE | re.MULTILINE | re.DOTALL
16
+
17
+ def _floatconstants():
18
+ _BYTES = '7FF80000000000007FF0000000000000'.decode('hex')
19
+ if sys.byteorder != 'big':
20
+ _BYTES = _BYTES[:8][::-1] + _BYTES[8:][::-1]
21
+ nan, inf = struct.unpack('dd', _BYTES)
22
+ return nan, inf, -inf
23
+
24
+ NaN, PosInf, NegInf = _floatconstants()
25
+
26
+
27
+ def linecol(doc, pos):
28
+ lineno = doc.count('\n', 0, pos) + 1
29
+ if lineno == 1:
30
+ colno = pos
31
+ else:
32
+ colno = pos - doc.rindex('\n', 0, pos)
33
+ return lineno, colno
34
+
35
+
36
+ def errmsg(msg, doc, pos, end=None):
37
+ # Note that this function is called from _speedups
38
+ lineno, colno = linecol(doc, pos)
39
+ if end is None:
40
+ #fmt = '{0}: line {1} column {2} (char {3})'
41
+ #return fmt.format(msg, lineno, colno, pos)
42
+ fmt = '%s: line %d column %d (char %d)'
43
+ return fmt % (msg, lineno, colno, pos)
44
+ endlineno, endcolno = linecol(doc, end)
45
+ #fmt = '{0}: line {1} column {2} - line {3} column {4} (char {5} - {6})'
46
+ #return fmt.format(msg, lineno, colno, endlineno, endcolno, pos, end)
47
+ fmt = '%s: line %d column %d - line %d column %d (char %d - %d)'
48
+ return fmt % (msg, lineno, colno, endlineno, endcolno, pos, end)
49
+
50
+
51
+ _CONSTANTS = {
52
+ '-Infinity': NegInf,
53
+ 'Infinity': PosInf,
54
+ 'NaN': NaN,
55
+ }
56
+
57
+ STRINGCHUNK = re.compile(r'(.*?)(["\\\x00-\x1f])', FLAGS)
58
+ BACKSLASH = {
59
+ '"': u'"', '\\': u'\\', '/': u'/',
60
+ 'b': u'\b', 'f': u'\f', 'n': u'\n', 'r': u'\r', 't': u'\t',
61
+ }
62
+
63
+ DEFAULT_ENCODING = "utf-8"
64
+
65
+ def py_scanstring(s, end, encoding=None, strict=True, _b=BACKSLASH, _m=STRINGCHUNK.match):
66
+ """Scan the string s for a JSON string. End is the index of the
67
+ character in s after the quote that started the JSON string.
68
+ Unescapes all valid JSON string escape sequences and raises ValueError
69
+ on attempt to decode an invalid string. If strict is False then literal
70
+ control characters are allowed in the string.
71
+
72
+ Returns a tuple of the decoded string and the index of the character in s
73
+ after the end quote."""
74
+ if encoding is None:
75
+ encoding = DEFAULT_ENCODING
76
+ chunks = []
77
+ _append = chunks.append
78
+ begin = end - 1
79
+ while 1:
80
+ chunk = _m(s, end)
81
+ if chunk is None:
82
+ raise ValueError(
83
+ errmsg("Unterminated string starting at", s, begin))
84
+ end = chunk.end()
85
+ content, terminator = chunk.groups()
86
+ # Content is contains zero or more unescaped string characters
87
+ if content:
88
+ if not isinstance(content, unicode):
89
+ content = unicode(content, encoding)
90
+ _append(content)
91
+ # Terminator is the end of string, a literal control character,
92
+ # or a backslash denoting that an escape sequence follows
93
+ if terminator == '"':
94
+ break
95
+ elif terminator != '\\':
96
+ if strict:
97
+ msg = "Invalid control character %r at" % (terminator,)
98
+ #msg = "Invalid control character {0!r} at".format(terminator)
99
+ raise ValueError(errmsg(msg, s, end))
100
+ else:
101
+ _append(terminator)
102
+ continue
103
+ try:
104
+ esc = s[end]
105
+ except IndexError:
106
+ raise ValueError(
107
+ errmsg("Unterminated string starting at", s, begin))
108
+ # If not a unicode escape sequence, must be in the lookup table
109
+ if esc != 'u':
110
+ try:
111
+ char = _b[esc]
112
+ except KeyError:
113
+ msg = "Invalid \\escape: " + repr(esc)
114
+ raise ValueError(errmsg(msg, s, end))
115
+ end += 1
116
+ else:
117
+ # Unicode escape sequence
118
+ esc = s[end + 1:end + 5]
119
+ next_end = end + 5
120
+ if len(esc) != 4:
121
+ msg = "Invalid \\uXXXX escape"
122
+ raise ValueError(errmsg(msg, s, end))
123
+ uni = int(esc, 16)
124
+ # Check for surrogate pair on UCS-4 systems
125
+ if 0xd800 <= uni <= 0xdbff and sys.maxunicode > 65535:
126
+ msg = "Invalid \\uXXXX\\uXXXX surrogate pair"
127
+ if not s[end + 5:end + 7] == '\\u':
128
+ raise ValueError(errmsg(msg, s, end))
129
+ esc2 = s[end + 7:end + 11]
130
+ if len(esc2) != 4:
131
+ raise ValueError(errmsg(msg, s, end))
132
+ uni2 = int(esc2, 16)
133
+ uni = 0x10000 + (((uni - 0xd800) << 10) | (uni2 - 0xdc00))
134
+ next_end += 6
135
+ char = unichr(uni)
136
+ end = next_end
137
+ # Append the unescaped character
138
+ _append(char)
139
+ return u''.join(chunks), end
140
+
141
+
142
+ # Use speedup if available
143
+ scanstring = c_scanstring or py_scanstring
144
+
145
+ WHITESPACE = re.compile(r'[ \t\n\r]*', FLAGS)
146
+ WHITESPACE_STR = ' \t\n\r'
147
+
148
+ def JSONObject((s, end), encoding, strict, scan_once, object_hook, _w=WHITESPACE.match, _ws=WHITESPACE_STR):
149
+ pairs = {}
150
+ # Use a slice to prevent IndexError from being raised, the following
151
+ # check will raise a more specific ValueError if the string is empty
152
+ nextchar = s[end:end + 1]
153
+ # Normally we expect nextchar == '"'
154
+ if nextchar != '"':
155
+ if nextchar in _ws:
156
+ end = _w(s, end).end()
157
+ nextchar = s[end:end + 1]
158
+ # Trivial empty object
159
+ if nextchar == '}':
160
+ return pairs, end + 1
161
+ elif nextchar != '"':
162
+ raise ValueError(errmsg("Expecting property name", s, end))
163
+ end += 1
164
+ while True:
165
+ key, end = scanstring(s, end, encoding, strict)
166
+
167
+ # To skip some function call overhead we optimize the fast paths where
168
+ # the JSON key separator is ": " or just ":".
169
+ if s[end:end + 1] != ':':
170
+ end = _w(s, end).end()
171
+ if s[end:end + 1] != ':':
172
+ raise ValueError(errmsg("Expecting : delimiter", s, end))
173
+
174
+ end += 1
175
+
176
+ try:
177
+ if s[end] in _ws:
178
+ end += 1
179
+ if s[end] in _ws:
180
+ end = _w(s, end + 1).end()
181
+ except IndexError:
182
+ pass
183
+
184
+ try:
185
+ value, end = scan_once(s, end)
186
+ except StopIteration:
187
+ raise ValueError(errmsg("Expecting object", s, end))
188
+ pairs[key] = value
189
+
190
+ try:
191
+ nextchar = s[end]
192
+ if nextchar in _ws:
193
+ end = _w(s, end + 1).end()
194
+ nextchar = s[end]
195
+ except IndexError:
196
+ nextchar = ''
197
+ end += 1
198
+
199
+ if nextchar == '}':
200
+ break
201
+ elif nextchar != ',':
202
+ raise ValueError(errmsg("Expecting , delimiter", s, end - 1))
203
+
204
+ try:
205
+ nextchar = s[end]
206
+ if nextchar in _ws:
207
+ end += 1
208
+ nextchar = s[end]
209
+ if nextchar in _ws:
210
+ end = _w(s, end + 1).end()
211
+ nextchar = s[end]
212
+ except IndexError:
213
+ nextchar = ''
214
+
215
+ end += 1
216
+ if nextchar != '"':
217
+ raise ValueError(errmsg("Expecting property name", s, end - 1))
218
+
219
+ if object_hook is not None:
220
+ pairs = object_hook(pairs)
221
+ return pairs, end
222
+
223
+ def JSONArray((s, end), scan_once, _w=WHITESPACE.match, _ws=WHITESPACE_STR):
224
+ values = []
225
+ nextchar = s[end:end + 1]
226
+ if nextchar in _ws:
227
+ end = _w(s, end + 1).end()
228
+ nextchar = s[end:end + 1]
229
+ # Look-ahead for trivial empty array
230
+ if nextchar == ']':
231
+ return values, end + 1
232
+ _append = values.append
233
+ while True:
234
+ try:
235
+ value, end = scan_once(s, end)
236
+ except StopIteration:
237
+ raise ValueError(errmsg("Expecting object", s, end))
238
+ _append(value)
239
+ nextchar = s[end:end + 1]
240
+ if nextchar in _ws:
241
+ end = _w(s, end + 1).end()
242
+ nextchar = s[end:end + 1]
243
+ end += 1
244
+ if nextchar == ']':
245
+ break
246
+ elif nextchar != ',':
247
+ raise ValueError(errmsg("Expecting , delimiter", s, end))
248
+
249
+ try:
250
+ if s[end] in _ws:
251
+ end += 1
252
+ if s[end] in _ws:
253
+ end = _w(s, end + 1).end()
254
+ except IndexError:
255
+ pass
256
+
257
+ return values, end
258
+
259
+ class JSONDecoder(object):
260
+ """Simple JSON <http://json.org> decoder
261
+
262
+ Performs the following translations in decoding by default:
263
+
264
+ +---------------+-------------------+
265
+ | JSON | Python |
266
+ +===============+===================+
267
+ | object | dict |
268
+ +---------------+-------------------+
269
+ | array | list |
270
+ +---------------+-------------------+
271
+ | string | unicode |
272
+ +---------------+-------------------+
273
+ | number (int) | int, long |
274
+ +---------------+-------------------+
275
+ | number (real) | float |
276
+ +---------------+-------------------+
277
+ | true | True |
278
+ +---------------+-------------------+
279
+ | false | False |
280
+ +---------------+-------------------+
281
+ | null | None |
282
+ +---------------+-------------------+
283
+
284
+ It also understands ``NaN``, ``Infinity``, and ``-Infinity`` as
285
+ their corresponding ``float`` values, which is outside the JSON spec.
286
+
287
+ """
288
+
289
+ def __init__(self, encoding=None, object_hook=None, parse_float=None,
290
+ parse_int=None, parse_constant=None, strict=True):
291
+ """``encoding`` determines the encoding used to interpret any ``str``
292
+ objects decoded by this instance (utf-8 by default). It has no
293
+ effect when decoding ``unicode`` objects.
294
+
295
+ Note that currently only encodings that are a superset of ASCII work,
296
+ strings of other encodings should be passed in as ``unicode``.
297
+
298
+ ``object_hook``, if specified, will be called with the result
299
+ of every JSON object decoded and its return value will be used in
300
+ place of the given ``dict``. This can be used to provide custom
301
+ deserializations (e.g. to support JSON-RPC class hinting).
302
+
303
+ ``parse_float``, if specified, will be called with the string
304
+ of every JSON float to be decoded. By default this is equivalent to
305
+ float(num_str). This can be used to use another datatype or parser
306
+ for JSON floats (e.g. decimal.Decimal).
307
+
308
+ ``parse_int``, if specified, will be called with the string
309
+ of every JSON int to be decoded. By default this is equivalent to
310
+ int(num_str). This can be used to use another datatype or parser
311
+ for JSON integers (e.g. float).
312
+
313
+ ``parse_constant``, if specified, will be called with one of the
314
+ following strings: -Infinity, Infinity, NaN.
315
+ This can be used to raise an exception if invalid JSON numbers
316
+ are encountered.
317
+
318
+ """
319
+ self.encoding = encoding
320
+ self.object_hook = object_hook
321
+ self.parse_float = parse_float or float
322
+ self.parse_int = parse_int or int
323
+ self.parse_constant = parse_constant or _CONSTANTS.__getitem__
324
+ self.strict = strict
325
+ self.parse_object = JSONObject
326
+ self.parse_array = JSONArray
327
+ self.parse_string = scanstring
328
+ self.scan_once = make_scanner(self)
329
+
330
+ def decode(self, s, _w=WHITESPACE.match):
331
+ """Return the Python representation of ``s`` (a ``str`` or ``unicode``
332
+ instance containing a JSON document)
333
+
334
+ """
335
+ obj, end = self.raw_decode(s, idx=_w(s, 0).end())
336
+ end = _w(s, end).end()
337
+ if end != len(s):
338
+ raise ValueError(errmsg("Extra data", s, end, len(s)))
339
+ return obj
340
+
341
+ def raw_decode(self, s, idx=0):
342
+ """Decode a JSON document from ``s`` (a ``str`` or ``unicode`` beginning
343
+ with a JSON document) and return a 2-tuple of the Python
344
+ representation and the index in ``s`` where the document ended.
345
+
346
+ This can be used to decode a JSON document from a string that may
347
+ have extraneous data at the end.
348
+
349
+ """
350
+ try:
351
+ obj, end = self.scan_once(s, idx)
352
+ except StopIteration:
353
+ raise ValueError("No JSON object could be decoded")
354
+ return obj, end
@@ -0,0 +1,440 @@
1
+ """Implementation of JSONEncoder
2
+ """
3
+ import re
4
+
5
+ try:
6
+ from simplejson._speedups import encode_basestring_ascii as c_encode_basestring_ascii
7
+ except ImportError:
8
+ c_encode_basestring_ascii = None
9
+ try:
10
+ from simplejson._speedups import make_encoder as c_make_encoder
11
+ except ImportError:
12
+ c_make_encoder = None
13
+
14
+ ESCAPE = re.compile(r'[\x00-\x1f\\"\b\f\n\r\t]')
15
+ ESCAPE_ASCII = re.compile(r'([\\"]|[^\ -~])')
16
+ HAS_UTF8 = re.compile(r'[\x80-\xff]')
17
+ ESCAPE_DCT = {
18
+ '\\': '\\\\',
19
+ '"': '\\"',
20
+ '\b': '\\b',
21
+ '\f': '\\f',
22
+ '\n': '\\n',
23
+ '\r': '\\r',
24
+ '\t': '\\t',
25
+ }
26
+ for i in range(0x20):
27
+ #ESCAPE_DCT.setdefault(chr(i), '\\u{0:04x}'.format(i))
28
+ ESCAPE_DCT.setdefault(chr(i), '\\u%04x' % (i,))
29
+
30
+ # Assume this produces an infinity on all machines (probably not guaranteed)
31
+ INFINITY = float('1e66666')
32
+ FLOAT_REPR = repr
33
+
34
+ def encode_basestring(s):
35
+ """Return a JSON representation of a Python string
36
+
37
+ """
38
+ def replace(match):
39
+ return ESCAPE_DCT[match.group(0)]
40
+ return '"' + ESCAPE.sub(replace, s) + '"'
41
+
42
+
43
+ def py_encode_basestring_ascii(s):
44
+ """Return an ASCII-only JSON representation of a Python string
45
+
46
+ """
47
+ if isinstance(s, str) and HAS_UTF8.search(s) is not None:
48
+ s = s.decode('utf-8')
49
+ def replace(match):
50
+ s = match.group(0)
51
+ try:
52
+ return ESCAPE_DCT[s]
53
+ except KeyError:
54
+ n = ord(s)
55
+ if n < 0x10000:
56
+ #return '\\u{0:04x}'.format(n)
57
+ return '\\u%04x' % (n,)
58
+ else:
59
+ # surrogate pair
60
+ n -= 0x10000
61
+ s1 = 0xd800 | ((n >> 10) & 0x3ff)
62
+ s2 = 0xdc00 | (n & 0x3ff)
63
+ #return '\\u{0:04x}\\u{1:04x}'.format(s1, s2)
64
+ return '\\u%04x\\u%04x' % (s1, s2)
65
+ return '"' + str(ESCAPE_ASCII.sub(replace, s)) + '"'
66
+
67
+
68
+ encode_basestring_ascii = c_encode_basestring_ascii or py_encode_basestring_ascii
69
+
70
+ class JSONEncoder(object):
71
+ """Extensible JSON <http://json.org> encoder for Python data structures.
72
+
73
+ Supports the following objects and types by default:
74
+
75
+ +-------------------+---------------+
76
+ | Python | JSON |
77
+ +===================+===============+
78
+ | dict | object |
79
+ +-------------------+---------------+
80
+ | list, tuple | array |
81
+ +-------------------+---------------+
82
+ | str, unicode | string |
83
+ +-------------------+---------------+
84
+ | int, long, float | number |
85
+ +-------------------+---------------+
86
+ | True | true |
87
+ +-------------------+---------------+
88
+ | False | false |
89
+ +-------------------+---------------+
90
+ | None | null |
91
+ +-------------------+---------------+
92
+
93
+ To extend this to recognize other objects, subclass and implement a
94
+ ``.default()`` method with another method that returns a serializable
95
+ object for ``o`` if possible, otherwise it should call the superclass
96
+ implementation (to raise ``TypeError``).
97
+
98
+ """
99
+ item_separator = ', '
100
+ key_separator = ': '
101
+ def __init__(self, skipkeys=False, ensure_ascii=True,
102
+ check_circular=True, allow_nan=True, sort_keys=False,
103
+ indent=None, separators=None, encoding='utf-8', default=None):
104
+ """Constructor for JSONEncoder, with sensible defaults.
105
+
106
+ If skipkeys is false, then it is a TypeError to attempt
107
+ encoding of keys that are not str, int, long, float or None. If
108
+ skipkeys is True, such items are simply skipped.
109
+
110
+ If ensure_ascii is true, the output is guaranteed to be str
111
+ objects with all incoming unicode characters escaped. If
112
+ ensure_ascii is false, the output will be unicode object.
113
+
114
+ If check_circular is true, then lists, dicts, and custom encoded
115
+ objects will be checked for circular references during encoding to
116
+ prevent an infinite recursion (which would cause an OverflowError).
117
+ Otherwise, no such check takes place.
118
+
119
+ If allow_nan is true, then NaN, Infinity, and -Infinity will be
120
+ encoded as such. This behavior is not JSON specification compliant,
121
+ but is consistent with most JavaScript based encoders and decoders.
122
+ Otherwise, it will be a ValueError to encode such floats.
123
+
124
+ If sort_keys is true, then the output of dictionaries will be
125
+ sorted by key; this is useful for regression tests to ensure
126
+ that JSON serializations can be compared on a day-to-day basis.
127
+
128
+ If indent is a non-negative integer, then JSON array
129
+ elements and object members will be pretty-printed with that
130
+ indent level. An indent level of 0 will only insert newlines.
131
+ None is the most compact representation.
132
+
133
+ If specified, separators should be a (item_separator, key_separator)
134
+ tuple. The default is (', ', ': '). To get the most compact JSON
135
+ representation you should specify (',', ':') to eliminate whitespace.
136
+
137
+ If specified, default is a function that gets called for objects
138
+ that can't otherwise be serialized. It should return a JSON encodable
139
+ version of the object or raise a ``TypeError``.
140
+
141
+ If encoding is not None, then all input strings will be
142
+ transformed into unicode using that encoding prior to JSON-encoding.
143
+ The default is UTF-8.
144
+
145
+ """
146
+
147
+ self.skipkeys = skipkeys
148
+ self.ensure_ascii = ensure_ascii
149
+ self.check_circular = check_circular
150
+ self.allow_nan = allow_nan
151
+ self.sort_keys = sort_keys
152
+ self.indent = indent
153
+ if separators is not None:
154
+ self.item_separator, self.key_separator = separators
155
+ if default is not None:
156
+ self.default = default
157
+ self.encoding = encoding
158
+
159
+ def default(self, o):
160
+ """Implement this method in a subclass such that it returns
161
+ a serializable object for ``o``, or calls the base implementation
162
+ (to raise a ``TypeError``).
163
+
164
+ For example, to support arbitrary iterators, you could
165
+ implement default like this::
166
+
167
+ def default(self, o):
168
+ try:
169
+ iterable = iter(o)
170
+ except TypeError:
171
+ pass
172
+ else:
173
+ return list(iterable)
174
+ return JSONEncoder.default(self, o)
175
+
176
+ """
177
+ raise TypeError(repr(o) + " is not JSON serializable")
178
+
179
+ def encode(self, o):
180
+ """Return a JSON string representation of a Python data structure.
181
+
182
+ >>> JSONEncoder().encode({"foo": ["bar", "baz"]})
183
+ '{"foo": ["bar", "baz"]}'
184
+
185
+ """
186
+ # This is for extremely simple cases and benchmarks.
187
+ if isinstance(o, basestring):
188
+ if isinstance(o, str):
189
+ _encoding = self.encoding
190
+ if (_encoding is not None
191
+ and not (_encoding == 'utf-8')):
192
+ o = o.decode(_encoding)
193
+ if self.ensure_ascii:
194
+ return encode_basestring_ascii(o)
195
+ else:
196
+ return encode_basestring(o)
197
+ # This doesn't pass the iterator directly to ''.join() because the
198
+ # exceptions aren't as detailed. The list call should be roughly
199
+ # equivalent to the PySequence_Fast that ''.join() would do.
200
+ chunks = self.iterencode(o, _one_shot=True)
201
+ if not isinstance(chunks, (list, tuple)):
202
+ chunks = list(chunks)
203
+ return ''.join(chunks)
204
+
205
+ def iterencode(self, o, _one_shot=False):
206
+ """Encode the given object and yield each string
207
+ representation as available.
208
+
209
+ For example::
210
+
211
+ for chunk in JSONEncoder().iterencode(bigobject):
212
+ mysocket.write(chunk)
213
+
214
+ """
215
+ if self.check_circular:
216
+ markers = {}
217
+ else:
218
+ markers = None
219
+ if self.ensure_ascii:
220
+ _encoder = encode_basestring_ascii
221
+ else:
222
+ _encoder = encode_basestring
223
+ if self.encoding != 'utf-8':
224
+ def _encoder(o, _orig_encoder=_encoder, _encoding=self.encoding):
225
+ if isinstance(o, str):
226
+ o = o.decode(_encoding)
227
+ return _orig_encoder(o)
228
+
229
+ def floatstr(o, allow_nan=self.allow_nan, _repr=FLOAT_REPR, _inf=INFINITY, _neginf=-INFINITY):
230
+ # Check for specials. Note that this type of test is processor- and/or
231
+ # platform-specific, so do tests which don't depend on the internals.
232
+
233
+ if o != o:
234
+ text = 'NaN'
235
+ elif o == _inf:
236
+ text = 'Infinity'
237
+ elif o == _neginf:
238
+ text = '-Infinity'
239
+ else:
240
+ return _repr(o)
241
+
242
+ if not allow_nan:
243
+ raise ValueError(
244
+ "Out of range float values are not JSON compliant: " +
245
+ repr(o))
246
+
247
+ return text
248
+
249
+
250
+ if _one_shot and c_make_encoder is not None and not self.indent and not self.sort_keys:
251
+ _iterencode = c_make_encoder(
252
+ markers, self.default, _encoder, self.indent,
253
+ self.key_separator, self.item_separator, self.sort_keys,
254
+ self.skipkeys, self.allow_nan)
255
+ else:
256
+ _iterencode = _make_iterencode(
257
+ markers, self.default, _encoder, self.indent, floatstr,
258
+ self.key_separator, self.item_separator, self.sort_keys,
259
+ self.skipkeys, _one_shot)
260
+ return _iterencode(o, 0)
261
+
262
+ def _make_iterencode(markers, _default, _encoder, _indent, _floatstr, _key_separator, _item_separator, _sort_keys, _skipkeys, _one_shot,
263
+ ## HACK: hand-optimized bytecode; turn globals into locals
264
+ False=False,
265
+ True=True,
266
+ ValueError=ValueError,
267
+ basestring=basestring,
268
+ dict=dict,
269
+ float=float,
270
+ id=id,
271
+ int=int,
272
+ isinstance=isinstance,
273
+ list=list,
274
+ long=long,
275
+ str=str,
276
+ tuple=tuple,
277
+ ):
278
+
279
+ def _iterencode_list(lst, _current_indent_level):
280
+ if not lst:
281
+ yield '[]'
282
+ return
283
+ if markers is not None:
284
+ markerid = id(lst)
285
+ if markerid in markers:
286
+ raise ValueError("Circular reference detected")
287
+ markers[markerid] = lst
288
+ buf = '['
289
+ if _indent is not None:
290
+ _current_indent_level += 1
291
+ newline_indent = '\n' + (' ' * (_indent * _current_indent_level))
292
+ separator = _item_separator + newline_indent
293
+ buf += newline_indent
294
+ else:
295
+ newline_indent = None
296
+ separator = _item_separator
297
+ first = True
298
+ for value in lst:
299
+ if first:
300
+ first = False
301
+ else:
302
+ buf = separator
303
+ if isinstance(value, basestring):
304
+ yield buf + _encoder(value)
305
+ elif value is None:
306
+ yield buf + 'null'
307
+ elif value is True:
308
+ yield buf + 'true'
309
+ elif value is False:
310
+ yield buf + 'false'
311
+ elif isinstance(value, (int, long)):
312
+ yield buf + str(value)
313
+ elif isinstance(value, float):
314
+ yield buf + _floatstr(value)
315
+ else:
316
+ yield buf
317
+ if isinstance(value, (list, tuple)):
318
+ chunks = _iterencode_list(value, _current_indent_level)
319
+ elif isinstance(value, dict):
320
+ chunks = _iterencode_dict(value, _current_indent_level)
321
+ else:
322
+ chunks = _iterencode(value, _current_indent_level)
323
+ for chunk in chunks:
324
+ yield chunk
325
+ if newline_indent is not None:
326
+ _current_indent_level -= 1
327
+ yield '\n' + (' ' * (_indent * _current_indent_level))
328
+ yield ']'
329
+ if markers is not None:
330
+ del markers[markerid]
331
+
332
+ def _iterencode_dict(dct, _current_indent_level):
333
+ if not dct:
334
+ yield '{}'
335
+ return
336
+ if markers is not None:
337
+ markerid = id(dct)
338
+ if markerid in markers:
339
+ raise ValueError("Circular reference detected")
340
+ markers[markerid] = dct
341
+ yield '{'
342
+ if _indent is not None:
343
+ _current_indent_level += 1
344
+ newline_indent = '\n' + (' ' * (_indent * _current_indent_level))
345
+ item_separator = _item_separator + newline_indent
346
+ yield newline_indent
347
+ else:
348
+ newline_indent = None
349
+ item_separator = _item_separator
350
+ first = True
351
+ if _sort_keys:
352
+ items = dct.items()
353
+ items.sort(key=lambda kv: kv[0])
354
+ else:
355
+ items = dct.iteritems()
356
+ for key, value in items:
357
+ if isinstance(key, basestring):
358
+ pass
359
+ # JavaScript is weakly typed for these, so it makes sense to
360
+ # also allow them. Many encoders seem to do something like this.
361
+ elif isinstance(key, float):
362
+ key = _floatstr(key)
363
+ elif key is True:
364
+ key = 'true'
365
+ elif key is False:
366
+ key = 'false'
367
+ elif key is None:
368
+ key = 'null'
369
+ elif isinstance(key, (int, long)):
370
+ key = str(key)
371
+ elif _skipkeys:
372
+ continue
373
+ else:
374
+ raise TypeError("key " + repr(key) + " is not a string")
375
+ if first:
376
+ first = False
377
+ else:
378
+ yield item_separator
379
+ yield _encoder(key)
380
+ yield _key_separator
381
+ if isinstance(value, basestring):
382
+ yield _encoder(value)
383
+ elif value is None:
384
+ yield 'null'
385
+ elif value is True:
386
+ yield 'true'
387
+ elif value is False:
388
+ yield 'false'
389
+ elif isinstance(value, (int, long)):
390
+ yield str(value)
391
+ elif isinstance(value, float):
392
+ yield _floatstr(value)
393
+ else:
394
+ if isinstance(value, (list, tuple)):
395
+ chunks = _iterencode_list(value, _current_indent_level)
396
+ elif isinstance(value, dict):
397
+ chunks = _iterencode_dict(value, _current_indent_level)
398
+ else:
399
+ chunks = _iterencode(value, _current_indent_level)
400
+ for chunk in chunks:
401
+ yield chunk
402
+ if newline_indent is not None:
403
+ _current_indent_level -= 1
404
+ yield '\n' + (' ' * (_indent * _current_indent_level))
405
+ yield '}'
406
+ if markers is not None:
407
+ del markers[markerid]
408
+
409
+ def _iterencode(o, _current_indent_level):
410
+ if isinstance(o, basestring):
411
+ yield _encoder(o)
412
+ elif o is None:
413
+ yield 'null'
414
+ elif o is True:
415
+ yield 'true'
416
+ elif o is False:
417
+ yield 'false'
418
+ elif isinstance(o, (int, long)):
419
+ yield str(o)
420
+ elif isinstance(o, float):
421
+ yield _floatstr(o)
422
+ elif isinstance(o, (list, tuple)):
423
+ for chunk in _iterencode_list(o, _current_indent_level):
424
+ yield chunk
425
+ elif isinstance(o, dict):
426
+ for chunk in _iterencode_dict(o, _current_indent_level):
427
+ yield chunk
428
+ else:
429
+ if markers is not None:
430
+ markerid = id(o)
431
+ if markerid in markers:
432
+ raise ValueError("Circular reference detected")
433
+ markers[markerid] = o
434
+ o = _default(o)
435
+ for chunk in _iterencode(o, _current_indent_level):
436
+ yield chunk
437
+ if markers is not None:
438
+ del markers[markerid]
439
+
440
+ return _iterencode