puppet 4.0.0 → 4.5.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.
- data/COMMITTERS.md +2 -2
- data/CONTRIBUTING.md +10 -10
- data/Gemfile +6 -8
- data/LICENSE +3 -3
- data/README.md +14 -10
- data/Rakefile +20 -0
- data/conf/auth.conf +2 -2
- data/conf/puppet.conf +1 -1
- data/ext/README.environment +1 -1
- data/ext/build_defaults.yaml +9 -36
- data/ext/debian/README.source +1 -1
- data/ext/debian/control +1 -1
- data/ext/debian/copyright +4 -4
- data/ext/debian/puppet.default +0 -5
- data/ext/debian/puppet.init +1 -16
- data/ext/debian/puppet.logrotate +14 -5
- data/ext/debian/puppetmaster.README.debian +11 -9
- data/ext/emacs/puppet-mode.el +1 -1
- data/ext/envpuppet +2 -2
- data/ext/ips/puppetagent.xml +1 -1
- data/ext/ips/puppetmaster.xml +1 -1
- data/ext/osx/puppet.plist +30 -0
- data/ext/project_data.yaml +11 -1
- data/ext/puppet-test +3 -3
- data/ext/rack/example-passenger-vhost.conf +1 -1
- data/ext/redhat/client.init +67 -17
- data/ext/redhat/client.sysconfig +1 -10
- data/ext/redhat/logrotate +15 -3
- data/ext/redhat/puppet.spec.erb +6 -11
- data/ext/redhat/server.init +1 -1
- data/ext/regexp_nodes/regexp_nodes.rb +1 -1
- data/ext/solaris/pkginfo +1 -1
- data/ext/solaris/smf/puppet +44 -0
- data/ext/solaris/smf/puppet.xml +44 -0
- data/ext/suse/client.init +30 -33
- data/ext/suse/puppet.spec +2 -2
- data/ext/suse/server.init +2 -2
- data/ext/systemd/puppet.service +3 -1
- data/ext/upload_facts.rb +1 -1
- data/ext/windows/puppet_interactive.bat +6 -0
- data/ext/windows/puppet_shell.bat +9 -0
- data/ext/windows/run_puppet_interactive.bat +9 -0
- data/ext/yaml_nodes.rb +1 -1
- data/install.rb +51 -59
- data/lib/hiera/puppet_function.rb +18 -7
- data/lib/hiera/scope.rb +1 -1
- data/lib/hiera_puppet.rb +6 -14
- data/lib/puppet/agent/locker.rb +11 -2
- data/lib/puppet/agent.rb +9 -24
- data/lib/puppet/application/agent.rb +39 -19
- data/lib/puppet/application/apply.rb +68 -15
- data/lib/puppet/application/ca.rb +1 -0
- data/lib/puppet/application/cert.rb +17 -1
- data/lib/puppet/application/device.rb +9 -4
- data/lib/puppet/application/filebucket.rb +79 -5
- data/lib/puppet/application/inspect.rb +2 -2
- data/lib/puppet/application/lookup.rb +342 -0
- data/lib/puppet/application/master.rb +22 -7
- data/lib/puppet/application/resource.rb +1 -5
- data/lib/puppet/configurer/plugin_handler.rb +6 -2
- data/lib/puppet/configurer.rb +116 -31
- data/lib/puppet/context/trusted_information.rb +21 -1
- data/lib/puppet/context.rb +16 -1
- data/lib/puppet/daemon.rb +17 -13
- data/lib/puppet/data_binding.rb +4 -2
- data/lib/puppet/data_providers/data_adapter.rb +7 -68
- data/lib/puppet/data_providers/data_function_support.rb +5 -26
- data/lib/puppet/data_providers/function_env_data_provider.rb +0 -10
- data/lib/puppet/data_providers/function_module_data_provider.rb +0 -22
- data/lib/puppet/data_providers/hiera_config.rb +129 -0
- data/lib/puppet/data_providers/hiera_env_data_provider.rb +18 -0
- data/lib/puppet/data_providers/hiera_interpolate.rb +19 -0
- data/lib/puppet/data_providers/hiera_module_data_provider.rb +23 -0
- data/lib/puppet/data_providers/hiera_support.rb +37 -0
- data/lib/puppet/data_providers/json_data_provider_factory.rb +24 -0
- data/lib/puppet/data_providers/lookup_adapter.rb +247 -0
- data/lib/puppet/data_providers/yaml_data_provider_factory.rb +26 -0
- data/lib/puppet/data_providers.rb +12 -13
- data/lib/puppet/defaults.rb +202 -47
- data/lib/puppet/environments.rb +98 -8
- data/lib/puppet/error.rb +31 -1
- data/lib/puppet/face/config.rb +1 -1
- data/lib/puppet/face/epp.rb +1 -1
- data/lib/puppet/face/help/man.erb +1 -1
- data/lib/puppet/face/module/changes.rb +2 -1
- data/lib/puppet/face/module/install.rb +6 -6
- data/lib/puppet/face/parser.rb +12 -9
- data/lib/puppet/face/plugin.rb +7 -14
- data/lib/puppet/face/status.rb +2 -1
- data/lib/puppet/feature/cfacter.rb +1 -0
- data/lib/puppet/feature/cfpropertylist.rb +3 -0
- data/lib/puppet/feature/telnet.rb +9 -0
- data/lib/puppet/file_bucket/dipper.rb +58 -2
- data/lib/puppet/file_serving/http_metadata.rb +46 -0
- data/lib/puppet/file_serving/metadata.rb +30 -9
- data/lib/puppet/file_serving/terminus_helper.rb +7 -8
- data/lib/puppet/file_serving/terminus_selector.rb +2 -0
- data/lib/puppet/file_system/file_impl.rb +6 -2
- data/lib/puppet/file_system/memory_impl.rb +5 -1
- data/lib/puppet/file_system/uniquefile.rb +3 -3
- data/lib/puppet/file_system/windows.rb +12 -16
- data/lib/puppet/file_system.rb +15 -2
- data/lib/puppet/forge/repository.rb +1 -32
- data/lib/puppet/forge.rb +1 -1
- data/lib/puppet/functions/assert_type.rb +57 -21
- data/lib/puppet/functions/defined.rb +161 -0
- data/lib/puppet/functions/dig.rb +39 -0
- data/lib/puppet/functions/each.rb +89 -39
- data/lib/puppet/functions/epp.rb +29 -37
- data/lib/puppet/functions/filter.rb +64 -38
- data/lib/puppet/functions/hiera.rb +76 -3
- data/lib/puppet/functions/hiera_array.rb +65 -3
- data/lib/puppet/functions/hiera_hash.rb +74 -2
- data/lib/puppet/functions/hiera_include.rb +77 -4
- data/lib/puppet/functions/inline_epp.rb +44 -71
- data/lib/puppet/functions/lest.rb +53 -0
- data/lib/puppet/functions/lookup.rb +172 -184
- data/lib/puppet/functions/map.rb +60 -33
- data/lib/puppet/functions/match.rb +30 -12
- data/lib/puppet/functions/new.rb +502 -0
- data/lib/puppet/functions/reduce.rb +99 -70
- data/lib/puppet/functions/regsubst.rb +12 -11
- data/lib/puppet/functions/reverse_each.rb +82 -0
- data/lib/puppet/functions/scanf.rb +15 -18
- data/lib/puppet/functions/slice.rb +22 -36
- data/lib/puppet/functions/split.rb +3 -3
- data/lib/puppet/functions/step.rb +88 -0
- data/lib/puppet/functions/then.rb +74 -0
- data/lib/puppet/functions/type.rb +70 -0
- data/lib/puppet/functions/versioncmp.rb +36 -0
- data/lib/puppet/functions/with.rb +15 -7
- data/lib/puppet/functions.rb +149 -13
- data/lib/puppet/graph/rb_tree_map.rb +1 -1
- data/lib/puppet/indirector/catalog/compiler.rb +196 -9
- data/lib/puppet/indirector/catalog/static_compiler.rb +46 -30
- data/lib/puppet/indirector/data_binding/none.rb +4 -1
- data/lib/puppet/indirector/facts/facter.rb +8 -0
- data/lib/puppet/indirector/file_bucket_file/file.rb +58 -1
- data/lib/puppet/indirector/file_content/http.rb +15 -0
- data/lib/puppet/indirector/file_metadata/http.rb +27 -0
- data/lib/puppet/indirector/generic_http.rb +16 -0
- data/lib/puppet/indirector/hiera.rb +7 -1
- data/lib/puppet/indirector/indirection.rb +12 -3
- data/lib/puppet/indirector/json.rb +3 -3
- data/lib/puppet/indirector/msgpack.rb +2 -2
- data/lib/puppet/indirector/node/exec.rb +1 -1
- data/lib/puppet/indirector/node/ldap.rb +1 -1
- data/lib/puppet/indirector/request.rb +7 -8
- data/lib/puppet/indirector/resource_type/parser.rb +10 -3
- data/lib/puppet/indirector/rest.rb +7 -2
- data/lib/puppet/indirector/terminus.rb +4 -4
- data/lib/puppet/info_service/class_information_service.rb +112 -0
- data/lib/puppet/info_service.rb +7 -0
- data/lib/puppet/loaders.rb +4 -0
- data/lib/puppet/metatype/manager.rb +19 -2
- data/lib/puppet/module.rb +26 -17
- data/lib/puppet/module_tool/applications/application.rb +1 -1
- data/lib/puppet/module_tool/applications/builder.rb +2 -2
- data/lib/puppet/module_tool/applications/unpacker.rb +1 -1
- data/lib/puppet/module_tool/metadata.rb +32 -9
- data/lib/puppet/module_tool/skeleton/templates/generator/Gemfile +14 -3
- data/lib/puppet/module_tool/skeleton/templates/generator/README.md.erb +42 -38
- data/lib/puppet/module_tool/skeleton/templates/generator/Rakefile +19 -4
- data/lib/puppet/module_tool/skeleton/templates/generator/{tests → examples}/init.pp.erb +2 -2
- data/lib/puppet/module_tool/skeleton/templates/generator/manifests/init.pp.erb +25 -18
- data/lib/puppet/module_tool/skeleton/templates/generator/spec/classes/init_spec.rb.erb +1 -2
- data/lib/puppet/module_tool/tar/mini.rb +3 -3
- data/lib/puppet/network/auth_config_parser.rb +1 -1
- data/lib/puppet/network/authconfig.rb +21 -1
- data/lib/puppet/network/authorization.rb +8 -1
- data/lib/puppet/network/http/api/indirected_routes.rb +0 -2
- data/lib/puppet/network/http/api/master/v3/environment.rb +63 -0
- data/lib/puppet/network/http/api/master/v3.rb +7 -1
- data/lib/puppet/network/http/factory.rb +8 -4
- data/lib/puppet/network/http/pool.rb +9 -0
- data/lib/puppet/network/http/rack/rest.rb +10 -1
- data/lib/puppet/node/environment.rb +35 -11
- data/lib/puppet/node.rb +39 -8
- data/lib/puppet/parser/ast/pops_bridge.rb +85 -24
- data/lib/puppet/parser/compiler/catalog_validator/env_relationship_validator.rb +64 -0
- data/lib/puppet/parser/compiler/catalog_validator/relationship_validator.rb +60 -0
- data/lib/puppet/parser/compiler/catalog_validator/site_validator.rb +20 -0
- data/lib/puppet/parser/compiler/catalog_validator.rb +33 -0
- data/lib/puppet/parser/compiler.rb +305 -15
- data/lib/puppet/parser/e4_parser_adapter.rb +13 -12
- data/lib/puppet/parser/environment_compiler.rb +164 -0
- data/lib/puppet/parser/functions/assert_type.rb +46 -16
- data/lib/puppet/parser/functions/defined.rb +105 -44
- data/lib/puppet/parser/functions/each.rb +85 -27
- data/lib/puppet/parser/functions/epp.rb +29 -37
- data/lib/puppet/parser/functions/file.rb +3 -1
- data/lib/puppet/parser/functions/filter.rb +59 -23
- data/lib/puppet/parser/functions/fqdn_rand.rb +3 -3
- data/lib/puppet/parser/functions/hiera.rb +83 -27
- data/lib/puppet/parser/functions/hiera_array.rb +71 -28
- data/lib/puppet/parser/functions/hiera_hash.rb +81 -30
- data/lib/puppet/parser/functions/hiera_include.rb +81 -40
- data/lib/puppet/parser/functions/inline_epp.rb +35 -60
- data/lib/puppet/parser/functions/inline_template.rb +2 -2
- data/lib/puppet/parser/functions/lookup.rb +125 -149
- data/lib/puppet/parser/functions/map.rb +55 -20
- data/lib/puppet/parser/functions/match.rb +28 -12
- data/lib/puppet/parser/functions/reduce.rb +97 -60
- data/lib/puppet/parser/functions/scanf.rb +15 -26
- data/lib/puppet/parser/functions/slice.rb +17 -24
- data/lib/puppet/parser/functions/split.rb +1 -1
- data/lib/puppet/parser/functions/with.rb +16 -8
- data/lib/puppet/parser/functions.rb +28 -16
- data/lib/puppet/parser/resource.rb +119 -26
- data/lib/puppet/parser/scope.rb +233 -24
- data/lib/puppet/parser/templatewrapper.rb +2 -1
- data/lib/puppet/parser.rb +3 -0
- data/lib/puppet/plugins/configuration.rb +3 -2
- data/lib/puppet/plugins/data_providers/data_provider.rb +336 -0
- data/lib/puppet/plugins/data_providers/registry.rb +84 -0
- data/lib/puppet/plugins/data_providers.rb +12 -60
- data/lib/puppet/pops/adaptable.rb +4 -1
- data/lib/puppet/pops/adapters.rb +96 -12
- data/lib/puppet/pops/binder/binder.rb +21 -17
- data/lib/puppet/pops/binder/binder_issues.rb +8 -6
- data/lib/puppet/pops/binder/bindings_checker.rb +12 -8
- data/lib/puppet/pops/binder/bindings_composer.rb +16 -12
- data/lib/puppet/pops/binder/bindings_factory.rb +108 -104
- data/lib/puppet/pops/binder/bindings_label_provider.rb +3 -1
- data/lib/puppet/pops/binder/bindings_loader.rb +6 -2
- data/lib/puppet/pops/binder/bindings_model.rb +49 -47
- data/lib/puppet/pops/binder/bindings_model_meta.rb +2 -2
- data/lib/puppet/pops/binder/config/binder_config.rb +1 -1
- data/lib/puppet/pops/binder/config/diagnostic_producer.rb +10 -6
- data/lib/puppet/pops/binder/injector.rb +55 -50
- data/lib/puppet/pops/binder/key_factory.rb +10 -12
- data/lib/puppet/pops/binder/producers.rb +67 -62
- data/lib/puppet/pops/binder/scheme_handler/module_scheme.rb +68 -9
- data/lib/puppet/pops/evaluator/access_operator.rb +189 -138
- data/lib/puppet/pops/evaluator/closure.rb +151 -104
- data/lib/puppet/pops/evaluator/collector_transformer.rb +35 -25
- data/lib/puppet/pops/evaluator/collectors/abstract_collector.rb +1 -1
- data/lib/puppet/pops/evaluator/collectors/catalog_collector.rb +4 -0
- data/lib/puppet/pops/evaluator/collectors/exported_collector.rb +4 -1
- data/lib/puppet/pops/evaluator/compare_operator.rb +87 -10
- data/lib/puppet/pops/evaluator/epp_evaluator.rb +16 -10
- data/lib/puppet/pops/evaluator/evaluator_impl.rb +204 -111
- data/lib/puppet/pops/evaluator/json_strict_literal_evaluator.rb +85 -0
- data/lib/puppet/pops/evaluator/literal_evaluator.rb +88 -0
- data/lib/puppet/pops/evaluator/relationship_operator.rb +19 -11
- data/lib/puppet/pops/evaluator/runtime3_converter.rb +19 -2
- data/lib/puppet/pops/evaluator/runtime3_support.rb +95 -44
- data/lib/puppet/pops/functions/dispatch.rb +6 -1
- data/lib/puppet/pops/functions/dispatcher.rb +10 -4
- data/lib/puppet/pops/functions/function.rb +6 -2
- data/lib/puppet/pops/issue_reporter.rb +48 -20
- data/lib/puppet/pops/issues.rb +194 -17
- data/lib/puppet/pops/label_provider.rb +1 -1
- data/lib/puppet/pops/loader/base_loader.rb +48 -7
- data/lib/puppet/pops/loader/dependency_loader.rb +27 -2
- data/lib/puppet/pops/loader/loader.rb +23 -0
- data/lib/puppet/pops/loader/loader_paths.rb +82 -6
- data/lib/puppet/pops/loader/module_loaders.rb +36 -21
- data/lib/puppet/pops/loader/predefined_loader.rb +29 -0
- data/lib/puppet/pops/loader/puppet_function_instantiator.rb +83 -0
- data/lib/puppet/pops/loader/ruby_function_instantiator.rb +16 -3
- data/lib/puppet/pops/loader/runtime3_type_loader.rb +57 -0
- data/lib/puppet/pops/loader/static_loader.rb +92 -5
- data/lib/puppet/pops/loader/type_definition_instantiator.rb +77 -0
- data/lib/puppet/pops/loaders.rb +133 -19
- data/lib/puppet/pops/lookup/explainer.rb +509 -0
- data/lib/puppet/pops/lookup/interpolation.rb +115 -0
- data/lib/puppet/pops/lookup/invocation.rb +119 -0
- data/lib/puppet/pops/lookup/sub_lookup.rb +86 -0
- data/lib/puppet/pops/lookup.rb +35 -52
- data/lib/puppet/pops/merge_strategy.rb +85 -30
- data/lib/puppet/pops/migration/migration_checker.rb +54 -0
- data/lib/puppet/pops/model/ast_transformer.rb +8 -1
- data/lib/puppet/pops/model/factory.rb +242 -158
- data/lib/puppet/pops/model/model.rb +25 -8
- data/lib/puppet/pops/model/model_label_provider.rb +25 -6
- data/lib/puppet/pops/model/model_meta.rb +48 -3
- data/lib/puppet/pops/model/model_tree_dumper.rb +30 -0
- data/lib/puppet/pops/parser/code_merger.rb +13 -1
- data/lib/puppet/pops/parser/egrammar.ra +133 -30
- data/lib/puppet/pops/parser/eparser.rb +1738 -1254
- data/lib/puppet/pops/parser/epp_support.rb +27 -12
- data/lib/puppet/pops/parser/evaluating_parser.rb +27 -13
- data/lib/puppet/pops/parser/heredoc_support.rb +19 -14
- data/lib/puppet/pops/parser/interpolation_support.rb +7 -1
- data/lib/puppet/pops/parser/lexer2.rb +452 -379
- data/lib/puppet/pops/parser/lexer_support.rb +132 -25
- data/lib/puppet/pops/parser/locator.rb +30 -5
- data/lib/puppet/pops/parser/parser_support.rb +49 -37
- data/lib/puppet/pops/parser/slurp_support.rb +32 -8
- data/lib/puppet/pops/patterns.rb +3 -0
- data/lib/puppet/pops/pcore.rb +30 -0
- data/lib/puppet/pops/types/class_loader.rb +25 -23
- data/lib/puppet/pops/types/enumeration.rb +9 -27
- data/lib/puppet/pops/types/implementation_registry.rb +146 -0
- data/lib/puppet/pops/types/iterable.rb +308 -0
- data/lib/puppet/pops/types/p_object_type.rb +846 -0
- data/lib/puppet/pops/types/p_runtime_type.rb +102 -0
- data/lib/puppet/pops/types/p_sem_ver_range_type.rb +164 -0
- data/lib/puppet/pops/types/p_sem_ver_type.rb +113 -0
- data/lib/puppet/pops/types/puppet_object.rb +21 -0
- data/lib/puppet/pops/types/recursion_guard.rb +92 -0
- data/lib/puppet/pops/types/ruby_generator.rb +258 -0
- data/lib/puppet/pops/types/string_converter.rb +922 -0
- data/lib/puppet/pops/types/type_acceptor.rb +25 -0
- data/lib/puppet/pops/types/type_asserter.rb +21 -19
- data/lib/puppet/pops/types/type_assertion_error.rb +1 -0
- data/lib/puppet/pops/types/type_calculator.rb +213 -1184
- data/lib/puppet/pops/types/type_conversion_error.rb +15 -0
- data/lib/puppet/pops/types/type_factory.rb +216 -157
- data/lib/puppet/pops/types/type_formatter.rb +569 -0
- data/lib/puppet/pops/types/type_mismatch_describer.rb +1001 -0
- data/lib/puppet/pops/types/type_parser.rb +332 -279
- data/lib/puppet/pops/types/types.rb +2770 -288
- data/lib/puppet/pops/utils.rb +11 -10
- data/lib/puppet/pops/validation/checker4_0.rb +266 -72
- data/lib/puppet/pops/validation/validator_factory_4_0.rb +12 -5
- data/lib/puppet/pops/validation.rb +43 -13
- data/lib/puppet/pops/visitor.rb +3 -1
- data/lib/puppet/pops.rb +29 -24
- data/lib/puppet/property/ensure.rb +1 -1
- data/lib/puppet/property.rb +1 -1
- data/lib/puppet/provider/aixobject.rb +1 -1
- data/lib/puppet/provider/augeas/augeas.rb +57 -2
- data/lib/puppet/provider/cron/crontab.rb +1 -1
- data/lib/puppet/provider/exec/windows.rb +1 -1
- data/lib/puppet/provider/exec.rb +6 -1
- data/lib/puppet/provider/group/directoryservice.rb +10 -0
- data/lib/puppet/provider/group/pw.rb +1 -0
- data/lib/puppet/provider/group/windows_adsi.rb +19 -6
- data/lib/puppet/provider/macauthorization/macauthorization.rb +10 -9
- data/lib/puppet/provider/mount/parsed.rb +159 -2
- data/lib/puppet/provider/nameservice/directoryservice.rb +35 -50
- data/lib/puppet/provider/package/appdmg.rb +3 -2
- data/lib/puppet/provider/package/apt.rb +1 -1
- data/lib/puppet/provider/package/dnf.rb +41 -0
- data/lib/puppet/provider/package/gem.rb +23 -2
- data/lib/puppet/provider/package/nim.rb +1 -1
- data/lib/puppet/provider/package/openbsd.rb +7 -7
- data/lib/puppet/provider/package/pacman.rb +9 -8
- data/lib/puppet/provider/package/pip.rb +80 -20
- data/lib/puppet/provider/package/pip3.rb +20 -0
- data/lib/puppet/provider/package/pkg.rb +1 -1
- data/lib/puppet/provider/package/pkgdmg.rb +7 -4
- data/lib/puppet/provider/package/pkgin.rb +3 -3
- data/lib/puppet/provider/package/pkgng.rb +143 -0
- data/lib/puppet/provider/package/portage.rb +1 -1
- data/lib/puppet/provider/package/ports.rb +0 -3
- data/lib/puppet/provider/package/puppet_gem.rb +0 -0
- data/lib/puppet/provider/package/rpm.rb +120 -14
- data/lib/puppet/provider/package/windows/exe_package.rb +10 -9
- data/lib/puppet/provider/package/windows/msi_package.rb +4 -4
- data/lib/puppet/provider/package/windows/package.rb +9 -1
- data/lib/puppet/provider/package/windows.rb +1 -1
- data/lib/puppet/provider/package/yum.rb +31 -80
- data/lib/puppet/provider/package/zypper.rb +69 -15
- data/lib/puppet/provider/package.rb +6 -2
- data/lib/puppet/provider/scheduled_task/win32_taskscheduler.rb +32 -7
- data/lib/puppet/provider/service/base.rb +3 -2
- data/lib/puppet/provider/service/bsd.rb +8 -8
- data/lib/puppet/provider/service/daemontools.rb +3 -3
- data/lib/puppet/provider/service/debian.rb +12 -3
- data/lib/puppet/provider/service/freebsd.rb +1 -1
- data/lib/puppet/provider/service/init.rb +22 -0
- data/lib/puppet/provider/service/launchd.rb +41 -18
- data/lib/puppet/provider/service/rcng.rb +51 -0
- data/lib/puppet/provider/service/redhat.rb +2 -1
- data/lib/puppet/provider/service/runit.rb +3 -3
- data/lib/puppet/provider/service/smf.rb +48 -4
- data/lib/puppet/provider/service/src.rb +27 -0
- data/lib/puppet/provider/service/systemd.rb +104 -22
- data/lib/puppet/provider/service/upstart.rb +1 -1
- data/lib/puppet/provider/sshkey/parsed.rb +20 -10
- data/lib/puppet/provider/user/aix.rb +1 -1
- data/lib/puppet/provider/user/directoryservice.rb +33 -58
- data/lib/puppet/provider/user/openbsd.rb +1 -0
- data/lib/puppet/provider/user/pw.rb +1 -0
- data/lib/puppet/provider/user/user_role_add.rb +3 -1
- data/lib/puppet/provider/user/windows_adsi.rb +45 -2
- data/lib/puppet/provider/yumrepo/inifile.rb +6 -3
- data/lib/puppet/provider/zfs/zfs.rb +1 -1
- data/lib/puppet/provider/zone/solaris.rb +2 -2
- data/lib/puppet/provider/zpool/zpool.rb +1 -1
- data/lib/puppet/provider.rb +5 -0
- data/lib/puppet/reference/configuration.rb +11 -5
- data/lib/puppet/reference/indirection.rb +1 -1
- data/lib/puppet/reference/providers.rb +2 -3
- data/lib/puppet/reference/report.rb +9 -12
- data/lib/puppet/reports.rb +5 -1
- data/lib/puppet/resource/capability_finder.rb +102 -0
- data/lib/puppet/resource/catalog.rb +133 -36
- data/lib/puppet/resource/status.rb +19 -3
- data/lib/puppet/resource/type.rb +236 -49
- data/lib/puppet/resource/type_collection.rb +83 -10
- data/lib/puppet/resource.rb +116 -119
- data/lib/puppet/settings/base_setting.rb +9 -3
- data/lib/puppet/settings/config_file.rb +1 -1
- data/lib/puppet/settings/environment_conf.rb +13 -5
- data/lib/puppet/settings/file_setting.rb +10 -9
- data/lib/puppet/settings/symbolic_enum_setting.rb +17 -0
- data/lib/puppet/settings.rb +68 -20
- data/lib/puppet/ssl/certificate_authority/interface.rb +2 -2
- data/lib/puppet/ssl/certificate_factory.rb +3 -3
- data/lib/puppet/ssl/certificate_request.rb +4 -4
- data/lib/puppet/ssl/certificate_signer.rb +1 -1
- data/lib/puppet/ssl/oids.rb +33 -3
- data/lib/puppet/ssl/validator/default_validator.rb +1 -1
- data/lib/puppet/test/test_helper.rb +16 -5
- data/lib/puppet/transaction/additional_resource_generator.rb +89 -8
- data/lib/puppet/transaction/report.rb +31 -1
- data/lib/puppet/transaction/resource_harness.rb +0 -20
- data/lib/puppet/transaction.rb +46 -36
- data/lib/puppet/type/augeas.rb +10 -1
- data/lib/puppet/type/cron.rb +12 -12
- data/lib/puppet/type/exec.rb +27 -18
- data/lib/puppet/type/file/checksum_value.rb +53 -0
- data/lib/puppet/type/file/content.rb +32 -117
- data/lib/puppet/type/file/data_sync.rb +84 -0
- data/lib/puppet/type/file/ensure.rb +22 -19
- data/lib/puppet/type/file/selcontext.rb +1 -1
- data/lib/puppet/type/file/source.rb +121 -34
- data/lib/puppet/type/file/target.rb +2 -2
- data/lib/puppet/type/file.rb +107 -44
- data/lib/puppet/type/filebucket.rb +1 -1
- data/lib/puppet/type/group.rb +15 -3
- data/lib/puppet/type/interface.rb +8 -3
- data/lib/puppet/type/macauthorization.rb +1 -1
- data/lib/puppet/type/mount.rb +29 -2
- data/lib/puppet/type/package.rb +31 -11
- data/lib/puppet/type/schedule.rb +5 -5
- data/lib/puppet/type/scheduled_task.rb +13 -0
- data/lib/puppet/type/service.rb +24 -0
- data/lib/puppet/type/sshkey.rb +5 -3
- data/lib/puppet/type/stage.rb +1 -1
- data/lib/puppet/type/tidy.rb +6 -4
- data/lib/puppet/type/user.rb +55 -19
- data/lib/puppet/type/yumrepo.rb +25 -5
- data/lib/puppet/type/zone.rb +5 -5
- data/lib/puppet/type.rb +95 -18
- data/lib/puppet/util/autoload.rb +16 -11
- data/lib/puppet/util/checksums.rb +74 -31
- data/lib/puppet/util/command_line.rb +4 -0
- data/lib/puppet/util/execution.rb +21 -5
- data/lib/puppet/util/feature.rb +1 -1
- data/lib/puppet/util/http_proxy.rb +132 -0
- data/lib/puppet/util/log/destinations.rb +23 -2
- data/lib/puppet/util/log.rb +53 -9
- data/lib/puppet/util/logging.rb +80 -2
- data/lib/puppet/util/monkey_patches.rb +20 -7
- data/lib/puppet/util/multi_match.rb +51 -0
- data/lib/puppet/util/network_device/cisco/device.rb +24 -6
- data/lib/puppet/util/network_device/cisco/interface.rb +21 -9
- data/lib/puppet/util/network_device/transport/ssh.rb +7 -3
- data/lib/puppet/util/network_device/transport/telnet.rb +39 -36
- data/lib/puppet/util/plist.rb +130 -0
- data/lib/puppet/util/resource_template.rb +1 -1
- data/lib/puppet/util/run_mode.rb +3 -16
- data/lib/puppet/util/skip_tags.rb +9 -0
- data/lib/puppet/util/splayer.rb +18 -0
- data/lib/puppet/util/tagging.rb +7 -1
- data/lib/puppet/util/windows/access_control_entry.rb +1 -1
- data/lib/puppet/util/windows/access_control_list.rb +3 -3
- data/lib/puppet/util/windows/adsi.rb +186 -74
- data/lib/puppet/util/windows/api_types.rb +24 -18
- data/lib/puppet/util/windows/com.rb +3 -3
- data/lib/puppet/util/windows/error.rb +1 -1
- data/lib/puppet/util/windows/file.rb +48 -18
- data/lib/puppet/util/windows/principal.rb +190 -0
- data/lib/puppet/util/windows/process.rb +78 -11
- data/lib/puppet/util/windows/registry.rb +22 -16
- data/lib/puppet/util/windows/root_certs.rb +5 -5
- data/lib/puppet/util/windows/security.rb +37 -36
- data/lib/puppet/util/windows/security_descriptor.rb +1 -1
- data/lib/puppet/util/windows/sid.rb +84 -15
- data/lib/puppet/util/windows/taskscheduler.rb +16 -16
- data/lib/puppet/util/windows/user.rb +10 -10
- data/lib/puppet/util/windows.rb +5 -0
- data/lib/puppet/util.rb +123 -23
- data/lib/puppet/vendor/deep_merge/deep_merge.gemspec +1 -1
- data/lib/puppet/vendor/pathspec/LICENSE +2 -2
- data/lib/puppet/vendor/pathspec/README.md +1 -1
- data/lib/puppet/vendor/rgen/README.rdoc +1 -1
- data/lib/puppet/vendor/semantic/lib/semantic/dependency/module_release.rb +14 -0
- data/lib/puppet/version.rb +1 -1
- data/lib/puppet.rb +30 -1
- data/lib/semver.rb +17 -1
- data/man/man5/puppet.conf.5 +60 -18
- data/man/man8/extlookup2hiera.8 +2 -2
- data/man/man8/puppet-agent.8 +6 -3
- data/man/man8/puppet-apply.8 +6 -3
- data/man/man8/puppet-ca.8 +3 -3
- data/man/man8/puppet-catalog.8 +3 -3
- data/man/man8/puppet-cert.8 +3 -3
- data/man/man8/puppet-certificate.8 +3 -3
- data/man/man8/puppet-certificate_request.8 +3 -3
- data/man/man8/puppet-certificate_revocation_list.8 +3 -3
- data/man/man8/puppet-config.8 +4 -4
- data/man/man8/puppet-describe.8 +2 -2
- data/man/man8/puppet-device.8 +7 -4
- data/man/man8/puppet-doc.8 +2 -2
- data/man/man8/puppet-epp.8 +3 -3
- data/man/man8/puppet-facts.8 +3 -3
- data/man/man8/puppet-file.8 +3 -3
- data/man/man8/puppet-filebucket.8 +3 -3
- data/man/man8/puppet-help.8 +3 -3
- data/man/man8/puppet-inspect.8 +3 -3
- data/man/man8/puppet-key.8 +3 -3
- data/man/man8/puppet-man.8 +3 -3
- data/man/man8/puppet-master.8 +6 -3
- data/man/man8/puppet-module.8 +10 -10
- data/man/man8/puppet-node.8 +3 -3
- data/man/man8/puppet-parser.8 +3 -3
- data/man/man8/puppet-plugin.8 +3 -3
- data/man/man8/puppet-report.8 +3 -3
- data/man/man8/puppet-resource.8 +3 -3
- data/man/man8/puppet-resource_type.8 +3 -3
- data/man/man8/puppet-status.8 +4 -4
- data/man/man8/puppet.8 +2 -2
- data/spec/fixtures/module.tar.gz +0 -0
- data/spec/fixtures/unit/application/environments/production/data/common.yaml +20 -0
- data/spec/fixtures/unit/application/environments/production/environment.conf +1 -0
- data/spec/fixtures/unit/application/environments/production/manifests/site.pp +1 -0
- data/spec/fixtures/unit/application/environments/puppet_func_provider/environment.conf +1 -0
- data/spec/fixtures/unit/application/environments/puppet_func_provider/functions/data.pp +10 -0
- data/spec/fixtures/unit/application/environments/puppet_func_provider/manifests/site.pp +1 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_bad_syntax_json/data/bad.json +3 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_bad_syntax_json/environment.conf +2 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_bad_syntax_json/hiera.yaml +5 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_bad_syntax_json/manifests/site.pp +5 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_bad_syntax_yaml/data/bad.yaml +3 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_bad_syntax_yaml/environment.conf +2 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_bad_syntax_yaml/hiera.yaml +5 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_bad_syntax_yaml/manifests/site.pp +5 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_defaults/data/common.yaml +2 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_defaults/environment.conf +2 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_defaults/manifests/site.pp +1 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_defaults/modules/one/data/common.yaml +2 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_defaults/modules/one/manifests/init.pp +5 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_defaults/modules/one/metadata.json +9 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_env_config/data1/first.json +3 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_env_config/data1/name.yaml +2 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_env_config/data1/second.json +3 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_env_config/data1/single.yaml +2 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_env_config/data1/third_utf8.json +3 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_env_config/data1/utf8.yaml +3 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_env_config/data2/single.yaml +2 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_env_config/environment.conf +2 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_env_config/hiera.yaml +22 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_env_config/manifests/site.pp +5 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_misc/data/common.yaml +46 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_misc/environment.conf +2 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_misc/manifests/site.pp +1 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_misc/modules/one/data/common.yaml +30 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_misc/modules/one/manifests/init.pp +13 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_misc/modules/one/metadata.json +9 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_module_config/data/common.yaml +4 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_module_config/data/specific.yaml +4 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_module_config/environment.conf +2 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_module_config/hiera.yaml +7 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_module_config/manifests/site.pp +1 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_module_config/modules/one/data1/first.json +3 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_module_config/modules/one/data1/name.yaml +1 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_module_config/modules/one/data1/second.json +3 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_module_config/modules/one/data1/single.yaml +2 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_module_config/modules/one/data2/single.yaml +2 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_module_config/modules/one/hiera.yaml +18 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_module_config/modules/one/manifests/init.pp +5 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_module_config/modules/one/metadata.json +9 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_modules/data/common.yaml +4 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_modules/data/specific.yaml +4 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_modules/environment.conf +2 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_modules/hiera.yaml +7 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_modules/manifests/site.pp +1 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_modules/modules/one/data/common.yaml +6 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_modules/modules/one/hiera.yaml +5 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_modules/modules/one/manifests/init.pp +2 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_modules/modules/one/metadata.json +9 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_modules/modules/two/data/common.yaml +4 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_modules/modules/two/hiera.yaml +5 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_modules/modules/two/manifests/init.pp +3 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_modules/modules/two/metadata.json +9 -0
- data/spec/fixtures/unit/data_providers/environments/production/lib/puppet/functions/environment/data.rb +3 -1
- data/spec/fixtures/unit/data_providers/environments/production/modules/abc/lib/puppet/functions/abc/data.rb +2 -1
- data/spec/fixtures/unit/data_providers/environments/production/modules/abc/manifests/init.pp +2 -1
- data/spec/fixtures/unit/data_providers/environments/production/modules/xyz/functions/data.pp +6 -0
- data/spec/fixtures/unit/data_providers/environments/production/modules/xyz/lib/puppet/bindings/xyz/default.rb +9 -0
- data/spec/fixtures/unit/data_providers/environments/production/modules/xyz/manifests/init.pp +9 -0
- data/spec/fixtures/unit/data_providers/environments/sample/modules/dataprovider/lib/puppet_x/helindbe/sample_env_data.rb +1 -0
- data/spec/fixtures/unit/data_providers/environments/sample/modules/dataprovider/lib/puppet_x/helindbe/sample_module_data.rb +1 -0
- data/spec/fixtures/unit/functions/lookup/environments/production/modules/bad_data/lib/puppet/functions/bad_data/data.rb +1 -0
- data/spec/fixtures/unit/functions/lookup/environments/production/modules/bad_data/manifests/init.pp +0 -1
- data/spec/fixtures/unit/functions/lookup/environments/production/modules/empty_json/data/empty.json +0 -0
- data/spec/fixtures/unit/functions/lookup/environments/production/modules/empty_json/hiera.yaml +5 -0
- data/spec/fixtures/unit/functions/lookup/environments/production/modules/empty_json/manifests/init.pp +2 -0
- data/spec/fixtures/unit/functions/lookup/environments/production/modules/empty_json/metadata.json +9 -0
- data/spec/fixtures/unit/functions/lookup/environments/production/modules/empty_key_json/data/empty_key.json +1 -0
- data/spec/fixtures/unit/functions/lookup/environments/production/modules/empty_key_json/hiera.yaml +5 -0
- data/spec/fixtures/unit/functions/lookup/environments/production/modules/empty_key_json/manifests/init.pp +2 -0
- data/spec/fixtures/unit/functions/lookup/environments/production/modules/empty_key_json/metadata.json +9 -0
- data/spec/fixtures/unit/functions/lookup/environments/production/modules/empty_key_yaml/data/empty_key.yaml +1 -0
- data/spec/fixtures/unit/functions/lookup/environments/production/modules/empty_key_yaml/hiera.yaml +5 -0
- data/spec/fixtures/unit/functions/lookup/environments/production/modules/empty_key_yaml/manifests/init.pp +2 -0
- data/spec/fixtures/unit/functions/lookup/environments/production/modules/empty_key_yaml/metadata.json +9 -0
- data/spec/fixtures/unit/functions/lookup/environments/production/modules/empty_yaml/data/empty.yaml +2 -0
- data/spec/fixtures/unit/functions/lookup/environments/production/modules/empty_yaml/hiera.yaml +5 -0
- data/spec/fixtures/unit/functions/lookup/environments/production/modules/empty_yaml/manifests/init.pp +2 -0
- data/spec/fixtures/unit/functions/lookup/environments/production/modules/empty_yaml/metadata.json +9 -0
- data/spec/fixtures/unit/functions/lookup/environments/production/modules/hieraprovider/data/first.json +4 -0
- data/spec/fixtures/unit/functions/lookup/environments/production/modules/hieraprovider/hiera.yaml +8 -0
- data/spec/fixtures/unit/functions/lookup/environments/production/modules/hieraprovider/manifests/init.pp +5 -0
- data/spec/fixtures/unit/functions/lookup/environments/production/modules/hieraprovider/metadata.json +9 -0
- data/spec/fixtures/unit/functions/lookup/environments/production/modules/meta/lib/puppet/functions/meta/data.rb +9 -0
- data/spec/fixtures/unit/functions/lookup/environments/production/modules/meta/manifests/init.pp +3 -0
- data/spec/fixtures/unit/functions/lookup/environments/production/modules/meta/metadata.json +9 -0
- data/spec/fixtures/unit/functions/lookup/environments/production/modules/metawcp/lib/puppet/bindings/metawcp/default.rb +10 -0
- data/spec/fixtures/unit/functions/lookup/environments/production/modules/metawcp/lib/puppet_x/thallgren/sample_module_data.rb +23 -0
- data/spec/fixtures/unit/functions/lookup/environments/production/modules/metawcp/manifests/init.pp +3 -0
- data/spec/fixtures/unit/functions/lookup/environments/production/modules/metawcp/metadata.json +9 -0
- data/spec/fixtures/unit/module/trailing-comma.json +1 -1
- data/spec/fixtures/unit/parser/lexer/subclass_name_duplication.pp +0 -0
- data/spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/usee/functions/usee_puppet.pp +3 -0
- data/spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/usee/lib/puppet/functions/usee/usee_ruby.rb +6 -0
- data/spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/usee/lib/puppet/type/usee_type.rb +5 -0
- data/spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/usee/manifests/init.pp +8 -0
- data/spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/usee/types/zero.pp +1 -0
- data/spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/usee2/lib/puppet/functions/usee2/callee.rb +5 -0
- data/spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/user/functions/puppet_calling_puppet.pp +5 -0
- data/spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/user/functions/puppet_calling_puppet_init.pp +5 -0
- data/spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/user/functions/puppet_calling_ruby.pp +5 -0
- data/spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/user/lib/puppet/functions/user/caller2.rb +5 -0
- data/spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/user/lib/puppet/functions/user/ruby_calling_puppet.rb +5 -0
- data/spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/user/lib/puppet/functions/user/ruby_calling_puppet_init.rb +5 -0
- data/spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/user/lib/puppet/functions/user/ruby_calling_ruby.rb +5 -0
- data/spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/user/manifests/init.pp +87 -0
- data/spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/{user → modules/user}/metadata.json +2 -1
- data/spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/user/types/withuseeone.pp +1 -0
- data/spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/user/types/withuseezero.pp +1 -0
- data/spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/user/functions/puppetcalled.pp +3 -0
- data/spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/user/functions/puppetcaller.pp +3 -0
- data/spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/user/functions/puppetcaller4.pp +3 -0
- data/spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/user/lib/puppet/functions/user/callingpuppet.rb +5 -0
- data/spec/fixtures/unit/pops/loaders/loaders/module_no_lib/modules/modulea/functions/hello.pp +3 -0
- data/spec/fixtures/unit/pops/loaders/loaders/module_no_lib/modules/modulea/manifests/init.pp +3 -0
- data/spec/fixtures/unit/pops/loaders/loaders/module_no_lib/modules/modulea/metadata.json +10 -0
- data/spec/fixtures/unit/pops/loaders/loaders/single_module/modules/modulea/functions/hello.pp +3 -0
- data/spec/fixtures/unit/pops/loaders/loaders/single_module/modules/modulea/functions/subspace/hello.pp +3 -0
- data/spec/fixtures/unit/pops/loaders/loaders/single_module/modules/modulea/metadata.json +1 -10
- data/spec/fixtures/unit/pops/parser/lexer/subclass_name_duplication.pp +0 -0
- data/spec/fixtures/unit/provider/mount/parsed/aix.filesystems +93 -85
- data/spec/fixtures/unit/provider/mount/parsed/aix.mount +11 -7
- data/spec/fixtures/unit/provider/package/pkgng/pkg.info +8 -0
- data/spec/fixtures/unit/provider/package/pkgng/pkg.query +1 -0
- data/spec/fixtures/unit/provider/package/pkgng/pkg.query_absent +1 -0
- data/spec/fixtures/unit/provider/package/pkgng/pkg.version +3 -0
- data/spec/fixtures/unit/provider/package/yum/yum-check-update-broken-notices.txt +187 -0
- data/spec/fixtures/unit/provider/package/yum/yum-check-update-obsoletes.txt +195 -0
- data/spec/fixtures/unit/provider/package/yum/yum-check-update-security.txt +184 -0
- data/spec/fixtures/unit/provider/package/zypper/zypper-list-updates-empty.out +3 -0
- data/spec/fixtures/unit/provider/service/smf/svcs.out +4 -3
- data/spec/fixtures/unit/provider/sshkey/parsed/sample_with_blank_lines +8 -0
- data/spec/fixtures/vcr/cassettes/Puppet_Network_HTTP_Connection/when_handling_requests/_request_get/should_yield_to_the_block.yml +24 -0
- data/spec/fixtures/vcr/cassettes/Puppet_Network_HTTP_Connection/when_handling_requests/_request_head/should_yield_to_the_block.yml +24 -0
- data/spec/fixtures/vcr/cassettes/Puppet_Network_HTTP_Connection/when_handling_requests/_request_post/should_yield_to_the_block.yml +24 -0
- data/spec/fixtures/vcr/cassettes/Puppet_Type_File/when_sourcing/from_http/using_md5/should_fetch_if_not_on_the_local_disk.yml +205 -0
- data/spec/fixtures/vcr/cassettes/Puppet_Type_File/when_sourcing/from_http/using_md5/should_not_update_if_content_on_disk_is_up-to-date.yml +213 -0
- data/spec/fixtures/vcr/cassettes/Puppet_Type_File/when_sourcing/from_http/using_md5/should_update_if_content_differs_on_disk.yml +213 -0
- data/spec/fixtures/vcr/cassettes/Puppet_Type_File/when_sourcing/from_http/using_mtime/should_fetch_if_mtime_is_older_on_disk.yml +205 -0
- data/spec/fixtures/vcr/cassettes/Puppet_Type_File/when_sourcing/from_http/using_mtime/should_fetch_if_no_header_specified.yml +197 -0
- data/spec/fixtures/vcr/cassettes/Puppet_Type_File/when_sourcing/from_http/using_mtime/should_fetch_if_not_on_the_local_disk.yml +205 -0
- data/spec/fixtures/vcr/cassettes/Puppet_Type_File/when_sourcing/from_http/using_mtime/should_not_update_if_mtime_is_newer_on_disk.yml +205 -0
- data/spec/integration/agent/logging_spec.rb +0 -0
- data/spec/integration/application/apply_spec.rb +121 -30
- data/spec/integration/application/doc_spec.rb +0 -0
- data/spec/integration/configurer_spec.rb +0 -0
- data/spec/integration/data_binding_spec.rb +195 -0
- data/spec/integration/defaults_spec.rb +14 -2
- data/spec/integration/faces/ca_spec.rb +0 -0
- data/spec/integration/faces/documentation_spec.rb +0 -0
- data/spec/integration/faces/plugin_spec.rb +0 -4
- data/spec/integration/file_bucket/file_spec.rb +2 -2
- data/spec/integration/file_serving/fileset_spec.rb +0 -0
- data/spec/integration/file_serving/terminus_helper_spec.rb +0 -0
- data/spec/integration/file_system/uniquefile_spec.rb +29 -0
- data/spec/integration/indirector/catalog/compiler_spec.rb +0 -0
- data/spec/integration/indirector/direct_file_server_spec.rb +0 -0
- data/spec/integration/indirector/facts/facter_spec.rb +97 -0
- data/spec/integration/indirector/file_content/file_server_spec.rb +0 -0
- data/spec/integration/indirector/file_metadata/file_server_spec.rb +0 -0
- data/spec/integration/indirector/node/ldap_spec.rb +0 -0
- data/spec/integration/module_tool/tar/mini_spec.rb +28 -0
- data/spec/integration/network/formats_spec.rb +0 -0
- data/spec/integration/node/environment_spec.rb +13 -0
- data/spec/integration/node/facts_spec.rb +0 -0
- data/spec/integration/node_spec.rb +0 -0
- data/spec/integration/parser/catalog_spec.rb +14 -2
- data/spec/integration/parser/collection_spec.rb +8 -0
- data/spec/integration/parser/compiler_spec.rb +949 -2
- data/spec/integration/parser/dynamic_scoping_spec.rb +67 -0
- data/spec/integration/parser/functions/require_spec.rb +0 -0
- data/spec/integration/parser/parameter_defaults_spec.rb +354 -0
- data/spec/integration/parser/resource_expressions_spec.rb +8 -5
- data/spec/integration/parser/scope_spec.rb +46 -7
- data/spec/integration/parser/undef_param_spec.rb +9 -1
- data/spec/integration/provider/mailalias/aliases_spec.rb +0 -0
- data/spec/integration/provider/mount_spec.rb +23 -36
- data/spec/integration/provider/service/init_spec.rb +0 -0
- data/spec/integration/provider/ssh_authorized_key_spec.rb +0 -0
- data/spec/integration/provider/yumrepo_spec.rb +1 -1
- data/spec/integration/reference/providers_spec.rb +0 -0
- data/spec/integration/reports_spec.rb +0 -0
- data/spec/integration/resource/catalog_spec.rb +1 -1
- data/spec/integration/resource/type_collection_spec.rb +8 -0
- data/spec/integration/ssl/certificate_authority_spec.rb +0 -1
- data/spec/integration/ssl/certificate_request_spec.rb +0 -1
- data/spec/integration/ssl/certificate_revocation_list_spec.rb +0 -1
- data/spec/integration/ssl/host_spec.rb +0 -1
- data/spec/integration/test/test_helper_spec.rb +28 -0
- data/spec/integration/transaction/report_spec.rb +16 -0
- data/spec/integration/transaction_spec.rb +52 -2
- data/spec/integration/type/exec_spec.rb +0 -0
- data/spec/integration/type/file_spec.rb +548 -45
- data/spec/integration/type/package_spec.rb +72 -1
- data/spec/integration/type/tidy_spec.rb +21 -9
- data/spec/integration/type_spec.rb +0 -0
- data/spec/integration/util/autoload_spec.rb +0 -0
- data/spec/integration/util/execution_spec.rb +22 -0
- data/spec/integration/util/rdoc/parser_spec.rb +1 -1
- data/spec/integration/util/settings_spec.rb +26 -0
- data/spec/integration/util/windows/principal_spec.rb +201 -0
- data/spec/integration/util/windows/process_spec.rb +31 -0
- data/spec/{unit → integration}/util/windows/registry_spec.rb +91 -1
- data/spec/integration/util/windows/security_spec.rb +40 -13
- data/spec/integration/util/windows/user_spec.rb +1 -1
- data/spec/integration/util_spec.rb +49 -27
- data/spec/lib/matchers/include_in_order.rb +2 -3
- data/spec/lib/matchers/resource.rb +22 -1
- data/spec/lib/puppet/face/1.0.0/huzzah.rb +0 -0
- data/spec/lib/puppet/face/basetest.rb +0 -0
- data/spec/lib/puppet/face/huzzah.rb +0 -0
- data/spec/lib/puppet_spec/compiler.rb +27 -3
- data/spec/lib/puppet_spec/files.rb +16 -2
- data/spec/lib/puppet_spec/fixtures.rb +0 -0
- data/spec/lib/puppet_spec/matchers.rb +6 -4
- data/spec/lib/puppet_spec/pops.rb +13 -0
- data/spec/lib/puppet_spec/verbose.rb +0 -0
- data/spec/shared_behaviours/all_parsedfile_providers.rb +0 -0
- data/spec/shared_behaviours/file_server_terminus.rb +0 -0
- data/spec/shared_behaviours/file_serving.rb +0 -0
- data/spec/shared_behaviours/iterative_functions.rb +9 -9
- data/spec/shared_behaviours/memory_terminus.rb +0 -0
- data/spec/shared_behaviours/path_parameters.rb +0 -0
- data/spec/shared_behaviours/things_that_declare_options.rb +0 -0
- data/spec/shared_contexts/types_setup.rb +100 -0
- data/spec/spec_helper.rb +7 -0
- data/spec/unit/agent/locker_spec.rb +4 -4
- data/spec/unit/agent_spec.rb +1 -46
- data/spec/unit/application/agent_spec.rb +15 -0
- data/spec/unit/application/apply_spec.rb +31 -1
- data/spec/unit/application/cert_spec.rb +0 -0
- data/spec/unit/application/certificate_spec.rb +0 -0
- data/spec/unit/application/config_spec.rb +0 -0
- data/spec/unit/application/describe_spec.rb +0 -0
- data/spec/unit/application/device_spec.rb +0 -0
- data/spec/unit/application/doc_spec.rb +0 -0
- data/spec/unit/application/face_base_spec.rb +0 -0
- data/spec/unit/application/facts_spec.rb +0 -0
- data/spec/unit/application/filebucket_spec.rb +88 -2
- data/spec/unit/application/indirection_base_spec.rb +0 -0
- data/spec/unit/application/inspect_spec.rb +19 -8
- data/spec/unit/application/lookup_spec.rb +387 -0
- data/spec/unit/application/master_spec.rb +33 -7
- data/spec/unit/application/resource_spec.rb +0 -0
- data/spec/unit/application_spec.rb +3 -3
- data/spec/unit/appmgmt_spec.rb +666 -0
- data/spec/unit/capability_spec.rb +394 -0
- data/spec/unit/configurer/downloader_factory_spec.rb +0 -0
- data/spec/unit/configurer/downloader_spec.rb +5 -5
- data/spec/unit/configurer/fact_handler_spec.rb +0 -0
- data/spec/unit/configurer/plugin_handler_spec.rb +42 -13
- data/spec/unit/configurer_spec.rb +282 -39
- data/spec/unit/confine/exists_spec.rb +0 -0
- data/spec/unit/confine/false_spec.rb +0 -0
- data/spec/unit/confine/feature_spec.rb +0 -0
- data/spec/unit/confine/true_spec.rb +0 -0
- data/spec/unit/confine/variable_spec.rb +0 -0
- data/spec/unit/confine_collection_spec.rb +0 -0
- data/spec/unit/confine_spec.rb +0 -0
- data/spec/unit/confiner_spec.rb +0 -0
- data/spec/unit/context/trusted_information_spec.rb +24 -1
- data/spec/unit/daemon_spec.rb +18 -8
- data/spec/unit/data_providers/function_data_provider_spec.rb +28 -1
- data/spec/unit/data_providers/hiera_data_provider_spec.rb +378 -0
- data/spec/unit/defaults_spec.rb +33 -0
- data/spec/unit/environments_spec.rb +26 -4
- data/spec/unit/external/pson_spec.rb +0 -0
- data/spec/unit/face/catalog_spec.rb +0 -0
- data/spec/unit/face/certificate_spec.rb +0 -0
- data/spec/unit/face/config_spec.rb +0 -0
- data/spec/unit/face/epp_face_spec.rb +2 -2
- data/spec/unit/face/facts_spec.rb +0 -0
- data/spec/unit/face/file_spec.rb +0 -0
- data/spec/unit/face/help_spec.rb +0 -0
- data/spec/unit/face/node_spec.rb +1 -1
- data/spec/unit/face/parser_spec.rb +43 -2
- data/spec/unit/face/plugin_spec.rb +33 -4
- data/spec/unit/face_spec.rb +0 -0
- data/spec/unit/file_bucket/dipper_spec.rb +210 -1
- data/spec/unit/file_bucket/file_spec.rb +0 -0
- data/spec/unit/file_serving/base_spec.rb +0 -0
- data/spec/unit/file_serving/configuration/parser_spec.rb +25 -30
- data/spec/unit/file_serving/configuration_spec.rb +1 -1
- data/spec/unit/file_serving/content_spec.rb +0 -0
- data/spec/unit/file_serving/fileset_spec.rb +0 -0
- data/spec/unit/file_serving/http_metadata_spec.rb +85 -0
- data/spec/unit/file_serving/metadata_spec.rb +51 -1
- data/spec/unit/file_serving/mount/file_spec.rb +0 -0
- data/spec/unit/file_serving/mount/modules_spec.rb +0 -0
- data/spec/unit/file_serving/mount/pluginfacts_spec.rb +0 -0
- data/spec/unit/file_serving/mount/plugins_spec.rb +0 -0
- data/spec/unit/file_serving/mount_spec.rb +0 -0
- data/spec/unit/file_serving/terminus_helper_spec.rb +2 -3
- data/spec/unit/file_serving/terminus_selector_spec.rb +12 -2
- data/spec/unit/file_system/uniquefile_spec.rb +20 -0
- data/spec/unit/file_system_spec.rb +145 -0
- data/spec/unit/functions/assert_type_spec.rb +48 -8
- data/spec/unit/functions/defined_spec.rb +289 -0
- data/spec/unit/functions/dig_spec.rb +58 -0
- data/spec/unit/functions/epp_spec.rb +17 -9
- data/spec/unit/functions/filter_spec.rb +18 -0
- data/spec/unit/functions/hiera_spec.rb +10 -8
- data/spec/unit/functions/inline_epp_spec.rb +4 -4
- data/spec/unit/functions/lest_spec.rb +34 -0
- data/spec/unit/functions/lookup_spec.rb +391 -22
- data/spec/unit/functions/new_spec.rb +543 -0
- data/spec/unit/functions/regsubst_spec.rb +29 -8
- data/spec/unit/functions/reverse_each_spec.rb +108 -0
- data/spec/unit/functions/scanf_spec.rb +1 -1
- data/spec/unit/functions/split_spec.rb +10 -2
- data/spec/unit/functions/step_spec.rb +113 -0
- data/spec/unit/functions/then_spec.rb +40 -0
- data/spec/unit/functions/type_spec.rb +35 -0
- data/spec/unit/functions/versioncmp_spec.rb +36 -0
- data/spec/unit/functions4_spec.rb +275 -70
- data/spec/unit/graph/relationship_graph_spec.rb +0 -0
- data/spec/unit/graph/sequential_prioritizer_spec.rb +1 -1
- data/spec/unit/graph/simple_graph_spec.rb +0 -0
- data/spec/unit/hiera/scope_spec.rb +5 -2
- data/spec/unit/hiera_puppet_spec.rb +49 -8
- data/spec/unit/indirector/catalog/compiler_spec.rb +752 -8
- data/spec/unit/indirector/catalog/json_spec.rb +0 -0
- data/spec/unit/indirector/catalog/msgpack_spec.rb +0 -0
- data/spec/unit/indirector/catalog/rest_spec.rb +0 -0
- data/spec/unit/indirector/catalog/static_compiler_spec.rb +38 -20
- data/spec/unit/indirector/catalog/store_configs_spec.rb +0 -0
- data/spec/unit/indirector/catalog/yaml_spec.rb +0 -0
- data/spec/unit/indirector/certificate/ca_spec.rb +0 -0
- data/spec/unit/indirector/certificate/disabled_ca_spec.rb +0 -0
- data/spec/unit/indirector/certificate/file_spec.rb +0 -0
- data/spec/unit/indirector/certificate/rest_spec.rb +0 -0
- data/spec/unit/indirector/certificate_request/ca_spec.rb +0 -0
- data/spec/unit/indirector/certificate_request/disabled_ca_spec.rb +0 -0
- data/spec/unit/indirector/certificate_request/file_spec.rb +0 -0
- data/spec/unit/indirector/certificate_request/rest_spec.rb +0 -0
- data/spec/unit/indirector/certificate_revocation_list/ca_spec.rb +0 -0
- data/spec/unit/indirector/certificate_revocation_list/disabled_ca_spec.rb +0 -0
- data/spec/unit/indirector/certificate_revocation_list/file_spec.rb +0 -0
- data/spec/unit/indirector/certificate_revocation_list/rest_spec.rb +0 -0
- data/spec/unit/indirector/certificate_status/file_spec.rb +0 -0
- data/spec/unit/indirector/certificate_status/rest_spec.rb +0 -0
- data/spec/unit/indirector/code_spec.rb +0 -0
- data/spec/unit/indirector/data_binding/none_spec.rb +2 -2
- data/spec/unit/indirector/direct_file_server_spec.rb +0 -0
- data/spec/unit/indirector/envelope_spec.rb +0 -0
- data/spec/unit/indirector/exec_spec.rb +0 -0
- data/spec/unit/indirector/face_spec.rb +0 -0
- data/spec/unit/indirector/facts/facter_spec.rb +8 -0
- data/spec/unit/indirector/facts/network_device_spec.rb +0 -0
- data/spec/unit/indirector/facts/store_configs_spec.rb +0 -0
- data/spec/unit/indirector/facts/yaml_spec.rb +0 -0
- data/spec/unit/indirector/file_bucket_file/file_spec.rb +53 -2
- data/spec/unit/indirector/file_bucket_file/rest_spec.rb +0 -0
- data/spec/unit/indirector/file_content/file_server_spec.rb +0 -0
- data/spec/unit/indirector/file_content/file_spec.rb +0 -0
- data/spec/unit/indirector/file_content/rest_spec.rb +0 -0
- data/spec/unit/indirector/file_metadata/file_server_spec.rb +0 -0
- data/spec/unit/indirector/file_metadata/file_spec.rb +0 -0
- data/spec/unit/indirector/file_metadata/rest_spec.rb +0 -0
- data/spec/unit/indirector/file_server_spec.rb +0 -0
- data/spec/unit/indirector/indirection_spec.rb +13 -2
- data/spec/unit/indirector/json_spec.rb +1 -1
- data/spec/unit/indirector/key/ca_spec.rb +0 -0
- data/spec/unit/indirector/key/disabled_ca_spec.rb +0 -0
- data/spec/unit/indirector/key/file_spec.rb +0 -0
- data/spec/unit/indirector/ldap_spec.rb +0 -0
- data/spec/unit/indirector/memory_spec.rb +0 -0
- data/spec/unit/indirector/msgpack_spec.rb +11 -1
- data/spec/unit/indirector/node/exec_spec.rb +0 -0
- data/spec/unit/indirector/node/ldap_spec.rb +0 -0
- data/spec/unit/indirector/node/memory_spec.rb +0 -0
- data/spec/unit/indirector/node/msgpack_spec.rb +0 -0
- data/spec/unit/indirector/node/plain_spec.rb +0 -0
- data/spec/unit/indirector/node/rest_spec.rb +0 -0
- data/spec/unit/indirector/node/store_configs_spec.rb +0 -0
- data/spec/unit/indirector/node/yaml_spec.rb +0 -0
- data/spec/unit/indirector/plain_spec.rb +0 -0
- data/spec/unit/indirector/report/msgpack_spec.rb +0 -0
- data/spec/unit/indirector/report/processor_spec.rb +0 -0
- data/spec/unit/indirector/report/rest_spec.rb +0 -0
- data/spec/unit/indirector/report/yaml_spec.rb +0 -0
- data/spec/unit/indirector/request_spec.rb +8 -8
- data/spec/unit/indirector/resource/ral_spec.rb +0 -0
- data/spec/unit/indirector/resource/store_configs_spec.rb +0 -0
- data/spec/unit/indirector/resource_type/parser_spec.rb +5 -0
- data/spec/unit/indirector/resource_type/rest_spec.rb +0 -0
- data/spec/unit/indirector/rest_spec.rb +12 -0
- data/spec/unit/indirector/ssl_file_spec.rb +1 -1
- data/spec/unit/indirector/status/rest_spec.rb +0 -0
- data/spec/unit/indirector/store_configs_spec.rb +0 -0
- data/spec/unit/indirector/terminus_spec.rb +0 -0
- data/spec/unit/indirector/yaml_spec.rb +1 -1
- data/spec/unit/indirector_spec.rb +0 -0
- data/spec/unit/info_service_spec.rb +298 -0
- data/spec/unit/interface/action_builder_spec.rb +0 -0
- data/spec/unit/interface/action_manager_spec.rb +0 -0
- data/spec/unit/interface/action_spec.rb +0 -0
- data/spec/unit/interface/documentation_spec.rb +0 -0
- data/spec/unit/interface/face_collection_spec.rb +0 -0
- data/spec/unit/interface/option_builder_spec.rb +0 -0
- data/spec/unit/interface/option_spec.rb +0 -0
- data/spec/unit/interface_spec.rb +0 -0
- data/spec/unit/man_spec.rb +0 -0
- data/spec/unit/module_spec.rb +42 -27
- data/spec/unit/module_tool/application_spec.rb +1 -1
- data/spec/unit/module_tool/applications/builder_spec.rb +28 -8
- data/spec/unit/module_tool/metadata_spec.rb +31 -2
- data/spec/unit/module_tool_spec.rb +0 -0
- data/spec/unit/network/auth_config_parser_spec.rb +16 -0
- data/spec/unit/network/authconfig_spec.rb +62 -32
- data/spec/unit/network/authorization_spec.rb +30 -2
- data/spec/unit/network/authstore_spec.rb +2 -2
- data/spec/unit/network/format_handler_spec.rb +0 -0
- data/spec/unit/network/format_spec.rb +0 -0
- data/spec/unit/network/formats_spec.rb +0 -0
- data/spec/unit/network/http/api/indirected_routes_spec.rb +21 -13
- data/spec/unit/network/http/api/master/v3/environment_spec.rb +60 -0
- data/spec/unit/network/http/api/master/v3_spec.rb +0 -0
- data/spec/unit/network/http/compression_spec.rb +1 -1
- data/spec/unit/network/http/connection_spec.rb +15 -19
- data/spec/unit/network/http/factory_spec.rb +14 -0
- data/spec/unit/network/http/handler_spec.rb +0 -5
- data/spec/unit/network/http/nocache_pool_spec.rb +0 -0
- data/spec/unit/network/http/pool_spec.rb +30 -0
- data/spec/unit/network/http/rack/rest_spec.rb +7 -0
- data/spec/unit/network/http/rack_spec.rb +0 -0
- data/spec/unit/network/http/session_spec.rb +0 -0
- data/spec/unit/network/http/site_spec.rb +0 -0
- data/spec/unit/network/http/webrick/rest_spec.rb +0 -0
- data/spec/unit/network/http/webrick_spec.rb +0 -0
- data/spec/unit/network/http_pool_spec.rb +0 -0
- data/spec/unit/network/http_spec.rb +0 -0
- data/spec/unit/network/resolver_spec.rb +0 -0
- data/spec/unit/network/rights_spec.rb +3 -3
- data/spec/unit/network/server_spec.rb +0 -0
- data/spec/unit/node/environment_spec.rb +10 -0
- data/spec/unit/node/facts_spec.rb +0 -0
- data/spec/unit/node_spec.rb +41 -0
- data/spec/unit/other/selinux_spec.rb +0 -0
- data/spec/unit/parameter/path_spec.rb +0 -0
- data/spec/unit/parameter/value_collection_spec.rb +0 -0
- data/spec/unit/parameter/value_spec.rb +0 -0
- data/spec/unit/parameter_spec.rb +0 -0
- data/spec/unit/parser/ast/leaf_spec.rb +1 -1
- data/spec/unit/parser/compiler_spec.rb +103 -2
- data/spec/unit/parser/files_spec.rb +0 -0
- data/spec/unit/parser/functions/create_resources_spec.rb +2 -2
- data/spec/unit/parser/functions/defined_spec.rb +0 -0
- data/spec/unit/parser/functions/digest_spec.rb +0 -0
- data/spec/unit/parser/functions/fail_spec.rb +0 -0
- data/spec/unit/parser/functions/file_spec.rb +7 -1
- data/spec/unit/parser/functions/fqdn_rand_spec.rb +6 -2
- data/spec/unit/parser/functions/generate_spec.rb +3 -12
- data/spec/unit/parser/functions/hiera_spec.rb +0 -0
- data/spec/unit/parser/functions/include_spec.rb +0 -0
- data/spec/unit/parser/functions/inline_template_spec.rb +0 -0
- data/spec/unit/parser/functions/realize_spec.rb +0 -0
- data/spec/unit/parser/functions/regsubst_spec.rb +0 -0
- data/spec/unit/parser/functions/require_spec.rb +0 -0
- data/spec/unit/parser/functions/scanf_spec.rb +0 -0
- data/spec/unit/parser/functions/shared.rb +1 -1
- data/spec/unit/parser/functions/shellquote_spec.rb +0 -0
- data/spec/unit/parser/functions/split_spec.rb +0 -0
- data/spec/unit/parser/functions/sprintf_spec.rb +0 -0
- data/spec/unit/parser/functions/tag_spec.rb +0 -0
- data/spec/unit/parser/functions/template_spec.rb +1 -1
- data/spec/unit/parser/functions/versioncmp_spec.rb +0 -0
- data/spec/unit/parser/functions_spec.rb +0 -0
- data/spec/unit/parser/relationship_spec.rb +0 -0
- data/spec/unit/parser/resource/param_spec.rb +0 -0
- data/spec/unit/parser/resource_spec.rb +10 -21
- data/spec/unit/parser/scope_spec.rb +84 -13
- data/spec/unit/parser/templatewrapper_spec.rb +1 -1
- data/spec/unit/parser/type_loader_spec.rb +0 -0
- data/spec/unit/pops/binder/config/binder_config_spec.rb +1 -1
- data/spec/unit/pops/binder/injector_spec.rb +3 -3
- data/spec/unit/pops/evaluator/access_ops_spec.rb +52 -17
- data/spec/unit/pops/evaluator/basic_expressions_spec.rb +1 -2
- data/spec/unit/pops/evaluator/comparison_ops_spec.rb +3 -0
- data/spec/unit/pops/evaluator/evaluating_parser_spec.rb +125 -36
- data/spec/unit/pops/evaluator/evaluator_rspec_helper.rb +4 -4
- data/spec/unit/pops/evaluator/json_strict_literal_evaluator_spec.rb +63 -0
- data/spec/unit/pops/evaluator/literal_evaluator_spec.rb +43 -0
- data/spec/unit/pops/evaluator/runtime3_converter_spec.rb +25 -0
- data/spec/unit/pops/evaluator/variables_spec.rb +2 -2
- data/spec/unit/pops/issues_spec.rb +16 -16
- data/spec/unit/pops/label_provider_spec.rb +5 -1
- data/spec/unit/pops/loaders/dependency_loader_spec.rb +53 -0
- data/spec/unit/pops/loaders/loaders_spec.rb +230 -47
- data/spec/unit/pops/loaders/static_loader_spec.rb +92 -1
- data/spec/unit/pops/lookup/interpolation_spec.rb +313 -0
- data/spec/unit/pops/migration_spec.rb +53 -0
- data/spec/unit/pops/parser/lexer2_spec.rb +326 -6
- data/spec/unit/pops/parser/parse_application_spec.rb +35 -0
- data/spec/unit/pops/parser/parse_basic_expressions_spec.rb +23 -0
- data/spec/unit/pops/parser/parse_calls_spec.rb +8 -0
- data/spec/unit/pops/parser/parse_capabilities_spec.rb +40 -0
- data/spec/unit/pops/parser/parse_heredoc_spec.rb +26 -0
- data/spec/unit/pops/parser/parse_site_spec.rb +47 -0
- data/spec/unit/pops/parser/parser_rspec_helper.rb +6 -0
- data/spec/unit/pops/parser/parser_spec.rb +28 -0
- data/spec/unit/pops/parser/source_pos_adapter_spec.rb +26 -0
- data/spec/unit/pops/types/enumeration_spec.rb +13 -12
- data/spec/unit/pops/types/iterable_spec.rb +262 -0
- data/spec/unit/pops/types/p_object_type_spec.rb +1060 -0
- data/spec/unit/pops/types/p_sem_ver_type_spec.rb +285 -0
- data/spec/unit/pops/types/recursion_guard_spec.rb +93 -0
- data/spec/unit/pops/types/ruby_generator_spec.rb +261 -0
- data/spec/unit/pops/types/string_converter_spec.rb +904 -0
- data/spec/unit/pops/types/type_acceptor_spec.rb +105 -0
- data/spec/unit/pops/types/type_asserter_spec.rb +43 -0
- data/spec/unit/pops/types/type_calculator_spec.rb +960 -849
- data/spec/unit/pops/types/type_factory_spec.rb +132 -91
- data/spec/unit/pops/types/type_formatter_spec.rb +352 -0
- data/spec/unit/pops/types/type_mismatch_describer_spec.rb +177 -0
- data/spec/unit/pops/types/type_parser_spec.rb +119 -32
- data/spec/unit/pops/types/types_spec.rb +561 -0
- data/spec/unit/pops/validation_spec.rb +66 -0
- data/spec/unit/pops/validator/validator_spec.rb +303 -17
- data/spec/unit/property/ensure_spec.rb +0 -0
- data/spec/unit/property/keyvalue_spec.rb +0 -0
- data/spec/unit/property/list_spec.rb +0 -0
- data/spec/unit/property/ordered_list_spec.rb +0 -0
- data/spec/unit/property_spec.rb +1 -1
- data/spec/unit/provider/augeas/augeas_spec.rb +59 -0
- data/spec/unit/provider/cisco_spec.rb +0 -0
- data/spec/unit/provider/command_spec.rb +0 -0
- data/spec/unit/provider/cron/crontab_spec.rb +0 -0
- data/spec/unit/provider/cron/parsed_spec.rb +1 -0
- data/spec/unit/provider/exec/posix_spec.rb +0 -0
- data/spec/unit/provider/exec/shell_spec.rb +0 -0
- data/spec/unit/provider/exec/windows_spec.rb +0 -0
- data/spec/unit/provider/exec_spec.rb +0 -0
- data/spec/unit/provider/file/posix_spec.rb +0 -0
- data/spec/unit/provider/file/windows_spec.rb +0 -0
- data/spec/unit/provider/group/directoryservice_spec.rb +33 -0
- data/spec/unit/provider/group/groupadd_spec.rb +0 -0
- data/spec/unit/provider/group/ldap_spec.rb +0 -0
- data/spec/unit/provider/group/pw_spec.rb +0 -0
- data/spec/unit/provider/group/windows_adsi_spec.rb +73 -17
- data/spec/unit/provider/host/parsed_spec.rb +0 -0
- data/spec/unit/provider/interface/cisco_spec.rb +0 -0
- data/spec/unit/provider/ldap_spec.rb +0 -0
- data/spec/unit/provider/macauthorization_spec.rb +5 -2
- data/spec/unit/provider/mcx/mcxcontent_spec.rb +0 -0
- data/spec/unit/provider/mount/parsed_spec.rb +31 -5
- data/spec/unit/provider/mount_spec.rb +0 -0
- data/spec/unit/provider/naginator_spec.rb +0 -0
- data/spec/unit/provider/nameservice/directoryservice_spec.rb +14 -19
- data/spec/unit/provider/nameservice_spec.rb +0 -0
- data/spec/unit/provider/network_device_spec.rb +0 -0
- data/spec/unit/provider/package/aix_spec.rb +0 -0
- data/spec/unit/provider/package/appdmg_spec.rb +3 -3
- data/spec/unit/provider/package/apt_spec.rb +5 -0
- data/spec/unit/provider/package/aptitude_spec.rb +0 -0
- data/spec/unit/provider/package/aptrpm_spec.rb +2 -2
- data/spec/unit/provider/package/base_spec.rb +18 -0
- data/spec/unit/provider/package/dnf_spec.rb +108 -0
- data/spec/unit/provider/package/dpkg_spec.rb +0 -0
- data/spec/unit/provider/package/freebsd_spec.rb +0 -0
- data/spec/unit/provider/package/gem_spec.rb +77 -0
- data/spec/unit/provider/package/hpux_spec.rb +0 -0
- data/spec/unit/provider/package/macports_spec.rb +0 -0
- data/spec/unit/provider/package/nim_spec.rb +6 -6
- data/spec/unit/provider/package/openbsd_spec.rb +0 -0
- data/spec/unit/provider/package/opkg_spec.rb +0 -0
- data/spec/unit/provider/package/pacman_spec.rb +55 -0
- data/spec/unit/provider/package/pip3_spec.rb +22 -0
- data/spec/unit/provider/package/pip_spec.rb +159 -46
- data/spec/unit/provider/package/pkg_spec.rb +0 -0
- data/spec/unit/provider/package/pkgdmg_spec.rb +35 -8
- data/spec/unit/provider/package/pkgin_spec.rb +23 -13
- data/spec/unit/provider/package/pkgng_spec.rb +174 -0
- data/spec/unit/provider/package/pkgutil_spec.rb +0 -0
- data/spec/unit/provider/package/puppet_gem_spec.rb +0 -0
- data/spec/unit/provider/package/rpm_spec.rb +160 -3
- data/spec/unit/provider/package/sun_spec.rb +0 -0
- data/spec/unit/provider/package/windows/exe_package_spec.rb +0 -1
- data/spec/unit/provider/package/windows/msi_package_spec.rb +0 -1
- data/spec/unit/provider/package/windows/package_spec.rb +41 -0
- data/spec/unit/provider/package/windows_spec.rb +0 -0
- data/spec/unit/provider/package/yum_spec.rb +81 -147
- data/spec/unit/provider/package/zypper_spec.rb +64 -19
- data/spec/unit/provider/parsedfile_spec.rb +0 -0
- data/spec/unit/provider/scheduled_task/win32_taskscheduler_spec.rb +322 -70
- data/spec/unit/provider/selboolean_spec.rb +0 -0
- data/spec/unit/provider/selmodule_spec.rb +0 -0
- data/spec/unit/provider/service/base_spec.rb +38 -27
- data/spec/unit/provider/service/bsd_spec.rb +130 -0
- data/spec/unit/provider/service/daemontools_spec.rb +0 -0
- data/spec/unit/provider/service/debian_spec.rb +29 -0
- data/spec/unit/provider/service/freebsd_spec.rb +17 -0
- data/spec/unit/provider/service/gentoo_spec.rb +2 -0
- data/spec/unit/provider/service/init_spec.rb +35 -1
- data/spec/unit/provider/service/launchd_spec.rb +89 -21
- data/spec/unit/provider/service/openbsd_spec.rb +1 -0
- data/spec/unit/provider/service/openrc_spec.rb +1 -0
- data/spec/unit/provider/service/openwrt_spec.rb +0 -0
- data/spec/unit/provider/service/rcng_spec.rb +41 -0
- data/spec/unit/provider/service/redhat_spec.rb +9 -1
- data/spec/unit/provider/service/runit_spec.rb +0 -0
- data/spec/unit/provider/service/smf_spec.rb +43 -6
- data/spec/unit/provider/service/src_spec.rb +20 -4
- data/spec/unit/provider/service/systemd_spec.rb +169 -37
- data/spec/unit/provider/service/upstart_spec.rb +58 -0
- data/spec/unit/provider/service/windows_spec.rb +0 -0
- data/spec/unit/provider/ssh_authorized_key/parsed_spec.rb +1 -1
- data/spec/unit/provider/sshkey/parsed_spec.rb +42 -18
- data/spec/unit/provider/user/directoryservice_spec.rb +40 -59
- data/spec/unit/provider/user/hpux_spec.rb +0 -0
- data/spec/unit/provider/user/ldap_spec.rb +0 -0
- data/spec/unit/provider/user/openbsd_spec.rb +0 -0
- data/spec/unit/provider/user/pw_spec.rb +0 -0
- data/spec/unit/provider/user/user_role_add_spec.rb +0 -0
- data/spec/unit/provider/user/useradd_spec.rb +0 -0
- data/spec/unit/provider/user/windows_adsi_spec.rb +137 -7
- data/spec/unit/provider/vlan/cisco_spec.rb +0 -0
- data/spec/unit/provider/yumrepo/inifile_spec.rb +16 -0
- data/spec/unit/provider/zfs/zfs_spec.rb +0 -0
- data/spec/unit/provider/zone/solaris_spec.rb +64 -12
- data/spec/unit/provider/zpool/zpool_spec.rb +0 -0
- data/spec/unit/provider_spec.rb +0 -0
- data/spec/unit/puppet_spec.rb +1 -1
- data/spec/unit/relationship_spec.rb +0 -0
- data/spec/unit/reports/http_spec.rb +0 -0
- data/spec/unit/reports/store_spec.rb +0 -0
- data/spec/unit/reports_spec.rb +10 -0
- data/spec/unit/resource/capability_finder_spec.rb +77 -0
- data/spec/unit/resource/catalog_spec.rb +95 -8
- data/spec/unit/resource/status_spec.rb +0 -0
- data/spec/unit/resource/type_collection_helper_spec.rb +0 -0
- data/spec/unit/resource/type_collection_spec.rb +23 -2
- data/spec/unit/resource/type_spec.rb +150 -8
- data/spec/unit/resource_spec.rb +115 -48
- data/spec/unit/settings/directory_setting_spec.rb +0 -0
- data/spec/unit/settings/duration_setting_spec.rb +0 -0
- data/spec/unit/settings/environment_conf_spec.rb +18 -1
- data/spec/unit/settings/file_setting_spec.rb +37 -0
- data/spec/unit/settings/path_setting_spec.rb +0 -0
- data/spec/unit/settings/priority_setting_spec.rb +0 -0
- data/spec/unit/settings_spec.rb +103 -3
- data/spec/unit/ssl/base_spec.rb +0 -0
- data/spec/unit/ssl/certificate_authority/interface_spec.rb +4 -3
- data/spec/unit/ssl/certificate_authority_spec.rb +5 -3
- data/spec/unit/ssl/certificate_factory_spec.rb +0 -0
- data/spec/unit/ssl/certificate_request_spec.rb +0 -0
- data/spec/unit/ssl/certificate_revocation_list_spec.rb +3 -3
- data/spec/unit/ssl/certificate_spec.rb +0 -0
- data/spec/unit/ssl/configuration_spec.rb +0 -0
- data/spec/unit/ssl/host_spec.rb +2 -2
- data/spec/unit/ssl/inventory_spec.rb +0 -0
- data/spec/unit/ssl/key_spec.rb +0 -0
- data/spec/unit/ssl/oids_spec.rb +8 -0
- data/spec/unit/status_spec.rb +0 -0
- data/spec/unit/transaction/additional_resource_generator_spec.rb +120 -32
- data/spec/unit/transaction/event_manager_spec.rb +0 -0
- data/spec/unit/transaction/event_spec.rb +0 -0
- data/spec/unit/transaction/report_spec.rb +51 -1
- data/spec/unit/transaction/resource_harness_spec.rb +0 -47
- data/spec/unit/transaction_spec.rb +12 -0
- data/spec/unit/type/augeas_spec.rb +0 -0
- data/spec/unit/type/component_spec.rb +0 -0
- data/spec/unit/type/computer_spec.rb +0 -0
- data/spec/unit/type/cron_spec.rb +0 -0
- data/spec/unit/type/exec_spec.rb +16 -8
- data/spec/unit/type/file/checksum_spec.rb +6 -0
- data/spec/unit/type/file/checksum_value_spec.rb +286 -0
- data/spec/unit/type/file/content_spec.rb +12 -193
- data/spec/unit/type/file/ctime_spec.rb +0 -0
- data/spec/unit/type/file/ensure_spec.rb +0 -0
- data/spec/unit/type/file/group_spec.rb +0 -0
- data/spec/unit/type/file/mode_spec.rb +0 -0
- data/spec/unit/type/file/mtime_spec.rb +0 -0
- data/spec/unit/type/file/owner_spec.rb +0 -0
- data/spec/unit/type/file/selinux_spec.rb +0 -0
- data/spec/unit/type/file/source_spec.rb +211 -119
- data/spec/unit/type/file/type_spec.rb +0 -0
- data/spec/unit/type/file_spec.rb +133 -34
- data/spec/unit/type/filebucket_spec.rb +0 -0
- data/spec/unit/type/group_spec.rb +0 -0
- data/spec/unit/type/host_spec.rb +4 -4
- data/spec/unit/type/interface_spec.rb +32 -0
- data/spec/unit/type/k5login_spec.rb +0 -0
- data/spec/unit/type/macauthorization_spec.rb +4 -1
- data/spec/unit/type/mailalias_spec.rb +0 -0
- data/spec/unit/type/maillist_spec.rb +0 -0
- data/spec/unit/type/mcx_spec.rb +0 -0
- data/spec/unit/type/mount_spec.rb +59 -10
- data/spec/unit/type/nagios_spec.rb +0 -0
- data/spec/unit/type/noop_metaparam_spec.rb +0 -0
- data/spec/unit/type/package/package_settings_spec.rb +0 -0
- data/spec/unit/type/package_spec.rb +1 -0
- data/spec/unit/type/resources_spec.rb +0 -0
- data/spec/unit/type/schedule_spec.rb +0 -0
- data/spec/unit/type/selboolean_spec.rb +0 -0
- data/spec/unit/type/selmodule_spec.rb +0 -0
- data/spec/unit/type/service_spec.rb +21 -0
- data/spec/unit/type/ssh_authorized_key_spec.rb +0 -0
- data/spec/unit/type/sshkey_spec.rb +0 -0
- data/spec/unit/type/stage_spec.rb +0 -0
- data/spec/unit/type/tidy_spec.rb +4 -4
- data/spec/unit/type/user_spec.rb +14 -7
- data/spec/unit/type/vlan_spec.rb +1 -1
- data/spec/unit/type/whit_spec.rb +0 -0
- data/spec/unit/type/yumrepo_spec.rb +2 -2
- data/spec/unit/type/zfs_spec.rb +0 -0
- data/spec/unit/type/zone_spec.rb +0 -0
- data/spec/unit/type/zpool_spec.rb +0 -0
- data/spec/unit/type_spec.rb +15 -1
- data/spec/unit/util/autoload_spec.rb +0 -0
- data/spec/unit/util/backups_spec.rb +0 -0
- data/spec/unit/util/checksums_spec.rb +0 -0
- data/spec/unit/util/colors_spec.rb +0 -0
- data/spec/unit/util/command_line_spec.rb +0 -0
- data/spec/unit/util/constant_inflector_spec.rb +0 -0
- data/spec/unit/util/diff_spec.rb +0 -0
- data/spec/unit/util/errors_spec.rb +0 -0
- data/spec/unit/util/execution_spec.rb +0 -0
- data/spec/unit/util/execution_stub_spec.rb +0 -0
- data/spec/unit/util/feature_spec.rb +1 -1
- data/spec/unit/util/filetype_spec.rb +1 -1
- data/spec/unit/util/http_proxy_spec.rb +87 -0
- data/spec/unit/util/ldap/connection_spec.rb +0 -0
- data/spec/unit/util/ldap/generator_spec.rb +1 -1
- data/spec/unit/util/ldap/manager_spec.rb +0 -0
- data/spec/unit/util/log/destinations_spec.rb +0 -2
- data/spec/unit/util/log_spec.rb +125 -1
- data/spec/unit/util/logging_spec.rb +69 -0
- data/spec/unit/util/metric_spec.rb +0 -0
- data/spec/unit/util/monkey_patches_spec.rb +79 -3
- data/spec/unit/util/multi_match_spec.rb +39 -0
- data/spec/unit/util/nagios_maker_spec.rb +0 -0
- data/spec/unit/util/network_device/cisco/device_spec.rb +253 -216
- data/spec/unit/util/network_device/cisco/facts_spec.rb +0 -0
- data/spec/unit/util/network_device/cisco/interface_spec.rb +0 -0
- data/spec/unit/util/network_device/config_spec.rb +0 -0
- data/spec/unit/util/network_device/ipcalc_spec.rb +0 -0
- data/spec/unit/util/network_device/transport/base_spec.rb +0 -0
- data/spec/unit/util/network_device/transport/ssh_spec.rb +1 -1
- data/spec/unit/util/network_device/transport/telnet_spec.rb +60 -58
- data/spec/unit/util/network_device_spec.rb +1 -1
- data/spec/unit/util/package_spec.rb +0 -0
- data/spec/unit/util/plist_spec.rb +110 -0
- data/spec/unit/util/posix_spec.rb +0 -0
- data/spec/unit/util/rdoc_spec.rb +0 -0
- data/spec/unit/util/resource_template_spec.rb +2 -2
- data/spec/unit/util/retry_action_spec.rb +0 -0
- data/spec/unit/util/run_mode_spec.rb +27 -3
- data/spec/unit/util/selinux_spec.rb +0 -0
- data/spec/unit/util/splayer_spec.rb +45 -0
- data/spec/unit/util/storage_spec.rb +5 -1
- data/spec/unit/util/suidmanager_spec.rb +0 -0
- data/spec/unit/util/symbolic_file_mode_spec.rb +0 -0
- data/spec/unit/util/tagging_spec.rb +0 -0
- data/spec/unit/util/user_attr_spec.rb +0 -0
- data/spec/unit/util/warnings_spec.rb +0 -0
- data/spec/unit/util/windows/adsi_spec.rb +175 -60
- data/spec/unit/util/windows/api_types_spec.rb +42 -0
- data/spec/unit/util/windows/file_spec.rb +34 -0
- data/spec/unit/util/windows/root_certs_spec.rb +0 -0
- data/spec/unit/util/windows/security_descriptor_spec.rb +3 -3
- data/spec/unit/util/windows/sid_spec.rb +48 -21
- data/spec/unit/util_spec.rb +144 -15
- data/spec/watchr.rb +0 -0
- data/tasks/cfpropertylist.rake +15 -0
- metadata +3427 -2981
- checksums.yaml +0 -7
- data/ext/puppet-nm-dispatcher +0 -13
- data/ext/systemd/puppetmaster.service +0 -11
- data/lib/puppet/pops/evaluator/callable_mismatch_describer.rb +0 -175
- data/lib/puppet/pops/types/types_meta.rb +0 -223
- data/lib/puppet/vendor/load_plist.rb +0 -1
- data/lib/puppet/vendor/plist/CHANGELOG +0 -82
- data/lib/puppet/vendor/plist/MIT-LICENSE +0 -21
- data/lib/puppet/vendor/plist/PUPPET_README.md +0 -6
- data/lib/puppet/vendor/plist/README +0 -36
- data/lib/puppet/vendor/plist/Rakefile +0 -144
- data/lib/puppet/vendor/plist/docs/USAGE +0 -104
- data/lib/puppet/vendor/plist/docs/jamis-template.rb +0 -591
- data/lib/puppet/vendor/plist/lib/plist/generator.rb +0 -224
- data/lib/puppet/vendor/plist/lib/plist/parser.rb +0 -225
- data/lib/puppet/vendor/plist/lib/plist.rb +0 -22
- data/lib/puppet/vendor/plist/test/assets/AlbumData.xml +0 -203
- data/lib/puppet/vendor/plist/test/assets/Cookies.plist +0 -104
- data/lib/puppet/vendor/plist/test/assets/commented.plist +0 -9
- data/lib/puppet/vendor/plist/test/assets/example_data.bin +0 -0
- data/lib/puppet/vendor/plist/test/assets/example_data.jpg +0 -0
- data/lib/puppet/vendor/plist/test/assets/example_data.plist +0 -259
- data/lib/puppet/vendor/plist/test/assets/test_data_elements.plist +0 -24
- data/lib/puppet/vendor/plist/test/assets/test_empty_key.plist +0 -13
- data/lib/puppet/vendor/plist/test/test_data_elements.rb +0 -115
- data/lib/puppet/vendor/plist/test/test_generator.rb +0 -59
- data/lib/puppet/vendor/plist/test/test_generator_basic_types.rb +0 -58
- data/lib/puppet/vendor/plist/test/test_generator_collections.rb +0 -82
- data/lib/puppet/vendor/plist/test/test_parser.rb +0 -90
- data/spec/integration/data_binding.rb +0 -104
- data/spec/integration/provider/package_spec.rb +0 -33
- /data/spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/{usee → modules/usee}/lib/puppet/functions/usee/callee.rb +0 -0
- /data/spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/{user → modules/user}/lib/puppet/functions/user/caller.rb +0 -0
data/lib/puppet/error.rb
CHANGED
|
@@ -54,8 +54,34 @@ module Puppet
|
|
|
54
54
|
include ExternalFileError
|
|
55
55
|
end
|
|
56
56
|
|
|
57
|
+
# Contains an issue code and can be annotated with an environment and a node
|
|
58
|
+
class ParseErrorWithIssue < Puppet::ParseError
|
|
59
|
+
attr_reader :issue_code, :basic_message
|
|
60
|
+
attr_accessor :environment, :node
|
|
61
|
+
|
|
62
|
+
# @param message [String] The error message
|
|
63
|
+
# @param file [String] The path to the file where the error was found
|
|
64
|
+
# @param line [Integer] The line in the file
|
|
65
|
+
# @param pos [Integer] The position on the line
|
|
66
|
+
# @param original [Exception] Original exception
|
|
67
|
+
# @param issue_code [Symbol] The issue code
|
|
68
|
+
#
|
|
69
|
+
def initialize(message, file=nil, line=nil, pos=nil, original=nil, issue_code= nil)
|
|
70
|
+
super(message, file, line, pos, original)
|
|
71
|
+
@issue_code = issue_code
|
|
72
|
+
@basic_message = message
|
|
73
|
+
end
|
|
74
|
+
|
|
75
|
+
def to_s
|
|
76
|
+
msg = super
|
|
77
|
+
msg = "Could not parse for environment #{environment}: #{msg}" if environment
|
|
78
|
+
msg = "#{msg} on node #{node}" if node
|
|
79
|
+
msg
|
|
80
|
+
end
|
|
81
|
+
end
|
|
82
|
+
|
|
57
83
|
# An error that already contains location information in the message text
|
|
58
|
-
class PreformattedError < Puppet::
|
|
84
|
+
class PreformattedError < Puppet::ParseErrorWithIssue
|
|
59
85
|
end
|
|
60
86
|
|
|
61
87
|
# An error class for when I don't know what happened. Automatically
|
|
@@ -67,4 +93,8 @@ module Puppet
|
|
|
67
93
|
class MissingCommand < Puppet::Error
|
|
68
94
|
end
|
|
69
95
|
|
|
96
|
+
# Raised when we failed to aquire a lock
|
|
97
|
+
class LockError < Puppet::Error
|
|
98
|
+
end
|
|
99
|
+
|
|
70
100
|
end
|
data/lib/puppet/face/config.rb
CHANGED
|
@@ -9,7 +9,7 @@ Puppet::Face.define(:config, '0.0.1') do
|
|
|
9
9
|
|
|
10
10
|
description "This subcommand can inspect and modify settings from Puppet's
|
|
11
11
|
'puppet.conf' configuration file. For documentation about individual settings,
|
|
12
|
-
see
|
|
12
|
+
see https://docs.puppetlabs.com/puppet/latest/reference/configuration.html."
|
|
13
13
|
|
|
14
14
|
option "--section SECTION_NAME" do
|
|
15
15
|
default_to { "main" }
|
data/lib/puppet/face/epp.rb
CHANGED
|
@@ -172,7 +172,7 @@ Puppet::Face.define(:epp, '0.0.1') do
|
|
|
172
172
|
|
|
173
173
|
show_filename = templates.count > 1
|
|
174
174
|
dumps = templates.each do |file|
|
|
175
|
-
buffer.print dump_parse(
|
|
175
|
+
buffer.print dump_parse(Puppet::FileSystem.read(file, :encoding => 'utf-8'), file, options, show_filename)
|
|
176
176
|
end
|
|
177
177
|
|
|
178
178
|
if !missing_files.empty?
|
|
@@ -23,7 +23,7 @@ settings, so you can specify `--server <servername>`, or
|
|
|
23
23
|
`--run_mode <runmode>` as an argument.
|
|
24
24
|
|
|
25
25
|
See the configuration file documentation at
|
|
26
|
-
<
|
|
26
|
+
<https://docs.puppetlabs.com/puppet/latest/reference/configuration.html> for the
|
|
27
27
|
full list of acceptable parameters. A commented list of all
|
|
28
28
|
configuration options can also be generated by running puppet with
|
|
29
29
|
`--genconfig`.
|
|
@@ -4,7 +4,8 @@ Puppet::Face.define(:module, '1.0.0') do
|
|
|
4
4
|
description <<-EOT
|
|
5
5
|
Shows any files in a module that have been modified since it was
|
|
6
6
|
installed. This action compares the files on disk to the md5 checksums
|
|
7
|
-
included in the module's
|
|
7
|
+
included in the module's checksums.json or, if that is missing, in
|
|
8
|
+
metadata.json.
|
|
8
9
|
EOT
|
|
9
10
|
|
|
10
11
|
returns "Array of strings representing paths of modified files."
|
|
@@ -21,7 +21,7 @@ Puppet::Face.define(:module, '1.0.0') do
|
|
|
21
21
|
|
|
22
22
|
$ puppet module install puppetlabs-vcsrepo
|
|
23
23
|
Preparing to install into /etc/puppetlabs/code/modules ...
|
|
24
|
-
Downloading from
|
|
24
|
+
Downloading from https://forgeapi.puppetlabs.com ...
|
|
25
25
|
Installing -- do not interrupt ...
|
|
26
26
|
/etc/puppetlabs/code/modules
|
|
27
27
|
└── puppetlabs-vcsrepo (v0.0.4)
|
|
@@ -30,7 +30,7 @@ Puppet::Face.define(:module, '1.0.0') do
|
|
|
30
30
|
|
|
31
31
|
$ puppet module install puppetlabs-vcsrepo --environment development
|
|
32
32
|
Preparing to install into /etc/puppetlabs/code/environments/development/modules ...
|
|
33
|
-
Downloading from
|
|
33
|
+
Downloading from https://forgeapi.puppetlabs.com ...
|
|
34
34
|
Installing -- do not interrupt ...
|
|
35
35
|
/etc/puppetlabs/code/environments/development/modules
|
|
36
36
|
└── puppetlabs-vcsrepo (v0.0.4)
|
|
@@ -39,7 +39,7 @@ Puppet::Face.define(:module, '1.0.0') do
|
|
|
39
39
|
|
|
40
40
|
$ puppet module install puppetlabs-vcsrepo -v 0.0.4
|
|
41
41
|
Preparing to install into /etc/puppetlabs/modules ...
|
|
42
|
-
Downloading from
|
|
42
|
+
Downloading from https://forgeapi.puppetlabs.com ...
|
|
43
43
|
Installing -- do not interrupt ...
|
|
44
44
|
/etc/puppetlabs/code/modules
|
|
45
45
|
└── puppetlabs-vcsrepo (v0.0.4)
|
|
@@ -48,7 +48,7 @@ Puppet::Face.define(:module, '1.0.0') do
|
|
|
48
48
|
|
|
49
49
|
$ puppet module install puppetlabs-vcsrepo --target-dir=/opt/puppetlabs/puppet/modules
|
|
50
50
|
Preparing to install into /opt/puppetlabs/puppet/modules ...
|
|
51
|
-
Downloading from
|
|
51
|
+
Downloading from https://forgeapi.puppetlabs.com ...
|
|
52
52
|
Installing -- do not interrupt ...
|
|
53
53
|
/opt/puppetlabs/puppet/modules
|
|
54
54
|
└── puppetlabs-vcsrepo (v0.0.4)
|
|
@@ -57,7 +57,7 @@ Puppet::Face.define(:module, '1.0.0') do
|
|
|
57
57
|
|
|
58
58
|
$ puppet module install puppetlabs-vcsrepo --target-dir=/opt/puppetlabs/puppet/modules --modulepath /etc/puppetlabs/code/modules
|
|
59
59
|
Preparing to install into /opt/puppetlabs/puppet/modules ...
|
|
60
|
-
Downloading from
|
|
60
|
+
Downloading from https://forgeapi.puppetlabs.com ...
|
|
61
61
|
Installing -- do not interrupt ...
|
|
62
62
|
/opt/puppetlabs/puppet/modules
|
|
63
63
|
└── puppetlabs-vcsrepo (v0.0.4)
|
|
@@ -66,7 +66,7 @@ Puppet::Face.define(:module, '1.0.0') do
|
|
|
66
66
|
|
|
67
67
|
$ puppet module install puppetlabs-vcsrepo-0.0.4.tar.gz
|
|
68
68
|
Preparing to install into /etc/puppetlabs/code/modules ...
|
|
69
|
-
Downloading from
|
|
69
|
+
Downloading from https://forgeapi.puppetlabs.com ...
|
|
70
70
|
Installing -- do not interrupt ...
|
|
71
71
|
/etc/puppetlabs/code/modules
|
|
72
72
|
└── puppetlabs-vcsrepo (v0.0.4)
|
data/lib/puppet/face/parser.rb
CHANGED
|
@@ -107,7 +107,7 @@ Puppet::Face.define(:parser, '0.0.1') do
|
|
|
107
107
|
missing_files = files - available_files
|
|
108
108
|
|
|
109
109
|
dumps = available_files.collect do |file|
|
|
110
|
-
dump_parse(
|
|
110
|
+
dump_parse(Puppet::FileSystem.read(file, :encoding => 'utf-8'), file, options)
|
|
111
111
|
end.join("")
|
|
112
112
|
|
|
113
113
|
if missing_files.empty?
|
|
@@ -146,13 +146,16 @@ Puppet::Face.define(:parser, '0.0.1') do
|
|
|
146
146
|
# @api private
|
|
147
147
|
def validate_manifest(manifest = nil)
|
|
148
148
|
env = Puppet.lookup(:current_environment)
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
149
|
+
loaders = Puppet::Pops::Loaders.new(env)
|
|
150
|
+
Puppet.override( {:loaders => loaders } , 'For puppet parser validate') do
|
|
151
|
+
begin
|
|
152
|
+
validation_environment = manifest ? env.override_with(:manifest => manifest) : env
|
|
153
|
+
validation_environment.check_for_reparse
|
|
154
|
+
validation_environment.known_resource_types.clear
|
|
155
|
+
rescue => detail
|
|
156
|
+
Puppet.log_exception(detail)
|
|
157
|
+
exit(1)
|
|
158
|
+
end
|
|
159
|
+
end
|
|
157
160
|
end
|
|
158
161
|
end
|
data/lib/puppet/face/plugin.rb
CHANGED
|
@@ -1,4 +1,7 @@
|
|
|
1
1
|
require 'puppet/face'
|
|
2
|
+
require 'puppet/configurer/downloader_factory'
|
|
3
|
+
require 'puppet/configurer/plugin_handler'
|
|
4
|
+
|
|
2
5
|
Puppet::Face.define(:plugin, '0.0.1') do
|
|
3
6
|
copyright "Puppet Labs", 2011
|
|
4
7
|
license "Apache 2 license; see COPYING"
|
|
@@ -37,21 +40,11 @@ Puppet::Face.define(:plugin, '0.0.1') do
|
|
|
37
40
|
EOT
|
|
38
41
|
|
|
39
42
|
when_invoked do |options|
|
|
40
|
-
require 'puppet/configurer/downloader'
|
|
41
43
|
remote_environment_for_plugins = Puppet::Node::Environment.remote(Puppet[:environment])
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
remote_environment_for_plugins).evaluate
|
|
47
|
-
if Puppet.features.external_facts?
|
|
48
|
-
result += Puppet::Configurer::Downloader.new("pluginfacts",
|
|
49
|
-
Puppet[:pluginfactdest],
|
|
50
|
-
Puppet[:pluginfactsource],
|
|
51
|
-
Puppet[:pluginsignore],
|
|
52
|
-
remote_environment_for_plugins).evaluate
|
|
53
|
-
end
|
|
54
|
-
result
|
|
44
|
+
|
|
45
|
+
factory = Puppet::Configurer::DownloaderFactory.new
|
|
46
|
+
handler = Puppet::Configurer::PluginHandler.new(factory)
|
|
47
|
+
handler.download_plugins(remote_environment_for_plugins)
|
|
55
48
|
end
|
|
56
49
|
|
|
57
50
|
when_rendering :console do |value|
|
data/lib/puppet/face/status.rb
CHANGED
|
@@ -37,7 +37,8 @@ Puppet::Indirector::Face.define(:status, '0.0.1') do
|
|
|
37
37
|
This action requires that the server's `auth.conf` file allow find
|
|
38
38
|
access to the `status` REST terminus. Puppet agent does not use this
|
|
39
39
|
facility, and it is turned off by default. See
|
|
40
|
-
<
|
|
40
|
+
<https://docs.puppetlabs.com/puppet/latest/reference/config_file_auth.html>
|
|
41
|
+
for more details.
|
|
41
42
|
EOT
|
|
42
43
|
find.examples <<-'EOT'
|
|
43
44
|
Check the status of the configured puppet master:
|
|
@@ -2,6 +2,8 @@ require 'pathname'
|
|
|
2
2
|
require 'puppet/file_bucket'
|
|
3
3
|
require 'puppet/file_bucket/file'
|
|
4
4
|
require 'puppet/indirector/request'
|
|
5
|
+
require 'puppet/util/diff'
|
|
6
|
+
require 'tempfile'
|
|
5
7
|
|
|
6
8
|
class Puppet::FileBucket::Dipper
|
|
7
9
|
include Puppet::Util::Checksums
|
|
@@ -22,7 +24,7 @@ class Puppet::FileBucket::Dipper
|
|
|
22
24
|
@rest_path = nil
|
|
23
25
|
else
|
|
24
26
|
@local_path = nil
|
|
25
|
-
@rest_path = "
|
|
27
|
+
@rest_path = "filebucket://#{server}:#{port}/"
|
|
26
28
|
end
|
|
27
29
|
@checksum_type = Puppet[:digest_algorithm].to_sym
|
|
28
30
|
@digest = method(@checksum_type)
|
|
@@ -56,6 +58,46 @@ class Puppet::FileBucket::Dipper
|
|
|
56
58
|
end
|
|
57
59
|
end
|
|
58
60
|
|
|
61
|
+
# Diffs two filebucket files identified by their sums
|
|
62
|
+
def diff(checksum_a, checksum_b, file_a, file_b)
|
|
63
|
+
raise RuntimeError, "Diff is not supported on this platform" if Puppet[:diff] == ""
|
|
64
|
+
if checksum_a
|
|
65
|
+
source_path = "#{@rest_path}#{@checksum_type}/#{checksum_a}"
|
|
66
|
+
if checksum_b
|
|
67
|
+
file_diff = Puppet::FileBucket::File.indirection.find(
|
|
68
|
+
source_path,
|
|
69
|
+
:bucket_path => @local_path,
|
|
70
|
+
:diff_with => checksum_b)
|
|
71
|
+
elsif file_b
|
|
72
|
+
tmp_file = ::Tempfile.new('diff')
|
|
73
|
+
begin
|
|
74
|
+
restore(tmp_file.path, checksum_a)
|
|
75
|
+
file_diff = Puppet::Util::Diff.diff(tmp_file.path, file_b)
|
|
76
|
+
ensure
|
|
77
|
+
tmp_file.close
|
|
78
|
+
tmp_file.unlink
|
|
79
|
+
end
|
|
80
|
+
else
|
|
81
|
+
raise Puppet::Error, "Please provide a file or checksum do diff with"
|
|
82
|
+
end
|
|
83
|
+
elsif file_a
|
|
84
|
+
if checksum_b
|
|
85
|
+
tmp_file = ::Tempfile.new('diff')
|
|
86
|
+
begin
|
|
87
|
+
restore(tmp_file.path, checksum_b)
|
|
88
|
+
file_diff = Puppet::Util::Diff.diff(file_a, tmp_file.path)
|
|
89
|
+
ensure
|
|
90
|
+
tmp_file.close
|
|
91
|
+
tmp_file.unlink
|
|
92
|
+
end
|
|
93
|
+
elsif file_b
|
|
94
|
+
file_diff = Puppet::Util::Diff.diff(file_a, file_b)
|
|
95
|
+
end
|
|
96
|
+
end
|
|
97
|
+
raise Puppet::Error, "Failed to diff files" unless file_diff
|
|
98
|
+
file_diff.to_s
|
|
99
|
+
end
|
|
100
|
+
|
|
59
101
|
# Retrieves a file by sum.
|
|
60
102
|
def getfile(sum)
|
|
61
103
|
get_bucket_file(sum).to_s
|
|
@@ -109,10 +151,24 @@ class Puppet::FileBucket::Dipper
|
|
|
109
151
|
end
|
|
110
152
|
end
|
|
111
153
|
|
|
154
|
+
# List Filebucket content.
|
|
155
|
+
def list(fromdate, todate)
|
|
156
|
+
raise Puppet::Error, "Listing remote file buckets is not allowed" unless local?
|
|
157
|
+
|
|
158
|
+
source_path = "#{@rest_path}#{@checksum_type}/"
|
|
159
|
+
file_bucket_list = Puppet::FileBucket::File.indirection.find(
|
|
160
|
+
source_path,
|
|
161
|
+
:bucket_path => @local_path,
|
|
162
|
+
:list_all => true,
|
|
163
|
+
:fromdate => fromdate,
|
|
164
|
+
:todate => todate)
|
|
165
|
+
raise Puppet::Error, "File not found" unless file_bucket_list
|
|
166
|
+
file_bucket_list.to_s
|
|
167
|
+
end
|
|
168
|
+
|
|
112
169
|
private
|
|
113
170
|
def absolutize_path( path )
|
|
114
171
|
Pathname.new(path).realpath
|
|
115
172
|
end
|
|
116
173
|
|
|
117
174
|
end
|
|
118
|
-
|
|
@@ -0,0 +1,46 @@
|
|
|
1
|
+
require 'puppet/file_serving/metadata'
|
|
2
|
+
|
|
3
|
+
# Simplified metadata representation, suitable for the information
|
|
4
|
+
# that is available from HTTP headers.
|
|
5
|
+
class Puppet::FileServing::HttpMetadata < Puppet::FileServing::Metadata
|
|
6
|
+
|
|
7
|
+
def initialize(http_response, path = '/dev/null')
|
|
8
|
+
super(path)
|
|
9
|
+
|
|
10
|
+
# ignore options that do not apply to HTTP metadata
|
|
11
|
+
@owner = @group = @mode = nil
|
|
12
|
+
|
|
13
|
+
# hash available checksums for eventual collection
|
|
14
|
+
@checksums = {}
|
|
15
|
+
# use a default mtime in case there is no usable HTTP header
|
|
16
|
+
@checksums[:mtime] = "{mtime}#{Time.now}"
|
|
17
|
+
|
|
18
|
+
if checksum = http_response['content-md5']
|
|
19
|
+
# convert base64 digest to hex
|
|
20
|
+
checksum = checksum.unpack("m0").first.unpack("H*").first
|
|
21
|
+
@checksums[:md5] = "{md5}#{checksum}"
|
|
22
|
+
end
|
|
23
|
+
|
|
24
|
+
if last_modified = http_response['last-modified']
|
|
25
|
+
mtime = DateTime.httpdate(last_modified).to_time
|
|
26
|
+
@checksums[:mtime] = "{mtime}#{mtime}"
|
|
27
|
+
end
|
|
28
|
+
|
|
29
|
+
@ftype = 'file'
|
|
30
|
+
|
|
31
|
+
self
|
|
32
|
+
end
|
|
33
|
+
|
|
34
|
+
# Override of the parent class method. Does not call super!
|
|
35
|
+
# We can only return metadata that was extracted from the
|
|
36
|
+
# HTTP headers during #initialize.
|
|
37
|
+
def collect
|
|
38
|
+
# Prefer the checksum_type from the indirector request options
|
|
39
|
+
# but fall back to the alternative otherwise
|
|
40
|
+
[ @checksum_type, :md5, :mtime ].each do |type|
|
|
41
|
+
@checksum_type = type
|
|
42
|
+
@checksum = @checksums[type]
|
|
43
|
+
return if @checksum
|
|
44
|
+
end
|
|
45
|
+
end
|
|
46
|
+
end
|
|
@@ -3,6 +3,7 @@ require 'puppet/indirector'
|
|
|
3
3
|
require 'puppet/file_serving'
|
|
4
4
|
require 'puppet/file_serving/base'
|
|
5
5
|
require 'puppet/util/checksums'
|
|
6
|
+
require 'uri'
|
|
6
7
|
|
|
7
8
|
# A class that handles retrieving file metadata.
|
|
8
9
|
class Puppet::FileServing::Metadata < Puppet::FileServing::Base
|
|
@@ -12,7 +13,7 @@ class Puppet::FileServing::Metadata < Puppet::FileServing::Base
|
|
|
12
13
|
extend Puppet::Indirector
|
|
13
14
|
indirects :file_metadata, :terminus_class => :selector
|
|
14
15
|
|
|
15
|
-
attr_reader :path, :owner, :group, :mode, :checksum_type, :checksum, :ftype, :destination
|
|
16
|
+
attr_reader :path, :owner, :group, :mode, :checksum_type, :checksum, :ftype, :destination, :source_permissions, :content_uri
|
|
16
17
|
|
|
17
18
|
PARAM_ORDER = [:mode, :ftype, :owner, :group]
|
|
18
19
|
|
|
@@ -22,10 +23,28 @@ class Puppet::FileServing::Metadata < Puppet::FileServing::Base
|
|
|
22
23
|
@checksum_type = type
|
|
23
24
|
end
|
|
24
25
|
|
|
26
|
+
def source_permissions=(source_permissions)
|
|
27
|
+
raise(ArgumentError, "Unsupported source_permission #{source_permissions}") unless [:use, :use_when_creating, :ignore].include?(source_permissions.intern)
|
|
28
|
+
|
|
29
|
+
@source_permissions = source_permissions.intern
|
|
30
|
+
end
|
|
31
|
+
|
|
32
|
+
def content_uri=(path)
|
|
33
|
+
begin
|
|
34
|
+
uri = URI.parse(URI.escape(path))
|
|
35
|
+
rescue URI::InvalidURIError => detail
|
|
36
|
+
raise(ArgumentError, "Could not understand URI #{path}: #{detail}")
|
|
37
|
+
end
|
|
38
|
+
raise(ArgumentError, "Cannot use opaque URLs '#{path}'") unless uri.hierarchical?
|
|
39
|
+
raise(ArgumentError, "Must use URLs of type puppet as content URI") if uri.scheme != "puppet"
|
|
40
|
+
|
|
41
|
+
@content_uri = path
|
|
42
|
+
end
|
|
43
|
+
|
|
25
44
|
class MetaStat
|
|
26
45
|
extend Forwardable
|
|
27
46
|
|
|
28
|
-
def initialize(stat, source_permissions
|
|
47
|
+
def initialize(stat, source_permissions)
|
|
29
48
|
@stat = stat
|
|
30
49
|
@source_permissions_ignore = (!source_permissions || source_permissions == :ignore)
|
|
31
50
|
end
|
|
@@ -50,7 +69,7 @@ class Puppet::FileServing::Metadata < Puppet::FileServing::Base
|
|
|
50
69
|
require 'puppet/util/windows/security'
|
|
51
70
|
end
|
|
52
71
|
|
|
53
|
-
def initialize(stat, path, source_permissions
|
|
72
|
+
def initialize(stat, path, source_permissions)
|
|
54
73
|
super(stat, source_permissions)
|
|
55
74
|
@path = path
|
|
56
75
|
raise(ArgumentError, "Unsupported Windows source permissions option #{source_permissions}") unless @source_permissions_ignore
|
|
@@ -66,13 +85,13 @@ class Puppet::FileServing::Metadata < Puppet::FileServing::Base
|
|
|
66
85
|
end
|
|
67
86
|
end
|
|
68
87
|
|
|
69
|
-
def collect_stat(path
|
|
88
|
+
def collect_stat(path)
|
|
70
89
|
stat = stat()
|
|
71
90
|
|
|
72
91
|
if Puppet.features.microsoft_windows?
|
|
73
|
-
WindowsStat.new(stat, path, source_permissions)
|
|
92
|
+
WindowsStat.new(stat, path, @source_permissions)
|
|
74
93
|
else
|
|
75
|
-
MetaStat.new(stat, source_permissions)
|
|
94
|
+
MetaStat.new(stat, @source_permissions)
|
|
76
95
|
end
|
|
77
96
|
end
|
|
78
97
|
|
|
@@ -82,7 +101,7 @@ class Puppet::FileServing::Metadata < Puppet::FileServing::Base
|
|
|
82
101
|
def collect(source_permissions = nil)
|
|
83
102
|
real_path = full_path
|
|
84
103
|
|
|
85
|
-
stat = collect_stat(real_path
|
|
104
|
+
stat = collect_stat(real_path)
|
|
86
105
|
@owner = stat.owner
|
|
87
106
|
@group = stat.group
|
|
88
107
|
@ftype = stat.ftype
|
|
@@ -115,6 +134,8 @@ class Puppet::FileServing::Metadata < Puppet::FileServing::Base
|
|
|
115
134
|
@checksum_type ||= Puppet[:digest_algorithm]
|
|
116
135
|
@ftype = data.delete('type')
|
|
117
136
|
@destination = data.delete('destination')
|
|
137
|
+
@source = data.delete('source')
|
|
138
|
+
@content_uri = data.delete('content_uri')
|
|
118
139
|
super(path,data)
|
|
119
140
|
end
|
|
120
141
|
|
|
@@ -130,8 +151,8 @@ class Puppet::FileServing::Metadata < Puppet::FileServing::Base
|
|
|
130
151
|
},
|
|
131
152
|
'type' => ftype,
|
|
132
153
|
'destination' => destination,
|
|
133
|
-
|
|
134
|
-
|
|
154
|
+
}.merge(content_uri ? {'content_uri' => content_uri} : {})
|
|
155
|
+
.merge(source ? {'source' => source} : {})
|
|
135
156
|
)
|
|
136
157
|
end
|
|
137
158
|
|
|
@@ -2,19 +2,18 @@ require 'puppet/file_serving'
|
|
|
2
2
|
require 'puppet/file_serving/fileset'
|
|
3
3
|
|
|
4
4
|
# Define some common methods for FileServing termini.
|
|
5
|
+
|
|
5
6
|
module Puppet::FileServing::TerminusHelper
|
|
6
7
|
# Create model instance for a file in a file server.
|
|
7
8
|
def path2instance(request, path, options = {})
|
|
8
9
|
result = model.new(path, :relative_path => options[:relative_path])
|
|
9
|
-
result.checksum_type = request.options[:checksum_type] if request.options[:checksum_type]
|
|
10
10
|
result.links = request.options[:links] if request.options[:links]
|
|
11
11
|
|
|
12
|
-
|
|
13
|
-
if options[:
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
end
|
|
12
|
+
result.checksum_type = request.options[:checksum_type] if request.options[:checksum_type]
|
|
13
|
+
result.source_permissions = request.options[:source_permissions] if request.options[:source_permissions]
|
|
14
|
+
|
|
15
|
+
result.collect
|
|
16
|
+
|
|
18
17
|
result
|
|
19
18
|
end
|
|
20
19
|
|
|
@@ -26,7 +25,7 @@ module Puppet::FileServing::TerminusHelper
|
|
|
26
25
|
end
|
|
27
26
|
|
|
28
27
|
Puppet::FileServing::Fileset.merge(*filesets).collect do |file, base_path|
|
|
29
|
-
path2instance(request, base_path, :
|
|
28
|
+
path2instance(request, base_path, :relative_path => file)
|
|
30
29
|
end
|
|
31
30
|
end
|
|
32
31
|
end
|
|
@@ -39,11 +39,15 @@ class Puppet::FileSystem::MemoryImpl
|
|
|
39
39
|
object.path
|
|
40
40
|
end
|
|
41
41
|
|
|
42
|
-
def read(path)
|
|
42
|
+
def read(path, opts = {})
|
|
43
43
|
handle = assert_path(path).handle
|
|
44
44
|
handle.read
|
|
45
45
|
end
|
|
46
46
|
|
|
47
|
+
def read_preserve_line_endings(path)
|
|
48
|
+
read(path)
|
|
49
|
+
end
|
|
50
|
+
|
|
47
51
|
def open(path, *args, &block)
|
|
48
52
|
handle = assert_path(path).handle
|
|
49
53
|
if block_given?
|
|
@@ -156,7 +156,7 @@ class Puppet::FileSystem::Uniquefile < DelegateClass(File)
|
|
|
156
156
|
if $SAFE > 0
|
|
157
157
|
tmp = @@systmpdir
|
|
158
158
|
else
|
|
159
|
-
for dir in [
|
|
159
|
+
for dir in [ Puppet::Util.get_env('TMPDIR'), Puppet::Util.get_env('TMP'), Puppet::Util.get_env('TEMP'), @@systmpdir, '/tmp']
|
|
160
160
|
if dir and stat = File.stat(dir) and stat.directory? and stat.writable?
|
|
161
161
|
tmp = dir
|
|
162
162
|
break
|
|
@@ -175,7 +175,7 @@ class Puppet::FileSystem::Uniquefile < DelegateClass(File)
|
|
|
175
175
|
mkdir(lock)
|
|
176
176
|
yield
|
|
177
177
|
ensure
|
|
178
|
-
rmdir(lock) if lock
|
|
178
|
+
rmdir(lock) if Puppet::FileSystem.exist?(lock)
|
|
179
179
|
end
|
|
180
180
|
|
|
181
181
|
def mkdir(*args)
|
|
@@ -187,4 +187,4 @@ class Puppet::FileSystem::Uniquefile < DelegateClass(File)
|
|
|
187
187
|
end
|
|
188
188
|
end
|
|
189
189
|
|
|
190
|
-
end
|
|
190
|
+
end
|
|
@@ -4,21 +4,7 @@ require 'puppet/util/windows'
|
|
|
4
4
|
class Puppet::FileSystem::Windows < Puppet::FileSystem::Posix
|
|
5
5
|
|
|
6
6
|
def exist?(path)
|
|
7
|
-
|
|
8
|
-
return ::File.exist?(path)
|
|
9
|
-
end
|
|
10
|
-
|
|
11
|
-
path = path.to_str if path.respond_to?(:to_str) # support WatchedFile
|
|
12
|
-
path = path.to_s # support String and Pathname
|
|
13
|
-
|
|
14
|
-
begin
|
|
15
|
-
if Puppet::Util::Windows::File.symlink?(path)
|
|
16
|
-
path = Puppet::Util::Windows::File.readlink(path)
|
|
17
|
-
end
|
|
18
|
-
! Puppet::Util::Windows::File.stat(path).nil?
|
|
19
|
-
rescue # generally INVALID_HANDLE_VALUE which means 'file not found'
|
|
20
|
-
false
|
|
21
|
-
end
|
|
7
|
+
return Puppet::Util::Windows::File.exist?(path)
|
|
22
8
|
end
|
|
23
9
|
|
|
24
10
|
def symlink(path, dest, options = {})
|
|
@@ -62,7 +48,9 @@ class Puppet::FileSystem::Windows < Puppet::FileSystem::Posix
|
|
|
62
48
|
stat = Puppet::Util::Windows::File.stat(file_name) rescue nil
|
|
63
49
|
|
|
64
50
|
# sigh, Ruby + Windows :(
|
|
65
|
-
if stat
|
|
51
|
+
if !stat
|
|
52
|
+
::File.unlink(file_name) rescue Dir.rmdir(file_name)
|
|
53
|
+
elsif stat.ftype == 'directory'
|
|
66
54
|
if Puppet::Util::Windows::File.symlink?(file_name)
|
|
67
55
|
Dir.rmdir(file_name)
|
|
68
56
|
else
|
|
@@ -91,6 +79,14 @@ class Puppet::FileSystem::Windows < Puppet::FileSystem::Posix
|
|
|
91
79
|
Puppet::Util::Windows::Security.set_mode(mode, path.to_s)
|
|
92
80
|
end
|
|
93
81
|
|
|
82
|
+
def read_preserve_line_endings(path)
|
|
83
|
+
contents = path.read( :mode => 'rb', :encoding => Encoding::UTF_8)
|
|
84
|
+
contents = path.read( :mode => 'rb', :encoding => Encoding::default_external) unless contents.valid_encoding?
|
|
85
|
+
contents = path.read unless contents.valid_encoding?
|
|
86
|
+
|
|
87
|
+
contents
|
|
88
|
+
end
|
|
89
|
+
|
|
94
90
|
private
|
|
95
91
|
|
|
96
92
|
def raise_if_symlinks_unsupported
|
data/lib/puppet/file_system.rb
CHANGED
|
@@ -122,8 +122,21 @@ module Puppet::FileSystem
|
|
|
122
122
|
#
|
|
123
123
|
# @api public
|
|
124
124
|
#
|
|
125
|
-
def self.read(path)
|
|
126
|
-
@impl.read(assert_path(path))
|
|
125
|
+
def self.read(path, opts = {})
|
|
126
|
+
@impl.read(assert_path(path), opts)
|
|
127
|
+
end
|
|
128
|
+
|
|
129
|
+
# Read a file keeping the original line endings intact. This
|
|
130
|
+
# attempts to open files using binary mode using some encoding
|
|
131
|
+
# overrides and falling back to IO.read when none of the
|
|
132
|
+
# encodings are valid.
|
|
133
|
+
#
|
|
134
|
+
# @return [String] The contents of the file
|
|
135
|
+
#
|
|
136
|
+
# @api public
|
|
137
|
+
#
|
|
138
|
+
def self.read_preserve_line_endings(path)
|
|
139
|
+
@impl.read_preserve_line_endings(assert_path(path))
|
|
127
140
|
end
|
|
128
141
|
|
|
129
142
|
# @return [String] The binary contents of the file
|