chefspec 5.0.0 → 7.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/.travis.yml +17 -25
- data/CHANGELOG.md +506 -371
- data/Gemfile +9 -0
- data/README.md +118 -75
- data/chefspec.gemspec +4 -5
- data/examples/apt_package/recipes/purge.rb +2 -2
- data/examples/apt_package/recipes/reconfig.rb +2 -2
- data/examples/apt_package/recipes/remove.rb +2 -2
- data/examples/apt_package/recipes/upgrade.rb +2 -2
- data/examples/apt_package/spec/install_spec.rb +4 -1
- data/examples/apt_package/spec/purge_spec.rb +4 -1
- data/examples/apt_package/spec/reconfig_spec.rb +4 -1
- data/examples/apt_package/spec/remove_spec.rb +4 -1
- data/examples/apt_package/spec/upgrade_spec.rb +4 -1
- data/examples/apt_repository/spec/add_spec.rb +4 -1
- data/examples/apt_repository/spec/remove_spec.rb +4 -1
- data/examples/apt_update/recipes/periodic.rb +1 -1
- data/examples/apt_update/spec/periodic_spec.rb +5 -2
- data/examples/apt_update/spec/update_spec.rb +4 -1
- data/examples/attributes/spec/default_spec.rb +1 -1
- data/examples/batch/recipes/run.rb +0 -4
- data/examples/batch/spec/run_spec.rb +4 -10
- data/examples/bff_package/recipes/install.rb +13 -0
- data/examples/bff_package/recipes/purge.rb +13 -0
- data/examples/bff_package/recipes/remove.rb +13 -0
- data/examples/bff_package/recipes/upgrade.rb +13 -0
- data/examples/bff_package/spec/install_spec.rb +23 -0
- data/examples/bff_package/spec/purge_spec.rb +19 -0
- data/examples/bff_package/spec/remove_spec.rb +19 -0
- data/examples/bff_package/spec/upgrade_spec.rb +19 -0
- data/examples/cab_package/recipes/install.rb +13 -0
- data/examples/cab_package/recipes/remove.rb +13 -0
- data/examples/cab_package/spec/install_spec.rb +26 -0
- data/examples/cab_package/spec/remove_spec.rb +22 -0
- data/examples/cached/spec/default_spec.rb +1 -1
- data/examples/chef_gem/spec/install_spec.rb +1 -1
- data/examples/chef_gem/spec/purge_spec.rb +1 -1
- data/examples/chef_gem/spec/reconfig_spec.rb +1 -1
- data/examples/chef_gem/spec/remove_spec.rb +1 -1
- data/examples/chef_gem/spec/upgrade_spec.rb +1 -1
- data/examples/chocolatey_package/spec/install_spec.rb +4 -6
- data/examples/chocolatey_package/spec/remove_spec.rb +4 -6
- data/examples/chocolatey_package/spec/upgrade_spec.rb +4 -6
- data/examples/compile_time/spec/default_spec.rb +1 -1
- data/examples/cookbook_file/spec/create_if_missing_spec.rb +3 -3
- data/examples/cookbook_file/spec/create_spec.rb +3 -3
- data/examples/cookbook_file/spec/delete_spec.rb +1 -1
- data/examples/cookbook_file/spec/touch_spec.rb +1 -1
- data/examples/cron/spec/create_spec.rb +1 -1
- data/examples/cron/spec/delete_spec.rb +1 -1
- data/examples/custom_matcher/providers/thing.rb +1 -1
- data/examples/custom_matcher/spec/install_spec.rb +1 -1
- data/examples/custom_matcher/spec/remove_spec.rb +1 -1
- data/examples/custom_resource/libraries/matchers.rb +5 -0
- data/examples/custom_resource/recipes/default.rb +1 -0
- data/examples/custom_resource/resources/custom_resource.rb +9 -0
- data/examples/custom_resource/spec/default_spec.rb +18 -0
- data/examples/deploy/spec/deploy_spec.rb +1 -1
- data/examples/deploy/spec/force_deploy_spec.rb +1 -1
- data/examples/deploy/spec/rollback_spec.rb +1 -1
- data/examples/directory/spec/create_spec.rb +4 -4
- data/examples/directory/spec/delete_spec.rb +3 -3
- data/examples/dnf_package/recipes/install.rb +13 -0
- data/examples/dnf_package/recipes/purge.rb +13 -0
- data/examples/dnf_package/recipes/remove.rb +13 -0
- data/examples/dnf_package/recipes/upgrade.rb +13 -0
- data/examples/dnf_package/spec/install_spec.rb +26 -0
- data/examples/dnf_package/spec/purge_spec.rb +22 -0
- data/examples/dnf_package/spec/remove_spec.rb +22 -0
- data/examples/dnf_package/spec/upgrade_spec.rb +22 -0
- data/examples/do_nothing/spec/default_spec.rb +1 -1
- data/examples/dpkg_package/spec/install_spec.rb +4 -6
- data/examples/dpkg_package/spec/purge_spec.rb +4 -6
- data/examples/dpkg_package/spec/remove_spec.rb +4 -6
- data/examples/dsc_resource/recipes/{default.rb → run.rb} +6 -6
- data/examples/dsc_resource/spec/{default_spec.rb → run_spec.rb} +8 -10
- data/examples/dsc_script/recipes/run.rb +12 -0
- data/examples/dsc_script/spec/run_spec.rb +16 -0
- data/examples/env/spec/create_spec.rb +4 -6
- data/examples/env/spec/delete_spec.rb +4 -6
- data/examples/env/spec/modify_spec.rb +4 -6
- data/examples/erl_call/spec/run_spec.rb +1 -1
- data/examples/execute/spec/run_spec.rb +1 -1
- data/examples/expect_exception/spec/compile_error_spec.rb +1 -1
- data/examples/expect_exception/spec/converge_error_spec.rb +1 -1
- data/examples/expect_exception/spec/no_error_spec.rb +1 -1
- data/examples/file/spec/create_if_missing_spec.rb +3 -3
- data/examples/file/spec/create_spec.rb +3 -3
- data/examples/file/spec/delete_spec.rb +1 -1
- data/examples/file/spec/touch_spec.rb +1 -1
- data/examples/freebsd_package/spec/install_spec.rb +4 -1
- data/examples/freebsd_package/spec/remove_spec.rb +4 -1
- data/examples/gem_package/spec/install_spec.rb +1 -1
- data/examples/gem_package/spec/purge_spec.rb +1 -1
- data/examples/gem_package/spec/reconfig_spec.rb +1 -1
- data/examples/gem_package/spec/remove_spec.rb +1 -1
- data/examples/gem_package/spec/upgrade_spec.rb +1 -1
- data/examples/git/spec/checkout_spec.rb +1 -1
- data/examples/git/spec/export_spec.rb +1 -1
- data/examples/git/spec/sync_spec.rb +1 -1
- data/examples/group/spec/create_spec.rb +1 -1
- data/examples/group/spec/manage_spec.rb +1 -1
- data/examples/group/spec/modify_spec.rb +1 -1
- data/examples/group/spec/remove_spec.rb +1 -1
- data/examples/guards/spec/default_spec.rb +1 -1
- data/examples/heavy_provider_light_resource/libraries/resource_service.rb +1 -1
- data/examples/heavy_provider_light_resource/recipes/default.rb +1 -2
- data/examples/heavy_provider_light_resource/spec/provider_service_spec.rb +2 -2
- data/examples/homebrew_package/recipes/install.rb +13 -0
- data/examples/homebrew_package/recipes/purge.rb +13 -0
- data/examples/homebrew_package/recipes/remove.rb +13 -0
- data/examples/homebrew_package/recipes/upgrade.rb +13 -0
- data/examples/homebrew_package/spec/install_spec.rb +23 -0
- data/examples/homebrew_package/spec/purge_spec.rb +19 -0
- data/examples/homebrew_package/spec/remove_spec.rb +19 -0
- data/examples/homebrew_package/spec/upgrade_spec.rb +19 -0
- data/examples/http_request/spec/delete_spec.rb +1 -1
- data/examples/http_request/spec/get_spec.rb +1 -1
- data/examples/http_request/spec/head_spec.rb +1 -1
- data/examples/http_request/spec/options_spec.rb +1 -1
- data/examples/http_request/spec/post_spec.rb +1 -1
- data/examples/http_request/spec/put_spec.rb +1 -1
- data/examples/ifconfig/spec/add_spec.rb +1 -1
- data/examples/ifconfig/spec/delete_spec.rb +1 -1
- data/examples/ifconfig/spec/disable_spec.rb +1 -1
- data/examples/ifconfig/spec/enable_spec.rb +1 -1
- data/examples/include_recipe/spec/default_spec.rb +1 -1
- data/examples/ips_package/spec/install_spec.rb +4 -6
- data/examples/ips_package/spec/remove_spec.rb +4 -6
- data/examples/ips_package/spec/upgrade_spec.rb +4 -6
- data/examples/launchd/recipes/create.rb +5 -0
- data/examples/launchd/recipes/create_if_missing.rb +3 -0
- data/examples/launchd/recipes/delete.rb +3 -0
- data/examples/launchd/recipes/disable.rb +3 -0
- data/examples/launchd/recipes/enable.rb +3 -0
- data/examples/launchd/spec/create_if_missing_spec.rb +10 -0
- data/examples/launchd/spec/create_spec.rb +14 -0
- data/examples/launchd/spec/delete_spec.rb +10 -0
- data/examples/launchd/spec/disable_spec.rb +10 -0
- data/examples/launchd/spec/enable_spec.rb +10 -0
- data/examples/link/spec/create_spec.rb +1 -1
- data/examples/link/spec/delete_spec.rb +1 -1
- data/examples/link/spec/link_to_spec.rb +1 -1
- data/examples/log/spec/write_spec.rb +1 -1
- data/examples/macports_package/spec/install_spec.rb +1 -1
- data/examples/macports_package/spec/purge_spec.rb +1 -1
- data/examples/macports_package/spec/remove_spec.rb +1 -1
- data/examples/macports_package/spec/upgrade_spec.rb +1 -1
- data/examples/mdadm/spec/assemble_spec.rb +1 -1
- data/examples/mdadm/spec/create_spec.rb +1 -1
- data/examples/mdadm/spec/stop_spec.rb +1 -1
- data/examples/mount/spec/disable_spec.rb +1 -1
- data/examples/mount/spec/enable_spec.rb +1 -1
- data/examples/mount/spec/mount_spec.rb +1 -1
- data/examples/mount/spec/remount_spec.rb +1 -1
- data/examples/mount/spec/umount_spec.rb +1 -1
- data/examples/msu_package/recipes/install.rb +13 -0
- data/examples/msu_package/recipes/remove.rb +13 -0
- data/examples/msu_package/spec/install_spec.rb +26 -0
- data/examples/msu_package/spec/remove_spec.rb +22 -0
- data/examples/multiple_actions/recipes/reversed.rb +9 -0
- data/examples/multiple_actions/recipes/sequential.rb +5 -3
- data/examples/multiple_actions/spec/default_spec.rb +1 -1
- data/examples/multiple_actions/spec/reversed_spec.rb +17 -0
- data/examples/multiple_actions/spec/sequential_spec.rb +5 -4
- data/examples/multiple_run_action/recipes/default.rb +2 -2
- data/examples/multiple_run_action/spec/default_spec.rb +1 -1
- data/examples/notifications/spec/before_spec.rb +1 -1
- data/examples/notifications/spec/chained_spec.rb +1 -1
- data/examples/notifications/spec/default_spec.rb +1 -1
- data/examples/notifications/spec/delayed_spec.rb +1 -1
- data/examples/notifications/spec/immediately_spec.rb +1 -1
- data/examples/ohai/spec/reload_spec.rb +1 -1
- data/examples/openbsd_package/recipes/install.rb +13 -0
- data/examples/openbsd_package/recipes/purge.rb +13 -0
- data/examples/openbsd_package/recipes/remove.rb +13 -0
- data/examples/openbsd_package/recipes/upgrade.rb +13 -0
- data/examples/openbsd_package/spec/install_spec.rb +23 -0
- data/examples/openbsd_package/spec/purge_spec.rb +19 -0
- data/examples/openbsd_package/spec/remove_spec.rb +19 -0
- data/examples/openbsd_package/spec/upgrade_spec.rb +19 -0
- data/examples/osx_profile/recipes/install.rb +8 -0
- data/examples/osx_profile/recipes/remove.rb +8 -0
- data/examples/osx_profile/spec/install_spec.rb +15 -0
- data/examples/osx_profile/spec/remove_spec.rb +13 -0
- data/examples/package/recipes/install.rb +1 -1
- data/examples/package/recipes/purge.rb +1 -1
- data/examples/package/recipes/reconfig.rb +1 -1
- data/examples/package/recipes/remove.rb +1 -1
- data/examples/package/recipes/upgrade.rb +1 -1
- data/examples/package/spec/install_spec.rb +2 -2
- data/examples/package/spec/purge_spec.rb +2 -2
- data/examples/package/spec/reconfig_spec.rb +2 -2
- data/examples/package/spec/remove_spec.rb +2 -2
- data/examples/package/spec/upgrade_spec.rb +2 -2
- data/examples/pacman_package/spec/install_spec.rb +4 -6
- data/examples/pacman_package/spec/purge_spec.rb +4 -6
- data/examples/pacman_package/spec/remove_spec.rb +4 -6
- data/examples/pacman_package/spec/upgrade_spec.rb +4 -6
- data/examples/paludis_package/recipes/install.rb +13 -0
- data/examples/paludis_package/recipes/purge.rb +13 -0
- data/examples/paludis_package/recipes/remove.rb +13 -0
- data/examples/paludis_package/recipes/upgrade.rb +13 -0
- data/examples/paludis_package/spec/install_spec.rb +23 -0
- data/examples/paludis_package/spec/purge_spec.rb +19 -0
- data/examples/paludis_package/spec/remove_spec.rb +19 -0
- data/examples/paludis_package/spec/upgrade_spec.rb +19 -0
- data/examples/portage_package/spec/install_spec.rb +4 -1
- data/examples/portage_package/spec/purge_spec.rb +4 -1
- data/examples/portage_package/spec/remove_spec.rb +4 -1
- data/examples/portage_package/spec/upgrade_spec.rb +4 -1
- data/examples/powershell_script/recipes/run.rb +0 -4
- data/examples/powershell_script/spec/run_spec.rb +4 -10
- data/examples/reboot/spec/cancel_spec.rb +1 -2
- data/examples/reboot/spec/now_spec.rb +1 -2
- data/examples/reboot/spec/request_spec.rb +1 -2
- data/examples/registry_key/spec/create_if_missing_spec.rb +4 -1
- data/examples/registry_key/spec/create_spec.rb +4 -1
- data/examples/registry_key/spec/delete_key_spec.rb +4 -1
- data/examples/registry_key/spec/delete_spec.rb +4 -1
- data/examples/remote_directory/spec/create_if_missing_spec.rb +1 -1
- data/examples/remote_directory/spec/create_spec.rb +1 -1
- data/examples/remote_directory/spec/delete_spec.rb +1 -1
- data/examples/remote_file/spec/create_if_missing_spec.rb +1 -1
- data/examples/remote_file/spec/create_spec.rb +1 -1
- data/examples/remote_file/spec/delete_spec.rb +1 -1
- data/examples/remote_file/spec/touch_spec.rb +1 -1
- data/examples/render_file/spec/default_spec.rb +1 -1
- data/examples/render_file/spec/template_helpers_spec.rb +1 -1
- data/examples/roles/roles/role.rb +4 -4
- data/examples/roles/spec/default_spec.rb +1 -1
- data/examples/route/spec/add_spec.rb +1 -1
- data/examples/route/spec/delete_spec.rb +1 -1
- data/examples/rpm_package/spec/install_spec.rb +4 -6
- data/examples/rpm_package/spec/remove_spec.rb +4 -6
- data/examples/rpm_package/spec/upgrade_spec.rb +4 -6
- data/examples/ruby_block/recipes/create.rb +8 -0
- data/examples/ruby_block/spec/create_spec.rb +13 -0
- data/examples/ruby_block/spec/run_spec.rb +1 -1
- data/examples/script/recipes/run_bash.rb +0 -4
- data/examples/script/recipes/run_csh.rb +0 -4
- data/examples/script/recipes/run_ksh.rb +9 -0
- data/examples/script/recipes/run_perl.rb +0 -4
- data/examples/script/recipes/run_python.rb +0 -4
- data/examples/script/recipes/run_ruby.rb +0 -4
- data/examples/script/recipes/run_script.rb +0 -4
- data/examples/script/spec/run_bash_spec.rb +1 -5
- data/examples/script/spec/run_csh_spec.rb +1 -5
- data/examples/script/spec/run_ksh_spec.rb +19 -0
- data/examples/script/spec/run_perl_spec.rb +1 -5
- data/examples/script/spec/run_python_spec.rb +1 -5
- data/examples/script/spec/run_ruby_spec.rb +1 -5
- data/examples/script/spec/run_script_spec.rb +1 -5
- data/examples/server/spec/client_spec.rb +2 -2
- data/examples/server/spec/data_bag_spec.rb +9 -11
- data/examples/server/spec/environment_spec.rb +1 -1
- data/examples/server/spec/exotic_port_spec.rb +17 -0
- data/examples/server/spec/node_spec.rb +6 -6
- data/examples/server/spec/render_with_cached_spec.rb +1 -1
- data/examples/server/spec/role_spec.rb +1 -1
- data/examples/server/spec/search_spec.rb +2 -2
- data/examples/service/recipes/disable.rb +1 -1
- data/examples/service/recipes/enable.rb +1 -1
- data/examples/service/recipes/reload.rb +1 -1
- data/examples/service/recipes/restart.rb +1 -1
- data/examples/service/recipes/start.rb +1 -1
- data/examples/service/recipes/stop.rb +1 -1
- data/examples/service/spec/disable_spec.rb +1 -1
- data/examples/service/spec/enable_spec.rb +1 -1
- data/examples/service/spec/reload_spec.rb +1 -1
- data/examples/service/spec/restart_spec.rb +1 -1
- data/examples/service/spec/start_spec.rb +1 -1
- data/examples/service/spec/stop_spec.rb +1 -1
- data/examples/smartos_package/spec/install_spec.rb +4 -1
- data/examples/smartos_package/spec/remove_spec.rb +4 -1
- data/examples/smartos_package/spec/upgrade_spec.rb +4 -1
- data/examples/solaris_package/recipes/upgrade.rb +13 -0
- data/examples/solaris_package/spec/install_spec.rb +4 -1
- data/examples/solaris_package/spec/remove_spec.rb +4 -1
- data/examples/solaris_package/spec/upgrade_spec.rb +22 -0
- data/examples/state_attrs/providers/lwrp.rb +0 -1
- data/examples/state_attrs/spec/default_spec.rb +1 -1
- data/examples/step_into/spec/default_spec.rb +4 -4
- data/examples/stub_command/spec/default_spec.rb +3 -3
- data/examples/stub_data_bag/spec/default_spec.rb +3 -3
- data/examples/stub_data_bag_item/spec/default_spec.rb +5 -5
- data/examples/stub_search/recipes/block.rb +3 -0
- data/examples/stub_search/recipes/default.rb +2 -5
- data/examples/stub_search/spec/block_spec.rb +27 -0
- data/examples/stub_search/spec/default_spec.rb +5 -5
- data/examples/subscribes/spec/before_spec.rb +1 -1
- data/examples/subscribes/spec/chained_spec.rb +1 -1
- data/examples/subscribes/spec/default_spec.rb +1 -2
- data/examples/subscribes/spec/delayed_spec.rb +1 -1
- data/examples/subscribes/spec/immediately_spec.rb +1 -1
- data/examples/subversion/spec/checkout_spec.rb +1 -1
- data/examples/subversion/spec/export_spec.rb +1 -1
- data/examples/subversion/spec/force_export_spec.rb +1 -1
- data/examples/subversion/spec/sync_spec.rb +1 -1
- data/examples/systemd_unit/recipes/create.rb +3 -0
- data/examples/systemd_unit/recipes/delete.rb +3 -0
- data/examples/systemd_unit/recipes/disable.rb +3 -0
- data/examples/systemd_unit/recipes/enable.rb +3 -0
- data/examples/systemd_unit/recipes/mask.rb +3 -0
- data/examples/systemd_unit/recipes/reload_or_restart.rb +3 -0
- data/examples/systemd_unit/recipes/reload_or_try_restart.rb +3 -0
- data/examples/systemd_unit/recipes/restart.rb +3 -0
- data/examples/systemd_unit/recipes/start.rb +3 -0
- data/examples/systemd_unit/recipes/stop.rb +3 -0
- data/examples/systemd_unit/recipes/try_restart.rb +3 -0
- data/examples/systemd_unit/recipes/unmask.rb +3 -0
- data/examples/systemd_unit/spec/create_spec.rb +10 -0
- data/examples/systemd_unit/spec/delete_spec.rb +10 -0
- data/examples/systemd_unit/spec/disable_spec.rb +10 -0
- data/examples/systemd_unit/spec/enable_spec.rb +10 -0
- data/examples/systemd_unit/spec/mask_spec.rb +10 -0
- data/examples/systemd_unit/spec/reload_or_restart_spec.rb +10 -0
- data/examples/systemd_unit/spec/reload_or_try_restart_spec.rb +10 -0
- data/examples/systemd_unit/spec/restart_spec.rb +10 -0
- data/examples/systemd_unit/spec/start_spec.rb +10 -0
- data/examples/systemd_unit/spec/stop_spec.rb +10 -0
- data/examples/systemd_unit/spec/try_restart_spec.rb +10 -0
- data/examples/systemd_unit/spec/unmask_spec.rb +10 -0
- data/examples/template/spec/create_if_missing_spec.rb +3 -3
- data/examples/template/spec/create_spec.rb +3 -3
- data/examples/template/spec/delete_spec.rb +1 -1
- data/examples/template/spec/touch_spec.rb +1 -1
- data/examples/use_inline_resources/spec/default_spec.rb +3 -3
- data/examples/user/spec/create_spec.rb +4 -1
- data/examples/user/spec/lock_spec.rb +4 -1
- data/examples/user/spec/manage_spec.rb +4 -1
- data/examples/user/spec/modify_spec.rb +4 -1
- data/examples/user/spec/remove_spec.rb +4 -1
- data/examples/user/spec/unlock_spec.rb +4 -1
- data/examples/windows_package/spec/install_spec.rb +4 -6
- data/examples/windows_package/spec/remove_spec.rb +4 -6
- data/examples/windows_service/spec/configure_startup_spec.rb +4 -6
- data/examples/windows_service/spec/disable_spec.rb +4 -6
- data/examples/windows_service/spec/enable_spec.rb +4 -6
- data/examples/windows_service/spec/reload_spec.rb +4 -6
- data/examples/windows_service/spec/restart_spec.rb +4 -6
- data/examples/windows_service/spec/start_spec.rb +4 -6
- data/examples/windows_service/spec/stop_spec.rb +4 -6
- data/examples/yum_package/spec/install_spec.rb +4 -1
- data/examples/yum_package/spec/purge_spec.rb +4 -1
- data/examples/yum_package/spec/remove_spec.rb +4 -1
- data/examples/yum_package/spec/upgrade_spec.rb +4 -1
- data/examples/yum_repository/recipes/add.rb +8 -0
- data/examples/yum_repository/recipes/create.rb +8 -0
- data/examples/yum_repository/recipes/delete.rb +3 -0
- data/examples/yum_repository/recipes/makecache.rb +3 -0
- data/examples/yum_repository/recipes/remove.rb +7 -0
- data/examples/yum_repository/spec/add_spec.rb +12 -0
- data/examples/yum_repository/spec/create_spec.rb +17 -0
- data/examples/yum_repository/spec/delete_spec.rb +12 -0
- data/examples/yum_repository/spec/makecache_spec.rb +12 -0
- data/examples/yum_repository/spec/remove_spec.rb +12 -0
- data/examples/zypper_package/recipes/install.rb +13 -0
- data/examples/zypper_package/recipes/purge.rb +13 -0
- data/examples/zypper_package/recipes/remove.rb +13 -0
- data/examples/zypper_package/recipes/upgrade.rb +13 -0
- data/examples/zypper_package/spec/install_spec.rb +23 -0
- data/examples/zypper_package/spec/purge_spec.rb +19 -0
- data/examples/zypper_package/spec/remove_spec.rb +19 -0
- data/examples/zypper_package/spec/upgrade_spec.rb +19 -0
- data/features/apt_repository.feature +15 -0
- data/features/apt_update.feature +13 -0
- data/features/attributes.feature +1 -1
- data/features/bff_package.feature +12 -0
- data/features/cab_package.feature +21 -0
- data/features/chocolatey_package.feature +1 -6
- data/features/compile_time.feature +1 -1
- data/features/custom_resource.feature +7 -0
- data/features/dnf_package.feature +26 -0
- data/features/dsc_resource.feature +5 -4
- data/features/dsc_script.feature +10 -0
- data/features/exotic_zero_port.feature +7 -0
- data/features/homebrew_package.feature +12 -0
- data/features/launchd.feature +17 -0
- data/features/msu_package.feature +23 -0
- data/features/multiple_actions.feature +1 -0
- data/features/notifications.feature +0 -7
- data/features/openbsd_package.feature +12 -0
- data/features/osx_profile.feature +13 -0
- data/features/paludis_package.feature +12 -0
- data/features/roles.feature +1 -1
- data/features/ruby_block.feature +1 -0
- data/features/script.feature +1 -0
- data/features/server_on_disk.feature +16 -0
- data/features/solaris_package.feature +1 -0
- data/features/stub_search.feature +1 -1
- data/features/subscribes.feature +0 -7
- data/features/support/env.rb +8 -0
- data/features/support/exotic_zero_port.rb +3 -0
- data/features/support/on_disk.rb +7 -0
- data/features/systemd_unit.feature +27 -0
- data/features/windows_package.feature +0 -4
- data/features/yum_repository.feature +23 -0
- data/features/{easy_install_package.feature → zypper_package.feature} +2 -2
- data/lib/chefspec/api/bff_package.rb +154 -0
- data/lib/chefspec/api/cab_package.rb +80 -0
- data/lib/chefspec/api/dnf_package.rb +154 -0
- data/lib/chefspec/api/dsc_script.rb +37 -0
- data/lib/chefspec/api/homebrew_package.rb +154 -0
- data/lib/chefspec/api/launchd.rb +151 -0
- data/lib/chefspec/api/msu_package.rb +81 -0
- data/lib/chefspec/api/openbsd_package.rb +155 -0
- data/lib/chefspec/api/osx_profile.rb +63 -0
- data/lib/chefspec/api/paludis_package.rb +155 -0
- data/lib/chefspec/api/ruby_block.rb +31 -0
- data/lib/chefspec/api/script.rb +39 -0
- data/lib/chefspec/api/solaris_package.rb +37 -0
- data/lib/chefspec/api/systemd_unit.rb +353 -0
- data/lib/chefspec/api/yum_repository.rb +130 -0
- data/lib/chefspec/api/zypper_package.rb +154 -0
- data/lib/chefspec/api.rb +15 -0
- data/lib/chefspec/coverage.rb +25 -7
- data/lib/chefspec/extensions/chef/data_query.rb +6 -1
- data/lib/chefspec/extensions/chef/lwrp_base.rb +21 -35
- data/lib/chefspec/macros.rb +1 -1
- data/lib/chefspec/matchers/resource_matcher.rb +20 -27
- data/lib/chefspec/rspec.rb +3 -0
- data/lib/chefspec/server_methods.rb +9 -12
- data/lib/chefspec/server_runner.rb +2 -42
- data/lib/chefspec/solo_runner.rb +11 -10
- data/lib/chefspec/version.rb +1 -1
- data/lib/chefspec/zero_server.rb +140 -0
- data/lib/chefspec.rb +0 -1
- data/spec/unit/macros_spec.rb +2 -2
- data/spec/unit/solo_runner_spec.rb +3 -2
- data/templates/errors/may_need_to_specify_platform.erb +1 -1
- metadata +195 -26
- data/examples/easy_install_package/recipes/install.rb +0 -13
- data/examples/easy_install_package/recipes/purge.rb +0 -13
- data/examples/easy_install_package/recipes/remove.rb +0 -13
- data/examples/easy_install_package/recipes/upgrade.rb +0 -13
- data/examples/easy_install_package/spec/install_spec.rb +0 -23
- data/examples/easy_install_package/spec/purge_spec.rb +0 -19
- data/examples/easy_install_package/spec/remove_spec.rb +0 -19
- data/examples/easy_install_package/spec/upgrade_spec.rb +0 -19
- data/gemfiles/chefspec.gemfile +0 -15
- data/lib/chefspec/chef_backwards_compat.rb +0 -79
|
@@ -0,0 +1,130 @@
|
|
|
1
|
+
module ChefSpec::API
|
|
2
|
+
# @since 3.0.0
|
|
3
|
+
module YumRepositoryMatchers
|
|
4
|
+
ChefSpec.define_matcher :yum_repository
|
|
5
|
+
|
|
6
|
+
#
|
|
7
|
+
# Assert that a +yum_repository+ resource exists in the Chef run with the
|
|
8
|
+
# action +:create+. Given a Chef Recipe that creates "epel" as an
|
|
9
|
+
# +yum_repository+:
|
|
10
|
+
#
|
|
11
|
+
# yum_repository 'epel' do
|
|
12
|
+
# baseurl "http://mirrors.fedoraproject.org/mirrorlist?repo=epel-#{node['platform_version'].to_i}&arch=$basearch"
|
|
13
|
+
# description 'Extra Packages for $releasever - $basearch'
|
|
14
|
+
# action :create
|
|
15
|
+
# end
|
|
16
|
+
#
|
|
17
|
+
# The Examples section demonstrates the different ways to test an
|
|
18
|
+
# +yum_repository+ resource with ChefSpec.
|
|
19
|
+
#
|
|
20
|
+
# @example Assert that an +yum_repository+ was created
|
|
21
|
+
# expect(chef_run).to create_yum_repository('epel')
|
|
22
|
+
# @param [String, Regex] resource_name
|
|
23
|
+
# the name of the resource to match
|
|
24
|
+
#
|
|
25
|
+
# @return [ChefSpec::Matchers::ResourceMatcher]
|
|
26
|
+
|
|
27
|
+
def create_yum_repository(resource_name)
|
|
28
|
+
ChefSpec::Matchers::ResourceMatcher.new(:yum_repository, :create,
|
|
29
|
+
resource_name)
|
|
30
|
+
end
|
|
31
|
+
|
|
32
|
+
#
|
|
33
|
+
# Assert that a +yum_repository+ resource exists in the Chef run with the
|
|
34
|
+
# action +:add+. Given a Chef Recipe that adds "epel" as an
|
|
35
|
+
# +yum_repository+:
|
|
36
|
+
#
|
|
37
|
+
# yum_repository 'epel' do
|
|
38
|
+
# baseurl "http://mirrors.fedoraproject.org/mirrorlist?repo=epel-#{node['platform_version'].to_i}&arch=$basearch"
|
|
39
|
+
# description 'Extra Packages for $releasever - $basearch'
|
|
40
|
+
# action :add
|
|
41
|
+
# end
|
|
42
|
+
#
|
|
43
|
+
# The Examples section demonstrates the different ways to test an
|
|
44
|
+
# +yum_repository+ resource with ChefSpec.
|
|
45
|
+
#
|
|
46
|
+
# @example Assert that an +yum_repository+ was added
|
|
47
|
+
# expect(chef_run).to add_yum_repository('epel')
|
|
48
|
+
# @param [String, Regex] resource_name
|
|
49
|
+
# the name of the resource to match
|
|
50
|
+
#
|
|
51
|
+
# @return [ChefSpec::Matchers::ResourceMatcher]
|
|
52
|
+
|
|
53
|
+
def add_yum_repository(resource_name)
|
|
54
|
+
ChefSpec::Matchers::ResourceMatcher.new(:yum_repository, :add,
|
|
55
|
+
resource_name)
|
|
56
|
+
end
|
|
57
|
+
|
|
58
|
+
#
|
|
59
|
+
# Assert that a +yum_repository+ resource exists in the Chef run with the
|
|
60
|
+
# action +:delete+. Given a Chef Recipe that deletes "epel" as an
|
|
61
|
+
# +yum_repository+:
|
|
62
|
+
#
|
|
63
|
+
# yum_repository 'epel' do
|
|
64
|
+
# action :delete
|
|
65
|
+
# end
|
|
66
|
+
#
|
|
67
|
+
# The Examples section demonstrates the different ways to test an
|
|
68
|
+
# +yum_repository+ resource with ChefSpec.
|
|
69
|
+
#
|
|
70
|
+
# @example Assert that an +yum_repository+ was deleted
|
|
71
|
+
# expect(chef_run).to delete_yum_repository('epel')
|
|
72
|
+
# @param [String, Regex] resource_name
|
|
73
|
+
# the name of the resource to match
|
|
74
|
+
#
|
|
75
|
+
# @return [ChefSpec::Matchers::ResourceMatcher]
|
|
76
|
+
|
|
77
|
+
def delete_yum_repository(resource_name)
|
|
78
|
+
ChefSpec::Matchers::ResourceMatcher.new(:yum_repository, :delete,
|
|
79
|
+
resource_name)
|
|
80
|
+
end
|
|
81
|
+
|
|
82
|
+
#
|
|
83
|
+
# Assert that a +yum_repository+ resource exists in the Chef run with the
|
|
84
|
+
# action +:remove+. Given a Chef Recipe that removes "epel" as an
|
|
85
|
+
# +yum_repository+:
|
|
86
|
+
#
|
|
87
|
+
# yum_repository 'epel' do
|
|
88
|
+
# action :remove
|
|
89
|
+
# end
|
|
90
|
+
#
|
|
91
|
+
# The Examples section demonstrates the different ways to test an
|
|
92
|
+
# +yum_repository+ resource with ChefSpec.
|
|
93
|
+
#
|
|
94
|
+
# @example Assert that an +yum_repository+ was removed
|
|
95
|
+
# expect(chef_run).to remove_yum_repository('epel')
|
|
96
|
+
# @param [String, Regex] resource_name
|
|
97
|
+
# the name of the resource to match
|
|
98
|
+
#
|
|
99
|
+
# @return [ChefSpec::Matchers::ResourceMatcher]
|
|
100
|
+
|
|
101
|
+
def remove_yum_repository(resource_name)
|
|
102
|
+
ChefSpec::Matchers::ResourceMatcher.new(:yum_repository, :remove,
|
|
103
|
+
resource_name)
|
|
104
|
+
end
|
|
105
|
+
|
|
106
|
+
#
|
|
107
|
+
# Assert that a +yum_repository+ resource exists in the Chef run with the
|
|
108
|
+
# action +:makecache+. Given a Chef Recipe that makes cache for "epel" as
|
|
109
|
+
# a +yum_repository+:
|
|
110
|
+
#
|
|
111
|
+
# yum_repository 'epel' do
|
|
112
|
+
# action :makecache
|
|
113
|
+
# end
|
|
114
|
+
#
|
|
115
|
+
# The Examples section demonstrates the different ways to test an
|
|
116
|
+
# +yum_repository+ resource with ChefSpec.
|
|
117
|
+
#
|
|
118
|
+
# @example Assert that an +yum_repository+ was make cache'd
|
|
119
|
+
# expect(chef_run).to makecache_yum_repository('epel')
|
|
120
|
+
# @param [String, Regex] resource_name
|
|
121
|
+
# the name of the resource to match
|
|
122
|
+
#
|
|
123
|
+
# @return [ChefSpec::Matchers::ResourceMatcher]
|
|
124
|
+
|
|
125
|
+
def makecache_yum_repository(resource_name)
|
|
126
|
+
ChefSpec::Matchers::ResourceMatcher.new(:yum_repository, :makecache,
|
|
127
|
+
resource_name)
|
|
128
|
+
end
|
|
129
|
+
end
|
|
130
|
+
end
|
|
@@ -0,0 +1,154 @@
|
|
|
1
|
+
module ChefSpec::API
|
|
2
|
+
# @since 5.1.0
|
|
3
|
+
module ZypperPackageMatchers
|
|
4
|
+
ChefSpec.define_matcher :zypper_package
|
|
5
|
+
|
|
6
|
+
#
|
|
7
|
+
# Assert that a +zypper_package+ resource exists in the Chef run with the
|
|
8
|
+
# action +:install+. Given a Chef Recipe that installs "apache2" as a
|
|
9
|
+
# +zypper_package+:
|
|
10
|
+
#
|
|
11
|
+
# zypper_package 'apache2' do
|
|
12
|
+
# action :install
|
|
13
|
+
# end
|
|
14
|
+
#
|
|
15
|
+
# The Examples section demonstrates the different ways to test a
|
|
16
|
+
# +zypper_package+ resource with ChefSpec.
|
|
17
|
+
#
|
|
18
|
+
# @example Assert that a +zypper_package+ was installed
|
|
19
|
+
# expect(chef_run).to install_zypper_package('apache2')
|
|
20
|
+
#
|
|
21
|
+
# @example Assert that a +zypper_package+ was installed with predicate matchers
|
|
22
|
+
# expect(chef_run).to install_zypper_package('apache2').with_version('1.2.3')
|
|
23
|
+
#
|
|
24
|
+
# @example Assert that a +zypper_package+ was installed with attributes
|
|
25
|
+
# expect(chef_run).to install_zypper_package('apache2').with(version: '1.2.3')
|
|
26
|
+
#
|
|
27
|
+
# @example Assert that a +zypper_package+ was installed using a regex
|
|
28
|
+
# expect(chef_run).to install_zypper_package('apache2').with(version: /(\d+\.){2}\.\d+/)
|
|
29
|
+
#
|
|
30
|
+
# @example Assert that a +zypper_package+ was _not_ installed
|
|
31
|
+
# expect(chef_run).to_not install_zypper_package('apache2')
|
|
32
|
+
#
|
|
33
|
+
#
|
|
34
|
+
# @param [String, Regex] resource_name
|
|
35
|
+
# the name of the resource to match
|
|
36
|
+
#
|
|
37
|
+
# @return [ChefSpec::Matchers::ResourceMatcher]
|
|
38
|
+
#
|
|
39
|
+
def install_zypper_package(resource_name)
|
|
40
|
+
ChefSpec::Matchers::ResourceMatcher.new(:zypper_package, :install, resource_name)
|
|
41
|
+
end
|
|
42
|
+
|
|
43
|
+
#
|
|
44
|
+
# Assert that a +zypper_package+ resource exists in the Chef run with the
|
|
45
|
+
# action +:purge+. Given a Chef Recipe that purges "apache2" as a
|
|
46
|
+
# +zypper_package+:
|
|
47
|
+
#
|
|
48
|
+
# zypper_package 'apache2' do
|
|
49
|
+
# action :purge
|
|
50
|
+
# end
|
|
51
|
+
#
|
|
52
|
+
# The Examples section demonstrates the different ways to test a
|
|
53
|
+
# +zypper_package+ resource with ChefSpec.
|
|
54
|
+
#
|
|
55
|
+
# @example Assert that a +zypper_package+ was purged
|
|
56
|
+
# expect(chef_run).to purge_zypper_package('apache2')
|
|
57
|
+
#
|
|
58
|
+
# @example Assert that a +zypper_package+ was purged with predicate matchers
|
|
59
|
+
# expect(chef_run).to purge_zypper_package('apache2').with_version('1.2.3')
|
|
60
|
+
#
|
|
61
|
+
# @example Assert that a +zypper_package+ was purged with attributes
|
|
62
|
+
# expect(chef_run).to purge_zypper_package('apache2').with(version: '1.2.3')
|
|
63
|
+
#
|
|
64
|
+
# @example Assert that a +zypper_package+ was purged using a regex
|
|
65
|
+
# expect(chef_run).to purge_zypper_package('apache2').with(version: /(\d+\.){2}\.\d+/)
|
|
66
|
+
#
|
|
67
|
+
# @example Assert that a +zypper_package+ was _not_ purged
|
|
68
|
+
# expect(chef_run).to_not purge_zypper_package('apache2')
|
|
69
|
+
#
|
|
70
|
+
#
|
|
71
|
+
# @param [String, Regex] resource_name
|
|
72
|
+
# the name of the resource to match
|
|
73
|
+
#
|
|
74
|
+
# @return [ChefSpec::Matchers::ResourceMatcher]
|
|
75
|
+
#
|
|
76
|
+
def purge_zypper_package(resource_name)
|
|
77
|
+
ChefSpec::Matchers::ResourceMatcher.new(:zypper_package, :purge, resource_name)
|
|
78
|
+
end
|
|
79
|
+
|
|
80
|
+
#
|
|
81
|
+
# Assert that a +zypper_package+ resource exists in the Chef run with the
|
|
82
|
+
# action +:remove+. Given a Chef Recipe that removes "apache2" as a
|
|
83
|
+
# +zypper_package+:
|
|
84
|
+
#
|
|
85
|
+
# zypper_package 'apache2' do
|
|
86
|
+
# action :remove
|
|
87
|
+
# end
|
|
88
|
+
#
|
|
89
|
+
# The Examples section demonstrates the different ways to test a
|
|
90
|
+
# +zypper_package+ resource with ChefSpec.
|
|
91
|
+
#
|
|
92
|
+
# @example Assert that a +zypper_package+ was removed
|
|
93
|
+
# expect(chef_run).to remove_zypper_package('apache2')
|
|
94
|
+
#
|
|
95
|
+
# @example Assert that a +zypper_package+ was removed with predicate matchers
|
|
96
|
+
# expect(chef_run).to remove_zypper_package('apache2').with_version('1.2.3')
|
|
97
|
+
#
|
|
98
|
+
# @example Assert that a +zypper_package+ was removed with attributes
|
|
99
|
+
# expect(chef_run).to remove_zypper_package('apache2').with(version: '1.2.3')
|
|
100
|
+
#
|
|
101
|
+
# @example Assert that a +zypper_package+ was removed using a regex
|
|
102
|
+
# expect(chef_run).to remove_zypper_package('apache2').with(version: /(\d+\.){2}\.\d+/)
|
|
103
|
+
#
|
|
104
|
+
# @example Assert that a +zypper_package+ was _not_ removed
|
|
105
|
+
# expect(chef_run).to_not remove_zypper_package('apache2')
|
|
106
|
+
#
|
|
107
|
+
#
|
|
108
|
+
# @param [String, Regex] resource_name
|
|
109
|
+
# the name of the resource to match
|
|
110
|
+
#
|
|
111
|
+
# @return [ChefSpec::Matchers::ResourceMatcher]
|
|
112
|
+
#
|
|
113
|
+
def remove_zypper_package(resource_name)
|
|
114
|
+
ChefSpec::Matchers::ResourceMatcher.new(:zypper_package, :remove, resource_name)
|
|
115
|
+
end
|
|
116
|
+
|
|
117
|
+
#
|
|
118
|
+
# Assert that a +zypper_package+ resource exists in the Chef run with the
|
|
119
|
+
# action +:upgrade+. Given a Chef Recipe that upgrades "apache2" as a
|
|
120
|
+
# +zypper_package+:
|
|
121
|
+
#
|
|
122
|
+
# zypper_package 'apache2' do
|
|
123
|
+
# action :upgrade
|
|
124
|
+
# end
|
|
125
|
+
#
|
|
126
|
+
# The Examples section demonstrates the different ways to test a
|
|
127
|
+
# +zypper_package+ resource with ChefSpec.
|
|
128
|
+
#
|
|
129
|
+
# @example Assert that a +zypper_package+ was upgraded
|
|
130
|
+
# expect(chef_run).to upgrade_zypper_package('apache2')
|
|
131
|
+
#
|
|
132
|
+
# @example Assert that a +zypper_package+ was upgraded with predicate matchers
|
|
133
|
+
# expect(chef_run).to upgrade_zypper_package('apache2').with_version('1.2.3')
|
|
134
|
+
#
|
|
135
|
+
# @example Assert that a +zypper_package+ was upgraded with attributes
|
|
136
|
+
# expect(chef_run).to upgrade_zypper_package('apache2').with(version: '1.2.3')
|
|
137
|
+
#
|
|
138
|
+
# @example Assert that a +zypper_package+ was upgraded using a regex
|
|
139
|
+
# expect(chef_run).to upgrade_zypper_package('apache2').with(version: /(\d+\.){2}\.\d+/)
|
|
140
|
+
#
|
|
141
|
+
# @example Assert that a +zypper_package+ was _not_ upgraded
|
|
142
|
+
# expect(chef_run).to_not upgrade_zypper_package('apache2')
|
|
143
|
+
#
|
|
144
|
+
#
|
|
145
|
+
# @param [String, Regex] resource_name
|
|
146
|
+
# the name of the resource to match
|
|
147
|
+
#
|
|
148
|
+
# @return [ChefSpec::Matchers::ResourceMatcher]
|
|
149
|
+
#
|
|
150
|
+
def upgrade_zypper_package(resource_name)
|
|
151
|
+
ChefSpec::Matchers::ResourceMatcher.new(:zypper_package, :upgrade, resource_name)
|
|
152
|
+
end
|
|
153
|
+
end
|
|
154
|
+
end
|
data/lib/chefspec/api.rb
CHANGED
|
@@ -25,16 +25,22 @@ module ChefSpec
|
|
|
25
25
|
end
|
|
26
26
|
|
|
27
27
|
require_relative 'api/apt_package'
|
|
28
|
+
require_relative 'api/apt_update'
|
|
29
|
+
require_relative 'api/apt_repository'
|
|
30
|
+
require_relative 'api/bff_package'
|
|
28
31
|
require_relative 'api/batch'
|
|
32
|
+
require_relative 'api/cab_package'
|
|
29
33
|
require_relative 'api/chef_gem'
|
|
30
34
|
require_relative 'api/chocolatey_package'
|
|
31
35
|
require_relative 'api/cookbook_file'
|
|
32
36
|
require_relative 'api/cron'
|
|
33
37
|
require_relative 'api/deploy'
|
|
34
38
|
require_relative 'api/directory'
|
|
39
|
+
require_relative 'api/dnf_package'
|
|
35
40
|
require_relative 'api/dpkg_package'
|
|
36
41
|
require_relative 'api/do_nothing'
|
|
37
42
|
require_relative 'api/dsc_resource'
|
|
43
|
+
require_relative 'api/dsc_script'
|
|
38
44
|
require_relative 'api/easy_install_package'
|
|
39
45
|
require_relative 'api/env'
|
|
40
46
|
require_relative 'api/erl_call'
|
|
@@ -44,19 +50,25 @@ require_relative 'api/freebsd_package'
|
|
|
44
50
|
require_relative 'api/gem_package'
|
|
45
51
|
require_relative 'api/git'
|
|
46
52
|
require_relative 'api/group'
|
|
53
|
+
require_relative 'api/homebrew_package'
|
|
47
54
|
require_relative 'api/http_request'
|
|
48
55
|
require_relative 'api/ifconfig'
|
|
49
56
|
require_relative 'api/include_recipe'
|
|
50
57
|
require_relative 'api/ips_package'
|
|
58
|
+
require_relative 'api/launchd'
|
|
51
59
|
require_relative 'api/link'
|
|
52
60
|
require_relative 'api/log'
|
|
53
61
|
require_relative 'api/macports_package'
|
|
54
62
|
require_relative 'api/mdadm'
|
|
55
63
|
require_relative 'api/mount'
|
|
64
|
+
require_relative 'api/msu_package'
|
|
56
65
|
require_relative 'api/notifications'
|
|
57
66
|
require_relative 'api/ohai'
|
|
67
|
+
require_relative 'api/openbsd_package'
|
|
68
|
+
require_relative 'api/osx_profile'
|
|
58
69
|
require_relative 'api/package'
|
|
59
70
|
require_relative 'api/pacman_package'
|
|
71
|
+
require_relative 'api/paludis_package'
|
|
60
72
|
require_relative 'api/portage_package'
|
|
61
73
|
require_relative 'api/powershell_script'
|
|
62
74
|
require_relative 'api/reboot'
|
|
@@ -74,8 +86,11 @@ require_relative 'api/solaris_package'
|
|
|
74
86
|
require_relative 'api/state_attrs'
|
|
75
87
|
require_relative 'api/subscriptions'
|
|
76
88
|
require_relative 'api/subversion'
|
|
89
|
+
require_relative 'api/systemd_unit'
|
|
77
90
|
require_relative 'api/template'
|
|
78
91
|
require_relative 'api/user'
|
|
79
92
|
require_relative 'api/windows_package'
|
|
80
93
|
require_relative 'api/windows_service'
|
|
81
94
|
require_relative 'api/yum_package'
|
|
95
|
+
require_relative 'api/yum_repository'
|
|
96
|
+
require_relative 'api/zypper_package'
|
data/lib/chefspec/coverage.rb
CHANGED
|
@@ -28,6 +28,15 @@ module ChefSpec
|
|
|
28
28
|
def initialize
|
|
29
29
|
@collection = {}
|
|
30
30
|
@filters = {}
|
|
31
|
+
@outputs = []
|
|
32
|
+
add_output do |report|
|
|
33
|
+
begin
|
|
34
|
+
erb = Erubis::Eruby.new(File.read(@template))
|
|
35
|
+
puts erb.evaluate(report)
|
|
36
|
+
rescue NameError => e
|
|
37
|
+
raise Error::ErbTemplateParseError.new(original_error: e.message)
|
|
38
|
+
end
|
|
39
|
+
end
|
|
31
40
|
@template = ChefSpec.root.join('templates', 'coverage', 'human.erb')
|
|
32
41
|
end
|
|
33
42
|
|
|
@@ -41,7 +50,7 @@ module ChefSpec
|
|
|
41
50
|
end
|
|
42
51
|
|
|
43
52
|
#
|
|
44
|
-
# Add a filter to the
|
|
53
|
+
# Add a filter to the coverage analysis.
|
|
45
54
|
#
|
|
46
55
|
# @param [Filter, String, Regexp] filter
|
|
47
56
|
# the filter to add
|
|
@@ -68,6 +77,18 @@ module ChefSpec
|
|
|
68
77
|
|
|
69
78
|
true
|
|
70
79
|
end
|
|
80
|
+
|
|
81
|
+
#
|
|
82
|
+
# Add an output to send the coverage results to.
|
|
83
|
+
# @param [Proc] block
|
|
84
|
+
# the block to use as the output
|
|
85
|
+
#
|
|
86
|
+
# @return [true]
|
|
87
|
+
#
|
|
88
|
+
def add_output(&block)
|
|
89
|
+
@outputs << block
|
|
90
|
+
end
|
|
91
|
+
|
|
71
92
|
#
|
|
72
93
|
# Change the template for reporting of converage analysis.
|
|
73
94
|
#
|
|
@@ -151,12 +172,9 @@ module ChefSpec
|
|
|
151
172
|
resource unless resource.touched?
|
|
152
173
|
end.compact
|
|
153
174
|
report[:all_resources] = @collection.values
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
puts erb.evaluate(report)
|
|
158
|
-
rescue NameError => e
|
|
159
|
-
raise Error::ErbTemplateParseError.new(original_error: e.message)
|
|
175
|
+
|
|
176
|
+
@outputs.each do |block|
|
|
177
|
+
self.instance_exec(report, &block)
|
|
160
178
|
end
|
|
161
179
|
|
|
162
180
|
# Ensure we exit correctly (#351)
|
|
@@ -14,7 +14,12 @@ module Chef::DSL::DataQuery
|
|
|
14
14
|
raise ChefSpec::Error::SearchNotStubbed.new(args: [type, query])
|
|
15
15
|
end
|
|
16
16
|
|
|
17
|
-
|
|
17
|
+
if block
|
|
18
|
+
Array(stub.result).each {|r| block.call(r) }
|
|
19
|
+
true
|
|
20
|
+
else
|
|
21
|
+
stub.result
|
|
22
|
+
end
|
|
18
23
|
end
|
|
19
24
|
|
|
20
25
|
# @see Chef::DSL::DataQuery#data_bag
|
|
@@ -1,45 +1,31 @@
|
|
|
1
|
-
#
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
1
|
+
# XXX: This monkeypatch is somewhat terrible and dumps all of the
|
|
2
|
+
# resources in the sub-resource collection into the main resource
|
|
3
|
+
# collection. Chefspec needs to be taught how to deal with
|
|
4
|
+
# sub-resource collections.
|
|
5
|
+
|
|
6
|
+
if defined?(Chef::Provider::InlineResources)
|
|
7
|
+
class Chef
|
|
8
|
+
class Provider
|
|
9
|
+
module InlineResources # ~> 12.5
|
|
10
|
+
def initialize(resource, run_context)
|
|
11
|
+
super
|
|
12
|
+
@run_context = run_context
|
|
13
|
+
@resource_collection = run_context.resource_collection
|
|
14
|
+
end
|
|
15
|
+
|
|
7
16
|
module ClassMethods
|
|
8
|
-
#
|
|
9
|
-
# For LWRPs that call +use_inline_resources+, do not create another
|
|
10
|
-
# +resource_collection+ so that everything is added to the parent
|
|
11
|
-
# +resource_collection+.
|
|
12
|
-
#
|
|
13
|
-
# @param [String] name
|
|
14
|
-
#
|
|
15
|
-
# @override Chef::Provider::LWRPBase::InlineResources::ClassMethods#action
|
|
16
|
-
#
|
|
17
17
|
def action(name, &block)
|
|
18
18
|
define_method("action_#{name}", &block)
|
|
19
19
|
end
|
|
20
20
|
end
|
|
21
21
|
end
|
|
22
22
|
end
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
# +resource_collection+.
|
|
30
|
-
#
|
|
31
|
-
# @param [String] name
|
|
32
|
-
#
|
|
33
|
-
def initialize(resource, run_context)
|
|
34
|
-
super
|
|
35
|
-
@run_context = run_context
|
|
36
|
-
@resource_collection = run_context.resource_collection
|
|
37
|
-
end
|
|
38
|
-
|
|
39
|
-
module ClassMethods
|
|
40
|
-
def action(name, &block)
|
|
41
|
-
define_method("action_#{name}", &block)
|
|
42
|
-
end
|
|
23
|
+
end
|
|
24
|
+
else # >= 13.0
|
|
25
|
+
class Chef
|
|
26
|
+
class Provider
|
|
27
|
+
def self.action(name, &block)
|
|
28
|
+
define_method("action_#{name}", &block)
|
|
43
29
|
end
|
|
44
30
|
end
|
|
45
31
|
end
|
data/lib/chefspec/macros.rb
CHANGED
|
@@ -139,7 +139,7 @@ module ChefSpec
|
|
|
139
139
|
# stub_node('mynode.example')
|
|
140
140
|
#
|
|
141
141
|
# @example mocking a specific platform and version
|
|
142
|
-
# stub_node('mynode.example', platform: 'ubuntu', version: '
|
|
142
|
+
# stub_node('mynode.example', platform: 'ubuntu', version: '16.04')
|
|
143
143
|
#
|
|
144
144
|
# @example overriding a specific ohai attribute
|
|
145
145
|
# stub_node('mynode.example', ohai: { ipaddress: '1.2.3.4' })
|
|
@@ -39,7 +39,7 @@ module ChefSpec::Matchers
|
|
|
39
39
|
end
|
|
40
40
|
|
|
41
41
|
def description
|
|
42
|
-
%Q{#{@
|
|
42
|
+
%Q{#{@expected_actioe} #{@resource_name} "#{@expected_identity}"}
|
|
43
43
|
end
|
|
44
44
|
|
|
45
45
|
def matches?(runner)
|
|
@@ -47,42 +47,35 @@ module ChefSpec::Matchers
|
|
|
47
47
|
|
|
48
48
|
if resource
|
|
49
49
|
ChefSpec::Coverage.cover!(resource)
|
|
50
|
-
|
|
51
|
-
else
|
|
52
|
-
false
|
|
50
|
+
unmatched_parameters.empty? && correct_phase?
|
|
53
51
|
end
|
|
54
52
|
end
|
|
55
53
|
|
|
56
54
|
def failure_message
|
|
57
55
|
if resource
|
|
58
|
-
if
|
|
59
|
-
if
|
|
60
|
-
|
|
61
|
-
%Q{expected "#{resource.to_s}" to be run at compile time}
|
|
62
|
-
else
|
|
63
|
-
%Q{expected "#{resource.to_s}" to be run at converge time}
|
|
64
|
-
end
|
|
56
|
+
if unmatched_parameters.empty?
|
|
57
|
+
if @compile_time
|
|
58
|
+
%Q{expected "#{resource.to_s}" to be run at compile time}
|
|
65
59
|
else
|
|
66
|
-
|
|
67
|
-
"\n\n" \
|
|
68
|
-
" " + unmatched_parameters.collect { |parameter, h|
|
|
69
|
-
msg = "#{parameter} #{h[:expected].inspect}, was #{h[:actual].inspect}"
|
|
70
|
-
diff = ::RSpec::Matchers::ExpectedsForMultipleDiffs.from(h[:expected]) \
|
|
71
|
-
.message_with_diff(message, ::RSpec::Expectations::differ, h[:actual])
|
|
72
|
-
msg += diff if diff
|
|
73
|
-
msg
|
|
74
|
-
}.join("\n ")
|
|
60
|
+
%Q{expected "#{resource.to_s}" to be run at converge time}
|
|
75
61
|
end
|
|
76
62
|
else
|
|
77
|
-
%Q{expected "#{resource.to_s}"
|
|
78
|
-
|
|
63
|
+
message = %Q{expected "#{resource.to_s}" to have parameters:} \
|
|
64
|
+
"\n\n" \
|
|
65
|
+
" " + unmatched_parameters.collect { |parameter, h|
|
|
66
|
+
msg = "#{parameter} #{h[:expected].inspect}, was #{h[:actual].inspect}"
|
|
67
|
+
diff = ::RSpec::Matchers::ExpectedsForMultipleDiffs.from(h[:expected]) \
|
|
68
|
+
.message_with_diff(message, ::RSpec::Expectations::differ, h[:actual])
|
|
69
|
+
msg += diff if diff
|
|
70
|
+
msg
|
|
71
|
+
}.join("\n ")
|
|
79
72
|
end
|
|
80
73
|
else
|
|
81
74
|
%Q{expected "#{@resource_name}[#{@expected_identity}]"} \
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
75
|
+
" with action :#{@expected_action} to be in Chef run." \
|
|
76
|
+
" Other #{@resource_name} resources:" \
|
|
77
|
+
"\n\n" \
|
|
78
|
+
" " + similar_resources.map(&:to_s).join("\n ") + "\n "
|
|
86
79
|
end
|
|
87
80
|
end
|
|
88
81
|
|
|
@@ -165,7 +158,7 @@ module ChefSpec::Matchers
|
|
|
165
158
|
# @return [Chef::Resource, nil]
|
|
166
159
|
#
|
|
167
160
|
def resource
|
|
168
|
-
@_resource ||= @runner.find_resource(@resource_name, @expected_identity)
|
|
161
|
+
@_resource ||= @runner.find_resource(@resource_name, @expected_identity, @expected_action)
|
|
169
162
|
end
|
|
170
163
|
|
|
171
164
|
#
|
data/lib/chefspec/rspec.rb
CHANGED
|
@@ -19,4 +19,7 @@ RSpec.configure do |config|
|
|
|
19
19
|
config.add_setting :path
|
|
20
20
|
config.add_setting :platform
|
|
21
21
|
config.add_setting :version
|
|
22
|
+
config.add_setting :server_runner_data_store, default: :in_memory
|
|
23
|
+
config.add_setting :server_runner_clear_cookbooks, default: true
|
|
24
|
+
config.add_setting :server_runner_port, default: (8889..8899)
|
|
22
25
|
end
|
|
@@ -10,13 +10,7 @@ module ChefSpec
|
|
|
10
10
|
# @return [ChefZero::Server]
|
|
11
11
|
#
|
|
12
12
|
def server
|
|
13
|
-
|
|
14
|
-
# Set the log level from RSpec, defaulting to warn
|
|
15
|
-
log_level: RSpec.configuration.log_level || :warn,
|
|
16
|
-
|
|
17
|
-
# Set a random port so ChefSpec may be run in multiple contexts
|
|
18
|
-
port: port,
|
|
19
|
-
)
|
|
13
|
+
ChefSpec::ZeroServer.server
|
|
20
14
|
end
|
|
21
15
|
|
|
22
16
|
#
|
|
@@ -70,8 +64,11 @@ module ChefSpec
|
|
|
70
64
|
data = get('#{key}', name)
|
|
71
65
|
json = JSON.parse(data)
|
|
72
66
|
|
|
73
|
-
|
|
67
|
+
case
|
|
68
|
+
when #{klass}.respond_to?(:json_create)
|
|
74
69
|
#{klass}.json_create(json)
|
|
70
|
+
when #{klass}.respond_to?(:from_hash)
|
|
71
|
+
#{klass}.from_hash(json)
|
|
75
72
|
else
|
|
76
73
|
#{klass}.new(json)
|
|
77
74
|
end
|
|
@@ -121,7 +118,7 @@ module ChefSpec
|
|
|
121
118
|
#
|
|
122
119
|
# @example Create a node from a +Chef::Node+ object
|
|
123
120
|
#
|
|
124
|
-
# node = stub_node('bacon', platform: 'ubuntu', version: '
|
|
121
|
+
# node = stub_node('bacon', platform: 'ubuntu', version: '16.04')
|
|
125
122
|
# create_node(node)
|
|
126
123
|
#
|
|
127
124
|
# @param [String, Chef::Node] object
|
|
@@ -157,7 +154,7 @@ module ChefSpec
|
|
|
157
154
|
# to the server
|
|
158
155
|
#
|
|
159
156
|
def load_data(name, key, data = {})
|
|
160
|
-
|
|
157
|
+
ChefSpec::ZeroServer.load_data(name, key, data)
|
|
161
158
|
end
|
|
162
159
|
|
|
163
160
|
#
|
|
@@ -167,9 +164,9 @@ module ChefSpec
|
|
|
167
164
|
args.unshift('organizations', 'chef')
|
|
168
165
|
|
|
169
166
|
if args.size == 3
|
|
170
|
-
|
|
167
|
+
server.data_store.list(args)
|
|
171
168
|
else
|
|
172
|
-
|
|
169
|
+
server.data_store.get(args)
|
|
173
170
|
end
|
|
174
171
|
end
|
|
175
172
|
end
|