RubyGems - chef - Versions diffs - 12.10.24 → 12.11.18 - Mend

chef 12.10.24 → 12.11.18

Files changed (523) hide show

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-shell +0 -0
data/bin/chef-solo +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

data/distro/common/html/knife_diff.html CHANGED

@@ -1,123 +1,123 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>knife diff &mdash; chef-client Man Pages</title>
-    <link rel="stylesheet" href="_static/guide.css" type="text/css" />
-    <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
-    <script type="text/javascript">
-      var DOCUMENTATION_OPTIONS = {
-        URL_ROOT:    './',
-        VERSION:     '',
-        COLLAPSE_INDEX: false,
-        FILE_SUFFIX: '.html',
-        HAS_SOURCE:  true
-      };
-    </script>
-    <script type="text/javascript" src="_static/jquery.js"></script>
-    <script type="text/javascript" src="_static/underscore.js"></script>
-    <script type="text/javascript" src="_static/doctools.js"></script>
-  </head>
-  <body>
-<div style="background-color: #212c35; text-align: left; padding: 0px 0px 0px 0px">
-<a href="http://docs.getchef.com/"><img src="_static/chef_html_logo.png" border="0" alt="Chef"/></a>
-</div>
-    <div class="document">
-      <div class="documentwrapper">
-          <div class="body">
-  <div class="section" id="knife-diff">
-<h1>knife diff<a class="headerlink" href="#knife-diff" title="Permalink to this headline">¶</a></h1>
-<p>The <strong>knife diff</strong> subcommand is used to compare the differences between files and directories on the Chef server and in the chef-repo. For example, to compare files on the Chef server prior to an uploading or downloading files using the <tt class="docutils literal"><span class="pre">knife</span> <span class="pre">download</span></tt> and <tt class="docutils literal"><span class="pre">knife</span> <span class="pre">upload</span></tt> subcommands, or to ensure that certain files in multiple production environments are the same. This subcommand is similar to the <tt class="docutils literal"><span class="pre">git</span> <span class="pre">diff</span></tt> command that can be used to diff what is in the chef-repo with what is synced to a git repository.</p>
-<div class="section" id="syntax">
-<h2>Syntax<a class="headerlink" href="#syntax" title="Permalink to this headline">¶</a></h2>
-<p>This subcommand has the following syntax:</p>
-<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>knife diff <span class="o">[</span>PATTERN...<span class="o">]</span> <span class="o">(</span>options<span class="o">)</span>
-</pre></div>
-</div>
-</div>
-<div class="section" id="options">
-<h2>Options<a class="headerlink" href="#options" title="Permalink to this headline">¶</a></h2>
-<div class="admonition note">
-<p class="first admonition-title">Note</p>
-<p class="last">Review the list of <a class="reference internal" href="knife_common_options.html"><em>common options</em></a> available to this (and all) knife subcommands and plugins.</p>
-</div>
-<p>This subcommand has the following options:</p>
-<dl class="docutils">
-<dt><tt class="docutils literal"><span class="pre">--chef-repo-path</span> <span class="pre">PATH</span></tt></dt>
-<dd>The path to the chef-repo. This setting will override the default path to the chef-repo. Default: same value as specified by <tt class="docutils literal"><span class="pre">chef_repo_path</span></tt> in client.rb.</dd>
-<dt><tt class="docutils literal"><span class="pre">--cookbook-version</span> <span class="pre">VERSION</span></tt></dt>
-<dd>The version of a cookbook to download.</dd>
-<dt><tt class="docutils literal"><span class="pre">--concurrency</span></tt></dt>
-<dd>The number of allowed concurrent connections. Default: <tt class="docutils literal"><span class="pre">10</span></tt>.</dd>
-<dt><tt class="docutils literal"><span class="pre">--diff-filter=[(A|D|M|T)...[*]]</span></tt></dt>
-<dd>Use to select only files that have been added (<tt class="docutils literal"><span class="pre">A</span></tt>), deleted (<tt class="docutils literal"><span class="pre">D</span></tt>), modified (<tt class="docutils literal"><span class="pre">M</span></tt>), and/or have had their type changed (<tt class="docutils literal"><span class="pre">T</span></tt>). Any combination of filter characters may be used, including no filter characters. Use <tt class="docutils literal"><span class="pre">*</span></tt> to select all paths if a file matches other criteria in the comparison. Default value: <tt class="docutils literal"><span class="pre">nil</span></tt>.</dd>
-<dt><tt class="docutils literal"><span class="pre">--name-only</span></tt></dt>
-<dd>Use to show only the names of modified files.</dd>
-<dt><tt class="docutils literal"><span class="pre">--name-status</span></tt></dt>
-<dd>Use to show only the names of files with a status of <tt class="docutils literal"><span class="pre">Added</span></tt>, <tt class="docutils literal"><span class="pre">Deleted</span></tt>, <tt class="docutils literal"><span class="pre">Modified</span></tt>, or <tt class="docutils literal"><span class="pre">Type</span> <span class="pre">Changed</span></tt>.</dd>
-<dt><tt class="docutils literal"><span class="pre">--no-recurse</span></tt></dt>
-<dd>Use <tt class="docutils literal"><span class="pre">--no-recurse</span></tt> to disable listing a directory recursively. Default: <tt class="docutils literal"><span class="pre">--recurse</span></tt>.</dd>
-<dt><tt class="docutils literal"><span class="pre">--repo-mode</span> <span class="pre">MODE</span></tt></dt>
-<dd>The layout of the local chef-repo. Possible values: <tt class="docutils literal"><span class="pre">static</span></tt>, <tt class="docutils literal"><span class="pre">everything</span></tt>, or <tt class="docutils literal"><span class="pre">hosted_everything</span></tt>. Use <tt class="docutils literal"><span class="pre">static</span></tt> for just roles, environments, cookbooks, and data bags. By default, <tt class="docutils literal"><span class="pre">everything</span></tt> and <tt class="docutils literal"><span class="pre">hosted_everything</span></tt> are dynamically selected depending on the server type. Default: <tt class="docutils literal"><span class="pre">everything</span></tt> / <tt class="docutils literal"><span class="pre">hosted_everything</span></tt>.</dd>
-</dl>
-</div>
-<div class="section" id="examples">
-<h2>Examples<a class="headerlink" href="#examples" title="Permalink to this headline">¶</a></h2>
-<p>The following examples show how to use this knife subcommand:</p>
-<p><strong>Compare files that contain JSON data</strong></p>
-<p>To compare the <tt class="docutils literal"><span class="pre">base.json</span></tt> role to a <tt class="docutils literal"><span class="pre">webserver.json</span></tt> role, enter:</p>
-<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>knife diff roles/base.json roles/webserver.json
-</pre></div>
-</div>
-<p><strong>Compare the chef-repo and the server</strong></p>
-<p>To compare the differences between the local chef-repo and the files that are on the Chef server, enter:</p>
-<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>knife diff
-</pre></div>
-</div>
-<p><strong>Compare, then return results</strong></p>
-<p>To diff a node named <tt class="docutils literal"><span class="pre">node-lb</span></tt> and then only return files that have been added, deleted, modified, or changed, enter:</p>
-<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>knife diff --name-status node-lb
-</pre></div>
-</div>
-<p>to return something like:</p>
-<div class="highlight-bash"><div class="highlight"><pre>node-lb/recipes/eip.rb
-node-lb/recipes/heartbeat-int.rb
-node-lb/templates/default/corpsite.conf.erb
-node-lb/files/default/wildcard.node.com.crt
-node-lb/files/default/wildcard.node.com.crt-2009
-node-lb/files/default/wildcard.node.com.key
-node-lb/.gitignore
-node-lb/Rakefile
-</pre></div>
-</div>
-</div>
-</div>
-          </div>
-      </div>
-      <div class="clearer"></div>
-    </div>
-  </body>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>knife diff &mdash; chef-client Man Pages</title>
+    <link rel="stylesheet" href="_static/guide.css" type="text/css" />
+    <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
+    <script type="text/javascript">
+      var DOCUMENTATION_OPTIONS = {
+        URL_ROOT:    './',
+        VERSION:     '',
+        COLLAPSE_INDEX: false,
+        FILE_SUFFIX: '.html',
+        HAS_SOURCE:  true
+      };
+    </script>
+    <script type="text/javascript" src="_static/jquery.js"></script>
+    <script type="text/javascript" src="_static/underscore.js"></script>
+    <script type="text/javascript" src="_static/doctools.js"></script>
+  </head>
+  <body>
+<div style="background-color: #212c35; text-align: left; padding: 0px 0px 0px 0px">
+<a href="http://docs.getchef.com/"><img src="_static/chef_html_logo.png" border="0" alt="Chef"/></a>
+</div>
+    <div class="document">
+      <div class="documentwrapper">
+          <div class="body">
+  <div class="section" id="knife-diff">
+<h1>knife diff<a class="headerlink" href="#knife-diff" title="Permalink to this headline">¶</a></h1>
+<p>The <strong>knife diff</strong> subcommand is used to compare the differences between files and directories on the Chef server and in the chef-repo. For example, to compare files on the Chef server prior to an uploading or downloading files using the <tt class="docutils literal"><span class="pre">knife</span> <span class="pre">download</span></tt> and <tt class="docutils literal"><span class="pre">knife</span> <span class="pre">upload</span></tt> subcommands, or to ensure that certain files in multiple production environments are the same. This subcommand is similar to the <tt class="docutils literal"><span class="pre">git</span> <span class="pre">diff</span></tt> command that can be used to diff what is in the chef-repo with what is synced to a git repository.</p>
+<div class="section" id="syntax">
+<h2>Syntax<a class="headerlink" href="#syntax" title="Permalink to this headline">¶</a></h2>
+<p>This subcommand has the following syntax:</p>
+<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>knife diff <span class="o">[</span>PATTERN...<span class="o">]</span> <span class="o">(</span>options<span class="o">)</span>
+</pre></div>
+</div>
+</div>
+<div class="section" id="options">
+<h2>Options<a class="headerlink" href="#options" title="Permalink to this headline">¶</a></h2>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">Review the list of <a class="reference internal" href="knife_common_options.html"><em>common options</em></a> available to this (and all) knife subcommands and plugins.</p>
+</div>
+<p>This subcommand has the following options:</p>
+<dl class="docutils">
+<dt><tt class="docutils literal"><span class="pre">--chef-repo-path</span> <span class="pre">PATH</span></tt></dt>
+<dd>The path to the chef-repo. This setting will override the default path to the chef-repo. Default: same value as specified by <tt class="docutils literal"><span class="pre">chef_repo_path</span></tt> in client.rb.</dd>
+<dt><tt class="docutils literal"><span class="pre">--cookbook-version</span> <span class="pre">VERSION</span></tt></dt>
+<dd>The version of a cookbook to download.</dd>
+<dt><tt class="docutils literal"><span class="pre">--concurrency</span></tt></dt>
+<dd>The number of allowed concurrent connections. Default: <tt class="docutils literal"><span class="pre">10</span></tt>.</dd>
+<dt><tt class="docutils literal"><span class="pre">--diff-filter=[(A|D|M|T)...[*]]</span></tt></dt>
+<dd>Use to select only files that have been added (<tt class="docutils literal"><span class="pre">A</span></tt>), deleted (<tt class="docutils literal"><span class="pre">D</span></tt>), modified (<tt class="docutils literal"><span class="pre">M</span></tt>), and/or have had their type changed (<tt class="docutils literal"><span class="pre">T</span></tt>). Any combination of filter characters may be used, including no filter characters. Use <tt class="docutils literal"><span class="pre">*</span></tt> to select all paths if a file matches other criteria in the comparison. Default value: <tt class="docutils literal"><span class="pre">nil</span></tt>.</dd>
+<dt><tt class="docutils literal"><span class="pre">--name-only</span></tt></dt>
+<dd>Use to show only the names of modified files.</dd>
+<dt><tt class="docutils literal"><span class="pre">--name-status</span></tt></dt>
+<dd>Use to show only the names of files with a status of <tt class="docutils literal"><span class="pre">Added</span></tt>, <tt class="docutils literal"><span class="pre">Deleted</span></tt>, <tt class="docutils literal"><span class="pre">Modified</span></tt>, or <tt class="docutils literal"><span class="pre">Type</span> <span class="pre">Changed</span></tt>.</dd>
+<dt><tt class="docutils literal"><span class="pre">--no-recurse</span></tt></dt>
+<dd>Use <tt class="docutils literal"><span class="pre">--no-recurse</span></tt> to disable listing a directory recursively. Default: <tt class="docutils literal"><span class="pre">--recurse</span></tt>.</dd>
+<dt><tt class="docutils literal"><span class="pre">--repo-mode</span> <span class="pre">MODE</span></tt></dt>
+<dd>The layout of the local chef-repo. Possible values: <tt class="docutils literal"><span class="pre">static</span></tt>, <tt class="docutils literal"><span class="pre">everything</span></tt>, or <tt class="docutils literal"><span class="pre">hosted_everything</span></tt>. Use <tt class="docutils literal"><span class="pre">static</span></tt> for just roles, environments, cookbooks, and data bags. By default, <tt class="docutils literal"><span class="pre">everything</span></tt> and <tt class="docutils literal"><span class="pre">hosted_everything</span></tt> are dynamically selected depending on the server type. Default: <tt class="docutils literal"><span class="pre">everything</span></tt> / <tt class="docutils literal"><span class="pre">hosted_everything</span></tt>.</dd>
+</dl>
+</div>
+<div class="section" id="examples">
+<h2>Examples<a class="headerlink" href="#examples" title="Permalink to this headline">¶</a></h2>
+<p>The following examples show how to use this knife subcommand:</p>
+<p><strong>Compare files that contain JSON data</strong></p>
+<p>To compare the <tt class="docutils literal"><span class="pre">base.json</span></tt> role to a <tt class="docutils literal"><span class="pre">webserver.json</span></tt> role, enter:</p>
+<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>knife diff roles/base.json roles/webserver.json
+</pre></div>
+</div>
+<p><strong>Compare the chef-repo and the server</strong></p>
+<p>To compare the differences between the local chef-repo and the files that are on the Chef server, enter:</p>
+<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>knife diff
+</pre></div>
+</div>
+<p><strong>Compare, then return results</strong></p>
+<p>To diff a node named <tt class="docutils literal"><span class="pre">node-lb</span></tt> and then only return files that have been added, deleted, modified, or changed, enter:</p>
+<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>knife diff --name-status node-lb
+</pre></div>
+</div>
+<p>to return something like:</p>
+<div class="highlight-bash"><div class="highlight"><pre>node-lb/recipes/eip.rb
+node-lb/recipes/heartbeat-int.rb
+node-lb/templates/default/corpsite.conf.erb
+node-lb/files/default/wildcard.node.com.crt
+node-lb/files/default/wildcard.node.com.crt-2009
+node-lb/files/default/wildcard.node.com.key
+node-lb/.gitignore
+node-lb/Rakefile
+</pre></div>
+</div>
+</div>
+</div>
+          </div>
+      </div>
+      <div class="clearer"></div>
+    </div>
+  </body>
 </html>

data/distro/common/html/knife_download.html CHANGED

@@ -1,145 +1,145 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>knife download &mdash; chef-client Man Pages</title>
-    <link rel="stylesheet" href="_static/guide.css" type="text/css" />
-    <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
-    <script type="text/javascript">
-      var DOCUMENTATION_OPTIONS = {
-        URL_ROOT:    './',
-        VERSION:     '',
-        COLLAPSE_INDEX: false,
-        FILE_SUFFIX: '.html',
-        HAS_SOURCE:  true
-      };
-    </script>
-    <script type="text/javascript" src="_static/jquery.js"></script>
-    <script type="text/javascript" src="_static/underscore.js"></script>
-    <script type="text/javascript" src="_static/doctools.js"></script>
-  </head>
-  <body>
-<div style="background-color: #212c35; text-align: left; padding: 0px 0px 0px 0px">
-<a href="http://docs.getchef.com/"><img src="_static/chef_html_logo.png" border="0" alt="Chef"/></a>
-</div>
-    <div class="document">
-      <div class="documentwrapper">
-          <div class="body">
-  <div class="section" id="knife-download">
-<h1>knife download<a class="headerlink" href="#knife-download" title="Permalink to this headline">¶</a></h1>
-<p>The <strong>knife download</strong> subcommand is used to download roles, cookbooks, environments, nodes, and data bags from the Chef server to the current working directory. It can be used to back up data on the Chef server, inspect the state of one or more files, or to extract out-of-process changes users may have made to files on the Chef server, such as if a user made a change that bypassed version source control. This subcommand is often used in conjunction with <tt class="docutils literal"><span class="pre">knife</span> <span class="pre">diff</span></tt>, which can be used to see exactly what changes will be downloaded, and then <tt class="docutils literal"><span class="pre">knife</span> <span class="pre">upload</span></tt>, which does the opposite of <tt class="docutils literal"><span class="pre">knife</span> <span class="pre">download</span></tt>.</p>
-<div class="section" id="syntax">
-<h2>Syntax<a class="headerlink" href="#syntax" title="Permalink to this headline">¶</a></h2>
-<p>This subcommand has the following syntax:</p>
-<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>knife download <span class="o">[</span>PATTERN...<span class="o">]</span> <span class="o">(</span>options<span class="o">)</span>
-</pre></div>
-</div>
-</div>
-<div class="section" id="options">
-<h2>Options<a class="headerlink" href="#options" title="Permalink to this headline">¶</a></h2>
-<div class="admonition note">
-<p class="first admonition-title">Note</p>
-<p class="last">Review the list of <a class="reference internal" href="knife_common_options.html"><em>common options</em></a> available to this (and all) knife subcommands and plugins.</p>
-</div>
-<p>This subcommand has the following options:</p>
-<dl class="docutils">
-<dt><tt class="docutils literal"><span class="pre">--chef-repo-path</span> <span class="pre">PATH</span></tt></dt>
-<dd>The path to the chef-repo. This setting will override the default path to the chef-repo. Default: same value as specified by <tt class="docutils literal"><span class="pre">chef_repo_path</span></tt> in client.rb.</dd>
-<dt><tt class="docutils literal"><span class="pre">--concurrency</span></tt></dt>
-<dd>The number of allowed concurrent connections. Default: <tt class="docutils literal"><span class="pre">10</span></tt>.</dd>
-<dt><tt class="docutils literal"><span class="pre">--cookbook-version</span> <span class="pre">VERSION</span></tt></dt>
-<dd>The version of a cookbook to download.</dd>
-<dt><tt class="docutils literal"><span class="pre">-n</span></tt>, <tt class="docutils literal"><span class="pre">--dry-run</span></tt></dt>
-<dd>Use to take no action and only print out results. Default: <tt class="docutils literal"><span class="pre">false</span></tt>.</dd>
-<dt><tt class="docutils literal"><span class="pre">--[no-]diff</span></tt></dt>
-<dd>Use to download only new and modified files. Set to <tt class="docutils literal"><span class="pre">false</span></tt> to download all files. Default: <tt class="docutils literal"><span class="pre">--diff</span></tt>.</dd>
-<dt><tt class="docutils literal"><span class="pre">--[no-]force</span></tt></dt>
-<dd>Use <tt class="docutils literal"><span class="pre">--force</span></tt> to download files even when the file on the hard drive is identical to the object on the server (role, cookbook, etc.). By default, files are compared to see if they have equivalent content, and local files are only overwritten if they are different. Default: <tt class="docutils literal"><span class="pre">--no-force</span></tt>.</dd>
-<dt><tt class="docutils literal"><span class="pre">--[no-]purge</span></tt></dt>
-<dd>Use <tt class="docutils literal"><span class="pre">--purge</span></tt> to delete local files and directories that do not exist on the Chef server. By default, if a role, cookbook, etc. does not exist on the Chef server, the local file for said role will be left alone and NOT deleted. Default: <tt class="docutils literal"><span class="pre">--no-purge</span></tt>.</dd>
-<dt><tt class="docutils literal"><span class="pre">--[no-]recurse</span></tt></dt>
-<dd>Use <tt class="docutils literal"><span class="pre">--no-recurse</span></tt> to disable downloading a directory recursively. Default: <tt class="docutils literal"><span class="pre">--recurse</span></tt>.</dd>
-<dt><tt class="docutils literal"><span class="pre">--repo-mode</span> <span class="pre">MODE</span></tt></dt>
-<dd>The layout of the local chef-repo. Possible values: <tt class="docutils literal"><span class="pre">static</span></tt>, <tt class="docutils literal"><span class="pre">everything</span></tt>, or <tt class="docutils literal"><span class="pre">hosted_everything</span></tt>. Use <tt class="docutils literal"><span class="pre">static</span></tt> for just roles, environments, cookbooks, and data bags. By default, <tt class="docutils literal"><span class="pre">everything</span></tt> and <tt class="docutils literal"><span class="pre">hosted_everything</span></tt> are dynamically selected depending on the server type. Default: <tt class="docutils literal"><span class="pre">everything</span></tt> / <tt class="docutils literal"><span class="pre">hosted_everything</span></tt>.</dd>
-</dl>
-</div>
-<div class="section" id="examples">
-<h2>Examples<a class="headerlink" href="#examples" title="Permalink to this headline">¶</a></h2>
-<p>The following examples show how to use this knife subcommand:</p>
-<p><strong>Download the entire chef-repo</strong></p>
-<p>To download the entire chef-repo from the Chef server, browse to the top level of the chef-repo and enter:</p>
-<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>knife download /
-</pre></div>
-</div>
-<p><strong>Download the /cookbooks directory</strong></p>
-<p>To download the <tt class="docutils literal"><span class="pre">cookbooks/</span></tt> directory from the Chef server, browse to the top level of the chef-repo and enter:</p>
-<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>knife download cookbooks
-</pre></div>
-</div>
-<p>or from anywhere in the chef-repo, enter:</p>
-<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>knife download /cookbooks
-</pre></div>
-</div>
-<p><strong>Download the /environments directory</strong></p>
-<p>To download the <tt class="docutils literal"><span class="pre">environments/</span></tt> directory from the Chef server, browse to the top level of the chef-repo and enter:</p>
-<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>knife download environments
-</pre></div>
-</div>
-<p>or from anywhere in the chef-repo, enter:</p>
-<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>knife download /environments
-</pre></div>
-</div>
-<p><strong>Download an environment</strong></p>
-<p>To download an environment named &#8220;production&#8221; from the Chef server, browse to the top level of the chef-repo and enter:</p>
-<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>knife download environments/production.json
-</pre></div>
-</div>
-<p>or from the <tt class="docutils literal"><span class="pre">environments/</span></tt> directory, enter:</p>
-<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>knife download production.json
-</pre></div>
-</div>
-<p><strong>Download the /roles directory</strong></p>
-<p>To download the <tt class="docutils literal"><span class="pre">roles/</span></tt> directory from the Chef server, browse to the top level of the chef-repo and enter:</p>
-<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>knife download roles
-</pre></div>
-</div>
-<p>or from anywhere in the chef-repo, enter:</p>
-<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>knife download /roles
-</pre></div>
-</div>
-<p><strong>Download cookbooks and roles</strong></p>
-<p>To download all cookbooks that start with &#8220;apache&#8221; and belong to the &#8220;webserver&#8221; role, browse to the top level of the chef-repo and enter:</p>
-<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span> knife download cookbooks/apache<span class="se">\*</span> roles/webserver.json
-</pre></div>
-</div>
-</div>
-</div>
-          </div>
-      </div>
-      <div class="clearer"></div>
-    </div>
-  </body>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>knife download &mdash; chef-client Man Pages</title>
+    <link rel="stylesheet" href="_static/guide.css" type="text/css" />
+    <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
+    <script type="text/javascript">
+      var DOCUMENTATION_OPTIONS = {
+        URL_ROOT:    './',
+        VERSION:     '',
+        COLLAPSE_INDEX: false,
+        FILE_SUFFIX: '.html',
+        HAS_SOURCE:  true
+      };
+    </script>
+    <script type="text/javascript" src="_static/jquery.js"></script>
+    <script type="text/javascript" src="_static/underscore.js"></script>
+    <script type="text/javascript" src="_static/doctools.js"></script>
+  </head>
+  <body>
+<div style="background-color: #212c35; text-align: left; padding: 0px 0px 0px 0px">
+<a href="http://docs.getchef.com/"><img src="_static/chef_html_logo.png" border="0" alt="Chef"/></a>
+</div>
+    <div class="document">
+      <div class="documentwrapper">
+          <div class="body">
+  <div class="section" id="knife-download">
+<h1>knife download<a class="headerlink" href="#knife-download" title="Permalink to this headline">¶</a></h1>
+<p>The <strong>knife download</strong> subcommand is used to download roles, cookbooks, environments, nodes, and data bags from the Chef server to the current working directory. It can be used to back up data on the Chef server, inspect the state of one or more files, or to extract out-of-process changes users may have made to files on the Chef server, such as if a user made a change that bypassed version source control. This subcommand is often used in conjunction with <tt class="docutils literal"><span class="pre">knife</span> <span class="pre">diff</span></tt>, which can be used to see exactly what changes will be downloaded, and then <tt class="docutils literal"><span class="pre">knife</span> <span class="pre">upload</span></tt>, which does the opposite of <tt class="docutils literal"><span class="pre">knife</span> <span class="pre">download</span></tt>.</p>
+<div class="section" id="syntax">
+<h2>Syntax<a class="headerlink" href="#syntax" title="Permalink to this headline">¶</a></h2>
+<p>This subcommand has the following syntax:</p>
+<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>knife download <span class="o">[</span>PATTERN...<span class="o">]</span> <span class="o">(</span>options<span class="o">)</span>
+</pre></div>
+</div>
+</div>
+<div class="section" id="options">
+<h2>Options<a class="headerlink" href="#options" title="Permalink to this headline">¶</a></h2>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">Review the list of <a class="reference internal" href="knife_common_options.html"><em>common options</em></a> available to this (and all) knife subcommands and plugins.</p>
+</div>
+<p>This subcommand has the following options:</p>
+<dl class="docutils">
+<dt><tt class="docutils literal"><span class="pre">--chef-repo-path</span> <span class="pre">PATH</span></tt></dt>
+<dd>The path to the chef-repo. This setting will override the default path to the chef-repo. Default: same value as specified by <tt class="docutils literal"><span class="pre">chef_repo_path</span></tt> in client.rb.</dd>
+<dt><tt class="docutils literal"><span class="pre">--concurrency</span></tt></dt>
+<dd>The number of allowed concurrent connections. Default: <tt class="docutils literal"><span class="pre">10</span></tt>.</dd>
+<dt><tt class="docutils literal"><span class="pre">--cookbook-version</span> <span class="pre">VERSION</span></tt></dt>
+<dd>The version of a cookbook to download.</dd>
+<dt><tt class="docutils literal"><span class="pre">-n</span></tt>, <tt class="docutils literal"><span class="pre">--dry-run</span></tt></dt>
+<dd>Use to take no action and only print out results. Default: <tt class="docutils literal"><span class="pre">false</span></tt>.</dd>
+<dt><tt class="docutils literal"><span class="pre">--[no-]diff</span></tt></dt>
+<dd>Use to download only new and modified files. Set to <tt class="docutils literal"><span class="pre">false</span></tt> to download all files. Default: <tt class="docutils literal"><span class="pre">--diff</span></tt>.</dd>
+<dt><tt class="docutils literal"><span class="pre">--[no-]force</span></tt></dt>
+<dd>Use <tt class="docutils literal"><span class="pre">--force</span></tt> to download files even when the file on the hard drive is identical to the object on the server (role, cookbook, etc.). By default, files are compared to see if they have equivalent content, and local files are only overwritten if they are different. Default: <tt class="docutils literal"><span class="pre">--no-force</span></tt>.</dd>
+<dt><tt class="docutils literal"><span class="pre">--[no-]purge</span></tt></dt>
+<dd>Use <tt class="docutils literal"><span class="pre">--purge</span></tt> to delete local files and directories that do not exist on the Chef server. By default, if a role, cookbook, etc. does not exist on the Chef server, the local file for said role will be left alone and NOT deleted. Default: <tt class="docutils literal"><span class="pre">--no-purge</span></tt>.</dd>
+<dt><tt class="docutils literal"><span class="pre">--[no-]recurse</span></tt></dt>
+<dd>Use <tt class="docutils literal"><span class="pre">--no-recurse</span></tt> to disable downloading a directory recursively. Default: <tt class="docutils literal"><span class="pre">--recurse</span></tt>.</dd>
+<dt><tt class="docutils literal"><span class="pre">--repo-mode</span> <span class="pre">MODE</span></tt></dt>
+<dd>The layout of the local chef-repo. Possible values: <tt class="docutils literal"><span class="pre">static</span></tt>, <tt class="docutils literal"><span class="pre">everything</span></tt>, or <tt class="docutils literal"><span class="pre">hosted_everything</span></tt>. Use <tt class="docutils literal"><span class="pre">static</span></tt> for just roles, environments, cookbooks, and data bags. By default, <tt class="docutils literal"><span class="pre">everything</span></tt> and <tt class="docutils literal"><span class="pre">hosted_everything</span></tt> are dynamically selected depending on the server type. Default: <tt class="docutils literal"><span class="pre">everything</span></tt> / <tt class="docutils literal"><span class="pre">hosted_everything</span></tt>.</dd>
+</dl>
+</div>
+<div class="section" id="examples">
+<h2>Examples<a class="headerlink" href="#examples" title="Permalink to this headline">¶</a></h2>
+<p>The following examples show how to use this knife subcommand:</p>
+<p><strong>Download the entire chef-repo</strong></p>
+<p>To download the entire chef-repo from the Chef server, browse to the top level of the chef-repo and enter:</p>
+<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>knife download /
+</pre></div>
+</div>
+<p><strong>Download the /cookbooks directory</strong></p>
+<p>To download the <tt class="docutils literal"><span class="pre">cookbooks/</span></tt> directory from the Chef server, browse to the top level of the chef-repo and enter:</p>
+<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>knife download cookbooks
+</pre></div>
+</div>
+<p>or from anywhere in the chef-repo, enter:</p>
+<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>knife download /cookbooks
+</pre></div>
+</div>
+<p><strong>Download the /environments directory</strong></p>
+<p>To download the <tt class="docutils literal"><span class="pre">environments/</span></tt> directory from the Chef server, browse to the top level of the chef-repo and enter:</p>
+<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>knife download environments
+</pre></div>
+</div>
+<p>or from anywhere in the chef-repo, enter:</p>
+<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>knife download /environments
+</pre></div>
+</div>
+<p><strong>Download an environment</strong></p>
+<p>To download an environment named &#8220;production&#8221; from the Chef server, browse to the top level of the chef-repo and enter:</p>
+<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>knife download environments/production.json
+</pre></div>
+</div>
+<p>or from the <tt class="docutils literal"><span class="pre">environments/</span></tt> directory, enter:</p>
+<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>knife download production.json
+</pre></div>
+</div>
+<p><strong>Download the /roles directory</strong></p>
+<p>To download the <tt class="docutils literal"><span class="pre">roles/</span></tt> directory from the Chef server, browse to the top level of the chef-repo and enter:</p>
+<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>knife download roles
+</pre></div>
+</div>
+<p>or from anywhere in the chef-repo, enter:</p>
+<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>knife download /roles
+</pre></div>
+</div>
+<p><strong>Download cookbooks and roles</strong></p>
+<p>To download all cookbooks that start with &#8220;apache&#8221; and belong to the &#8220;webserver&#8221; role, browse to the top level of the chef-repo and enter:</p>
+<div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span> knife download cookbooks/apache<span class="se">\*</span> roles/webserver.json
+</pre></div>
+</div>
+</div>
+</div>
+          </div>
+      </div>
+      <div class="clearer"></div>
+    </div>
+  </body>
 </html>