chef 10.34.6 → 11.0.0.beta.0
Sign up to get free protection for your applications and to get access to all the features.
- data/CONTRIBUTING.md +155 -0
- data/README.md +89 -0
- data/Rakefile +4 -12
- data/bin/chef-apply +25 -0
- data/bin/chef-shell +34 -0
- data/bin/shef +6 -5
- data/distro/common/html/chef-client.8.html +4 -4
- data/distro/common/html/chef-expander.8.html +4 -4
- data/distro/common/html/chef-expanderctl.8.html +4 -4
- data/distro/common/html/chef-server-webui.8.html +4 -4
- data/distro/common/html/chef-server.8.html +4 -4
- data/distro/common/html/{shef.1.html → chef-shell.1.html} +49 -46
- data/distro/common/html/chef-solo.8.html +18 -12
- data/distro/common/html/chef-solr.8.html +4 -4
- data/distro/common/html/knife-bootstrap.1.html +4 -4
- data/distro/common/html/knife-client.1.html +4 -4
- data/distro/common/html/knife-configure.1.html +4 -4
- data/distro/common/html/knife-cookbook-site.1.html +4 -4
- data/distro/common/html/knife-cookbook.1.html +10 -7
- data/distro/common/html/knife-data-bag.1.html +10 -7
- data/distro/common/html/knife-environment.1.html +8 -6
- data/distro/common/html/knife-exec.1.html +9 -9
- data/distro/common/html/knife-index.1.html +4 -4
- data/distro/common/html/knife-node.1.html +4 -4
- data/distro/common/html/knife-role.1.html +4 -4
- data/distro/common/html/knife-search.1.html +4 -4
- data/distro/common/html/knife-ssh.1.html +4 -4
- data/distro/common/html/knife-status.1.html +4 -4
- data/distro/common/html/knife-tag.1.html +4 -4
- data/distro/common/html/knife.1.html +8 -13
- data/distro/common/man/man1/{shef.1 → chef-shell.1} +21 -57
- data/distro/common/man/man1/knife-bootstrap.1 +1 -1
- data/distro/common/man/man1/knife-client.1 +1 -1
- data/distro/common/man/man1/knife-configure.1 +1 -1
- data/distro/common/man/man1/knife-cookbook-site.1 +1 -1
- data/distro/common/man/man1/knife-cookbook.1 +15 -2
- data/distro/common/man/man1/knife-data-bag.1 +15 -2
- data/distro/common/man/man1/knife-environment.1 +12 -2
- data/distro/common/man/man1/knife-exec.1 +4 -7
- data/distro/common/man/man1/knife-index.1 +1 -1
- data/distro/common/man/man1/knife-node.1 +1 -1
- data/distro/common/man/man1/knife-role.1 +1 -1
- data/distro/common/man/man1/knife-search.1 +1 -1
- data/distro/common/man/man1/knife-ssh.1 +1 -1
- data/distro/common/man/man1/knife-status.1 +1 -1
- data/distro/common/man/man1/knife-tag.1 +1 -1
- data/distro/common/man/man1/knife.1 +3 -6
- data/distro/common/man/man8/chef-client.8 +1 -1
- data/distro/common/man/man8/chef-expander.8 +1 -1
- data/distro/common/man/man8/chef-expanderctl.8 +1 -1
- data/distro/common/man/man8/chef-server-webui.8 +1 -1
- data/distro/common/man/man8/chef-server.8 +1 -1
- data/distro/common/man/man8/chef-solo.8 +36 -4
- data/distro/common/man/man8/chef-solr.8 +1 -1
- data/distro/common/markdown/man1/{shef.mkd → chef-shell.mkd} +49 -43
- data/distro/common/markdown/man1/knife-exec.mkd +11 -6
- data/distro/common/markdown/man1/knife.mkd +4 -9
- data/distro/debian/etc/default/chef-client +0 -1
- data/distro/debian/etc/init.d/chef-client +2 -2
- data/lib/chef.rb +2 -5
- data/lib/chef/api_client.rb +20 -130
- data/lib/chef/api_client/registration.rb +126 -0
- data/lib/chef/application.rb +71 -14
- data/lib/chef/application/apply.rb +160 -0
- data/lib/chef/application/client.rb +25 -18
- data/lib/chef/application/knife.rb +0 -2
- data/lib/chef/application/solo.rb +23 -8
- data/lib/chef/application/windows_service.rb +5 -2
- data/lib/chef/applications.rb +1 -0
- data/lib/chef/chef_fs.rb +11 -0
- data/lib/chef/chef_fs/command_line.rb +232 -0
- data/lib/chef/chef_fs/file_pattern.rb +312 -0
- data/lib/chef/chef_fs/file_system.rb +358 -0
- data/lib/chef/chef_fs/file_system/base_fs_dir.rb +47 -0
- data/lib/chef/chef_fs/file_system/base_fs_object.rb +121 -0
- data/lib/chef/chef_fs/file_system/chef_repository_file_system_entry.rb +109 -0
- data/{spec/unit/monkey_patches/uri_spec.rb → lib/chef/chef_fs/file_system/chef_repository_file_system_root_dir.rb} +12 -15
- data/lib/chef/chef_fs/file_system/chef_server_root_dir.rb +84 -0
- data/lib/chef/chef_fs/file_system/cookbook_dir.rb +188 -0
- data/lib/chef/chef_fs/file_system/cookbook_file.rb +78 -0
- data/lib/chef/chef_fs/file_system/cookbook_subdir.rb +54 -0
- data/lib/chef/chef_fs/file_system/cookbooks_dir.rb +68 -0
- data/lib/chef/chef_fs/file_system/data_bag_dir.rb +78 -0
- data/lib/chef/chef_fs/file_system/data_bag_item.rb +59 -0
- data/lib/chef/chef_fs/file_system/data_bags_dir.rb +66 -0
- data/lib/chef/chef_fs/file_system/file_system_entry.rb +90 -0
- data/lib/chef/{index_queue.rb → chef_fs/file_system/file_system_error.rb} +14 -12
- data/lib/chef/{resource/whyrun_safe_ruby_block.rb → chef_fs/file_system/file_system_root_dir.rb} +10 -10
- data/lib/chef/chef_fs/file_system/must_delete_recursively_error.rb +31 -0
- data/lib/chef/chef_fs/file_system/nodes_dir.rb +47 -0
- data/lib/chef/{provider/whyrun_safe_ruby_block.rb → chef_fs/file_system/nonexistent_fs_object.rb} +19 -9
- data/lib/chef/chef_fs/file_system/not_found_error.rb +31 -0
- data/lib/chef/chef_fs/file_system/rest_list_dir.rb +84 -0
- data/lib/chef/chef_fs/file_system/rest_list_entry.rb +123 -0
- data/lib/chef/chef_fs/knife.rb +77 -0
- data/lib/chef/chef_fs/path_utils.rb +64 -0
- data/lib/chef/client.rb +44 -21
- data/lib/chef/config.rb +52 -43
- data/lib/chef/cookbook/synchronizer.rb +6 -8
- data/lib/chef/cookbook/syntax_check.rb +61 -14
- data/lib/chef/cookbook_loader.rb +39 -26
- data/lib/chef/cookbook_uploader.rb +17 -19
- data/lib/chef/cookbook_version.rb +3 -302
- data/lib/chef/daemon.rb +3 -18
- data/lib/chef/data_bag.rb +4 -97
- data/lib/chef/data_bag_item.rb +2 -65
- data/lib/chef/digester.rb +73 -0
- data/lib/chef/dsl.rb +6 -0
- data/lib/chef/dsl/data_query.rb +66 -0
- data/lib/chef/dsl/include_attribute.rb +60 -0
- data/lib/chef/dsl/include_recipe.rb +42 -0
- data/lib/chef/dsl/platform_introspection.rb +213 -0
- data/lib/chef/dsl/recipe.rb +84 -0
- data/lib/chef/dsl/registry_helper.rb +59 -0
- data/lib/chef/encrypted_data_bag_item.rb +74 -19
- data/lib/chef/environment.rb +9 -180
- data/lib/chef/exceptions.rb +87 -14
- data/lib/chef/formatters/base.rb +4 -1
- data/lib/chef/formatters/error_inspectors/registration_error_inspector.rb +0 -4
- data/lib/chef/json_compat.rb +1 -97
- data/lib/chef/knife.rb +90 -41
- data/lib/chef/knife/bootstrap/archlinux-gems.erb +2 -2
- data/lib/chef/knife/bootstrap/centos5-gems.erb +2 -2
- data/lib/chef/knife/bootstrap/chef-full.erb +3 -3
- data/lib/chef/knife/bootstrap/fedora13-gems.erb +2 -2
- data/lib/chef/knife/bootstrap/ubuntu10.04-apt.erb +2 -2
- data/lib/chef/knife/bootstrap/ubuntu10.04-gems.erb +2 -2
- data/lib/chef/knife/bootstrap/ubuntu12.04-gems.erb +2 -2
- data/lib/chef/knife/configure.rb +1 -2
- data/lib/chef/knife/cookbook_metadata.rb +1 -0
- data/lib/chef/knife/cookbook_test.rb +3 -2
- data/lib/chef/knife/cookbook_upload.rb +12 -7
- data/lib/chef/knife/core/bootstrap_context.rb +1 -1
- data/lib/chef/knife/core/generic_presenter.rb +26 -13
- data/lib/chef/knife/core/node_editor.rb +36 -16
- data/lib/chef/knife/core/node_presenter.rb +1 -1
- data/lib/chef/knife/core/text_formatter.rb +23 -37
- data/lib/chef/knife/core/ui.rb +15 -9
- data/lib/chef/knife/delete.rb +39 -0
- data/lib/chef/knife/diff.rb +46 -0
- data/lib/chef/knife/download.rb +50 -0
- data/lib/chef/knife/environment_show.rb +7 -0
- data/lib/chef/knife/exec.rb +5 -5
- data/lib/chef/knife/help_topics.rb +1 -1
- data/lib/chef/knife/index_rebuild.rb +91 -7
- data/lib/chef/knife/list.rb +109 -0
- data/lib/chef/knife/raw.rb +108 -0
- data/lib/chef/knife/search.rb +40 -22
- data/lib/chef/knife/show.rb +32 -0
- data/lib/chef/knife/ssh.rb +6 -2
- data/lib/chef/knife/upload.rb +50 -0
- data/lib/chef/mixin/checksum.rb +3 -3
- data/lib/chef/mixin/deep_merge.rb +55 -197
- data/lib/chef/mixin/language.rb +9 -222
- data/lib/chef/mixin/language_include_attribute.rb +6 -38
- data/lib/chef/mixin/language_include_recipe.rb +3 -35
- data/lib/chef/mixin/params_validate.rb +6 -19
- data/lib/chef/mixin/recipe_definition_dsl_core.rb +8 -61
- data/lib/chef/mixin/securable.rb +32 -7
- data/lib/chef/mixin/template.rb +40 -0
- data/lib/chef/mixins.rb +0 -4
- data/lib/chef/monkey_patches/net_http.rb +0 -34
- data/lib/chef/node.rb +133 -309
- data/lib/chef/node/attribute.rb +333 -473
- data/lib/chef/node/attribute_collections.rb +199 -0
- data/lib/chef/node/immutable_collections.rb +186 -0
- data/lib/chef/platform.rb +7 -22
- data/lib/chef/provider.rb +2 -49
- data/lib/chef/provider/breakpoint.rb +6 -6
- data/lib/chef/provider/cookbook_file.rb +5 -33
- data/lib/chef/provider/deploy.rb +2 -1
- data/lib/chef/provider/directory.rb +14 -17
- data/lib/chef/provider/file.rb +19 -52
- data/lib/chef/provider/group.rb +31 -51
- data/lib/chef/provider/group/dscl.rb +13 -53
- data/lib/chef/provider/group/gpasswd.rb +19 -14
- data/lib/chef/provider/group/groupadd.rb +1 -41
- data/lib/chef/provider/group/groupmod.rb +36 -46
- data/lib/chef/provider/group/pw.rb +16 -59
- data/lib/chef/provider/group/suse.rb +13 -16
- data/lib/chef/provider/group/usermod.rb +18 -40
- data/lib/chef/provider/group/windows.rb +6 -13
- data/lib/chef/provider/http_request.rb +25 -42
- data/lib/chef/provider/link.rb +2 -0
- data/lib/chef/provider/lwrp_base.rb +150 -0
- data/lib/chef/provider/package/portage.rb +4 -9
- data/lib/chef/provider/package/rpm.rb +2 -2
- data/lib/chef/provider/package/rubygems.rb +9 -41
- data/lib/chef/provider/package/yum.rb +12 -19
- data/lib/chef/provider/registry_key.rb +156 -0
- data/lib/chef/provider/remote_directory.rb +2 -0
- data/lib/chef/provider/remote_file.rb +21 -12
- data/lib/chef/provider/ruby_block.rb +5 -2
- data/lib/chef/provider/service.rb +15 -0
- data/lib/chef/provider/service/init.rb +9 -7
- data/lib/chef/provider/service/macosx.rb +15 -73
- data/lib/chef/provider/service/simple.rb +1 -1
- data/lib/chef/provider/service/solaris.rb +3 -3
- data/lib/chef/provider/template.rb +22 -25
- data/lib/chef/provider/template_finder.rb +61 -0
- data/lib/chef/provider/user.rb +0 -1
- data/lib/chef/provider/user/dscl.rb +175 -568
- data/lib/chef/provider/user/useradd.rb +30 -47
- data/lib/chef/providers.rb +3 -2
- data/lib/chef/recipe.rb +14 -8
- data/lib/chef/resource.rb +13 -154
- data/lib/chef/resource/group.rb +1 -11
- data/lib/chef/resource/http_request.rb +2 -1
- data/lib/chef/resource/lwrp_base.rb +127 -0
- data/lib/chef/resource/mount.rb +10 -11
- data/lib/chef/resource/registry_key.rb +86 -0
- data/lib/chef/resource/remote_directory.rb +6 -5
- data/lib/chef/resource/remote_file.rb +22 -31
- data/lib/chef/resource/ruby_block.rb +2 -2
- data/lib/chef/resource/service.rb +14 -0
- data/lib/chef/resource/user.rb +0 -18
- data/lib/chef/resource_collection.rb +25 -21
- data/lib/chef/resources.rb +2 -1
- data/lib/chef/rest.rb +50 -131
- data/lib/chef/rest/auth_credentials.rb +4 -20
- data/lib/chef/rest/rest_request.rb +2 -7
- data/lib/chef/role.rb +1 -97
- data/lib/chef/run_context.rb +108 -130
- data/lib/chef/run_context/cookbook_compiler.rb +280 -0
- data/lib/chef/run_list.rb +0 -2
- data/lib/chef/run_list/run_list_expansion.rb +0 -15
- data/lib/chef/run_lock.rb +90 -0
- data/lib/chef/runner.rb +28 -5
- data/lib/chef/sandbox.rb +15 -148
- data/lib/chef/scan_access_control.rb +2 -4
- data/lib/chef/shef/ext.rb +3 -575
- data/lib/chef/{shef.rb → shell.rb} +35 -40
- data/lib/chef/shell/ext.rb +593 -0
- data/lib/chef/{shef → shell}/model_wrapper.rb +3 -3
- data/lib/chef/{shef/shef_rest.rb → shell/shell_rest.rb} +4 -4
- data/lib/chef/{shef/shef_session.rb → shell/shell_session.rb} +17 -15
- data/lib/chef/shell_out.rb +7 -0
- data/lib/chef/util/windows/net_group.rb +1 -5
- data/lib/chef/version.rb +3 -3
- data/lib/chef/win32/api/process.rb +0 -1
- data/lib/chef/win32/handle.rb +1 -8
- data/lib/chef/win32/registry.rb +371 -0
- data/spec/data/big_json.json +1 -2
- data/spec/data/big_json_plus_one.json +1 -2
- data/spec/data/cookbooks/openldap/attributes/default.rb +10 -9
- data/spec/data/cookbooks/openldap/attributes/smokey.rb +1 -1
- data/spec/data/lwrp/providers/inline_compiler.rb +26 -0
- data/spec/data/nodes/default.rb +3 -3
- data/spec/data/nodes/test.example.com.rb +3 -3
- data/spec/data/nodes/test.rb +3 -3
- data/spec/data/partial_one.erb +1 -0
- data/spec/data/run_context/cookbooks/circular-dep1/attributes/default.rb +4 -0
- data/spec/data/run_context/cookbooks/circular-dep1/definitions/circular_dep1_res.rb +1 -0
- data/spec/data/run_context/cookbooks/circular-dep1/libraries/lib.rb +2 -0
- data/spec/data/run_context/cookbooks/circular-dep1/metadata.rb +2 -0
- data/spec/data/run_context/cookbooks/circular-dep1/providers/provider.rb +1 -0
- data/spec/data/{knife-home/.chef/plugins/knife/example_home_subcommand.rb → run_context/cookbooks/circular-dep1/recipes/default.rb} +0 -0
- data/spec/data/run_context/cookbooks/circular-dep1/resources/resource.rb +1 -0
- data/spec/data/run_context/cookbooks/circular-dep2/attributes/default.rb +3 -0
- data/spec/data/run_context/cookbooks/circular-dep2/definitions/circular_dep2_res.rb +1 -0
- data/spec/data/run_context/cookbooks/circular-dep2/libraries/lib.rb +2 -0
- data/spec/data/run_context/cookbooks/circular-dep2/metadata.rb +2 -0
- data/spec/data/run_context/cookbooks/circular-dep2/providers/provider.rb +1 -0
- data/spec/data/{lwrp_const_scoping/resources/conflict.rb → run_context/cookbooks/circular-dep2/recipes/default.rb} +0 -0
- data/spec/data/run_context/cookbooks/circular-dep2/resources/resource.rb +1 -0
- data/spec/data/run_context/cookbooks/dependency1/attributes/aa_first.rb +2 -0
- data/spec/data/run_context/cookbooks/dependency1/attributes/default.rb +2 -0
- data/spec/data/run_context/cookbooks/dependency1/attributes/zz_last.rb +3 -0
- data/spec/data/run_context/cookbooks/dependency1/definitions/dependency1_res.rb +1 -0
- data/spec/data/run_context/cookbooks/dependency1/libraries/lib.rb +2 -0
- data/spec/data/run_context/cookbooks/dependency1/providers/provider.rb +1 -0
- data/spec/data/run_context/cookbooks/dependency1/recipes/default.rb +0 -0
- data/spec/data/run_context/cookbooks/dependency1/resources/resource.rb +1 -0
- data/spec/data/run_context/cookbooks/dependency2/attributes/default.rb +3 -0
- data/spec/data/run_context/cookbooks/dependency2/definitions/dependency2_res.rb +1 -0
- data/spec/data/run_context/cookbooks/dependency2/libraries/lib.rb +2 -0
- data/spec/data/run_context/cookbooks/dependency2/providers/provider.rb +1 -0
- data/spec/data/run_context/cookbooks/dependency2/recipes/default.rb +0 -0
- data/spec/data/run_context/cookbooks/dependency2/resources/resource.rb +1 -0
- data/spec/data/run_context/cookbooks/no-default-attr/attributes/server.rb +3 -0
- data/spec/data/run_context/cookbooks/no-default-attr/definitions/no_default-attr_res.rb +1 -0
- data/spec/data/run_context/cookbooks/no-default-attr/providers/provider.rb +1 -0
- data/spec/data/run_context/cookbooks/no-default-attr/recipes/default.rb +0 -0
- data/spec/data/run_context/cookbooks/no-default-attr/resources/resource.rb +1 -0
- data/spec/data/run_context/cookbooks/test-with-circular-deps/attributes/default.rb +3 -0
- data/spec/data/run_context/cookbooks/test-with-circular-deps/definitions/test_with-circular-deps_res.rb +1 -0
- data/spec/data/run_context/cookbooks/test-with-circular-deps/libraries/lib.rb +2 -0
- data/spec/data/run_context/cookbooks/test-with-circular-deps/metadata.rb +2 -0
- data/spec/data/run_context/cookbooks/test-with-circular-deps/providers/provider.rb +1 -0
- data/spec/data/run_context/cookbooks/test-with-circular-deps/recipes/default.rb +0 -0
- data/spec/data/run_context/cookbooks/test-with-circular-deps/resources/resource.rb +1 -0
- data/spec/data/run_context/cookbooks/test-with-deps/attributes/default.rb +3 -0
- data/spec/data/run_context/cookbooks/test-with-deps/definitions/test_with-deps_res.rb +1 -0
- data/spec/data/run_context/cookbooks/test-with-deps/libraries/lib.rb +1 -0
- data/spec/data/run_context/cookbooks/test-with-deps/metadata.rb +3 -0
- data/spec/data/run_context/cookbooks/test-with-deps/providers/provider.rb +1 -0
- data/spec/data/run_context/cookbooks/test-with-deps/recipes/default.rb +0 -0
- data/spec/data/run_context/cookbooks/test-with-deps/recipes/server.rb +0 -0
- data/spec/data/run_context/cookbooks/test-with-deps/resources/resource.rb +1 -0
- data/spec/data/run_context/cookbooks/test/attributes/default.rb +0 -0
- data/spec/data/run_context/cookbooks/test/attributes/george.rb +1 -1
- data/spec/data/run_context/cookbooks/test/definitions/test_res.rb +1 -0
- data/spec/data/run_context/cookbooks/test/providers/provider.rb +1 -0
- data/spec/data/run_context/cookbooks/test/resources/resource.rb +1 -0
- data/spec/data/shef-config.rb +7 -0
- data/spec/functional/dsl/registry_helper_spec.rb +63 -0
- data/spec/functional/knife/cookbook_delete_spec.rb +1 -1
- data/spec/functional/knife/exec_spec.rb +2 -2
- data/spec/functional/knife/ssh_spec.rb +5 -1
- data/spec/functional/resource/cookbook_file_spec.rb +7 -19
- data/spec/functional/resource/directory_spec.rb +4 -0
- data/spec/functional/resource/file_spec.rb +56 -22
- data/spec/functional/resource/link_spec.rb +2 -0
- data/spec/functional/resource/registry_spec.rb +576 -0
- data/spec/functional/resource/remote_directory_spec.rb +142 -36
- data/spec/functional/resource/remote_file_spec.rb +18 -0
- data/spec/functional/resource/template_spec.rb +23 -2
- data/spec/functional/run_lock_spec.rb +106 -0
- data/spec/functional/shell_spec.rb +100 -0
- data/spec/functional/win32/registry_helper_spec.rb +632 -0
- data/spec/spec_helper.rb +5 -29
- data/spec/stress/win32/security_spec.rb +1 -1
- data/spec/support/chef_helpers.rb +0 -2
- data/spec/support/platform_helpers.rb +8 -15
- data/spec/support/shared/functional/directory_resource.rb +84 -22
- data/spec/support/shared/functional/file_resource.rb +169 -71
- data/spec/support/shared/functional/securable_resource.rb +143 -119
- data/spec/support/shared/functional/securable_resource_with_reporting.rb +375 -0
- data/spec/support/shared/unit/file_system_support.rb +110 -0
- data/spec/support/shared/unit/platform_introspector.rb +162 -0
- data/spec/unit/api_client/registration_spec.rb +175 -0
- data/spec/unit/api_client_spec.rb +78 -156
- data/spec/unit/application/apply.rb +84 -0
- data/spec/unit/application/client_spec.rb +1 -37
- data/spec/unit/application/knife_spec.rb +5 -0
- data/spec/unit/application_spec.rb +57 -2
- data/spec/unit/checksum/storage/filesystem_spec.rb +1 -1
- data/spec/unit/chef_fs/diff_spec.rb +328 -0
- data/spec/unit/chef_fs/file_pattern_spec.rb +526 -0
- data/spec/unit/chef_fs/file_system/chef_server_root_dir_spec.rb +237 -0
- data/spec/unit/chef_fs/file_system/cookbooks_dir_spec.rb +568 -0
- data/spec/unit/chef_fs/file_system/data_bags_dir_spec.rb +220 -0
- data/spec/unit/chef_fs/file_system_spec.rb +136 -0
- data/spec/unit/client_spec.rb +124 -33
- data/spec/unit/config_spec.rb +46 -13
- data/spec/unit/cookbook/synchronizer_spec.rb +1 -49
- data/spec/unit/cookbook/syntax_check_spec.rb +48 -109
- data/spec/unit/cookbook_loader_spec.rb +153 -91
- data/spec/unit/cookbook_manifest_spec.rb +81 -81
- data/spec/unit/cookbook_spec.rb +3 -20
- data/spec/unit/cookbook_version_spec.rb +23 -122
- data/spec/unit/daemon_spec.rb +3 -24
- data/spec/unit/data_bag_spec.rb +6 -4
- data/spec/unit/digester_spec.rb +50 -0
- data/spec/unit/dsl/data_query_spec.rb +66 -0
- data/spec/unit/dsl/platform_introspection_spec.rb +130 -0
- data/spec/unit/dsl/regsitry_helper_spec.rb +55 -0
- data/spec/unit/encrypted_data_bag_item_spec.rb +50 -105
- data/spec/unit/environment_spec.rb +0 -130
- data/spec/unit/exceptions_spec.rb +2 -3
- data/spec/unit/formatters/error_inspectors/resource_failure_inspector_spec.rb +3 -3
- data/spec/unit/json_compat_spec.rb +15 -7
- data/spec/unit/knife/bootstrap_spec.rb +2 -0
- data/spec/unit/knife/configure_spec.rb +20 -14
- data/spec/unit/knife/cookbook_metadata_spec.rb +11 -4
- data/spec/unit/knife/cookbook_test_spec.rb +1 -0
- data/spec/unit/knife/cookbook_upload_spec.rb +43 -8
- data/spec/unit/knife/core/bootstrap_context_spec.rb +1 -1
- data/spec/unit/knife/core/ui_spec.rb +156 -125
- data/spec/unit/knife/data_bag_create_spec.rb +9 -0
- data/spec/unit/knife/data_bag_edit_spec.rb +1 -4
- data/spec/unit/knife/data_bag_from_file_spec.rb +4 -6
- data/spec/unit/knife/data_bag_show_spec.rb +11 -4
- data/spec/unit/knife/index_rebuild_spec.rb +96 -33
- data/spec/unit/knife/knife_help.rb +7 -7
- data/spec/unit/knife/node_edit_spec.rb +6 -33
- data/spec/unit/knife/node_run_list_remove_spec.rb +2 -1
- data/spec/unit/knife/ssh_spec.rb +12 -15
- data/spec/unit/knife/status_spec.rb +2 -2
- data/spec/unit/knife_spec.rb +53 -0
- data/spec/unit/lwrp_spec.rb +59 -42
- data/spec/unit/mixin/checksum_spec.rb +2 -2
- data/spec/unit/mixin/deep_merge_spec.rb +101 -799
- data/spec/unit/mixin/enforce_ownership_and_permissions_spec.rb +6 -1
- data/spec/unit/mixin/params_validate_spec.rb +4 -37
- data/spec/unit/mixin/securable_spec.rb +5 -3
- data/spec/unit/mixin/template_spec.rb +119 -0
- data/spec/unit/node/attribute_spec.rb +195 -173
- data/spec/unit/node/immutable_collections_spec.rb +139 -0
- data/spec/unit/node_spec.rb +366 -370
- data/spec/unit/platform_spec.rb +9 -10
- data/spec/unit/provider/breakpoint_spec.rb +8 -8
- data/spec/unit/provider/cookbook_file_spec.rb +4 -8
- data/spec/unit/provider/directory_spec.rb +96 -64
- data/spec/unit/provider/env_spec.rb +2 -2
- data/spec/unit/provider/file_spec.rb +48 -39
- data/spec/unit/provider/group/dscl_spec.rb +0 -36
- data/spec/unit/provider/group/gpasswd_spec.rb +9 -16
- data/spec/unit/provider/group/groupadd_spec.rb +4 -3
- data/spec/unit/provider/group/groupmod_spec.rb +1 -0
- data/spec/unit/provider/group/pw_spec.rb +15 -12
- data/spec/unit/provider/group/usermod_spec.rb +6 -21
- data/spec/unit/provider/group/windows_spec.rb +8 -0
- data/spec/unit/provider/group_spec.rb +6 -28
- data/spec/unit/provider/http_request_spec.rb +28 -69
- data/spec/unit/provider/ifconfig_spec.rb +2 -2
- data/spec/unit/provider/ohai_spec.rb +4 -4
- data/spec/unit/provider/package/apt_spec.rb +0 -1
- data/spec/unit/provider/package/ips_spec.rb +0 -1
- data/spec/unit/provider/package/portage_spec.rb +0 -44
- data/spec/unit/provider/package/rpm_spec.rb +0 -12
- data/spec/unit/provider/package/rubygems_spec.rb +1 -44
- data/spec/unit/provider/package/yum_spec.rb +39 -36
- data/spec/unit/provider/package_spec.rb +7 -5
- data/spec/unit/provider/registry_key_spec.rb +269 -0
- data/spec/unit/provider/remote_directory_spec.rb +7 -3
- data/spec/unit/provider/remote_file_spec.rb +36 -0
- data/spec/unit/provider/route_spec.rb +4 -3
- data/spec/unit/provider/ruby_block_spec.rb +8 -0
- data/spec/unit/provider/service/arch_service_spec.rb +5 -5
- data/spec/unit/provider/service/debian_service_spec.rb +1 -1
- data/spec/unit/provider/service/freebsd_service_spec.rb +5 -5
- data/spec/unit/provider/service/init_service_spec.rb +27 -4
- data/spec/unit/provider/service/insserv_service_spec.rb +1 -1
- data/spec/unit/provider/service/invokercd_service_spec.rb +4 -4
- data/spec/unit/provider/service/macosx_spec.rb +11 -66
- data/spec/unit/provider/service/redhat_spec.rb +1 -1
- data/spec/unit/provider/service/simple_service_spec.rb +3 -3
- data/spec/unit/provider/service/upstart_service_spec.rb +9 -9
- data/spec/unit/provider/subversion_spec.rb +1 -1
- data/spec/unit/provider/template_spec.rb +35 -11
- data/spec/unit/provider/user/dscl_spec.rb +285 -681
- data/spec/unit/provider/user/useradd_spec.rb +1 -22
- data/spec/unit/provider/user_spec.rb +1 -1
- data/spec/unit/recipe_spec.rb +10 -8
- data/spec/unit/registry_helper_spec.rb +374 -0
- data/spec/unit/resource/mount_spec.rb +0 -11
- data/spec/unit/resource/registry_key_spec.rb +171 -0
- data/spec/unit/resource/remote_file_spec.rb +21 -23
- data/spec/unit/resource/ruby_block_spec.rb +7 -3
- data/spec/unit/resource/service_spec.rb +11 -0
- data/spec/unit/resource_spec.rb +4 -19
- data/spec/unit/rest/auth_credentials_spec.rb +2 -19
- data/spec/unit/rest_spec.rb +130 -284
- data/spec/unit/run_context/cookbook_compiler_spec.rb +181 -0
- data/spec/unit/run_context_spec.rb +18 -4
- data/spec/unit/run_list_spec.rb +0 -209
- data/spec/unit/run_lock_spec.rb +37 -0
- data/spec/unit/runner_spec.rb +101 -2
- data/spec/unit/scan_access_control_spec.rb +4 -4
- data/spec/unit/{shef → shell}/model_wrapper_spec.rb +5 -5
- data/spec/unit/{shef/shef_ext_spec.rb → shell/shell_ext_spec.rb} +21 -21
- data/spec/unit/{shef/shef_session_spec.rb → shell/shell_session_spec.rb} +14 -69
- data/spec/unit/shell_out_spec.rb +18 -0
- data/spec/unit/{shef_spec.rb → shell_spec.rb} +20 -20
- metadata +275 -234
- checksums.yaml +0 -15
- data/README.rdoc +0 -177
- data/distro/common/html/knife-recipe.1.html +0 -92
- data/lib/chef/certificate.rb +0 -161
- data/lib/chef/checksum.rb +0 -167
- data/lib/chef/checksum_cache.rb +0 -190
- data/lib/chef/cookbook_version_selector.rb +0 -168
- data/lib/chef/couchdb.rb +0 -246
- data/lib/chef/index_queue/amqp_client.rb +0 -116
- data/lib/chef/index_queue/consumer.rb +0 -76
- data/lib/chef/index_queue/indexable.rb +0 -109
- data/lib/chef/knife/bootstrap/ubuntu12.10-gems.erb +0 -60
- data/lib/chef/monkey_patches/moneta.rb +0 -50
- data/lib/chef/monkey_patches/uri.rb +0 -70
- data/lib/chef/openid_registration.rb +0 -187
- data/lib/chef/provider/user/solaris.rb +0 -90
- data/lib/chef/solr_query.rb +0 -187
- data/lib/chef/solr_query/lucene.treetop +0 -150
- data/lib/chef/solr_query/lucene_nodes.rb +0 -285
- data/lib/chef/solr_query/query_transform.rb +0 -65
- data/lib/chef/solr_query/solr_http_request.rb +0 -132
- data/lib/chef/webui_user.rb +0 -231
- data/spec/data/cookbooks/openldap/files/default/.dotfile +0 -1
- data/spec/data/cookbooks/openldap/files/default/.ssh/id_rsa +0 -1
- data/spec/data/cookbooks/openldap/files/default/remotedir/.a_dotdir/.a_dotfile_in_a_dotdir +0 -1
- data/spec/data/cookbooks/openldap/files/default/remotedir/remotesubdir/.a_dotfile +0 -1
- data/spec/data/mac_users/10.7-8.plist.xml +0 -559
- data/spec/data/mac_users/10.7-8.shadow.xml +0 -11
- data/spec/data/mac_users/10.7.plist.xml +0 -559
- data/spec/data/mac_users/10.7.shadow.xml +0 -11
- data/spec/data/mac_users/10.8.plist.xml +0 -559
- data/spec/data/mac_users/10.8.shadow.xml +0 -21
- data/spec/data/mac_users/10.9.plist.xml +0 -560
- data/spec/data/mac_users/10.9.shadow.xml +0 -21
- data/spec/functional/resource/base.rb +0 -40
- data/spec/functional/resource/group_spec.rb +0 -343
- data/spec/functional/resource/user/dscl_spec.rb +0 -199
- data/spec/unit/certificate_spec.rb +0 -76
- data/spec/unit/checksum_cache_spec.rb +0 -209
- data/spec/unit/checksum_spec.rb +0 -94
- data/spec/unit/couchdb_spec.rb +0 -274
- data/spec/unit/index_queue_spec.rb +0 -391
- data/spec/unit/mixin/language_spec.rb +0 -305
- data/spec/unit/openid_registration_spec.rb +0 -153
- data/spec/unit/provider/user/solaris_spec.rb +0 -414
- data/spec/unit/provider/whyrun_safe_ruby_block_spec.rb +0 -47
- data/spec/unit/solr_query/query_transform_spec.rb +0 -454
- data/spec/unit/solr_query/solr_http_request_spec.rb +0 -244
- data/spec/unit/solr_query_spec.rb +0 -203
- data/spec/unit/webui_user_spec.rb +0 -238
data/lib/chef/node/attribute.rb
CHANGED
@@ -1,4 +1,4 @@
|
|
1
|
-
|
1
|
+
#--
|
2
2
|
# Author:: Adam Jacob (<adam@opscode.com>)
|
3
3
|
# Author:: AJ Christensen (<aj@opscode.com>)
|
4
4
|
# Copyright:: Copyright (c) 2008 Opscode, Inc.
|
@@ -17,488 +17,348 @@
|
|
17
17
|
# limitations under the License.
|
18
18
|
#
|
19
19
|
|
20
|
+
require 'chef/node/immutable_collections'
|
21
|
+
require 'chef/node/attribute_collections'
|
20
22
|
require 'chef/mixin/deep_merge'
|
21
23
|
require 'chef/log'
|
22
24
|
|
23
25
|
class Chef
|
24
26
|
class Node
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
:current_override,
|
35
|
-
:current_automatic,
|
36
|
-
:auto_vivifiy_on_read,
|
37
|
-
:set_unless_value_present,
|
38
|
-
:set_type
|
27
|
+
|
28
|
+
# == Attribute
|
29
|
+
# Attribute implements a nested key-value (Hash) and flat collection
|
30
|
+
# (Array) data structure supporting multiple levels of precedence, such
|
31
|
+
# that a given key may have multiple values internally, but will only
|
32
|
+
# return the highest precedence value when reading.
|
33
|
+
class Attribute < Mash
|
34
|
+
|
35
|
+
include Immutablize
|
39
36
|
|
40
37
|
include Enumerable
|
41
38
|
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
|
55
|
-
|
56
|
-
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
|
62
|
-
|
63
|
-
|
64
|
-
|
65
|
-
|
66
|
-
|
67
|
-
|
68
|
-
|
69
|
-
|
70
|
-
|
71
|
-
|
72
|
-
|
73
|
-
|
74
|
-
|
75
|
-
|
76
|
-
|
77
|
-
|
78
|
-
|
79
|
-
|
80
|
-
|
81
|
-
|
82
|
-
|
83
|
-
|
84
|
-
|
85
|
-
|
86
|
-
|
87
|
-
|
88
|
-
|
89
|
-
|
90
|
-
|
91
|
-
|
92
|
-
|
93
|
-
|
94
|
-
|
95
|
-
|
96
|
-
|
97
|
-
|
98
|
-
|
99
|
-
|
100
|
-
|
101
|
-
|
102
|
-
|
103
|
-
|
104
|
-
|
105
|
-
|
106
|
-
|
107
|
-
|
108
|
-
|
109
|
-
|
110
|
-
|
111
|
-
|
112
|
-
|
113
|
-
|
114
|
-
|
115
|
-
|
116
|
-
|
117
|
-
|
118
|
-
|
119
|
-
|
120
|
-
|
121
|
-
|
122
|
-
|
123
|
-
|
124
|
-
|
125
|
-
|
126
|
-
|
127
|
-
|
128
|
-
|
129
|
-
|
130
|
-
|
131
|
-
|
132
|
-
|
133
|
-
|
134
|
-
|
135
|
-
|
136
|
-
|
137
|
-
|
138
|
-
|
139
|
-
|
140
|
-
|
141
|
-
|
142
|
-
|
143
|
-
|
144
|
-
|
145
|
-
|
146
|
-
|
147
|
-
|
148
|
-
block.call(key, value)
|
149
|
-
end
|
150
|
-
end
|
151
|
-
|
152
|
-
def each_attribute(&block)
|
153
|
-
get_keys.each do |key|
|
154
|
-
value = determine_value(
|
155
|
-
get_value(automatic, key),
|
156
|
-
get_value(override, key),
|
157
|
-
get_value(normal, key),
|
158
|
-
get_value(default, key)
|
159
|
-
)
|
160
|
-
block.call(key, value)
|
161
|
-
end
|
162
|
-
end
|
163
|
-
|
164
|
-
def each_key(&block)
|
165
|
-
get_keys.each do |key|
|
166
|
-
block.call(key)
|
167
|
-
end
|
168
|
-
end
|
169
|
-
|
170
|
-
def each_value(&block)
|
171
|
-
get_keys.each do |key|
|
172
|
-
value = determine_value(
|
173
|
-
get_value(automatic, key),
|
174
|
-
get_value(override, key),
|
175
|
-
get_value(normal, key),
|
176
|
-
get_value(default, key)
|
177
|
-
)
|
178
|
-
block.call(value)
|
179
|
-
end
|
180
|
-
end
|
181
|
-
|
182
|
-
def empty?
|
183
|
-
get_keys.empty?
|
184
|
-
end
|
185
|
-
|
186
|
-
def fetch(key, default_value=nil, &block)
|
187
|
-
if get_keys.include? key
|
188
|
-
determine_value(
|
189
|
-
get_value(automatic, key),
|
190
|
-
get_value(override, key),
|
191
|
-
get_value(normal, key),
|
192
|
-
get_value(default, key)
|
193
|
-
)
|
194
|
-
elsif default_value
|
195
|
-
default_value
|
196
|
-
elsif block_given?
|
197
|
-
block.call(key)
|
198
|
-
else
|
199
|
-
raise IndexError, "Key #{key} does not exist"
|
200
|
-
end
|
201
|
-
end
|
202
|
-
|
203
|
-
# Writing this method hurts me a little bit.
|
204
|
-
#
|
205
|
-
# TODO: Refactor all this stuff so this kind of horror is no longer needed
|
206
|
-
#
|
207
|
-
# We have invented a new kind of duck-typing, we call it Madoff typing.
|
208
|
-
# We just lie and hope we die before you recognize our scheme. :)
|
209
|
-
def kind_of?(klass)
|
210
|
-
if klass == Hash || klass == Mash || klass == Chef::Node::Attribute
|
211
|
-
true
|
212
|
-
else
|
213
|
-
false
|
214
|
-
end
|
215
|
-
end
|
216
|
-
|
217
|
-
def has_value?(value)
|
218
|
-
self.any? do |k,v|
|
219
|
-
value == v
|
220
|
-
end
|
221
|
-
end
|
222
|
-
|
223
|
-
alias :value? :has_value?
|
224
|
-
|
225
|
-
def index(value)
|
226
|
-
index = self.find do |h|
|
227
|
-
value == h[1]
|
228
|
-
end
|
229
|
-
index.first if index.is_a? Array || nil
|
230
|
-
end
|
231
|
-
|
232
|
-
def values
|
233
|
-
self.collect { |h| h[1] }
|
234
|
-
end
|
235
|
-
|
236
|
-
def size
|
237
|
-
self.collect{}.length
|
238
|
-
end
|
239
|
-
|
240
|
-
alias :length :size
|
241
|
-
|
242
|
-
def get_keys
|
243
|
-
keys
|
244
|
-
end
|
245
|
-
|
246
|
-
def keys
|
247
|
-
tkeys = current_automatic ? current_automatic.keys : []
|
248
|
-
[ current_override, current_normal, current_default ].each do |attr_hash|
|
249
|
-
if attr_hash
|
250
|
-
attr_hash.keys.each do |key|
|
251
|
-
tkeys << key unless tkeys.include?(key)
|
39
|
+
# List of the component attribute hashes, in order of precedence, low to
|
40
|
+
# high.
|
41
|
+
COMPONENTS = [
|
42
|
+
:@default,
|
43
|
+
:@env_default,
|
44
|
+
:@role_default,
|
45
|
+
:@force_default,
|
46
|
+
:@normal,
|
47
|
+
:@override,
|
48
|
+
:@role_override,
|
49
|
+
:@env_override,
|
50
|
+
:@force_override,
|
51
|
+
:@automatic
|
52
|
+
].freeze
|
53
|
+
|
54
|
+
DEFAULT_COMPONENTS = [
|
55
|
+
:@default,
|
56
|
+
:@env_default,
|
57
|
+
:@role_default,
|
58
|
+
:@force_default
|
59
|
+
]
|
60
|
+
|
61
|
+
|
62
|
+
OVERRIDE_COMPONENTS = [
|
63
|
+
:@override,
|
64
|
+
:@role_override,
|
65
|
+
:@env_override,
|
66
|
+
:@force_override
|
67
|
+
]
|
68
|
+
|
69
|
+
[:all?,
|
70
|
+
:any?,
|
71
|
+
:assoc,
|
72
|
+
:chunk,
|
73
|
+
:collect,
|
74
|
+
:collect_concat,
|
75
|
+
:compare_by_identity,
|
76
|
+
:compare_by_identity?,
|
77
|
+
:count,
|
78
|
+
:cycle,
|
79
|
+
:detect,
|
80
|
+
:drop,
|
81
|
+
:drop_while,
|
82
|
+
:each,
|
83
|
+
:each_cons,
|
84
|
+
:each_entry,
|
85
|
+
:each_key,
|
86
|
+
:each_pair,
|
87
|
+
:each_slice,
|
88
|
+
:each_value,
|
89
|
+
:each_with_index,
|
90
|
+
:each_with_object,
|
91
|
+
:empty?,
|
92
|
+
:entries,
|
93
|
+
:except,
|
94
|
+
:fetch,
|
95
|
+
:find,
|
96
|
+
:find_all,
|
97
|
+
:find_index,
|
98
|
+
:first,
|
99
|
+
:flat_map,
|
100
|
+
:flatten,
|
101
|
+
:grep,
|
102
|
+
:group_by,
|
103
|
+
:has_value?,
|
104
|
+
:include?,
|
105
|
+
:index,
|
106
|
+
:inject,
|
107
|
+
:invert,
|
108
|
+
:key,
|
109
|
+
:keys,
|
110
|
+
:length,
|
111
|
+
:map,
|
112
|
+
:max,
|
113
|
+
:max_by,
|
114
|
+
:merge,
|
115
|
+
:min,
|
116
|
+
:min_by,
|
117
|
+
:minmax,
|
118
|
+
:minmax_by,
|
119
|
+
:none?,
|
120
|
+
:one?,
|
121
|
+
:partition,
|
122
|
+
:rassoc,
|
123
|
+
:reduce,
|
124
|
+
:reject,
|
125
|
+
:reverse_each,
|
126
|
+
:select,
|
127
|
+
:size,
|
128
|
+
:slice_before,
|
129
|
+
:sort,
|
130
|
+
:sort_by,
|
131
|
+
:store,
|
132
|
+
:symbolize_keys,
|
133
|
+
:take,
|
134
|
+
:take_while,
|
135
|
+
:to_a,
|
136
|
+
:to_hash,
|
137
|
+
:to_set,
|
138
|
+
:value?,
|
139
|
+
:values,
|
140
|
+
:values_at,
|
141
|
+
:zip].each do |delegated_method|
|
142
|
+
class_eval(<<-METHOD_DEFN)
|
143
|
+
def #{delegated_method}(*args, &block)
|
144
|
+
merged_attributes.send(:#{delegated_method}, *args, &block)
|
252
145
|
end
|
253
|
-
|
254
|
-
|
255
|
-
|
256
|
-
|
257
|
-
|
258
|
-
|
259
|
-
|
260
|
-
|
261
|
-
|
262
|
-
|
263
|
-
|
264
|
-
|
265
|
-
|
266
|
-
|
267
|
-
|
268
|
-
|
269
|
-
|
270
|
-
|
271
|
-
|
272
|
-
|
273
|
-
|
274
|
-
|
275
|
-
|
276
|
-
|
277
|
-
|
278
|
-
|
279
|
-
|
280
|
-
|
281
|
-
|
282
|
-
|
283
|
-
|
284
|
-
|
285
|
-
|
286
|
-
|
287
|
-
|
288
|
-
|
289
|
-
|
290
|
-
|
291
|
-
|
292
|
-
|
293
|
-
|
294
|
-
|
295
|
-
|
296
|
-
|
297
|
-
|
298
|
-
|
299
|
-
|
300
|
-
|
301
|
-
|
302
|
-
|
303
|
-
|
304
|
-
|
305
|
-
|
306
|
-
|
307
|
-
|
308
|
-
|
309
|
-
|
310
|
-
|
311
|
-
|
312
|
-
|
313
|
-
|
314
|
-
|
315
|
-
|
316
|
-
|
317
|
-
|
318
|
-
|
319
|
-
|
320
|
-
|
321
|
-
|
322
|
-
|
323
|
-
|
324
|
-
|
325
|
-
|
326
|
-
|
327
|
-
|
328
|
-
|
329
|
-
|
330
|
-
|
331
|
-
|
332
|
-
|
333
|
-
|
334
|
-
|
335
|
-
|
336
|
-
|
337
|
-
|
338
|
-
|
339
|
-
|
340
|
-
|
341
|
-
|
342
|
-
|
343
|
-
|
344
|
-
|
345
|
-
|
346
|
-
|
347
|
-
|
348
|
-
|
349
|
-
|
350
|
-
|
351
|
-
|
352
|
-
|
353
|
-
|
354
|
-
|
355
|
-
|
356
|
-
|
357
|
-
|
358
|
-
|
359
|
-
|
360
|
-
|
361
|
-
|
362
|
-
|
363
|
-
|
364
|
-
|
365
|
-
|
366
|
-
|
367
|
-
|
368
|
-
|
369
|
-
|
370
|
-
|
371
|
-
|
372
|
-
|
373
|
-
|
374
|
-
|
375
|
-
|
376
|
-
|
377
|
-
|
378
|
-
|
379
|
-
|
380
|
-
|
381
|
-
|
382
|
-
|
383
|
-
|
384
|
-
|
385
|
-
|
386
|
-
|
387
|
-
|
388
|
-
|
389
|
-
|
390
|
-
|
391
|
-
|
392
|
-
|
393
|
-
|
394
|
-
|
395
|
-
|
396
|
-
|
397
|
-
|
398
|
-
|
399
|
-
|
400
|
-
|
401
|
-
|
402
|
-
|
403
|
-
|
404
|
-
|
405
|
-
|
406
|
-
|
407
|
-
|
408
|
-
|
409
|
-
|
410
|
-
|
411
|
-
|
412
|
-
|
413
|
-
|
414
|
-
|
415
|
-
|
416
|
-
|
417
|
-
|
418
|
-
|
419
|
-
|
420
|
-
|
421
|
-
|
422
|
-
|
423
|
-
|
424
|
-
|
425
|
-
|
426
|
-
|
427
|
-
|
428
|
-
|
429
|
-
|
430
|
-
|
431
|
-
|
432
|
-
|
433
|
-
|
434
|
-
|
435
|
-
|
436
|
-
|
437
|
-
|
438
|
-
|
439
|
-
|
440
|
-
|
441
|
-
|
442
|
-
|
443
|
-
|
444
|
-
|
445
|
-
|
446
|
-
|
447
|
-
|
448
|
-
|
449
|
-
|
450
|
-
|
451
|
-
|
452
|
-
|
453
|
-
|
454
|
-
|
455
|
-
|
456
|
-
|
457
|
-
|
458
|
-
|
459
|
-
|
460
|
-
|
461
|
-
|
462
|
-
|
463
|
-
|
464
|
-
|
465
|
-
|
466
|
-
|
467
|
-
end
|
468
|
-
end
|
469
|
-
|
470
|
-
def delete(key)
|
471
|
-
[@automatic, @override, @normal, @default].inject(nil) do |return_value, attrs|
|
472
|
-
deleted_value = delete_from_component(attrs, key)
|
473
|
-
return_value || deleted_value
|
474
|
-
end
|
475
|
-
end
|
476
|
-
|
477
|
-
def delete_from_component(component_attrs, key)
|
478
|
-
# get the Hash-like object at the current nesting level:
|
479
|
-
nested_attrs = value_at_current_nesting(component_attrs, key)
|
480
|
-
|
481
|
-
if nested_attrs.respond_to?(:delete)
|
482
|
-
nested_attrs.delete(key)
|
483
|
-
else
|
484
|
-
nil
|
485
|
-
end
|
486
|
-
end
|
487
|
-
|
488
|
-
def component_has_key?(component_attrs,key)
|
489
|
-
# get the Hash-like object at the current nesting level:
|
490
|
-
nested_attrs = value_at_current_nesting(component_attrs, key)
|
491
|
-
nested_attrs.respond_to?(:key?) && nested_attrs.key?(key)
|
492
|
-
end
|
493
|
-
|
494
|
-
def value_at_current_nesting(component_attrs, key)
|
495
|
-
@current_nesting_level.inject(component_attrs) do |subtree, intermediate_key|
|
496
|
-
# if the intermediate value isn't a hash or doesn't have the intermediate key,
|
497
|
-
# it can't have the bottom-level key we're looking for.
|
498
|
-
(subtree.respond_to?(:key?) && subtree[intermediate_key]) or (return false)
|
499
|
-
end
|
500
|
-
end
|
146
|
+
METHOD_DEFN
|
147
|
+
end
|
148
|
+
|
149
|
+
|
150
|
+
# return the cookbook level default attribute component
|
151
|
+
attr_reader :default
|
152
|
+
|
153
|
+
# return the role level default attribute component
|
154
|
+
attr_reader :role_default
|
155
|
+
|
156
|
+
# return the environment level default attribute component
|
157
|
+
attr_reader :env_default
|
158
|
+
|
159
|
+
# return the force_default level attribute component
|
160
|
+
attr_reader :force_default
|
161
|
+
|
162
|
+
# default! is the "advertised" method for force_default, but is
|
163
|
+
# implemented as an alias because instance variables can't (easily) have
|
164
|
+
# +!+ characters.
|
165
|
+
alias :default! :force_default
|
166
|
+
|
167
|
+
# return the "normal" level attribute component
|
168
|
+
attr_reader :normal
|
169
|
+
|
170
|
+
# return the cookbook level override attribute component
|
171
|
+
attr_reader :override
|
172
|
+
|
173
|
+
# return the role level override attribute component
|
174
|
+
attr_reader :role_override
|
175
|
+
|
176
|
+
# return the enviroment level override attribute component
|
177
|
+
attr_reader :env_override
|
178
|
+
|
179
|
+
# return the force override level attribute component
|
180
|
+
attr_reader :force_override
|
181
|
+
|
182
|
+
# +override!+ is the "advertised" method for +force_override+ but is
|
183
|
+
# implemented as an alias because instance variables can't easily have
|
184
|
+
# +!+ characters.
|
185
|
+
alias :override! :force_override
|
186
|
+
|
187
|
+
# return the automatic level attribute component
|
188
|
+
attr_reader :automatic
|
189
|
+
|
190
|
+
def initialize(normal, default, override, automatic)
|
191
|
+
@set_unless_present = false
|
192
|
+
|
193
|
+
@default = VividMash.new(self, default)
|
194
|
+
@env_default = VividMash.new(self, {})
|
195
|
+
@role_default = VividMash.new(self, {})
|
196
|
+
@force_default = VividMash.new(self, {})
|
197
|
+
|
198
|
+
@normal = VividMash.new(self, normal)
|
199
|
+
|
200
|
+
@override = VividMash.new(self, override)
|
201
|
+
@role_override = VividMash.new(self, {})
|
202
|
+
@env_override = VividMash.new(self, {})
|
203
|
+
@force_override = VividMash.new(self, {})
|
204
|
+
|
205
|
+
@automatic = VividMash.new(self, automatic)
|
206
|
+
|
207
|
+
@merged_attributes = nil
|
208
|
+
@combined_override = nil
|
209
|
+
@combined_default = nil
|
210
|
+
end
|
211
|
+
|
212
|
+
# Enables or disables `||=`-like attribute setting. See, e.g., Node#set_unless
|
213
|
+
def set_unless_value_present=(setting)
|
214
|
+
@set_unless_present = setting
|
215
|
+
end
|
216
|
+
|
217
|
+
# Clears merged_attributes, which will cause it to be recomputed on the
|
218
|
+
# next access.
|
219
|
+
def reset_cache
|
220
|
+
@merged_attributes = nil
|
221
|
+
@combined_default = nil
|
222
|
+
@combined_override = nil
|
223
|
+
end
|
224
|
+
|
225
|
+
alias :reset :reset_cache
|
226
|
+
|
227
|
+
# Set the cookbook level default attribute component to +new_data+.
|
228
|
+
def default=(new_data)
|
229
|
+
reset
|
230
|
+
@default = VividMash.new(self, new_data)
|
231
|
+
end
|
232
|
+
|
233
|
+
# Set the role level default attribute component to +new_data+
|
234
|
+
def role_default=(new_data)
|
235
|
+
reset
|
236
|
+
@role_default = VividMash.new(self, new_data)
|
237
|
+
end
|
238
|
+
|
239
|
+
# Set the environment level default attribute component to +new_data+
|
240
|
+
def env_default=(new_data)
|
241
|
+
reset
|
242
|
+
@env_default = VividMash.new(self, new_data)
|
243
|
+
end
|
244
|
+
|
245
|
+
# Set the force_default (+default!+) level attributes to +new_data+
|
246
|
+
def force_default=(new_data)
|
247
|
+
reset
|
248
|
+
@force_default = VividMash.new(self, new_data)
|
249
|
+
end
|
250
|
+
|
251
|
+
# Set the normal level attribute component to +new_data+
|
252
|
+
def normal=(new_data)
|
253
|
+
reset
|
254
|
+
@normal = VividMash.new(self, new_data)
|
255
|
+
end
|
256
|
+
|
257
|
+
# Set the cookbook level override attribute component to +new_data+
|
258
|
+
def override=(new_data)
|
259
|
+
reset
|
260
|
+
@override = VividMash.new(self, new_data)
|
261
|
+
end
|
262
|
+
|
263
|
+
# Set the role level override attribute component to +new_data+
|
264
|
+
def role_override=(new_data)
|
265
|
+
reset
|
266
|
+
@role_override = VividMash.new(self, new_data)
|
267
|
+
end
|
268
|
+
|
269
|
+
# Set the environment level override attribute component to +new_data+
|
270
|
+
def env_override=(new_data)
|
271
|
+
reset
|
272
|
+
@env_override = VividMash.new(self, new_data)
|
273
|
+
end
|
274
|
+
|
275
|
+
def force_override=(new_data)
|
276
|
+
reset
|
277
|
+
@force_override = VividMash.new(self, new_data)
|
278
|
+
end
|
279
|
+
|
280
|
+
def automatic=(new_data)
|
281
|
+
reset
|
282
|
+
@automatic = VividMash.new(self, new_data)
|
283
|
+
end
|
284
|
+
|
285
|
+
def merged_attributes
|
286
|
+
@merged_attributes ||= begin
|
287
|
+
resolved_attrs = COMPONENTS.inject(Mash.new) do |merged, component_ivar|
|
288
|
+
component_value = instance_variable_get(component_ivar)
|
289
|
+
Chef::Mixin::DeepMerge.merge(merged, component_value)
|
290
|
+
end
|
291
|
+
immutablize(resolved_attrs)
|
292
|
+
end
|
293
|
+
end
|
294
|
+
|
295
|
+
def combined_override
|
296
|
+
@combined_override ||= begin
|
297
|
+
resolved_attrs = OVERRIDE_COMPONENTS.inject(Mash.new) do |merged, component_ivar|
|
298
|
+
component_value = instance_variable_get(component_ivar)
|
299
|
+
Chef::Mixin::DeepMerge.merge(merged, component_value)
|
300
|
+
end
|
301
|
+
immutablize(resolved_attrs)
|
302
|
+
end
|
303
|
+
end
|
304
|
+
|
305
|
+
def combined_default
|
306
|
+
@combined_default ||= begin
|
307
|
+
resolved_attrs = DEFAULT_COMPONENTS.inject(Mash.new) do |merged, component_ivar|
|
308
|
+
component_value = instance_variable_get(component_ivar)
|
309
|
+
Chef::Mixin::DeepMerge.merge(merged, component_value)
|
310
|
+
end
|
311
|
+
immutablize(resolved_attrs)
|
312
|
+
end
|
313
|
+
end
|
314
|
+
|
315
|
+
def [](key)
|
316
|
+
merged_attributes[key]
|
317
|
+
end
|
318
|
+
|
319
|
+
def []=(key, value)
|
320
|
+
merged_attributes[key] = value
|
321
|
+
end
|
322
|
+
|
323
|
+
def has_key?(key)
|
324
|
+
COMPONENTS.any? do |component_ivar|
|
325
|
+
instance_variable_get(component_ivar).has_key?(key)
|
326
|
+
end
|
327
|
+
end
|
328
|
+
|
329
|
+
alias :attribute? :has_key?
|
330
|
+
alias :member? :has_key?
|
331
|
+
alias :include? :has_key?
|
332
|
+
alias :key? :has_key?
|
333
|
+
|
334
|
+
alias :each_attribute :each
|
335
|
+
|
336
|
+
def method_missing(symbol, *args)
|
337
|
+
if args.empty?
|
338
|
+
if key?(symbol)
|
339
|
+
self[symbol]
|
340
|
+
else
|
341
|
+
raise NoMethodError, "Undefined method or attribute `#{symbol}' on `node'"
|
342
|
+
end
|
343
|
+
elsif symbol.to_s =~ /=$/
|
344
|
+
key_to_set = symbol.to_s[/^(.+)=$/, 1]
|
345
|
+
self[key_to_set] = (args.length == 1 ? args[0] : args)
|
346
|
+
else
|
347
|
+
raise NoMethodError, "Undefined node attribute or method `#{symbol}' on `node'"
|
348
|
+
end
|
349
|
+
end
|
350
|
+
|
351
|
+
def inspect
|
352
|
+
"#<#{self.class} " << (COMPONENTS + [:@merged_attributes, :@properties]).map{|iv|
|
353
|
+
"#{iv}=#{instance_variable_get(iv).inspect}"
|
354
|
+
}.join(', ') << ">"
|
355
|
+
end
|
356
|
+
|
357
|
+
def set_unless?
|
358
|
+
@set_unless_present
|
359
|
+
end
|
501
360
|
|
502
361
|
end
|
362
|
+
|
503
363
|
end
|
504
364
|
end
|