chef 12.10.24-universal-mingw32 → 12.11.18-universal-mingw32
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CONTRIBUTING.md +3 -38
- data/Gemfile +6 -11
- data/LICENSE +201 -201
- data/README.md +11 -1
- data/VERSION +1 -1
- data/acceptance/.bundle/config +2 -0
- data/acceptance/Gemfile.lock +27 -26
- data/acceptance/basics/.kitchen/logs/chef-current-install-ubuntu-1404.log +2 -0
- data/acceptance/basics/.kitchen/logs/kitchen.log +3 -0
- data/acceptance/data-collector/.acceptance/acceptance-cookbook/.gitignore +2 -0
- data/acceptance/data-collector/.acceptance/acceptance-cookbook/metadata.rb +3 -0
- data/acceptance/data-collector/.acceptance/acceptance-cookbook/recipes/destroy.rb +2 -0
- data/acceptance/data-collector/.acceptance/acceptance-cookbook/recipes/provision.rb +2 -0
- data/acceptance/data-collector/.acceptance/acceptance-cookbook/recipes/verify.rb +2 -0
- data/acceptance/data-collector/.acceptance/data-collector-test/.gitignore +16 -0
- data/acceptance/data-collector/.acceptance/data-collector-test/Berksfile +3 -0
- data/acceptance/data-collector/.acceptance/data-collector-test/files/default/api.rb +85 -0
- data/acceptance/data-collector/.acceptance/data-collector-test/files/default/apigemfile +3 -0
- data/acceptance/data-collector/.acceptance/data-collector-test/files/default/client-rb-both-mode.rb +4 -0
- data/acceptance/data-collector/.acceptance/data-collector-test/files/default/client-rb-client-mode.rb +4 -0
- data/acceptance/data-collector/.acceptance/data-collector-test/files/default/client-rb-no-endpoint.rb +2 -0
- data/acceptance/data-collector/.acceptance/data-collector-test/files/default/client-rb-solo-mode.rb +4 -0
- data/acceptance/data-collector/.acceptance/data-collector-test/files/default/config.ru +2 -0
- data/acceptance/data-collector/.acceptance/data-collector-test/metadata.rb +7 -0
- data/acceptance/data-collector/.acceptance/data-collector-test/recipes/default.rb +38 -0
- data/acceptance/data-collector/.kitchen.yml +9 -0
- data/acceptance/data-collector/Berksfile +3 -0
- data/acceptance/data-collector/Berksfile.lock +6 -0
- data/acceptance/data-collector/test/integration/default/serverspec/default_spec.rb +251 -0
- data/acceptance/fips/.kitchen/logs/fips-integration-centos-6.log +3 -0
- data/acceptance/fips/.kitchen/logs/fips-integration-windows-2012r2.log +3 -0
- data/acceptance/fips/.kitchen/logs/fips-unit-functional-centos-6.log +3 -0
- data/acceptance/fips/.kitchen/logs/fips-unit-functional-windows-2012r2.log +3 -0
- data/acceptance/fips/.kitchen/logs/kitchen.log +6 -0
- data/acceptance/fips/test/integration/fips-integration/serverspec/fips-integration_spec.rb +2 -1
- data/acceptance/top-cookbooks/.kitchen.docker.yml +1 -4
- data/acceptance/trivial/.kitchen/logs/chef-current-install-windows-2012r2.log +2 -0
- data/acceptance/trivial/.kitchen/logs/kitchen.log +3 -0
- data/acceptance/windows-service/.kitchen/logs/chef-windows-service-windows-2012r2.log +2 -0
- data/acceptance/windows-service/.kitchen/logs/kitchen.log +3 -0
- data/bin/chef-apply +0 -0
- data/bin/chef-client +0 -0
- data/bin/chef-service-manager +0 -0
- data/bin/chef-shell +0 -0
- data/bin/chef-solo +0 -0
- data/bin/chef-windows-service +0 -0
- data/bin/knife +0 -0
- data/chef.gemspec +1 -0
- data/distro/common/html/_sources/ctl_chef_client.txt +35 -35
- data/distro/common/html/_sources/ctl_chef_server.txt +341 -341
- data/distro/common/html/_sources/ctl_chef_shell.txt +15 -15
- data/distro/common/html/_sources/ctl_chef_solo.txt +25 -25
- data/distro/common/html/_sources/index.txt +135 -135
- data/distro/common/html/_sources/knife.txt +74 -74
- data/distro/common/html/_sources/knife_bootstrap.txt +56 -56
- data/distro/common/html/_sources/knife_client.txt +150 -150
- data/distro/common/html/_sources/knife_common_options.txt +6 -6
- data/distro/common/html/_sources/knife_configure.txt +29 -29
- data/distro/common/html/_sources/knife_cookbook.txt +236 -236
- data/distro/common/html/_sources/knife_cookbook_site.txt +157 -157
- data/distro/common/html/_sources/knife_data_bag.txt +159 -159
- data/distro/common/html/_sources/knife_delete.txt +26 -26
- data/distro/common/html/_sources/knife_deps.txt +61 -61
- data/distro/common/html/_sources/knife_diff.txt +34 -34
- data/distro/common/html/_sources/knife_download.txt +44 -44
- data/distro/common/html/_sources/knife_edit.txt +26 -26
- data/distro/common/html/_sources/knife_environment.txt +158 -158
- data/distro/common/html/_sources/knife_exec.txt +47 -47
- data/distro/common/html/_sources/knife_index_rebuild.txt +20 -20
- data/distro/common/html/_sources/knife_list.txt +33 -33
- data/distro/common/html/_sources/knife_node.txt +250 -250
- data/distro/common/html/_sources/knife_raw.txt +35 -35
- data/distro/common/html/_sources/knife_recipe_list.txt +23 -23
- data/distro/common/html/_sources/knife_role.txt +157 -157
- data/distro/common/html/_sources/knife_search.txt +53 -53
- data/distro/common/html/_sources/knife_serve.txt +18 -18
- data/distro/common/html/_sources/knife_show.txt +26 -26
- data/distro/common/html/_sources/knife_ssh.txt +43 -43
- data/distro/common/html/_sources/knife_ssl_check.txt +41 -41
- data/distro/common/html/_sources/knife_ssl_fetch.txt +41 -41
- data/distro/common/html/_sources/knife_status.txt +37 -37
- data/distro/common/html/_sources/knife_tag.txt +69 -69
- data/distro/common/html/_sources/knife_upload.txt +49 -49
- data/distro/common/html/_sources/knife_user.txt +127 -127
- data/distro/common/html/_sources/knife_using.txt +43 -43
- data/distro/common/html/_sources/knife_xargs.txt +30 -30
- data/distro/common/html/_static/guide.css +504 -504
- data/distro/common/html/_static/pygments.css +61 -61
- data/distro/common/html/_static/underscore.js +31 -31
- data/distro/common/html/ctl_chef_client.html +269 -269
- data/distro/common/html/ctl_chef_server.html +727 -727
- data/distro/common/html/ctl_chef_shell.html +162 -162
- data/distro/common/html/ctl_chef_solo.html +193 -193
- data/distro/common/html/index.html +201 -201
- data/distro/common/html/knife.html +169 -169
- data/distro/common/html/knife_bootstrap.html +284 -284
- data/distro/common/html/knife_client.html +284 -284
- data/distro/common/html/knife_common_options.html +95 -95
- data/distro/common/html/knife_configure.html +104 -104
- data/distro/common/html/knife_cookbook.html +486 -486
- data/distro/common/html/knife_data_bag.html +373 -373
- data/distro/common/html/knife_delete.html +92 -92
- data/distro/common/html/knife_deps.html +142 -142
- data/distro/common/html/knife_diff.html +122 -122
- data/distro/common/html/knife_download.html +144 -144
- data/distro/common/html/knife_edit.html +88 -88
- data/distro/common/html/knife_environment.html +325 -325
- data/distro/common/html/knife_exec.html +219 -219
- data/distro/common/html/knife_index_rebuild.html +82 -82
- data/distro/common/html/knife_list.html +113 -113
- data/distro/common/html/knife_node.html +457 -457
- data/distro/common/html/knife_raw.html +109 -109
- data/distro/common/html/knife_recipe_list.html +90 -90
- data/distro/common/html/knife_role.html +294 -294
- data/distro/common/html/knife_search.html +202 -202
- data/distro/common/html/knife_serve.html +78 -78
- data/distro/common/html/knife_show.html +103 -103
- data/distro/common/html/knife_ssh.html +176 -176
- data/distro/common/html/knife_ssl_check.html +150 -150
- data/distro/common/html/knife_ssl_fetch.html +150 -150
- data/distro/common/html/knife_status.html +143 -143
- data/distro/common/html/knife_tag.html +137 -137
- data/distro/common/html/knife_upload.html +152 -152
- data/distro/common/html/knife_user.html +241 -241
- data/distro/common/html/knife_using.html +209 -209
- data/distro/common/html/knife_xargs.html +121 -121
- data/distro/common/html/search.html +81 -81
- data/distro/common/man/man1/README.md +58 -58
- data/distro/common/man/man1/chef-shell.1 +194 -194
- data/distro/common/man/man1/knife-bootstrap.1 +215 -215
- data/distro/common/man/man1/knife-client.1 +443 -443
- data/distro/common/man/man1/knife-configure.1 +161 -161
- data/distro/common/man/man1/knife-cookbook.1 +770 -770
- data/distro/common/man/man1/knife-data-bag.1 +617 -617
- data/distro/common/man/man1/knife-delete.1 +127 -127
- data/distro/common/man/man1/knife-deps.1 +246 -246
- data/distro/common/man/man1/knife-diff.1 +226 -226
- data/distro/common/man/man1/knife-download.1 +258 -258
- data/distro/common/man/man1/knife-edit.1 +121 -121
- data/distro/common/man/man1/knife-environment.1 +508 -508
- data/distro/common/man/man1/knife-exec.1 +362 -362
- data/distro/common/man/man1/knife-index-rebuild.1 +63 -63
- data/distro/common/man/man1/knife-list.1 +174 -174
- data/distro/common/man/man1/knife-node.1 +716 -716
- data/distro/common/man/man1/knife-raw.1 +172 -172
- data/distro/common/man/man1/knife-recipe-list.1 +85 -85
- data/distro/common/man/man1/knife-role.1 +426 -426
- data/distro/common/man/man1/knife-search.1 +359 -359
- data/distro/common/man/man1/knife-serve.1 +109 -109
- data/distro/common/man/man1/knife-show.1 +160 -160
- data/distro/common/man/man1/knife-ssh.1 +284 -284
- data/distro/common/man/man1/knife-ssl-check.1 +207 -207
- data/distro/common/man/man1/knife-ssl-fetch.1 +207 -207
- data/distro/common/man/man1/knife-status.1 +234 -234
- data/distro/common/man/man1/knife-tag.1 +189 -189
- data/distro/common/man/man1/knife-upload.1 +280 -280
- data/distro/common/man/man1/knife-user.1 +356 -356
- data/distro/common/man/man1/knife-xargs.1 +189 -189
- data/distro/common/man/man1/knife.1 +332 -332
- data/distro/common/man/man8/chef-apply.8 +86 -86
- data/distro/common/man/man8/chef-client.8 +398 -398
- data/distro/common/man/man8/chef-solo.8 +260 -260
- data/distro/common/markdown/README +3 -3
- data/lib/chef/application.rb +14 -9
- data/lib/chef/application/apply.rb +5 -5
- data/lib/chef/application/client.rb +3 -3
- data/lib/chef/application/exit_code.rb +226 -0
- data/lib/chef/application/solo.rb +37 -7
- data/lib/chef/application/windows_service.rb +3 -3
- data/lib/chef/chef_fs/command_line.rb +7 -0
- data/lib/chef/chef_fs/config.rb +1 -1
- data/lib/chef/chef_fs/data_handler/data_handler_base.rb +11 -10
- data/lib/chef/chef_fs/data_handler/environment_data_handler.rb +1 -1
- data/lib/chef/chef_fs/data_handler/role_data_handler.rb +1 -1
- data/lib/chef/chef_fs/file_system.rb +15 -13
- data/lib/chef/chef_fs/file_system/base_fs_object.rb +4 -0
- data/lib/chef/chef_fs/file_system/chef_server/acl_dir.rb +1 -1
- data/lib/chef/chef_fs/file_system/chef_server/acl_entry.rb +9 -0
- data/lib/chef/chef_fs/file_system/chef_server/data_bag_dir.rb +6 -0
- data/lib/chef/chef_fs/file_system/chef_server/data_bag_entry.rb +19 -0
- data/lib/chef/chef_fs/file_system/chef_server/environments_dir.rb +1 -1
- data/lib/chef/chef_fs/file_system/chef_server/nodes_dir.rb +1 -1
- data/lib/chef/chef_fs/file_system/chef_server/org_entry.rb +4 -0
- data/lib/chef/chef_fs/file_system/chef_server/organization_invites_entry.rb +4 -0
- data/lib/chef/chef_fs/file_system/chef_server/organization_members_entry.rb +4 -0
- data/lib/chef/chef_fs/file_system/chef_server/policy_revision_entry.rb +4 -0
- 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 +15 -4
- data/lib/chef/chef_fs/file_system/exceptions.rb +7 -0
- data/lib/chef/chef_fs/file_system/multiplexed_dir.rb +2 -2
- data/lib/chef/chef_fs/file_system/nonexistent_fs_object.rb +0 -4
- data/lib/chef/chef_fs/file_system/repository/acl.rb +7 -0
- data/lib/chef/chef_fs/file_system/repository/acls_sub_dir.rb +0 -4
- data/lib/chef/chef_fs/file_system/repository/base_file.rb +36 -4
- data/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_entry.rb +4 -0
- data/lib/chef/chef_fs/file_system/repository/client_keys_sub_dir.rb +0 -4
- data/lib/chef/chef_fs/file_system/repository/clients_dir.rb +0 -3
- data/lib/chef/chef_fs/file_system/repository/containers_dir.rb +0 -4
- data/lib/chef/chef_fs/file_system/repository/directory.rb +4 -0
- data/lib/chef/chef_fs/file_system/repository/environments_dir.rb +0 -4
- data/lib/chef/chef_fs/file_system/repository/groups_dir.rb +0 -4
- data/lib/chef/chef_fs/file_system/repository/nodes_dir.rb +0 -4
- data/lib/chef/chef_fs/file_system/repository/policy_groups_dir.rb +0 -4
- data/lib/chef/chef_fs/file_system/repository/roles_dir.rb +0 -4
- data/lib/chef/chef_fs/file_system/repository/users_dir.rb +0 -4
- data/lib/chef/client.rb +11 -3
- data/lib/chef/config_fetcher.rb +4 -4
- data/lib/chef/cookbook/gem_installer.rb +1 -0
- data/lib/chef/cookbook/synchronizer.rb +1 -1
- data/lib/chef/data_bag.rb +2 -2
- data/lib/chef/data_bag_item.rb +1 -1
- data/lib/chef/data_collector.rb +345 -0
- data/lib/chef/data_collector/messages.rb +125 -0
- data/lib/chef/data_collector/messages/helpers.rb +161 -0
- data/lib/chef/data_collector/resource_report.rb +84 -0
- data/lib/chef/decorator.rb +81 -0
- data/lib/chef/decorator/lazy.rb +60 -0
- data/lib/chef/decorator/lazy_array.rb +59 -0
- data/lib/chef/deprecation/provider/remote_file.rb +1 -1
- data/lib/chef/dsl/core.rb +19 -11
- data/lib/chef/dsl/platform_introspection.rb +16 -0
- data/lib/chef/dsl/recipe.rb +15 -9
- data/lib/chef/dsl/universal.rb +50 -0
- data/lib/chef/environment.rb +2 -2
- data/lib/chef/exceptions.rb +19 -4
- data/lib/chef/handler.rb +33 -0
- data/lib/chef/knife/cookbook_show.rb +6 -10
- data/lib/chef/knife/cookbook_site_install.rb +7 -2
- data/lib/chef/knife/help_topics.rb +4 -4
- data/lib/chef/knife/list.rb +1 -2
- data/lib/chef/knife/ssl_check.rb +2 -1
- data/lib/chef/monkey_patches/win32/registry.rb +11 -0
- data/lib/chef/nil_argument.rb +3 -3
- data/lib/chef/node.rb +2 -2
- data/lib/chef/platform/rebooter.rb +13 -2
- data/lib/chef/policy_builder/dynamic.rb +1 -1
- data/lib/chef/policy_builder/expand_node_object.rb +3 -3
- data/lib/chef/policy_builder/policyfile.rb +1 -1
- data/lib/chef/provider/git.rb +43 -41
- data/lib/chef/provider/lwrp_base.rb +0 -1
- data/lib/chef/provider/osx_profile.rb +2 -3
- data/lib/chef/provider/package.rb +51 -13
- data/lib/chef/provider/package/apt.rb +97 -103
- data/lib/chef/provider/package/chocolatey.rb +9 -10
- data/lib/chef/provider/package/dpkg.rb +2 -2
- data/lib/chef/provider/package/portage.rb +1 -1
- data/lib/chef/provider/package/rubygems.rb +8 -12
- data/lib/chef/provider/package/yum.rb +4 -959
- data/lib/chef/provider/package/yum/rpm_utils.rb +642 -0
- data/lib/chef/provider/package/{yum-dump.py → yum/yum-dump.py} +0 -0
- data/lib/chef/provider/package/yum/yum_cache.rb +376 -0
- data/lib/chef/provider/resource_update.rb +52 -52
- data/lib/chef/provider/systemd_unit.rb +238 -0
- data/lib/chef/providers.rb +1 -0
- data/lib/chef/reserved_names.rb +9 -9
- data/lib/chef/resource.rb +2 -7
- data/lib/chef/resource/file.rb +6 -1
- data/lib/chef/resource/systemd_unit.rb +63 -0
- data/lib/chef/resources.rb +1 -0
- data/lib/chef/sandbox.rb +20 -20
- data/lib/chef/shell/shell_session.rb +3 -3
- data/lib/chef/version.rb +1 -1
- data/lib/chef/win32/system.rb +0 -0
- data/spec/data/apt/chef-integration-test-1.0/debian/changelog +5 -5
- data/spec/data/apt/chef-integration-test-1.0/debian/compat +1 -1
- data/spec/data/apt/chef-integration-test-1.0/debian/control +13 -13
- data/spec/data/apt/chef-integration-test-1.0/debian/files +1 -1
- data/spec/data/apt/chef-integration-test-1.0/debian/rules +13 -13
- data/spec/data/apt/chef-integration-test-1.0/debian/source/format +1 -1
- data/spec/data/apt/chef-integration-test-1.1/debian/changelog +11 -11
- data/spec/data/apt/chef-integration-test-1.1/debian/compat +1 -1
- data/spec/data/apt/chef-integration-test-1.1/debian/control +13 -13
- data/spec/data/apt/chef-integration-test-1.1/debian/files +1 -1
- data/spec/data/apt/chef-integration-test-1.1/debian/rules +13 -13
- data/spec/data/apt/chef-integration-test-1.1/debian/source/format +1 -1
- data/spec/data/apt/chef-integration-test2-1.0/debian/rules +0 -0
- data/spec/data/apt/chef-integration-test_1.0-1_amd64.changes +22 -22
- data/spec/data/apt/chef-integration-test_1.1-1_amd64.changes +22 -22
- data/spec/data/apt/var/www/apt/conf/distributions +7 -7
- data/spec/data/apt/var/www/apt/conf/incoming +4 -4
- data/spec/data/apt/var/www/apt/conf/pulls +3 -3
- data/spec/data/apt/var/www/apt/db/version +4 -4
- data/spec/data/apt/var/www/apt/dists/sid/Release +19 -19
- data/spec/data/apt/var/www/apt/dists/sid/main/binary-amd64/Packages +16 -16
- data/spec/data/apt/var/www/apt/dists/sid/main/binary-amd64/Release +5 -5
- data/spec/data/bootstrap/encrypted_data_bag_secret +1 -1
- data/spec/data/bootstrap/no_proxy.erb +2 -2
- data/spec/data/bootstrap/secret.erb +9 -9
- data/spec/data/bootstrap/test-hints.erb +12 -12
- data/spec/data/bootstrap/test.erb +1 -1
- data/spec/data/cb_version_cookbooks/tatft/README.rdoc +2 -2
- data/spec/data/cb_version_cookbooks/tatft/attributes/default.rb +1 -1
- data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-600hhz-0 +1 -1
- data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-ahd2gq-0 +1 -1
- data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-api8ux-0 +1 -1
- data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-b0r1m1-0 +1 -1
- data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-bfygsi-0 +1 -1
- data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-el14l6-0 +1 -1
- data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-ivrl3y-0 +1 -1
- data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-kkbs85-0 +1 -1
- data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-ory1ux-0 +1 -1
- data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-pgsq76-0 +1 -1
- data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-ra8uim-0 +1 -1
- data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-t7k1g-0 +1 -1
- data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-t8g0sv-0 +1 -1
- data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-ufy6g3-0 +1 -1
- data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-x2d6j9-0 +1 -1
- data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-xi0l6h-0 +1 -1
- data/spec/data/config.rb +6 -6
- data/spec/data/cookbooks/angrybash/metadata.rb +2 -2
- data/spec/data/cookbooks/angrybash/recipes/default.rb +8 -8
- data/spec/data/cookbooks/apache2/files/default/apache2_module_conf_generate.pl +2 -2
- data/spec/data/cookbooks/apache2/metadata.rb +2 -2
- data/spec/data/cookbooks/apache2/recipes/default.rb +2 -2
- data/spec/data/cookbooks/borken/metadata.rb +2 -2
- data/spec/data/cookbooks/borken/recipes/default.rb +1 -1
- data/spec/data/cookbooks/borken/templates/default/borken.erb +1 -1
- data/spec/data/cookbooks/chefignore +8 -8
- data/spec/data/cookbooks/ignorken/files/default/not_me.rb +2 -2
- data/spec/data/cookbooks/ignorken/metadata.rb +2 -2
- data/spec/data/cookbooks/ignorken/recipes/ignoreme.rb +1 -1
- data/spec/data/cookbooks/ignorken/templates/ubuntu-12.10/not_me.rb +2 -2
- data/spec/data/cookbooks/java/files/default/java.response +1 -1
- data/spec/data/cookbooks/java/metadata.rb +2 -2
- data/spec/data/cookbooks/name-mismatch-versionnumber/README.md +4 -4
- data/spec/data/cookbooks/name-mismatch-versionnumber/metadata.rb +8 -8
- data/spec/data/cookbooks/openldap/attributes/default.rb +16 -16
- data/spec/data/cookbooks/openldap/attributes/smokey.rb +1 -1
- data/spec/data/cookbooks/openldap/definitions/client.rb +5 -5
- data/spec/data/cookbooks/openldap/definitions/server.rb +5 -5
- data/spec/data/cookbooks/openldap/files/default/.dotfile +1 -1
- data/spec/data/cookbooks/openldap/files/default/remotedir/.a_dotdir/.a_dotfile_in_a_dotdir +1 -1
- data/spec/data/cookbooks/openldap/files/default/remotedir/not_a_template.erb +2 -2
- data/spec/data/cookbooks/openldap/files/default/remotedir/remote_dir_file1.txt +2 -2
- data/spec/data/cookbooks/openldap/files/default/remotedir/remote_dir_file2.txt +2 -2
- data/spec/data/cookbooks/openldap/files/default/remotedir/remotesubdir/.a_dotfile +1 -1
- data/spec/data/cookbooks/openldap/files/default/remotedir/remotesubdir/remote_subdir_file1.txt +2 -2
- data/spec/data/cookbooks/openldap/files/default/remotedir/remotesubdir/remote_subdir_file2.txt +2 -2
- data/spec/data/cookbooks/openldap/files/default/remotedir/subdir_with_no_file_just_a_subsubdir/the_subsubdir/some_file.txt +3 -3
- data/spec/data/cookbooks/openldap/libraries/openldap.rb +4 -4
- data/spec/data/cookbooks/openldap/libraries/openldap/version.rb +3 -3
- data/spec/data/cookbooks/openldap/metadata.rb +8 -8
- data/spec/data/cookbooks/openldap/recipes/default.rb +4 -4
- data/spec/data/cookbooks/openldap/recipes/gigantor.rb +3 -3
- data/spec/data/cookbooks/openldap/recipes/one.rb +15 -15
- data/spec/data/cookbooks/openldap/recipes/return.rb +2 -2
- data/spec/data/cookbooks/openldap/templates/default/helper_test.erb +1 -1
- data/spec/data/cookbooks/openldap/templates/default/helpers_via_partial_test.erb +1 -1
- data/spec/data/cookbooks/openldap/templates/default/no_windows_line_endings.erb +4 -4
- data/spec/data/cookbooks/openldap/templates/default/openldap_variable_stuff.conf.erb +1 -1
- data/spec/data/cookbooks/openldap/templates/default/test.erb +1 -1
- data/spec/data/cookbooks/preseed/files/default/preseed-file.seed +1 -1
- data/spec/data/cookbooks/preseed/files/default/preseed-template.seed +4 -4
- data/spec/data/cookbooks/preseed/metadata.rb +2 -2
- data/spec/data/cookbooks/preseed/templates/default/preseed-template-variables.seed +1 -1
- data/spec/data/cookbooks/preseed/templates/default/preseed-template.seed +1 -1
- data/spec/data/definitions/test.rb +4 -4
- data/spec/data/environment-config.rb +4 -4
- data/spec/data/file-providers-method-snapshot-chef-11-4.json +127 -127
- data/spec/data/fileedit/hosts +4 -4
- data/spec/data/incomplete-metadata-chef-repo/incomplete-metadata/README.md +4 -4
- data/spec/data/incomplete-metadata-chef-repo/incomplete-metadata/metadata.rb +13 -13
- data/spec/data/invalid-metadata-chef-repo/invalid-metadata/README.md +4 -4
- data/spec/data/kitchen/chefignore +6 -6
- data/spec/data/kitchen/openldap/attributes/default.rb +3 -3
- data/spec/data/kitchen/openldap/attributes/robinson.rb +2 -2
- data/spec/data/kitchen/openldap/definitions/client.rb +3 -3
- data/spec/data/kitchen/openldap/definitions/drewbarrymore.rb +2 -2
- data/spec/data/kitchen/openldap/recipes/gigantor.rb +2 -2
- data/spec/data/kitchen/openldap/recipes/ignoreme.rb +2 -2
- data/spec/data/kitchen/openldap/recipes/woot.rb +3 -3
- data/spec/data/knife_subcommand/test_explicit_category.rb +6 -6
- data/spec/data/knife_subcommand/test_name_mapping.rb +4 -4
- data/spec/data/knife_subcommand/test_yourself.rb +21 -21
- data/spec/data/lwrp/providers/inline_compiler.rb +26 -26
- data/spec/data/lwrp/providers/monkey_name_printer.rb +5 -5
- data/spec/data/lwrp/providers/paint_drying_watcher.rb +7 -7
- data/spec/data/lwrp/providers/thumb_twiddler.rb +7 -7
- data/spec/data/lwrp/resources/foo.rb +4 -4
- data/spec/data/lwrp/resources_with_default_attributes/nodeattr.rb +1 -1
- data/spec/data/lwrp_override/providers/buck_passer.rb +5 -5
- data/spec/data/mac_users/10.7-8.plist.xml +559 -559
- data/spec/data/mac_users/10.7-8.shadow.xml +11 -11
- data/spec/data/mac_users/10.7.plist.xml +559 -559
- data/spec/data/mac_users/10.7.shadow.xml +11 -11
- data/spec/data/mac_users/10.8.plist.xml +559 -559
- data/spec/data/mac_users/10.8.shadow.xml +21 -21
- data/spec/data/mac_users/10.9.plist.xml +560 -560
- data/spec/data/mac_users/10.9.shadow.xml +21 -21
- data/spec/data/metadata/quick_start/metadata.rb +19 -19
- data/spec/data/nodes/default.rb +15 -15
- data/spec/data/nodes/test.example.com.rb +17 -17
- data/spec/data/nodes/test.rb +15 -15
- data/spec/data/null_config.rb +1 -1
- data/spec/data/object_loader/environments/test.json +7 -7
- data/spec/data/object_loader/environments/test.rb +2 -2
- data/spec/data/object_loader/environments/test_json_class.json +8 -8
- data/spec/data/object_loader/nodes/test.json +7 -7
- data/spec/data/object_loader/nodes/test.rb +2 -2
- data/spec/data/object_loader/nodes/test_json_class.json +8 -8
- data/spec/data/object_loader/roles/test.json +7 -7
- data/spec/data/object_loader/roles/test.rb +2 -2
- data/spec/data/object_loader/roles/test_json_class.json +8 -8
- data/spec/data/partial_one.erb +1 -1
- data/spec/data/recipes/test.rb +7 -7
- data/spec/data/run_context/cookbooks/circular-dep1/attributes/default.rb +4 -4
- data/spec/data/run_context/cookbooks/circular-dep1/definitions/circular_dep1_res.rb +1 -1
- data/spec/data/run_context/cookbooks/circular-dep1/libraries/lib.rb +2 -2
- data/spec/data/run_context/cookbooks/circular-dep1/metadata.rb +2 -2
- data/spec/data/run_context/cookbooks/circular-dep1/providers/provider.rb +1 -1
- data/spec/data/run_context/cookbooks/circular-dep1/resources/resource.rb +1 -1
- data/spec/data/run_context/cookbooks/circular-dep2/attributes/default.rb +3 -3
- data/spec/data/run_context/cookbooks/circular-dep2/definitions/circular_dep2_res.rb +1 -1
- data/spec/data/run_context/cookbooks/circular-dep2/libraries/lib.rb +2 -2
- data/spec/data/run_context/cookbooks/circular-dep2/metadata.rb +2 -2
- data/spec/data/run_context/cookbooks/circular-dep2/providers/provider.rb +1 -1
- data/spec/data/run_context/cookbooks/circular-dep2/resources/resource.rb +1 -1
- data/spec/data/run_context/cookbooks/dependency1/attributes/aa_first.rb +2 -2
- data/spec/data/run_context/cookbooks/dependency1/attributes/default.rb +2 -2
- data/spec/data/run_context/cookbooks/dependency1/attributes/zz_last.rb +3 -3
- data/spec/data/run_context/cookbooks/dependency1/definitions/dependency1_res.rb +1 -1
- data/spec/data/run_context/cookbooks/dependency1/libraries/lib.rb +2 -2
- data/spec/data/run_context/cookbooks/dependency1/providers/provider.rb +1 -1
- data/spec/data/run_context/cookbooks/dependency1/resources/resource.rb +1 -1
- data/spec/data/run_context/cookbooks/dependency2/attributes/default.rb +3 -3
- data/spec/data/run_context/cookbooks/dependency2/definitions/dependency2_res.rb +1 -1
- data/spec/data/run_context/cookbooks/dependency2/libraries/lib.rb +2 -2
- data/spec/data/run_context/cookbooks/dependency2/providers/provider.rb +1 -1
- data/spec/data/run_context/cookbooks/dependency2/resources/resource.rb +1 -1
- data/spec/data/run_context/cookbooks/no-default-attr/attributes/server.rb +3 -3
- data/spec/data/run_context/cookbooks/no-default-attr/definitions/no_default-attr_res.rb +1 -1
- data/spec/data/run_context/cookbooks/no-default-attr/providers/provider.rb +1 -1
- data/spec/data/run_context/cookbooks/no-default-attr/resources/resource.rb +1 -1
- data/spec/data/run_context/cookbooks/test-with-circular-deps/attributes/default.rb +3 -3
- data/spec/data/run_context/cookbooks/test-with-circular-deps/definitions/test_with-circular-deps_res.rb +1 -1
- data/spec/data/run_context/cookbooks/test-with-circular-deps/libraries/lib.rb +2 -2
- data/spec/data/run_context/cookbooks/test-with-circular-deps/metadata.rb +2 -2
- data/spec/data/run_context/cookbooks/test-with-circular-deps/providers/provider.rb +1 -1
- data/spec/data/run_context/cookbooks/test-with-circular-deps/resources/resource.rb +1 -1
- data/spec/data/run_context/cookbooks/test-with-deps/attributes/default.rb +3 -3
- data/spec/data/run_context/cookbooks/test-with-deps/definitions/test_with-deps_res.rb +1 -1
- data/spec/data/run_context/cookbooks/test-with-deps/libraries/lib.rb +1 -1
- data/spec/data/run_context/cookbooks/test-with-deps/metadata.rb +3 -3
- data/spec/data/run_context/cookbooks/test-with-deps/providers/provider.rb +1 -1
- data/spec/data/run_context/cookbooks/test-with-deps/resources/resource.rb +1 -1
- data/spec/data/run_context/cookbooks/test/attributes/george.rb +1 -1
- data/spec/data/run_context/cookbooks/test/definitions/new_animals.rb +9 -9
- data/spec/data/run_context/cookbooks/test/definitions/new_cat.rb +5 -5
- data/spec/data/run_context/cookbooks/test/definitions/test_res.rb +1 -1
- data/spec/data/run_context/cookbooks/test/providers/provider.rb +1 -1
- data/spec/data/run_context/cookbooks/test/recipes/default.rb +5 -5
- data/spec/data/run_context/cookbooks/test/recipes/one.rb +7 -7
- data/spec/data/run_context/cookbooks/test/recipes/two.rb +7 -7
- data/spec/data/run_context/cookbooks/test/resources/resource.rb +1 -1
- data/spec/data/run_context/nodes/run_context.rb +5 -5
- data/spec/data/search_queries_to_transform.txt +98 -98
- data/spec/data/shef-config.rb +10 -10
- data/spec/data/ssl/5e707473.0 +18 -18
- data/spec/data/ssl/chef-rspec.cert +27 -27
- data/spec/data/ssl/chef-rspec.key +27 -27
- data/spec/data/ssl/key.pem +15 -15
- data/spec/data/ssl/private_key.pem +27 -27
- data/spec/data/ssl/private_key_with_whitespace.pem +32 -32
- data/spec/data/standalone_cookbook/chefignore +9 -9
- data/spec/data/standalone_cookbook/recipes/default.rb +2 -2
- data/spec/data/trusted_certs/example.crt +22 -22
- data/spec/data/trusted_certs/intermediate.pem +27 -27
- data/spec/data/trusted_certs/root.pem +22 -22
- data/spec/functional/assets/chefinittest +34 -34
- data/spec/functional/assets/testchefsubsys +10 -10
- data/spec/functional/provider/remote_file/cache_control_data_spec.rb +0 -0
- data/spec/functional/resource/aix_service_spec.rb +0 -0
- data/spec/functional/resource/aixinit_service_spec.rb +0 -0
- data/spec/functional/resource/chocolatey_package_spec.rb +0 -5
- data/spec/functional/resource/env_spec.rb +0 -0
- data/spec/functional/win32/registry_spec.rb +1 -0
- data/spec/integration/client/exit_code_spec.rb +245 -0
- data/spec/integration/knife/deps_spec.rb +7 -7
- data/spec/integration/knife/download_spec.rb +19 -0
- data/spec/integration/knife/list_spec.rb +0 -8
- data/spec/integration/knife/upload_spec.rb +21 -2
- data/spec/integration/solo/solo_spec.rb +1 -1
- data/spec/rcov.opts +2 -2
- data/spec/unit/application/apply_spec.rb +6 -4
- data/spec/unit/application/exit_code_spec.rb +231 -0
- data/spec/unit/application/solo_spec.rb +143 -88
- data/spec/unit/chef_fs/config_spec.rb +129 -0
- data/spec/unit/chef_fs/file_system/repository/base_file_spec.rb +8 -10
- data/spec/unit/client_spec.rb +1 -1
- data/spec/unit/config_fetcher_spec.rb +2 -2
- data/spec/unit/cookbook/synchronizer_spec.rb +1 -1
- data/spec/unit/data_bag_item_spec.rb +2 -2
- data/spec/unit/data_bag_spec.rb +2 -2
- data/spec/unit/data_collector/messages/helpers_spec.rb +190 -0
- data/spec/unit/data_collector/messages_spec.rb +207 -0
- data/spec/unit/data_collector_spec.rb +525 -0
- data/spec/unit/decorator/lazy_array_spec.rb +58 -0
- data/spec/unit/decorator/lazy_spec.rb +39 -0
- data/spec/unit/decorator_spec.rb +142 -0
- data/spec/unit/environment_spec.rb +4 -4
- data/spec/unit/handler_spec.rb +87 -0
- data/spec/unit/knife/cookbook_show_spec.rb +89 -90
- data/spec/unit/knife/ssl_check_spec.rb +16 -0
- data/spec/unit/policy_builder/dynamic_spec.rb +1 -1
- data/spec/unit/policy_builder/policyfile_spec.rb +1 -1
- data/spec/unit/provider/git_spec.rb +77 -18
- data/spec/unit/provider/package/apt_spec.rb +97 -34
- data/spec/unit/provider/package/chocolatey_spec.rb +3 -15
- data/spec/unit/provider/package/portage_spec.rb +6 -0
- data/spec/unit/provider/package/rubygems_spec.rb +38 -4
- data/spec/unit/provider/package/yum/yum_cache_spec.rb +27 -0
- data/spec/unit/provider/package_spec.rb +20 -7
- data/spec/unit/provider/systemd_unit_spec.rb +885 -0
- data/spec/unit/resource/systemd_unit_spec.rb +133 -0
- data/spec/unit/resource_builder_spec.rb +1 -1
- data/tasks/bin/bundle-platform +6 -2
- data/tasks/bin/bundle-platform.bat +0 -0
- data/tasks/bin/create-override-gemfile +0 -0
- data/tasks/bin/run_external_test +0 -0
- data/tasks/bundle_util.rb +18 -2
- data/tasks/changelog.rb +1 -0
- data/tasks/dependencies.rb +47 -57
- metadata +847 -7
- data/tasks/bin/run_chef_tests +0 -17
@@ -0,0 +1,642 @@
|
|
1
|
+
|
2
|
+
# Author:: Adam Jacob (<adam@chef.io>)
|
3
|
+
# Copyright:: Copyright 2008-2016, Chef Software, Inc.
|
4
|
+
# License:: Apache License, Version 2.0
|
5
|
+
#
|
6
|
+
# Licensed under the Apache License, Version 2.0 (the "License");
|
7
|
+
# you may not use this file except in compliance with the License.
|
8
|
+
# You may obtain a copy of the License at
|
9
|
+
#
|
10
|
+
# http://www.apache.org/licenses/LICENSE-2.0
|
11
|
+
#
|
12
|
+
# Unless required by applicable law or agreed to in writing, software
|
13
|
+
# distributed under the License is distributed on an "AS IS" BASIS,
|
14
|
+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
15
|
+
# See the License for the specific language governing permissions and
|
16
|
+
# limitations under the License.
|
17
|
+
#
|
18
|
+
|
19
|
+
require "chef/provider/package"
|
20
|
+
|
21
|
+
class Chef
|
22
|
+
class Provider
|
23
|
+
class Package
|
24
|
+
class Yum < Chef::Provider::Package
|
25
|
+
class RPMUtils
|
26
|
+
class << self
|
27
|
+
|
28
|
+
# RPM::Version version_parse equivalent
|
29
|
+
def version_parse(evr)
|
30
|
+
return if evr.nil?
|
31
|
+
|
32
|
+
epoch = nil
|
33
|
+
# assume this is a version
|
34
|
+
version = evr
|
35
|
+
release = nil
|
36
|
+
|
37
|
+
lead = 0
|
38
|
+
tail = evr.size
|
39
|
+
|
40
|
+
if %r{^([\d]+):}.match(evr) # rubocop:disable Performance/RedundantMatch
|
41
|
+
epoch = $1.to_i
|
42
|
+
lead = $1.length + 1
|
43
|
+
elsif evr[0].ord == ":".ord
|
44
|
+
epoch = 0
|
45
|
+
lead = 1
|
46
|
+
end
|
47
|
+
|
48
|
+
if %r{:?.*-(.*)$}.match(evr) # rubocop:disable Performance/RedundantMatch
|
49
|
+
release = $1
|
50
|
+
tail = evr.length - release.length - lead - 1
|
51
|
+
|
52
|
+
if release.empty?
|
53
|
+
release = nil
|
54
|
+
end
|
55
|
+
end
|
56
|
+
|
57
|
+
version = evr[lead, tail]
|
58
|
+
if version.empty?
|
59
|
+
version = nil
|
60
|
+
end
|
61
|
+
|
62
|
+
[ epoch, version, release ]
|
63
|
+
end
|
64
|
+
|
65
|
+
# verify
|
66
|
+
def isalnum(x)
|
67
|
+
isalpha(x) || isdigit(x)
|
68
|
+
end
|
69
|
+
|
70
|
+
def isalpha(x)
|
71
|
+
v = x.ord
|
72
|
+
(v >= 65 && v <= 90) || (v >= 97 && v <= 122)
|
73
|
+
end
|
74
|
+
|
75
|
+
def isdigit(x)
|
76
|
+
v = x.ord
|
77
|
+
v >= 48 && v <= 57
|
78
|
+
end
|
79
|
+
|
80
|
+
# based on the reference spec in lib/rpmvercmp.c in rpm 4.9.0
|
81
|
+
def rpmvercmp(x, y)
|
82
|
+
# easy! :)
|
83
|
+
return 0 if x == y
|
84
|
+
|
85
|
+
if x.nil?
|
86
|
+
x = ""
|
87
|
+
end
|
88
|
+
|
89
|
+
if y.nil?
|
90
|
+
y = ""
|
91
|
+
end
|
92
|
+
|
93
|
+
# not so easy :(
|
94
|
+
#
|
95
|
+
# takes 2 strings like
|
96
|
+
#
|
97
|
+
# x = "1.20.b18.el5"
|
98
|
+
# y = "1.20.b17.el5"
|
99
|
+
#
|
100
|
+
# breaks into purely alpha and numeric segments and compares them using
|
101
|
+
# some rules
|
102
|
+
#
|
103
|
+
# * 10 > 1
|
104
|
+
# * 1 > a
|
105
|
+
# * z > a
|
106
|
+
# * Z > A
|
107
|
+
# * z > Z
|
108
|
+
# * leading zeros are ignored
|
109
|
+
# * separators (periods, commas) are ignored
|
110
|
+
# * "1.20.b18.el5.extrastuff" > "1.20.b18.el5"
|
111
|
+
|
112
|
+
x_pos = 0 # overall string element reference position
|
113
|
+
x_pos_max = x.length - 1 # number of elements in string, starting from 0
|
114
|
+
x_seg_pos = 0 # segment string element reference position
|
115
|
+
x_comp = nil # segment to compare
|
116
|
+
|
117
|
+
y_pos = 0
|
118
|
+
y_seg_pos = 0
|
119
|
+
y_pos_max = y.length - 1
|
120
|
+
y_comp = nil
|
121
|
+
|
122
|
+
while x_pos <= x_pos_max && y_pos <= y_pos_max
|
123
|
+
# first we skip over anything non alphanumeric
|
124
|
+
while (x_pos <= x_pos_max) && (isalnum(x[x_pos]) == false)
|
125
|
+
x_pos += 1 # +1 over pos_max if end of string
|
126
|
+
end
|
127
|
+
while (y_pos <= y_pos_max) && (isalnum(y[y_pos]) == false)
|
128
|
+
y_pos += 1
|
129
|
+
end
|
130
|
+
|
131
|
+
# if we hit the end of either we are done matching segments
|
132
|
+
if (x_pos == x_pos_max + 1) || (y_pos == y_pos_max + 1)
|
133
|
+
break
|
134
|
+
end
|
135
|
+
|
136
|
+
# we are now at the start of a alpha or numeric segment
|
137
|
+
x_seg_pos = x_pos
|
138
|
+
y_seg_pos = y_pos
|
139
|
+
|
140
|
+
# grab segment so we can compare them
|
141
|
+
if isdigit(x[x_seg_pos].ord)
|
142
|
+
x_seg_is_num = true
|
143
|
+
|
144
|
+
# already know it's a digit
|
145
|
+
x_seg_pos += 1
|
146
|
+
|
147
|
+
# gather up our digits
|
148
|
+
while (x_seg_pos <= x_pos_max) && isdigit(x[x_seg_pos])
|
149
|
+
x_seg_pos += 1
|
150
|
+
end
|
151
|
+
# copy the segment but not the unmatched character that x_seg_pos will
|
152
|
+
# refer to
|
153
|
+
x_comp = x[x_pos, x_seg_pos - x_pos]
|
154
|
+
|
155
|
+
while (y_seg_pos <= y_pos_max) && isdigit(y[y_seg_pos])
|
156
|
+
y_seg_pos += 1
|
157
|
+
end
|
158
|
+
y_comp = y[y_pos, y_seg_pos - y_pos]
|
159
|
+
else
|
160
|
+
# we are comparing strings
|
161
|
+
x_seg_is_num = false
|
162
|
+
|
163
|
+
while (x_seg_pos <= x_pos_max) && isalpha(x[x_seg_pos])
|
164
|
+
x_seg_pos += 1
|
165
|
+
end
|
166
|
+
x_comp = x[x_pos, x_seg_pos - x_pos]
|
167
|
+
|
168
|
+
while (y_seg_pos <= y_pos_max) && isalpha(y[y_seg_pos])
|
169
|
+
y_seg_pos += 1
|
170
|
+
end
|
171
|
+
y_comp = y[y_pos, y_seg_pos - y_pos]
|
172
|
+
end
|
173
|
+
|
174
|
+
# if y_seg_pos didn't advance in the above loop it means the segments are
|
175
|
+
# different types
|
176
|
+
if y_pos == y_seg_pos
|
177
|
+
# numbers always win over letters
|
178
|
+
return x_seg_is_num ? 1 : -1
|
179
|
+
end
|
180
|
+
|
181
|
+
# move the ball forward before we mess with the segments
|
182
|
+
x_pos += x_comp.length # +1 over pos_max if end of string
|
183
|
+
y_pos += y_comp.length
|
184
|
+
|
185
|
+
# we are comparing numbers - simply convert them
|
186
|
+
if x_seg_is_num
|
187
|
+
x_comp = x_comp.to_i
|
188
|
+
y_comp = y_comp.to_i
|
189
|
+
end
|
190
|
+
|
191
|
+
# compares ints or strings
|
192
|
+
# don't return if equal - try the next segment
|
193
|
+
if x_comp > y_comp
|
194
|
+
return 1
|
195
|
+
elsif x_comp < y_comp
|
196
|
+
return -1
|
197
|
+
end
|
198
|
+
|
199
|
+
# if we've reached here than the segments are the same - try again
|
200
|
+
end
|
201
|
+
|
202
|
+
# we must have reached the end of one or both of the strings and they
|
203
|
+
# matched up until this point
|
204
|
+
|
205
|
+
# segments matched completely but the segment separators were different -
|
206
|
+
# rpm reference code treats these as equal.
|
207
|
+
if (x_pos == x_pos_max + 1) && (y_pos == y_pos_max + 1)
|
208
|
+
return 0
|
209
|
+
end
|
210
|
+
|
211
|
+
# the most unprocessed characters left wins
|
212
|
+
if (x_pos_max - x_pos) > (y_pos_max - y_pos)
|
213
|
+
return 1
|
214
|
+
else
|
215
|
+
return -1
|
216
|
+
end
|
217
|
+
end
|
218
|
+
|
219
|
+
end # self
|
220
|
+
end # RPMUtils
|
221
|
+
|
222
|
+
class RPMVersion
|
223
|
+
include Comparable
|
224
|
+
|
225
|
+
def initialize(*args)
|
226
|
+
if args.size == 1
|
227
|
+
@e, @v, @r = RPMUtils.version_parse(args[0])
|
228
|
+
elsif args.size == 3
|
229
|
+
@e = args[0].to_i
|
230
|
+
@v = args[1]
|
231
|
+
@r = args[2]
|
232
|
+
else
|
233
|
+
raise ArgumentError, "Expecting either 'epoch-version-release' or 'epoch, " +
|
234
|
+
"version, release'"
|
235
|
+
end
|
236
|
+
end
|
237
|
+
attr_reader :e, :v, :r
|
238
|
+
alias :epoch :e
|
239
|
+
alias :version :v
|
240
|
+
alias :release :r
|
241
|
+
|
242
|
+
def self.parse(*args)
|
243
|
+
self.new(*args)
|
244
|
+
end
|
245
|
+
|
246
|
+
def <=>(y)
|
247
|
+
compare_versions(y)
|
248
|
+
end
|
249
|
+
|
250
|
+
def compare(y)
|
251
|
+
compare_versions(y, false)
|
252
|
+
end
|
253
|
+
|
254
|
+
def partial_compare(y)
|
255
|
+
compare_versions(y, true)
|
256
|
+
end
|
257
|
+
|
258
|
+
# RPM::Version rpm_version_to_s equivalent
|
259
|
+
def to_s
|
260
|
+
if @r.nil?
|
261
|
+
@v
|
262
|
+
else
|
263
|
+
"#{@v}-#{@r}"
|
264
|
+
end
|
265
|
+
end
|
266
|
+
|
267
|
+
def evr
|
268
|
+
"#{@e}:#{@v}-#{@r}"
|
269
|
+
end
|
270
|
+
|
271
|
+
private
|
272
|
+
|
273
|
+
# Rough RPM::Version rpm_version_cmp equivalent - except much slower :)
|
274
|
+
#
|
275
|
+
# partial lets epoch and version segment equality be good enough to return equal, eg:
|
276
|
+
#
|
277
|
+
# 2:1.2-1 == 2:1.2
|
278
|
+
# 2:1.2-1 == 2:
|
279
|
+
#
|
280
|
+
def compare_versions(y, partial = false)
|
281
|
+
x = self
|
282
|
+
|
283
|
+
# compare epoch
|
284
|
+
if (x.e.nil? == false && x.e > 0) && y.e.nil?
|
285
|
+
return 1
|
286
|
+
elsif x.e.nil? && (y.e.nil? == false && y.e > 0)
|
287
|
+
return -1
|
288
|
+
elsif x.e.nil? == false && y.e.nil? == false
|
289
|
+
if x.e < y.e
|
290
|
+
return -1
|
291
|
+
elsif x.e > y.e
|
292
|
+
return 1
|
293
|
+
end
|
294
|
+
end
|
295
|
+
|
296
|
+
# compare version
|
297
|
+
if partial && (x.v.nil? || y.v.nil?)
|
298
|
+
return 0
|
299
|
+
elsif x.v.nil? == false && y.v.nil?
|
300
|
+
return 1
|
301
|
+
elsif x.v.nil? && y.v.nil? == false
|
302
|
+
return -1
|
303
|
+
elsif x.v.nil? == false && y.v.nil? == false
|
304
|
+
cmp = RPMUtils.rpmvercmp(x.v, y.v)
|
305
|
+
return cmp if cmp != 0
|
306
|
+
end
|
307
|
+
|
308
|
+
# compare release
|
309
|
+
if partial && (x.r.nil? || y.r.nil?)
|
310
|
+
return 0
|
311
|
+
elsif x.r.nil? == false && y.r.nil?
|
312
|
+
return 1
|
313
|
+
elsif x.r.nil? && y.r.nil? == false
|
314
|
+
return -1
|
315
|
+
elsif x.r.nil? == false && y.r.nil? == false
|
316
|
+
cmp = RPMUtils.rpmvercmp(x.r, y.r)
|
317
|
+
return cmp
|
318
|
+
end
|
319
|
+
|
320
|
+
return 0
|
321
|
+
end
|
322
|
+
end
|
323
|
+
|
324
|
+
class RPMPackage
|
325
|
+
include Comparable
|
326
|
+
|
327
|
+
def initialize(*args)
|
328
|
+
if args.size == 4
|
329
|
+
@n = args[0]
|
330
|
+
@version = RPMVersion.new(args[1])
|
331
|
+
@a = args[2]
|
332
|
+
@provides = args[3]
|
333
|
+
elsif args.size == 6
|
334
|
+
@n = args[0]
|
335
|
+
e = args[1].to_i
|
336
|
+
v = args[2]
|
337
|
+
r = args[3]
|
338
|
+
@version = RPMVersion.new(e, v, r)
|
339
|
+
@a = args[4]
|
340
|
+
@provides = args[5]
|
341
|
+
else
|
342
|
+
raise ArgumentError, "Expecting either 'name, epoch-version-release, arch, provides' " +
|
343
|
+
"or 'name, epoch, version, release, arch, provides'"
|
344
|
+
end
|
345
|
+
|
346
|
+
# We always have one, ourselves!
|
347
|
+
if @provides.empty?
|
348
|
+
@provides = [ RPMProvide.new(@n, @version.evr, :==) ]
|
349
|
+
end
|
350
|
+
end
|
351
|
+
attr_reader :n, :a, :version, :provides
|
352
|
+
alias :name :n
|
353
|
+
alias :arch :a
|
354
|
+
|
355
|
+
def <=>(y)
|
356
|
+
compare(y)
|
357
|
+
end
|
358
|
+
|
359
|
+
def compare(y)
|
360
|
+
x = self
|
361
|
+
|
362
|
+
# easy! :)
|
363
|
+
return 0 if x.nevra == y.nevra
|
364
|
+
|
365
|
+
# compare name
|
366
|
+
if x.n.nil? == false && y.n.nil?
|
367
|
+
return 1
|
368
|
+
elsif x.n.nil? && y.n.nil? == false
|
369
|
+
return -1
|
370
|
+
elsif x.n.nil? == false && y.n.nil? == false
|
371
|
+
if x.n < y.n
|
372
|
+
return -1
|
373
|
+
elsif x.n > y.n
|
374
|
+
return 1
|
375
|
+
end
|
376
|
+
end
|
377
|
+
|
378
|
+
# compare version
|
379
|
+
if x.version > y.version
|
380
|
+
return 1
|
381
|
+
elsif x.version < y.version
|
382
|
+
return -1
|
383
|
+
end
|
384
|
+
|
385
|
+
# compare arch
|
386
|
+
if x.a.nil? == false && y.a.nil?
|
387
|
+
return 1
|
388
|
+
elsif x.a.nil? && y.a.nil? == false
|
389
|
+
return -1
|
390
|
+
elsif x.a.nil? == false && y.a.nil? == false
|
391
|
+
if x.a < y.a
|
392
|
+
return -1
|
393
|
+
elsif x.a > y.a
|
394
|
+
return 1
|
395
|
+
end
|
396
|
+
end
|
397
|
+
|
398
|
+
return 0
|
399
|
+
end
|
400
|
+
|
401
|
+
def to_s
|
402
|
+
nevra
|
403
|
+
end
|
404
|
+
|
405
|
+
def nevra
|
406
|
+
"#{@n}-#{@version.evr}.#{@a}"
|
407
|
+
end
|
408
|
+
end
|
409
|
+
|
410
|
+
# Simple implementation from rpm and ruby-rpm reference code
|
411
|
+
class RPMDependency
|
412
|
+
def initialize(*args)
|
413
|
+
if args.size == 3
|
414
|
+
@name = args[0]
|
415
|
+
@version = RPMVersion.new(args[1])
|
416
|
+
# Our requirement to other dependencies
|
417
|
+
@flag = args[2] || :==
|
418
|
+
elsif args.size == 5
|
419
|
+
@name = args[0]
|
420
|
+
e = args[1].to_i
|
421
|
+
v = args[2]
|
422
|
+
r = args[3]
|
423
|
+
@version = RPMVersion.new(e, v, r)
|
424
|
+
@flag = args[4] || :==
|
425
|
+
else
|
426
|
+
raise ArgumentError, "Expecting either 'name, epoch-version-release, flag' or " +
|
427
|
+
"'name, epoch, version, release, flag'"
|
428
|
+
end
|
429
|
+
end
|
430
|
+
attr_reader :name, :version, :flag
|
431
|
+
|
432
|
+
# Parses 2 forms:
|
433
|
+
#
|
434
|
+
# "mtr >= 2:0.71-3.0"
|
435
|
+
# "mta"
|
436
|
+
def self.parse(string)
|
437
|
+
if %r{^(\S+)\s+(>|>=|=|==|<=|<)\s+(\S+)$}.match(string) # rubocop:disable Performance/RedundantMatch
|
438
|
+
name = $1
|
439
|
+
if $2 == "="
|
440
|
+
flag = :==
|
441
|
+
else
|
442
|
+
flag = :"#{$2}"
|
443
|
+
end
|
444
|
+
version = $3
|
445
|
+
|
446
|
+
return self.new(name, version, flag)
|
447
|
+
else
|
448
|
+
name = string
|
449
|
+
return self.new(name, nil, nil)
|
450
|
+
end
|
451
|
+
end
|
452
|
+
|
453
|
+
# Test if another RPMDependency satisfies our requirements
|
454
|
+
def satisfy?(y)
|
455
|
+
unless y.kind_of?(RPMDependency)
|
456
|
+
raise ArgumentError, "Expecting an RPMDependency object"
|
457
|
+
end
|
458
|
+
|
459
|
+
x = self
|
460
|
+
|
461
|
+
# Easy!
|
462
|
+
if x.name != y.name
|
463
|
+
return false
|
464
|
+
end
|
465
|
+
|
466
|
+
# Partial compare
|
467
|
+
#
|
468
|
+
# eg: x.version 2.3 == y.version 2.3-1
|
469
|
+
sense = x.version.partial_compare(y.version)
|
470
|
+
|
471
|
+
# Thanks to rpmdsCompare() rpmds.c
|
472
|
+
if (sense < 0) && ((x.flag == :> || x.flag == :>=) || (y.flag == :<= || y.flag == :<))
|
473
|
+
return true
|
474
|
+
elsif (sense > 0) && ((x.flag == :< || x.flag == :<=) || (y.flag == :>= || y.flag == :>))
|
475
|
+
return true
|
476
|
+
elsif sense == 0 && (
|
477
|
+
((x.flag == :== || x.flag == :<= || x.flag == :>=) && (y.flag == :== || y.flag == :<= || y.flag == :>=)) ||
|
478
|
+
(x.flag == :< && y.flag == :<) ||
|
479
|
+
(x.flag == :> && y.flag == :>)
|
480
|
+
)
|
481
|
+
return true
|
482
|
+
end
|
483
|
+
|
484
|
+
return false
|
485
|
+
end
|
486
|
+
end
|
487
|
+
|
488
|
+
class RPMProvide < RPMDependency; end
|
489
|
+
class RPMRequire < RPMDependency; end
|
490
|
+
|
491
|
+
class RPMDbPackage < RPMPackage
|
492
|
+
# <rpm parts>, installed, available
|
493
|
+
def initialize(*args)
|
494
|
+
@repoid = args.pop
|
495
|
+
# state
|
496
|
+
@available = args.pop
|
497
|
+
@installed = args.pop
|
498
|
+
super(*args)
|
499
|
+
end
|
500
|
+
attr_reader :repoid, :available, :installed
|
501
|
+
end
|
502
|
+
|
503
|
+
# Simple storage for RPMPackage objects - keeps them unique and sorted
|
504
|
+
class RPMDb
|
505
|
+
def initialize
|
506
|
+
# package name => [ RPMPackage, RPMPackage ] of different versions
|
507
|
+
@rpms = Hash.new
|
508
|
+
# package nevra => RPMPackage for lookups
|
509
|
+
@index = Hash.new
|
510
|
+
# provide name (aka feature) => [RPMPackage, RPMPackage] each providing this feature
|
511
|
+
@provides = Hash.new
|
512
|
+
# RPMPackages listed as available
|
513
|
+
@available = Set.new
|
514
|
+
# RPMPackages listed as installed
|
515
|
+
@installed = Set.new
|
516
|
+
end
|
517
|
+
|
518
|
+
def [](package_name)
|
519
|
+
self.lookup(package_name)
|
520
|
+
end
|
521
|
+
|
522
|
+
# Lookup package_name and return a descending array of package objects
|
523
|
+
def lookup(package_name)
|
524
|
+
pkgs = @rpms[package_name]
|
525
|
+
if pkgs
|
526
|
+
return pkgs.sort.reverse
|
527
|
+
else
|
528
|
+
return nil
|
529
|
+
end
|
530
|
+
end
|
531
|
+
|
532
|
+
def lookup_provides(provide_name)
|
533
|
+
@provides[provide_name]
|
534
|
+
end
|
535
|
+
|
536
|
+
# Using the package name as a key, and nevra for an index, keep a unique list of packages.
|
537
|
+
# The available/installed state can be overwritten for existing packages.
|
538
|
+
def push(*args)
|
539
|
+
args.flatten.each do |new_rpm|
|
540
|
+
unless new_rpm.kind_of?(RPMDbPackage)
|
541
|
+
raise ArgumentError, "Expecting an RPMDbPackage object"
|
542
|
+
end
|
543
|
+
|
544
|
+
@rpms[new_rpm.n] ||= Array.new
|
545
|
+
|
546
|
+
# we may already have this one, like when the installed list is refreshed
|
547
|
+
idx = @index[new_rpm.nevra]
|
548
|
+
if idx
|
549
|
+
# grab the existing package if it's not
|
550
|
+
curr_rpm = idx
|
551
|
+
else
|
552
|
+
@rpms[new_rpm.n] << new_rpm
|
553
|
+
|
554
|
+
new_rpm.provides.each do |provide|
|
555
|
+
@provides[provide.name] ||= Array.new
|
556
|
+
@provides[provide.name] << new_rpm
|
557
|
+
end
|
558
|
+
|
559
|
+
curr_rpm = new_rpm
|
560
|
+
end
|
561
|
+
|
562
|
+
# Track the nevra -> RPMPackage association to avoid having to compare versions
|
563
|
+
# with @rpms[new_rpm.n] on the next round
|
564
|
+
@index[new_rpm.nevra] = curr_rpm
|
565
|
+
|
566
|
+
# these are overwritten for existing packages
|
567
|
+
if new_rpm.available
|
568
|
+
@available << curr_rpm
|
569
|
+
end
|
570
|
+
if new_rpm.installed
|
571
|
+
@installed << curr_rpm
|
572
|
+
end
|
573
|
+
end
|
574
|
+
end
|
575
|
+
|
576
|
+
def <<(*args)
|
577
|
+
self.push(args)
|
578
|
+
end
|
579
|
+
|
580
|
+
def clear
|
581
|
+
@rpms.clear
|
582
|
+
@index.clear
|
583
|
+
@provides.clear
|
584
|
+
clear_available
|
585
|
+
clear_installed
|
586
|
+
end
|
587
|
+
|
588
|
+
def clear_available
|
589
|
+
@available.clear
|
590
|
+
end
|
591
|
+
|
592
|
+
def clear_installed
|
593
|
+
@installed.clear
|
594
|
+
end
|
595
|
+
|
596
|
+
def size
|
597
|
+
@rpms.size
|
598
|
+
end
|
599
|
+
alias :length :size
|
600
|
+
|
601
|
+
def available_size
|
602
|
+
@available.size
|
603
|
+
end
|
604
|
+
|
605
|
+
def installed_size
|
606
|
+
@installed.size
|
607
|
+
end
|
608
|
+
|
609
|
+
def available?(package)
|
610
|
+
@available.include?(package)
|
611
|
+
end
|
612
|
+
|
613
|
+
def installed?(package)
|
614
|
+
@installed.include?(package)
|
615
|
+
end
|
616
|
+
|
617
|
+
def whatprovides(rpmdep)
|
618
|
+
unless rpmdep.kind_of?(RPMDependency)
|
619
|
+
raise ArgumentError, "Expecting an RPMDependency object"
|
620
|
+
end
|
621
|
+
|
622
|
+
what = []
|
623
|
+
|
624
|
+
packages = lookup_provides(rpmdep.name)
|
625
|
+
if packages
|
626
|
+
packages.each do |pkg|
|
627
|
+
pkg.provides.each do |provide|
|
628
|
+
if provide.satisfy?(rpmdep)
|
629
|
+
what << pkg
|
630
|
+
end
|
631
|
+
end
|
632
|
+
end
|
633
|
+
end
|
634
|
+
|
635
|
+
return what
|
636
|
+
end
|
637
|
+
end
|
638
|
+
|
639
|
+
end
|
640
|
+
end
|
641
|
+
end
|
642
|
+
end
|