chef 12.0.3 → 12.1.0.rc.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CONTRIBUTING.md +4 -1
- data/README.md +42 -18
- data/distro/common/html/_sources/ctl_chef_client.txt +1 -1
- data/distro/common/html/_sources/ctl_chef_server.txt +53 -35
- data/distro/common/html/_sources/ctl_chef_solo.txt +1 -1
- data/distro/common/html/_sources/knife_bootstrap.txt +1 -1
- data/distro/common/html/_sources/knife_cookbook_site.txt +1 -1
- data/distro/common/html/_sources/knife_data_bag.txt +4 -4
- data/distro/common/html/_sources/knife_status.txt +1 -1
- data/distro/common/html/_static/searchtools.js +1 -1
- data/distro/common/html/ctl_chef_client.html +55 -7
- data/distro/common/html/ctl_chef_server.html +84 -41
- data/distro/common/html/ctl_chef_shell.html +45 -1
- data/distro/common/html/ctl_chef_solo.html +51 -5
- data/distro/common/html/index.html +2 -2
- data/distro/common/html/knife.html +1 -1
- data/distro/common/html/knife_bootstrap.html +30 -10
- data/distro/common/html/knife_cookbook_site.html +2 -0
- data/distro/common/html/knife_data_bag.html +4 -4
- data/distro/common/html/knife_node.html +2 -2
- data/distro/common/html/knife_raw.html +1 -1
- data/distro/common/html/knife_role.html +1 -1
- data/distro/common/html/knife_search.html +3 -3
- data/distro/common/html/knife_status.html +4 -0
- data/distro/common/html/searchindex.js +1 -1
- data/distro/common/man/man1/chef-shell.1 +72 -1
- data/distro/common/man/man1/knife-bootstrap.1 +71 -63
- data/distro/common/man/man1/knife-client.1 +1 -1
- data/distro/common/man/man1/knife-configure.1 +1 -1
- data/distro/common/man/man1/knife-cookbook-site.1 +4 -1
- data/distro/common/man/man1/knife-cookbook.1 +1 -1
- data/distro/common/man/man1/knife-data-bag.1 +5 -5
- data/distro/common/man/man1/knife-delete.1 +1 -1
- data/distro/common/man/man1/knife-deps.1 +1 -1
- data/distro/common/man/man1/knife-diff.1 +1 -1
- data/distro/common/man/man1/knife-download.1 +1 -1
- data/distro/common/man/man1/knife-edit.1 +1 -1
- data/distro/common/man/man1/knife-environment.1 +1 -1
- data/distro/common/man/man1/knife-exec.1 +1 -1
- data/distro/common/man/man1/knife-index-rebuild.1 +1 -1
- data/distro/common/man/man1/knife-list.1 +1 -1
- data/distro/common/man/man1/knife-node.1 +3 -3
- data/distro/common/man/man1/knife-raw.1 +2 -2
- data/distro/common/man/man1/knife-recipe-list.1 +1 -1
- data/distro/common/man/man1/knife-role.1 +2 -2
- data/distro/common/man/man1/knife-search.1 +4 -4
- data/distro/common/man/man1/knife-serve.1 +1 -1
- data/distro/common/man/man1/knife-show.1 +1 -1
- data/distro/common/man/man1/knife-ssh.1 +1 -1
- data/distro/common/man/man1/knife-ssl-check.1 +1 -1
- data/distro/common/man/man1/knife-ssl-fetch.1 +1 -1
- data/distro/common/man/man1/knife-status.1 +1 -1
- data/distro/common/man/man1/knife-tag.1 +1 -1
- data/distro/common/man/man1/knife-upload.1 +1 -1
- data/distro/common/man/man1/knife-user.1 +1 -1
- data/distro/common/man/man1/knife-xargs.1 +1 -1
- data/distro/common/man/man1/knife.1 +1 -1
- data/distro/common/man/man8/chef-apply.8 +86 -0
- data/distro/common/man/man8/chef-client.8 +76 -5
- data/distro/common/man/man8/chef-solo.8 +79 -6
- data/distro/common/markdown/man1/knife-bootstrap.mkd +1 -1
- data/distro/common/markdown/man1/knife-cookbook-site.mkd +1 -1
- data/distro/common/markdown/man1/knife-data-bag.mkd +1 -1
- data/distro/common/markdown/man1/knife-environment.mkd +1 -1
- data/distro/common/markdown/man1/knife.mkd +1 -1
- data/lib/chef.rb +0 -7
- data/lib/chef/api_client.rb +10 -2
- data/lib/chef/api_client/registration.rb +7 -9
- data/lib/chef/application.rb +28 -12
- data/lib/chef/application/apply.rb +17 -1
- data/lib/chef/application/client.rb +74 -6
- data/lib/chef/application/knife.rb +1 -2
- data/lib/chef/application/solo.rb +30 -0
- data/lib/chef/application/windows_service.rb +1 -0
- data/lib/chef/application/windows_service_manager.rb +8 -2
- data/lib/chef/applications.rb +0 -1
- data/lib/chef/audit/audit_event_proxy.rb +93 -0
- data/lib/chef/audit/audit_reporter.rb +169 -0
- data/lib/chef/audit/control_group_data.rb +140 -0
- data/lib/chef/audit/rspec_formatter.rb +37 -0
- data/lib/chef/audit/runner.rb +178 -0
- data/lib/chef/chef_fs/chef_fs_data_store.rb +11 -2
- data/lib/chef/chef_fs/config.rb +25 -4
- data/lib/chef/chef_fs/data_handler/policy_data_handler.rb +15 -0
- data/lib/chef/chef_fs/data_handler/user_data_handler.rb +1 -0
- data/lib/chef/chef_fs/file_system.rb +1 -1
- data/lib/chef/chef_fs/file_system/base_fs_dir.rb +5 -0
- data/lib/chef/chef_fs/file_system/chef_repository_file_system_cookbook_entry.rb +3 -2
- data/lib/chef/{shef/ext.rb → chef_fs/file_system/chef_repository_file_system_policies_dir.rb} +22 -3
- data/lib/chef/chef_fs/file_system/chef_repository_file_system_root_dir.rb +4 -0
- data/lib/chef/client.rb +81 -52
- data/lib/chef/config.rb +35 -3
- data/lib/chef/cookbook/metadata.rb +3 -3
- data/lib/chef/cookbook_manifest.rb +275 -0
- data/lib/chef/cookbook_site_streaming_uploader.rb +24 -23
- data/lib/chef/cookbook_uploader.rb +11 -2
- data/lib/chef/cookbook_version.rb +71 -194
- data/lib/chef/data_bag.rb +5 -2
- data/lib/chef/data_bag_item.rb +6 -3
- data/lib/chef/deprecation/warnings.rb +5 -4
- data/lib/chef/dsl/audit.rb +51 -0
- data/lib/chef/dsl/include_recipe.rb +2 -3
- data/lib/chef/dsl/reboot_pending.rb +1 -1
- data/lib/chef/dsl/recipe.rb +49 -31
- data/lib/chef/encrypted_data_bag_item/assertions.rb +0 -3
- data/lib/chef/environment.rb +5 -2
- data/lib/chef/event_dispatch/base.rb +36 -1
- data/lib/chef/event_dispatch/dispatcher.rb +3 -5
- data/lib/chef/exceptions.rb +61 -2
- data/lib/chef/file_access_control/unix.rb +12 -0
- data/lib/chef/file_access_control/windows.rb +14 -0
- data/lib/chef/formatters/doc.rb +47 -1
- data/{spec/unit/monkey_patches/string_spec.rb → lib/chef/guard_interpreter.rb} +11 -16
- data/lib/chef/guard_interpreter/resource_guard_interpreter.rb +3 -2
- data/lib/chef/http.rb +1 -2
- data/lib/chef/knife.rb +5 -3
- data/lib/chef/knife/bootstrap.rb +84 -15
- data/lib/chef/knife/bootstrap/chef_vault_handler.rb +165 -0
- data/lib/chef/knife/bootstrap/client_builder.rb +190 -0
- data/lib/chef/knife/bootstrap/{README.md → templates/README.md} +0 -0
- data/lib/chef/knife/bootstrap/{archlinux-gems.erb → templates/archlinux-gems.erb} +9 -0
- data/lib/chef/knife/bootstrap/{chef-aix.erb → templates/chef-aix.erb} +9 -0
- data/lib/chef/knife/bootstrap/{chef-full.erb → templates/chef-full.erb} +10 -1
- data/lib/chef/knife/client_create.rb +8 -7
- data/lib/chef/knife/cookbook_site_download.rb +1 -1
- data/lib/chef/knife/cookbook_site_install.rb +1 -1
- data/lib/chef/knife/cookbook_site_list.rb +1 -1
- data/lib/chef/knife/cookbook_site_search.rb +1 -1
- data/lib/chef/knife/cookbook_site_share.rb +39 -28
- data/lib/chef/knife/cookbook_site_show.rb +3 -3
- data/lib/chef/knife/cookbook_site_unshare.rb +1 -1
- data/lib/chef/knife/cookbook_test.rb +1 -0
- data/lib/chef/knife/cookbook_upload.rb +13 -8
- data/lib/chef/knife/core/bootstrap_context.rb +14 -3
- data/lib/chef/knife/core/generic_presenter.rb +5 -2
- data/lib/chef/knife/core/object_loader.rb +1 -1
- data/lib/chef/knife/core/subcommand_loader.rb +24 -0
- data/lib/chef/knife/core/ui.rb +9 -1
- data/lib/chef/knife/node_run_list_remove.rb +11 -3
- data/lib/chef/knife/raw.rb +14 -3
- data/lib/chef/knife/role_env_run_list_add.rb +86 -0
- data/lib/chef/knife/role_env_run_list_clear.rb +55 -0
- data/lib/chef/knife/role_env_run_list_remove.rb +57 -0
- data/lib/chef/knife/role_env_run_list_replace.rb +59 -0
- data/lib/chef/knife/role_env_run_list_set.rb +70 -0
- data/lib/chef/knife/role_run_list_add.rb +86 -0
- data/lib/chef/knife/role_run_list_clear.rb +55 -0
- data/lib/chef/knife/role_run_list_remove.rb +57 -0
- data/lib/chef/knife/role_run_list_replace.rb +59 -0
- data/lib/chef/knife/role_run_list_set.rb +70 -0
- data/lib/chef/knife/search.rb +4 -4
- data/lib/chef/knife/serve.rb +3 -0
- data/lib/chef/knife/ssh.rb +1 -1
- data/lib/chef/knife/ssl_check.rb +2 -2
- data/lib/chef/knife/ssl_fetch.rb +14 -1
- data/lib/chef/log.rb +10 -1
- data/lib/chef/mixin/command.rb +1 -1
- data/lib/chef/mixin/command/windows.rb +1 -5
- data/lib/chef/mixin/get_source_from_package.rb +1 -0
- data/lib/chef/mixin/params_validate.rb +2 -2
- data/lib/chef/mixin/securable.rb +1 -7
- data/lib/chef/mixin/shell_out.rb +7 -1
- data/lib/chef/mixin/template.rb +2 -14
- data/lib/chef/mixin/why_run.rb +1 -1
- data/lib/chef/monkey_patches/net_http.rb +4 -0
- data/lib/chef/monologger.rb +0 -2
- data/lib/chef/node.rb +5 -2
- data/lib/chef/node/attribute.rb +11 -9
- data/lib/chef/node/attribute_collections.rb +8 -12
- data/lib/chef/node/immutable_collections.rb +4 -10
- data/lib/chef/org.rb +148 -0
- data/lib/chef/platform/provider_mapping.rb +3 -2
- data/lib/chef/platform/provider_priority_map.rb +2 -0
- data/lib/chef/platform/query_helpers.rb +0 -3
- data/lib/chef/policy_builder/policyfile.rb +51 -8
- data/lib/chef/provider/deploy.rb +1 -2
- data/lib/chef/provider/directory.rb +3 -3
- data/lib/chef/provider/dsc_script.rb +13 -7
- data/lib/chef/provider/env.rb +8 -8
- data/lib/chef/provider/execute.rb +55 -36
- data/lib/chef/provider/file.rb +8 -0
- data/lib/chef/provider/group.rb +2 -0
- data/lib/chef/provider/group/dscl.rb +3 -4
- data/lib/chef/provider/ifconfig.rb +25 -25
- data/lib/chef/provider/ifconfig/aix.rb +25 -27
- data/lib/chef/provider/lwrp_base.rb +1 -1
- data/lib/chef/provider/mount.rb +2 -2
- data/lib/chef/provider/mount/mount.rb +3 -4
- data/lib/chef/provider/mount/solaris.rb +1 -1
- data/lib/chef/provider/package.rb +297 -48
- data/lib/chef/provider/package/aix.rb +25 -30
- data/lib/chef/provider/package/apt.rb +63 -19
- data/lib/chef/provider/package/dpkg.rb +15 -16
- data/lib/chef/provider/package/macports.rb +7 -7
- data/lib/chef/provider/package/openbsd.rb +107 -0
- data/lib/chef/provider/package/pacman.rb +13 -15
- data/lib/chef/provider/package/portage.rb +3 -4
- data/lib/chef/provider/package/rpm.rb +28 -17
- data/lib/chef/provider/package/rubygems.rb +9 -9
- data/lib/chef/provider/package/solaris.rb +17 -21
- data/lib/chef/provider/package/windows/msi.rb +1 -1
- data/lib/chef/provider/package/yum-dump.py +2 -2
- data/lib/chef/provider/package/yum.rb +117 -51
- data/lib/chef/provider/package/zypper.rb +17 -18
- data/lib/chef/provider/powershell_script.rb +4 -4
- data/lib/chef/provider/registry_key.rb +2 -2
- data/lib/chef/provider/remote_directory.rb +1 -1
- data/lib/chef/provider/script.rb +25 -16
- data/lib/chef/provider/service.rb +1 -1
- data/lib/chef/provider/service/freebsd.rb +1 -1
- data/lib/chef/provider/service/openbsd.rb +216 -0
- data/lib/chef/provider/service/upstart.rb +1 -1
- data/lib/chef/provider/service/windows.rb +99 -1
- data/lib/chef/provider/user.rb +1 -1
- data/lib/chef/provider/user/dscl.rb +19 -4
- data/lib/chef/providers.rb +2 -0
- data/lib/chef/recipe.rb +11 -5
- data/lib/chef/request_id.rb +1 -1
- data/lib/chef/resource.rb +839 -444
- data/lib/chef/resource/chef_gem.rb +20 -3
- data/lib/chef/resource/conditional.rb +3 -14
- data/lib/chef/resource/dsc_script.rb +14 -0
- data/lib/chef/resource/execute.rb +14 -7
- data/lib/chef/resource/file.rb +14 -0
- data/lib/chef/resource/file/verification.rb +122 -0
- data/lib/chef/resource/ips_package.rb +1 -1
- data/lib/chef/resource/lwrp_base.rb +2 -11
- data/lib/chef/resource/macports_package.rb +2 -1
- data/lib/chef/resource/openbsd_package.rb +51 -0
- data/lib/chef/resource/package.rb +2 -2
- data/lib/chef/resource/paludis_package.rb +1 -1
- data/lib/chef/resource/reboot.rb +1 -1
- data/lib/chef/resource/remote_file.rb +1 -0
- data/lib/chef/resource/rpm_package.rb +9 -0
- data/lib/chef/resource/script.rb +11 -0
- data/lib/chef/resource/template.rb +2 -3
- data/lib/chef/resource/windows_package.rb +1 -1
- data/lib/chef/resource/windows_service.rb +18 -0
- data/lib/chef/resource_builder.rb +137 -0
- data/lib/chef/resource_definition.rb +1 -1
- data/lib/chef/resource_reporter.rb +1 -1
- data/lib/chef/resources.rb +1 -0
- data/lib/chef/role.rb +17 -4
- data/lib/chef/run_context.rb +10 -6
- data/lib/chef/search/query.rb +66 -87
- data/lib/chef/shell/ext.rb +2 -2
- data/lib/chef/util/diff.rb +1 -4
- data/lib/chef/util/dsc/configuration_generator.rb +30 -6
- data/lib/chef/util/dsc/lcm_output_parser.rb +7 -3
- data/lib/chef/util/dsc/local_configuration_manager.rb +8 -8
- data/lib/chef/util/file_edit.rb +2 -2
- data/lib/chef/util/path_helper.rb +1 -4
- data/lib/chef/util/windows/net_use.rb +3 -3
- data/lib/chef/version.rb +1 -1
- data/lib/chef/win32/api.rb +1 -0
- data/lib/chef/win32/api/security.rb +26 -0
- data/lib/chef/win32/file.rb +21 -0
- data/lib/chef/win32/security.rb +46 -0
- data/lib/chef/win32/security/token.rb +8 -0
- data/lib/chef/win32/version.rb +0 -4
- data/spec/data/recipes.tgz +0 -0
- data/spec/functional/application_spec.rb +1 -1
- data/spec/functional/audit/rspec_formatter_spec.rb +54 -0
- data/spec/functional/audit/runner_spec.rb +137 -0
- data/spec/functional/dsl/reboot_pending_spec.rb +10 -10
- data/spec/functional/dsl/registry_helper_spec.rb +6 -6
- data/spec/functional/event_loggers/windows_eventlog_spec.rb +5 -5
- data/spec/functional/file_content_management/deploy_strategies_spec.rb +12 -21
- data/spec/functional/http/simple_spec.rb +1 -1
- data/spec/functional/knife/cookbook_delete_spec.rb +24 -24
- data/spec/functional/knife/exec_spec.rb +2 -4
- data/spec/functional/knife/smoke_test.rb +1 -1
- data/spec/functional/knife/ssh_spec.rb +23 -23
- data/spec/functional/provider/remote_file/cache_control_data_spec.rb +8 -8
- data/spec/functional/provider/whyrun_safe_ruby_block_spec.rb +2 -2
- data/spec/functional/rebooter_spec.rb +1 -1
- data/spec/functional/resource/aix_service_spec.rb +3 -0
- data/spec/functional/resource/aixinit_service_spec.rb +3 -3
- data/spec/functional/resource/bash_spec.rb +88 -0
- data/spec/functional/resource/deploy_revision_spec.rb +99 -100
- data/spec/functional/resource/env_spec.rb +3 -3
- data/spec/functional/resource/execute_spec.rb +97 -63
- data/spec/functional/resource/file_spec.rb +7 -7
- data/spec/functional/resource/git_spec.rb +13 -13
- data/spec/functional/resource/group_spec.rb +28 -25
- data/spec/functional/resource/ifconfig_spec.rb +2 -2
- data/spec/functional/resource/link_spec.rb +77 -78
- data/spec/functional/resource/mount_spec.rb +5 -5
- data/spec/functional/resource/ohai_spec.rb +1 -1
- data/spec/functional/resource/package_spec.rb +22 -22
- data/spec/functional/resource/powershell_spec.rb +57 -42
- data/spec/functional/resource/reboot_spec.rb +2 -2
- data/spec/functional/resource/registry_spec.rb +91 -91
- data/spec/functional/resource/remote_directory_spec.rb +19 -19
- data/spec/functional/resource/remote_file_spec.rb +18 -18
- data/spec/functional/resource/template_spec.rb +4 -4
- data/spec/functional/resource/user/dscl_spec.rb +4 -4
- data/spec/functional/resource/user/useradd_spec.rb +64 -51
- data/spec/functional/resource/windows_service_spec.rb +98 -0
- data/spec/functional/run_lock_spec.rb +9 -9
- data/spec/functional/shell_spec.rb +3 -3
- data/spec/functional/tiny_server_spec.rb +12 -12
- data/spec/functional/util/path_helper_spec.rb +1 -1
- data/spec/functional/version_spec.rb +1 -1
- data/spec/functional/win32/registry_helper_spec.rb +125 -125
- data/spec/functional/win32/security_spec.rb +65 -2
- data/spec/functional/win32/service_manager_spec.rb +30 -84
- data/spec/functional/win32/versions_spec.rb +6 -6
- data/spec/integration/client/client_spec.rb +102 -9
- data/spec/integration/knife/chef_fs_data_store_spec.rb +12 -8
- data/spec/integration/knife/common_options_spec.rb +3 -3
- data/spec/integration/knife/cookbook_api_ipv6_spec.rb +2 -2
- data/spec/integration/knife/deps_spec.rb +4 -4
- data/spec/integration/knife/diff_spec.rb +6 -6
- data/spec/integration/knife/download_spec.rb +6 -6
- data/spec/integration/knife/list_spec.rb +2 -2
- data/spec/integration/knife/raw_spec.rb +5 -5
- data/spec/integration/knife/serve_spec.rb +3 -3
- data/spec/integration/knife/show_spec.rb +3 -3
- data/spec/integration/knife/upload_spec.rb +18 -18
- data/spec/integration/recipes/lwrp_inline_resources_spec.rb +1 -1
- data/spec/integration/solo/solo_spec.rb +11 -12
- data/spec/spec_helper.rb +27 -15
- data/spec/stress/win32/file_spec.rb +4 -4
- data/spec/stress/win32/security_spec.rb +4 -4
- data/spec/support/chef_helpers.rb +3 -3
- data/spec/support/matchers/leak.rb +2 -2
- data/spec/support/mock/platform.rb +1 -1
- data/spec/support/pedant/Gemfile +3 -0
- data/spec/support/pedant/pedant_config.rb +9 -2
- data/spec/support/pedant/run_pedant.rb +15 -16
- data/spec/support/platform_helpers.rb +8 -12
- data/spec/support/shared/functional/directory_resource.rb +13 -13
- data/spec/support/shared/functional/file_resource.rb +83 -83
- data/spec/support/shared/functional/http.rb +1 -1
- data/spec/support/shared/functional/securable_resource.rb +64 -64
- data/spec/support/shared/functional/securable_resource_with_reporting.rb +43 -41
- data/spec/support/shared/functional/win32_service.rb +60 -0
- data/spec/support/shared/functional/windows_script.rb +8 -8
- data/spec/support/shared/integration/knife_support.rb +8 -5
- data/spec/support/shared/matchers/exit_with_code.rb +6 -2
- data/spec/support/shared/unit/api_error_inspector.rb +8 -8
- data/spec/support/shared/unit/execute_resource.rb +24 -20
- data/spec/support/shared/unit/file_system_support.rb +2 -2
- data/spec/support/shared/unit/platform_introspector.rb +21 -21
- data/spec/support/shared/unit/provider/file.rb +239 -210
- data/spec/support/shared/unit/provider/useradd_based_user_provider.rb +69 -69
- data/spec/support/shared/unit/script_resource.rb +40 -32
- data/spec/support/shared/unit/windows_script_resource.rb +8 -8
- data/spec/unit/api_client/registration_spec.rb +47 -47
- data/spec/unit/api_client_spec.rb +107 -69
- data/spec/unit/application/apply_spec.rb +31 -15
- data/spec/unit/application/client_spec.rb +146 -45
- data/spec/unit/application/knife_spec.rb +31 -31
- data/spec/unit/application/solo_spec.rb +59 -43
- data/spec/unit/application_spec.rb +109 -74
- data/spec/unit/audit/audit_event_proxy_spec.rb +311 -0
- data/spec/unit/audit/audit_reporter_spec.rb +393 -0
- data/spec/unit/audit/control_group_data_spec.rb +478 -0
- data/{lib/chef/monkey_patches/file.rb → spec/unit/audit/rspec_formatter_spec.rb} +11 -8
- data/spec/unit/audit/runner_spec.rb +135 -0
- data/spec/unit/chef_fs/config_spec.rb +52 -0
- data/spec/unit/chef_fs/diff_spec.rb +12 -12
- data/spec/unit/chef_fs/file_pattern_spec.rb +276 -277
- data/spec/unit/chef_fs/file_system/operation_failed_error_spec.rb +6 -6
- data/spec/unit/chef_fs/file_system_spec.rb +26 -13
- data/spec/unit/chef_fs/parallelizer.rb +87 -87
- data/spec/unit/chef_spec.rb +1 -1
- data/spec/unit/client_spec.rb +263 -97
- data/spec/unit/config_fetcher_spec.rb +13 -13
- data/spec/unit/config_spec.rb +105 -66
- data/spec/unit/cookbook/chefignore_spec.rb +6 -6
- data/spec/unit/cookbook/cookbook_version_loader_spec.rb +3 -3
- data/spec/unit/cookbook/metadata_spec.rb +149 -149
- data/spec/unit/cookbook/syntax_check_spec.rb +36 -31
- data/spec/unit/cookbook_loader_spec.rb +62 -58
- data/spec/unit/cookbook_manifest_spec.rb +141 -468
- data/spec/unit/cookbook_site_streaming_uploader_spec.rb +27 -27
- data/spec/unit/cookbook_spec.rb +15 -15
- data/spec/unit/cookbook_uploader_spec.rb +37 -3
- data/spec/unit/cookbook_version_file_specificity_spec.rb +554 -0
- data/spec/unit/cookbook_version_spec.rb +98 -240
- data/spec/unit/daemon_spec.rb +31 -31
- data/spec/unit/data_bag_item_spec.rb +121 -89
- data/spec/unit/data_bag_spec.rb +35 -35
- data/spec/unit/deprecation_spec.rb +27 -14
- data/spec/unit/digester_spec.rb +3 -3
- data/spec/unit/dsl/audit_spec.rb +43 -0
- data/spec/unit/dsl/data_query_spec.rb +1 -1
- data/spec/unit/dsl/platform_introspection_spec.rb +14 -14
- data/spec/unit/dsl/reboot_pending_spec.rb +18 -18
- data/spec/unit/dsl/regsitry_helper_spec.rb +6 -6
- data/spec/unit/encrypted_data_bag_item_spec.rb +58 -82
- data/spec/unit/environment_spec.rb +105 -105
- data/spec/unit/exceptions_spec.rb +47 -1
- data/spec/unit/file_access_control_spec.rb +62 -56
- data/spec/unit/file_cache_spec.rb +11 -11
- data/spec/unit/file_content_management/deploy/cp_spec.rb +2 -2
- data/spec/unit/file_content_management/deploy/mv_unix_spec.rb +10 -10
- data/spec/unit/file_content_management/deploy/mv_windows_spec.rb +23 -23
- data/spec/unit/formatters/error_inspectors/compile_error_inspector_spec.rb +14 -14
- data/spec/unit/formatters/error_inspectors/cookbook_resolve_error_inspector_spec.rb +12 -12
- data/spec/unit/formatters/error_inspectors/cookbook_sync_error_inspector_spec.rb +1 -1
- data/spec/unit/formatters/error_inspectors/resource_failure_inspector_spec.rb +16 -16
- data/spec/unit/formatters/error_inspectors/run_list_expansion_error_inspector_spec.rb +4 -4
- data/spec/unit/guard_interpreter/resource_guard_interpreter_spec.rb +103 -13
- data/spec/unit/guard_interpreter_spec.rb +41 -0
- data/spec/unit/handler/json_file_spec.rb +10 -10
- data/spec/unit/handler_spec.rb +39 -39
- data/spec/unit/http/basic_client_spec.rb +3 -3
- data/spec/unit/http/http_request_spec.rb +10 -10
- data/spec/unit/http/simple_spec.rb +3 -3
- data/spec/unit/http/ssl_policies_spec.rb +15 -15
- data/spec/unit/http/validate_content_length_spec.rb +18 -13
- data/spec/unit/http_spec.rb +16 -9
- data/spec/unit/knife/bootstrap/chef_vault_handler_spec.rb +153 -0
- data/spec/unit/knife/bootstrap/client_builder_spec.rb +178 -0
- data/spec/unit/knife/bootstrap_spec.rb +144 -91
- data/spec/unit/knife/client_bulk_delete_spec.rb +24 -24
- data/spec/unit/knife/client_create_spec.rb +57 -43
- data/spec/unit/knife/client_delete_spec.rb +15 -15
- data/spec/unit/knife/client_edit_spec.rb +4 -4
- data/spec/unit/knife/client_list_spec.rb +2 -2
- data/spec/unit/knife/client_reregister_spec.rb +9 -9
- data/spec/unit/knife/configure_client_spec.rb +20 -20
- data/spec/unit/knife/configure_spec.rb +85 -85
- data/spec/unit/knife/cookbook_bulk_delete_spec.rb +15 -15
- data/spec/unit/knife/cookbook_create_spec.rb +59 -59
- data/spec/unit/knife/cookbook_delete_spec.rb +49 -49
- data/spec/unit/knife/cookbook_download_spec.rb +56 -56
- data/spec/unit/knife/cookbook_list_spec.rb +9 -9
- data/spec/unit/knife/cookbook_metadata_from_file_spec.rb +8 -8
- data/spec/unit/knife/cookbook_metadata_spec.rb +44 -44
- data/spec/unit/knife/cookbook_show_spec.rb +29 -29
- data/spec/unit/knife/cookbook_site_download_spec.rb +26 -26
- data/spec/unit/knife/cookbook_site_install_spec.rb +5 -1
- data/spec/unit/knife/cookbook_site_share_spec.rb +68 -59
- data/spec/unit/knife/cookbook_site_unshare_spec.rb +15 -15
- data/spec/unit/knife/cookbook_test_spec.rb +16 -16
- data/spec/unit/knife/cookbook_upload_spec.rb +105 -71
- data/spec/unit/knife/core/bootstrap_context_spec.rb +37 -22
- data/spec/unit/knife/core/cookbook_scm_repo_spec.rb +36 -36
- data/spec/unit/knife/core/object_loader_spec.rb +3 -3
- data/spec/unit/knife/core/subcommand_loader_spec.rb +107 -33
- data/spec/unit/knife/core/ui_spec.rb +84 -72
- data/spec/unit/knife/data_bag_from_file_spec.rb +1 -1
- data/spec/unit/knife/environment_compare_spec.rb +12 -12
- data/spec/unit/knife/environment_create_spec.rb +16 -16
- data/spec/unit/knife/environment_delete_spec.rb +14 -14
- data/spec/unit/knife/environment_edit_spec.rb +15 -15
- data/spec/unit/knife/environment_from_file_spec.rb +17 -17
- data/spec/unit/knife/environment_list_spec.rb +7 -7
- data/spec/unit/knife/environment_show_spec.rb +10 -10
- data/spec/unit/knife/index_rebuild_spec.rb +17 -17
- data/spec/unit/knife/knife_help.rb +24 -24
- data/spec/unit/knife/node_bulk_delete_spec.rb +14 -14
- data/spec/unit/knife/node_delete_spec.rb +11 -11
- data/spec/unit/knife/node_edit_spec.rb +17 -17
- data/spec/unit/knife/node_environment_set_spec.rb +12 -12
- data/spec/unit/knife/node_from_file_spec.rb +8 -8
- data/spec/unit/knife/node_list_spec.rb +9 -9
- data/spec/unit/knife/node_run_list_add_spec.rb +29 -29
- data/spec/unit/knife/node_run_list_remove_spec.rb +28 -13
- data/spec/unit/knife/node_run_list_set_spec.rb +27 -27
- data/spec/unit/knife/raw_spec.rb +43 -0
- data/spec/unit/knife/role_bulk_delete_spec.rb +12 -12
- data/spec/unit/knife/role_create_spec.rb +12 -12
- data/spec/unit/knife/role_delete_spec.rb +10 -10
- data/spec/unit/knife/role_edit_spec.rb +13 -13
- data/spec/unit/knife/role_env_run_list_add_spec.rb +217 -0
- data/spec/unit/knife/role_env_run_list_clear_spec.rb +100 -0
- data/spec/unit/knife/role_env_run_list_remove_spec.rb +108 -0
- data/spec/unit/knife/role_env_run_list_replace_spec.rb +108 -0
- data/spec/unit/knife/role_env_run_list_set_spec.rb +102 -0
- data/spec/unit/knife/role_from_file_spec.rb +10 -10
- data/spec/unit/knife/role_list_spec.rb +7 -7
- data/spec/unit/knife/role_run_list_add_spec.rb +179 -0
- data/spec/unit/knife/role_run_list_clear_spec.rb +90 -0
- data/spec/unit/knife/role_run_list_remove_spec.rb +98 -0
- data/spec/unit/knife/role_run_list_replace_spec.rb +101 -0
- data/spec/unit/knife/role_run_list_set_spec.rb +92 -0
- data/spec/unit/knife/ssh_spec.rb +66 -66
- data/spec/unit/knife/ssl_check_spec.rb +27 -27
- data/spec/unit/knife/ssl_fetch_spec.rb +45 -12
- data/spec/unit/knife/status_spec.rb +5 -5
- data/spec/unit/knife/tag_create_spec.rb +5 -5
- data/spec/unit/knife/tag_delete_spec.rb +6 -6
- data/spec/unit/knife/tag_list_spec.rb +4 -4
- data/spec/unit/knife/user_create_spec.rb +18 -18
- data/spec/unit/knife/user_delete_spec.rb +4 -4
- data/spec/unit/knife/user_edit_spec.rb +7 -7
- data/spec/unit/knife/user_list_spec.rb +2 -2
- data/spec/unit/knife/user_reregister_spec.rb +10 -10
- data/spec/unit/knife/user_show_spec.rb +5 -5
- data/spec/unit/knife_spec.rb +36 -36
- data/spec/unit/lwrp_spec.rb +63 -39
- data/spec/unit/mash_spec.rb +6 -6
- data/spec/unit/mixin/checksum_spec.rb +2 -2
- data/spec/unit/mixin/command_spec.rb +13 -13
- data/spec/unit/mixin/convert_to_class_name_spec.rb +6 -6
- data/spec/unit/mixin/deep_merge_spec.rb +49 -49
- data/spec/unit/mixin/deprecation_spec.rb +5 -5
- data/spec/unit/mixin/enforce_ownership_and_permissions_spec.rb +14 -14
- data/spec/unit/mixin/homebrew_user_spec.rb +3 -3
- data/spec/unit/mixin/params_validate_spec.rb +71 -71
- data/spec/unit/mixin/path_sanity_spec.rb +14 -14
- data/spec/unit/mixin/securable_spec.rb +177 -177
- data/spec/unit/mixin/shell_out_spec.rb +56 -27
- data/spec/unit/mixin/template_spec.rb +31 -31
- data/spec/unit/mixin/windows_architecture_helper_spec.rb +5 -5
- data/spec/unit/mixin/xml_escape_spec.rb +7 -7
- data/spec/unit/monkey_patches/uri_spec.rb +1 -1
- data/spec/unit/monologger_spec.rb +3 -3
- data/spec/unit/node/attribute_spec.rb +185 -136
- data/spec/unit/node/immutable_collections_spec.rb +22 -22
- data/spec/unit/node_spec.rb +210 -179
- data/spec/unit/org_spec.rb +196 -0
- data/spec/unit/platform/query_helpers_spec.rb +5 -5
- data/spec/unit/platform_spec.rb +46 -46
- data/spec/unit/policy_builder/expand_node_object_spec.rb +17 -18
- data/spec/unit/policy_builder/policyfile_spec.rb +159 -71
- data/spec/unit/provider/directory_spec.rb +5 -5
- data/spec/unit/provider/dsc_script_spec.rb +6 -6
- data/spec/unit/provider/env_spec.rb +27 -14
- data/spec/unit/provider/execute_spec.rb +139 -68
- data/spec/unit/provider/file/content_spec.rb +8 -8
- data/spec/unit/provider/git_spec.rb +10 -5
- data/spec/unit/provider/group/dscl_spec.rb +8 -11
- data/spec/unit/provider/group_spec.rb +13 -13
- data/spec/unit/provider/ifconfig/aix_spec.rb +3 -2
- data/spec/unit/provider/ifconfig/debian_spec.rb +19 -19
- data/spec/unit/provider/ifconfig_spec.rb +2 -2
- data/spec/unit/provider/mdadm_spec.rb +2 -2
- data/spec/unit/provider/mount/aix_spec.rb +5 -5
- data/spec/unit/provider/mount/mount_spec.rb +22 -22
- data/spec/unit/provider/mount/solaris_spec.rb +20 -20
- data/spec/unit/provider/package/aix_spec.rb +23 -22
- data/spec/unit/provider/package/apt_spec.rb +23 -4
- data/spec/unit/provider/package/dpkg_spec.rb +14 -15
- data/spec/unit/provider/package/freebsd/pkgng_spec.rb +1 -1
- data/spec/unit/provider/package/freebsd/port_spec.rb +1 -1
- data/spec/unit/provider/package/ips_spec.rb +1 -2
- data/spec/unit/provider/package/macports_spec.rb +14 -14
- data/spec/unit/provider/package/openbsd_spec.rb +66 -0
- data/spec/unit/provider/package/pacman_spec.rb +15 -14
- data/spec/unit/provider/package/portage_spec.rb +11 -11
- data/spec/unit/provider/package/rpm_spec.rb +132 -84
- data/spec/unit/provider/package/rubygems_spec.rb +54 -25
- data/spec/unit/provider/package/solaris_spec.rb +22 -25
- data/spec/unit/provider/package/yum_spec.rb +237 -36
- data/spec/unit/provider/package/zypper_spec.rb +9 -12
- data/spec/unit/provider/package_spec.rb +276 -2
- data/spec/unit/provider/package_spec.rbe +0 -0
- data/spec/unit/provider/remote_directory_spec.rb +25 -25
- data/spec/unit/provider/remote_file/ftp_spec.rb +3 -3
- data/spec/unit/provider/route_spec.rb +3 -3
- data/spec/unit/provider/script_spec.rb +61 -43
- data/spec/unit/provider/service/aix_service_spec.rb +5 -5
- data/spec/unit/provider/service/arch_service_spec.rb +5 -5
- data/spec/unit/provider/service/debian_service_spec.rb +8 -8
- data/spec/unit/provider/service/freebsd_service_spec.rb +16 -2
- data/spec/unit/provider/service/gentoo_service_spec.rb +8 -8
- data/spec/unit/provider/service/init_service_spec.rb +5 -5
- data/spec/unit/provider/service/insserv_service_spec.rb +2 -2
- data/spec/unit/provider/service/invokercd_service_spec.rb +5 -5
- data/spec/unit/provider/service/macosx_spec.rb +7 -7
- data/spec/unit/provider/service/openbsd_service_spec.rb +543 -0
- data/spec/unit/provider/service/redhat_spec.rb +4 -4
- data/spec/unit/provider/service/simple_service_spec.rb +2 -2
- data/spec/unit/provider/service/solaris_smf_service_spec.rb +14 -14
- data/spec/unit/provider/service/systemd_service_spec.rb +15 -7
- data/spec/unit/provider/service/upstart_service_spec.rb +4 -4
- data/spec/unit/provider/service/windows_spec.rb +119 -25
- data/spec/unit/provider/service_spec.rb +1 -1
- data/spec/unit/provider/user/dscl_spec.rb +38 -30
- data/spec/unit/provider/user_spec.rb +1 -1
- data/spec/unit/provider_resolver_spec.rb +7 -7
- data/spec/unit/provider_spec.rb +23 -23
- data/spec/unit/recipe_spec.rb +194 -83
- data/spec/unit/registry_helper_spec.rb +143 -143
- data/spec/unit/resource/chef_gem_spec.rb +117 -3
- data/spec/unit/resource/conditional_action_not_nothing_spec.rb +2 -2
- data/spec/unit/resource/conditional_spec.rb +56 -15
- data/spec/unit/resource/deploy_spec.rb +2 -2
- data/spec/unit/resource/dsc_script_spec.rb +32 -0
- data/spec/unit/resource/execute_spec.rb +4 -0
- data/spec/unit/resource/file/verification_spec.rb +111 -0
- data/spec/unit/resource/file_spec.rb +14 -0
- data/spec/unit/resource/openbsd_package_spec.rb +49 -0
- data/spec/unit/resource/remote_file_spec.rb +12 -12
- data/spec/unit/resource/resource_notification_spec.rb +18 -18
- data/spec/unit/resource/rpm_package_spec.rb +12 -0
- data/spec/unit/resource/scm_spec.rb +4 -4
- data/spec/unit/resource/script_spec.rb +3 -5
- data/spec/unit/resource/subversion_spec.rb +1 -1
- data/spec/unit/resource_builder_spec.rb +1 -0
- data/spec/unit/resource_collection/resource_list_spec.rb +2 -2
- data/spec/unit/resource_collection/resource_set_spec.rb +3 -3
- data/spec/unit/resource_collection/stepable_iterator_spec.rb +24 -24
- data/spec/unit/resource_collection_spec.rb +52 -52
- data/spec/unit/resource_definition_spec.rb +1 -1
- data/spec/unit/resource_reporter_spec.rb +118 -118
- data/spec/unit/resource_spec.rb +131 -125
- data/spec/unit/rest/auth_credentials_spec.rb +73 -73
- data/spec/unit/rest_spec.rb +12 -12
- data/spec/unit/role_spec.rb +85 -84
- data/spec/unit/run_context/cookbook_compiler_spec.rb +18 -18
- data/spec/unit/run_context_spec.rb +39 -68
- data/spec/unit/run_list/run_list_expansion_spec.rb +21 -21
- data/spec/unit/run_list/run_list_item_spec.rb +28 -28
- data/spec/unit/run_list/versioned_recipe_list_spec.rb +14 -14
- data/spec/unit/run_list_spec.rb +55 -55
- data/spec/unit/run_lock_spec.rb +14 -14
- data/spec/unit/run_status_spec.rb +24 -24
- data/spec/unit/scan_access_control_spec.rb +23 -23
- data/spec/unit/search/query_spec.rb +54 -66
- data/spec/unit/shell/model_wrapper_spec.rb +13 -13
- data/spec/unit/shell/shell_ext_spec.rb +32 -32
- data/spec/unit/shell/shell_session_spec.rb +24 -24
- data/spec/unit/shell_out_spec.rb +4 -4
- data/spec/unit/shell_spec.rb +27 -27
- data/spec/unit/user_spec.rb +50 -50
- data/spec/unit/util/backup_spec.rb +32 -32
- data/spec/unit/util/diff_spec.rb +31 -31
- data/spec/unit/util/dsc/configuration_generator_spec.rb +38 -16
- data/spec/unit/util/dsc/lcm_output_parser_spec.rb +21 -26
- data/spec/unit/util/dsc/local_configuration_manager_spec.rb +10 -10
- data/spec/unit/util/editor_spec.rb +10 -10
- data/spec/unit/util/file_edit_spec.rb +10 -10
- data/spec/unit/util/path_helper_spec.rb +38 -46
- data/spec/unit/util/powershell/cmdlet_spec.rb +9 -9
- data/spec/unit/util/selinux_spec.rb +30 -30
- data/spec/unit/util/threaded_job_queue_spec.rb +6 -6
- data/spec/unit/version/platform_spec.rb +5 -5
- data/spec/unit/version_class_spec.rb +15 -15
- data/spec/unit/version_constraint/platform_spec.rb +7 -7
- data/spec/unit/version_constraint_spec.rb +43 -43
- data/spec/unit/windows_service_spec.rb +15 -15
- data/spec/unit/workstation_config_loader_spec.rb +2 -2
- data/tasks/rspec.rb +16 -18
- metadata +126 -53
- data/bin/chef-service-manager +0 -37
- data/bin/chef-windows-service +0 -35
- data/bin/shef +0 -35
- data/lib/chef/application/agent.rb +0 -18
- data/lib/chef/monkey_patches/fileutils.rb +0 -65
- data/lib/chef/monkey_patches/numeric.rb +0 -15
- data/lib/chef/monkey_patches/object.rb +0 -9
- data/lib/chef/monkey_patches/pathname.rb +0 -32
- data/lib/chef/monkey_patches/regexp.rb +0 -34
- data/lib/chef/monkey_patches/securerandom.rb +0 -44
- data/lib/chef/monkey_patches/string.rb +0 -49
- data/lib/chef/monkey_patches/tempfile.rb +0 -64
- data/lib/chef/monkey_patches/uri.rb +0 -70
@@ -92,10 +92,9 @@ class Chef
|
|
92
92
|
def candidate_version
|
93
93
|
return @candidate_version if @candidate_version
|
94
94
|
|
95
|
-
status =
|
96
|
-
|
97
|
-
|
98
|
-
end
|
95
|
+
status = shell_out("emerge --color n --nospinner --search #{@new_resource.package_name.split('/').last}")
|
96
|
+
available, installed = parse_emerge(@new_resource.package_name, status.stdout)
|
97
|
+
@candidate_version = available
|
99
98
|
|
100
99
|
unless status.exitstatus == 0
|
101
100
|
raise Chef::Exceptions::Package, "emerge --search failed - #{status.inspect}!"
|
@@ -17,6 +17,7 @@
|
|
17
17
|
#
|
18
18
|
require 'chef/provider/package'
|
19
19
|
require 'chef/mixin/command'
|
20
|
+
require 'chef/mixin/shell_out'
|
20
21
|
require 'chef/resource/package'
|
21
22
|
require 'chef/mixin/get_source_from_package'
|
22
23
|
|
@@ -53,20 +54,18 @@ class Chef
|
|
53
54
|
@new_resource.version(nil)
|
54
55
|
|
55
56
|
if @new_resource.source
|
56
|
-
unless ::File.exists?(@new_resource.source)
|
57
|
+
unless uri_scheme?(@new_resource.source) || ::File.exists?(@new_resource.source)
|
57
58
|
@package_source_exists = false
|
58
59
|
return
|
59
60
|
end
|
60
61
|
|
61
62
|
Chef::Log.debug("#{@new_resource} checking rpm status")
|
62
|
-
|
63
|
-
|
64
|
-
|
65
|
-
|
66
|
-
|
67
|
-
|
68
|
-
@candidate_version = $2
|
69
|
-
end
|
63
|
+
shell_out!("rpm -qp --queryformat '%{NAME} %{VERSION}-%{RELEASE}\n' #{@new_resource.source}").stdout.each_line do |line|
|
64
|
+
case line
|
65
|
+
when /^([\w\d+_.-]+)\s([\w\d_.-]+)$/
|
66
|
+
@current_resource.package_name($1)
|
67
|
+
@new_resource.version($2)
|
68
|
+
@candidate_version = $2
|
70
69
|
end
|
71
70
|
end
|
72
71
|
else
|
@@ -77,13 +76,12 @@ class Chef
|
|
77
76
|
end
|
78
77
|
|
79
78
|
Chef::Log.debug("#{@new_resource} checking install state")
|
80
|
-
@rpm_status =
|
81
|
-
|
82
|
-
|
83
|
-
|
84
|
-
|
85
|
-
|
86
|
-
end
|
79
|
+
@rpm_status = shell_out("rpm -q --queryformat '%{NAME} %{VERSION}-%{RELEASE}\n' #{@current_resource.package_name}")
|
80
|
+
@rpm_status.stdout.each_line do |line|
|
81
|
+
case line
|
82
|
+
when /^([\w\d+_.-]+)\s([\w\d_.-]+)$/
|
83
|
+
Chef::Log.debug("#{@new_resource} current version is #{$2}")
|
84
|
+
@current_resource.version($2)
|
87
85
|
end
|
88
86
|
end
|
89
87
|
|
@@ -94,7 +92,11 @@ class Chef
|
|
94
92
|
unless @current_resource.version
|
95
93
|
shell_out!( "rpm #{@new_resource.options} -i #{@new_resource.source}" )
|
96
94
|
else
|
97
|
-
|
95
|
+
if allow_downgrade
|
96
|
+
shell_out!( "rpm #{@new_resource.options} -U --oldpackage #{@new_resource.source}" )
|
97
|
+
else
|
98
|
+
shell_out!( "rpm #{@new_resource.options} -U #{@new_resource.source}" )
|
99
|
+
end
|
98
100
|
end
|
99
101
|
end
|
100
102
|
|
@@ -108,6 +110,15 @@ class Chef
|
|
108
110
|
end
|
109
111
|
end
|
110
112
|
|
113
|
+
private
|
114
|
+
|
115
|
+
def uri_scheme?(str)
|
116
|
+
scheme = URI.split(str).first
|
117
|
+
return false unless scheme
|
118
|
+
%w(http https ftp file).include?(scheme.downcase)
|
119
|
+
rescue URI::InvalidURIError
|
120
|
+
return false
|
121
|
+
end
|
111
122
|
end
|
112
123
|
end
|
113
124
|
end
|
@@ -17,6 +17,7 @@
|
|
17
17
|
# limitations under the License.
|
18
18
|
#
|
19
19
|
|
20
|
+
require 'uri'
|
20
21
|
require 'chef/provider/package'
|
21
22
|
require 'chef/mixin/command'
|
22
23
|
require 'chef/resource/package'
|
@@ -130,7 +131,7 @@ class Chef
|
|
130
131
|
|
131
132
|
##
|
132
133
|
# Determines the candidate version for a gem from a .gem file on disk
|
133
|
-
# and checks if it matches the version
|
134
|
+
# and checks if it matches the version constraints in +gem_dependency+
|
134
135
|
# === Returns
|
135
136
|
# Gem::Version a singular gem version object is returned if the gem
|
136
137
|
# is available
|
@@ -483,7 +484,7 @@ class Chef
|
|
483
484
|
|
484
485
|
def candidate_version
|
485
486
|
@candidate_version ||= begin
|
486
|
-
if target_version_already_installed?
|
487
|
+
if target_version_already_installed?(@current_resource.version, @new_resource.version)
|
487
488
|
nil
|
488
489
|
elsif source_is_remote?
|
489
490
|
@gem_env.candidate_version_from_remote(gem_dependency, *gem_sources).to_s
|
@@ -493,12 +494,11 @@ class Chef
|
|
493
494
|
end
|
494
495
|
end
|
495
496
|
|
496
|
-
def target_version_already_installed?
|
497
|
-
return false unless
|
498
|
-
return false if
|
499
|
-
return false if @new_resource.version.nil?
|
497
|
+
def target_version_already_installed?(current_version, new_version)
|
498
|
+
return false unless current_version
|
499
|
+
return false if new_version.nil?
|
500
500
|
|
501
|
-
Gem::Requirement.new(
|
501
|
+
Gem::Requirement.new(new_version).satisfied_by?(Gem::Version.new(current_version))
|
502
502
|
end
|
503
503
|
|
504
504
|
##
|
@@ -534,9 +534,9 @@ class Chef
|
|
534
534
|
if @new_resource.source =~ /\.gem$/i
|
535
535
|
name = @new_resource.source
|
536
536
|
else
|
537
|
-
src = @new_resource.source && " --source=#{@new_resource.source} --source=
|
537
|
+
src = @new_resource.source && " --source=#{@new_resource.source} --source=https://rubygems.org"
|
538
538
|
end
|
539
|
-
if version
|
539
|
+
if !version.nil? && version.length > 0
|
540
540
|
shell_out!("#{gem_binary_path} install #{name} -q --no-rdoc --no-ri -v \"#{version}\"#{src}#{opts}", :env=>nil)
|
541
541
|
else
|
542
542
|
shell_out!("#{gem_binary_path} install \"#{name}\" -q --no-rdoc --no-ri #{src}#{opts}", :env=>nil)
|
@@ -55,25 +55,22 @@ class Chef
|
|
55
55
|
@package_source_found = ::File.exists?(@new_resource.source)
|
56
56
|
if @package_source_found
|
57
57
|
Chef::Log.debug("#{@new_resource} checking pkg status")
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
|
62
|
-
@new_resource.version($1)
|
63
|
-
end
|
58
|
+
shell_out("pkginfo -l -d #{@new_resource.source} #{@new_resource.package_name}").stdout.each_line do |line|
|
59
|
+
case line
|
60
|
+
when /VERSION:\s+(.+)/
|
61
|
+
@new_resource.version($1)
|
64
62
|
end
|
65
63
|
end
|
66
64
|
end
|
67
65
|
end
|
68
66
|
|
69
67
|
Chef::Log.debug("#{@new_resource} checking install state")
|
70
|
-
status =
|
71
|
-
|
72
|
-
|
73
|
-
|
74
|
-
|
75
|
-
|
76
|
-
end
|
68
|
+
status = shell_out("pkginfo -l #{@current_resource.package_name}")
|
69
|
+
status.stdout.each_line do |line|
|
70
|
+
case line
|
71
|
+
when /VERSION:\s+(.+)/
|
72
|
+
Chef::Log.debug("#{@new_resource} version #{$1} is already installed")
|
73
|
+
@current_resource.version($1)
|
77
74
|
end
|
78
75
|
end
|
79
76
|
|
@@ -90,14 +87,13 @@ class Chef
|
|
90
87
|
|
91
88
|
def candidate_version
|
92
89
|
return @candidate_version if @candidate_version
|
93
|
-
status =
|
94
|
-
|
95
|
-
|
96
|
-
|
97
|
-
|
98
|
-
|
99
|
-
|
100
|
-
end
|
90
|
+
status = shell_out("pkginfo -l -d #{@new_resource.source} #{new_resource.package_name}")
|
91
|
+
status.stdout.each_line do |line|
|
92
|
+
case line
|
93
|
+
when /VERSION:\s+(.+)/
|
94
|
+
@candidate_version = $1
|
95
|
+
@new_resource.version($1)
|
96
|
+
Chef::Log.debug("#{@new_resource} setting install candidate version to #{@candidate_version}")
|
101
97
|
end
|
102
98
|
end
|
103
99
|
unless status.exitstatus == 0
|
@@ -42,7 +42,7 @@ class Chef
|
|
42
42
|
def installed_version
|
43
43
|
Chef::Log.debug("#{@new_resource} getting product code for package at #{@new_resource.source}")
|
44
44
|
product_code = get_product_property(@new_resource.source, "ProductCode")
|
45
|
-
Chef::Log.debug("#{@new_resource} checking package status and
|
45
|
+
Chef::Log.debug("#{@new_resource} checking package status and version for #{product_code}")
|
46
46
|
get_installed_version(product_code)
|
47
47
|
end
|
48
48
|
|
@@ -23,7 +23,7 @@
|
|
23
23
|
# and dump the results to stdout.
|
24
24
|
#
|
25
25
|
# yum-dump invokes yum similarly to the command line interface which makes it
|
26
|
-
# subject to most of the configuration
|
26
|
+
# subject to most of the configuration parameters in yum.conf. yum-dump will
|
27
27
|
# also load yum plugins in the same manor as yum - these can affect the output.
|
28
28
|
#
|
29
29
|
# Can be run as non root, but that won't update the cache.
|
@@ -70,7 +70,7 @@ def setup(yb, options):
|
|
70
70
|
else:
|
71
71
|
yb.doConfigSetup(errorlevel=0, debuglevel=0)
|
72
72
|
except yum.Errors.ConfigError, e:
|
73
|
-
#
|
73
|
+
# suppresses an ignored exception at exit
|
74
74
|
yb.preconf = None
|
75
75
|
print >> sys.stderr, "yum-dump Config Error: %s" % e
|
76
76
|
return 1
|
@@ -18,7 +18,7 @@
|
|
18
18
|
|
19
19
|
require 'chef/config'
|
20
20
|
require 'chef/provider/package'
|
21
|
-
require 'chef/mixin/command'
|
21
|
+
require 'chef/mixin/command' # handle_command_failures
|
22
22
|
require 'chef/mixin/shell_out'
|
23
23
|
require 'chef/resource/package'
|
24
24
|
require 'singleton'
|
@@ -976,14 +976,6 @@ class Chef
|
|
976
976
|
end
|
977
977
|
end
|
978
978
|
|
979
|
-
def allow_downgrade
|
980
|
-
if @new_resource.respond_to?("allow_downgrade")
|
981
|
-
@new_resource.allow_downgrade
|
982
|
-
else
|
983
|
-
false
|
984
|
-
end
|
985
|
-
end
|
986
|
-
|
987
979
|
# Helpers
|
988
980
|
#
|
989
981
|
|
@@ -1018,7 +1010,7 @@ class Chef
|
|
1018
1010
|
if status.exitstatus > 0
|
1019
1011
|
command_output = "STDOUT: #{stdout}"
|
1020
1012
|
command_output << "STDERR: #{stderr}"
|
1021
|
-
handle_command_failures(status, command_output, {})
|
1013
|
+
Chef::Mixin::Command.handle_command_failures(status, command_output, {})
|
1022
1014
|
end
|
1023
1015
|
end
|
1024
1016
|
|
@@ -1054,9 +1046,20 @@ class Chef
|
|
1054
1046
|
# 3) or a dependency, eg: "foo >= 1.1"
|
1055
1047
|
|
1056
1048
|
# Check if we have name or name+arch which has a priority over a dependency
|
1057
|
-
|
1058
|
-
|
1059
|
-
|
1049
|
+
package_name_array.each_with_index do |n, index|
|
1050
|
+
unless @yum.package_available?(n)
|
1051
|
+
# If they aren't in the installed packages they could be a dependency
|
1052
|
+
dep = parse_dependency(n, new_version_array[index])
|
1053
|
+
if dep
|
1054
|
+
if @new_resource.package_name.is_a?(Array)
|
1055
|
+
@new_resource.package_name(package_name_array - [n] + [dep.first])
|
1056
|
+
@new_resource.version(new_version_array - [new_version_array[index]] + [dep.last]) if dep.last
|
1057
|
+
else
|
1058
|
+
@new_resource.package_name(dep.first)
|
1059
|
+
@new_resource.version(dep.last) if dep.last
|
1060
|
+
end
|
1061
|
+
end
|
1062
|
+
end
|
1060
1063
|
end
|
1061
1064
|
|
1062
1065
|
# Don't overwrite an existing arch
|
@@ -1090,10 +1093,18 @@ class Chef
|
|
1090
1093
|
|
1091
1094
|
Chef::Log.debug("#{@new_resource} checking yum info for #{new_resource}")
|
1092
1095
|
|
1093
|
-
installed_version =
|
1094
|
-
@
|
1095
|
-
|
1096
|
-
|
1096
|
+
installed_version = []
|
1097
|
+
@candidate_version = []
|
1098
|
+
package_name_array.each do |pkg|
|
1099
|
+
installed_version << @yum.installed_version(pkg, arch)
|
1100
|
+
@candidate_version << @yum.candidate_version(pkg, arch)
|
1101
|
+
end
|
1102
|
+
if installed_version.size == 1
|
1103
|
+
@current_resource.version(installed_version[0])
|
1104
|
+
@candidate_version = @candidate_version[0]
|
1105
|
+
else
|
1106
|
+
@current_resource.version(installed_version)
|
1107
|
+
end
|
1097
1108
|
|
1098
1109
|
Chef::Log.debug("#{@new_resource} installed version: #{installed_version || "(none)"} candidate version: " +
|
1099
1110
|
"#{@candidate_version || "(none)"}")
|
@@ -1101,43 +1112,77 @@ class Chef
|
|
1101
1112
|
@current_resource
|
1102
1113
|
end
|
1103
1114
|
|
1104
|
-
def
|
1105
|
-
if
|
1106
|
-
|
1107
|
-
|
1108
|
-
|
1109
|
-
|
1115
|
+
def install_remote_package(name, version)
|
1116
|
+
# Work around yum not exiting with an error if a package doesn't exist
|
1117
|
+
# for CHEF-2062
|
1118
|
+
all_avail = as_array(name).zip(as_array(version)).any? do |n, v|
|
1119
|
+
@yum.version_available?(n, v, arch)
|
1120
|
+
end
|
1121
|
+
method = log_method = nil
|
1122
|
+
methods = []
|
1123
|
+
if all_avail
|
1124
|
+
# More Yum fun:
|
1125
|
+
#
|
1126
|
+
# yum install of an old name+version will exit(1)
|
1127
|
+
# yum install of an old name+version+arch will exit(0) for some reason
|
1128
|
+
#
|
1129
|
+
# Some packages can be installed multiple times like the kernel
|
1130
|
+
as_array(name).zip(as_array(version)).each do |n, v|
|
1110
1131
|
method = "install"
|
1111
1132
|
log_method = "installing"
|
1112
|
-
|
1113
|
-
|
1114
|
-
|
1115
|
-
|
1116
|
-
|
1117
|
-
#
|
1118
|
-
# Some packages can be installed multiple times like the kernel
|
1119
|
-
unless @yum.allow_multi_install.include?(name)
|
1120
|
-
if RPMVersion.parse(@current_resource.version) > RPMVersion.parse(version)
|
1121
|
-
# Unless they want this...
|
1133
|
+
idx = package_name_array.index(n)
|
1134
|
+
unless @yum.allow_multi_install.include?(n)
|
1135
|
+
if RPMVersion.parse(current_version_array[idx]) > RPMVersion.parse(v)
|
1136
|
+
# We allow downgrading only in the evenit of single-package
|
1137
|
+
# rules where the user explicitly allowed it
|
1122
1138
|
if allow_downgrade
|
1123
1139
|
method = "downgrade"
|
1124
1140
|
log_method = "downgrading"
|
1125
1141
|
else
|
1126
1142
|
# we bail like yum when the package is older
|
1127
|
-
raise Chef::Exceptions::Package, "Installed package #{
|
1128
|
-
"than candidate package #{
|
1143
|
+
raise Chef::Exceptions::Package, "Installed package #{n}-#{current_version_array[idx]} is newer " +
|
1144
|
+
"than candidate package #{n}-#{v}"
|
1129
1145
|
end
|
1130
1146
|
end
|
1131
1147
|
end
|
1148
|
+
# methods don't count for packages we won't be touching
|
1149
|
+
next if RPMVersion.parse(current_version_array[idx]) == RPMVersion.parse(v)
|
1150
|
+
methods << method
|
1151
|
+
end
|
1132
1152
|
|
1133
|
-
|
1134
|
-
|
1153
|
+
# We could split this up into two commands if we wanted to, but
|
1154
|
+
# for now, just don't support this.
|
1155
|
+
if methods.uniq.length > 1
|
1156
|
+
raise Chef::Exceptions::Package, "Multipackage rule #{name} has a mix of upgrade and downgrade packages. Cannot proceed."
|
1157
|
+
end
|
1135
1158
|
|
1136
|
-
|
1137
|
-
|
1138
|
-
|
1139
|
-
|
1159
|
+
repos = []
|
1160
|
+
pkg_string_bits = []
|
1161
|
+
index = 0
|
1162
|
+
as_array(name).zip(as_array(version)).each do |n, v|
|
1163
|
+
s = ''
|
1164
|
+
unless v == current_version_array[index]
|
1165
|
+
s = "#{n}-#{v}#{yum_arch}"
|
1166
|
+
repo = @yum.package_repository(n, v, arch)
|
1167
|
+
repos << "#{s} from #{repo} repository"
|
1168
|
+
pkg_string_bits << s
|
1169
|
+
end
|
1170
|
+
index += 1
|
1140
1171
|
end
|
1172
|
+
pkg_string = pkg_string_bits.join(' ')
|
1173
|
+
Chef::Log.info("#{@new_resource} #{log_method} #{repos.join(' ')}")
|
1174
|
+
yum_command("yum -d0 -e0 -y#{expand_options(@new_resource.options)} #{method} #{pkg_string}")
|
1175
|
+
else
|
1176
|
+
raise Chef::Exceptions::Package, "Version #{version} of #{name} not found. Did you specify both version " +
|
1177
|
+
"and release? (version-release, e.g. 1.84-10.fc6)"
|
1178
|
+
end
|
1179
|
+
end
|
1180
|
+
|
1181
|
+
def install_package(name, version)
|
1182
|
+
if @new_resource.source
|
1183
|
+
yum_command("yum -d0 -e0 -y#{expand_options(@new_resource.options)} localinstall #{@new_resource.source}")
|
1184
|
+
else
|
1185
|
+
install_remote_package(name, version)
|
1141
1186
|
end
|
1142
1187
|
|
1143
1188
|
if flush_cache[:after]
|
@@ -1156,10 +1201,11 @@ class Chef
|
|
1156
1201
|
# Hacky - better overall solution? Custom compare in Package provider?
|
1157
1202
|
def action_upgrade
|
1158
1203
|
# Could be uninstalled or have no candidate
|
1159
|
-
if @current_resource.version.nil? ||
|
1204
|
+
if @current_resource.version.nil? || !candidate_version_array.any?
|
1160
1205
|
super
|
1161
|
-
|
1162
|
-
|
1206
|
+
elsif candidate_version_array.zip(current_version_array).any? do |c, i|
|
1207
|
+
RPMVersion.parse(c) > RPMVersion.parse(i)
|
1208
|
+
end
|
1163
1209
|
super
|
1164
1210
|
else
|
1165
1211
|
Chef::Log.debug("#{@new_resource} is at the latest version - nothing to do")
|
@@ -1172,10 +1218,13 @@ class Chef
|
|
1172
1218
|
|
1173
1219
|
def remove_package(name, version)
|
1174
1220
|
if version
|
1175
|
-
|
1221
|
+
remove_str = as_array(name).zip(as_array(version)).map do |x|
|
1222
|
+
"#{x.join('-')}#{yum_arch}"
|
1223
|
+
end.join(' ')
|
1176
1224
|
else
|
1177
|
-
|
1225
|
+
remove_str = as_array(name).map { |n| "#{n}#{yum_arch}" }.join(' ')
|
1178
1226
|
end
|
1227
|
+
yum_command("yum -d0 -e0 -y#{expand_options(@new_resource.options)} remove #{remove_str}")
|
1179
1228
|
|
1180
1229
|
if flush_cache[:after]
|
1181
1230
|
@yum.reload
|
@@ -1218,9 +1267,19 @@ class Chef
|
|
1218
1267
|
# matching them up with an actual package so the standard resource handling can apply.
|
1219
1268
|
#
|
1220
1269
|
# There is currently no support for filename matching.
|
1221
|
-
def parse_dependency
|
1270
|
+
def parse_dependency(name,version)
|
1222
1271
|
# Transform the package_name into a requirement
|
1223
|
-
|
1272
|
+
|
1273
|
+
# If we are passed a version or a version constraint we have to assume it's a requirement first. If it can't be
|
1274
|
+
# parsed only yum_require.name will be set and @new_resource.version will be left intact
|
1275
|
+
if version
|
1276
|
+
require_string = "#{name} #{version}"
|
1277
|
+
else
|
1278
|
+
# Transform the package_name into a requirement, might contain a version, could just be
|
1279
|
+
# a match for virtual provides
|
1280
|
+
require_string = name
|
1281
|
+
end
|
1282
|
+
yum_require = RPMRequire.parse(require_string)
|
1224
1283
|
# and gather all the packages that have a Provides feature satisfying the requirement.
|
1225
1284
|
# It could be multiple be we can only manage one
|
1226
1285
|
packages = @yum.packages_from_require(yum_require)
|
@@ -1238,8 +1297,11 @@ class Chef
|
|
1238
1297
|
|
1239
1298
|
unless packages.empty?
|
1240
1299
|
new_package_name = packages.first.name
|
1241
|
-
|
1242
|
-
|
1300
|
+
new_package_version = packages.first.version.to_s
|
1301
|
+
debug_msg = "#{name}: Unable to match package '#{name}' but matched #{packages.size} "
|
1302
|
+
debug_msg << packages.size == 1 ? "package" : "packages"
|
1303
|
+
debug_msg << ", selected '#{new_package_name}' version '#{new_package_version}'"
|
1304
|
+
Chef::Log.debug(debug_msg)
|
1243
1305
|
|
1244
1306
|
# Ensure it's not the same package under a different architecture
|
1245
1307
|
unique_names = []
|
@@ -1254,7 +1316,11 @@ class Chef
|
|
1254
1316
|
"specific version.")
|
1255
1317
|
end
|
1256
1318
|
|
1257
|
-
|
1319
|
+
if yum_require.version.to_s.nil?
|
1320
|
+
new_package_version = nil
|
1321
|
+
end
|
1322
|
+
|
1323
|
+
[new_package_name,new_package_version]
|
1258
1324
|
end
|
1259
1325
|
end
|
1260
1326
|
|