chef 12.19.36 → 14.14.25
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +5 -5
- data/Gemfile +29 -52
- data/README.md +98 -167
- data/Rakefile +16 -48
- data/bin/chef-apply +0 -1
- data/bin/chef-client +1 -2
- data/{lib/chef/resource/timestamped_deploy.rb → bin/chef-resource-inspector} +11 -11
- data/bin/chef-shell +2 -5
- data/bin/chef-solo +1 -2
- data/bin/knife +1 -2
- data/chef-universal-mingw32.gemspec +6 -5
- data/chef.gemspec +14 -13
- data/lib/chef.rb +1 -2
- data/lib/chef/api_client.rb +21 -24
- data/lib/chef/api_client/registration.rb +16 -8
- data/lib/chef/api_client_v1.rb +32 -29
- data/lib/chef/application.rb +86 -66
- data/lib/chef/application/apply.rb +67 -60
- data/lib/chef/application/client.rb +228 -197
- data/lib/chef/application/exit_code.rb +11 -80
- data/lib/chef/application/knife.rb +81 -76
- data/lib/chef/application/solo.rb +139 -137
- data/lib/chef/application/windows_service.rb +32 -32
- data/lib/chef/application/windows_service_manager.rb +39 -39
- data/lib/chef/audit/audit_event_proxy.rb +7 -7
- data/lib/chef/audit/audit_reporter.rb +15 -15
- data/lib/chef/audit/control_group_data.rb +25 -19
- data/lib/chef/audit/runner.rb +3 -3
- data/lib/chef/blacklist.rb +81 -0
- data/lib/chef/chef_class.rb +17 -9
- data/lib/chef/chef_fs/chef_fs_data_store.rb +12 -12
- data/lib/chef/chef_fs/command_line.rb +20 -21
- data/lib/chef/chef_fs/config.rb +3 -3
- data/lib/chef/chef_fs/data_handler/acl_data_handler.rb +1 -1
- data/lib/chef/chef_fs/data_handler/data_bag_item_data_handler.rb +5 -0
- data/lib/chef/chef_fs/data_handler/data_handler_base.rb +11 -9
- data/lib/chef/chef_fs/data_handler/organization_invites_data_handler.rb +1 -1
- data/lib/chef/chef_fs/data_handler/policy_data_handler.rb +1 -1
- data/lib/chef/chef_fs/data_handler/policy_group_data_handler.rb +1 -1
- data/lib/chef/chef_fs/file_system/chef_server/acl_entry.rb +2 -2
- data/lib/chef/chef_fs/file_system/chef_server/acls_dir.rb +1 -1
- data/lib/chef/chef_fs/file_system/chef_server/chef_server_root_dir.rb +3 -3
- data/lib/chef/chef_fs/file_system/chef_server/cookbook_artifacts_dir.rb +6 -2
- data/lib/chef/chef_fs/file_system/chef_server/cookbook_dir.rb +16 -29
- data/lib/chef/chef_fs/file_system/chef_server/cookbook_file.rb +1 -1
- data/lib/chef/chef_fs/file_system/chef_server/cookbooks_dir.rb +6 -2
- data/lib/chef/chef_fs/file_system/chef_server/data_bag_dir.rb +1 -1
- data/lib/chef/chef_fs/file_system/chef_server/data_bags_dir.rb +2 -2
- data/lib/chef/chef_fs/file_system/chef_server/nodes_dir.rb +1 -1
- data/lib/chef/chef_fs/file_system/chef_server/organization_invites_entry.rb +2 -2
- data/lib/chef/chef_fs/file_system/chef_server/organization_members_entry.rb +2 -2
- data/lib/chef/chef_fs/file_system/chef_server/policies_dir.rb +5 -5
- data/lib/chef/chef_fs/file_system/chef_server/policy_group_entry.rb +2 -2
- data/lib/chef/chef_fs/file_system/chef_server/rest_list_dir.rb +3 -3
- data/lib/chef/chef_fs/file_system/chef_server/rest_list_entry.rb +17 -8
- data/lib/chef/chef_fs/file_system/chef_server/versioned_cookbooks_dir.rb +5 -1
- data/lib/chef/chef_fs/file_system/multiplexed_dir.rb +1 -1
- data/lib/chef/chef_fs/file_system/repository/acls_dir.rb +1 -1
- data/lib/chef/chef_fs/file_system/repository/base_file.rb +2 -2
- data/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_dir.rb +4 -5
- data/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_entry.rb +3 -3
- data/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_root_dir.rb +4 -3
- data/lib/chef/chef_fs/file_system/repository/directory.rb +3 -3
- data/lib/chef/chef_fs/file_system/repository/file_system_entry.rb +3 -3
- data/lib/chef/chef_fs/file_system_cache.rb +1 -1
- data/lib/chef/chef_fs/knife.rb +6 -6
- data/lib/chef/chef_fs/parallelizer.rb +1 -1
- data/lib/chef/chef_fs/path_utils.rb +2 -2
- data/lib/chef/client.rb +113 -51
- data/lib/chef/config.rb +1 -2
- data/lib/chef/config_fetcher.rb +6 -6
- data/lib/chef/constants.rb +1 -1
- data/lib/chef/cookbook/chefignore.rb +5 -1
- data/lib/chef/cookbook/cookbook_collection.rb +4 -4
- data/lib/chef/cookbook/cookbook_version_loader.rb +1 -85
- data/lib/chef/cookbook/file_system_file_vendor.rb +2 -2
- data/lib/chef/cookbook/gem_installer.rb +28 -11
- data/lib/chef/cookbook/manifest_v0.rb +73 -0
- data/lib/chef/cookbook/manifest_v2.rb +45 -0
- data/lib/chef/cookbook/metadata.rb +73 -181
- data/lib/chef/cookbook/remote_file_vendor.rb +7 -7
- data/lib/chef/cookbook/synchronizer.rb +42 -28
- data/lib/chef/cookbook/syntax_check.rb +4 -4
- data/lib/chef/cookbook_loader.rb +15 -7
- data/lib/chef/cookbook_manifest.rb +107 -69
- data/lib/chef/cookbook_site_streaming_uploader.rb +14 -16
- data/lib/chef/cookbook_uploader.rb +8 -9
- data/lib/chef/cookbook_version.rb +75 -168
- data/lib/chef/data_bag.rb +13 -15
- data/lib/chef/data_bag_item.rb +11 -20
- data/lib/chef/data_collector.rb +113 -37
- data/lib/chef/data_collector/messages.rb +4 -2
- data/lib/chef/data_collector/messages/helpers.rb +2 -4
- data/lib/chef/data_collector/resource_report.rb +36 -8
- data/lib/chef/decorator/unchain.rb +0 -16
- data/lib/chef/deprecated.rb +143 -145
- data/lib/chef/deprecation/warnings.rb +3 -1
- data/lib/chef/dsl/audit.rb +1 -1
- data/lib/chef/dsl/data_query.rb +22 -8
- data/lib/chef/dsl/declare_resource.rb +40 -16
- data/lib/chef/dsl/definitions.rb +1 -1
- data/lib/chef/dsl/include_attribute.rb +3 -7
- data/lib/chef/dsl/include_recipe.rb +1 -5
- data/lib/chef/dsl/platform_introspection.rb +14 -13
- data/lib/chef/dsl/reboot_pending.rb +2 -9
- data/lib/chef/dsl/recipe.rb +2 -21
- data/lib/chef/dsl/resources.rb +3 -10
- data/lib/chef/dsl/universal.rb +11 -1
- data/lib/chef/encrypted_data_bag_item.rb +6 -4
- data/lib/chef/encrypted_data_bag_item/check_encrypted.rb +1 -1
- data/lib/chef/encrypted_data_bag_item/encryptor.rb +1 -1
- data/lib/chef/environment.rb +17 -22
- data/lib/chef/event_dispatch/base.rb +18 -2
- data/lib/chef/event_dispatch/dsl.rb +2 -2
- data/lib/chef/event_loggers/windows_eventlog.rb +21 -21
- data/lib/chef/exceptions.rb +25 -14
- data/lib/chef/file_access_control/unix.rb +14 -14
- data/lib/chef/file_access_control/windows.rb +5 -3
- data/lib/chef/file_cache.rb +18 -16
- data/lib/chef/file_content_management/content_base.rb +3 -1
- data/lib/chef/file_content_management/deploy/cp.rb +2 -2
- data/lib/chef/file_content_management/deploy/mv_unix.rb +9 -8
- data/lib/chef/file_content_management/deploy/mv_windows.rb +1 -1
- data/lib/chef/file_content_management/tempfile.rb +4 -4
- data/lib/chef/formatters/base.rb +10 -11
- data/lib/chef/formatters/doc.rb +15 -19
- data/lib/chef/formatters/error_description.rb +18 -1
- data/lib/chef/formatters/error_inspectors/api_error_formatting.rb +51 -51
- data/lib/chef/formatters/error_inspectors/compile_error_inspector.rb +3 -3
- data/lib/chef/formatters/error_inspectors/cookbook_resolve_error_inspector.rb +11 -11
- data/lib/chef/formatters/error_inspectors/cookbook_sync_error_inspector.rb +1 -1
- data/lib/chef/formatters/error_inspectors/node_load_error_inspector.rb +14 -14
- data/lib/chef/formatters/error_inspectors/registration_error_inspector.rb +40 -40
- data/lib/chef/formatters/error_inspectors/resource_failure_inspector.rb +1 -1
- data/lib/chef/formatters/error_inspectors/run_list_expansion_error_inspector.rb +17 -17
- data/lib/chef/formatters/indentable_output_stream.rb +17 -5
- data/lib/chef/guard_interpreter/default_guard_interpreter.rb +6 -2
- data/lib/chef/guard_interpreter/resource_guard_interpreter.rb +5 -5
- data/lib/chef/handler.rb +3 -5
- data/lib/chef/handler/json_file.rb +2 -3
- data/lib/chef/http.rb +75 -25
- data/lib/chef/http/api_versions.rb +7 -1
- data/lib/chef/http/auth_credentials.rb +7 -5
- data/lib/chef/http/authenticator.rb +27 -15
- data/lib/chef/http/basic_client.rb +16 -17
- data/lib/chef/http/cookie_manager.rb +1 -1
- data/lib/chef/http/decompressor.rb +6 -6
- data/lib/chef/http/http_request.rb +13 -10
- data/lib/chef/http/json_input.rb +1 -1
- data/lib/chef/http/json_output.rb +5 -2
- data/lib/chef/http/json_to_model_output.rb +1 -1
- data/lib/chef/http/socketless_chef_zero_client.rb +4 -3
- data/lib/chef/http/validate_content_length.rb +5 -5
- data/lib/chef/json_compat.rb +3 -95
- data/lib/chef/key.rb +17 -20
- data/lib/chef/knife.rb +57 -40
- data/lib/chef/knife/bootstrap.rb +174 -138
- data/lib/chef/knife/bootstrap/chef_vault_handler.rb +1 -1
- data/lib/chef/knife/bootstrap/client_builder.rb +2 -2
- data/lib/chef/knife/bootstrap/templates/chef-full.erb +15 -8
- data/lib/chef/knife/client_bulk_delete.rb +3 -4
- data/lib/chef/knife/client_create.rb +17 -18
- data/lib/chef/knife/client_delete.rb +4 -5
- data/lib/chef/knife/client_edit.rb +2 -3
- data/lib/chef/knife/client_key_create.rb +3 -0
- data/lib/chef/knife/client_key_delete.rb +1 -0
- data/lib/chef/knife/client_key_edit.rb +1 -0
- data/lib/chef/knife/client_key_list.rb +1 -0
- data/lib/chef/knife/client_key_show.rb +1 -0
- data/lib/chef/knife/client_list.rb +3 -4
- data/lib/chef/knife/client_reregister.rb +4 -5
- data/lib/chef/knife/client_show.rb +0 -1
- data/lib/chef/knife/config_get.rb +126 -0
- data/lib/chef/{provider/breakpoint.rb → knife/config_get_profile.rb} +13 -14
- data/lib/chef/knife/config_list_profiles.rb +121 -0
- data/lib/chef/knife/config_use_profile.rb +50 -0
- data/lib/chef/knife/configure.rb +39 -63
- data/lib/chef/knife/configure_client.rb +1 -3
- data/lib/chef/knife/cookbook_bulk_delete.rb +1 -1
- data/lib/chef/knife/cookbook_create.rb +1 -434
- data/lib/chef/knife/cookbook_delete.rb +5 -5
- data/lib/chef/knife/cookbook_download.rb +16 -17
- data/lib/chef/knife/cookbook_list.rb +6 -6
- data/lib/chef/knife/cookbook_metadata.rb +10 -11
- data/lib/chef/knife/cookbook_metadata_from_file.rb +1 -2
- data/lib/chef/knife/cookbook_show.rb +23 -19
- data/lib/chef/knife/cookbook_site_download.rb +9 -85
- data/lib/chef/knife/cookbook_site_install.rb +8 -164
- data/lib/chef/knife/cookbook_site_list.rb +9 -34
- data/lib/chef/knife/cookbook_site_search.rb +10 -23
- data/lib/chef/knife/cookbook_site_share.rb +9 -138
- data/lib/chef/knife/cookbook_site_show.rb +10 -36
- data/lib/chef/knife/cookbook_site_unshare.rb +9 -31
- data/lib/chef/knife/cookbook_test.rb +11 -11
- data/lib/chef/knife/cookbook_upload.rb +39 -39
- data/lib/chef/knife/core/bootstrap_context.rb +23 -17
- data/lib/chef/knife/core/cookbook_scm_repo.rb +1 -1
- data/lib/chef/knife/core/generic_presenter.rb +8 -9
- data/lib/chef/knife/core/hashed_command_loader.rb +2 -2
- data/lib/chef/knife/core/node_presenter.rb +38 -39
- data/lib/chef/knife/core/status_presenter.rb +45 -30
- data/lib/chef/knife/core/subcommand_loader.rb +5 -34
- data/lib/chef/knife/core/ui.rb +12 -4
- data/lib/chef/knife/data_bag_create.rb +6 -4
- data/lib/chef/knife/data_bag_edit.rb +1 -1
- data/lib/chef/knife/data_bag_from_file.rb +4 -5
- data/lib/chef/knife/data_bag_list.rb +3 -3
- data/lib/chef/knife/data_bag_secret_options.rb +14 -14
- data/lib/chef/knife/data_bag_show.rb +3 -3
- data/lib/chef/knife/delete.rb +31 -13
- data/lib/chef/knife/deps.rb +26 -10
- data/lib/chef/knife/diff.rb +30 -14
- data/lib/chef/knife/download.rb +39 -23
- data/lib/chef/knife/edit.rb +21 -5
- data/lib/chef/knife/environment_compare.rb +12 -12
- data/lib/chef/knife/environment_create.rb +3 -4
- data/lib/chef/knife/environment_delete.rb +0 -1
- data/lib/chef/knife/environment_edit.rb +0 -1
- data/lib/chef/knife/environment_from_file.rb +5 -3
- data/lib/chef/knife/environment_list.rb +3 -4
- data/lib/chef/knife/environment_show.rb +0 -1
- data/lib/chef/knife/exec.rb +10 -10
- data/lib/chef/knife/key_create.rb +4 -4
- data/lib/chef/knife/key_create_base.rb +12 -12
- data/lib/chef/knife/key_edit.rb +5 -5
- data/lib/chef/knife/key_edit_base.rb +15 -15
- data/lib/chef/knife/key_list.rb +3 -3
- data/lib/chef/knife/key_list_base.rb +9 -9
- data/lib/chef/knife/list.rb +37 -21
- data/lib/chef/knife/node_delete.rb +1 -1
- data/lib/chef/knife/node_edit.rb +4 -4
- data/lib/chef/knife/node_list.rb +3 -3
- data/lib/chef/knife/node_policy_set.rb +79 -0
- data/lib/chef/knife/node_run_list_add.rb +7 -7
- data/lib/chef/knife/node_run_list_remove.rb +1 -1
- data/lib/chef/knife/node_show.rb +6 -6
- data/lib/chef/knife/osc_user_create.rb +13 -13
- data/lib/chef/knife/osc_user_edit.rb +2 -2
- data/lib/chef/knife/osc_user_list.rb +3 -3
- data/lib/chef/knife/osc_user_reregister.rb +4 -4
- data/lib/chef/knife/raw.rb +40 -19
- data/lib/chef/knife/role_create.rb +3 -3
- data/lib/chef/knife/role_env_run_list_add.rb +5 -4
- data/lib/chef/knife/role_env_run_list_clear.rb +1 -1
- data/lib/chef/knife/role_env_run_list_remove.rb +3 -3
- data/lib/chef/knife/role_env_run_list_replace.rb +2 -1
- data/lib/chef/knife/role_env_run_list_set.rb +1 -1
- data/lib/chef/knife/role_list.rb +3 -3
- data/lib/chef/knife/role_run_list_add.rb +5 -4
- data/lib/chef/knife/role_run_list_clear.rb +1 -1
- data/lib/chef/knife/role_run_list_remove.rb +3 -4
- data/lib/chef/knife/role_run_list_replace.rb +2 -1
- data/lib/chef/knife/role_run_list_set.rb +1 -2
- data/lib/chef/knife/role_show.rb +2 -3
- data/lib/chef/knife/search.rb +36 -43
- data/lib/chef/knife/serve.rb +22 -6
- data/lib/chef/knife/show.rb +20 -4
- data/lib/chef/knife/ssh.rb +173 -130
- data/lib/chef/knife/ssl_check.rb +34 -34
- data/lib/chef/knife/ssl_fetch.rb +6 -6
- data/lib/chef/knife/status.rb +12 -12
- data/lib/chef/knife/supermarket_download.rb +95 -6
- data/lib/chef/knife/supermarket_install.rb +166 -6
- data/lib/chef/knife/supermarket_list.rb +38 -6
- data/lib/chef/knife/supermarket_search.rb +27 -7
- data/lib/chef/knife/supermarket_share.rb +139 -6
- data/lib/chef/knife/supermarket_show.rb +40 -6
- data/lib/chef/knife/supermarket_unshare.rb +35 -7
- data/lib/chef/knife/upload.rb +42 -26
- data/lib/chef/knife/user_create.rb +28 -27
- data/lib/chef/knife/user_delete.rb +9 -8
- data/lib/chef/knife/user_edit.rb +11 -10
- data/lib/chef/knife/user_key_create.rb +1 -0
- data/lib/chef/knife/user_key_delete.rb +1 -0
- data/lib/chef/knife/user_key_edit.rb +1 -0
- data/lib/chef/knife/user_key_list.rb +1 -0
- data/lib/chef/knife/user_key_show.rb +1 -0
- data/lib/chef/knife/user_list.rb +3 -4
- data/lib/chef/knife/user_reregister.rb +13 -12
- data/lib/chef/knife/user_show.rb +9 -8
- data/lib/chef/knife/xargs.rb +55 -39
- data/lib/chef/local_mode.rb +1 -0
- data/lib/chef/log.rb +10 -8
- data/lib/chef/log/winevt.rb +21 -21
- data/lib/chef/mash.rb +6 -0
- data/lib/chef/mixin/api_version_request_handling.rb +8 -10
- data/lib/chef/mixin/create_path.rb +1 -1
- data/lib/chef/mixin/deep_merge.rb +2 -2
- data/lib/chef/mixin/deprecation.rb +16 -16
- data/lib/chef/mixin/from_file.rb +5 -0
- data/lib/chef/mixin/get_source_from_package.rb +2 -2
- data/lib/chef/mixin/homebrew_user.rb +13 -2
- data/lib/chef/mixin/openssl_helper.rb +402 -0
- data/lib/chef/mixin/params_validate.rb +32 -23
- data/lib/chef/mixin/path_sanity.rb +17 -19
- data/lib/chef/mixin/powershell_exec.rb +105 -0
- data/lib/chef/mixin/powershell_out.rb +2 -2
- data/lib/chef/mixin/properties.rb +19 -2
- data/lib/chef/mixin/provides.rb +3 -2
- data/lib/chef/mixin/securable.rb +12 -16
- data/lib/chef/mixin/shell_out.rb +157 -110
- data/lib/chef/mixin/template.rb +15 -12
- data/lib/chef/mixin/user_context.rb +55 -0
- data/lib/chef/mixin/versioned_api.rb +16 -1
- data/lib/chef/mixin/which.rb +4 -2
- data/lib/chef/mixin/why_run.rb +6 -11
- data/lib/chef/mixin/wide_string.rb +5 -23
- data/lib/chef/mixin/windows_env_helper.rb +1 -1
- data/lib/chef/mixin/xml_escape.rb +3 -3
- data/lib/chef/mixins.rb +0 -1
- data/lib/chef/monkey_patches/net_http.rb +12 -8
- data/lib/chef/monologger.rb +2 -86
- data/lib/chef/node.rb +71 -60
- data/lib/chef/node/attribute.rb +277 -235
- data/lib/chef/node/attribute_collections.rb +4 -22
- data/lib/chef/node/immutable_collections.rb +54 -53
- data/lib/chef/node/mixin/deep_merge_cache.rb +1 -1
- data/lib/chef/node/mixin/immutablize_array.rb +117 -4
- data/lib/chef/node/mixin/immutablize_hash.rb +117 -6
- data/lib/chef/node_map.rb +142 -65
- data/lib/chef/null_logger.rb +7 -0
- data/lib/chef/org.rb +15 -18
- data/lib/chef/platform/provider_mapping.rb +1 -168
- data/lib/chef/platform/query_helpers.rb +0 -12
- data/lib/chef/platform/rebooter.rb +9 -5
- data/lib/chef/platform/service_helpers.rb +1 -1
- data/lib/chef/policy_builder/dynamic.rb +1 -1
- data/lib/chef/policy_builder/expand_node_object.rb +5 -31
- data/lib/chef/policy_builder/policyfile.rb +55 -10
- data/lib/chef/powershell.rb +57 -0
- data/lib/chef/property.rb +149 -145
- data/lib/chef/provider.rb +92 -140
- data/lib/chef/provider/apt_preference.rb +94 -0
- data/lib/chef/provider/apt_repository.rb +169 -62
- data/lib/chef/provider/apt_update.rb +9 -16
- data/lib/chef/provider/batch.rb +1 -1
- data/lib/chef/provider/cookbook_file.rb +0 -6
- data/lib/chef/provider/cookbook_file/content.rb +1 -1
- data/lib/chef/provider/cron.rb +35 -41
- data/lib/chef/provider/cron/unix.rb +5 -5
- data/lib/chef/provider/directory.rb +4 -8
- data/lib/chef/provider/dsc_resource.rb +8 -12
- data/lib/chef/provider/dsc_script.rb +22 -22
- data/lib/chef/provider/execute.rb +16 -14
- data/lib/chef/provider/file.rb +13 -23
- data/lib/chef/provider/git.rb +47 -24
- data/lib/chef/provider/group.rb +7 -13
- data/lib/chef/provider/group/aix.rb +8 -8
- data/lib/chef/provider/group/dscl.rb +11 -7
- data/lib/chef/provider/group/gpasswd.rb +4 -4
- data/lib/chef/provider/group/groupadd.rb +8 -8
- data/lib/chef/provider/group/groupmod.rb +9 -9
- data/lib/chef/provider/group/pw.rb +8 -8
- data/lib/chef/provider/group/suse.rb +2 -2
- data/lib/chef/provider/group/usermod.rb +1 -1
- data/lib/chef/provider/group/windows.rb +3 -2
- data/lib/chef/provider/http_request.rb +30 -20
- data/lib/chef/provider/ifconfig.rb +108 -50
- data/lib/chef/provider/ifconfig/aix.rb +3 -3
- data/lib/chef/provider/ifconfig/debian.rb +6 -3
- data/lib/chef/provider/ifconfig/redhat.rb +7 -1
- data/lib/chef/provider/launchd.rb +24 -1
- data/lib/chef/provider/link.rb +7 -11
- data/lib/chef/provider/log.rb +5 -19
- data/lib/chef/provider/lwrp_base.rb +2 -11
- data/lib/chef/provider/mdadm.rb +11 -19
- data/lib/chef/provider/mount.rb +22 -18
- data/lib/chef/provider/mount/aix.rb +70 -29
- data/lib/chef/provider/mount/mount.rb +48 -35
- data/lib/chef/provider/mount/solaris.rb +33 -29
- data/lib/chef/provider/mount/windows.rb +14 -14
- data/lib/chef/provider/noop.rb +2 -2
- data/lib/chef/provider/ohai.rb +1 -7
- data/lib/chef/provider/osx_profile.rb +12 -18
- data/lib/chef/provider/package.rb +117 -86
- data/lib/chef/provider/package/apt.rb +67 -19
- data/lib/chef/provider/package/{aix.rb → bff.rb} +21 -22
- data/lib/chef/provider/package/cab.rb +26 -18
- data/lib/chef/provider/package/chocolatey.rb +36 -26
- data/lib/chef/provider/package/dnf.rb +22 -11
- data/lib/chef/provider/package/dnf/dnf_helper.py +25 -2
- data/lib/chef/provider/package/dnf/python_helper.rb +23 -7
- data/lib/chef/provider/package/dpkg.rb +29 -13
- data/lib/chef/provider/package/freebsd/base.rb +4 -4
- data/lib/chef/provider/package/freebsd/pkg.rb +8 -8
- data/lib/chef/provider/package/freebsd/pkgng.rb +6 -6
- data/lib/chef/provider/package/freebsd/port.rb +4 -4
- data/lib/chef/provider/package/homebrew.rb +4 -4
- data/lib/chef/provider/package/ips.rb +7 -8
- data/lib/chef/provider/package/macports.rb +9 -9
- data/lib/chef/provider/package/msu.rb +5 -6
- data/lib/chef/provider/package/openbsd.rb +9 -9
- data/lib/chef/provider/package/pacman.rb +7 -8
- data/lib/chef/provider/package/paludis.rb +5 -5
- data/lib/chef/provider/package/portage.rb +31 -38
- data/lib/chef/provider/package/powershell.rb +29 -10
- data/lib/chef/provider/package/rpm.rb +20 -17
- data/lib/chef/provider/package/rubygems.rb +84 -58
- data/lib/chef/provider/package/smartos.rb +11 -11
- data/lib/chef/provider/package/solaris.rb +19 -20
- data/lib/chef/provider/package/windows.rb +55 -9
- data/lib/chef/provider/package/windows/exe.rb +6 -4
- data/lib/chef/provider/package/windows/msi.rb +9 -7
- data/lib/chef/provider/package/windows/registry_uninstall_entry.rb +22 -10
- data/lib/chef/provider/package/yum.rb +167 -414
- data/lib/chef/provider/package/yum/python_helper.rb +222 -0
- data/lib/chef/provider/package/yum/rpm_utils.rb +10 -1
- data/lib/chef/provider/package/yum/simplejson/LICENSE.txt +79 -0
- data/lib/chef/provider/package/yum/simplejson/__init__.py +318 -0
- data/lib/chef/provider/package/yum/simplejson/__init__.pyc +0 -0
- data/lib/chef/provider/package/yum/simplejson/decoder.py +354 -0
- data/lib/chef/provider/package/yum/simplejson/decoder.pyc +0 -0
- data/lib/chef/provider/package/yum/simplejson/encoder.py +440 -0
- data/lib/chef/provider/package/yum/simplejson/encoder.pyc +0 -0
- data/lib/chef/provider/package/yum/simplejson/scanner.py +65 -0
- data/lib/chef/provider/package/yum/simplejson/scanner.pyc +0 -0
- data/lib/chef/provider/package/yum/simplejson/tool.py +37 -0
- data/lib/chef/provider/package/yum/version.rb +56 -0
- data/lib/chef/provider/package/yum/yum_cache.rb +33 -316
- data/lib/chef/provider/package/yum/yum_helper.py +211 -0
- data/lib/chef/provider/package/zypper.rb +41 -37
- data/lib/chef/provider/powershell_script.rb +79 -79
- data/lib/chef/provider/reboot.rb +19 -11
- data/lib/chef/provider/registry_key.rb +29 -12
- data/lib/chef/provider/remote_directory.rb +2 -16
- data/lib/chef/provider/remote_file.rb +19 -6
- data/lib/chef/provider/remote_file/cache_control_data.rb +3 -3
- data/lib/chef/provider/remote_file/content.rb +5 -5
- data/lib/chef/provider/remote_file/fetcher.rb +3 -0
- data/lib/chef/provider/remote_file/http.rb +13 -5
- data/lib/chef/provider/remote_file/local_file.rb +1 -1
- data/lib/chef/provider/remote_file/network_file.rb +18 -5
- data/lib/chef/provider/remote_file/sftp.rb +1 -1
- data/lib/chef/provider/resource_update.rb +1 -1
- data/lib/chef/provider/route.rb +43 -26
- data/lib/chef/provider/ruby_block.rb +2 -6
- data/lib/chef/provider/script.rb +2 -2
- data/lib/chef/provider/service.rb +16 -23
- data/lib/chef/provider/service/aix.rb +4 -8
- data/lib/chef/provider/service/aixinit.rb +2 -2
- data/lib/chef/provider/service/debian.rb +36 -25
- data/lib/chef/provider/service/freebsd.rb +6 -7
- data/lib/chef/provider/service/gentoo.rb +2 -3
- data/lib/chef/provider/service/init.rb +5 -6
- data/lib/chef/provider/service/insserv.rb +5 -3
- data/lib/chef/provider/service/macosx.rb +17 -15
- data/lib/chef/provider/service/openbsd.rb +4 -5
- data/lib/chef/provider/service/redhat.rb +3 -3
- data/lib/chef/provider/service/simple.rb +12 -16
- data/lib/chef/provider/service/solaris.rb +11 -6
- data/lib/chef/provider/service/systemd.rb +19 -18
- data/lib/chef/provider/service/upstart.rb +23 -24
- data/lib/chef/provider/service/windows.rb +279 -104
- data/lib/chef/provider/subversion.rb +12 -18
- data/lib/chef/provider/support/yum_repo.erb +6 -0
- data/lib/chef/provider/support/zypper_repo.erb +17 -0
- data/lib/chef/provider/systemd_unit.rb +66 -45
- data/lib/chef/provider/template.rb +0 -6
- data/lib/chef/provider/template/content.rb +25 -2
- data/lib/chef/provider/user.rb +25 -24
- data/lib/chef/provider/user/aix.rb +47 -15
- data/lib/chef/provider/user/dscl.rb +16 -23
- data/lib/chef/provider/user/linux.rb +12 -21
- data/lib/chef/provider/user/pw.rb +14 -20
- data/lib/chef/provider/user/solaris.rb +61 -30
- data/lib/chef/provider/user/useradd.rb +18 -15
- data/lib/chef/provider/user/windows.rb +11 -10
- data/lib/chef/provider/whyrun_safe_ruby_block.rb +1 -1
- data/lib/chef/provider/{env.rb → windows_env.rb} +65 -27
- data/lib/chef/provider/windows_path.rb +61 -0
- data/lib/chef/provider/windows_task.rb +631 -0
- data/lib/chef/provider/yum_repository.rb +27 -17
- data/lib/chef/provider/zypper_repository.rb +169 -0
- data/lib/chef/provider_resolver.rb +12 -38
- data/lib/chef/providers.rb +7 -13
- data/lib/chef/recipe.rb +9 -7
- data/lib/chef/resource.rb +212 -245
- data/lib/chef/resource/action_class.rb +14 -18
- data/lib/chef/resource/apt_package.rb +11 -3
- data/lib/chef/resource/apt_preference.rb +52 -0
- data/lib/chef/resource/apt_repository.rb +57 -17
- data/lib/chef/resource/apt_update.rb +11 -3
- data/lib/chef/resource/bash.rb +1 -0
- data/lib/chef/resource/batch.rb +2 -1
- data/lib/chef/resource/bff_package.rb +5 -1
- data/lib/chef/resource/breakpoint.rb +15 -0
- data/lib/chef/resource/build_essential.rb +142 -0
- data/lib/chef/resource/cab_package.rb +8 -7
- data/lib/chef/resource/chef_gem.rb +20 -11
- data/lib/chef/resource/chef_handler.rb +132 -0
- data/lib/chef/resource/chocolatey_config.rb +83 -0
- data/lib/chef/resource/chocolatey_package.rb +20 -10
- data/lib/chef/resource/chocolatey_source.rb +95 -0
- data/lib/chef/resource/cookbook_file.rb +9 -13
- data/lib/chef/resource/cron.rb +29 -71
- data/lib/chef/resource/cron_access.rb +70 -0
- data/lib/chef/resource/cron_d.rb +238 -0
- data/lib/chef/resource/csh.rb +6 -0
- data/lib/chef/resource/directory.rb +13 -24
- data/lib/chef/resource/dmg_package.rb +171 -0
- data/lib/chef/resource/dnf_package.rb +34 -22
- data/lib/chef/resource/dpkg_package.rb +5 -2
- data/lib/chef/resource/dsc_resource.rb +14 -23
- data/lib/chef/resource/dsc_script.rb +24 -40
- data/lib/chef/resource/execute.rb +54 -89
- data/lib/chef/resource/file.rb +27 -10
- data/lib/chef/resource/file/verification.rb +17 -8
- data/lib/chef/resource/freebsd_package.rb +14 -3
- data/lib/chef/resource/gem_package.rb +29 -12
- data/lib/chef/resource/git.rb +4 -13
- data/lib/chef/resource/group.rb +24 -65
- data/lib/chef/resource/homebrew_cask.rb +100 -0
- data/lib/chef/resource/homebrew_package.rb +5 -1
- data/lib/chef/resource/homebrew_tap.rb +87 -0
- data/lib/chef/resource/hostname.rb +265 -0
- data/lib/chef/resource/http_request.rb +11 -22
- data/lib/chef/resource/ifconfig.rb +71 -113
- data/lib/chef/resource/ips_package.rb +6 -2
- data/lib/chef/resource/kernel_module.rb +135 -0
- data/lib/chef/resource/ksh.rb +7 -0
- data/lib/chef/resource/launchd.rb +211 -115
- data/lib/chef/resource/link.rb +28 -42
- data/lib/chef/resource/locale.rb +94 -0
- data/lib/chef/resource/log.rb +21 -45
- data/lib/chef/resource/lwrp_base.rb +8 -9
- data/lib/chef/resource/macos_userdefaults.rb +132 -0
- data/lib/chef/resource/macosx_service.rb +8 -25
- data/lib/chef/resource/macports_package.rb +2 -0
- data/lib/chef/resource/mdadm.rb +28 -73
- data/lib/chef/resource/mount.rb +45 -136
- data/lib/chef/resource/msu_package.rb +16 -14
- data/lib/chef/resource/ohai.rb +10 -2
- data/lib/chef/resource/ohai_hint.rb +95 -0
- data/lib/chef/resource/openbsd_package.rb +3 -0
- data/lib/chef/resource/openssl_dhparam.rb +77 -0
- data/lib/chef/resource/openssl_ec_private_key.rb +93 -0
- data/lib/chef/resource/openssl_ec_public_key.rb +75 -0
- data/lib/chef/resource/openssl_rsa_private_key.rb +91 -0
- data/lib/chef/resource/openssl_rsa_public_key.rb +74 -0
- data/lib/chef/resource/openssl_x509_certificate.rb +221 -0
- data/lib/chef/resource/openssl_x509_crl.rb +132 -0
- data/lib/chef/resource/openssl_x509_request.rb +151 -0
- data/lib/chef/resource/osx_profile.rb +14 -40
- data/lib/chef/resource/package.rb +33 -7
- data/lib/chef/resource/pacman_package.rb +3 -1
- data/lib/chef/resource/paludis_package.rb +8 -3
- data/lib/chef/resource/perl.rb +6 -0
- data/lib/chef/resource/portage_package.rb +6 -5
- data/lib/chef/resource/powershell_package.rb +18 -7
- data/lib/chef/resource/powershell_package_source.rb +169 -0
- data/lib/chef/resource/powershell_script.rb +12 -3
- data/lib/chef/resource/python.rb +5 -0
- data/lib/chef/resource/reboot.rb +16 -18
- data/lib/chef/resource/registry_key.rb +16 -30
- data/lib/chef/resource/remote_directory.rb +13 -48
- data/lib/chef/resource/remote_file.rb +70 -47
- data/lib/chef/resource/resource_notification.rb +47 -26
- data/lib/chef/resource/rhsm_errata.rb +46 -0
- data/lib/chef/resource/rhsm_errata_level.rb +51 -0
- data/lib/chef/resource/rhsm_register.rb +168 -0
- data/lib/chef/resource/rhsm_repo.rb +65 -0
- data/lib/chef/resource/rhsm_subscription.rb +98 -0
- data/lib/chef/resource/route.rb +16 -107
- data/lib/chef/resource/rpm_package.rb +3 -2
- data/lib/chef/resource/ruby.rb +6 -0
- data/lib/chef/resource/ruby_block.rb +6 -14
- data/lib/chef/resource/scm.rb +42 -146
- data/lib/chef/resource/script.rb +15 -35
- data/lib/chef/resource/service.rb +34 -30
- data/lib/chef/resource/smartos_package.rb +4 -2
- data/lib/chef/resource/solaris_package.rb +3 -1
- data/lib/chef/resource/ssh_known_hosts_entry.rb +146 -0
- data/lib/chef/resource/subversion.rb +21 -10
- data/lib/chef/resource/sudo.rb +230 -0
- data/lib/chef/resource/support/cron.d.erb +28 -0
- data/lib/chef/resource/support/cron_access.erb +4 -0
- data/lib/chef/resource/support/ssh_known_hosts.erb +3 -0
- data/lib/chef/resource/support/sudoer.erb +18 -0
- data/lib/chef/resource/swap_file.rb +209 -0
- data/lib/chef/resource/sysctl.rb +151 -0
- data/lib/chef/resource/systemd_unit.rb +34 -11
- data/lib/chef/resource/template.rb +22 -26
- data/lib/chef/resource/timezone.rb +135 -0
- data/lib/chef/resource/user.rb +19 -34
- data/lib/chef/resource/user/aix_user.rb +1 -1
- data/lib/chef/resource/user/dscl_user.rb +1 -1
- data/lib/chef/resource/user/linux_user.rb +1 -10
- data/lib/chef/resource/user/pw_user.rb +1 -1
- data/lib/chef/resource/user/solaris_user.rb +1 -1
- data/lib/chef/resource/user/windows_user.rb +5 -1
- data/lib/chef/resource/windows_ad_join.rb +120 -0
- data/lib/chef/resource/windows_auto_run.rb +87 -0
- data/lib/chef/resource/windows_certificate.rb +332 -0
- data/lib/chef/resource/windows_env.rb +49 -0
- data/lib/chef/resource/windows_feature.rb +90 -0
- data/lib/chef/resource/windows_feature_dism.rb +222 -0
- data/lib/chef/resource/windows_feature_powershell.rb +262 -0
- data/lib/chef/resource/windows_firewall_rule.rb +205 -0
- data/lib/chef/resource/windows_font.rb +125 -0
- data/lib/chef/resource/windows_package.rb +8 -2
- data/lib/chef/resource/windows_pagefile.rb +206 -0
- data/lib/chef/resource/{easy_install_package.rb → windows_path.rb} +14 -8
- data/lib/chef/resource/windows_printer.rb +146 -0
- data/lib/chef/resource/windows_printer_port.rb +136 -0
- data/lib/chef/resource/windows_script.rb +1 -1
- data/lib/chef/resource/windows_service.rb +86 -36
- data/lib/chef/resource/windows_share.rb +324 -0
- data/lib/chef/resource/windows_shortcut.rb +79 -0
- data/lib/chef/resource/windows_task.rb +349 -0
- data/lib/chef/resource/windows_workgroup.rb +112 -0
- data/lib/chef/resource/yum_package.rb +40 -24
- data/lib/chef/resource/yum_repository.rb +154 -45
- data/lib/chef/resource/zypper_package.rb +16 -0
- data/lib/chef/resource/zypper_repository.rb +103 -0
- data/lib/chef/resource_builder.rb +1 -65
- data/lib/chef/resource_collection.rb +19 -2
- data/lib/chef/resource_collection/resource_collection_serialization.rb +12 -3
- data/lib/chef/resource_collection/resource_list.rb +6 -0
- data/lib/chef/resource_collection/resource_set.rb +43 -16
- data/lib/chef/resource_definition.rb +1 -1
- data/lib/chef/resource_inspector.rb +108 -0
- data/lib/chef/resource_reporter.rb +9 -10
- data/lib/chef/resource_resolver.rb +5 -29
- data/lib/chef/resources.rb +53 -7
- data/lib/chef/role.rb +14 -20
- data/lib/chef/run_context.rb +91 -64
- data/lib/chef/run_context/cookbook_compiler.rb +65 -12
- data/lib/chef/run_list/run_list_expansion.rb +12 -10
- data/lib/chef/run_list/run_list_item.rb +1 -1
- data/lib/chef/run_list/versioned_recipe_list.rb +11 -9
- data/lib/chef/run_status.rb +14 -12
- data/lib/chef/runner.rb +50 -9
- data/lib/chef/search/query.rb +32 -33
- data/lib/chef/server_api.rb +3 -0
- data/lib/chef/server_api_versions.rb +21 -2
- data/lib/chef/shell.rb +86 -60
- data/lib/chef/shell/ext.rb +151 -151
- data/lib/chef/shell/model_wrapper.rb +1 -1
- data/lib/chef/shell/shell_session.rb +22 -11
- data/lib/chef/user.rb +19 -22
- data/lib/chef/user_v1.rb +38 -41
- data/lib/chef/util/backup.rb +2 -2
- data/lib/chef/util/diff.rb +3 -3
- data/lib/chef/util/dsc/configuration_generator.rb +12 -12
- data/lib/chef/util/dsc/lcm_output_parser.rb +59 -4
- data/lib/chef/util/dsc/local_configuration_manager.rb +35 -25
- data/lib/chef/util/file_edit.rb +14 -14
- data/lib/chef/util/powershell/cmdlet.rb +5 -5
- data/lib/chef/util/selinux.rb +6 -5
- data/lib/chef/util/windows/logon_session.rb +129 -0
- data/lib/chef/util/windows/net_group.rb +7 -1
- data/lib/chef/util/windows/net_use.rb +3 -3
- data/lib/chef/util/windows/net_user.rb +24 -16
- data/lib/chef/util/windows/volume.rb +2 -6
- data/lib/chef/version.rb +5 -3
- data/lib/chef/version/platform.rb +18 -0
- data/lib/chef/version_constraint.rb +3 -3
- data/lib/chef/version_constraint/platform.rb +2 -0
- data/lib/chef/version_string.rb +143 -0
- data/lib/chef/whitelist.rb +1 -1
- data/lib/chef/win32/api.rb +6 -6
- data/lib/chef/win32/api/error.rb +4 -4
- data/lib/chef/win32/api/file.rb +13 -12
- data/lib/chef/win32/api/net.rb +75 -59
- data/lib/chef/win32/api/security.rb +16 -0
- data/lib/chef/win32/eventlog.rb +2 -2
- data/lib/chef/win32/file.rb +10 -0
- data/lib/chef/win32/mutex.rb +1 -1
- data/lib/chef/win32/net.rb +15 -0
- data/lib/chef/win32/registry.rb +25 -25
- data/lib/chef/win32/security.rb +68 -35
- data/lib/chef/win32/security/securable_object.rb +10 -10
- data/lib/chef/win32/security/sid.rb +45 -2
- data/lib/chef/win32/system.rb +0 -0
- data/lib/chef/win32/unicode.rb +6 -0
- data/lib/chef/win32/version.rb +26 -33
- data/lib/chef/win32_service_constants.rb +143 -0
- data/spec/data/client.d_00/02-strings.rb +2 -0
- data/spec/data/cookbooks/openldap/templates/default/openldap_nested_variable_stuff.erb +1 -0
- data/spec/data/lwrp/providers/buck_passer.rb +1 -1
- data/spec/data/lwrp/providers/buck_passer_2.rb +1 -1
- data/spec/data/lwrp/providers/embedded_resource_accesses_providers_scope.rb +1 -1
- data/spec/data/lwrp/providers/inline_compiler.rb +0 -2
- data/spec/data/lwrp/resources/buck_passer.rb +5 -0
- data/spec/data/lwrp/resources/buck_passer_2.rb +3 -0
- data/spec/data/lwrp/resources/embedded_resource_accesses_providers_scope.rb +3 -0
- data/spec/data/lwrp/resources/inline_compiler.rb +3 -0
- data/spec/data/lwrp/resources/monkey_name_printer.rb +5 -0
- data/spec/data/lwrp/resources/paint_drying_watcher.rb +3 -0
- data/spec/data/lwrp/resources/thumb_twiddler.rb +3 -0
- data/spec/data/mixin/invalid_data.rb +3 -0
- data/spec/data/mixin/real_data.rb +2 -0
- data/spec/data/root_alias_cookbooks/dup_attr/attributes.rb +1 -0
- data/spec/data/root_alias_cookbooks/dup_attr/attributes/default.rb +1 -0
- data/spec/data/root_alias_cookbooks/dup_attr/metadata.rb +2 -0
- data/spec/data/root_alias_cookbooks/dup_attr/recipe.rb +3 -0
- data/spec/data/root_alias_cookbooks/dup_recipe/attributes.rb +1 -0
- data/spec/data/root_alias_cookbooks/dup_recipe/metadata.rb +2 -0
- data/spec/data/root_alias_cookbooks/dup_recipe/recipe.rb +3 -0
- data/spec/data/root_alias_cookbooks/dup_recipe/recipes/default.rb +3 -0
- data/spec/data/root_alias_cookbooks/simple/attributes.rb +1 -0
- data/spec/data/root_alias_cookbooks/simple/metadata.rb +2 -0
- data/spec/data/root_alias_cookbooks/simple/recipe.rb +3 -0
- data/spec/data/shef-config.rb +11 -10
- data/spec/data/templates/failed.erb +5 -0
- data/spec/data/windows_certificates/base64_test.cer +22 -0
- data/spec/data/windows_certificates/othertest.cer +0 -0
- data/spec/data/windows_certificates/test.cer +0 -0
- data/spec/data/windows_certificates/test.p7b +0 -0
- data/spec/data/windows_certificates/test.pem +21 -0
- data/spec/data/windows_certificates/test.pfx +0 -0
- data/spec/functional/assets/chefinittest +6 -4
- data/spec/functional/assets/inittest +36 -0
- data/spec/functional/assets/yumrepo/chef_rpm-1.10-1.aarch64.rpm +0 -0
- data/spec/functional/assets/yumrepo/chef_rpm-1.10-1.i686.rpm +0 -0
- data/spec/functional/assets/yumrepo/chef_rpm-1.10-1.ppc64.rpm +0 -0
- data/spec/functional/assets/yumrepo/chef_rpm-1.10-1.ppc64le.rpm +0 -0
- data/spec/functional/assets/yumrepo/chef_rpm-1.10-1.s390x.rpm +0 -0
- data/spec/functional/assets/yumrepo/chef_rpm-1.10-1.src.rpm +0 -0
- data/spec/functional/assets/yumrepo/chef_rpm-1.10-1.x86_64.rpm +0 -0
- data/spec/functional/assets/yumrepo/chef_rpm-1.2-1.aarch64.rpm +0 -0
- data/spec/functional/assets/yumrepo/chef_rpm-1.2-1.i686.rpm +0 -0
- data/spec/functional/assets/yumrepo/chef_rpm-1.2-1.ppc64.rpm +0 -0
- data/spec/functional/assets/yumrepo/chef_rpm-1.2-1.ppc64le.rpm +0 -0
- data/spec/functional/assets/yumrepo/chef_rpm-1.2-1.s390x.rpm +0 -0
- data/spec/functional/assets/yumrepo/chef_rpm-1.2-1.src.rpm +0 -0
- data/spec/functional/assets/yumrepo/chef_rpm-1.2-1.x86_64.rpm +0 -0
- data/spec/functional/assets/yumrepo/repodata/4632d67cb92636e7575d911c24f0e04d3505a944e97c483abe0c3e73a7c62d33-filelists.sqlite.bz2 +0 -0
- data/spec/functional/assets/yumrepo/repodata/74599b793e54d877323837d2d81a1c3c594c44e4335f9528234bb490f7b9b439-other.xml.gz +0 -0
- data/spec/functional/assets/yumrepo/repodata/a845d418f919d2115ab95a56b2c76f6825ad0d0bede49181a55c04f58995d057-primary.sqlite.bz2 +0 -0
- data/spec/functional/assets/yumrepo/repodata/af9b7cf9ef23bd7b43068d74a460f3b5d06753d638e58e4a0c9edc35bfb9cdc4-other.sqlite.bz2 +0 -0
- data/spec/functional/assets/yumrepo/repodata/bdb4f5f1492a3b9532f22c43110a81500dd744f23da0aec5c33b2a41317c737d-filelists.xml.gz +0 -0
- data/spec/functional/assets/yumrepo/repodata/c10d1d34ce99e02f12ec96ef68360543ab1bb7c3cb81a4a2bf78df7d8597e9df-primary.xml.gz +0 -0
- data/spec/functional/assets/yumrepo/repodata/filelists.xml.gz +0 -0
- data/spec/functional/assets/yumrepo/repodata/other.xml.gz +0 -0
- data/spec/functional/assets/yumrepo/repodata/primary.xml.gz +0 -0
- data/spec/functional/assets/yumrepo/repodata/repomd.xml +19 -53
- data/spec/functional/assets/zypprepo/chef_rpm-1.10-1.aarch64.rpm +0 -0
- data/spec/functional/assets/zypprepo/chef_rpm-1.10-1.i686.rpm +0 -0
- data/spec/functional/assets/zypprepo/chef_rpm-1.10-1.ppc64.rpm +0 -0
- data/spec/functional/assets/zypprepo/chef_rpm-1.10-1.ppc64le.rpm +0 -0
- data/spec/functional/assets/zypprepo/chef_rpm-1.10-1.s390x.rpm +0 -0
- data/spec/functional/assets/zypprepo/chef_rpm-1.10-1.src.rpm +0 -0
- data/spec/functional/assets/zypprepo/chef_rpm-1.10-1.x86_64.rpm +0 -0
- data/spec/functional/assets/zypprepo/chef_rpm-1.2-1.aarch64.rpm +0 -0
- data/spec/functional/assets/zypprepo/chef_rpm-1.2-1.i686.rpm +0 -0
- data/spec/functional/assets/zypprepo/chef_rpm-1.2-1.ppc64.rpm +0 -0
- data/spec/functional/assets/zypprepo/chef_rpm-1.2-1.ppc64le.rpm +0 -0
- data/spec/functional/assets/zypprepo/chef_rpm-1.2-1.s390x.rpm +0 -0
- data/spec/functional/assets/zypprepo/chef_rpm-1.2-1.src.rpm +0 -0
- data/spec/functional/assets/zypprepo/chef_rpm-1.2-1.x86_64.rpm +0 -0
- data/spec/functional/audit/rspec_formatter_spec.rb +1 -1
- data/spec/functional/audit/runner_spec.rb +1 -1
- data/spec/functional/dsl/reboot_pending_spec.rb +3 -3
- data/spec/functional/dsl/registry_helper_spec.rb +3 -3
- data/spec/functional/event_loggers/windows_eventlog_spec.rb +2 -2
- data/spec/functional/http/simple_spec.rb +25 -19
- data/spec/functional/knife/exec_spec.rb +1 -1
- data/spec/functional/knife/ssh_spec.rb +84 -9
- data/spec/functional/mixin/from_file_spec.rb +82 -0
- data/spec/functional/mixin/powershell_out_spec.rb +3 -3
- data/spec/functional/mixin/shell_out_spec.rb +33 -3
- data/spec/functional/mixin/user_context_spec.rb +117 -0
- data/spec/functional/notifications_spec.rb +1 -1
- data/spec/functional/rebooter_spec.rb +27 -15
- data/spec/functional/resource/aixinit_service_spec.rb +2 -2
- data/spec/functional/resource/{package_spec.rb → apt_package_spec.rb} +21 -21
- data/spec/functional/resource/bash_spec.rb +12 -46
- data/spec/functional/resource/bff_spec.rb +4 -4
- data/spec/functional/resource/chocolatey_package_spec.rb +1 -8
- data/spec/functional/resource/cron_spec.rb +3 -3
- data/spec/functional/resource/dnf_package_spec.rb +128 -128
- data/spec/functional/resource/dsc_resource_spec.rb +3 -3
- data/spec/functional/resource/dsc_script_spec.rb +95 -95
- data/spec/functional/resource/execute_spec.rb +5 -5
- data/spec/functional/resource/file_spec.rb +1 -1
- data/spec/functional/resource/git_spec.rb +19 -19
- data/spec/functional/resource/group_spec.rb +44 -29
- data/spec/functional/resource/ifconfig_spec.rb +8 -7
- data/spec/functional/resource/insserv_spec.rb +206 -0
- data/spec/functional/resource/link_spec.rb +15 -19
- data/spec/functional/resource/mount_spec.rb +10 -6
- data/spec/functional/resource/msu_package_spec.rb +14 -0
- data/spec/functional/resource/powershell_script_spec.rb +15 -17
- data/spec/functional/resource/reboot_spec.rb +3 -3
- data/spec/functional/resource/registry_spec.rb +86 -86
- data/spec/functional/resource/remote_file_spec.rb +190 -15
- data/spec/functional/resource/rpm_spec.rb +2 -2
- data/spec/functional/resource/template_spec.rb +35 -2
- data/{lib/chef/knife/cookbook_site_vendor.rb → spec/functional/resource/timezone_spec.rb} +15 -22
- data/spec/functional/resource/user/dscl_spec.rb +2 -3
- data/spec/functional/resource/user/windows_spec.rb +131 -19
- data/spec/functional/resource/windows_certificate_spec.rb +492 -0
- data/spec/functional/resource/windows_env_spec.rb +285 -0
- data/spec/functional/resource/windows_path_spec.rb +64 -0
- data/spec/functional/resource/windows_service_spec.rb +1 -1
- data/spec/functional/resource/windows_task_spec.rb +1917 -0
- data/spec/functional/resource/yum_package_spec.rb +959 -0
- data/spec/functional/resource/zypper_package_spec.rb +233 -0
- data/spec/functional/root_alias_spec.rb +78 -0
- data/spec/functional/run_lock_spec.rb +4 -4
- data/spec/functional/shell_spec.rb +39 -41
- data/spec/functional/util/powershell/cmdlet_spec.rb +9 -9
- data/spec/functional/version_spec.rb +1 -1
- data/spec/functional/win32/crypto_spec.rb +10 -10
- data/spec/functional/win32/registry_spec.rb +66 -66
- data/spec/functional/win32/security_spec.rb +113 -7
- data/spec/functional/win32/versions_spec.rb +7 -9
- data/spec/integration/client/client_spec.rb +384 -187
- data/spec/integration/client/exit_code_spec.rb +21 -124
- data/spec/integration/client/ipv6_spec.rb +37 -37
- data/spec/integration/knife/chef_fs_data_store_spec.rb +130 -130
- data/spec/integration/knife/chef_repo_path_spec.rb +422 -420
- data/spec/integration/knife/chef_repository_file_system_spec.rb +35 -132
- data/spec/integration/knife/chefignore_spec.rb +88 -88
- data/spec/integration/knife/client_bulk_delete_spec.rb +49 -49
- data/spec/integration/knife/client_create_spec.rb +6 -6
- data/spec/integration/knife/client_delete_spec.rb +13 -13
- data/spec/integration/knife/client_key_create_spec.rb +1 -1
- data/spec/integration/knife/client_key_delete_spec.rb +2 -2
- data/spec/integration/knife/client_key_list_spec.rb +4 -4
- data/spec/integration/knife/client_list_spec.rb +8 -8
- data/spec/integration/knife/common_options_spec.rb +59 -41
- data/spec/integration/knife/config_get_profile_spec.rb +112 -0
- data/spec/integration/knife/config_get_spec.rb +183 -0
- data/spec/integration/knife/config_list_profiles_spec.rb +188 -0
- data/spec/integration/knife/config_use_profile_spec.rb +100 -0
- data/spec/integration/knife/cookbook_api_ipv6_spec.rb +38 -38
- data/spec/integration/knife/cookbook_bulk_delete_spec.rb +16 -16
- data/spec/integration/knife/cookbook_download_spec.rb +13 -37
- data/spec/integration/knife/cookbook_list_spec.rb +8 -8
- data/spec/integration/knife/cookbook_show_spec.rb +85 -96
- data/spec/integration/knife/cookbook_upload_spec.rb +24 -24
- data/spec/integration/knife/data_bag_create_spec.rb +82 -13
- data/spec/integration/knife/data_bag_delete_spec.rb +8 -8
- data/spec/integration/knife/data_bag_edit_spec.rb +104 -0
- data/spec/integration/knife/data_bag_from_file_spec.rb +47 -47
- data/spec/integration/knife/data_bag_list_spec.rb +4 -4
- data/spec/integration/knife/data_bag_show_spec.rb +56 -15
- data/spec/integration/knife/delete_spec.rb +593 -593
- data/spec/integration/knife/deps_spec.rb +192 -196
- data/spec/integration/knife/diff_spec.rb +116 -116
- data/spec/integration/knife/download_spec.rb +510 -510
- data/spec/integration/knife/environment_compare_spec.rb +17 -17
- data/spec/integration/knife/environment_create_spec.rb +1 -1
- data/spec/integration/knife/environment_from_file_spec.rb +59 -59
- data/spec/integration/knife/environment_list_spec.rb +4 -4
- data/spec/integration/knife/environment_show_spec.rb +27 -27
- data/spec/integration/knife/list_spec.rb +731 -731
- data/spec/integration/knife/node_bulk_delete_spec.rb +8 -8
- data/spec/integration/knife/node_create_spec.rb +1 -1
- data/spec/integration/knife/node_delete_spec.rb +6 -6
- data/spec/integration/knife/node_environment_set_spec.rb +3 -3
- data/spec/integration/knife/node_from_file_spec.rb +16 -16
- data/spec/integration/knife/node_list_spec.rb +5 -5
- data/spec/integration/knife/raw_spec.rb +123 -119
- data/spec/integration/knife/redirection_spec.rb +6 -4
- data/spec/integration/knife/role_bulk_delete_spec.rb +8 -8
- data/spec/integration/knife/role_create_spec.rb +1 -1
- data/spec/integration/knife/role_delete_spec.rb +6 -6
- data/spec/integration/knife/role_from_file_spec.rb +42 -42
- data/spec/integration/knife/role_list_spec.rb +5 -5
- data/spec/integration/knife/role_show_spec.rb +11 -11
- data/spec/integration/knife/search_node_spec.rb +39 -0
- data/spec/integration/knife/serve_spec.rb +58 -22
- data/spec/integration/knife/show_spec.rb +57 -57
- data/spec/integration/knife/upload_spec.rb +399 -407
- data/spec/integration/recipes/accumulator_spec.rb +8 -8
- data/spec/integration/recipes/lwrp_inline_resources_spec.rb +15 -19
- data/spec/integration/recipes/lwrp_spec.rb +12 -12
- data/spec/integration/recipes/noop_resource_spec.rb +1 -1
- data/spec/integration/recipes/notifies_spec.rb +217 -157
- data/spec/integration/recipes/notifying_block_spec.rb +2 -2
- data/spec/integration/recipes/recipe_dsl_spec.rb +87 -237
- data/spec/integration/recipes/remote_directory.rb +1 -1
- data/spec/integration/recipes/resource_action_spec.rb +62 -139
- data/spec/integration/recipes/resource_converge_if_changed_spec.rb +144 -88
- data/spec/integration/recipes/resource_load_spec.rb +13 -29
- data/spec/integration/recipes/unified_mode_spec.rb +876 -0
- data/spec/integration/solo/solo_spec.rb +42 -42
- data/spec/scripts/ssl-serve.rb +12 -12
- data/spec/spec_helper.rb +126 -62
- data/spec/stress/win32/file_spec.rb +2 -2
- data/spec/stress/win32/security_spec.rb +2 -2
- data/spec/support/lib/chef/resource/one_two_three_four.rb +0 -2
- data/spec/support/lib/chef/resource/zen_master.rb +1 -3
- data/spec/support/mock/constant.rb +1 -1
- data/spec/support/platform_helpers.rb +54 -10
- data/spec/support/shared/context/client.rb +45 -35
- data/spec/support/shared/examples/client.rb +51 -0
- data/spec/support/shared/functional/directory_resource.rb +12 -10
- data/spec/support/shared/functional/execute_resource.rb +1 -1
- data/spec/support/shared/functional/file_resource.rb +8 -8
- data/spec/support/shared/functional/securable_resource.rb +116 -85
- data/spec/support/shared/functional/securable_resource_with_reporting.rb +6 -6
- data/spec/support/shared/functional/win32_service.rb +5 -5
- data/spec/support/shared/functional/windows_script.rb +3 -3
- data/spec/support/shared/integration/app_server_support.rb +5 -5
- data/spec/support/shared/integration/integration_helper.rb +2 -2
- data/spec/support/shared/integration/knife_support.rb +15 -4
- data/spec/support/shared/unit/api_error_inspector.rb +11 -11
- data/spec/support/shared/unit/api_versioning.rb +4 -4
- data/spec/support/shared/unit/application_dot_d.rb +2 -0
- data/spec/support/shared/unit/execute_resource.rb +14 -16
- data/spec/support/shared/unit/provider/file.rb +22 -13
- data/spec/support/shared/unit/provider/useradd_based_user_provider.rb +41 -41
- data/spec/support/shared/unit/script_resource.rb +1 -9
- data/spec/support/shared/unit/user_and_client_shared.rb +3 -3
- data/spec/tiny_server.rb +8 -9
- data/spec/unit/api_client/registration_spec.rb +31 -31
- data/spec/unit/api_client_spec.rb +8 -8
- data/spec/unit/api_client_v1_spec.rb +9 -9
- data/spec/unit/application/apply_spec.rb +4 -4
- data/spec/unit/application/client_spec.rb +53 -24
- data/spec/unit/application/exit_code_spec.rb +4 -89
- data/spec/unit/application/knife_spec.rb +3 -3
- data/spec/unit/application/solo_spec.rb +6 -13
- data/spec/unit/application_spec.rb +116 -41
- data/spec/unit/audit/audit_event_proxy_spec.rb +48 -48
- data/spec/unit/audit/audit_reporter_spec.rb +71 -75
- data/spec/unit/audit/control_group_data_spec.rb +34 -34
- data/spec/unit/audit/runner_spec.rb +2 -2
- data/spec/unit/chef_class_spec.rb +130 -0
- data/spec/unit/chef_fs/data_handler/data_bag_item_data_handler.rb +82 -0
- data/spec/unit/chef_fs/data_handler/data_handler_base_spec.rb +65 -0
- data/spec/unit/chef_fs/diff_spec.rb +45 -45
- data/spec/unit/chef_fs/file_pattern_spec.rb +2 -2
- data/spec/unit/chef_fs/file_system/operation_failed_error_spec.rb +2 -2
- data/spec/unit/chef_fs/file_system/repository/directory_spec.rb +4 -4
- data/spec/unit/chef_fs/file_system_spec.rb +9 -9
- data/spec/unit/chef_fs/parallelizer.rb +12 -12
- data/spec/unit/client_spec.rb +97 -46
- data/spec/unit/config_fetcher_spec.rb +23 -23
- data/spec/unit/config_spec.rb +2 -2
- data/spec/unit/cookbook/cookbook_version_loader_spec.rb +22 -19
- data/spec/unit/cookbook/file_vendor_spec.rb +20 -9
- data/spec/unit/cookbook/gem_installer_spec.rb +113 -0
- data/spec/unit/cookbook/manifest_v0_spec.rb +133 -0
- data/spec/unit/cookbook/manifest_v2_spec.rb +70 -0
- data/spec/unit/cookbook/metadata_spec.rb +114 -193
- data/spec/unit/cookbook/synchronizer_spec.rb +188 -158
- data/spec/unit/cookbook/syntax_check_spec.rb +1 -0
- data/spec/unit/cookbook_loader_spec.rb +33 -30
- data/spec/unit/cookbook_manifest_spec.rb +33 -48
- data/spec/unit/cookbook_site_streaming_uploader_spec.rb +6 -10
- data/spec/unit/cookbook_spec.rb +10 -14
- data/spec/unit/cookbook_uploader_spec.rb +9 -9
- data/spec/unit/cookbook_version_file_specificity_spec.rb +156 -109
- data/spec/unit/cookbook_version_spec.rb +19 -128
- data/spec/unit/daemon_spec.rb +25 -16
- data/spec/unit/data_bag_item_spec.rb +7 -3
- data/spec/unit/data_bag_spec.rb +2 -2
- data/spec/unit/data_collector/messages/helpers_spec.rb +9 -0
- data/spec/unit/data_collector/messages_spec.rb +137 -0
- data/spec/unit/data_collector/resource_report_spec.rb +145 -0
- data/spec/unit/data_collector_spec.rb +137 -2
- data/spec/unit/deprecated_spec.rb +19 -13
- data/spec/unit/deprecation_spec.rb +0 -14
- data/spec/unit/dsl/audit_spec.rb +1 -1
- data/spec/unit/dsl/declare_resource_spec.rb +10 -1
- data/spec/unit/dsl/platform_introspection_spec.rb +16 -16
- data/spec/unit/dsl/reboot_pending_spec.rb +1 -14
- data/spec/unit/dsl/recipe_spec.rb +1 -18
- data/spec/unit/encrypted_data_bag_item_spec.rb +6 -6
- data/spec/unit/environment_spec.rb +19 -19
- data/spec/unit/exceptions_spec.rb +1 -1
- data/spec/unit/file_access_control_spec.rb +8 -8
- data/spec/unit/file_content_management/deploy/mv_unix_spec.rb +16 -4
- data/spec/unit/file_content_management/deploy/mv_windows_spec.rb +26 -26
- data/spec/unit/formatters/base_spec.rb +34 -5
- data/spec/unit/formatters/doc_spec.rb +18 -0
- data/spec/unit/formatters/error_description_spec.rb +66 -21
- data/spec/unit/formatters/error_inspectors/compile_error_inspector_spec.rb +16 -16
- data/spec/unit/formatters/error_inspectors/cookbook_resolve_error_inspector_spec.rb +4 -4
- data/spec/unit/formatters/error_inspectors/cookbook_sync_error_inspector_spec.rb +1 -1
- data/spec/unit/formatters/error_inspectors/node_load_error_inspector_spec.rb +1 -1
- data/spec/unit/formatters/error_inspectors/registration_error_inspector_spec.rb +1 -1
- data/spec/unit/formatters/error_inspectors/resource_failure_inspector_spec.rb +1 -1
- data/spec/unit/formatters/error_inspectors/run_list_expansion_error_inspector_spec.rb +7 -7
- data/spec/unit/guard_interpreter/resource_guard_interpreter_spec.rb +4 -4
- data/spec/unit/handler/json_file_spec.rb +1 -1
- data/spec/unit/http/api_versions_spec.rb +18 -5
- data/spec/unit/http/authenticator_spec.rb +58 -13
- data/spec/unit/http/http_request_spec.rb +7 -1
- data/spec/unit/http/socketless_chef_zero_client_spec.rb +2 -1
- data/spec/unit/http/ssl_policies_spec.rb +1 -1
- data/spec/unit/http/validate_content_length_spec.rb +7 -7
- data/spec/unit/http_spec.rb +9 -0
- data/spec/unit/json_compat_spec.rb +0 -32
- data/spec/unit/key_spec.rb +12 -12
- data/spec/unit/knife/bootstrap/client_builder_spec.rb +4 -4
- data/spec/unit/knife/bootstrap_spec.rb +160 -12
- data/spec/unit/knife/client_bulk_delete_spec.rb +1 -1
- data/spec/unit/knife/client_delete_spec.rb +2 -2
- data/spec/unit/knife/client_reregister_spec.rb +1 -1
- data/spec/unit/knife/configure_client_spec.rb +4 -6
- data/spec/unit/knife/configure_spec.rb +12 -63
- data/spec/unit/knife/cookbook_bulk_delete_spec.rb +1 -1
- data/spec/unit/knife/cookbook_create_spec.rb +1 -220
- data/spec/unit/knife/cookbook_delete_spec.rb +6 -6
- data/spec/unit/knife/cookbook_download_spec.rb +64 -46
- data/spec/unit/knife/cookbook_list_spec.rb +7 -7
- data/spec/unit/knife/cookbook_show_spec.rb +62 -29
- data/spec/unit/knife/cookbook_test_spec.rb +2 -2
- data/spec/unit/knife/cookbook_upload_spec.rb +19 -19
- data/spec/unit/knife/core/bootstrap_context_spec.rb +54 -37
- data/spec/unit/knife/core/cookbook_scm_repo_spec.rb +21 -21
- data/spec/unit/knife/core/gem_glob_loader_spec.rb +2 -2
- data/spec/unit/knife/core/hashed_command_loader_spec.rb +1 -1
- data/spec/unit/knife/core/node_editor_spec.rb +6 -6
- data/spec/unit/knife/core/object_loader_spec.rb +1 -1
- data/spec/unit/knife/core/subcommand_loader_spec.rb +0 -6
- data/spec/unit/knife/core/ui_spec.rb +76 -66
- data/spec/unit/knife/data_bag_create_spec.rb +107 -41
- data/spec/unit/knife/data_bag_edit_spec.rb +2 -3
- data/spec/unit/knife/data_bag_secret_options_spec.rb +5 -5
- data/spec/unit/knife/data_bag_show_spec.rb +16 -2
- data/spec/unit/knife/environment_compare_spec.rb +3 -3
- data/spec/unit/knife/environment_from_file_spec.rb +1 -1
- data/spec/unit/knife/key_create_spec.rb +4 -4
- data/spec/unit/knife/key_delete_spec.rb +3 -3
- data/spec/unit/knife/key_edit_spec.rb +3 -3
- data/spec/unit/knife/key_list_spec.rb +3 -3
- data/spec/unit/knife/key_show_spec.rb +3 -3
- data/spec/unit/knife/node_delete_spec.rb +1 -1
- data/spec/unit/knife/node_edit_spec.rb +10 -8
- data/spec/unit/knife/node_from_file_spec.rb +1 -1
- data/spec/unit/knife/node_policy_set_spec.rb +122 -0
- data/spec/unit/knife/node_run_list_add_spec.rb +1 -1
- data/spec/unit/knife/osc_user_edit_spec.rb +1 -1
- data/spec/unit/knife/osc_user_reregister_spec.rb +2 -2
- data/spec/unit/knife/osc_user_show_spec.rb +1 -1
- data/spec/unit/knife/role_bulk_delete_spec.rb +1 -1
- data/spec/unit/knife/role_create_spec.rb +1 -1
- data/spec/unit/knife/role_delete_spec.rb +1 -1
- data/spec/unit/knife/role_env_run_list_add_spec.rb +4 -4
- data/spec/unit/knife/role_env_run_list_clear_spec.rb +1 -1
- data/spec/unit/knife/role_env_run_list_remove_spec.rb +1 -1
- data/spec/unit/knife/role_env_run_list_replace_spec.rb +1 -1
- data/spec/unit/knife/role_env_run_list_set_spec.rb +1 -1
- data/spec/unit/knife/role_from_file_spec.rb +1 -1
- data/spec/unit/knife/role_run_list_add_spec.rb +4 -4
- data/spec/unit/knife/role_run_list_clear_spec.rb +1 -1
- data/spec/unit/knife/role_run_list_remove_spec.rb +1 -1
- data/spec/unit/knife/role_run_list_replace_spec.rb +1 -1
- data/spec/unit/knife/role_run_list_set_spec.rb +1 -1
- data/spec/unit/knife/ssh_spec.rb +136 -66
- data/spec/unit/knife/ssl_check_spec.rb +23 -23
- data/spec/unit/knife/ssl_fetch_spec.rb +11 -11
- data/spec/unit/knife/status_spec.rb +2 -0
- data/spec/unit/knife/{cookbook_site_download_spec.rb → supermarket_download_spec.rb} +28 -26
- data/spec/unit/knife/{cookbook_site_install_spec.rb → supermarket_install_spec.rb} +10 -9
- data/spec/unit/knife/{cookbook_site_share_spec.rb → supermarket_share_spec.rb} +15 -15
- data/spec/unit/knife/{cookbook_site_unshare_spec.rb → supermarket_unshare_spec.rb} +9 -8
- data/spec/unit/knife/user_delete_spec.rb +1 -1
- data/spec/unit/knife/user_reregister_spec.rb +1 -1
- data/spec/unit/knife_spec.rb +65 -38
- data/spec/unit/log/syslog_spec.rb +4 -6
- data/spec/unit/log/winevt_spec.rb +3 -4
- data/spec/unit/lwrp_spec.rb +50 -137
- data/spec/unit/mash_spec.rb +3 -3
- data/spec/unit/mixin/api_version_request_handling_spec.rb +18 -18
- data/spec/unit/mixin/checksum_spec.rb +1 -1
- data/spec/unit/mixin/enforce_ownership_and_permissions_spec.rb +8 -8
- data/spec/unit/mixin/homebrew_user_spec.rb +2 -6
- data/spec/unit/mixin/openssl_helper_spec.rb +857 -0
- data/spec/unit/mixin/params_validate_spec.rb +104 -93
- data/spec/unit/mixin/path_sanity_spec.rb +7 -7
- data/spec/unit/mixin/powershell_exec_spec.rb +43 -0
- data/spec/unit/mixin/powershell_type_coercions_spec.rb +8 -7
- data/spec/unit/mixin/properties_spec.rb +12 -2
- data/spec/unit/mixin/securable_spec.rb +27 -27
- data/spec/unit/mixin/shell_out_spec.rb +335 -187
- data/spec/unit/mixin/template_spec.rb +45 -0
- data/spec/unit/mixin/user_context_spec.rb +108 -0
- data/spec/unit/mixin/versioned_api_spec.rb +21 -0
- data/spec/unit/mixin/xml_escape_spec.rb +1 -1
- data/spec/unit/node/attribute_spec.rb +77 -45
- data/spec/unit/node/immutable_collections_spec.rb +126 -5
- data/spec/unit/node/vivid_mash_spec.rb +3 -3
- data/spec/unit/node_map_spec.rb +90 -18
- data/spec/unit/node_spec.rb +171 -156
- data/spec/unit/org_spec.rb +2 -2
- data/spec/unit/platform/query_helpers_spec.rb +30 -43
- data/spec/unit/policy_builder/expand_node_object_spec.rb +6 -31
- data/spec/unit/policy_builder/policyfile_spec.rb +162 -35
- data/spec/unit/property/validation_spec.rb +108 -70
- data/spec/unit/property_spec.rb +139 -135
- data/spec/unit/provider/apt_preference_spec.rb +87 -0
- data/spec/unit/provider/apt_repository_spec.rb +131 -60
- data/spec/unit/provider/apt_update_spec.rb +9 -7
- data/spec/unit/provider/cookbook_file/content_spec.rb +1 -1
- data/spec/unit/provider/cookbook_file_spec.rb +2 -1
- data/spec/unit/provider/cron/unix_spec.rb +20 -15
- data/spec/unit/provider/cron_spec.rb +439 -365
- data/spec/unit/provider/dsc_resource_spec.rb +10 -10
- data/spec/unit/provider/dsc_script_spec.rb +1 -1
- data/spec/unit/provider/execute_spec.rb +25 -16
- data/spec/unit/provider/file/content_spec.rb +3 -3
- data/spec/unit/provider/file_spec.rb +2 -1
- data/spec/unit/provider/git_spec.rb +185 -130
- data/spec/unit/provider/group/dscl_spec.rb +39 -31
- data/spec/unit/provider/group/gpasswd_spec.rb +12 -9
- data/spec/unit/provider/group/groupadd_spec.rb +16 -16
- data/spec/unit/provider/group/groupmod_spec.rb +19 -16
- data/spec/unit/provider/group/pw_spec.rb +12 -9
- data/spec/unit/provider/group/suse_spec.rb +2 -2
- data/spec/unit/provider/group/usermod_spec.rb +10 -10
- data/spec/unit/provider/group/windows_spec.rb +18 -3
- data/spec/unit/provider/group_spec.rb +16 -16
- data/spec/unit/provider/http_request_spec.rb +1 -1
- data/spec/unit/provider/ifconfig/aix_spec.rb +20 -20
- data/spec/unit/provider/ifconfig/debian_spec.rb +16 -16
- data/spec/unit/provider/ifconfig/redhat_spec.rb +10 -0
- data/spec/unit/provider/ifconfig_spec.rb +33 -15
- data/spec/unit/provider/launchd_spec.rb +52 -52
- data/spec/unit/provider/link_spec.rb +13 -11
- data/spec/unit/provider/log_spec.rb +18 -13
- data/spec/unit/provider/mdadm_spec.rb +3 -3
- data/spec/unit/provider/mount/aix_spec.rb +85 -45
- data/spec/unit/provider/mount/mount_spec.rb +90 -37
- data/spec/unit/provider/mount/solaris_spec.rb +88 -88
- data/spec/unit/provider/mount/windows_spec.rb +6 -6
- data/spec/unit/provider/ohai_spec.rb +9 -9
- data/spec/unit/provider/osx_profile_spec.rb +6 -4
- data/spec/unit/provider/package/apt_spec.rb +576 -447
- data/spec/unit/provider/package/{aix_spec.rb → bff_spec.rb} +45 -43
- data/spec/unit/provider/package/cab_spec.rb +58 -58
- data/spec/unit/provider/package/chocolatey_spec.rb +66 -48
- data/spec/unit/provider/package/dpkg_spec.rb +33 -33
- data/spec/unit/provider/package/freebsd/pkg_spec.rb +36 -36
- data/spec/unit/provider/package/freebsd/pkgng_spec.rb +22 -22
- data/spec/unit/provider/package/freebsd/port_spec.rb +21 -21
- data/spec/unit/provider/package/homebrew_spec.rb +6 -5
- data/spec/unit/provider/package/ips_spec.rb +96 -96
- data/spec/unit/provider/package/macports_spec.rb +27 -27
- data/spec/unit/provider/package/msu_spec.rb +44 -44
- data/spec/unit/provider/package/openbsd_spec.rb +19 -19
- data/spec/unit/provider/package/pacman_spec.rb +52 -52
- data/spec/unit/provider/package/paludis_spec.rb +33 -33
- data/spec/unit/provider/package/portage_spec.rb +27 -163
- data/spec/unit/provider/package/powershell_spec.rb +236 -72
- data/spec/unit/provider/package/rpm_spec.rb +26 -26
- data/spec/unit/provider/package/rubygems_spec.rb +255 -98
- data/spec/unit/provider/package/smartos_spec.rb +21 -21
- data/spec/unit/provider/package/solaris_spec.rb +38 -38
- data/spec/unit/provider/package/windows/exe_spec.rb +2 -2
- data/spec/unit/provider/package/windows/msi_spec.rb +2 -2
- data/spec/unit/provider/package/windows/registry_uninstall_entry_spec.rb +78 -0
- data/spec/unit/provider/package/windows_spec.rb +22 -2
- data/{lib/chef/mixin/language_include_recipe.rb → spec/unit/provider/package/yum/python_helper_spec.rb} +8 -10
- data/spec/unit/provider/package/yum/yum_cache_spec.rb +86 -4
- data/spec/unit/provider/package/zypper_spec.rb +207 -68
- data/spec/unit/provider/package_spec.rb +87 -23
- data/spec/unit/provider/powershell_script_spec.rb +16 -6
- data/spec/unit/provider/registry_key_spec.rb +103 -23
- data/spec/unit/provider/remote_directory_spec.rb +1 -1
- data/spec/unit/provider/remote_file/cache_control_data_spec.rb +8 -8
- data/spec/unit/provider/remote_file/content_spec.rb +6 -6
- data/spec/unit/provider/remote_file/fetcher_spec.rb +6 -5
- data/spec/unit/provider/remote_file/ftp_spec.rb +1 -1
- data/spec/unit/provider/remote_file/http_spec.rb +26 -24
- data/spec/unit/provider/remote_file/local_file_spec.rb +2 -2
- data/spec/unit/provider/remote_file/network_file_spec.rb +9 -4
- data/spec/unit/provider/remote_file/sftp_spec.rb +2 -2
- data/spec/unit/provider/remote_file_spec.rb +2 -1
- data/spec/unit/provider/route_spec.rb +36 -14
- data/spec/unit/provider/script_spec.rb +2 -2
- data/spec/unit/provider/service/aix_service_spec.rb +8 -8
- data/spec/unit/provider/service/aixinit_service_spec.rb +4 -4
- data/spec/unit/provider/service/arch_service_spec.rb +36 -36
- data/spec/unit/provider/service/debian_service_spec.rb +42 -168
- data/spec/unit/provider/service/freebsd_service_spec.rb +37 -37
- data/spec/unit/provider/service/gentoo_service_spec.rb +1 -1
- data/spec/unit/provider/service/init_service_spec.rb +30 -30
- data/spec/unit/provider/service/insserv_service_spec.rb +4 -4
- data/spec/unit/provider/service/invokercd_service_spec.rb +30 -30
- data/spec/unit/provider/service/macosx_spec.rb +68 -63
- data/spec/unit/provider/service/openbsd_service_spec.rb +12 -12
- data/spec/unit/provider/service/redhat_spec.rb +27 -27
- data/spec/unit/provider/service/simple_service_spec.rb +20 -20
- data/spec/unit/provider/service/solaris_smf_service_spec.rb +54 -17
- data/spec/unit/provider/service/systemd_service_spec.rb +37 -43
- data/spec/unit/provider/service/upstart_service_spec.rb +33 -46
- data/spec/unit/provider/service/windows_spec.rb +517 -70
- data/spec/unit/provider/service_spec.rb +4 -4
- data/spec/unit/provider/subversion_spec.rb +15 -15
- data/spec/unit/provider/systemd_unit_spec.rb +241 -159
- data/spec/unit/provider/template/content_spec.rb +44 -44
- data/spec/unit/provider/template_spec.rb +3 -5
- data/spec/unit/provider/user/aix_spec.rb +96 -0
- data/spec/unit/provider/user/dscl_spec.rb +39 -21
- data/spec/unit/provider/user/linux_spec.rb +5 -43
- data/spec/unit/provider/user/pw_spec.rb +29 -49
- data/spec/unit/provider/user/solaris_spec.rb +8 -9
- data/spec/unit/provider/user/windows_spec.rb +23 -11
- data/spec/unit/provider/user_spec.rb +52 -36
- data/spec/unit/provider/{env_spec.rb → windows_env_spec.rb} +106 -16
- data/spec/unit/provider/windows_path_spec.rb +65 -0
- data/spec/unit/provider/windows_task_spec.rb +435 -0
- data/spec/unit/provider/zypper_repository_spec.rb +126 -0
- data/spec/unit/provider_resolver_spec.rb +41 -54
- data/spec/unit/provider_spec.rb +10 -7
- data/spec/unit/recipe_spec.rb +19 -188
- data/spec/unit/resource/apt_package_spec.rb +19 -1
- data/spec/unit/resource/apt_preference_spec.rb +57 -0
- data/spec/unit/resource/apt_repository_spec.rb +58 -16
- data/spec/unit/resource/apt_update_spec.rb +22 -10
- data/spec/unit/resource/bash_spec.rb +14 -9
- data/spec/unit/resource/batch_spec.rb +2 -5
- data/spec/unit/resource/bff_package_spec.rb +51 -0
- data/spec/unit/resource/breakpoint_spec.rb +30 -13
- data/spec/unit/resource/build_essential_spec.rb +43 -0
- data/spec/unit/resource/cab_package_spec.rb +30 -4
- data/spec/unit/resource/chef_gem_spec.rb +32 -64
- data/spec/unit/resource/chef_handler_spec.rb +40 -0
- data/spec/unit/resource/chocolatey_config_spec.rb +98 -0
- data/spec/unit/resource/chocolatey_package_spec.rb +24 -12
- data/spec/unit/resource/chocolatey_source_spec.rb +102 -0
- data/spec/unit/resource/conditional_spec.rb +5 -5
- data/spec/unit/resource/cookbook_file_spec.rb +36 -31
- data/{lib/chef/mixin/language_include_attribute.rb → spec/unit/resource/cron_access_spec.rb} +14 -12
- data/spec/unit/resource/cron_d_spec.rb +90 -0
- data/spec/unit/resource/cron_spec.rb +73 -86
- data/spec/unit/resource/csh_spec.rb +14 -9
- data/spec/unit/resource/directory_spec.rb +23 -36
- data/spec/unit/resource/{deploy_revision_spec.rb → dmg_package_spec.rb} +15 -18
- data/spec/unit/resource/dnf_package_spec.rb +47 -38
- data/spec/unit/resource/dpkg_package_spec.rb +18 -0
- data/spec/unit/resource/dsc_resource_spec.rb +7 -7
- data/spec/unit/resource/dsc_script_spec.rb +49 -49
- data/spec/unit/resource/execute_spec.rb +47 -19
- data/spec/unit/resource/file/verification/systemd_unit_spec.rb +1 -1
- data/spec/unit/resource/file/verification_spec.rb +27 -19
- data/spec/unit/resource/file_spec.rb +58 -61
- data/spec/unit/resource/freebsd_package_spec.rb +47 -31
- data/spec/unit/resource/gem_package_spec.rb +30 -5
- data/spec/unit/resource/git_spec.rb +23 -11
- data/spec/unit/resource/group_spec.rb +78 -75
- data/spec/unit/resource/homebrew_cask_spec.rb +40 -0
- data/spec/unit/resource/homebrew_package_spec.rb +18 -0
- data/spec/unit/resource/homebrew_tap_spec.rb +44 -0
- data/spec/unit/resource/hostname_spec.rb +47 -0
- data/spec/unit/resource/http_request_spec.rb +23 -17
- data/spec/unit/resource/ifconfig_spec.rb +4 -4
- data/spec/unit/resource/ips_package_spec.rb +21 -7
- data/spec/unit/resource/kernel_module_spec.rb +48 -0
- data/spec/unit/resource/ksh_spec.rb +14 -9
- data/spec/unit/resource/launchd_spec.rb +23 -15
- data/spec/unit/resource/link_spec.rb +52 -62
- data/spec/unit/resource/locale_spec.rb +60 -0
- data/spec/unit/resource/log_spec.rb +22 -31
- data/spec/unit/resource/{timestamped_deploy_spec.rb → macos_user_defaults_spec.rb} +14 -11
- data/spec/unit/resource/macports_package_spec.rb +19 -0
- data/spec/unit/resource/mdadm_spec.rb +41 -44
- data/spec/unit/resource/mount_spec.rb +94 -131
- data/spec/unit/resource/msu_package_spec.rb +25 -11
- data/spec/unit/resource/ohai_hint_spec.rb +44 -0
- data/spec/unit/resource/ohai_spec.rb +17 -16
- data/spec/unit/resource/openbsd_package_spec.rb +24 -14
- data/spec/unit/resource/openssl_dhparam.rb +61 -0
- data/spec/unit/resource/openssl_ec_private_key_spec.rb +64 -0
- data/spec/unit/resource/openssl_ec_public_key_spec.rb +43 -0
- data/spec/unit/resource/openssl_rsa_private_key_spec.rb +64 -0
- data/spec/unit/resource/openssl_rsa_public_key_spec.rb +43 -0
- data/spec/unit/resource/openssl_x509_certificate_spec.rb +72 -0
- data/spec/unit/resource/openssl_x509_crl_spec.rb +61 -0
- data/spec/unit/resource/openssl_x509_request.rb +68 -0
- data/spec/unit/resource/osx_profile_spec.rb +10 -12
- data/spec/unit/resource/package_spec.rb +47 -37
- data/spec/unit/resource/pacman_package_spec.rb +17 -3
- data/spec/unit/resource/paludis_package_spec.rb +36 -0
- data/spec/unit/resource/perl_spec.rb +13 -9
- data/spec/unit/resource/portage_package_spec.rb +18 -10
- data/spec/unit/resource/powershell_package_source_spec.rb +219 -0
- data/spec/unit/resource/powershell_package_spec.rb +42 -12
- data/spec/unit/resource/powershell_script_spec.rb +10 -10
- data/spec/unit/resource/python_spec.rb +10 -10
- data/spec/unit/resource/reboot_spec.rb +47 -0
- data/spec/unit/resource/registry_key_spec.rb +99 -99
- data/spec/unit/resource/remote_directory_spec.rb +50 -42
- data/spec/unit/resource/remote_file_spec.rb +95 -82
- data/spec/unit/resource/resource_notification_spec.rb +8 -8
- data/spec/unit/resource/rhsm_errata_level_spec.rb +50 -0
- data/spec/unit/resource/rhsm_errata_spec.rb +39 -0
- data/spec/unit/resource/rhsm_register_spec.rb +204 -0
- data/spec/unit/resource/rhsm_repo_spec.rb +64 -0
- data/spec/unit/resource/rhsm_subscription_spec.rb +98 -0
- data/spec/unit/resource/route_spec.rb +36 -48
- data/spec/unit/resource/rpm_package_spec.rb +22 -6
- data/spec/unit/resource/ruby_block_spec.rb +15 -18
- data/spec/unit/resource/ruby_spec.rb +9 -10
- data/spec/unit/resource/scm_spec.rb +64 -84
- data/spec/unit/resource/script_spec.rb +10 -2
- data/spec/unit/resource/service_spec.rb +102 -75
- data/spec/unit/resource/smartos_package_spec.rb +21 -2
- data/spec/unit/resource/solaris_package_spec.rb +16 -4
- data/spec/unit/resource/ssh_known_hosts_entry_spec.rb +55 -0
- data/spec/unit/resource/subversion_spec.rb +39 -19
- data/spec/unit/resource/sudo_spec.rb +99 -0
- data/spec/unit/resource/swap_file_spec.rb +39 -0
- data/spec/unit/resource/sysctl_spec.rb +54 -0
- data/spec/unit/resource/systemd_unit_spec.rb +58 -61
- data/spec/unit/resource/template_spec.rb +74 -62
- data/spec/unit/resource/timezone.rb +39 -0
- data/spec/unit/resource/user_spec.rb +45 -56
- data/spec/unit/resource/windows_ad_join_spec.rb +51 -0
- data/spec/unit/resource/windows_auto_run_spec.rb +50 -0
- data/spec/unit/resource/windows_certificate.rb +83 -0
- data/spec/unit/resource/windows_env_spec.rb +75 -0
- data/spec/unit/resource/windows_feature.rb +64 -0
- data/spec/unit/resource/windows_feature_dism.rb +72 -0
- data/spec/unit/resource/windows_feature_powershell.rb +72 -0
- data/spec/unit/resource/windows_firewall_rule_spec.rb +401 -0
- data/spec/unit/resource/windows_font_spec.rb +43 -0
- data/spec/unit/resource/windows_package_spec.rb +16 -6
- data/spec/unit/resource/windows_pagefile_spec.rb +49 -0
- data/spec/unit/resource/windows_path_spec.rb +40 -0
- data/spec/unit/resource/windows_printer_port_spec.rb +62 -0
- data/spec/unit/resource/windows_printer_spec.rb +52 -0
- data/spec/unit/resource/windows_service_spec.rb +49 -5
- data/spec/unit/resource/windows_share.rb +39 -0
- data/spec/unit/resource/windows_shortcut_spec.rb +38 -0
- data/spec/unit/resource/windows_task_spec.rb +399 -0
- data/spec/unit/resource/windows_workgroup_spec.rb +74 -0
- data/spec/unit/resource/yum_package_spec.rb +6 -6
- data/spec/unit/resource/yum_repository_spec.rb +112 -9
- data/spec/unit/resource/zypper_package_spec.rb +51 -0
- data/spec/unit/resource/zypper_repository_spec.rb +115 -0
- data/spec/unit/resource_collection/resource_set_spec.rb +52 -7
- data/spec/unit/resource_collection_spec.rb +17 -8
- data/spec/unit/resource_definition_spec.rb +2 -2
- data/spec/unit/resource_inspector_spec.rb +60 -0
- data/spec/unit/resource_reporter_spec.rb +39 -39
- data/spec/unit/resource_spec.rb +154 -100
- data/spec/unit/role_spec.rb +22 -22
- data/spec/unit/run_context/child_run_context_spec.rb +3 -3
- data/spec/unit/run_context/cookbook_compiler_spec.rb +1 -3
- data/spec/unit/run_context_spec.rb +1 -1
- data/spec/unit/run_list/run_list_item_spec.rb +3 -3
- data/spec/unit/run_list/versioned_recipe_list_spec.rb +19 -16
- data/spec/unit/run_list_spec.rb +6 -6
- data/spec/unit/runner_spec.rb +16 -30
- data/spec/unit/scan_access_control_spec.rb +3 -3
- data/spec/unit/search/query_spec.rb +36 -43
- data/spec/unit/server_api_spec.rb +75 -1
- data/spec/unit/server_api_versions_spec.rb +22 -0
- data/spec/unit/shell/model_wrapper_spec.rb +4 -4
- data/spec/unit/shell/shell_ext_spec.rb +4 -4
- data/spec/unit/shell/shell_session_spec.rb +113 -58
- data/spec/unit/user_spec.rb +3 -3
- data/spec/unit/user_v1_spec.rb +27 -27
- data/spec/unit/util/diff_spec.rb +1 -1
- data/spec/unit/util/dsc/configuration_generator_spec.rb +4 -4
- data/spec/unit/util/dsc/lcm_output_parser_spec.rb +172 -88
- data/spec/unit/util/dsc/local_configuration_manager_spec.rb +77 -24
- data/spec/unit/util/file_edit_spec.rb +38 -38
- data/spec/unit/util/powershell/cmdlet_spec.rb +1 -1
- data/spec/unit/util/selinux_spec.rb +10 -13
- data/spec/unit/util/windows/logon_session_spec.rb +285 -0
- data/spec/unit/version_string_spec.rb +79 -0
- data/spec/unit/win32/error_spec.rb +12 -2
- data/spec/unit/win32/link_spec.rb +73 -0
- data/spec/unit/win32/registry_spec.rb +3 -3
- data/spec/unit/win32/security_spec.rb +69 -1
- data/spec/unit/windows_service_spec.rb +6 -4
- data/tasks/announce.rb +1 -1
- data/tasks/bin/run_external_test +22 -40
- data/tasks/dependencies.rb +21 -114
- data/tasks/maintainers.rb +13 -13
- data/tasks/rspec.rb +3 -3
- data/tasks/templates/prerelease.md.erb +11 -2
- data/tasks/templates/release.md.erb +9 -1
- metadata +335 -404
- data/CONTRIBUTING.md +0 -151
- data/VERSION +0 -1
- data/acceptance/.gitignore +0 -3
- data/acceptance/.shared/kitchen_acceptance/.kitchen.digitalocean.yml +0 -33
- data/acceptance/.shared/kitchen_acceptance/.kitchen.ec2.yml +0 -282
- data/acceptance/.shared/kitchen_acceptance/.kitchen.vagrant.yml +0 -59
- data/acceptance/.shared/kitchen_acceptance/libraries/kitchen.rb +0 -68
- data/acceptance/.shared/kitchen_acceptance/metadata.rb +0 -1
- data/acceptance/Gemfile +0 -16
- data/acceptance/Gemfile.lock +0 -258
- data/acceptance/README.md +0 -137
- data/acceptance/basics/.acceptance/acceptance-cookbook/.gitignore +0 -2
- data/acceptance/basics/.acceptance/acceptance-cookbook/metadata.rb +0 -3
- data/acceptance/basics/.acceptance/acceptance-cookbook/recipes/destroy.rb +0 -1
- data/acceptance/basics/.acceptance/acceptance-cookbook/recipes/provision.rb +0 -1
- data/acceptance/basics/.acceptance/acceptance-cookbook/recipes/verify.rb +0 -1
- data/acceptance/basics/.kitchen.yml +0 -4
- data/acceptance/basics/test/integration/chef-current-install/serverspec/chef_client_spec.rb +0 -19
- data/acceptance/basics/test/integration/chef-current-install/serverspec/spec_helper.rb +0 -6
- data/acceptance/basics/test/integration/helpers/serverspec/Gemfile +0 -8
- data/acceptance/data-collector/.acceptance/acceptance-cookbook/.gitignore +0 -2
- data/acceptance/data-collector/.acceptance/acceptance-cookbook/metadata.rb +0 -3
- data/acceptance/data-collector/.acceptance/acceptance-cookbook/recipes/destroy.rb +0 -2
- data/acceptance/data-collector/.acceptance/acceptance-cookbook/recipes/provision.rb +0 -2
- data/acceptance/data-collector/.acceptance/acceptance-cookbook/recipes/verify.rb +0 -2
- data/acceptance/data-collector/.acceptance/data-collector-test/.gitignore +0 -16
- data/acceptance/data-collector/.acceptance/data-collector-test/Berksfile +0 -3
- data/acceptance/data-collector/.acceptance/data-collector-test/files/default/api.rb +0 -85
- data/acceptance/data-collector/.acceptance/data-collector-test/files/default/apigemfile +0 -3
- data/acceptance/data-collector/.acceptance/data-collector-test/files/default/client-rb-both-mode.rb +0 -4
- data/acceptance/data-collector/.acceptance/data-collector-test/files/default/client-rb-client-mode.rb +0 -4
- data/acceptance/data-collector/.acceptance/data-collector-test/files/default/client-rb-no-endpoint.rb +0 -2
- data/acceptance/data-collector/.acceptance/data-collector-test/files/default/client-rb-solo-mode.rb +0 -4
- data/acceptance/data-collector/.acceptance/data-collector-test/files/default/config.ru +0 -2
- data/acceptance/data-collector/.acceptance/data-collector-test/metadata.rb +0 -7
- data/acceptance/data-collector/.acceptance/data-collector-test/recipes/default.rb +0 -38
- data/acceptance/data-collector/.kitchen.yml +0 -9
- data/acceptance/data-collector/Berksfile +0 -3
- data/acceptance/data-collector/test/integration/default/serverspec/default_spec.rb +0 -204
- data/acceptance/data-collector/test/integration/helpers/serverspec/Gemfile +0 -8
- data/acceptance/fips/.acceptance/acceptance-cookbook/.gitignore +0 -2
- data/acceptance/fips/.acceptance/acceptance-cookbook/metadata.rb +0 -2
- data/acceptance/fips/.acceptance/acceptance-cookbook/recipes/destroy.rb +0 -1
- data/acceptance/fips/.acceptance/acceptance-cookbook/recipes/provision.rb +0 -1
- data/acceptance/fips/.acceptance/acceptance-cookbook/recipes/verify.rb +0 -1
- data/acceptance/fips/.kitchen.yml +0 -8
- data/acceptance/fips/test/integration/fips-integration/serverspec/Gemfile +0 -9
- data/acceptance/fips/test/integration/fips-integration/serverspec/fips-integration_spec.rb +0 -52
- data/acceptance/fips/test/integration/fips-unit-functional/serverspec/Gemfile +0 -7
- data/acceptance/fips/test/integration/fips-unit-functional/serverspec/fips-unit-functional_spec.rb +0 -56
- data/acceptance/omnitruck/.acceptance/acceptance-cookbook/.gitignore +0 -2
- data/acceptance/omnitruck/.acceptance/acceptance-cookbook/metadata.rb +0 -1
- data/acceptance/omnitruck/.acceptance/acceptance-cookbook/recipes/destroy.rb +0 -1
- data/acceptance/omnitruck/.acceptance/acceptance-cookbook/recipes/provision.rb +0 -1
- data/acceptance/omnitruck/.acceptance/acceptance-cookbook/recipes/verify.rb +0 -61
- data/acceptance/top-cookbooks/.acceptance/acceptance-cookbook/.gitignore +0 -2
- data/acceptance/top-cookbooks/.acceptance/acceptance-cookbook/libraries/cookbook_kitchen.rb +0 -43
- data/acceptance/top-cookbooks/.acceptance/acceptance-cookbook/libraries/top_cookbooks.rb +0 -45
- data/acceptance/top-cookbooks/.acceptance/acceptance-cookbook/metadata.rb +0 -3
- data/acceptance/top-cookbooks/.acceptance/acceptance-cookbook/recipes/destroy.rb +0 -1
- data/acceptance/top-cookbooks/.acceptance/acceptance-cookbook/recipes/provision.rb +0 -1
- data/acceptance/top-cookbooks/.acceptance/acceptance-cookbook/recipes/verify.rb +0 -1
- data/acceptance/top-cookbooks/.gitignore +0 -1
- data/acceptance/top-cookbooks/.kitchen.chocolatey.yml +0 -6
- data/acceptance/top-cookbooks/.kitchen.docker.yml +0 -9
- data/acceptance/top-cookbooks/.kitchen.git.yml +0 -11
- data/acceptance/top-cookbooks/.kitchen.iis.yml +0 -4
- data/acceptance/top-cookbooks/.kitchen.learn-the-basics-rhel.yml +0 -7
- data/acceptance/top-cookbooks/.kitchen.learn-the-basics-ubuntu.yml +0 -7
- data/acceptance/top-cookbooks/.kitchen.learn-the-basics-windows.yml +0 -7
- data/acceptance/top-cookbooks/.kitchen.powershell.yml +0 -4
- data/acceptance/top-cookbooks/.kitchen.sql_server.yml +0 -5
- data/acceptance/top-cookbooks/.kitchen.winbox.yml +0 -8
- data/acceptance/top-cookbooks/.kitchen.windows.yml +0 -38
- data/acceptance/trivial/.acceptance/acceptance-cookbook/.gitignore +0 -2
- data/acceptance/trivial/.acceptance/acceptance-cookbook/metadata.rb +0 -2
- data/acceptance/trivial/.acceptance/acceptance-cookbook/recipes/destroy.rb +0 -1
- data/acceptance/trivial/.acceptance/acceptance-cookbook/recipes/provision.rb +0 -1
- data/acceptance/trivial/.acceptance/acceptance-cookbook/recipes/verify.rb +0 -1
- data/acceptance/trivial/.kitchen.yml +0 -7
- data/acceptance/trivial/test/integration/chef-current-install/inspec/chef_client_spec.rb +0 -5
- data/acceptance/windows-service/.acceptance/acceptance-cookbook/.gitignore +0 -2
- data/acceptance/windows-service/.acceptance/acceptance-cookbook/metadata.rb +0 -2
- data/acceptance/windows-service/.acceptance/acceptance-cookbook/recipes/destroy.rb +0 -1
- data/acceptance/windows-service/.acceptance/acceptance-cookbook/recipes/provision.rb +0 -1
- data/acceptance/windows-service/.acceptance/acceptance-cookbook/recipes/verify.rb +0 -1
- data/acceptance/windows-service/.kitchen.yml +0 -7
- data/acceptance/windows-service/test/integration/chef-windows-service/inspec/chef_windows_service_spec.rb +0 -58
- data/distro/common/html/_sources/ctl_chef_client.txt +0 -36
- data/distro/common/html/_sources/ctl_chef_server.txt +0 -341
- data/distro/common/html/_sources/ctl_chef_shell.txt +0 -15
- data/distro/common/html/_sources/ctl_chef_solo.txt +0 -25
- data/distro/common/html/_sources/index.txt +0 -135
- data/distro/common/html/_sources/knife.txt +0 -74
- data/distro/common/html/_sources/knife_bootstrap.txt +0 -56
- data/distro/common/html/_sources/knife_client.txt +0 -151
- data/distro/common/html/_sources/knife_common_options.txt +0 -6
- data/distro/common/html/_sources/knife_configure.txt +0 -29
- data/distro/common/html/_sources/knife_cookbook.txt +0 -236
- data/distro/common/html/_sources/knife_cookbook_site.txt +0 -157
- data/distro/common/html/_sources/knife_data_bag.txt +0 -160
- data/distro/common/html/_sources/knife_delete.txt +0 -26
- data/distro/common/html/_sources/knife_deps.txt +0 -61
- data/distro/common/html/_sources/knife_diff.txt +0 -34
- data/distro/common/html/_sources/knife_download.txt +0 -44
- data/distro/common/html/_sources/knife_edit.txt +0 -26
- data/distro/common/html/_sources/knife_environment.txt +0 -158
- data/distro/common/html/_sources/knife_exec.txt +0 -47
- data/distro/common/html/_sources/knife_index_rebuild.txt +0 -21
- data/distro/common/html/_sources/knife_list.txt +0 -33
- data/distro/common/html/_sources/knife_node.txt +0 -250
- data/distro/common/html/_sources/knife_raw.txt +0 -35
- data/distro/common/html/_sources/knife_recipe_list.txt +0 -23
- data/distro/common/html/_sources/knife_role.txt +0 -157
- data/distro/common/html/_sources/knife_search.txt +0 -53
- data/distro/common/html/_sources/knife_serve.txt +0 -19
- data/distro/common/html/_sources/knife_show.txt +0 -27
- data/distro/common/html/_sources/knife_ssh.txt +0 -43
- data/distro/common/html/_sources/knife_ssl_check.txt +0 -41
- data/distro/common/html/_sources/knife_ssl_fetch.txt +0 -41
- data/distro/common/html/_sources/knife_status.txt +0 -37
- data/distro/common/html/_sources/knife_tag.txt +0 -69
- data/distro/common/html/_sources/knife_upload.txt +0 -49
- data/distro/common/html/_sources/knife_user.txt +0 -127
- data/distro/common/html/_sources/knife_using.txt +0 -43
- data/distro/common/html/_sources/knife_xargs.txt +0 -30
- data/distro/common/html/_static/ajax-loader.gif +0 -0
- data/distro/common/html/_static/basic.css +0 -537
- data/distro/common/html/_static/chef.ico +0 -0
- data/distro/common/html/_static/chef_html_logo.png +0 -0
- data/distro/common/html/_static/comment-bright.png +0 -0
- data/distro/common/html/_static/comment-close.png +0 -0
- data/distro/common/html/_static/comment.png +0 -0
- data/distro/common/html/_static/contents.png +0 -0
- data/distro/common/html/_static/doctools.js +0 -238
- data/distro/common/html/_static/down-pressed.png +0 -0
- data/distro/common/html/_static/down.png +0 -0
- data/distro/common/html/_static/file.png +0 -0
- data/distro/common/html/_static/guide.css +0 -505
- data/distro/common/html/_static/jquery.js +0 -2
- data/distro/common/html/_static/minus.png +0 -0
- data/distro/common/html/_static/navigation.png +0 -0
- data/distro/common/html/_static/plus.png +0 -0
- data/distro/common/html/_static/pygments.css +0 -62
- data/distro/common/html/_static/searchtools.js +0 -622
- data/distro/common/html/_static/underscore.js +0 -31
- data/distro/common/html/_static/up-pressed.png +0 -0
- data/distro/common/html/_static/up.png +0 -0
- data/distro/common/html/_static/websupport.js +0 -808
- data/distro/common/html/ctl_chef_client.html +0 -270
- data/distro/common/html/ctl_chef_server.html +0 -728
- data/distro/common/html/ctl_chef_shell.html +0 -163
- data/distro/common/html/ctl_chef_solo.html +0 -194
- data/distro/common/html/index.html +0 -202
- data/distro/common/html/knife.html +0 -170
- data/distro/common/html/knife_bootstrap.html +0 -285
- data/distro/common/html/knife_client.html +0 -285
- data/distro/common/html/knife_common_options.html +0 -96
- data/distro/common/html/knife_configure.html +0 -105
- data/distro/common/html/knife_cookbook.html +0 -487
- data/distro/common/html/knife_cookbook_site.html +0 -375
- data/distro/common/html/knife_data_bag.html +0 -374
- data/distro/common/html/knife_delete.html +0 -93
- data/distro/common/html/knife_deps.html +0 -143
- data/distro/common/html/knife_diff.html +0 -123
- data/distro/common/html/knife_download.html +0 -145
- data/distro/common/html/knife_edit.html +0 -89
- data/distro/common/html/knife_environment.html +0 -322
- data/distro/common/html/knife_exec.html +0 -220
- data/distro/common/html/knife_index_rebuild.html +0 -83
- data/distro/common/html/knife_list.html +0 -114
- data/distro/common/html/knife_node.html +0 -458
- data/distro/common/html/knife_raw.html +0 -110
- data/distro/common/html/knife_recipe_list.html +0 -91
- data/distro/common/html/knife_role.html +0 -295
- data/distro/common/html/knife_search.html +0 -203
- data/distro/common/html/knife_serve.html +0 -79
- data/distro/common/html/knife_show.html +0 -104
- data/distro/common/html/knife_ssh.html +0 -177
- data/distro/common/html/knife_ssl_check.html +0 -151
- data/distro/common/html/knife_ssl_fetch.html +0 -151
- data/distro/common/html/knife_status.html +0 -144
- data/distro/common/html/knife_tag.html +0 -138
- data/distro/common/html/knife_upload.html +0 -153
- data/distro/common/html/knife_user.html +0 -242
- data/distro/common/html/knife_using.html +0 -210
- data/distro/common/html/knife_xargs.html +0 -122
- data/distro/common/html/objects.inv +0 -0
- data/distro/common/html/search.html +0 -82
- data/distro/common/html/searchindex.js +0 -1
- data/distro/common/man/man1/README.md +0 -58
- data/distro/common/man/man1/chef-shell.1 +0 -194
- data/distro/common/man/man1/knife-bootstrap.1 +0 -215
- data/distro/common/man/man1/knife-client.1 +0 -443
- data/distro/common/man/man1/knife-configure.1 +0 -161
- data/distro/common/man/man1/knife-cookbook-site.1 +0 -552
- data/distro/common/man/man1/knife-cookbook.1 +0 -770
- data/distro/common/man/man1/knife-data-bag.1 +0 -617
- data/distro/common/man/man1/knife-delete.1 +0 -127
- data/distro/common/man/man1/knife-deps.1 +0 -246
- data/distro/common/man/man1/knife-diff.1 +0 -226
- data/distro/common/man/man1/knife-download.1 +0 -258
- data/distro/common/man/man1/knife-edit.1 +0 -121
- data/distro/common/man/man1/knife-environment.1 +0 -496
- data/distro/common/man/man1/knife-exec.1 +0 -362
- data/distro/common/man/man1/knife-index-rebuild.1 +0 -63
- data/distro/common/man/man1/knife-list.1 +0 -174
- data/distro/common/man/man1/knife-node.1 +0 -716
- data/distro/common/man/man1/knife-raw.1 +0 -172
- data/distro/common/man/man1/knife-recipe-list.1 +0 -85
- data/distro/common/man/man1/knife-role.1 +0 -426
- data/distro/common/man/man1/knife-search.1 +0 -359
- data/distro/common/man/man1/knife-serve.1 +0 -109
- data/distro/common/man/man1/knife-show.1 +0 -160
- data/distro/common/man/man1/knife-ssh.1 +0 -284
- data/distro/common/man/man1/knife-ssl-check.1 +0 -207
- data/distro/common/man/man1/knife-ssl-fetch.1 +0 -207
- data/distro/common/man/man1/knife-status.1 +0 -234
- data/distro/common/man/man1/knife-tag.1 +0 -189
- data/distro/common/man/man1/knife-upload.1 +0 -280
- data/distro/common/man/man1/knife-user.1 +0 -356
- data/distro/common/man/man1/knife-xargs.1 +0 -189
- data/distro/common/man/man1/knife.1 +0 -332
- data/distro/common/man/man8/chef-apply.8 +0 -86
- data/distro/common/man/man8/chef-client.8 +0 -398
- data/distro/common/man/man8/chef-solo.8 +0 -260
- data/distro/common/markdown/README +0 -3
- data/distro/common/markdown/man1/chef-shell.mkd +0 -195
- data/distro/common/markdown/man1/knife-bootstrap.mkd +0 -141
- data/distro/common/markdown/man1/knife-client.mkd +0 -103
- data/distro/common/markdown/man1/knife-configure.mkd +0 -71
- data/distro/common/markdown/man1/knife-cookbook-site.mkd +0 -123
- data/distro/common/markdown/man1/knife-cookbook.mkd +0 -263
- data/distro/common/markdown/man1/knife-data-bag.mkd +0 -121
- data/distro/common/markdown/man1/knife-environment.mkd +0 -151
- data/distro/common/markdown/man1/knife-exec.mkd +0 -42
- data/distro/common/markdown/man1/knife-index.mkd +0 -30
- data/distro/common/markdown/man1/knife-node.mkd +0 -130
- data/distro/common/markdown/man1/knife-role.mkd +0 -85
- data/distro/common/markdown/man1/knife-search.mkd +0 -180
- data/distro/common/markdown/man1/knife-ssh.mkd +0 -69
- data/distro/common/markdown/man1/knife-status.mkd +0 -36
- data/distro/common/markdown/man1/knife-tag.mkd +0 -39
- data/distro/common/markdown/man1/knife.mkd +0 -213
- data/distro/common/markdown/man8/chef-client.mkd +0 -75
- data/distro/common/markdown/man8/chef-expander.mkd +0 -81
- data/distro/common/markdown/man8/chef-expanderctl.mkd +0 -57
- data/distro/common/markdown/man8/chef-server-webui.mkd +0 -121
- data/distro/common/markdown/man8/chef-server.mkd +0 -120
- data/distro/common/markdown/man8/chef-solo.mkd +0 -107
- data/distro/common/markdown/man8/chef-solr.mkd +0 -89
- data/distro/powershell/chef/chef.psm1 +0 -442
- data/lib-backcompat/chef/chef_fs/file_system/acl_entry.rb +0 -5
- data/lib-backcompat/chef/chef_fs/file_system/already_exists_error.rb +0 -20
- data/lib-backcompat/chef/chef_fs/file_system/chef_repository_file_system_root_dir.rb +0 -5
- data/lib-backcompat/chef/chef_fs/file_system/chef_server_root_dir.rb +0 -5
- data/lib-backcompat/chef/chef_fs/file_system/cookbook_frozen_error.rb +0 -20
- data/lib-backcompat/chef/chef_fs/file_system/default_environment_cannot_be_modified_error.rb +0 -20
- data/lib-backcompat/chef/chef_fs/file_system/file_system_error.rb +0 -20
- data/lib-backcompat/chef/chef_fs/file_system/must_delete_recursively_error.rb +0 -20
- data/lib-backcompat/chef/chef_fs/file_system/not_found_error.rb +0 -20
- data/lib-backcompat/chef/chef_fs/file_system/operation_failed_error.rb +0 -20
- data/lib-backcompat/chef/chef_fs/file_system/operation_not_allowed_error.rb +0 -20
- data/lib-backcompat/chef/chef_fs/file_system/repository/chef_repository_file_system_acls_dir.rb +0 -5
- data/lib-backcompat/chef/chef_fs/file_system/repository/chef_repository_file_system_client_keys_dir.rb +0 -5
- data/lib-backcompat/chef/chef_fs/file_system/repository/chef_repository_file_system_entry.rb +0 -6
- data/lib-backcompat/chef/chef_fs/file_system/repository/chef_repository_file_system_policies_dir.rb +0 -5
- data/lib-backcompat/chef/chef_fs/file_system/repository/file_system_root_dir.rb +0 -34
- data/lib/chef/deprecation/mixin/template.rb +0 -48
- data/lib/chef/deprecation/provider/cookbook_file.rb +0 -54
- data/lib/chef/deprecation/provider/file.rb +0 -198
- data/lib/chef/deprecation/provider/remote_directory.rb +0 -52
- data/lib/chef/deprecation/provider/remote_file.rb +0 -85
- data/lib/chef/deprecation/provider/template.rb +0 -63
- data/lib/chef/dsl/method_missing.rb +0 -75
- data/lib/chef/knife/core/custom_manifest_loader.rb +0 -69
- data/lib/chef/knife/help.rb +0 -101
- data/lib/chef/knife/help_topics.rb +0 -4
- data/lib/chef/knife/index_rebuild.rb +0 -133
- data/lib/chef/mixin/command.rb +0 -194
- data/lib/chef/mixin/command/unix.rb +0 -220
- data/lib/chef/mixin/command/windows.rb +0 -71
- data/lib/chef/mixin/language.rb +0 -48
- data/lib/chef/mixin/recipe_definition_dsl_core.rb +0 -35
- data/lib/chef/provider/deploy.rb +0 -476
- data/lib/chef/provider/deploy/revision.rb +0 -107
- data/lib/chef/provider/deploy/timestamped.rb +0 -34
- data/lib/chef/provider/env/windows.rb +0 -72
- data/lib/chef/provider/erl_call.rb +0 -108
- data/lib/chef/provider/package/easy_install.rb +0 -135
- data/lib/chef/provider/package/yum/yum-dump.py +0 -307
- data/lib/chef/resource/deploy.rb +0 -443
- data/lib/chef/resource/deploy_revision.rb +0 -31
- data/lib/chef/resource/env.rb +0 -65
- data/lib/chef/resource/erl_call.rb +0 -85
- data/lib/chef/rest.rb +0 -210
- data/lib/chef/shell_out.rb +0 -13
- data/lib/chef/tasks/chef_repo.rake +0 -200
- data/spec/functional/assets/yumrepo/chef_rpm-1.10-1.fc24.i686.rpm +0 -0
- data/spec/functional/assets/yumrepo/chef_rpm-1.10-1.fc24.src.rpm +0 -0
- data/spec/functional/assets/yumrepo/chef_rpm-1.10-1.fc24.x86_64.rpm +0 -0
- data/spec/functional/assets/yumrepo/chef_rpm-1.2-1.fc24.i686.rpm +0 -0
- data/spec/functional/assets/yumrepo/chef_rpm-1.2-1.fc24.src.rpm +0 -0
- data/spec/functional/assets/yumrepo/chef_rpm-1.2-1.fc24.x86_64.rpm +0 -0
- data/spec/functional/assets/yumrepo/repodata/313329137b55fd333b2dc66394a6661a2befa6cc535d8460d92a4a78a9c581f0-primary.sqlite.bz2 +0 -0
- data/spec/functional/assets/yumrepo/repodata/31ac4db5d5ac593728fcc26aef82b7b93c4cc4dbec843786b1845b939b658553-other.xml.gz +0 -0
- data/spec/functional/assets/yumrepo/repodata/4ac40fa3c6728c1401318e2e20a997436624e83dcf7a5f952b851ef422637773-filelists.sqlite.bz2 +0 -0
- data/spec/functional/assets/yumrepo/repodata/66391e53f0510b98b3f0b79f40ba1048026d9a1ef20905d9c40ba6f5411f3243-primary.xml.gz +0 -0
- data/spec/functional/assets/yumrepo/repodata/8b34697595fcc87928e12d24644dda9462c3857bd932861e28bc77ae1f31be16-filelists.xml.gz +0 -0
- data/spec/functional/assets/yumrepo/repodata/b97cca3fe14bcf06c52be4449b6108f7731239ff221111dcce8aada5467f60dc-other.sqlite.bz2 +0 -0
- data/spec/functional/resource/deploy_revision_spec.rb +0 -881
- data/spec/functional/resource/env_spec.rb +0 -192
- data/spec/functional/resource/user/useradd_spec.rb +0 -709
- data/spec/functional/rest_spec.rb +0 -95
- data/spec/unit/knife/core/custom_manifest_loader_spec.rb +0 -41
- data/spec/unit/knife/index_rebuild_spec.rb +0 -125
- data/spec/unit/knife/knife_help.rb +0 -92
- data/spec/unit/lib_backcompat_spec.rb +0 -34
- data/spec/unit/mixin/command_spec.rb +0 -107
- data/spec/unit/platform_spec.rb +0 -269
- data/spec/unit/provider/breakpoint_spec.rb +0 -53
- data/spec/unit/provider/deploy/revision_spec.rb +0 -110
- data/spec/unit/provider/deploy/timestamped_spec.rb +0 -40
- data/spec/unit/provider/deploy_spec.rb +0 -641
- data/spec/unit/provider/env/windows_spec.rb +0 -103
- data/spec/unit/provider/erl_call_spec.rb +0 -85
- data/spec/unit/provider/package/easy_install_spec.rb +0 -114
- data/spec/unit/provider/package/yum_spec.rb +0 -2294
- data/spec/unit/resource/deploy_spec.rb +0 -283
- data/spec/unit/resource/easy_install_package_spec.rb +0 -39
- data/spec/unit/resource/env_spec.rb +0 -85
- data/spec/unit/resource/erl_call_spec.rb +0 -81
- data/spec/unit/rest/auth_credentials_spec.rb +0 -292
- data/spec/unit/rest_spec.rb +0 -753
- data/spec/unit/shell_out_spec.rb +0 -18
- data/tasks/bin/bundle-platform +0 -20
- data/tasks/bin/bundle-platform.bat +0 -2
- data/tasks/bin/bundler_patch.rb +0 -27
- data/tasks/bin/create-override-gemfile +0 -110
- data/tasks/bin/gem-version-diff +0 -37
- data/tasks/bundle.rb +0 -97
- data/tasks/bundle_util.rb +0 -110
- data/tasks/cbgb.rb +0 -84
- data/tasks/changelog.rb +0 -33
- data/tasks/gemfile_util.rb +0 -390
Binary file
|
@@ -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
|
Binary file
|
@@ -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
|