chef 11.6.2-x86-mingw32 → 11.8.0.rc.1-x86-mingw32
Sign up to get free protection for your applications and to get access to all the features.
- data/CONTRIBUTING.md +12 -12
- data/Rakefile +11 -14
- data/bin/chef-apply +2 -2
- data/bin/chef-client +2 -2
- data/bin/chef-service-manager +2 -2
- data/bin/chef-shell +3 -0
- data/bin/chef-solo +2 -2
- data/bin/knife +3 -3
- data/distro/arch/etc/rc.d/chef-client +2 -2
- data/distro/arch/etc/rc.d/chef-server +2 -2
- data/distro/arch/etc/rc.d/chef-server-webui +2 -2
- data/distro/arch/etc/rc.d/chef-solr +2 -2
- data/distro/common/html/chef-client.8.html +3 -3
- data/distro/common/html/chef-expander.8.html +3 -3
- data/distro/common/html/chef-expanderctl.8.html +3 -3
- data/distro/common/html/chef-server-webui.8.html +3 -3
- data/distro/common/html/chef-server.8.html +3 -3
- data/distro/common/html/chef-shell.1.html +3 -3
- data/distro/common/html/chef-solo.8.html +3 -3
- data/distro/common/html/chef-solr.8.html +4 -4
- data/distro/common/html/knife-bootstrap.1.html +3 -3
- data/distro/common/html/knife-client.1.html +3 -3
- data/distro/common/html/knife-configure.1.html +13 -13
- data/distro/common/html/knife-cookbook-site.1.html +3 -3
- data/distro/common/html/knife-cookbook.1.html +7 -7
- data/distro/common/html/knife-data-bag.1.html +3 -3
- data/distro/common/html/knife-environment.1.html +3 -3
- data/distro/common/html/knife-exec.1.html +3 -3
- data/distro/common/html/knife-index.1.html +3 -3
- data/distro/common/html/knife-node.1.html +3 -3
- data/distro/common/html/knife-role.1.html +3 -3
- data/distro/common/html/knife-search.1.html +3 -3
- data/distro/common/html/knife-ssh.1.html +3 -3
- data/distro/common/html/knife-status.1.html +3 -3
- data/distro/common/html/knife-tag.1.html +3 -3
- data/distro/common/html/knife.1.html +3 -3
- data/distro/common/man/man1/README.md +58 -0
- data/distro/common/man/man1/chef-shell.1 +114 -219
- data/distro/common/man/man1/knife-bootstrap.1 +176 -180
- data/distro/common/man/man1/knife-client.1 +368 -0
- data/distro/common/man/man1/knife-configure.1 +147 -85
- data/distro/common/man/man1/knife-cookbook-site.1 +465 -133
- data/distro/common/man/man1/knife-cookbook.1 +614 -304
- data/distro/common/man/man1/knife-data-bag.1 +476 -113
- data/distro/common/man/man1/knife-delete.1 +132 -0
- data/distro/common/man/man1/knife-deps.1 +219 -0
- data/distro/common/man/man1/knife-diff.1 +212 -0
- data/distro/common/man/man1/knife-download.1 +220 -0
- data/distro/common/man/man1/knife-edit.1 +126 -0
- data/distro/common/man/man1/knife-environment.1 +324 -0
- data/distro/common/man/man1/knife-exec.1 +317 -35
- data/distro/common/man/man1/knife-index-rebuild.1 +115 -0
- data/distro/common/man/man1/knife-list.1 +167 -0
- data/distro/common/man/man1/knife-node.1 +567 -123
- data/distro/common/man/man1/knife-raw.1 +170 -0
- data/distro/common/man/man1/knife-recipe-list.1 +133 -0
- data/distro/common/man/man1/knife-role.1 +367 -81
- data/distro/common/man/man1/knife-search.1 +267 -243
- data/distro/common/man/man1/knife-show.1 +138 -0
- data/distro/common/man/man1/knife-ssh.1 +241 -66
- data/distro/common/man/man1/knife-status.1 +202 -24
- data/distro/common/man/man1/knife-tag.1 +176 -39
- data/distro/common/man/man1/knife-upload.1 +239 -0
- data/distro/common/man/man1/knife-user.1 +317 -0
- data/distro/common/man/man1/knife-xargs.1 +166 -0
- data/distro/common/man/man1/knife.1 +227 -284
- data/distro/common/man/man8/chef-client.8 +247 -81
- data/distro/common/man/man8/chef-solo.8 +142 -110
- data/distro/common/markdown/man1/knife-bootstrap.mkd +1 -1
- data/distro/common/markdown/man1/knife-configure.mkd +11 -11
- data/distro/common/markdown/man1/knife-cookbook.mkd +4 -4
- data/distro/common/markdown/man8/chef-expander.mkd +1 -1
- data/distro/common/markdown/man8/chef-expanderctl.mkd +1 -1
- data/distro/debian/etc/init.d/chef-client +1 -1
- data/distro/debian/etc/init.d/chef-expander +1 -1
- data/distro/debian/etc/init.d/chef-server +1 -1
- data/distro/debian/etc/init.d/chef-server-webui +1 -1
- data/distro/debian/etc/init.d/chef-solr +1 -1
- data/distro/debian/etc/init/chef-client.conf +1 -1
- data/distro/debian/etc/init/chef-expander.conf +1 -1
- data/distro/debian/etc/init/chef-server-webui.conf +1 -1
- data/distro/debian/etc/init/chef-server.conf +1 -1
- data/distro/debian/etc/init/chef-solr.conf +1 -1
- data/distro/redhat/etc/init.d/chef-client +1 -1
- data/distro/redhat/etc/init.d/chef-server +2 -2
- data/distro/redhat/etc/init.d/chef-server-webui +2 -2
- data/distro/redhat/etc/init.d/chef-solr +2 -2
- data/lib/chef/api_client.rb +20 -5
- data/lib/chef/application.rb +53 -22
- data/lib/chef/application/agent.rb +2 -2
- data/lib/chef/application/client.rb +34 -24
- data/lib/chef/application/knife.rb +10 -0
- data/lib/chef/application/solo.rb +9 -27
- data/lib/chef/application/windows_service.rb +24 -10
- data/lib/chef/application/windows_service_manager.rb +8 -0
- data/lib/chef/checksum/storage.rb +2 -2
- data/lib/chef/checksum/storage/filesystem.rb +2 -2
- data/lib/chef/chef_fs/chef_fs_data_store.rb +1 -1
- data/lib/chef/chef_fs/command_line.rb +2 -1
- data/lib/chef/chef_fs/config.rb +19 -64
- data/lib/chef/chef_fs/data_handler/client_data_handler.rb +1 -2
- data/lib/chef/chef_fs/file_system.rb +2 -2
- data/lib/chef/chef_fs/file_system/acl_entry.rb +1 -1
- data/lib/chef/chef_fs/file_system/chef_repository_file_system_acls_dir.rb +37 -0
- data/lib/chef/chef_fs/file_system/chef_repository_file_system_cookbook_dir.rb +16 -8
- data/lib/chef/chef_fs/file_system/chef_repository_file_system_cookbook_entry.rb +19 -4
- data/lib/chef/chef_fs/file_system/chef_repository_file_system_cookbooks_dir.rb +27 -12
- data/lib/chef/chef_fs/file_system/chef_repository_file_system_entry.rb +31 -3
- data/lib/chef/chef_fs/file_system/chef_repository_file_system_root_dir.rb +12 -5
- data/lib/chef/chef_fs/file_system/chef_server_root_dir.rb +12 -2
- data/lib/chef/chef_fs/file_system/cookbook_dir.rb +3 -2
- data/lib/chef/chef_fs/file_system/cookbook_file.rb +2 -5
- data/lib/chef/chef_fs/file_system/cookbooks_dir.rb +21 -6
- data/lib/chef/chef_fs/file_system/data_bag_dir.rb +1 -1
- data/lib/chef/chef_fs/file_system/data_bags_dir.rb +3 -2
- data/lib/chef/chef_fs/file_system/file_system_entry.rb +15 -5
- data/lib/chef/chef_fs/file_system/multiplexed_dir.rb +2 -1
- data/lib/chef/chef_fs/file_system/nodes_dir.rb +1 -1
- data/lib/chef/chef_fs/file_system/operation_failed_error.rb +8 -0
- data/lib/chef/chef_fs/file_system/rest_list_dir.rb +4 -2
- data/lib/chef/chef_fs/file_system/rest_list_entry.rb +4 -6
- data/lib/chef/chef_fs/knife.rb +39 -22
- data/lib/chef/chef_fs/path_utils.rb +5 -0
- data/lib/chef/client.rb +9 -3
- data/lib/chef/config.rb +306 -115
- data/lib/chef/config_fetcher.rb +79 -0
- data/lib/chef/cookbook/file_vendor.rb +5 -5
- data/lib/chef/cookbook/metadata.rb +2 -2
- data/lib/chef/cookbook/syntax_check.rb +6 -16
- data/lib/chef/cookbook_site_streaming_uploader.rb +8 -4
- data/lib/chef/cookbook_uploader.rb +10 -8
- data/lib/chef/cookbook_version.rb +24 -8
- data/lib/chef/daemon.rb +14 -75
- data/lib/chef/data_bag.rb +2 -3
- data/lib/chef/dsl/include_recipe.rb +2 -2
- data/lib/chef/event_dispatch/base.rb +1 -1
- data/lib/chef/event_dispatch/dispatcher.rb +1 -1
- data/lib/chef/file_access_control/windows.rb +1 -1
- data/lib/chef/formatters/doc.rb +5 -5
- data/lib/chef/formatters/error_inspectors/api_error_formatting.rb +2 -2
- data/lib/chef/formatters/error_inspectors/compile_error_inspector.rb +2 -2
- data/lib/chef/formatters/error_inspectors/cookbook_sync_error_inspector.rb +2 -2
- data/lib/chef/formatters/error_inspectors/node_load_error_inspector.rb +2 -2
- data/lib/chef/formatters/error_inspectors/resource_failure_inspector.rb +2 -2
- data/lib/chef/handler/json_file.rb +2 -2
- data/lib/chef/http.rb +386 -0
- data/lib/chef/{rest → http}/auth_credentials.rb +1 -1
- data/lib/chef/http/authenticator.rb +89 -0
- data/lib/chef/http/basic_client.rb +114 -0
- data/lib/chef/{rest → http}/cookie_jar.rb +1 -1
- data/lib/chef/http/cookie_manager.rb +56 -0
- data/lib/chef/http/decompressor.rb +137 -0
- data/lib/chef/{rest/rest_request.rb → http/http_request.rb} +13 -74
- data/lib/chef/http/json_input.rb +53 -0
- data/lib/chef/http/json_output.rb +69 -0
- data/lib/chef/http/json_to_model_output.rb +34 -0
- data/lib/chef/http/simple.rb +16 -0
- data/lib/chef/http/ssl_policies.rb +129 -0
- data/lib/chef/knife.rb +45 -23
- data/lib/chef/knife/bootstrap.rb +10 -3
- data/lib/chef/knife/bootstrap/chef-full.erb +10 -1
- data/lib/chef/knife/client_create.rb +1 -1
- data/lib/chef/knife/configure.rb +1 -1
- data/lib/chef/knife/cookbook_create.rb +7 -7
- data/lib/chef/knife/cookbook_download.rb +2 -2
- data/lib/chef/knife/cookbook_metadata_from_file.rb +2 -2
- data/lib/chef/knife/cookbook_show.rb +3 -3
- data/lib/chef/knife/cookbook_site_install.rb +2 -2
- data/lib/chef/knife/cookbook_site_list.rb +2 -2
- data/lib/chef/knife/cookbook_site_search.rb +3 -3
- data/lib/chef/knife/cookbook_site_show.rb +5 -5
- data/lib/chef/knife/core/bootstrap_context.rb +7 -3
- data/lib/chef/knife/core/node_editor.rb +16 -36
- data/lib/chef/knife/core/node_presenter.rb +1 -1
- data/lib/chef/knife/core/subcommand_loader.rb +5 -5
- data/lib/chef/knife/core/ui.rb +9 -13
- data/lib/chef/knife/data_bag_create.rb +7 -5
- data/lib/chef/knife/data_bag_delete.rb +3 -3
- data/lib/chef/knife/data_bag_edit.rb +9 -7
- data/lib/chef/knife/data_bag_from_file.rb +10 -8
- data/lib/chef/knife/data_bag_list.rb +2 -2
- data/lib/chef/knife/data_bag_show.rb +9 -7
- data/lib/chef/knife/delete.rb +2 -0
- data/lib/chef/knife/deps.rb +2 -0
- data/lib/chef/knife/diff.rb +6 -0
- data/lib/chef/knife/download.rb +6 -0
- data/lib/chef/knife/edit.rb +5 -8
- data/lib/chef/knife/environment_from_file.rb +2 -2
- data/lib/chef/knife/help_topics.rb +1 -1
- data/lib/chef/knife/index_rebuild.rb +2 -2
- data/lib/chef/knife/list.rb +2 -0
- data/lib/chef/knife/raw.rb +31 -5
- data/lib/chef/knife/show.rb +2 -0
- data/lib/chef/knife/ssh.rb +21 -7
- data/lib/chef/knife/status.rb +1 -1
- data/lib/chef/knife/upload.rb +2 -0
- data/lib/chef/knife/xargs.rb +2 -0
- data/lib/chef/mixin/checksum.rb +2 -2
- data/lib/chef/mixin/command.rb +46 -17
- data/lib/chef/mixin/convert_to_class_name.rb +8 -8
- data/lib/chef/mixin/create_path.rb +9 -9
- data/lib/chef/mixin/deep_merge.rb +2 -2
- data/lib/chef/mixin/from_file.rb +6 -6
- data/lib/chef/mixin/language_include_recipe.rb +2 -2
- data/lib/chef/mixin/params_validate.rb +21 -21
- data/lib/chef/mixin/shell_out.rb +9 -0
- data/lib/chef/mixin/template.rb +13 -16
- data/lib/chef/mixin/why_run.rb +16 -16
- data/lib/chef/mixin/windows_architecture_helper.rb +5 -5
- data/lib/chef/mixin/xml_escape.rb +10 -10
- data/lib/chef/monkey_patches/numeric.rb +1 -1
- data/lib/chef/monkey_patches/regexp.rb +4 -4
- data/lib/chef/monkey_patches/string.rb +3 -3
- data/lib/chef/monkey_patches/tempfile.rb +2 -2
- data/lib/chef/node.rb +8 -0
- data/lib/chef/node/attribute.rb +1 -1
- data/lib/chef/platform/provider_mapping.rb +26 -1
- data/lib/chef/provider/batch.rb +3 -3
- data/lib/chef/provider/cron.rb +27 -13
- data/lib/chef/provider/cron/aix.rb +48 -0
- data/lib/chef/provider/cron/solaris.rb +6 -40
- data/lib/chef/provider/cron/unix.rb +76 -0
- data/lib/chef/provider/deploy/timestamped.rb +4 -4
- data/lib/chef/provider/erl_call.rb +1 -1
- data/lib/chef/provider/execute.rb +2 -2
- data/lib/chef/provider/git.rb +1 -0
- data/lib/chef/provider/group.rb +21 -21
- data/lib/chef/provider/group/dscl.rb +9 -9
- data/lib/chef/provider/group/gpasswd.rb +5 -5
- data/lib/chef/provider/group/groupadd.rb +11 -10
- data/lib/chef/provider/group/pw.rb +11 -11
- data/lib/chef/provider/group/suse.rb +4 -4
- data/lib/chef/provider/group/usermod.rb +8 -8
- data/lib/chef/provider/group/windows.rb +9 -9
- data/lib/chef/provider/http_request.rb +8 -8
- data/lib/chef/provider/ifconfig.rb +57 -37
- data/lib/chef/provider/ifconfig/aix.rb +99 -0
- data/lib/chef/provider/log.rb +3 -3
- data/lib/chef/provider/mdadm.rb +5 -4
- data/lib/chef/provider/mount.rb +12 -12
- data/lib/chef/provider/mount/aix.rb +179 -0
- data/lib/chef/provider/mount/mount.rb +29 -15
- data/lib/chef/provider/package.rb +26 -16
- data/lib/chef/provider/package/aix.rb +146 -0
- data/lib/chef/provider/package/apt.rb +16 -31
- data/lib/chef/provider/package/dpkg.rb +9 -9
- data/lib/chef/provider/package/freebsd.rb +2 -2
- data/lib/chef/provider/package/ips.rb +3 -3
- data/lib/chef/provider/package/macports.rb +1 -1
- data/lib/chef/provider/package/pacman.rb +8 -8
- data/lib/chef/provider/package/rpm.rb +14 -14
- data/lib/chef/provider/package/rubygems.rb +1 -1
- data/lib/chef/provider/package/smartos.rb +3 -3
- data/lib/chef/provider/package/solaris.rb +16 -6
- data/lib/chef/provider/package/yum-dump.py +4 -4
- data/lib/chef/provider/package/yum.rb +3 -3
- data/lib/chef/provider/powershell_script.rb +7 -7
- data/lib/chef/provider/remote_file/ftp.rb +1 -0
- data/lib/chef/provider/remote_file/http.rb +6 -13
- data/lib/chef/provider/remote_file/local_file.rb +1 -0
- data/lib/chef/provider/resource_update.rb +9 -9
- data/lib/chef/provider/ruby_block.rb +3 -3
- data/lib/chef/provider/script.rb +1 -1
- data/lib/chef/provider/service.rb +2 -2
- data/lib/chef/provider/service/debian.rb +35 -15
- data/lib/chef/provider/service/freebsd.rb +9 -9
- data/lib/chef/provider/service/gentoo.rb +4 -4
- data/lib/chef/provider/service/init.rb +1 -1
- data/lib/chef/provider/service/insserv.rb +2 -2
- data/lib/chef/provider/service/invokercd.rb +1 -1
- data/lib/chef/provider/service/redhat.rb +2 -2
- data/lib/chef/provider/service/simple.rb +6 -6
- data/lib/chef/provider/service/solaris.rb +1 -1
- data/lib/chef/provider/service/systemd.rb +3 -3
- data/lib/chef/provider/service/upstart.rb +15 -15
- data/lib/chef/provider/subversion.rb +6 -5
- data/lib/chef/provider/user.rb +13 -9
- data/lib/chef/provider/user/dscl.rb +28 -28
- data/lib/chef/provider/user/pw.rb +11 -11
- data/lib/chef/provider/user/useradd.rb +1 -1
- data/lib/chef/provider/user/windows.rb +7 -7
- data/lib/chef/provider/windows_script.rb +7 -7
- data/lib/chef/providers.rb +4 -0
- data/lib/chef/recipe.rb +2 -19
- data/lib/chef/resource/apt_package.rb +3 -3
- data/lib/chef/resource/bash.rb +3 -3
- data/lib/chef/resource/batch.rb +4 -4
- data/lib/chef/resource/bff_package.rb +36 -0
- data/lib/chef/resource/breakpoint.rb +3 -3
- data/lib/chef/resource/cron.rb +5 -5
- data/lib/chef/resource/csh.rb +3 -3
- data/lib/chef/resource/deploy.rb +16 -3
- data/lib/chef/resource/deploy_revision.rb +6 -6
- data/lib/chef/resource/directory.rb +2 -2
- data/lib/chef/resource/dpkg_package.rb +4 -4
- data/lib/chef/resource/easy_install_package.rb +1 -1
- data/lib/chef/resource/erl_call.rb +1 -1
- data/lib/chef/resource/freebsd_package.rb +4 -4
- data/lib/chef/resource/group.rb +15 -6
- data/lib/chef/resource/http_request.rb +6 -6
- data/lib/chef/resource/ifconfig.rb +4 -4
- data/lib/chef/resource/ips_package.rb +2 -2
- data/lib/chef/resource/log.rb +12 -11
- data/lib/chef/resource/macports_package.rb +2 -2
- data/lib/chef/resource/mount.rb +11 -12
- data/lib/chef/resource/ohai.rb +3 -3
- data/lib/chef/resource/pacman_package.rb +4 -4
- data/lib/chef/resource/perl.rb +3 -3
- data/lib/chef/resource/portage_package.rb +4 -4
- data/lib/chef/resource/powershell_script.rb +3 -3
- data/lib/chef/resource/python.rb +3 -3
- data/lib/chef/resource/route.rb +4 -4
- data/lib/chef/resource/rpm_package.rb +2 -2
- data/lib/chef/resource/ruby.rb +3 -3
- data/lib/chef/resource/ruby_block.rb +3 -3
- data/lib/chef/resource/scm.rb +10 -2
- data/lib/chef/resource/script.rb +5 -5
- data/lib/chef/resource/service.rb +5 -5
- data/lib/chef/resource/smartos_package.rb +8 -6
- data/lib/chef/resource/solaris_package.rb +8 -7
- data/lib/chef/resource/subversion.rb +3 -3
- data/lib/chef/resource/timestamped_deploy.rb +4 -4
- data/lib/chef/resource/user.rb +13 -13
- data/lib/chef/resource/windows_script.rb +6 -6
- data/lib/chef/resource/yum_package.rb +2 -2
- data/lib/chef/resource_collection.rb +1 -1
- data/lib/chef/resource_collection/stepable_iterator.rb +22 -22
- data/lib/chef/resource_definition.rb +8 -8
- data/lib/chef/resource_definition_list.rb +2 -2
- data/lib/chef/resource_reporter.rb +8 -2
- data/lib/chef/resources.rb +2 -0
- data/lib/chef/rest.rb +70 -334
- data/lib/chef/role.rb +17 -13
- data/lib/chef/run_context.rb +14 -0
- data/lib/chef/run_context/cookbook_compiler.rb +3 -3
- data/lib/chef/run_lock.rb +73 -20
- data/lib/chef/server_api.rb +41 -0
- data/lib/chef/shell.rb +3 -19
- data/lib/chef/shell/shell_session.rb +1 -1
- data/lib/chef/streaming_cookbook_uploader.rb +30 -26
- data/lib/chef/tasks/chef_repo.rake +17 -17
- data/lib/chef/util/backup.rb +2 -1
- data/lib/chef/util/diff.rb +76 -33
- data/lib/chef/util/windows.rb +2 -2
- data/lib/chef/util/windows/net_group.rb +2 -2
- data/lib/chef/util/windows/net_use.rb +2 -2
- data/lib/chef/util/windows/net_user.rb +3 -3
- data/lib/chef/util/windows/volume.rb +3 -3
- data/lib/chef/version.rb +1 -1
- data/lib/chef/win32/api/file.rb +1 -1
- data/lib/chef/win32/api/synchronization.rb +89 -0
- data/lib/chef/win32/handle.rb +1 -1
- data/lib/chef/win32/mutex.rb +94 -0
- data/lib/chef/win32/security/ace.rb +1 -1
- data/lib/chef/win32/security/sid.rb +1 -1
- data/lib/chef/win32/version.rb +5 -3
- data/spec/data/bootstrap/no_proxy.erb +2 -0
- data/spec/data/cookbooks/openldap/metadata.rb +8 -0
- data/spec/data/cookbooks/preseed/files/default/preseed-template.seed +4 -0
- data/spec/data/trusted_certs/example.crt +22 -0
- data/spec/data/trusted_certs/intermediate.pem +27 -0
- data/spec/data/trusted_certs/opscode.pem +38 -0
- data/spec/data/trusted_certs/root.pem +22 -0
- data/spec/functional/assets/PkgA.1.0.0.0.bff +0 -0
- data/spec/functional/assets/PkgA.2.0.0.0.bff +0 -0
- data/spec/functional/assets/dummy-1-0.aix6.1.noarch.rpm +0 -0
- data/spec/functional/assets/dummy-2-0.aix6.1.noarch.rpm +0 -0
- data/spec/functional/assets/mytest-1.0-1.noarch.rpm +0 -0
- data/spec/functional/assets/mytest-2.0-1.noarch.rpm +0 -0
- data/spec/functional/knife/cookbook_delete_spec.rb +4 -7
- data/spec/functional/knife/exec_spec.rb +0 -3
- data/spec/functional/knife/ssh_spec.rb +2 -6
- data/spec/functional/resource/base.rb +41 -0
- data/spec/functional/resource/batch_spec.rb +6 -33
- data/spec/functional/resource/bff_spec.rb +122 -0
- data/spec/functional/resource/cron_spec.rb +147 -0
- data/spec/functional/resource/group_spec.rb +204 -0
- data/spec/functional/resource/ifconfig_spec.rb +163 -0
- data/spec/functional/resource/link_spec.rb +4 -4
- data/spec/functional/resource/mount_spec.rb +207 -0
- data/spec/functional/resource/package_spec.rb +95 -17
- data/spec/functional/resource/powershell_spec.rb +21 -22
- data/spec/functional/resource/registry_spec.rb +5 -19
- data/spec/functional/resource/remote_file_spec.rb +14 -0
- data/spec/functional/resource/rpm_spec.rb +122 -0
- data/spec/functional/resource/template_spec.rb +11 -44
- data/spec/functional/resource/user_spec.rb +2 -1
- data/spec/functional/run_lock_spec.rb +48 -5
- data/spec/functional/shell_spec.rb +46 -26
- data/spec/functional/tiny_server_spec.rb +2 -2
- data/spec/functional/version_spec.rb +35 -0
- data/spec/functional/win32/versions_spec.rb +3 -3
- data/spec/integration/client/client_spec.rb +146 -0
- data/spec/integration/knife/chef_fs_data_store_spec.rb +353 -0
- data/spec/integration/knife/chef_repo_path_spec.rb +72 -19
- data/spec/integration/knife/common_options_spec.rb +103 -0
- data/spec/integration/knife/download_spec.rb +38 -2
- data/spec/integration/knife/raw_spec.rb +63 -0
- data/spec/integration/knife/upload_spec.rb +20 -4
- data/spec/integration/solo/solo_spec.rb +78 -25
- data/spec/spec_helper.rb +35 -1
- data/spec/support/lib/chef/provider/easy.rb +4 -4
- data/spec/support/lib/chef/provider/snakeoil.rb +4 -4
- data/spec/support/lib/chef/resource/cat.rb +5 -5
- data/spec/support/lib/chef/resource/with_state.rb +37 -0
- data/spec/support/lib/library_load_order.rb +22 -0
- data/spec/support/platform_helpers.rb +8 -0
- data/spec/support/shared/functional/file_resource.rb +4 -22
- data/spec/support/shared/functional/windows_script.rb +48 -0
- data/spec/support/shared/integration/integration_helper.rb +5 -22
- data/spec/support/shared/integration/knife_support.rb +3 -3
- data/spec/support/shared/unit/script_resource.rb +7 -7
- data/spec/support/shared/unit/windows_script_resource.rb +7 -7
- data/spec/tiny_server.rb +2 -2
- data/spec/unit/api_client/registration_spec.rb +1 -1
- data/spec/unit/api_client_spec.rb +25 -2
- data/spec/unit/application/apply.rb +1 -9
- data/spec/unit/application/client_spec.rb +19 -44
- data/spec/unit/application/solo_spec.rb +10 -50
- data/spec/unit/application_spec.rb +51 -80
- data/spec/unit/checksum/storage/filesystem_spec.rb +3 -2
- data/spec/unit/chef_fs/file_system/operation_failed_error_spec.rb +47 -0
- data/spec/unit/chef_spec.rb +2 -2
- data/spec/unit/client_spec.rb +2 -18
- data/spec/unit/config_fetcher_spec.rb +98 -0
- data/spec/unit/config_spec.rb +107 -29
- data/spec/unit/cookbook/metadata_spec.rb +50 -50
- data/spec/unit/cookbook/synchronizer_spec.rb +3 -3
- data/spec/unit/cookbook/syntax_check_spec.rb +1 -2
- data/spec/unit/cookbook_loader_spec.rb +28 -12
- data/spec/unit/cookbook_manifest_spec.rb +11 -11
- data/spec/unit/cookbook_site_streaming_uploader.rb +200 -0
- data/spec/unit/cookbook_version_spec.rb +16 -0
- data/spec/unit/daemon_spec.rb +0 -132
- data/spec/unit/data_bag_item_spec.rb +6 -6
- data/spec/unit/data_bag_spec.rb +6 -8
- data/spec/unit/digester_spec.rb +2 -2
- data/spec/unit/encrypted_data_bag_item_spec.rb +0 -15
- data/spec/unit/file_cache_spec.rb +1 -1
- data/spec/unit/formatters/error_inspectors/compile_error_inspector_spec.rb +4 -4
- data/spec/unit/formatters/error_inspectors/cookbook_resolve_error_inspector_spec.rb +2 -2
- data/spec/unit/formatters/error_inspectors/cookbook_sync_error_inspector_spec.rb +2 -2
- data/spec/unit/formatters/error_inspectors/node_load_error_inspector_spec.rb +2 -2
- data/spec/unit/formatters/error_inspectors/registration_error_inspector_spec.rb +2 -2
- data/spec/unit/formatters/error_inspectors/resource_failure_inspector_spec.rb +4 -4
- data/spec/unit/formatters/error_inspectors/run_list_expansion_error_inspector_spec.rb +2 -2
- data/spec/unit/handler_spec.rb +5 -5
- data/spec/unit/http/ssl_policies_spec.rb +170 -0
- data/spec/unit/knife/bootstrap_spec.rb +31 -14
- data/spec/unit/knife/client_bulk_delete_spec.rb +8 -8
- data/spec/unit/knife/client_create_spec.rb +2 -2
- data/spec/unit/knife/client_delete_spec.rb +2 -2
- data/spec/unit/knife/client_edit_spec.rb +2 -2
- data/spec/unit/knife/client_list_spec.rb +2 -2
- data/spec/unit/knife/client_reregister_spec.rb +2 -2
- data/spec/unit/knife/client_show_spec.rb +2 -2
- data/spec/unit/knife/config_file_selection_spec.rb +53 -36
- data/spec/unit/knife/configure_spec.rb +0 -6
- data/spec/unit/knife/cookbook_create_spec.rb +1 -12
- data/spec/unit/knife/cookbook_metadata_from_file_spec.rb +2 -2
- data/spec/unit/knife/cookbook_show_spec.rb +3 -3
- data/spec/unit/knife/cookbook_site_install_spec.rb +1 -1
- data/spec/unit/knife/core/bootstrap_context_spec.rb +10 -2
- data/spec/unit/knife/core/ui_spec.rb +118 -0
- data/spec/unit/knife/data_bag_show_spec.rb +2 -2
- data/spec/unit/knife/environment_from_file_spec.rb +2 -2
- data/spec/unit/knife/index_rebuild_spec.rb +1 -1
- data/spec/unit/knife/node_delete_spec.rb +3 -3
- data/spec/unit/knife/node_edit_spec.rb +35 -8
- data/spec/unit/knife/node_list_spec.rb +3 -3
- data/spec/unit/knife/node_run_list_add_spec.rb +3 -3
- data/spec/unit/knife/node_show_spec.rb +3 -3
- data/spec/unit/knife/role_create_spec.rb +3 -3
- data/spec/unit/knife/role_delete_spec.rb +3 -3
- data/spec/unit/knife/role_list_spec.rb +2 -2
- data/spec/unit/knife/ssh_spec.rb +1 -8
- data/spec/unit/knife_spec.rb +0 -2
- data/spec/unit/log_spec.rb +2 -2
- data/spec/unit/mash_spec.rb +2 -2
- data/spec/unit/mixin/checksum_spec.rb +3 -3
- data/spec/unit/mixin/command_spec.rb +1 -1
- data/spec/unit/mixin/convert_to_class_name_spec.rb +7 -7
- data/spec/unit/mixin/deprecation_spec.rb +2 -2
- data/spec/unit/mixin/params_validate_spec.rb +72 -72
- data/spec/unit/mixin/securable_spec.rb +0 -14
- data/spec/unit/mixin/shell_out_spec.rb +1 -1
- data/spec/unit/mixin/template_spec.rb +34 -0
- data/spec/unit/mixin/windows_architecture_helper_spec.rb +5 -5
- data/spec/unit/mixin/xml_escape_spec.rb +2 -2
- data/spec/unit/node/attribute_spec.rb +11 -11
- data/spec/unit/node/immutable_collections_spec.rb +2 -2
- data/spec/unit/node_spec.rb +5 -0
- data/spec/unit/platform_spec.rb +36 -35
- data/spec/unit/provider/cron/{solaris_spec.rb → unix_spec.rb} +6 -6
- data/spec/unit/provider/cron_spec.rb +21 -3
- data/spec/unit/provider/deploy/timestamped_spec.rb +5 -5
- data/spec/unit/provider/deploy_spec.rb +21 -7
- data/spec/unit/provider/env_spec.rb +2 -2
- data/spec/unit/provider/execute_spec.rb +2 -2
- data/spec/unit/provider/file/content_spec.rb +0 -8
- data/spec/unit/provider/git_spec.rb +29 -9
- data/spec/unit/provider/group/dscl_spec.rb +12 -12
- data/spec/unit/provider/group/gpasswd_spec.rb +2 -2
- data/spec/unit/provider/group/groupadd_spec.rb +14 -0
- data/spec/unit/provider/group/groupmod_spec.rb +13 -13
- data/spec/unit/provider/group/pw_spec.rb +16 -16
- data/spec/unit/provider/group/usermod_spec.rb +10 -9
- data/spec/unit/provider/group/windows_spec.rb +14 -0
- data/spec/unit/provider/group_spec.rb +29 -29
- data/spec/unit/provider/http_request_spec.rb +15 -15
- data/spec/unit/provider/ifconfig/aix_spec.rb +180 -0
- data/spec/unit/provider/ifconfig_spec.rb +9 -9
- data/spec/unit/provider/link_spec.rb +2 -2
- data/spec/unit/provider/log_spec.rb +8 -8
- data/spec/unit/provider/mdadm_spec.rb +14 -11
- data/spec/unit/provider/mount/aix_spec.rb +237 -0
- data/spec/unit/provider/mount/mount_spec.rb +2 -0
- data/spec/unit/provider/mount/windows_spec.rb +2 -2
- data/spec/unit/provider/mount_spec.rb +6 -6
- data/spec/unit/provider/package/aix_spec.rb +171 -0
- data/spec/unit/provider/package/apt_spec.rb +130 -171
- data/spec/unit/provider/package/dpkg_spec.rb +3 -3
- data/spec/unit/provider/package/freebsd_spec.rb +28 -0
- data/spec/unit/provider/package/ips_spec.rb +1 -1
- data/spec/unit/provider/package/rpm_spec.rb +15 -15
- data/spec/unit/provider/package/smartos_spec.rb +21 -3
- data/spec/unit/provider/package_spec.rb +4 -2
- data/spec/unit/provider/powershell_spec.rb +3 -3
- data/spec/unit/provider/remote_directory_spec.rb +2 -2
- data/spec/unit/provider/remote_file/ftp_spec.rb +0 -5
- data/spec/unit/provider/remote_file/http_spec.rb +12 -28
- data/spec/unit/provider/remote_file/local_file_spec.rb +2 -1
- data/spec/unit/provider/route_spec.rb +2 -2
- data/spec/unit/provider/ruby_block_spec.rb +2 -2
- data/spec/unit/provider/service/arch_service_spec.rb +17 -17
- data/spec/unit/provider/service/debian_service_spec.rb +242 -152
- data/spec/unit/provider/service/freebsd_service_spec.rb +9 -9
- data/spec/unit/provider/service/gentoo_service_spec.rb +9 -9
- data/spec/unit/provider/service/init_service_spec.rb +11 -11
- data/spec/unit/provider/service/insserv_service_spec.rb +5 -5
- data/spec/unit/provider/service/invokercd_service_spec.rb +10 -10
- data/spec/unit/provider/service/redhat_spec.rb +6 -6
- data/spec/unit/provider/service/simple_service_spec.rb +6 -6
- data/spec/unit/provider/service/solaris_smf_service_spec.rb +4 -4
- data/spec/unit/provider/service/systemd_service_spec.rb +3 -3
- data/spec/unit/provider/service/upstart_service_spec.rb +5 -5
- data/spec/unit/provider/service/windows_spec.rb +7 -7
- data/spec/unit/provider/subversion_spec.rb +1 -1
- data/spec/unit/provider/user/dscl_spec.rb +21 -21
- data/spec/unit/provider/user/pw_spec.rb +2 -2
- data/spec/unit/provider/user/windows_spec.rb +5 -5
- data/spec/unit/provider/user_spec.rb +39 -47
- data/spec/unit/resource/apt_package_spec.rb +6 -6
- data/spec/unit/resource/bash_spec.rb +5 -5
- data/spec/unit/resource/batch_spec.rb +7 -7
- data/spec/unit/resource/breakpoint_spec.rb +8 -8
- data/spec/unit/resource/chef_gem_spec.rb +6 -6
- data/spec/unit/resource/cookbook_file_spec.rb +11 -11
- data/spec/unit/resource/cron_spec.rb +15 -15
- data/spec/unit/resource/csh_spec.rb +5 -5
- data/spec/unit/resource/deploy_revision_spec.rb +6 -6
- data/spec/unit/resource/deploy_spec.rb +50 -36
- data/spec/unit/resource/directory_spec.rb +1 -1
- data/spec/unit/resource/dpkg_package_spec.rb +6 -6
- data/spec/unit/resource/env_spec.rb +1 -1
- data/spec/unit/resource/erl_call_spec.rb +1 -1
- data/spec/unit/resource/freebsd_package_spec.rb +6 -6
- data/spec/unit/resource/gem_package_spec.rb +6 -6
- data/spec/unit/resource/git_spec.rb +8 -8
- data/spec/unit/resource/group_spec.rb +11 -11
- data/spec/unit/resource/http_request_spec.rb +7 -7
- data/spec/unit/resource/ifconfig_spec.rb +1 -1
- data/spec/unit/resource/ips_package_spec.rb +6 -6
- data/spec/unit/resource/link_spec.rb +1 -1
- data/spec/unit/resource/log_spec.rb +13 -10
- data/spec/unit/resource/macports_package_spec.rb +2 -2
- data/spec/unit/resource/mdadm_spec.rb +3 -3
- data/spec/unit/resource/mount_spec.rb +13 -13
- data/spec/unit/resource/ohai_spec.rb +1 -1
- data/spec/unit/resource/package_spec.rb +6 -6
- data/spec/unit/resource/pacman_package_spec.rb +6 -6
- data/spec/unit/resource/perl_spec.rb +5 -5
- data/spec/unit/resource/portage_package_spec.rb +6 -6
- data/spec/unit/resource/powershell_spec.rb +5 -5
- data/spec/unit/resource/python_spec.rb +5 -5
- data/spec/unit/resource/registry_key_spec.rb +2 -2
- data/spec/unit/resource/remote_directory_spec.rb +9 -9
- data/spec/unit/resource/remote_file_spec.rb +4 -4
- data/spec/unit/resource/route_spec.rb +13 -13
- data/spec/unit/resource/rpm_package_spec.rb +2 -2
- data/spec/unit/resource/ruby_block_spec.rb +4 -4
- data/spec/unit/resource/ruby_spec.rb +5 -5
- data/spec/unit/resource/scm_spec.rb +14 -1
- data/spec/unit/resource/script_spec.rb +5 -5
- data/spec/unit/resource/service_spec.rb +18 -18
- data/spec/unit/resource/smartos_package_spec.rb +6 -6
- data/spec/unit/resource/solaris_package_spec.rb +57 -0
- data/spec/unit/resource/subversion_spec.rb +6 -6
- data/spec/unit/resource/timestamped_deploy_spec.rb +4 -4
- data/spec/unit/resource/user_spec.rb +13 -13
- data/spec/unit/resource/yum_package_spec.rb +7 -7
- data/spec/unit/resource_collection/stepable_iterator_spec.rb +21 -21
- data/spec/unit/resource_definition_spec.rb +23 -23
- data/spec/unit/resource_reporter_spec.rb +27 -0
- data/spec/unit/rest/auth_credentials_spec.rb +0 -94
- data/spec/unit/rest_spec.rb +117 -99
- data/spec/unit/role_spec.rb +57 -4
- data/spec/unit/run_context/cookbook_compiler_spec.rb +4 -20
- data/spec/unit/run_context_spec.rb +44 -3
- data/spec/unit/run_list/run_list_item_spec.rb +1 -1
- data/spec/unit/run_lock_spec.rb +6 -3
- data/spec/unit/scan_access_control_spec.rb +2 -2
- data/spec/unit/search/query_spec.rb +3 -3
- data/spec/unit/util/backup_spec.rb +6 -13
- data/spec/unit/util/diff_spec.rb +36 -53
- data/spec/unit/version/platform_spec.rb +3 -3
- data/spec/unit/version_class_spec.rb +5 -5
- data/spec/unit/version_constraint/platform_spec.rb +2 -2
- data/spec/unit/windows_service_spec.rb +54 -0
- metadata +290 -108
- checksums.yaml +0 -7
- data/distro/common/man/man1/knife-index.1 +0 -29
- data/distro/common/man/man8/chef-expander.8 +0 -97
- data/distro/common/man/man8/chef-expanderctl.8 +0 -62
- data/distro/common/man/man8/chef-server-webui.8 +0 -155
- data/distro/common/man/man8/chef-server.8 +0 -147
- data/distro/common/man/man8/chef-solr.8 +0 -122
- data/lib/chef/chef_fs/raw_request.rb +0 -79
@@ -6,9 +6,9 @@
|
|
6
6
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
7
7
|
# you may not use this file except in compliance with the License.
|
8
8
|
# You may obtain a copy of the License at
|
9
|
-
#
|
9
|
+
#
|
10
10
|
# http://www.apache.org/licenses/LICENSE-2.0
|
11
|
-
#
|
11
|
+
#
|
12
12
|
# Unless required by applicable law or agreed to in writing, software
|
13
13
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
14
14
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
@@ -18,7 +18,7 @@
|
|
18
18
|
|
19
19
|
require 'spec_helper'
|
20
20
|
|
21
|
-
describe Chef::Provider::Service::Debian
|
21
|
+
describe Chef::Provider::Service::Debian do
|
22
22
|
before(:each) do
|
23
23
|
@node = Chef::Node.new
|
24
24
|
@node.automatic_attrs[:command] = {:ps => 'fuuuu'}
|
@@ -26,95 +26,41 @@ describe Chef::Provider::Service::Debian, "load_current_resource" do
|
|
26
26
|
@run_context = Chef::RunContext.new(@node, {}, @events)
|
27
27
|
|
28
28
|
@new_resource = Chef::Resource::Service.new("chef")
|
29
|
+
@provider = Chef::Provider::Service::Debian.new(@new_resource, @run_context)
|
29
30
|
|
30
31
|
@current_resource = Chef::Resource::Service.new("chef")
|
31
|
-
|
32
|
-
@provider = Chef::Provider::Service::Debian.new(@new_resource, @run_context)
|
33
32
|
@provider.current_resource = @current_resource
|
34
33
|
|
35
34
|
@pid, @stdin, @stdout, @stderr = nil, nil, nil, nil
|
36
|
-
|
37
35
|
end
|
38
36
|
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
lambda { @provider.process_resource_requirements } .should raise_error(Chef::Exceptions::Service)
|
43
|
-
end
|
37
|
+
describe "load_current_resource" do
|
38
|
+
it "ensures /usr/sbin/update-rc.d is available" do
|
39
|
+
File.should_receive(:exists?).with("/usr/sbin/update-rc.d") .and_return(false)
|
44
40
|
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
result=<<-UPDATE_RC_D_SUCCESS
|
50
|
-
Removing any system startup links for /etc/init.d/chef ...
|
51
|
-
/etc/rc0.d/K20chef
|
52
|
-
/etc/rc1.d/K20chef
|
53
|
-
/etc/rc2.d/S20chef
|
54
|
-
/etc/rc3.d/S20chef
|
55
|
-
/etc/rc4.d/S20chef
|
56
|
-
/etc/rc5.d/S20chef
|
57
|
-
/etc/rc6.d/K20chef
|
58
|
-
UPDATE_RC_D_SUCCESS
|
59
|
-
@stdout = StringIO.new(result)
|
60
|
-
@stderr = StringIO.new
|
61
|
-
@status = mock("Status", :exitstatus => 0, :stdout => @stdout)
|
62
|
-
@provider.stub!(:shell_out!).and_return(@status)
|
63
|
-
@provider.stub!(:popen4).and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
|
64
|
-
end
|
65
|
-
|
66
|
-
it "says the service is enabled" do
|
67
|
-
@provider.service_currently_enabled?(@provider.get_priority).should be_true
|
41
|
+
@provider.define_resource_requirements
|
42
|
+
lambda {
|
43
|
+
@provider.process_resource_requirements
|
44
|
+
}.should raise_error(Chef::Exceptions::Service)
|
68
45
|
end
|
69
46
|
|
70
|
-
|
71
|
-
Chef::Resource::Service.stub!(:new).and_return(@current_resource)
|
72
|
-
@provider.load_current_resource.should equal(@current_resource)
|
73
|
-
@current_resource.enabled.should be_true
|
74
|
-
end
|
75
|
-
end
|
76
|
-
|
77
|
-
{"Debian/Lenny and older" => {
|
78
|
-
"linked" => {
|
79
|
-
"stdout" => " Removing any system startup links for /etc/init.d/chef ...
|
80
|
-
/etc/rc0.d/K20chef
|
81
|
-
/etc/rc1.d/K20chef
|
82
|
-
/etc/rc2.d/S20chef
|
83
|
-
/etc/rc3.d/S20chef
|
84
|
-
/etc/rc4.d/S20chef
|
85
|
-
/etc/rc5.d/S20chef
|
86
|
-
/etc/rc6.d/K20chef",
|
87
|
-
"stderr" => ""
|
88
|
-
},
|
89
|
-
"not linked" => {
|
90
|
-
"stdout" => " Removing any system startup links for /etc/init.d/chef ...",
|
91
|
-
"stderr" => ""
|
92
|
-
},
|
93
|
-
},
|
94
|
-
"Debian/Squeeze and earlier" => {
|
95
|
-
"linked" => {
|
96
|
-
"stdout" => "update-rc.d: using dependency based boot sequencing",
|
97
|
-
"stderr" => "insserv: remove service /etc/init.d/../rc0.d/K20chef-client
|
98
|
-
insserv: remove service /etc/init.d/../rc1.d/K20chef-client
|
99
|
-
insserv: remove service /etc/init.d/../rc2.d/S20chef-client
|
100
|
-
insserv: remove service /etc/init.d/../rc3.d/S20chef-client
|
101
|
-
insserv: remove service /etc/init.d/../rc4.d/S20chef-client
|
102
|
-
insserv: remove service /etc/init.d/../rc5.d/S20chef-client
|
103
|
-
insserv: remove service /etc/init.d/../rc6.d/K20chef-client
|
104
|
-
insserv: dryrun, not creating .depend.boot, .depend.start, and .depend.stop"
|
105
|
-
},
|
106
|
-
"not linked" => {
|
107
|
-
"stdout" => "update-rc.d: using dependency based boot sequencing",
|
108
|
-
"stderr" => ""
|
109
|
-
}
|
110
|
-
}
|
111
|
-
}.each do |model, streams|
|
112
|
-
describe "when update-rc.d shows the init script linked to rc*.d/" do
|
47
|
+
context "when update-rc.d shows init linked to rc*.d/" do
|
113
48
|
before do
|
114
49
|
@provider.stub!(:assert_update_rcd_available)
|
115
50
|
|
116
|
-
|
117
|
-
|
51
|
+
result = <<-UPDATE_RC_D_SUCCESS
|
52
|
+
Removing any system startup links for /etc/init.d/chef ...
|
53
|
+
/etc/rc0.d/K20chef
|
54
|
+
/etc/rc1.d/K20chef
|
55
|
+
/etc/rc2.d/S20chef
|
56
|
+
/etc/rc3.d/S20chef
|
57
|
+
/etc/rc4.d/S20chef
|
58
|
+
/etc/rc5.d/S20chef
|
59
|
+
/etc/rc6.d/K20chef
|
60
|
+
UPDATE_RC_D_SUCCESS
|
61
|
+
|
62
|
+
@stdout = StringIO.new(result)
|
63
|
+
@stderr = StringIO.new
|
118
64
|
@status = mock("Status", :exitstatus => 0, :stdout => @stdout)
|
119
65
|
@provider.stub!(:shell_out!).and_return(@status)
|
120
66
|
@provider.stub!(:popen4).and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
|
@@ -129,25 +75,15 @@ insserv: dryrun, not creating .depend.boot, .depend.start, and .depend.stop"
|
|
129
75
|
@provider.load_current_resource.should equal(@current_resource)
|
130
76
|
@current_resource.enabled.should be_true
|
131
77
|
end
|
132
|
-
|
133
|
-
it "stores the start/stop priorities of the service" do
|
134
|
-
@provider.load_current_resource
|
135
|
-
expected_priorities = {"6"=>[:stop, "20"],
|
136
|
-
"0"=>[:stop, "20"],
|
137
|
-
"1"=>[:stop, "20"],
|
138
|
-
"2"=>[:start, "20"],
|
139
|
-
"3"=>[:start, "20"],
|
140
|
-
"4"=>[:start, "20"],
|
141
|
-
"5"=>[:start, "20"]}
|
142
|
-
@provider.current_resource.priority.should == expected_priorities
|
143
|
-
end
|
144
78
|
end
|
145
79
|
|
146
|
-
|
80
|
+
context "when update-rc.d shows init isn't linked to rc*.d/" do
|
147
81
|
before do
|
148
82
|
@provider.stub!(:assert_update_rcd_available)
|
149
|
-
@
|
150
|
-
@
|
83
|
+
@status = mock("Status", :exitstatus => 0)
|
84
|
+
@stdout = StringIO.new(
|
85
|
+
" Removing any system startup links for /etc/init.d/chef ...")
|
86
|
+
@stderr = StringIO.new
|
151
87
|
@status = mock("Status", :exitstatus => 0, :stdout => @stdout)
|
152
88
|
@provider.stub!(:shell_out!).and_return(@status)
|
153
89
|
@provider.stub!(:popen4).and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
|
@@ -163,92 +99,246 @@ insserv: dryrun, not creating .depend.boot, .depend.start, and .depend.stop"
|
|
163
99
|
@current_resource.enabled.should be_false
|
164
100
|
end
|
165
101
|
end
|
166
|
-
end
|
167
102
|
|
168
|
-
|
169
|
-
|
170
|
-
|
171
|
-
|
172
|
-
|
173
|
-
@stderr = StringIO.new
|
174
|
-
@status = mock("Status", :exitstatus => 0, :stdout => @stdout)
|
175
|
-
@provider.stub!(:shell_out!).and_return(@status)
|
176
|
-
@provider.stub!(:popen4).and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
|
177
|
-
end
|
103
|
+
context "when update-rc.d fails" do
|
104
|
+
before do
|
105
|
+
@status = mock("Status", :exitstatus => -1)
|
106
|
+
@provider.stub!(:popen4).and_return(@status)
|
107
|
+
end
|
178
108
|
|
179
|
-
|
180
|
-
|
109
|
+
it "raises an error" do
|
110
|
+
@provider.define_resource_requirements
|
111
|
+
lambda {
|
112
|
+
@provider.process_resource_requirements
|
113
|
+
}.should raise_error(Chef::Exceptions::Service)
|
114
|
+
end
|
181
115
|
end
|
182
116
|
|
183
|
-
|
184
|
-
|
185
|
-
|
186
|
-
|
117
|
+
{"Debian/Lenny and older" => {
|
118
|
+
"linked" => {
|
119
|
+
"stdout" => <<-STDOUT,
|
120
|
+
Removing any system startup links for /etc/init.d/chef ...
|
121
|
+
/etc/rc0.d/K20chef
|
122
|
+
/etc/rc1.d/K20chef
|
123
|
+
/etc/rc2.d/S20chef
|
124
|
+
/etc/rc3.d/S20chef
|
125
|
+
/etc/rc4.d/S20chef
|
126
|
+
/etc/rc5.d/S20chef
|
127
|
+
/etc/rc6.d/K20chef
|
128
|
+
STDOUT
|
129
|
+
"stderr" => ""
|
130
|
+
},
|
131
|
+
"not linked" => {
|
132
|
+
"stdout" =>
|
133
|
+
" Removing any system startup links for /etc/init.d/chef ...",
|
134
|
+
"stderr" => ""
|
135
|
+
},
|
136
|
+
},
|
137
|
+
"Debian/Squeeze and earlier" => {
|
138
|
+
"linked" => {
|
139
|
+
"stdout" => "update-rc.d: using dependency based boot sequencing",
|
140
|
+
"stderr" => <<-STDERR,
|
141
|
+
insserv: remove service /etc/init.d/../rc0.d/K20chef-client
|
142
|
+
insserv: remove service /etc/init.d/../rc1.d/K20chef-client
|
143
|
+
insserv: remove service /etc/init.d/../rc2.d/S20chef-client
|
144
|
+
insserv: remove service /etc/init.d/../rc3.d/S20chef-client
|
145
|
+
insserv: remove service /etc/init.d/../rc4.d/S20chef-client
|
146
|
+
insserv: remove service /etc/init.d/../rc5.d/S20chef-client
|
147
|
+
insserv: remove service /etc/init.d/../rc6.d/K20chef-client
|
148
|
+
insserv: dryrun, not creating .depend.boot, .depend.start, and .depend.stop
|
149
|
+
STDERR
|
150
|
+
},
|
151
|
+
"not linked" => {
|
152
|
+
"stdout" => "update-rc.d: using dependency based boot sequencing",
|
153
|
+
"stderr" => ""
|
154
|
+
}
|
155
|
+
}
|
156
|
+
}.each do |model, streams|
|
157
|
+
context "on #{model}" do
|
158
|
+
context "when update-rc.d shows init linked to rc*.d/" do
|
159
|
+
before do
|
160
|
+
@provider.stub!(:assert_update_rcd_available)
|
161
|
+
|
162
|
+
@stdout = StringIO.new(streams["linked"]["stdout"])
|
163
|
+
@stderr = StringIO.new(streams["linked"]["stderr"])
|
164
|
+
@status = mock("Status", :exitstatus => 0, :stdout => @stdout)
|
165
|
+
@provider.stub!(:shell_out!).and_return(@status)
|
166
|
+
@provider.stub!(:popen4).and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
|
167
|
+
end
|
168
|
+
|
169
|
+
it "says the service is enabled" do
|
170
|
+
@provider.service_currently_enabled?(@provider.get_priority).should be_true
|
171
|
+
end
|
172
|
+
|
173
|
+
it "stores the 'enabled' state" do
|
174
|
+
Chef::Resource::Service.stub!(:new).and_return(@current_resource)
|
175
|
+
@provider.load_current_resource.should equal(@current_resource)
|
176
|
+
@current_resource.enabled.should be_true
|
177
|
+
end
|
178
|
+
|
179
|
+
it "stores the start/stop priorities of the service" do
|
180
|
+
@provider.load_current_resource
|
181
|
+
expected_priorities = {"6"=>[:stop, "20"],
|
182
|
+
"0"=>[:stop, "20"],
|
183
|
+
"1"=>[:stop, "20"],
|
184
|
+
"2"=>[:start, "20"],
|
185
|
+
"3"=>[:start, "20"],
|
186
|
+
"4"=>[:start, "20"],
|
187
|
+
"5"=>[:start, "20"]}
|
188
|
+
@provider.current_resource.priority.should == expected_priorities
|
189
|
+
end
|
190
|
+
end
|
191
|
+
|
192
|
+
context "when update-rc.d shows init isn't linked to rc*.d/" do
|
193
|
+
before do
|
194
|
+
@provider.stub!(:assert_update_rcd_available)
|
195
|
+
@stdout = StringIO.new(streams["not linked"]["stdout"])
|
196
|
+
@stderr = StringIO.new(streams["not linked"]["stderr"])
|
197
|
+
@status = mock("Status", :exitstatus => 0, :stdout => @stdout)
|
198
|
+
@provider.stub!(:shell_out!).and_return(@status)
|
199
|
+
@provider.stub!(:popen4).and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
|
200
|
+
end
|
201
|
+
|
202
|
+
it "says the service is disabled" do
|
203
|
+
@provider.service_currently_enabled?(@provider.get_priority).should be_false
|
204
|
+
end
|
205
|
+
|
206
|
+
it "stores the 'disabled' state" do
|
207
|
+
Chef::Resource::Service.stub!(:new).and_return(@current_resource)
|
208
|
+
@provider.load_current_resource.should equal(@current_resource)
|
209
|
+
@current_resource.enabled.should be_false
|
210
|
+
end
|
211
|
+
end
|
212
|
+
end
|
187
213
|
end
|
214
|
+
|
188
215
|
end
|
189
216
|
|
190
|
-
describe "
|
191
|
-
|
192
|
-
|
193
|
-
|
217
|
+
describe "action_enable" do
|
218
|
+
shared_examples_for "the service is up to date" do
|
219
|
+
it "does not enable the service" do
|
220
|
+
@provider.should_not_receive(:enable_service)
|
221
|
+
@provider.action_enable
|
222
|
+
@provider.set_updated_status
|
223
|
+
@provider.new_resource.should_not be_updated
|
224
|
+
end
|
194
225
|
end
|
195
226
|
|
196
|
-
|
197
|
-
|
198
|
-
|
227
|
+
shared_examples_for "the service is not up to date" do
|
228
|
+
it "enables the service and sets the resource as updated" do
|
229
|
+
@provider.should_receive(:enable_service).and_return(true)
|
230
|
+
@provider.action_enable
|
231
|
+
@provider.set_updated_status
|
232
|
+
@provider.new_resource.should be_updated
|
233
|
+
end
|
199
234
|
end
|
200
|
-
end
|
201
235
|
|
202
|
-
|
203
|
-
|
204
|
-
|
205
|
-
|
206
|
-
|
236
|
+
context "when the service is disabled" do
|
237
|
+
before do
|
238
|
+
@current_resource.enabled(false)
|
239
|
+
end
|
240
|
+
|
241
|
+
it_behaves_like "the service is not up to date"
|
207
242
|
end
|
208
|
-
end
|
209
243
|
|
210
|
-
|
211
|
-
|
212
|
-
|
244
|
+
context "when the service is enabled" do
|
245
|
+
before do
|
246
|
+
@current_resource.enabled(true)
|
247
|
+
end
|
248
|
+
|
249
|
+
context "and the service sets no priority" do
|
250
|
+
it_behaves_like "the service is up to date"
|
251
|
+
end
|
252
|
+
|
253
|
+
context "and the service requests the same priority as is set" do
|
254
|
+
before do
|
255
|
+
@current_resource.priority(80)
|
256
|
+
@new_resource.priority(80)
|
257
|
+
end
|
258
|
+
it_behaves_like "the service is up to date"
|
259
|
+
end
|
260
|
+
|
261
|
+
context "and the service requests a different priority than is set" do
|
262
|
+
before do
|
263
|
+
@current_resource.priority(20)
|
264
|
+
@new_resource.priority(80)
|
265
|
+
end
|
266
|
+
it_behaves_like "the service is not up to date"
|
267
|
+
end
|
213
268
|
end
|
269
|
+
end
|
214
270
|
|
215
|
-
|
216
|
-
|
217
|
-
|
218
|
-
@provider.enable_service()
|
271
|
+
def expect_commands(provider, commands)
|
272
|
+
commands.each do |command|
|
273
|
+
provider.should_receive(:run_command).with({:command => command})
|
219
274
|
end
|
220
275
|
end
|
221
276
|
|
222
|
-
describe "
|
223
|
-
|
224
|
-
|
277
|
+
describe "enable_service" do
|
278
|
+
let(:service_name) { @new_resource.service_name }
|
279
|
+
context "when the service doesn't set a priority" do
|
280
|
+
it "calls update-rc.d 'service_name' defaults" do
|
281
|
+
expect_commands(@provider, [
|
282
|
+
"/usr/sbin/update-rc.d -f #{service_name} remove",
|
283
|
+
"/usr/sbin/update-rc.d #{service_name} defaults"
|
284
|
+
])
|
285
|
+
@provider.enable_service
|
286
|
+
end
|
225
287
|
end
|
226
288
|
|
227
|
-
|
228
|
-
|
229
|
-
|
230
|
-
|
289
|
+
context "when the service sets a simple priority" do
|
290
|
+
before do
|
291
|
+
@new_resource.priority(75)
|
292
|
+
end
|
293
|
+
|
294
|
+
it "calls update-rc.d 'service_name' defaults" do
|
295
|
+
expect_commands(@provider, [
|
296
|
+
"/usr/sbin/update-rc.d -f #{service_name} remove",
|
297
|
+
"/usr/sbin/update-rc.d #{service_name} defaults 75 25"
|
298
|
+
])
|
299
|
+
@provider.enable_service
|
300
|
+
end
|
231
301
|
end
|
232
|
-
end
|
233
302
|
|
234
|
-
|
303
|
+
context "when the service sets complex priorities" do
|
304
|
+
before do
|
305
|
+
@new_resource.priority(2 => [:start, 20], 3 => [:stop, 55])
|
306
|
+
end
|
235
307
|
|
236
|
-
|
237
|
-
|
238
|
-
|
239
|
-
|
308
|
+
it "calls update-rc.d 'service_name' with those priorities" do
|
309
|
+
expect_commands(@provider, [
|
310
|
+
"/usr/sbin/update-rc.d -f #{service_name} remove",
|
311
|
+
"/usr/sbin/update-rc.d #{service_name} start 20 2 . stop 55 3 . "
|
312
|
+
])
|
313
|
+
@provider.enable_service
|
314
|
+
end
|
240
315
|
end
|
241
316
|
end
|
242
317
|
|
243
|
-
describe "
|
244
|
-
|
245
|
-
|
318
|
+
describe "disable_service" do
|
319
|
+
let(:service_name) { @new_resource.service_name }
|
320
|
+
context "when the service doesn't set a priority" do
|
321
|
+
it "calls update-rc.d -f 'service_name' remove + stop with default priority" do
|
322
|
+
expect_commands(@provider, [
|
323
|
+
"/usr/sbin/update-rc.d -f #{service_name} remove",
|
324
|
+
"/usr/sbin/update-rc.d -f #{service_name} stop 80 2 3 4 5 ."
|
325
|
+
])
|
326
|
+
@provider.disable_service
|
327
|
+
end
|
246
328
|
end
|
247
329
|
|
248
|
-
|
249
|
-
|
250
|
-
|
251
|
-
|
330
|
+
context "when the service sets a simple priority" do
|
331
|
+
before do
|
332
|
+
@new_resource.priority(75)
|
333
|
+
end
|
334
|
+
|
335
|
+
it "calls update-rc.d -f 'service_name' remove + stop with the specified priority" do
|
336
|
+
expect_commands(@provider, [
|
337
|
+
"/usr/sbin/update-rc.d -f #{service_name} remove",
|
338
|
+
"/usr/sbin/update-rc.d -f #{service_name} stop #{100 - @new_resource.priority} 2 3 4 5 ."
|
339
|
+
])
|
340
|
+
@provider.disable_service
|
341
|
+
end
|
252
342
|
end
|
253
343
|
end
|
254
344
|
end
|