chef 11.4.4 → 11.6.0.hotfix.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/README.md +1 -1
- data/Rakefile +18 -1
- data/bin/chef-service-manager +37 -0
- data/distro/common/html/chef-client.8.html +4 -4
- data/distro/common/html/chef-expander.8.html +4 -4
- data/distro/common/html/chef-expanderctl.8.html +4 -4
- data/distro/common/html/chef-server-webui.8.html +4 -4
- data/distro/common/html/chef-server.8.html +4 -4
- data/distro/common/html/chef-shell.1.html +4 -4
- data/distro/common/html/chef-solo.8.html +12 -18
- data/distro/common/html/chef-solr.8.html +4 -4
- data/distro/common/html/knife-bootstrap.1.html +4 -4
- data/distro/common/html/knife-client.1.html +4 -4
- data/distro/common/html/knife-configure.1.html +4 -4
- data/distro/common/html/knife-cookbook-site.1.html +4 -4
- data/distro/common/html/knife-cookbook.1.html +7 -10
- data/distro/common/html/knife-data-bag.1.html +7 -10
- data/distro/common/html/knife-environment.1.html +6 -8
- data/distro/common/html/knife-exec.1.html +4 -4
- data/distro/common/html/knife-index.1.html +4 -4
- data/distro/common/html/knife-node.1.html +4 -4
- data/distro/common/html/knife-role.1.html +4 -4
- data/distro/common/html/knife-search.1.html +4 -4
- data/distro/common/html/knife-ssh.1.html +4 -4
- data/distro/common/html/knife-status.1.html +4 -4
- data/distro/common/html/knife-tag.1.html +4 -4
- data/distro/common/html/knife.1.html +4 -4
- data/distro/common/man/man1/chef-shell.1 +1 -1
- data/distro/common/man/man1/knife-bootstrap.1 +1 -1
- 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 +1 -1
- data/distro/common/man/man1/knife-cookbook.1 +2 -15
- data/distro/common/man/man1/knife-data-bag.1 +2 -15
- data/distro/common/man/man1/knife-environment.1 +2 -12
- data/distro/common/man/man1/knife-exec.1 +1 -1
- data/distro/common/man/man1/knife-index.1 +1 -1
- data/distro/common/man/man1/knife-node.1 +1 -1
- data/distro/common/man/man1/knife-role.1 +1 -1
- data/distro/common/man/man1/knife-search.1 +1 -1
- data/distro/common/man/man1/knife-ssh.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.1 +1 -1
- data/distro/common/man/man8/chef-client.8 +1 -1
- data/distro/common/man/man8/chef-expander.8 +1 -1
- data/distro/common/man/man8/chef-expanderctl.8 +1 -1
- data/distro/common/man/man8/chef-server-webui.8 +1 -1
- data/distro/common/man/man8/chef-server.8 +1 -1
- data/distro/common/man/man8/chef-solo.8 +4 -36
- data/distro/common/man/man8/chef-solr.8 +1 -1
- data/distro/debian/etc/init.d/chef-client +4 -2
- data/distro/windows/service_manager.rb +2 -146
- data/lib/chef.rb +1 -1
- data/lib/chef/application.rb +5 -12
- data/lib/chef/application/apply.rb +2 -0
- data/lib/chef/application/client.rb +12 -12
- data/lib/chef/application/knife.rb +2 -2
- data/lib/chef/application/solo.rb +4 -5
- data/lib/chef/application/windows_service.rb +113 -56
- data/lib/chef/application/windows_service_manager.rb +179 -0
- data/lib/chef/chef_fs.rb +2 -4
- data/lib/chef/chef_fs/chef_fs_data_store.rb +371 -0
- data/lib/chef/chef_fs/command_line.rb +145 -93
- data/lib/chef/chef_fs/config.rb +205 -0
- data/lib/chef/chef_fs/data_handler/acl_data_handler.rb +26 -0
- data/lib/chef/chef_fs/data_handler/client_data_handler.rb +38 -0
- data/lib/chef/chef_fs/data_handler/container_data_handler.rb +29 -0
- data/lib/chef/chef_fs/data_handler/cookbook_data_handler.rb +38 -0
- data/lib/chef/chef_fs/data_handler/data_bag_item_data_handler.rb +56 -0
- data/lib/chef/chef_fs/data_handler/data_handler_base.rb +128 -0
- data/lib/chef/chef_fs/data_handler/environment_data_handler.rb +40 -0
- data/lib/chef/chef_fs/data_handler/group_data_handler.rb +51 -0
- data/lib/chef/chef_fs/data_handler/node_data_handler.rb +36 -0
- data/lib/chef/chef_fs/data_handler/role_data_handler.rb +40 -0
- data/lib/chef/chef_fs/data_handler/user_data_handler.rb +27 -0
- data/lib/chef/chef_fs/file_system.rb +195 -127
- data/lib/chef/chef_fs/file_system/acl_dir.rb +64 -0
- data/lib/chef/chef_fs/file_system/acl_entry.rb +58 -0
- data/lib/chef/chef_fs/file_system/acls_dir.rb +68 -0
- data/lib/chef/chef_fs/file_system/already_exists_error.rb +31 -0
- data/lib/chef/chef_fs/file_system/base_fs_object.rb +98 -39
- data/lib/chef/chef_fs/file_system/chef_repository_file_system_cookbook_dir.rb +85 -0
- data/lib/chef/chef_fs/file_system/chef_repository_file_system_cookbook_entry.rb +71 -0
- data/lib/chef/chef_fs/file_system/chef_repository_file_system_cookbooks_dir.rb +55 -0
- data/lib/chef/chef_fs/file_system/chef_repository_file_system_data_bags_dir.rb +36 -0
- data/lib/chef/chef_fs/file_system/chef_repository_file_system_entry.rb +14 -63
- data/lib/chef/chef_fs/file_system/chef_repository_file_system_root_dir.rb +93 -3
- data/lib/chef/chef_fs/file_system/chef_server_root_dir.rb +35 -9
- data/lib/chef/chef_fs/file_system/cookbook_dir.rb +67 -32
- data/lib/chef/chef_fs/file_system/cookbook_file.rb +13 -6
- data/lib/chef/chef_fs/file_system/cookbook_frozen_error.rb +31 -0
- data/lib/chef/chef_fs/file_system/cookbooks_acl_dir.rb +41 -0
- data/lib/chef/chef_fs/file_system/cookbooks_dir.rb +102 -21
- data/lib/chef/chef_fs/file_system/data_bag_dir.rb +12 -21
- data/lib/chef/chef_fs/file_system/data_bags_dir.rb +14 -8
- data/lib/chef/chef_fs/file_system/default_environment_cannot_be_modified_error.rb +36 -0
- data/lib/chef/chef_fs/file_system/environments_dir.rb +60 -0
- data/lib/chef/chef_fs/file_system/file_system_entry.rb +8 -8
- data/lib/chef/chef_fs/file_system/file_system_error.rb +3 -1
- data/lib/chef/chef_fs/file_system/memory_dir.rb +52 -0
- data/lib/chef/chef_fs/file_system/memory_file.rb +17 -0
- data/lib/chef/chef_fs/file_system/memory_root.rb +21 -0
- data/lib/chef/chef_fs/file_system/multiplexed_dir.rb +48 -0
- data/lib/chef/chef_fs/file_system/must_delete_recursively_error.rb +2 -2
- data/lib/chef/chef_fs/file_system/nodes_dir.rb +17 -9
- data/lib/chef/chef_fs/file_system/nonexistent_fs_object.rb +0 -4
- data/lib/chef/chef_fs/file_system/not_found_error.rb +2 -2
- data/lib/chef/chef_fs/file_system/operation_failed_error.rb +34 -0
- data/lib/chef/chef_fs/file_system/operation_not_allowed_error.rb +48 -0
- data/lib/chef/chef_fs/file_system/rest_list_dir.rb +42 -13
- data/lib/chef/chef_fs/file_system/rest_list_entry.rb +81 -27
- data/lib/chef/chef_fs/knife.rb +68 -29
- data/lib/chef/chef_fs/parallelizer.rb +129 -0
- data/lib/chef/chef_fs/path_utils.rb +29 -3
- data/lib/chef/chef_fs/raw_request.rb +79 -0
- data/lib/chef/client.rb +46 -20
- data/lib/chef/config.rb +59 -61
- data/lib/chef/cookbook/chefignore.rb +2 -1
- data/lib/chef/cookbook/synchronizer.rb +8 -6
- data/lib/chef/cookbook/syntax_check.rb +17 -2
- data/lib/chef/cookbook_uploader.rb +10 -1
- data/lib/chef/cookbook_version.rb +0 -109
- data/lib/chef/data_bag.rb +15 -6
- data/lib/chef/deprecation/mixin/template.rb +49 -0
- data/lib/chef/deprecation/provider/cookbook_file.rb +55 -0
- data/lib/chef/deprecation/provider/file.rb +197 -0
- data/lib/chef/deprecation/provider/remote_file.rb +86 -0
- data/lib/chef/deprecation/provider/template.rb +63 -0
- data/lib/chef/deprecation/warnings.rb +38 -0
- data/lib/chef/encrypted_data_bag_item.rb +153 -61
- data/lib/chef/environment.rb +34 -3
- data/lib/chef/event_dispatch/base.rb +3 -0
- data/lib/chef/exceptions.rb +27 -2
- data/lib/chef/file_access_control/unix.rb +64 -7
- data/lib/chef/file_access_control/windows.rb +22 -11
- data/lib/chef/file_content_management/content_base.rb +56 -0
- data/lib/chef/file_content_management/deploy.rb +38 -0
- data/lib/chef/file_content_management/deploy/cp.rb +48 -0
- data/lib/chef/file_content_management/deploy/mv_unix.rb +77 -0
- data/lib/chef/file_content_management/deploy/mv_windows.rb +95 -0
- data/lib/chef/file_content_management/tempfile.rb +61 -0
- data/lib/chef/formatters/doc.rb +1 -1
- data/lib/chef/formatters/error_descriptor.rb +5 -4
- data/lib/chef/formatters/error_inspectors/cookbook_resolve_error_inspector.rb +23 -3
- data/lib/chef/formatters/error_inspectors/registration_error_inspector.rb +4 -0
- data/lib/chef/json_compat.rb +3 -0
- data/lib/chef/knife.rb +12 -3
- data/lib/chef/knife/bootstrap.rb +46 -2
- data/lib/chef/knife/bootstrap/archlinux-gems.erb +3 -3
- data/lib/chef/knife/bootstrap/centos5-gems.erb +3 -3
- data/lib/chef/knife/bootstrap/chef-full.erb +4 -4
- data/lib/chef/knife/bootstrap/fedora13-gems.erb +3 -3
- data/lib/chef/knife/bootstrap/ubuntu10.04-apt.erb +3 -3
- data/lib/chef/knife/bootstrap/ubuntu10.04-gems.erb +3 -3
- data/lib/chef/knife/bootstrap/ubuntu12.04-gems.erb +3 -3
- data/lib/chef/knife/client_show.rb +2 -5
- data/lib/chef/knife/configure.rb +3 -3
- data/lib/chef/knife/cookbook_create.rb +6 -5
- data/lib/chef/knife/cookbook_download.rb +13 -5
- data/lib/chef/knife/cookbook_site_share.rb +1 -0
- data/lib/chef/knife/cookbook_test.rb +1 -0
- data/lib/chef/knife/cookbook_upload.rb +4 -9
- data/lib/chef/knife/core/bootstrap_context.rb +10 -4
- data/lib/chef/knife/core/generic_presenter.rb +16 -0
- data/lib/chef/knife/core/node_editor.rb +1 -1
- data/lib/chef/knife/core/subcommand_loader.rb +43 -12
- data/lib/chef/knife/core/ui.rb +19 -4
- data/lib/chef/knife/delete.rb +76 -9
- data/lib/chef/knife/deps.rb +139 -0
- data/lib/chef/knife/diff.rb +22 -5
- data/lib/chef/knife/download.rb +16 -3
- data/lib/chef/knife/edit.rb +76 -0
- data/lib/chef/knife/environment_show.rb +2 -7
- data/lib/chef/knife/list.rb +91 -47
- data/lib/chef/knife/node_run_list_set.rb +66 -0
- data/lib/chef/knife/node_show.rb +1 -7
- data/lib/chef/knife/raw.rb +20 -64
- data/lib/chef/knife/role_show.rb +2 -4
- data/lib/chef/knife/search.rb +5 -6
- data/lib/chef/knife/show.rb +34 -11
- data/lib/chef/knife/ssh.rb +8 -0
- data/lib/chef/knife/upload.rb +23 -4
- data/lib/chef/knife/user_show.rb +2 -5
- data/lib/chef/knife/xargs.rb +265 -0
- data/lib/chef/log.rb +2 -2
- data/lib/chef/mixin/file_class.rb +0 -9
- data/lib/chef/mixin/language_include_recipe.rb +1 -1
- data/lib/chef/mixin/params_validate.rb +19 -9
- data/lib/chef/mixin/template.rb +126 -36
- data/lib/chef/mixin/windows_architecture_helper.rb +91 -0
- data/lib/chef/monkey_patches/file.rb +26 -0
- data/lib/chef/monkey_patches/net-ssh-multi.rb +140 -0
- data/lib/chef/monkey_patches/securerandom.rb +44 -0
- data/lib/chef/monologger.rb +93 -0
- data/lib/chef/node.rb +4 -0
- data/lib/chef/platform.rb +4 -490
- data/lib/chef/platform/provider_mapping.rb +529 -0
- data/lib/chef/{monkey_patches/dir.rb → platform/query_helpers.rb} +25 -19
- data/lib/chef/provider.rb +12 -9
- data/lib/chef/provider/batch.rb +35 -0
- data/lib/chef/provider/cookbook_file.rb +9 -78
- data/lib/chef/provider/cookbook_file/content.rb +49 -0
- data/lib/chef/provider/deploy.rb +24 -20
- data/lib/chef/provider/deploy/revision.rb +27 -0
- data/lib/chef/provider/directory.rb +19 -22
- data/lib/chef/provider/execute.rb +22 -5
- data/lib/chef/provider/file.rb +299 -217
- data/lib/chef/provider/file/content.rb +39 -0
- data/lib/chef/provider/git.rb +76 -43
- data/lib/chef/provider/group/usermod.rb +2 -2
- data/lib/chef/provider/ifconfig.rb +25 -35
- data/lib/chef/provider/ifconfig/debian.rb +71 -0
- data/lib/chef/provider/ifconfig/redhat.rb +47 -0
- data/lib/chef/provider/link.rb +10 -3
- data/lib/chef/provider/mount.rb +1 -1
- data/lib/chef/provider/mount/mount.rb +8 -3
- data/lib/chef/provider/mount/windows.rb +4 -1
- data/lib/chef/provider/package/portage.rb +9 -4
- data/lib/chef/provider/package/rubygems.rb +45 -10
- data/lib/chef/provider/package/smartos.rb +47 -36
- data/lib/chef/provider/package/yum.rb +19 -12
- data/lib/chef/provider/package/zypper.rb +45 -55
- data/lib/chef/provider/powershell_script.rb +77 -0
- data/lib/chef/provider/remote_directory.rb +5 -6
- data/lib/chef/provider/remote_file.rb +12 -108
- data/lib/chef/provider/remote_file/cache_control_data.rb +165 -0
- data/lib/chef/provider/remote_file/content.rb +75 -0
- data/lib/chef/provider/remote_file/fetcher.rb +43 -0
- data/lib/chef/provider/remote_file/ftp.rb +183 -0
- data/lib/chef/provider/remote_file/http.rb +124 -0
- data/lib/chef/provider/remote_file/local_file.rb +47 -0
- data/lib/chef/provider/route.rb +6 -2
- data/lib/chef/provider/script.rb +14 -2
- data/lib/chef/provider/service/macosx.rb +16 -10
- data/lib/chef/provider/service/solaris.rb +6 -5
- data/lib/chef/provider/template.rb +16 -78
- data/lib/chef/provider/template/content.rb +61 -0
- data/lib/chef/provider/user/solaris.rb +90 -0
- data/lib/chef/provider/user/useradd.rb +76 -63
- data/lib/chef/provider/windows_script.rb +73 -0
- data/lib/chef/providers.rb +16 -0
- data/lib/chef/resource.rb +23 -2
- data/lib/chef/resource/batch.rb +31 -0
- data/lib/chef/resource/conditional.rb +4 -0
- data/lib/chef/resource/conditional_action_not_nothing.rb +48 -0
- data/lib/chef/resource/file.rb +31 -3
- data/lib/chef/resource/link.rb +17 -0
- data/lib/chef/resource/lwrp_base.rb +1 -1
- data/lib/chef/resource/mount.rb +29 -2
- data/lib/chef/resource/powershell_script.rb +31 -0
- data/lib/chef/resource/remote_file.rb +47 -1
- data/lib/chef/resource/route.rb +1 -1
- data/lib/chef/resource/template.rb +145 -0
- data/lib/chef/resource/windows_script.rb +62 -0
- data/lib/chef/resource_collection.rb +45 -11
- data/lib/chef/resource_reporter.rb +81 -52
- data/lib/chef/resources.rb +2 -0
- data/lib/chef/rest.rb +13 -4
- data/lib/chef/rest/rest_request.rb +5 -1
- data/lib/chef/run_context/cookbook_compiler.rb +3 -3
- data/lib/chef/run_list/run_list_expansion.rb +1 -1
- data/lib/chef/run_lock.rb +7 -1
- data/lib/chef/runner.rb +0 -1
- data/lib/chef/scan_access_control.rb +6 -1
- data/lib/chef/search/query.rb +2 -2
- data/lib/chef/shell/shell_session.rb +2 -2
- data/lib/chef/util/backup.rb +84 -0
- data/lib/chef/util/diff.rb +145 -0
- data/lib/chef/util/file_edit.rb +1 -1
- data/lib/chef/util/selinux.rb +100 -0
- data/lib/chef/util/windows/net_user.rb +14 -1
- data/lib/chef/util/windows/volume.rb +2 -2
- data/lib/chef/version.rb +1 -1
- data/lib/chef/version/platform.rb +42 -0
- data/lib/chef/version_class.rb +1 -1
- data/lib/chef/version_constraint.rb +6 -5
- data/lib/chef/version_constraint/platform.rb +26 -0
- data/lib/chef/win32/api/file.rb +8 -2
- data/lib/chef/win32/version.rb +25 -8
- data/spec/data/apt/chef-integration-test-1.0/debian/changelog +5 -0
- data/spec/data/apt/chef-integration-test-1.0/debian/compat +1 -0
- data/spec/data/apt/chef-integration-test-1.0/debian/control +13 -0
- data/spec/data/apt/chef-integration-test-1.0/debian/copyright +34 -0
- data/spec/data/apt/chef-integration-test-1.0/debian/files +1 -0
- data/spec/data/apt/chef-integration-test-1.0/debian/rules +13 -0
- data/spec/data/apt/chef-integration-test-1.0/debian/source/format +1 -0
- data/spec/data/apt/chef-integration-test-1.1/debian/changelog +11 -0
- data/spec/data/apt/chef-integration-test-1.1/debian/compat +1 -0
- data/spec/data/apt/chef-integration-test-1.1/debian/control +13 -0
- data/spec/data/apt/chef-integration-test-1.1/debian/copyright +34 -0
- data/spec/data/apt/chef-integration-test-1.1/debian/files +1 -0
- data/spec/data/apt/chef-integration-test-1.1/debian/rules +13 -0
- data/spec/data/apt/chef-integration-test-1.1/debian/source/format +1 -0
- data/spec/data/apt/chef-integration-test_1.0-1_amd64.changes +22 -0
- data/spec/data/apt/chef-integration-test_1.0-1_amd64.deb +0 -0
- data/spec/data/apt/chef-integration-test_1.0.orig.tar.gz +0 -0
- data/spec/data/apt/chef-integration-test_1.1-1_amd64.changes +22 -0
- data/spec/data/apt/chef-integration-test_1.1-1_amd64.deb +0 -0
- data/spec/data/apt/chef-integration-test_1.1.orig.tar.gz +0 -0
- data/spec/data/apt/var/www/apt/conf/distributions +7 -0
- data/spec/data/apt/var/www/apt/conf/incoming +4 -0
- data/spec/data/apt/var/www/apt/conf/pulls +3 -0
- data/spec/data/apt/var/www/apt/db/checksums.db +0 -0
- data/spec/data/apt/var/www/apt/db/contents.cache.db +0 -0
- data/spec/data/apt/var/www/apt/db/packages.db +0 -0
- data/spec/data/apt/var/www/apt/db/references.db +0 -0
- data/spec/data/apt/var/www/apt/db/release.caches.db +0 -0
- data/spec/data/apt/var/www/apt/db/version +4 -0
- data/spec/data/apt/var/www/apt/dists/sid/Release +19 -0
- data/spec/data/apt/var/www/apt/dists/sid/main/binary-amd64/Packages +16 -0
- data/spec/data/apt/var/www/apt/dists/sid/main/binary-amd64/Packages.gz +0 -0
- data/spec/data/apt/var/www/apt/dists/sid/main/binary-amd64/Release +5 -0
- data/spec/data/apt/var/www/apt/dists/sid/main/binary-i386/Packages +0 -0
- data/spec/data/apt/var/www/apt/pool/main/c/chef-integration-test/chef-integration-test_1.0-1_amd64.deb +0 -0
- data/spec/data/apt/var/www/apt/pool/main/c/chef-integration-test/chef-integration-test_1.1-1_amd64.deb +0 -0
- data/spec/data/bootstrap/encrypted_data_bag_secret +1 -0
- data/spec/data/bootstrap/secret.erb +9 -0
- data/spec/data/cookbooks/ignorken/recipes/default.rb +1 -0
- data/spec/data/cookbooks/ignorken/recipes/ignoreme.rb +2 -0
- data/spec/data/cookbooks/openldap/files/default/.dotfile +1 -0
- data/spec/data/cookbooks/openldap/files/default/.ssh/id_rsa +1 -0
- data/spec/data/cookbooks/openldap/files/default/remotedir/.a_dotdir/.a_dotfile_in_a_dotdir +1 -0
- data/spec/data/cookbooks/openldap/files/default/remotedir/remotesubdir/.a_dotfile +1 -0
- data/spec/data/cookbooks/openldap/templates/default/all_windows_line_endings.erb +4 -0
- data/spec/data/cookbooks/openldap/templates/default/helper_test.erb +1 -0
- data/spec/data/cookbooks/openldap/templates/default/helpers_via_partial_test.erb +1 -0
- data/spec/data/cookbooks/openldap/templates/default/no_windows_line_endings.erb +4 -0
- data/spec/data/cookbooks/openldap/templates/default/some_windows_line_endings.erb +4 -0
- data/spec/data/cookbooks/preseed/files/default/preseed-file.seed +1 -0
- data/spec/data/cookbooks/preseed/templates/default/preseed-template.seed +1 -0
- data/spec/data/file-providers-method-snapshot-chef-11-4.json +127 -0
- data/spec/data/git_bundles/example-repo.gitbundle +0 -0
- data/spec/data/knife-home/.chef/plugins/knife/example_home_subcommand.rb +0 -0
- data/spec/data/knife_subcommand/test_yourself.rb +8 -0
- data/spec/data/null_config.rb +1 -0
- data/spec/data/partial_one.erb +1 -1
- data/spec/data/remote_file/nyan_cat.png.gz +0 -0
- data/spec/functional/file_content_management/deploy_strategies_spec.rb +238 -0
- data/spec/functional/knife/exec_spec.rb +2 -2
- data/spec/functional/provider/remote_file/cache_control_data_spec.rb +101 -0
- data/spec/functional/resource/batch_spec.rb +64 -0
- data/spec/functional/resource/cookbook_file_spec.rb +2 -3
- data/spec/functional/resource/deploy_revision_spec.rb +180 -0
- data/spec/functional/resource/directory_spec.rb +2 -2
- data/spec/functional/resource/file_spec.rb +17 -1
- data/spec/functional/resource/git_spec.rb +259 -0
- data/spec/functional/resource/link_spec.rb +422 -388
- data/spec/functional/resource/package_spec.rb +297 -0
- data/spec/functional/resource/powershell_spec.rb +188 -0
- data/spec/functional/resource/registry_spec.rb +8 -4
- data/spec/functional/resource/remote_directory_spec.rb +2 -2
- data/spec/functional/resource/remote_file_spec.rb +97 -29
- data/spec/functional/resource/template_spec.rb +173 -17
- data/spec/functional/resource/user_spec.rb +547 -0
- data/spec/functional/run_lock_spec.rb +5 -0
- data/spec/functional/shell_spec.rb +2 -1
- data/spec/functional/win32/service_manager_spec.rb +269 -0
- data/spec/functional/win32/versions_spec.rb +78 -0
- data/spec/integration/knife/chef_repo_path_spec.rb +805 -0
- data/spec/integration/knife/chef_repository_file_system_spec.rb +276 -0
- data/spec/integration/knife/chefignore_spec.rb +271 -0
- data/spec/integration/knife/delete_spec.rb +944 -0
- data/spec/integration/knife/deps_spec.rb +648 -0
- data/spec/integration/knife/diff_spec.rb +536 -0
- data/spec/integration/knife/download_spec.rb +962 -0
- data/spec/integration/knife/list_spec.rb +633 -0
- data/spec/integration/knife/raw_spec.rb +166 -0
- data/spec/integration/knife/redirection_spec.rb +57 -0
- data/spec/integration/knife/show_spec.rb +158 -0
- data/spec/integration/knife/upload_spec.rb +1060 -0
- data/spec/integration/solo/solo_spec.rb +41 -0
- data/spec/spec_helper.rb +55 -1
- data/spec/support/chef_helpers.rb +32 -0
- data/spec/support/platform_helpers.rb +40 -0
- data/spec/support/platforms/win32/spec_service.rb +59 -0
- data/spec/support/shared/functional/directory_resource.rb +43 -16
- data/spec/support/shared/functional/file_resource.rb +661 -20
- data/spec/support/shared/functional/securable_resource.rb +109 -8
- data/spec/support/shared/functional/securable_resource_with_reporting.rb +39 -31
- data/spec/support/shared/integration/integration_helper.rb +166 -0
- data/spec/support/shared/integration/knife_support.rb +171 -0
- data/spec/support/shared/unit/execute_resource.rb +125 -0
- data/spec/support/shared/unit/file_system_support.rb +8 -48
- data/spec/support/shared/unit/provider/file.rb +609 -0
- data/spec/support/shared/unit/provider/useradd_based_user_provider.rb +407 -0
- data/spec/support/shared/unit/script_resource.rb +52 -0
- data/spec/support/shared/unit/windows_script_resource.rb +48 -0
- data/spec/tiny_server.rb +13 -11
- data/spec/unit/application/client_spec.rb +39 -1
- data/spec/unit/application/knife_spec.rb +12 -0
- data/spec/unit/application/solo_spec.rb +1 -1
- data/spec/unit/application_spec.rb +57 -2
- data/spec/unit/chef_fs/diff_spec.rb +30 -31
- data/spec/unit/chef_fs/file_pattern_spec.rb +2 -2
- data/spec/unit/chef_fs/file_system_spec.rb +2 -3
- data/spec/unit/client_spec.rb +20 -1
- data/spec/unit/config_spec.rb +70 -52
- data/spec/unit/cookbook/synchronizer_spec.rb +49 -1
- data/spec/unit/cookbook/syntax_check_spec.rb +28 -3
- data/spec/unit/cookbook_loader_spec.rb +3 -2
- data/spec/unit/daemon_spec.rb +7 -7
- data/spec/unit/data_bag_spec.rb +7 -0
- data/spec/unit/deprecation_spec.rb +86 -0
- data/spec/unit/encrypted_data_bag_item_spec.rb +183 -88
- data/spec/unit/environment_spec.rb +98 -0
- data/spec/unit/exceptions_spec.rb +6 -1
- data/spec/unit/file_access_control_spec.rb +21 -1
- data/spec/unit/file_content_management/deploy/cp_spec.rb +46 -0
- data/spec/unit/file_content_management/deploy/mv_unix_spec.rb +103 -0
- data/spec/unit/file_content_management/deploy/mv_windows_spec.rb +179 -0
- data/spec/unit/formatters/error_inspectors/cookbook_resolve_error_inspector_spec.rb +38 -2
- data/spec/unit/formatters/error_inspectors/resource_failure_inspector_spec.rb +3 -2
- data/spec/unit/knife/bootstrap_spec.rb +128 -29
- data/spec/unit/knife/configure_spec.rb +42 -26
- data/spec/unit/knife/cookbook_download_spec.rb +24 -3
- data/spec/unit/knife/cookbook_upload_spec.rb +8 -4
- data/spec/unit/knife/core/bootstrap_context_spec.rb +78 -61
- data/spec/unit/knife/core/subcommand_loader_spec.rb +20 -0
- data/spec/unit/knife/core/ui_spec.rb +41 -0
- data/spec/unit/knife/node_run_list_set_spec.rb +140 -0
- data/spec/unit/knife_spec.rb +21 -0
- data/spec/unit/mixin/enforce_ownership_and_permissions_spec.rb +1 -0
- data/spec/unit/mixin/params_validate_spec.rb +35 -0
- data/spec/unit/mixin/template_spec.rb +69 -57
- data/spec/unit/mixin/windows_architecture_helper_spec.rb +83 -0
- data/spec/unit/node_spec.rb +7 -0
- data/spec/unit/platform_spec.rb +15 -1
- data/spec/unit/provider/cookbook_file/content_spec.rb +40 -0
- data/spec/unit/provider/cookbook_file_spec.rb +26 -183
- data/spec/unit/provider/cron/solaris_spec.rb +1 -1
- data/spec/unit/provider/deploy/revision_spec.rb +19 -11
- data/spec/unit/provider/deploy_spec.rb +2 -2
- data/spec/unit/provider/directory_spec.rb +23 -23
- data/spec/unit/provider/execute_spec.rb +27 -1
- data/spec/unit/provider/file/content_spec.rb +101 -0
- data/spec/unit/provider/file_spec.rb +25 -484
- data/spec/unit/provider/git_spec.rb +224 -28
- data/spec/unit/provider/group/usermod_spec.rb +3 -1
- data/spec/unit/provider/ifconfig/debian_spec.rb +89 -0
- data/spec/unit/provider/ifconfig/redhat_spec.rb +71 -0
- data/spec/unit/provider/ifconfig_spec.rb +0 -33
- data/spec/unit/provider/mount/mount_spec.rb +33 -2
- data/spec/unit/provider/mount/windows_spec.rb +4 -1
- data/spec/unit/provider/mount_spec.rb +16 -6
- data/spec/unit/provider/package/portage_spec.rb +44 -0
- data/spec/unit/provider/package/rubygems_spec.rb +44 -1
- data/spec/unit/provider/package/smartos_spec.rb +3 -2
- data/spec/unit/provider/package/yum_spec.rb +36 -39
- data/spec/unit/provider/package/zypper_spec.rb +84 -22
- data/spec/unit/provider/package_spec.rb +0 -4
- data/spec/unit/provider/powershell_spec.rb +38 -0
- data/spec/unit/provider/remote_directory_spec.rb +0 -4
- data/spec/unit/provider/remote_file/cache_control_data_spec.rb +211 -0
- data/spec/unit/provider/remote_file/content_spec.rb +230 -0
- data/spec/unit/provider/remote_file/fetcher_spec.rb +75 -0
- data/spec/unit/provider/remote_file/ftp_spec.rb +224 -0
- data/spec/unit/provider/remote_file/http_spec.rb +319 -0
- data/spec/unit/provider/remote_file/local_file_spec.rb +60 -0
- data/spec/unit/provider/remote_file_spec.rb +33 -295
- data/spec/unit/provider/route_spec.rb +25 -9
- data/spec/unit/provider/service/macosx_spec.rb +176 -152
- data/spec/unit/provider/service/solaris_smf_service_spec.rb +21 -18
- data/spec/unit/provider/service/systemd_service_spec.rb +2 -2
- data/spec/unit/provider/service/upstart_service_spec.rb +2 -2
- data/spec/unit/provider/service_spec.rb +3 -3
- data/spec/unit/provider/template/content_spec.rb +78 -0
- data/spec/unit/provider/template_spec.rb +52 -184
- data/spec/unit/provider/user/solaris_spec.rb +80 -0
- data/spec/unit/provider/user/useradd_spec.rb +12 -358
- data/spec/unit/resource/batch_spec.rb +48 -0
- data/spec/unit/resource/conditional_action_not_nothing_spec.rb +45 -0
- data/spec/unit/resource/execute_spec.rb +3 -101
- data/spec/unit/resource/file_spec.rb +0 -5
- data/spec/unit/resource/group_spec.rb +9 -0
- data/spec/unit/resource/ifconfig_spec.rb +60 -1
- data/spec/unit/resource/link_spec.rb +1 -0
- data/spec/unit/resource/mount_spec.rb +37 -0
- data/spec/unit/resource/powershell_spec.rb +48 -0
- data/spec/unit/resource/remote_file_spec.rb +44 -4
- data/spec/unit/resource/route_spec.rb +1 -1
- data/spec/unit/resource/script_spec.rb +13 -36
- data/spec/unit/resource/template_spec.rb +111 -8
- data/spec/unit/resource/user_spec.rb +7 -0
- data/spec/unit/resource_collection_spec.rb +61 -32
- data/spec/unit/resource_reporter_spec.rb +115 -102
- data/spec/unit/resource_spec.rb +170 -1
- data/spec/unit/rest/auth_credentials_spec.rb +2 -2
- data/spec/unit/rest_spec.rb +6 -2
- data/spec/unit/run_context/cookbook_compiler_spec.rb +9 -0
- data/spec/unit/runner_spec.rb +1 -1
- data/spec/unit/scan_access_control_spec.rb +4 -2
- data/spec/unit/shell/shell_session_spec.rb +15 -2
- data/spec/unit/util/backup_spec.rb +149 -0
- data/spec/unit/util/diff_spec.rb +596 -0
- data/spec/unit/util/selinux_spec.rb +172 -0
- data/spec/unit/version/platform_spec.rb +61 -0
- data/spec/unit/version_constraint/platform_spec.rb +46 -0
- data/spec/unit/version_constraint_spec.rb +5 -0
- metadata +233 -10
- data/lib/chef/chef_fs/file_system/data_bag_item.rb +0 -59
- data/spec/unit/chef_fs/file_system/chef_server_root_dir_spec.rb +0 -237
- data/spec/unit/chef_fs/file_system/cookbooks_dir_spec.rb +0 -568
- data/spec/unit/chef_fs/file_system/data_bags_dir_spec.rb +0 -220
|
@@ -0,0 +1,962 @@
|
|
|
1
|
+
#
|
|
2
|
+
# Author:: John Keiser (<jkeiser@opscode.com>)
|
|
3
|
+
# Copyright:: Copyright (c) 2013 Opscode, 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
|
+
require 'support/shared/integration/integration_helper'
|
|
19
|
+
require 'chef/knife/download'
|
|
20
|
+
require 'chef/knife/diff'
|
|
21
|
+
|
|
22
|
+
describe 'knife download' do
|
|
23
|
+
extend IntegrationSupport
|
|
24
|
+
include KnifeSupport
|
|
25
|
+
|
|
26
|
+
context 'without versioned cookbooks' do
|
|
27
|
+
when_the_chef_server "has one of each thing" do
|
|
28
|
+
client 'x', {}
|
|
29
|
+
cookbook 'x', '1.0.0', { 'metadata.rb' => 'version "1.0.0"' }
|
|
30
|
+
data_bag 'x', { 'y' => {} }
|
|
31
|
+
environment 'x', {}
|
|
32
|
+
node 'x', {}
|
|
33
|
+
role 'x', {}
|
|
34
|
+
user 'x', {}
|
|
35
|
+
|
|
36
|
+
when_the_repository 'has only top-level directories' do
|
|
37
|
+
directory 'clients'
|
|
38
|
+
directory 'cookbooks'
|
|
39
|
+
directory 'data_bags'
|
|
40
|
+
directory 'environments'
|
|
41
|
+
directory 'nodes'
|
|
42
|
+
directory 'roles'
|
|
43
|
+
directory 'users'
|
|
44
|
+
|
|
45
|
+
it 'knife download downloads everything' do
|
|
46
|
+
knife('download /').should_succeed <<EOM
|
|
47
|
+
Created /clients/chef-validator.json
|
|
48
|
+
Created /clients/chef-webui.json
|
|
49
|
+
Created /clients/x.json
|
|
50
|
+
Created /cookbooks/x
|
|
51
|
+
Created /cookbooks/x/metadata.rb
|
|
52
|
+
Created /data_bags/x
|
|
53
|
+
Created /data_bags/x/y.json
|
|
54
|
+
Created /environments/_default.json
|
|
55
|
+
Created /environments/x.json
|
|
56
|
+
Created /nodes/x.json
|
|
57
|
+
Created /roles/x.json
|
|
58
|
+
Created /users/admin.json
|
|
59
|
+
Created /users/x.json
|
|
60
|
+
EOM
|
|
61
|
+
knife('diff --name-status /').should_succeed ''
|
|
62
|
+
end
|
|
63
|
+
end
|
|
64
|
+
|
|
65
|
+
when_the_repository 'has an identical copy of each thing' do
|
|
66
|
+
file 'clients/chef-validator.json', { 'validator' => true, 'public_key' => ChefZero::PUBLIC_KEY }
|
|
67
|
+
file 'clients/chef-webui.json', { 'admin' => true, 'public_key' => ChefZero::PUBLIC_KEY }
|
|
68
|
+
file 'clients/x.json', { 'public_key' => ChefZero::PUBLIC_KEY }
|
|
69
|
+
file 'cookbooks/x/metadata.rb', 'version "1.0.0"'
|
|
70
|
+
file 'data_bags/x/y.json', {}
|
|
71
|
+
file 'environments/_default.json', { "description" => "The default Chef environment" }
|
|
72
|
+
file 'environments/x.json', {}
|
|
73
|
+
file 'nodes/x.json', {}
|
|
74
|
+
file 'roles/x.json', {}
|
|
75
|
+
file 'users/admin.json', { 'admin' => true, 'public_key' => ChefZero::PUBLIC_KEY }
|
|
76
|
+
file 'users/x.json', { 'public_key' => ChefZero::PUBLIC_KEY }
|
|
77
|
+
|
|
78
|
+
it 'knife download makes no changes' do
|
|
79
|
+
knife('download /').should_succeed ''
|
|
80
|
+
knife('diff --name-status /').should_succeed ''
|
|
81
|
+
end
|
|
82
|
+
|
|
83
|
+
it 'knife download --purge makes no changes' do
|
|
84
|
+
knife('download --purge /').should_succeed ''
|
|
85
|
+
knife('diff --name-status /').should_succeed ''
|
|
86
|
+
end
|
|
87
|
+
|
|
88
|
+
context 'except the role file' do
|
|
89
|
+
file 'roles/x.json', <<EOM
|
|
90
|
+
{
|
|
91
|
+
"chef_type": "role",
|
|
92
|
+
"default_attributes": {
|
|
93
|
+
},
|
|
94
|
+
"description": "blarghle",
|
|
95
|
+
"env_run_lists": {
|
|
96
|
+
},
|
|
97
|
+
"json_class": "Chef::Role",
|
|
98
|
+
"name": "x",
|
|
99
|
+
"override_attributes": {
|
|
100
|
+
},
|
|
101
|
+
"run_list": [
|
|
102
|
+
|
|
103
|
+
]
|
|
104
|
+
}
|
|
105
|
+
EOM
|
|
106
|
+
it 'knife download changes the role' do
|
|
107
|
+
knife('download /').should_succeed "Updated /roles/x.json\n"
|
|
108
|
+
knife('diff --name-status /').should_succeed ''
|
|
109
|
+
end
|
|
110
|
+
|
|
111
|
+
it 'knife download --no-diff does not change the role' do
|
|
112
|
+
knife('download --no-diff /').should_succeed ''
|
|
113
|
+
knife('diff --name-status /').should_succeed "M\t/roles/x.json\n"
|
|
114
|
+
end
|
|
115
|
+
end
|
|
116
|
+
|
|
117
|
+
context 'except the role file is textually different, but not ACTUALLY different' do
|
|
118
|
+
file 'roles/x.json', <<EOM
|
|
119
|
+
{
|
|
120
|
+
"chef_type": "role",
|
|
121
|
+
"default_attributes": {
|
|
122
|
+
},
|
|
123
|
+
"env_run_lists": {
|
|
124
|
+
},
|
|
125
|
+
"json_class": "Chef::Role",
|
|
126
|
+
"name": "x",
|
|
127
|
+
"description": "",
|
|
128
|
+
"override_attributes": {
|
|
129
|
+
},
|
|
130
|
+
"run_list": [
|
|
131
|
+
|
|
132
|
+
]
|
|
133
|
+
}
|
|
134
|
+
EOM
|
|
135
|
+
it 'knife download / does not change anything' do
|
|
136
|
+
knife('download /').should_succeed ''
|
|
137
|
+
knife('diff --name-status /').should_succeed ''
|
|
138
|
+
end
|
|
139
|
+
end
|
|
140
|
+
|
|
141
|
+
context 'as well as one extra copy of each thing' do
|
|
142
|
+
file 'clients/y.json', { 'public_key' => ChefZero::PUBLIC_KEY }
|
|
143
|
+
file 'cookbooks/x/blah.rb', ''
|
|
144
|
+
file 'cookbooks/y/metadata.rb', 'version "1.0.0"'
|
|
145
|
+
file 'data_bags/x/z.json', {}
|
|
146
|
+
file 'data_bags/y/zz.json', {}
|
|
147
|
+
file 'environments/y.json', {}
|
|
148
|
+
file 'nodes/y.json', {}
|
|
149
|
+
file 'roles/y.json', {}
|
|
150
|
+
file 'users/y.json', { 'public_key' => ChefZero::PUBLIC_KEY }
|
|
151
|
+
|
|
152
|
+
it 'knife download does nothing' do
|
|
153
|
+
knife('download /').should_succeed ''
|
|
154
|
+
knife('diff --name-status /').should_succeed <<EOM
|
|
155
|
+
A\t/clients/y.json
|
|
156
|
+
A\t/cookbooks/x/blah.rb
|
|
157
|
+
A\t/cookbooks/y
|
|
158
|
+
A\t/data_bags/x/z.json
|
|
159
|
+
A\t/data_bags/y
|
|
160
|
+
A\t/environments/y.json
|
|
161
|
+
A\t/nodes/y.json
|
|
162
|
+
A\t/roles/y.json
|
|
163
|
+
A\t/users/y.json
|
|
164
|
+
EOM
|
|
165
|
+
end
|
|
166
|
+
|
|
167
|
+
it 'knife download --purge deletes the extra files' do
|
|
168
|
+
knife('download --purge /').should_succeed <<EOM
|
|
169
|
+
Deleted extra entry /clients/y.json (purge is on)
|
|
170
|
+
Deleted extra entry /cookbooks/x/blah.rb (purge is on)
|
|
171
|
+
Deleted extra entry /cookbooks/y (purge is on)
|
|
172
|
+
Deleted extra entry /data_bags/x/z.json (purge is on)
|
|
173
|
+
Deleted extra entry /data_bags/y (purge is on)
|
|
174
|
+
Deleted extra entry /environments/y.json (purge is on)
|
|
175
|
+
Deleted extra entry /nodes/y.json (purge is on)
|
|
176
|
+
Deleted extra entry /roles/y.json (purge is on)
|
|
177
|
+
Deleted extra entry /users/y.json (purge is on)
|
|
178
|
+
EOM
|
|
179
|
+
knife('diff --name-status /').should_succeed ''
|
|
180
|
+
end
|
|
181
|
+
end
|
|
182
|
+
end
|
|
183
|
+
|
|
184
|
+
when_the_repository 'is empty' do
|
|
185
|
+
it 'knife download creates the extra files' do
|
|
186
|
+
knife('download /').should_succeed <<EOM
|
|
187
|
+
Created /clients
|
|
188
|
+
Created /clients/chef-validator.json
|
|
189
|
+
Created /clients/chef-webui.json
|
|
190
|
+
Created /clients/x.json
|
|
191
|
+
Created /cookbooks
|
|
192
|
+
Created /cookbooks/x
|
|
193
|
+
Created /cookbooks/x/metadata.rb
|
|
194
|
+
Created /data_bags
|
|
195
|
+
Created /data_bags/x
|
|
196
|
+
Created /data_bags/x/y.json
|
|
197
|
+
Created /environments
|
|
198
|
+
Created /environments/_default.json
|
|
199
|
+
Created /environments/x.json
|
|
200
|
+
Created /nodes
|
|
201
|
+
Created /nodes/x.json
|
|
202
|
+
Created /roles
|
|
203
|
+
Created /roles/x.json
|
|
204
|
+
Created /users
|
|
205
|
+
Created /users/admin.json
|
|
206
|
+
Created /users/x.json
|
|
207
|
+
EOM
|
|
208
|
+
knife('diff --name-status /').should_succeed ''
|
|
209
|
+
end
|
|
210
|
+
|
|
211
|
+
it 'knife download --no-diff creates the extra files' do
|
|
212
|
+
knife('download --no-diff /').should_succeed <<EOM
|
|
213
|
+
Created /clients
|
|
214
|
+
Created /clients/chef-validator.json
|
|
215
|
+
Created /clients/chef-webui.json
|
|
216
|
+
Created /clients/x.json
|
|
217
|
+
Created /cookbooks
|
|
218
|
+
Created /cookbooks/x
|
|
219
|
+
Created /cookbooks/x/metadata.rb
|
|
220
|
+
Created /data_bags
|
|
221
|
+
Created /data_bags/x
|
|
222
|
+
Created /data_bags/x/y.json
|
|
223
|
+
Created /environments
|
|
224
|
+
Created /environments/_default.json
|
|
225
|
+
Created /environments/x.json
|
|
226
|
+
Created /nodes
|
|
227
|
+
Created /nodes/x.json
|
|
228
|
+
Created /roles
|
|
229
|
+
Created /roles/x.json
|
|
230
|
+
Created /users
|
|
231
|
+
Created /users/admin.json
|
|
232
|
+
Created /users/x.json
|
|
233
|
+
EOM
|
|
234
|
+
knife('diff --name-status /').should_succeed ''
|
|
235
|
+
end
|
|
236
|
+
|
|
237
|
+
context 'when current directory is top level' do
|
|
238
|
+
cwd '.'
|
|
239
|
+
it 'knife download with no parameters reports an error' do
|
|
240
|
+
knife('download').should_fail "FATAL: Must specify at least one argument. If you want to download everything in this directory, type \"knife download .\"\n", :stdout => /USAGE/
|
|
241
|
+
end
|
|
242
|
+
end
|
|
243
|
+
end
|
|
244
|
+
end
|
|
245
|
+
|
|
246
|
+
# Test download of an item when the other end doesn't even have the container
|
|
247
|
+
when_the_repository 'is empty' do
|
|
248
|
+
when_the_chef_server 'has two data bag items' do
|
|
249
|
+
data_bag 'x', { 'y' => {}, 'z' => {} }
|
|
250
|
+
|
|
251
|
+
it 'knife download of one data bag item itself succeeds' do
|
|
252
|
+
knife('download /data_bags/x/y.json').should_succeed <<EOM
|
|
253
|
+
Created /data_bags
|
|
254
|
+
Created /data_bags/x
|
|
255
|
+
Created /data_bags/x/y.json
|
|
256
|
+
EOM
|
|
257
|
+
knife('diff --name-status /data_bags').should_succeed <<EOM
|
|
258
|
+
D\t/data_bags/x/z.json
|
|
259
|
+
EOM
|
|
260
|
+
end
|
|
261
|
+
end
|
|
262
|
+
end
|
|
263
|
+
|
|
264
|
+
when_the_repository 'has three data bag items' do
|
|
265
|
+
file 'data_bags/x/deleted.json', <<EOM
|
|
266
|
+
{
|
|
267
|
+
"id": "deleted"
|
|
268
|
+
}
|
|
269
|
+
EOM
|
|
270
|
+
file 'data_bags/x/modified.json', <<EOM
|
|
271
|
+
{
|
|
272
|
+
"id": "modified"
|
|
273
|
+
}
|
|
274
|
+
EOM
|
|
275
|
+
file 'data_bags/x/unmodified.json', <<EOM
|
|
276
|
+
{
|
|
277
|
+
"id": "unmodified"
|
|
278
|
+
}
|
|
279
|
+
EOM
|
|
280
|
+
|
|
281
|
+
when_the_chef_server 'has a modified, unmodified, added and deleted data bag item' do
|
|
282
|
+
data_bag 'x', {
|
|
283
|
+
'added' => {},
|
|
284
|
+
'modified' => { 'foo' => 'bar' },
|
|
285
|
+
'unmodified' => {}
|
|
286
|
+
}
|
|
287
|
+
|
|
288
|
+
it 'knife download of the modified file succeeds' do
|
|
289
|
+
knife('download /data_bags/x/modified.json').should_succeed <<EOM
|
|
290
|
+
Updated /data_bags/x/modified.json
|
|
291
|
+
EOM
|
|
292
|
+
knife('diff --name-status /data_bags').should_succeed <<EOM
|
|
293
|
+
D\t/data_bags/x/added.json
|
|
294
|
+
A\t/data_bags/x/deleted.json
|
|
295
|
+
EOM
|
|
296
|
+
end
|
|
297
|
+
it 'knife download of the unmodified file does nothing' do
|
|
298
|
+
knife('download /data_bags/x/unmodified.json').should_succeed ''
|
|
299
|
+
knife('diff --name-status /data_bags').should_succeed <<EOM
|
|
300
|
+
D\t/data_bags/x/added.json
|
|
301
|
+
M\t/data_bags/x/modified.json
|
|
302
|
+
A\t/data_bags/x/deleted.json
|
|
303
|
+
EOM
|
|
304
|
+
end
|
|
305
|
+
it 'knife download of the added file succeeds' do
|
|
306
|
+
knife('download /data_bags/x/added.json').should_succeed <<EOM
|
|
307
|
+
Created /data_bags/x/added.json
|
|
308
|
+
EOM
|
|
309
|
+
knife('diff --name-status /data_bags').should_succeed <<EOM
|
|
310
|
+
M\t/data_bags/x/modified.json
|
|
311
|
+
A\t/data_bags/x/deleted.json
|
|
312
|
+
EOM
|
|
313
|
+
end
|
|
314
|
+
it 'knife download of the deleted file does nothing' do
|
|
315
|
+
knife('download /data_bags/x/deleted.json').should_succeed ''
|
|
316
|
+
knife('diff --name-status /data_bags').should_succeed <<EOM
|
|
317
|
+
D\t/data_bags/x/added.json
|
|
318
|
+
M\t/data_bags/x/modified.json
|
|
319
|
+
A\t/data_bags/x/deleted.json
|
|
320
|
+
EOM
|
|
321
|
+
end
|
|
322
|
+
it 'knife download --purge of the deleted file deletes it' do
|
|
323
|
+
knife('download --purge /data_bags/x/deleted.json').should_succeed <<EOM
|
|
324
|
+
Deleted extra entry /data_bags/x/deleted.json (purge is on)
|
|
325
|
+
EOM
|
|
326
|
+
knife('diff --name-status /data_bags').should_succeed <<EOM
|
|
327
|
+
D\t/data_bags/x/added.json
|
|
328
|
+
M\t/data_bags/x/modified.json
|
|
329
|
+
EOM
|
|
330
|
+
end
|
|
331
|
+
it 'knife download of the entire data bag downloads everything' do
|
|
332
|
+
knife('download /data_bags/x').should_succeed <<EOM
|
|
333
|
+
Created /data_bags/x/added.json
|
|
334
|
+
Updated /data_bags/x/modified.json
|
|
335
|
+
EOM
|
|
336
|
+
knife('diff --name-status /data_bags').should_succeed <<EOM
|
|
337
|
+
A\t/data_bags/x/deleted.json
|
|
338
|
+
EOM
|
|
339
|
+
end
|
|
340
|
+
it 'knife download --purge of the entire data bag downloads everything' do
|
|
341
|
+
knife('download --purge /data_bags/x').should_succeed <<EOM
|
|
342
|
+
Created /data_bags/x/added.json
|
|
343
|
+
Updated /data_bags/x/modified.json
|
|
344
|
+
Deleted extra entry /data_bags/x/deleted.json (purge is on)
|
|
345
|
+
EOM
|
|
346
|
+
knife('diff --name-status /data_bags').should_succeed ''
|
|
347
|
+
end
|
|
348
|
+
context 'when cwd is the /data_bags directory' do
|
|
349
|
+
cwd 'data_bags'
|
|
350
|
+
it 'knife download fails' do
|
|
351
|
+
knife('download').should_fail "FATAL: Must specify at least one argument. If you want to download everything in this directory, type \"knife download .\"\n", :stdout => /USAGE/
|
|
352
|
+
end
|
|
353
|
+
it 'knife download --purge . downloads everything' do
|
|
354
|
+
knife('download --purge .').should_succeed <<EOM
|
|
355
|
+
Created x/added.json
|
|
356
|
+
Updated x/modified.json
|
|
357
|
+
Deleted extra entry x/deleted.json (purge is on)
|
|
358
|
+
EOM
|
|
359
|
+
knife('diff --name-status /data_bags').should_succeed ''
|
|
360
|
+
end
|
|
361
|
+
it 'knife download --purge * downloads everything' do
|
|
362
|
+
knife('download --purge *').should_succeed <<EOM
|
|
363
|
+
Created x/added.json
|
|
364
|
+
Updated x/modified.json
|
|
365
|
+
Deleted extra entry x/deleted.json (purge is on)
|
|
366
|
+
EOM
|
|
367
|
+
knife('diff --name-status /data_bags').should_succeed ''
|
|
368
|
+
end
|
|
369
|
+
end
|
|
370
|
+
end
|
|
371
|
+
end
|
|
372
|
+
|
|
373
|
+
when_the_repository 'has a cookbook' do
|
|
374
|
+
file 'cookbooks/x/metadata.rb', 'version "1.0.0"'
|
|
375
|
+
file 'cookbooks/x/z.rb', ''
|
|
376
|
+
|
|
377
|
+
when_the_chef_server 'has a modified, added and deleted file for the cookbook' do
|
|
378
|
+
cookbook 'x', '1.0.0', { 'metadata.rb' => 'version "1.0.0"', 'y.rb' => 'hi' }
|
|
379
|
+
|
|
380
|
+
it 'knife download of a modified file succeeds' do
|
|
381
|
+
knife('download /cookbooks/x/metadata.rb').should_succeed "Updated /cookbooks/x/metadata.rb\n"
|
|
382
|
+
knife('diff --name-status /cookbooks').should_succeed <<EOM
|
|
383
|
+
D\t/cookbooks/x/y.rb
|
|
384
|
+
A\t/cookbooks/x/z.rb
|
|
385
|
+
EOM
|
|
386
|
+
end
|
|
387
|
+
it 'knife download of a deleted file does nothing' do
|
|
388
|
+
knife('download /cookbooks/x/z.rb').should_succeed ''
|
|
389
|
+
knife('diff --name-status /cookbooks').should_succeed <<EOM
|
|
390
|
+
M\t/cookbooks/x/metadata.rb
|
|
391
|
+
D\t/cookbooks/x/y.rb
|
|
392
|
+
A\t/cookbooks/x/z.rb
|
|
393
|
+
EOM
|
|
394
|
+
end
|
|
395
|
+
it 'knife download --purge of a deleted file succeeds' do
|
|
396
|
+
knife('download --purge /cookbooks/x/z.rb').should_succeed "Deleted extra entry /cookbooks/x/z.rb (purge is on)\n"
|
|
397
|
+
knife('diff --name-status /cookbooks').should_succeed <<EOM
|
|
398
|
+
M\t/cookbooks/x/metadata.rb
|
|
399
|
+
D\t/cookbooks/x/y.rb
|
|
400
|
+
EOM
|
|
401
|
+
end
|
|
402
|
+
it 'knife download of an added file succeeds' do
|
|
403
|
+
knife('download /cookbooks/x/y.rb').should_succeed "Created /cookbooks/x/y.rb\n"
|
|
404
|
+
knife('diff --name-status /cookbooks').should_succeed <<EOM
|
|
405
|
+
M\t/cookbooks/x/metadata.rb
|
|
406
|
+
A\t/cookbooks/x/z.rb
|
|
407
|
+
EOM
|
|
408
|
+
end
|
|
409
|
+
it 'knife download of the cookbook itself succeeds' do
|
|
410
|
+
knife('download /cookbooks/x').should_succeed <<EOM
|
|
411
|
+
Updated /cookbooks/x/metadata.rb
|
|
412
|
+
Created /cookbooks/x/y.rb
|
|
413
|
+
EOM
|
|
414
|
+
knife('diff --name-status /cookbooks').should_succeed <<EOM
|
|
415
|
+
A\t/cookbooks/x/z.rb
|
|
416
|
+
EOM
|
|
417
|
+
end
|
|
418
|
+
it 'knife download --purge of the cookbook itself succeeds' do
|
|
419
|
+
knife('download --purge /cookbooks/x').should_succeed <<EOM
|
|
420
|
+
Updated /cookbooks/x/metadata.rb
|
|
421
|
+
Created /cookbooks/x/y.rb
|
|
422
|
+
Deleted extra entry /cookbooks/x/z.rb (purge is on)
|
|
423
|
+
EOM
|
|
424
|
+
knife('diff --name-status /cookbooks').should_succeed ''
|
|
425
|
+
end
|
|
426
|
+
end
|
|
427
|
+
end
|
|
428
|
+
|
|
429
|
+
when_the_repository 'has a cookbook' do
|
|
430
|
+
file 'cookbooks/x/metadata.rb', 'version "1.0.0"'
|
|
431
|
+
file 'cookbooks/x/onlyin1.0.0.rb', 'old_text'
|
|
432
|
+
|
|
433
|
+
when_the_chef_server 'has a later version for the cookbook' do
|
|
434
|
+
cookbook 'x', '1.0.0', { 'metadata.rb' => 'version "1.0.0"', 'onlyin1.0.0.rb' => '' }
|
|
435
|
+
cookbook 'x', '1.0.1', { 'metadata.rb' => 'version "1.0.1"', 'onlyin1.0.1.rb' => 'hi' }
|
|
436
|
+
|
|
437
|
+
it 'knife download /cookbooks/x downloads the latest version' do
|
|
438
|
+
knife('download --purge /cookbooks/x').should_succeed <<EOM
|
|
439
|
+
Updated /cookbooks/x/metadata.rb
|
|
440
|
+
Created /cookbooks/x/onlyin1.0.1.rb
|
|
441
|
+
Deleted extra entry /cookbooks/x/onlyin1.0.0.rb (purge is on)
|
|
442
|
+
EOM
|
|
443
|
+
knife('diff --name-status /cookbooks').should_succeed ''
|
|
444
|
+
end
|
|
445
|
+
end
|
|
446
|
+
|
|
447
|
+
when_the_chef_server 'has an earlier version for the cookbook' do
|
|
448
|
+
cookbook 'x', '1.0.0', { 'metadata.rb' => 'version "1.0.0"', 'onlyin1.0.0.rb' => ''}
|
|
449
|
+
cookbook 'x', '0.9.9', { 'metadata.rb' => 'version "0.9.9"', 'onlyin0.9.9.rb' => 'hi' }
|
|
450
|
+
it 'knife download /cookbooks/x downloads the updated file' do
|
|
451
|
+
knife('download --purge /cookbooks/x').should_succeed <<EOM
|
|
452
|
+
Updated /cookbooks/x/onlyin1.0.0.rb
|
|
453
|
+
EOM
|
|
454
|
+
knife('diff --name-status /cookbooks').should_succeed ''
|
|
455
|
+
end
|
|
456
|
+
end
|
|
457
|
+
|
|
458
|
+
when_the_chef_server 'has a later version for the cookbook, and no current version' do
|
|
459
|
+
cookbook 'x', '1.0.1', { 'metadata.rb' => 'version "1.0.1"', 'onlyin1.0.1.rb' => 'hi' }
|
|
460
|
+
|
|
461
|
+
it 'knife download /cookbooks/x downloads the latest version' do
|
|
462
|
+
knife('download --purge /cookbooks/x').should_succeed <<EOM
|
|
463
|
+
Updated /cookbooks/x/metadata.rb
|
|
464
|
+
Created /cookbooks/x/onlyin1.0.1.rb
|
|
465
|
+
Deleted extra entry /cookbooks/x/onlyin1.0.0.rb (purge is on)
|
|
466
|
+
EOM
|
|
467
|
+
knife('diff --name-status /cookbooks').should_succeed ''
|
|
468
|
+
end
|
|
469
|
+
end
|
|
470
|
+
|
|
471
|
+
when_the_chef_server 'has an earlier version for the cookbook, and no current version' do
|
|
472
|
+
cookbook 'x', '0.9.9', { 'metadata.rb' => 'version "0.9.9"', 'onlyin0.9.9.rb' => 'hi' }
|
|
473
|
+
|
|
474
|
+
it 'knife download /cookbooks/x downloads the old version' do
|
|
475
|
+
knife('download --purge /cookbooks/x').should_succeed <<EOM
|
|
476
|
+
Updated /cookbooks/x/metadata.rb
|
|
477
|
+
Created /cookbooks/x/onlyin0.9.9.rb
|
|
478
|
+
Deleted extra entry /cookbooks/x/onlyin1.0.0.rb (purge is on)
|
|
479
|
+
EOM
|
|
480
|
+
knife('diff --name-status /cookbooks').should_succeed ''
|
|
481
|
+
end
|
|
482
|
+
end
|
|
483
|
+
end
|
|
484
|
+
|
|
485
|
+
when_the_chef_server 'has an environment' do
|
|
486
|
+
environment 'x', {}
|
|
487
|
+
when_the_repository 'has an environment with bad JSON' do
|
|
488
|
+
file 'environments/x.json', '{'
|
|
489
|
+
it 'knife download succeeds' do
|
|
490
|
+
knife('download /environments/x.json').should_succeed "Updated /environments/x.json\n", :stderr => "WARN: Parse error reading #{path_to('environments/x.json')} as JSON: A JSON text must at least contain two octets!\n"
|
|
491
|
+
knife('diff --name-status /environments/x.json').should_succeed ''
|
|
492
|
+
end
|
|
493
|
+
end
|
|
494
|
+
|
|
495
|
+
when_the_repository 'has the same environment with the wrong name in the file' do
|
|
496
|
+
file 'environments/x.json', { 'name' => 'y' }
|
|
497
|
+
it 'knife download succeeds' do
|
|
498
|
+
knife('download /environments/x.json').should_succeed "Updated /environments/x.json\n"
|
|
499
|
+
knife('diff --name-status /environments/x.json').should_succeed ''
|
|
500
|
+
end
|
|
501
|
+
end
|
|
502
|
+
|
|
503
|
+
when_the_repository 'has the same environment with no name in the file' do
|
|
504
|
+
file 'environments/x.json', { 'description' => 'hi' }
|
|
505
|
+
it 'knife download succeeds' do
|
|
506
|
+
knife('download /environments/x.json').should_succeed "Updated /environments/x.json\n"
|
|
507
|
+
knife('diff --name-status /environments/x.json').should_succeed ''
|
|
508
|
+
end
|
|
509
|
+
end
|
|
510
|
+
end
|
|
511
|
+
end # without versioned cookbooks
|
|
512
|
+
|
|
513
|
+
with_versioned_cookbooks do
|
|
514
|
+
when_the_chef_server "has one of each thing" do
|
|
515
|
+
client 'x', {}
|
|
516
|
+
cookbook 'x', '1.0.0', { 'metadata.rb' => 'version "1.0.0"' }
|
|
517
|
+
data_bag 'x', { 'y' => {} }
|
|
518
|
+
environment 'x', {}
|
|
519
|
+
node 'x', {}
|
|
520
|
+
role 'x', {}
|
|
521
|
+
user 'x', {}
|
|
522
|
+
|
|
523
|
+
when_the_repository 'has only top-level directories' do
|
|
524
|
+
directory 'clients'
|
|
525
|
+
directory 'cookbooks'
|
|
526
|
+
directory 'data_bags'
|
|
527
|
+
directory 'environments'
|
|
528
|
+
directory 'nodes'
|
|
529
|
+
directory 'roles'
|
|
530
|
+
directory 'users'
|
|
531
|
+
|
|
532
|
+
it 'knife download downloads everything' do
|
|
533
|
+
knife('download /').should_succeed <<EOM
|
|
534
|
+
Created /clients/chef-validator.json
|
|
535
|
+
Created /clients/chef-webui.json
|
|
536
|
+
Created /clients/x.json
|
|
537
|
+
Created /cookbooks/x-1.0.0
|
|
538
|
+
Created /cookbooks/x-1.0.0/metadata.rb
|
|
539
|
+
Created /data_bags/x
|
|
540
|
+
Created /data_bags/x/y.json
|
|
541
|
+
Created /environments/_default.json
|
|
542
|
+
Created /environments/x.json
|
|
543
|
+
Created /nodes/x.json
|
|
544
|
+
Created /roles/x.json
|
|
545
|
+
Created /users/admin.json
|
|
546
|
+
Created /users/x.json
|
|
547
|
+
EOM
|
|
548
|
+
knife('diff --name-status /').should_succeed ''
|
|
549
|
+
end
|
|
550
|
+
end
|
|
551
|
+
|
|
552
|
+
when_the_repository 'has an identical copy of each thing' do
|
|
553
|
+
file 'clients/chef-validator.json', { 'validator' => true, 'public_key' => ChefZero::PUBLIC_KEY }
|
|
554
|
+
file 'clients/chef-webui.json', { 'admin' => true, 'public_key' => ChefZero::PUBLIC_KEY }
|
|
555
|
+
file 'clients/x.json', { 'public_key' => ChefZero::PUBLIC_KEY }
|
|
556
|
+
file 'cookbooks/x-1.0.0/metadata.rb', 'version "1.0.0"'
|
|
557
|
+
file 'data_bags/x/y.json', {}
|
|
558
|
+
file 'environments/_default.json', { "description" => "The default Chef environment" }
|
|
559
|
+
file 'environments/x.json', {}
|
|
560
|
+
file 'nodes/x.json', {}
|
|
561
|
+
file 'roles/x.json', {}
|
|
562
|
+
file 'users/admin.json', { 'admin' => true, 'public_key' => ChefZero::PUBLIC_KEY }
|
|
563
|
+
file 'users/x.json', { 'public_key' => ChefZero::PUBLIC_KEY }
|
|
564
|
+
|
|
565
|
+
it 'knife download makes no changes' do
|
|
566
|
+
knife('download /').should_succeed ''
|
|
567
|
+
knife('diff --name-status /').should_succeed ''
|
|
568
|
+
end
|
|
569
|
+
|
|
570
|
+
it 'knife download --purge makes no changes' do
|
|
571
|
+
knife('download --purge /').should_succeed ''
|
|
572
|
+
knife('diff --name-status /').should_succeed ''
|
|
573
|
+
end
|
|
574
|
+
|
|
575
|
+
context 'except the role file' do
|
|
576
|
+
file 'roles/x.json', { "description" => "blarghle" }
|
|
577
|
+
|
|
578
|
+
it 'knife download changes the role' do
|
|
579
|
+
knife('download /').should_succeed "Updated /roles/x.json\n"
|
|
580
|
+
knife('diff --name-status /').should_succeed ''
|
|
581
|
+
end
|
|
582
|
+
end
|
|
583
|
+
|
|
584
|
+
context 'except the role file is textually different, but not ACTUALLY different' do
|
|
585
|
+
file 'roles/x.json', <<EOM
|
|
586
|
+
{
|
|
587
|
+
"chef_type": "role" ,
|
|
588
|
+
"default_attributes": {
|
|
589
|
+
},
|
|
590
|
+
"env_run_lists": {
|
|
591
|
+
},
|
|
592
|
+
"json_class": "Chef::Role",
|
|
593
|
+
"name": "x",
|
|
594
|
+
"description": "",
|
|
595
|
+
"override_attributes": {
|
|
596
|
+
},
|
|
597
|
+
"run_list": [
|
|
598
|
+
|
|
599
|
+
]
|
|
600
|
+
}
|
|
601
|
+
EOM
|
|
602
|
+
it 'knife download / does not change anything' do
|
|
603
|
+
knife('download /').should_succeed ''
|
|
604
|
+
knife('diff --name-status /').should_succeed ''
|
|
605
|
+
end
|
|
606
|
+
end
|
|
607
|
+
|
|
608
|
+
context 'as well as one extra copy of each thing' do
|
|
609
|
+
file 'clients/y.json', { 'public_key' => ChefZero::PUBLIC_KEY }
|
|
610
|
+
file 'cookbooks/x-1.0.0/blah.rb', ''
|
|
611
|
+
file 'cookbooks/x-2.0.0/metadata.rb', 'version "2.0.0"'
|
|
612
|
+
file 'cookbooks/y-1.0.0/metadata.rb', 'version "1.0.0"'
|
|
613
|
+
file 'data_bags/x/z.json', {}
|
|
614
|
+
file 'data_bags/y/zz.json', {}
|
|
615
|
+
file 'environments/y.json', {}
|
|
616
|
+
file 'nodes/y.json', {}
|
|
617
|
+
file 'roles/y.json', {}
|
|
618
|
+
file 'users/y.json', { 'public_key' => ChefZero::PUBLIC_KEY }
|
|
619
|
+
|
|
620
|
+
it 'knife download does nothing' do
|
|
621
|
+
knife('download /').should_succeed ''
|
|
622
|
+
knife('diff --name-status /').should_succeed <<EOM
|
|
623
|
+
A\t/clients/y.json
|
|
624
|
+
A\t/cookbooks/x-1.0.0/blah.rb
|
|
625
|
+
A\t/cookbooks/x-2.0.0
|
|
626
|
+
A\t/cookbooks/y-1.0.0
|
|
627
|
+
A\t/data_bags/x/z.json
|
|
628
|
+
A\t/data_bags/y
|
|
629
|
+
A\t/environments/y.json
|
|
630
|
+
A\t/nodes/y.json
|
|
631
|
+
A\t/roles/y.json
|
|
632
|
+
A\t/users/y.json
|
|
633
|
+
EOM
|
|
634
|
+
end
|
|
635
|
+
|
|
636
|
+
it 'knife download --purge deletes the extra files' do
|
|
637
|
+
knife('download --purge /').should_succeed <<EOM
|
|
638
|
+
Deleted extra entry /clients/y.json (purge is on)
|
|
639
|
+
Deleted extra entry /cookbooks/x-1.0.0/blah.rb (purge is on)
|
|
640
|
+
Deleted extra entry /cookbooks/x-2.0.0 (purge is on)
|
|
641
|
+
Deleted extra entry /cookbooks/y-1.0.0 (purge is on)
|
|
642
|
+
Deleted extra entry /data_bags/x/z.json (purge is on)
|
|
643
|
+
Deleted extra entry /data_bags/y (purge is on)
|
|
644
|
+
Deleted extra entry /environments/y.json (purge is on)
|
|
645
|
+
Deleted extra entry /nodes/y.json (purge is on)
|
|
646
|
+
Deleted extra entry /roles/y.json (purge is on)
|
|
647
|
+
Deleted extra entry /users/y.json (purge is on)
|
|
648
|
+
EOM
|
|
649
|
+
knife('diff --name-status /').should_succeed ''
|
|
650
|
+
end
|
|
651
|
+
end
|
|
652
|
+
end
|
|
653
|
+
|
|
654
|
+
when_the_repository 'is empty' do
|
|
655
|
+
it 'knife download creates the extra files' do
|
|
656
|
+
knife('download /').should_succeed <<EOM
|
|
657
|
+
Created /clients
|
|
658
|
+
Created /clients/chef-validator.json
|
|
659
|
+
Created /clients/chef-webui.json
|
|
660
|
+
Created /clients/x.json
|
|
661
|
+
Created /cookbooks
|
|
662
|
+
Created /cookbooks/x-1.0.0
|
|
663
|
+
Created /cookbooks/x-1.0.0/metadata.rb
|
|
664
|
+
Created /data_bags
|
|
665
|
+
Created /data_bags/x
|
|
666
|
+
Created /data_bags/x/y.json
|
|
667
|
+
Created /environments
|
|
668
|
+
Created /environments/_default.json
|
|
669
|
+
Created /environments/x.json
|
|
670
|
+
Created /nodes
|
|
671
|
+
Created /nodes/x.json
|
|
672
|
+
Created /roles
|
|
673
|
+
Created /roles/x.json
|
|
674
|
+
Created /users
|
|
675
|
+
Created /users/admin.json
|
|
676
|
+
Created /users/x.json
|
|
677
|
+
EOM
|
|
678
|
+
knife('diff --name-status /').should_succeed ''
|
|
679
|
+
end
|
|
680
|
+
|
|
681
|
+
context 'when current directory is top level' do
|
|
682
|
+
cwd '.'
|
|
683
|
+
it 'knife download with no parameters reports an error' do
|
|
684
|
+
knife('download').should_fail "FATAL: Must specify at least one argument. If you want to download everything in this directory, type \"knife download .\"\n", :stdout => /USAGE/
|
|
685
|
+
end
|
|
686
|
+
end
|
|
687
|
+
end
|
|
688
|
+
end
|
|
689
|
+
|
|
690
|
+
# Test download of an item when the other end doesn't even have the container
|
|
691
|
+
when_the_repository 'is empty' do
|
|
692
|
+
when_the_chef_server 'has two data bag items' do
|
|
693
|
+
data_bag 'x', { 'y' => {}, 'z' => {} }
|
|
694
|
+
|
|
695
|
+
it 'knife download of one data bag item itself succeeds' do
|
|
696
|
+
knife('download /data_bags/x/y.json').should_succeed <<EOM
|
|
697
|
+
Created /data_bags
|
|
698
|
+
Created /data_bags/x
|
|
699
|
+
Created /data_bags/x/y.json
|
|
700
|
+
EOM
|
|
701
|
+
knife('diff --name-status /data_bags').should_succeed <<EOM
|
|
702
|
+
D\t/data_bags/x/z.json
|
|
703
|
+
EOM
|
|
704
|
+
end
|
|
705
|
+
end
|
|
706
|
+
end
|
|
707
|
+
|
|
708
|
+
when_the_repository 'has three data bag items' do
|
|
709
|
+
file 'data_bags/x/deleted.json', <<EOM
|
|
710
|
+
{
|
|
711
|
+
"id": "deleted"
|
|
712
|
+
}
|
|
713
|
+
EOM
|
|
714
|
+
file 'data_bags/x/modified.json', <<EOM
|
|
715
|
+
{
|
|
716
|
+
"id": "modified"
|
|
717
|
+
}
|
|
718
|
+
EOM
|
|
719
|
+
file 'data_bags/x/unmodified.json', <<EOM
|
|
720
|
+
{
|
|
721
|
+
"id": "unmodified"
|
|
722
|
+
}
|
|
723
|
+
EOM
|
|
724
|
+
|
|
725
|
+
when_the_chef_server 'has a modified, unmodified, added and deleted data bag item' do
|
|
726
|
+
data_bag 'x', {
|
|
727
|
+
'added' => {},
|
|
728
|
+
'modified' => { 'foo' => 'bar' },
|
|
729
|
+
'unmodified' => {}
|
|
730
|
+
}
|
|
731
|
+
|
|
732
|
+
it 'knife download of the modified file succeeds' do
|
|
733
|
+
knife('download /data_bags/x/modified.json').should_succeed <<EOM
|
|
734
|
+
Updated /data_bags/x/modified.json
|
|
735
|
+
EOM
|
|
736
|
+
knife('diff --name-status /data_bags').should_succeed <<EOM
|
|
737
|
+
D\t/data_bags/x/added.json
|
|
738
|
+
A\t/data_bags/x/deleted.json
|
|
739
|
+
EOM
|
|
740
|
+
end
|
|
741
|
+
it 'knife download of the unmodified file does nothing' do
|
|
742
|
+
knife('download /data_bags/x/unmodified.json').should_succeed ''
|
|
743
|
+
knife('diff --name-status /data_bags').should_succeed <<EOM
|
|
744
|
+
D\t/data_bags/x/added.json
|
|
745
|
+
M\t/data_bags/x/modified.json
|
|
746
|
+
A\t/data_bags/x/deleted.json
|
|
747
|
+
EOM
|
|
748
|
+
end
|
|
749
|
+
it 'knife download of the added file succeeds' do
|
|
750
|
+
knife('download /data_bags/x/added.json').should_succeed <<EOM
|
|
751
|
+
Created /data_bags/x/added.json
|
|
752
|
+
EOM
|
|
753
|
+
knife('diff --name-status /data_bags').should_succeed <<EOM
|
|
754
|
+
M\t/data_bags/x/modified.json
|
|
755
|
+
A\t/data_bags/x/deleted.json
|
|
756
|
+
EOM
|
|
757
|
+
end
|
|
758
|
+
it 'knife download of the deleted file does nothing' do
|
|
759
|
+
knife('download /data_bags/x/deleted.json').should_succeed ''
|
|
760
|
+
knife('diff --name-status /data_bags').should_succeed <<EOM
|
|
761
|
+
D\t/data_bags/x/added.json
|
|
762
|
+
M\t/data_bags/x/modified.json
|
|
763
|
+
A\t/data_bags/x/deleted.json
|
|
764
|
+
EOM
|
|
765
|
+
end
|
|
766
|
+
it 'knife download --purge of the deleted file deletes it' do
|
|
767
|
+
knife('download --purge /data_bags/x/deleted.json').should_succeed <<EOM
|
|
768
|
+
Deleted extra entry /data_bags/x/deleted.json (purge is on)
|
|
769
|
+
EOM
|
|
770
|
+
knife('diff --name-status /data_bags').should_succeed <<EOM
|
|
771
|
+
D\t/data_bags/x/added.json
|
|
772
|
+
M\t/data_bags/x/modified.json
|
|
773
|
+
EOM
|
|
774
|
+
end
|
|
775
|
+
it 'knife download of the entire data bag downloads everything' do
|
|
776
|
+
knife('download /data_bags/x').should_succeed <<EOM
|
|
777
|
+
Created /data_bags/x/added.json
|
|
778
|
+
Updated /data_bags/x/modified.json
|
|
779
|
+
EOM
|
|
780
|
+
knife('diff --name-status /data_bags').should_succeed <<EOM
|
|
781
|
+
A\t/data_bags/x/deleted.json
|
|
782
|
+
EOM
|
|
783
|
+
end
|
|
784
|
+
it 'knife download --purge of the entire data bag downloads everything' do
|
|
785
|
+
knife('download --purge /data_bags/x').should_succeed <<EOM
|
|
786
|
+
Created /data_bags/x/added.json
|
|
787
|
+
Updated /data_bags/x/modified.json
|
|
788
|
+
Deleted extra entry /data_bags/x/deleted.json (purge is on)
|
|
789
|
+
EOM
|
|
790
|
+
knife('diff --name-status /data_bags').should_succeed ''
|
|
791
|
+
end
|
|
792
|
+
context 'when cwd is the /data_bags directory' do
|
|
793
|
+
cwd 'data_bags'
|
|
794
|
+
it 'knife download fails' do
|
|
795
|
+
knife('download').should_fail "FATAL: Must specify at least one argument. If you want to download everything in this directory, type \"knife download .\"\n", :stdout => /USAGE/
|
|
796
|
+
end
|
|
797
|
+
it 'knife download --purge . downloads everything' do
|
|
798
|
+
knife('download --purge .').should_succeed <<EOM
|
|
799
|
+
Created x/added.json
|
|
800
|
+
Updated x/modified.json
|
|
801
|
+
Deleted extra entry x/deleted.json (purge is on)
|
|
802
|
+
EOM
|
|
803
|
+
knife('diff --name-status /data_bags').should_succeed ''
|
|
804
|
+
end
|
|
805
|
+
it 'knife download --purge * downloads everything' do
|
|
806
|
+
knife('download --purge *').should_succeed <<EOM
|
|
807
|
+
Created x/added.json
|
|
808
|
+
Updated x/modified.json
|
|
809
|
+
Deleted extra entry x/deleted.json (purge is on)
|
|
810
|
+
EOM
|
|
811
|
+
knife('diff --name-status /data_bags').should_succeed ''
|
|
812
|
+
end
|
|
813
|
+
end
|
|
814
|
+
end
|
|
815
|
+
end
|
|
816
|
+
|
|
817
|
+
when_the_repository 'has a cookbook' do
|
|
818
|
+
file 'cookbooks/x-1.0.0/metadata.rb', 'version "1.0.0"'
|
|
819
|
+
file 'cookbooks/x-1.0.0/z.rb', ''
|
|
820
|
+
|
|
821
|
+
when_the_chef_server 'has a modified, added and deleted file for the cookbook' do
|
|
822
|
+
cookbook 'x', '1.0.0', { 'metadata.rb' => 'version "1.0.0"', 'y.rb' => 'hi' }
|
|
823
|
+
|
|
824
|
+
it 'knife download of a modified file succeeds' do
|
|
825
|
+
knife('download /cookbooks/x-1.0.0/metadata.rb').should_succeed "Updated /cookbooks/x-1.0.0/metadata.rb\n"
|
|
826
|
+
knife('diff --name-status /cookbooks').should_succeed <<EOM
|
|
827
|
+
D\t/cookbooks/x-1.0.0/y.rb
|
|
828
|
+
A\t/cookbooks/x-1.0.0/z.rb
|
|
829
|
+
EOM
|
|
830
|
+
end
|
|
831
|
+
it 'knife download of a deleted file does nothing' do
|
|
832
|
+
knife('download /cookbooks/x-1.0.0/z.rb').should_succeed ''
|
|
833
|
+
knife('diff --name-status /cookbooks').should_succeed <<EOM
|
|
834
|
+
M\t/cookbooks/x-1.0.0/metadata.rb
|
|
835
|
+
D\t/cookbooks/x-1.0.0/y.rb
|
|
836
|
+
A\t/cookbooks/x-1.0.0/z.rb
|
|
837
|
+
EOM
|
|
838
|
+
end
|
|
839
|
+
it 'knife download --purge of a deleted file succeeds' do
|
|
840
|
+
knife('download --purge /cookbooks/x-1.0.0/z.rb').should_succeed "Deleted extra entry /cookbooks/x-1.0.0/z.rb (purge is on)\n"
|
|
841
|
+
knife('diff --name-status /cookbooks').should_succeed <<EOM
|
|
842
|
+
M\t/cookbooks/x-1.0.0/metadata.rb
|
|
843
|
+
D\t/cookbooks/x-1.0.0/y.rb
|
|
844
|
+
EOM
|
|
845
|
+
end
|
|
846
|
+
it 'knife download of an added file succeeds' do
|
|
847
|
+
knife('download /cookbooks/x-1.0.0/y.rb').should_succeed "Created /cookbooks/x-1.0.0/y.rb\n"
|
|
848
|
+
knife('diff --name-status /cookbooks').should_succeed <<EOM
|
|
849
|
+
M\t/cookbooks/x-1.0.0/metadata.rb
|
|
850
|
+
A\t/cookbooks/x-1.0.0/z.rb
|
|
851
|
+
EOM
|
|
852
|
+
end
|
|
853
|
+
it 'knife download of the cookbook itself succeeds' do
|
|
854
|
+
knife('download /cookbooks/x-1.0.0').should_succeed <<EOM
|
|
855
|
+
Updated /cookbooks/x-1.0.0/metadata.rb
|
|
856
|
+
Created /cookbooks/x-1.0.0/y.rb
|
|
857
|
+
EOM
|
|
858
|
+
knife('diff --name-status /cookbooks').should_succeed <<EOM
|
|
859
|
+
A\t/cookbooks/x-1.0.0/z.rb
|
|
860
|
+
EOM
|
|
861
|
+
end
|
|
862
|
+
it 'knife download --purge of the cookbook itself succeeds' do
|
|
863
|
+
knife('download --purge /cookbooks/x-1.0.0').should_succeed <<EOM
|
|
864
|
+
Updated /cookbooks/x-1.0.0/metadata.rb
|
|
865
|
+
Created /cookbooks/x-1.0.0/y.rb
|
|
866
|
+
Deleted extra entry /cookbooks/x-1.0.0/z.rb (purge is on)
|
|
867
|
+
EOM
|
|
868
|
+
knife('diff --name-status /cookbooks').should_succeed ''
|
|
869
|
+
end
|
|
870
|
+
end
|
|
871
|
+
end
|
|
872
|
+
|
|
873
|
+
when_the_repository 'has a cookbook' do
|
|
874
|
+
file 'cookbooks/x-1.0.0/metadata.rb', 'version "1.0.0"'
|
|
875
|
+
file 'cookbooks/x-1.0.0/onlyin1.0.0.rb', 'old_text'
|
|
876
|
+
|
|
877
|
+
when_the_chef_server 'has a later version for the cookbook' do
|
|
878
|
+
cookbook 'x', '1.0.0', { 'metadata.rb' => 'version "1.0.0"', 'onlyin1.0.0.rb' => '' }
|
|
879
|
+
cookbook 'x', '1.0.1', { 'metadata.rb' => 'version "1.0.1"', 'onlyin1.0.1.rb' => 'hi' }
|
|
880
|
+
|
|
881
|
+
it 'knife download /cookbooks/x downloads the latest version' do
|
|
882
|
+
knife('download --purge /cookbooks').should_succeed <<EOM
|
|
883
|
+
Updated /cookbooks/x-1.0.0/onlyin1.0.0.rb
|
|
884
|
+
Created /cookbooks/x-1.0.1
|
|
885
|
+
Created /cookbooks/x-1.0.1/metadata.rb
|
|
886
|
+
Created /cookbooks/x-1.0.1/onlyin1.0.1.rb
|
|
887
|
+
EOM
|
|
888
|
+
knife('diff --name-status /cookbooks').should_succeed ''
|
|
889
|
+
end
|
|
890
|
+
end
|
|
891
|
+
|
|
892
|
+
when_the_chef_server 'has an earlier version for the cookbook' do
|
|
893
|
+
cookbook 'x', '1.0.0', { 'metadata.rb' => 'version "1.0.0"', 'onlyin1.0.0.rb' => ''}
|
|
894
|
+
cookbook 'x', '0.9.9', { 'metadata.rb' => 'version "0.9.9"', 'onlyin0.9.9.rb' => 'hi' }
|
|
895
|
+
it 'knife download /cookbooks downloads the updated file' do
|
|
896
|
+
knife('download --purge /cookbooks').should_succeed <<EOM
|
|
897
|
+
Created /cookbooks/x-0.9.9
|
|
898
|
+
Created /cookbooks/x-0.9.9/metadata.rb
|
|
899
|
+
Created /cookbooks/x-0.9.9/onlyin0.9.9.rb
|
|
900
|
+
Updated /cookbooks/x-1.0.0/onlyin1.0.0.rb
|
|
901
|
+
EOM
|
|
902
|
+
knife('diff --name-status /cookbooks').should_succeed ''
|
|
903
|
+
end
|
|
904
|
+
end
|
|
905
|
+
|
|
906
|
+
when_the_chef_server 'has a later version for the cookbook, and no current version' do
|
|
907
|
+
cookbook 'x', '1.0.1', { 'metadata.rb' => 'version "1.0.1"', 'onlyin1.0.1.rb' => 'hi' }
|
|
908
|
+
|
|
909
|
+
it 'knife download /cookbooks/x downloads the latest version' do
|
|
910
|
+
knife('download --purge /cookbooks').should_succeed <<EOM
|
|
911
|
+
Created /cookbooks/x-1.0.1
|
|
912
|
+
Created /cookbooks/x-1.0.1/metadata.rb
|
|
913
|
+
Created /cookbooks/x-1.0.1/onlyin1.0.1.rb
|
|
914
|
+
Deleted extra entry /cookbooks/x-1.0.0 (purge is on)
|
|
915
|
+
EOM
|
|
916
|
+
knife('diff --name-status /cookbooks').should_succeed ''
|
|
917
|
+
end
|
|
918
|
+
end
|
|
919
|
+
|
|
920
|
+
when_the_chef_server 'has an earlier version for the cookbook, and no current version' do
|
|
921
|
+
cookbook 'x', '0.9.9', { 'metadata.rb' => 'version "0.9.9"', 'onlyin0.9.9.rb' => 'hi' }
|
|
922
|
+
|
|
923
|
+
it 'knife download --purge /cookbooks downloads the old version and deletes the new version' do
|
|
924
|
+
knife('download --purge /cookbooks').should_succeed <<EOM
|
|
925
|
+
Created /cookbooks/x-0.9.9
|
|
926
|
+
Created /cookbooks/x-0.9.9/metadata.rb
|
|
927
|
+
Created /cookbooks/x-0.9.9/onlyin0.9.9.rb
|
|
928
|
+
Deleted extra entry /cookbooks/x-1.0.0 (purge is on)
|
|
929
|
+
EOM
|
|
930
|
+
knife('diff --name-status /cookbooks').should_succeed ''
|
|
931
|
+
end
|
|
932
|
+
end
|
|
933
|
+
end
|
|
934
|
+
|
|
935
|
+
when_the_chef_server 'has an environment' do
|
|
936
|
+
environment 'x', {}
|
|
937
|
+
when_the_repository 'has an environment with bad JSON' do
|
|
938
|
+
file 'environments/x.json', '{'
|
|
939
|
+
it 'knife download succeeds' do
|
|
940
|
+
knife('download /environments/x.json').should_succeed "Updated /environments/x.json\n", :stderr => "WARN: Parse error reading #{path_to('environments/x.json')} as JSON: A JSON text must at least contain two octets!\n"
|
|
941
|
+
knife('diff --name-status /environments/x.json').should_succeed ''
|
|
942
|
+
end
|
|
943
|
+
end
|
|
944
|
+
|
|
945
|
+
when_the_repository 'has the same environment with the wrong name in the file' do
|
|
946
|
+
file 'environments/x.json', { 'name' => 'y' }
|
|
947
|
+
it 'knife download succeeds' do
|
|
948
|
+
knife('download /environments/x.json').should_succeed "Updated /environments/x.json\n"
|
|
949
|
+
knife('diff --name-status /environments/x.json').should_succeed ''
|
|
950
|
+
end
|
|
951
|
+
end
|
|
952
|
+
|
|
953
|
+
when_the_repository 'has the same environment with no name in the file' do
|
|
954
|
+
file 'environments/x.json', { 'description' => 'hi' }
|
|
955
|
+
it 'knife download succeeds' do
|
|
956
|
+
knife('download /environments/x.json').should_succeed "Updated /environments/x.json\n"
|
|
957
|
+
knife('diff --name-status /environments/x.json').should_succeed ''
|
|
958
|
+
end
|
|
959
|
+
end
|
|
960
|
+
end
|
|
961
|
+
end # with versioned cookbooks
|
|
962
|
+
end
|