puppet 8.5.1-x86-mingw32 → 8.6.0-x86-mingw32
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile.lock +23 -20
- data/ext/windows/service/daemon.rb +49 -55
- data/lib/hiera/scope.rb +3 -3
- data/lib/hiera_puppet.rb +1 -1
- data/lib/puppet/agent/disabler.rb +1 -1
- data/lib/puppet/application/agent.rb +2 -2
- data/lib/puppet/application/apply.rb +2 -2
- data/lib/puppet/application/describe.rb +6 -6
- data/lib/puppet/application/device.rb +99 -100
- data/lib/puppet/application/doc.rb +1 -1
- data/lib/puppet/application/face_base.rb +7 -7
- data/lib/puppet/application/filebucket.rb +1 -1
- data/lib/puppet/application/lookup.rb +5 -5
- data/lib/puppet/application/resource.rb +10 -3
- data/lib/puppet/application/ssl.rb +3 -3
- data/lib/puppet/application.rb +16 -18
- data/lib/puppet/coercion.rb +1 -1
- data/lib/puppet/configurer/downloader.rb +9 -4
- data/lib/puppet/configurer/fact_handler.rb +12 -13
- data/lib/puppet/configurer.rb +16 -18
- data/lib/puppet/confine/feature.rb +1 -1
- data/lib/puppet/confine/variable.rb +1 -1
- data/lib/puppet/confine.rb +2 -2
- data/lib/puppet/confine_collection.rb +1 -1
- data/lib/puppet/confiner.rb +2 -2
- data/lib/puppet/daemon.rb +3 -3
- data/lib/puppet/datatypes.rb +5 -6
- data/lib/puppet/defaults.rb +14 -8
- data/lib/puppet/environments.rb +3 -7
- data/lib/puppet/error.rb +3 -3
- data/lib/puppet/external/dot.rb +42 -34
- data/lib/puppet/face/catalog/select.rb +1 -1
- data/lib/puppet/face/epp.rb +7 -9
- data/lib/puppet/face/help.rb +12 -12
- data/lib/puppet/face/module/changes.rb +1 -3
- data/lib/puppet/face/module/list.rb +37 -37
- data/lib/puppet/face/node/clean.rb +1 -1
- data/lib/puppet/face/parser.rb +6 -8
- data/lib/puppet/face/report.rb +5 -7
- data/lib/puppet/facter_impl.rb +1 -1
- data/lib/puppet/feature/base.rb +9 -11
- data/lib/puppet/feature/pe_license.rb +1 -1
- data/lib/puppet/feature/ssh.rb +1 -1
- data/lib/puppet/feature/telnet.rb +3 -5
- data/lib/puppet/feature/zlib.rb +1 -1
- data/lib/puppet/ffi/windows/constants.rb +1 -1
- data/lib/puppet/ffi/windows/functions.rb +2 -2
- data/lib/puppet/ffi/windows/structs.rb +3 -3
- data/lib/puppet/file_bucket/dipper.rb +4 -4
- data/lib/puppet/file_bucket/file.rb +4 -4
- data/lib/puppet/file_serving/base.rb +5 -5
- data/lib/puppet/file_serving/configuration/parser.rb +9 -9
- data/lib/puppet/file_serving/configuration.rb +3 -3
- data/lib/puppet/file_serving/fileset.rb +13 -13
- data/lib/puppet/file_serving/http_metadata.rb +1 -1
- data/lib/puppet/file_serving/metadata.rb +13 -9
- data/lib/puppet/file_serving/mount/file.rb +6 -6
- data/lib/puppet/file_serving/mount/locales.rb +2 -4
- data/lib/puppet/file_serving/mount/pluginfacts.rb +2 -4
- data/lib/puppet/file_serving/mount/plugins.rb +2 -4
- data/lib/puppet/file_serving/mount.rb +1 -1
- data/lib/puppet/file_system/file_impl.rb +3 -3
- data/lib/puppet/file_system/memory_impl.rb +1 -1
- data/lib/puppet/file_system/path_pattern.rb +1 -1
- data/lib/puppet/file_system/uniquefile.rb +17 -16
- data/lib/puppet/file_system/windows.rb +26 -18
- data/lib/puppet/forge/cache.rb +2 -2
- data/lib/puppet/forge/errors.rb +1 -1
- data/lib/puppet/forge/repository.rb +2 -2
- data/lib/puppet/forge.rb +13 -19
- data/lib/puppet/functions/abs.rb +2 -2
- data/lib/puppet/functions/camelcase.rb +1 -1
- data/lib/puppet/functions/compare.rb +2 -2
- data/lib/puppet/functions/contain.rb +1 -1
- data/lib/puppet/functions/defined.rb +2 -2
- data/lib/puppet/functions/dig.rb +1 -1
- data/lib/puppet/functions/eyaml_lookup_key.rb +11 -13
- data/lib/puppet/functions/get.rb +1 -1
- data/lib/puppet/functions/hocon_data.rb +3 -5
- data/lib/puppet/functions/import.rb +1 -1
- data/lib/puppet/functions/json_data.rb +4 -6
- data/lib/puppet/functions/max.rb +2 -2
- data/lib/puppet/functions/min.rb +2 -2
- data/lib/puppet/functions/new.rb +1 -1
- data/lib/puppet/functions/reduce.rb +6 -10
- data/lib/puppet/functions/regsubst.rb +2 -2
- data/lib/puppet/functions/require.rb +1 -1
- data/lib/puppet/functions/yaml_data.rb +11 -13
- data/lib/puppet/functions.rb +32 -37
- data/lib/puppet/generate/type.rb +2 -2
- data/lib/puppet/gettext/config.rb +9 -9
- data/lib/puppet/graph/rb_tree_map.rb +31 -23
- data/lib/puppet/graph/relationship_graph.rb +12 -12
- data/lib/puppet/graph/simple_graph.rb +8 -10
- data/lib/puppet/http/client.rb +1 -1
- data/lib/puppet/http/dns.rb +4 -4
- data/lib/puppet/http/external_client.rb +1 -1
- data/lib/puppet/http/factory.rb +1 -1
- data/lib/puppet/http/proxy.rb +15 -15
- data/lib/puppet/http/redirector.rb +6 -2
- data/lib/puppet/http/resolver.rb +2 -2
- data/lib/puppet/http/retry_after_handler.rb +2 -2
- data/lib/puppet/http/service/ca.rb +1 -1
- data/lib/puppet/http/service/compiler.rb +4 -4
- data/lib/puppet/http/service/file_server.rb +1 -1
- data/lib/puppet/http/service/report.rb +2 -2
- data/lib/puppet/http/service.rb +9 -13
- data/lib/puppet/http/session.rb +1 -1
- data/lib/puppet/http/site.rb +1 -1
- data/lib/puppet/indirector/catalog/compiler.rb +44 -45
- data/lib/puppet/indirector/catalog/rest.rb +7 -5
- data/lib/puppet/indirector/catalog/store_configs.rb +1 -1
- data/lib/puppet/indirector/exec.rb +2 -2
- data/lib/puppet/indirector/face.rb +7 -9
- data/lib/puppet/indirector/fact_search.rb +1 -1
- data/lib/puppet/indirector/facts/facter.rb +6 -6
- data/lib/puppet/indirector/facts/json.rb +1 -1
- data/lib/puppet/indirector/facts/store_configs.rb +1 -1
- data/lib/puppet/indirector/file_bucket_file/file.rb +17 -17
- data/lib/puppet/indirector/file_bucket_file/rest.rb +3 -3
- data/lib/puppet/indirector/file_content/rest.rb +1 -1
- data/lib/puppet/indirector/file_metadata/rest.rb +1 -1
- data/lib/puppet/indirector/hiera.rb +1 -1
- data/lib/puppet/indirector/indirection.rb +27 -29
- data/lib/puppet/indirector/json.rb +4 -4
- data/lib/puppet/indirector/memory.rb +2 -2
- data/lib/puppet/indirector/msgpack.rb +5 -5
- data/lib/puppet/indirector/node/store_configs.rb +1 -1
- data/lib/puppet/indirector/none.rb +1 -1
- data/lib/puppet/indirector/report/json.rb +1 -1
- data/lib/puppet/indirector/report/yaml.rb +1 -1
- data/lib/puppet/indirector/request.rb +4 -4
- data/lib/puppet/indirector/resource/ral.rb +2 -4
- data/lib/puppet/indirector/resource/store_configs.rb +1 -1
- data/lib/puppet/indirector/terminus.rb +4 -4
- data/lib/puppet/indirector/yaml.rb +3 -3
- data/lib/puppet/info_service/class_information_service.rb +5 -8
- data/lib/puppet/info_service/task_information_service.rb +6 -7
- data/lib/puppet/interface/action.rb +5 -5
- data/lib/puppet/interface/action_manager.rb +5 -5
- data/lib/puppet/interface/documentation.rb +5 -5
- data/lib/puppet/interface/face_collection.rb +7 -7
- data/lib/puppet/interface/option.rb +2 -2
- data/lib/puppet/interface/option_manager.rb +6 -6
- data/lib/puppet/interface.rb +4 -4
- data/lib/puppet/metatype/manager.rb +2 -2
- data/lib/puppet/module/plan.rb +10 -10
- data/lib/puppet/module/task.rb +8 -8
- data/lib/puppet/module.rb +39 -41
- data/lib/puppet/module_tool/applications/application.rb +10 -8
- data/lib/puppet/module_tool/applications/installer.rb +53 -50
- data/lib/puppet/module_tool/applications/unpacker.rb +6 -8
- data/lib/puppet/module_tool/applications/upgrader.rb +37 -34
- data/lib/puppet/module_tool/checksums.rb +2 -2
- data/lib/puppet/module_tool/dependency.rb +1 -1
- data/lib/puppet/module_tool/errors/base.rb +1 -1
- data/lib/puppet/module_tool/install_directory.rb +1 -1
- data/lib/puppet/module_tool/local_tarball.rb +3 -5
- data/lib/puppet/module_tool/metadata.rb +12 -8
- data/lib/puppet/module_tool/shared_behaviors.rb +27 -12
- data/lib/puppet/module_tool/tar/mini.rb +3 -3
- data/lib/puppet/module_tool.rb +4 -4
- data/lib/puppet/network/client_request.rb +5 -3
- data/lib/puppet/network/format.rb +2 -2
- data/lib/puppet/network/format_support.rb +1 -1
- data/lib/puppet/network/formats.rb +1 -1
- data/lib/puppet/network/http/api/indirected_routes.rb +24 -44
- data/lib/puppet/network/http/api/server/v3.rb +1 -1
- data/lib/puppet/network/http/connection.rb +1 -1
- data/lib/puppet/network/http/handler.rb +8 -12
- data/lib/puppet/network/http/request.rb +1 -1
- data/lib/puppet/network/http/route.rb +9 -9
- data/lib/puppet/node/environment.rb +21 -23
- data/lib/puppet/node/facts.rb +1 -1
- data/lib/puppet/node.rb +5 -5
- data/lib/puppet/pal/json_catalog_encoder.rb +1 -1
- data/lib/puppet/pal/pal_impl.rb +48 -50
- data/lib/puppet/pal/plan_signature.rb +1 -1
- data/lib/puppet/pal/task_signature.rb +1 -1
- data/lib/puppet/parameter/package_options.rb +1 -1
- data/lib/puppet/parameter/value.rb +2 -2
- data/lib/puppet/parameter/value_collection.rb +7 -7
- data/lib/puppet/parameter.rb +8 -9
- data/lib/puppet/parser/ast/block_expression.rb +2 -2
- data/lib/puppet/parser/ast/hostclass.rb +1 -1
- data/lib/puppet/parser/ast/pops_bridge.rb +3 -4
- data/lib/puppet/parser/ast/resource.rb +4 -4
- data/lib/puppet/parser/ast/resourceparam.rb +4 -4
- data/lib/puppet/parser/ast.rb +14 -15
- data/lib/puppet/parser/compiler.rb +26 -28
- data/lib/puppet/parser/functions/create_resources.rb +3 -3
- data/lib/puppet/parser/functions/fail.rb +1 -1
- data/lib/puppet/parser/functions/generate.rb +2 -2
- data/lib/puppet/parser/functions/tag.rb +1 -1
- data/lib/puppet/parser/functions.rb +2 -2
- data/lib/puppet/parser/relationship.rb +3 -1
- data/lib/puppet/parser/resource/param.rb +2 -2
- data/lib/puppet/parser/resource.rb +23 -23
- data/lib/puppet/parser/scope.rb +10 -10
- data/lib/puppet/parser/script_compiler.rb +1 -1
- data/lib/puppet/parser/templatewrapper.rb +1 -1
- data/lib/puppet/parser/type_loader.rb +10 -12
- data/lib/puppet/parser.rb +1 -1
- data/lib/puppet/pops/adaptable.rb +1 -1
- data/lib/puppet/pops/evaluator/access_operator.rb +8 -8
- data/lib/puppet/pops/evaluator/callable_signature.rb +4 -4
- data/lib/puppet/pops/evaluator/collector_transformer.rb +4 -4
- data/lib/puppet/pops/evaluator/collectors/abstract_collector.rb +7 -7
- data/lib/puppet/pops/evaluator/collectors/fixed_set_collector.rb +6 -6
- data/lib/puppet/pops/evaluator/compare_operator.rb +10 -10
- data/lib/puppet/pops/evaluator/deferred_resolver.rb +1 -1
- data/lib/puppet/pops/evaluator/epp_evaluator.rb +2 -2
- data/lib/puppet/pops/evaluator/evaluator_impl.rb +56 -60
- data/lib/puppet/pops/evaluator/relationship_operator.rb +2 -2
- data/lib/puppet/pops/evaluator/runtime3_converter.rb +3 -3
- data/lib/puppet/pops/evaluator/runtime3_support.rb +1 -1
- data/lib/puppet/pops/functions/dispatcher.rb +3 -3
- data/lib/puppet/pops/functions/function.rb +14 -16
- data/lib/puppet/pops/issue_reporter.rb +2 -2
- data/lib/puppet/pops/label_provider.rb +2 -2
- data/lib/puppet/pops/loader/dependency_loader.rb +3 -3
- data/lib/puppet/pops/loader/loader.rb +4 -4
- data/lib/puppet/pops/loader/loader_paths.rb +3 -3
- data/lib/puppet/pops/loader/module_loaders.rb +11 -11
- data/lib/puppet/pops/loader/ruby_data_type_instantiator.rb +1 -1
- data/lib/puppet/pops/loader/ruby_function_instantiator.rb +1 -1
- data/lib/puppet/pops/loader/ruby_legacy_function_instantiator.rb +5 -1
- data/lib/puppet/pops/loader/static_loader.rb +3 -3
- data/lib/puppet/pops/loaders.rb +3 -3
- data/lib/puppet/pops/lookup/data_dig_function_provider.rb +1 -1
- data/lib/puppet/pops/lookup/explainer.rb +2 -2
- data/lib/puppet/pops/lookup/global_data_provider.rb +1 -1
- data/lib/puppet/pops/lookup/hiera_config.rb +15 -11
- data/lib/puppet/pops/lookup/interpolation.rb +3 -3
- data/lib/puppet/pops/lookup/key_recorder.rb +1 -1
- data/lib/puppet/pops/lookup/location_resolver.rb +1 -1
- data/lib/puppet/pops/lookup/lookup_adapter.rb +7 -7
- data/lib/puppet/pops/lookup/sub_lookup.rb +1 -1
- data/lib/puppet/pops/merge_strategy.rb +6 -6
- data/lib/puppet/pops/migration/migration_checker.rb +1 -1
- data/lib/puppet/pops/model/ast_transformer.rb +9 -11
- data/lib/puppet/pops/model/factory.rb +4 -5
- data/lib/puppet/pops/parser/epp_parser.rb +2 -2
- data/lib/puppet/pops/parser/epp_support.rb +1 -1
- data/lib/puppet/pops/parser/evaluating_parser.rb +2 -2
- data/lib/puppet/pops/parser/heredoc_support.rb +4 -4
- data/lib/puppet/pops/parser/interpolation_support.rb +3 -3
- data/lib/puppet/pops/parser/lexer2.rb +20 -12
- data/lib/puppet/pops/parser/lexer_support.rb +1 -1
- data/lib/puppet/pops/parser/locator.rb +4 -4
- data/lib/puppet/pops/parser/parser_support.rb +12 -14
- data/lib/puppet/pops/parser/pn_parser.rb +3 -3
- data/lib/puppet/pops/parser/slurp_support.rb +8 -8
- data/lib/puppet/pops/patterns.rb +12 -12
- data/lib/puppet/pops/pcore.rb +1 -1
- data/lib/puppet/pops/pn.rb +2 -2
- data/lib/puppet/pops/puppet_stack.rb +1 -1
- data/lib/puppet/pops/resource/resource_type_impl.rb +1 -1
- data/lib/puppet/pops/serialization/abstract_reader.rb +2 -2
- data/lib/puppet/pops/serialization/abstract_writer.rb +3 -3
- data/lib/puppet/pops/time/timestamp.rb +1 -1
- data/lib/puppet/pops/types/class_loader.rb +4 -6
- data/lib/puppet/pops/types/iterable.rb +1 -1
- data/lib/puppet/pops/types/p_binary_type.rb +1 -1
- data/lib/puppet/pops/types/p_init_type.rb +1 -1
- data/lib/puppet/pops/types/p_object_type.rb +5 -5
- data/lib/puppet/pops/types/p_object_type_extension.rb +4 -6
- data/lib/puppet/pops/types/p_sem_ver_range_type.rb +1 -1
- data/lib/puppet/pops/types/p_sensitive_type.rb +1 -1
- data/lib/puppet/pops/types/p_timespan_type.rb +2 -2
- data/lib/puppet/pops/types/p_type_set_type.rb +10 -10
- data/lib/puppet/pops/types/p_uri_type.rb +4 -4
- data/lib/puppet/pops/types/recursion_guard.rb +4 -4
- data/lib/puppet/pops/types/ruby_generator.rb +2 -2
- data/lib/puppet/pops/types/string_converter.rb +12 -8
- data/lib/puppet/pops/types/tree_iterators.rb +4 -6
- data/lib/puppet/pops/types/type_calculator.rb +10 -10
- data/lib/puppet/pops/types/type_factory.rb +7 -3
- data/lib/puppet/pops/types/type_formatter.rb +22 -24
- data/lib/puppet/pops/types/type_mismatch_describer.rb +24 -24
- data/lib/puppet/pops/types/types.rb +28 -24
- data/lib/puppet/pops/utils.rb +38 -42
- data/lib/puppet/pops/validation/checker4_0.rb +10 -10
- data/lib/puppet/pops/validation/tasks_checker.rb +1 -1
- data/lib/puppet/pops/validation/validator_factory_4_0.rb +1 -1
- data/lib/puppet/pops/validation.rb +4 -4
- data/lib/puppet/pops/visitor.rb +2 -2
- data/lib/puppet/property/ensure.rb +12 -14
- data/lib/puppet/property/keyvalue.rb +4 -4
- data/lib/puppet/property/list.rb +4 -4
- data/lib/puppet/property/ordered_list.rb +1 -1
- data/lib/puppet/property.rb +31 -33
- data/lib/puppet/provider/exec.rb +2 -2
- data/lib/puppet/provider/file/posix.rb +19 -17
- data/lib/puppet/provider/file/windows.rb +13 -19
- data/lib/puppet/provider/group/directoryservice.rb +3 -2
- data/lib/puppet/provider/group/groupadd.rb +4 -4
- data/lib/puppet/provider/group/windows_adsi.rb +2 -2
- data/lib/puppet/provider/nameservice/directoryservice.rb +29 -29
- data/lib/puppet/provider/nameservice/objectadd.rb +2 -4
- data/lib/puppet/provider/nameservice/pw.rb +1 -2
- data/lib/puppet/provider/nameservice.rb +8 -8
- data/lib/puppet/provider/package/aix.rb +19 -19
- data/lib/puppet/provider/package/appdmg.rb +2 -2
- data/lib/puppet/provider/package/apple.rb +1 -1
- data/lib/puppet/provider/package/apt.rb +18 -18
- data/lib/puppet/provider/package/aptitude.rb +1 -3
- data/lib/puppet/provider/package/aptrpm.rb +9 -9
- data/lib/puppet/provider/package/blastwave.rb +10 -14
- data/lib/puppet/provider/package/dnfmodule.rb +3 -3
- data/lib/puppet/provider/package/dpkg.rb +11 -13
- data/lib/puppet/provider/package/fink.rb +14 -14
- data/lib/puppet/provider/package/freebsd.rb +1 -1
- data/lib/puppet/provider/package/gem.rb +12 -14
- data/lib/puppet/provider/package/macports.rb +2 -2
- data/lib/puppet/provider/package/nim.rb +10 -10
- data/lib/puppet/provider/package/openbsd.rb +22 -22
- data/lib/puppet/provider/package/opkg.rb +6 -6
- data/lib/puppet/provider/package/pacman.rb +35 -29
- data/lib/puppet/provider/package/pip.rb +25 -24
- data/lib/puppet/provider/package/pkg.rb +15 -15
- data/lib/puppet/provider/package/pkgdmg.rb +10 -10
- data/lib/puppet/provider/package/pkgin.rb +2 -2
- data/lib/puppet/provider/package/pkgng.rb +5 -5
- data/lib/puppet/provider/package/pkgutil.rb +17 -21
- data/lib/puppet/provider/package/portage.rb +59 -61
- data/lib/puppet/provider/package/ports.rb +12 -11
- data/lib/puppet/provider/package/portupgrade.rb +35 -35
- data/lib/puppet/provider/package/puppetserver_gem.rb +10 -9
- data/lib/puppet/provider/package/rpm.rb +26 -26
- data/lib/puppet/provider/package/rug.rb +7 -9
- data/lib/puppet/provider/package/sun.rb +4 -4
- data/lib/puppet/provider/package/up2date.rb +5 -7
- data/lib/puppet/provider/package/urpmi.rb +6 -6
- data/lib/puppet/provider/package/windows/exe_package.rb +7 -7
- data/lib/puppet/provider/package/windows/msi_package.rb +3 -3
- data/lib/puppet/provider/package/windows/package.rb +2 -2
- data/lib/puppet/provider/package/windows.rb +3 -5
- data/lib/puppet/provider/package/yum.rb +33 -37
- data/lib/puppet/provider/package/zypper.rb +12 -14
- data/lib/puppet/provider/package.rb +1 -1
- data/lib/puppet/provider/package_targetable.rb +1 -1
- data/lib/puppet/provider/parsedfile.rb +9 -9
- data/lib/puppet/provider/service/base.rb +16 -21
- data/lib/puppet/provider/service/bsd.rb +4 -4
- data/lib/puppet/provider/service/daemontools.rb +31 -31
- data/lib/puppet/provider/service/debian.rb +6 -6
- data/lib/puppet/provider/service/freebsd.rb +36 -36
- data/lib/puppet/provider/service/gentoo.rb +6 -6
- data/lib/puppet/provider/service/init.rb +19 -19
- data/lib/puppet/provider/service/launchd.rb +22 -22
- data/lib/puppet/provider/service/openbsd.rb +10 -10
- data/lib/puppet/provider/service/openrc.rb +1 -1
- data/lib/puppet/provider/service/openwrt.rb +3 -3
- data/lib/puppet/provider/service/rcng.rb +3 -3
- data/lib/puppet/provider/service/redhat.rb +4 -4
- data/lib/puppet/provider/service/runit.rb +6 -6
- data/lib/puppet/provider/service/service.rb +5 -7
- data/lib/puppet/provider/service/smf.rb +28 -27
- data/lib/puppet/provider/service/src.rb +7 -7
- data/lib/puppet/provider/service/systemd.rb +31 -37
- data/lib/puppet/provider/service/upstart.rb +17 -17
- data/lib/puppet/provider/service/windows.rb +7 -7
- data/lib/puppet/provider/user/aix.rb +4 -2
- data/lib/puppet/provider/user/directoryservice.rb +34 -36
- data/lib/puppet/provider/user/hpux.rb +10 -14
- data/lib/puppet/provider/user/pw.rb +1 -1
- data/lib/puppet/provider/user/user_role_add.rb +16 -18
- data/lib/puppet/provider/user/useradd.rb +7 -7
- data/lib/puppet/provider/user/windows_adsi.rb +1 -1
- data/lib/puppet/provider.rb +8 -8
- data/lib/puppet/reference/indirection.rb +3 -0
- data/lib/puppet/reference/metaparameter.rb +1 -1
- data/lib/puppet/reference/providers.rb +3 -3
- data/lib/puppet/reference/type.rb +1 -1
- data/lib/puppet/relationship.rb +4 -5
- data/lib/puppet/reports/http.rb +1 -1
- data/lib/puppet/reports/log.rb +2 -2
- data/lib/puppet/reports/store.rb +4 -4
- data/lib/puppet/reports.rb +2 -2
- data/lib/puppet/resource/catalog.rb +16 -16
- data/lib/puppet/resource/status.rb +3 -3
- data/lib/puppet/resource/type.rb +8 -8
- data/lib/puppet/resource/type_collection.rb +1 -1
- data/lib/puppet/resource.rb +41 -41
- data/lib/puppet/scheduler/scheduler.rb +1 -1
- data/lib/puppet/settings/alias_setting.rb +3 -5
- data/lib/puppet/settings/base_setting.rb +11 -11
- data/lib/puppet/settings/boolean_setting.rb +2 -2
- data/lib/puppet/settings/config_file.rb +5 -4
- data/lib/puppet/settings/duration_setting.rb +2 -2
- data/lib/puppet/settings/environment_conf.rb +3 -3
- data/lib/puppet/settings/file_or_directory_setting.rb +2 -2
- data/lib/puppet/settings/file_setting.rb +11 -11
- data/lib/puppet/settings/ini_file.rb +3 -3
- data/lib/puppet/settings/port_setting.rb +1 -1
- data/lib/puppet/settings/priority_setting.rb +2 -2
- data/lib/puppet/settings/ttl_setting.rb +2 -2
- data/lib/puppet/settings/value_translator.rb +8 -8
- data/lib/puppet/settings.rb +65 -70
- data/lib/puppet/ssl/base.rb +2 -4
- data/lib/puppet/ssl/certificate_request.rb +18 -22
- data/lib/puppet/ssl/certificate_request_attributes.rb +3 -3
- data/lib/puppet/ssl/oids.rb +2 -2
- data/lib/puppet/ssl/openssl_loader.rb +4 -4
- data/lib/puppet/syntax_checkers/base64.rb +3 -3
- data/lib/puppet/syntax_checkers/epp.rb +3 -3
- data/lib/puppet/syntax_checkers/json.rb +3 -3
- data/lib/puppet/syntax_checkers/pp.rb +3 -3
- data/lib/puppet/transaction/additional_resource_generator.rb +1 -1
- data/lib/puppet/transaction/event.rb +2 -2
- data/lib/puppet/transaction/event_manager.rb +5 -5
- data/lib/puppet/transaction/persistence.rb +12 -14
- data/lib/puppet/transaction/report.rb +4 -4
- data/lib/puppet/transaction/resource_harness.rb +2 -2
- data/lib/puppet/transaction.rb +14 -18
- data/lib/puppet/type/component.rb +3 -3
- data/lib/puppet/type/exec.rb +43 -45
- data/lib/puppet/type/file/checksum_value.rb +1 -1
- data/lib/puppet/type/file/content.rb +6 -6
- data/lib/puppet/type/file/ctime.rb +2 -2
- data/lib/puppet/type/file/data_sync.rb +3 -3
- data/lib/puppet/type/file/ensure.rb +16 -15
- data/lib/puppet/type/file/mode.rb +9 -9
- data/lib/puppet/type/file/mtime.rb +2 -2
- data/lib/puppet/type/file/selcontext.rb +14 -14
- data/lib/puppet/type/file/source.rb +19 -21
- data/lib/puppet/type/file/target.rb +11 -11
- data/lib/puppet/type/file.rb +21 -21
- data/lib/puppet/type/filebucket.rb +3 -3
- data/lib/puppet/type/group.rb +3 -3
- data/lib/puppet/type/notify.rb +2 -2
- data/lib/puppet/type/package.rb +4 -4
- data/lib/puppet/type/resources.rb +6 -6
- data/lib/puppet/type/schedule.rb +9 -9
- data/lib/puppet/type/service.rb +6 -8
- data/lib/puppet/type/tidy.rb +22 -24
- data/lib/puppet/type/user.rb +13 -13
- data/lib/puppet/type.rb +76 -88
- data/lib/puppet/util/at_fork/solaris.rb +33 -37
- data/lib/puppet/util/autoload.rb +2 -2
- data/lib/puppet/util/backups.rb +9 -9
- data/lib/puppet/util/character_encoding.rb +7 -6
- data/lib/puppet/util/checksums.rb +2 -2
- data/lib/puppet/util/classgen.rb +8 -8
- data/lib/puppet/util/colors.rb +1 -1
- data/lib/puppet/util/command_line/puppet_option_parser.rb +1 -1
- data/lib/puppet/util/command_line/trollop.rb +42 -46
- data/lib/puppet/util/command_line.rb +2 -2
- data/lib/puppet/util/constant_inflector.rb +2 -2
- data/lib/puppet/util/diff.rb +19 -21
- data/lib/puppet/util/docs.rb +2 -2
- data/lib/puppet/util/errors.rb +9 -9
- data/lib/puppet/util/execution.rb +32 -9
- data/lib/puppet/util/feature.rb +1 -1
- data/lib/puppet/util/fileparsing.rb +12 -16
- data/lib/puppet/util/filetype.rb +36 -40
- data/lib/puppet/util/inifile.rb +6 -12
- data/lib/puppet/util/ldap/connection.rb +1 -1
- data/lib/puppet/util/ldap/manager.rb +10 -12
- data/lib/puppet/util/lockfile.rb +6 -8
- data/lib/puppet/util/log/destination.rb +2 -2
- data/lib/puppet/util/log/destinations.rb +4 -4
- data/lib/puppet/util/log.rb +12 -9
- data/lib/puppet/util/logging.rb +11 -11
- data/lib/puppet/util/metric.rb +3 -3
- data/lib/puppet/util/monkey_patches.rb +5 -7
- data/lib/puppet/util/network_device/config.rb +3 -3
- data/lib/puppet/util/package/version/debian.rb +27 -28
- data/lib/puppet/util/package/version/pip.rb +5 -5
- data/lib/puppet/util/package/version/range/eq.rb +1 -1
- data/lib/puppet/util/package/version/rpm.rb +1 -1
- data/lib/puppet/util/package.rb +2 -2
- data/lib/puppet/util/pidlock.rb +2 -2
- data/lib/puppet/util/platform.rb +1 -1
- data/lib/puppet/util/plist.rb +8 -10
- data/lib/puppet/util/posix.rb +17 -17
- data/lib/puppet/util/profiler/aggregate.rb +1 -1
- data/lib/puppet/util/provider_features.rb +3 -3
- data/lib/puppet/util/rdoc/code_objects.rb +3 -3
- data/lib/puppet/util/rdoc/generators/puppet_generator.rb +63 -64
- data/lib/puppet/util/rdoc/generators/template/puppet/puppet.rb +23 -23
- data/lib/puppet/util/rdoc/parser/puppet_parser_core.rb +12 -12
- data/lib/puppet/util/rdoc/parser/puppet_parser_rdoc2.rb +1 -1
- data/lib/puppet/util/rdoc/parser.rb +1 -1
- data/lib/puppet/util/reference.rb +13 -9
- data/lib/puppet/util/retry_action.rb +1 -1
- data/lib/puppet/util/rpm_compare.rb +17 -18
- data/lib/puppet/util/rubygems.rb +1 -1
- data/lib/puppet/util/selinux.rb +7 -7
- data/lib/puppet/util/storage.rb +10 -12
- data/lib/puppet/util/suidmanager.rb +18 -19
- data/lib/puppet/util/symbolic_file_mode.rb +71 -75
- data/lib/puppet/util/tag_set.rb +2 -2
- data/lib/puppet/util/tagging.rb +8 -10
- data/lib/puppet/util/terminal.rb +4 -4
- data/lib/puppet/util/user_attr.rb +7 -7
- data/lib/puppet/util/watcher.rb +3 -5
- data/lib/puppet/util/windows/access_control_list.rb +1 -1
- data/lib/puppet/util/windows/adsi.rb +42 -42
- data/lib/puppet/util/windows/daemon.rb +64 -68
- data/lib/puppet/util/windows/error.rb +2 -2
- data/lib/puppet/util/windows/file.rb +18 -25
- data/lib/puppet/util/windows/monkey_patches/process.rb +1 -1
- data/lib/puppet/util/windows/principal.rb +8 -8
- data/lib/puppet/util/windows/process.rb +16 -28
- data/lib/puppet/util/windows/registry.rb +16 -15
- data/lib/puppet/util/windows/root_certs.rb +2 -2
- data/lib/puppet/util/windows/security.rb +31 -31
- data/lib/puppet/util/windows/service.rb +11 -11
- data/lib/puppet/util/windows/sid.rb +8 -8
- data/lib/puppet/util/windows/user.rb +18 -20
- data/lib/puppet/util/yaml.rb +1 -1
- data/lib/puppet/util.rb +55 -46
- data/lib/puppet/version.rb +2 -2
- data/lib/puppet/x509/pem_store.rb +1 -1
- data/lib/puppet.rb +3 -3
- data/man/man5/puppet.conf.5 +10 -2
- data/man/man8/puppet-agent.8 +1 -1
- data/man/man8/puppet-apply.8 +1 -1
- data/man/man8/puppet-catalog.8 +1 -1
- data/man/man8/puppet-config.8 +1 -1
- data/man/man8/puppet-describe.8 +1 -1
- data/man/man8/puppet-device.8 +1 -1
- data/man/man8/puppet-doc.8 +1 -1
- data/man/man8/puppet-epp.8 +1 -1
- data/man/man8/puppet-facts.8 +1 -1
- data/man/man8/puppet-filebucket.8 +1 -1
- data/man/man8/puppet-generate.8 +1 -1
- data/man/man8/puppet-help.8 +1 -1
- data/man/man8/puppet-lookup.8 +1 -1
- data/man/man8/puppet-module.8 +1 -1
- data/man/man8/puppet-node.8 +1 -1
- data/man/man8/puppet-parser.8 +1 -1
- data/man/man8/puppet-plugin.8 +1 -1
- data/man/man8/puppet-report.8 +1 -1
- data/man/man8/puppet-resource.8 +5 -1
- data/man/man8/puppet-script.8 +1 -1
- data/man/man8/puppet-ssl.8 +1 -1
- data/man/man8/puppet.8 +2 -2
- metadata +2 -2
data/lib/puppet/environments.rb
CHANGED
@@ -35,11 +35,7 @@ module Puppet::Environments
|
|
35
35
|
# @!macro loader_get_or_fail
|
36
36
|
def get!(name)
|
37
37
|
environment = get(name)
|
38
|
-
|
39
|
-
environment
|
40
|
-
else
|
41
|
-
raise EnvironmentNotFound, name
|
42
|
-
end
|
38
|
+
environment || raise(EnvironmentNotFound, name)
|
43
39
|
end
|
44
40
|
|
45
41
|
def clear_all
|
@@ -198,7 +194,7 @@ module Puppet::Environments
|
|
198
194
|
if Puppet::FileSystem.symlink?(dir) && Puppet[:versioned_environment_dirs]
|
199
195
|
dir = Pathname.new Puppet::FileSystem.expand_path(Puppet::FileSystem.readlink(dir))
|
200
196
|
end
|
201
|
-
|
197
|
+
dir
|
202
198
|
end
|
203
199
|
|
204
200
|
# @!macro loader_search_paths
|
@@ -317,7 +313,7 @@ module Puppet::Environments
|
|
317
313
|
end
|
318
314
|
|
319
315
|
def clear_all
|
320
|
-
@loaders.each
|
316
|
+
@loaders.each(&:clear_all)
|
321
317
|
end
|
322
318
|
end
|
323
319
|
|
data/lib/puppet/error.rb
CHANGED
@@ -28,7 +28,7 @@ module Puppet
|
|
28
28
|
|
29
29
|
super(message, original)
|
30
30
|
|
31
|
-
@file = file unless
|
31
|
+
@file = file unless file.is_a?(String) && file.empty?
|
32
32
|
@line = line
|
33
33
|
@pos = pos
|
34
34
|
|
@@ -41,7 +41,7 @@ module Puppet
|
|
41
41
|
|
42
42
|
def to_s
|
43
43
|
msg = super
|
44
|
-
@file = nil if
|
44
|
+
@file = nil if @file.is_a?(String) && @file.empty?
|
45
45
|
msg += Puppet::Util::Errors.error_location_with_space(@file, @line, @pos)
|
46
46
|
msg
|
47
47
|
end
|
@@ -98,7 +98,7 @@ module Puppet
|
|
98
98
|
def self.from_issue_and_stack(issue, args = {})
|
99
99
|
filename, line = Puppet::Pops::PuppetStack.top_of_stack
|
100
100
|
|
101
|
-
|
101
|
+
new(
|
102
102
|
issue.format(args),
|
103
103
|
filename,
|
104
104
|
line,
|
data/lib/puppet/external/dot.rb
CHANGED
@@ -100,17 +100,17 @@ module DOT
|
|
100
100
|
|
101
101
|
# options for graph declaration
|
102
102
|
|
103
|
-
GRAPH_OPTS = [
|
104
|
-
|
105
|
-
|
106
|
-
|
107
|
-
|
108
|
-
|
109
|
-
|
110
|
-
|
111
|
-
|
112
|
-
|
113
|
-
|
103
|
+
GRAPH_OPTS = %w[
|
104
|
+
bgcolor
|
105
|
+
center clusterrank color concentrate
|
106
|
+
fontcolor fontname fontsize
|
107
|
+
label layerseq
|
108
|
+
margin mclimit
|
109
|
+
nodesep nslimit
|
110
|
+
ordering orientation
|
111
|
+
page
|
112
|
+
rank rankdir ranksep ratio
|
113
|
+
size
|
114
114
|
]
|
115
115
|
|
116
116
|
# a root class for any element in dot notation
|
@@ -119,7 +119,7 @@ module DOT
|
|
119
119
|
attr_accessor :name
|
120
120
|
|
121
121
|
def initialize(params = {})
|
122
|
-
@label = params['name']
|
122
|
+
@label = params['name'] || ''
|
123
123
|
end
|
124
124
|
|
125
125
|
def to_s
|
@@ -135,8 +135,8 @@ module DOT
|
|
135
135
|
|
136
136
|
def initialize(params = {}, option_list = [])
|
137
137
|
super(params)
|
138
|
-
@name = params['name']
|
139
|
-
@parent = params['parent']
|
138
|
+
@name = params['name'] || nil
|
139
|
+
@parent = params['parent'] || nil
|
140
140
|
@options = {}
|
141
141
|
option_list.each { |i|
|
142
142
|
@options[i] = params[i] if params[i]
|
@@ -161,11 +161,11 @@ module DOT
|
|
161
161
|
|
162
162
|
def initialize(params = {})
|
163
163
|
super(params)
|
164
|
-
@name = params['label']
|
164
|
+
@name = params['label'] || ''
|
165
165
|
end
|
166
166
|
|
167
167
|
def to_s
|
168
|
-
(@name && @name != "" ? "<#{@name}>" : "") +
|
168
|
+
(@name && @name != "" ? "<#{@name}>" : "") + @label.to_s
|
169
169
|
end
|
170
170
|
end
|
171
171
|
|
@@ -174,7 +174,7 @@ module DOT
|
|
174
174
|
class DOTNode < DOTElement
|
175
175
|
def initialize(params = {}, option_list = NODE_OPTS)
|
176
176
|
super(params, option_list)
|
177
|
-
@ports = params['ports']
|
177
|
+
@ports = params['ports'] || []
|
178
178
|
end
|
179
179
|
|
180
180
|
def each_port
|
@@ -196,16 +196,20 @@ module DOT
|
|
196
196
|
def to_s(t = '')
|
197
197
|
# This code is totally incomprehensible; it needs to be replaced!
|
198
198
|
|
199
|
-
label = @options['shape'] != 'record' && @ports.length == 0
|
200
|
-
|
201
|
-
|
202
|
-
|
203
|
-
|
204
|
-
|
205
|
-
|
206
|
-
|
207
|
-
|
208
|
-
|
199
|
+
label = if @options['shape'] != 'record' && @ports.length == 0
|
200
|
+
if @options['label']
|
201
|
+
t + $tab + "label = #{stringify(@options['label'])}\n"
|
202
|
+
else
|
203
|
+
''
|
204
|
+
end
|
205
|
+
else
|
206
|
+
t + $tab + 'label = "' + " \\\n" +
|
207
|
+
t + $tab2 + "#{stringify(@options['label'])}| \\\n" +
|
208
|
+
@ports.collect { |i|
|
209
|
+
t + $tab2 + i.to_s
|
210
|
+
}.join("| \\\n") + " \\\n" +
|
211
|
+
t + $tab + '"' + "\n"
|
212
|
+
end
|
209
213
|
|
210
214
|
t + "#{@name} [\n" +
|
211
215
|
@options.to_a.filter_map { |i|
|
@@ -229,7 +233,7 @@ module DOT
|
|
229
233
|
class DOTSubgraph < DOTElement
|
230
234
|
def initialize(params = {}, option_list = GRAPH_OPTS)
|
231
235
|
super(params, option_list)
|
232
|
-
@nodes = params['nodes']
|
236
|
+
@nodes = params['nodes'] || []
|
233
237
|
@dot_string = 'graph'
|
234
238
|
end
|
235
239
|
|
@@ -253,9 +257,11 @@ module DOT
|
|
253
257
|
hdr = t + "#{@dot_string} #{@name} {\n"
|
254
258
|
|
255
259
|
options = @options.to_a.filter_map { |name, val|
|
256
|
-
val && name != 'label'
|
257
|
-
t + $tab + "#{name} = #{val}"
|
260
|
+
if val && name != 'label'
|
261
|
+
t + $tab + "#{name} = #{val}"
|
262
|
+
else
|
258
263
|
name ? t + $tab + "#{name} = \"#{val}\"" : nil
|
264
|
+
end
|
259
265
|
}.join("\n") + "\n"
|
260
266
|
|
261
267
|
nodes = @nodes.collect { |i|
|
@@ -281,8 +287,8 @@ module DOT
|
|
281
287
|
|
282
288
|
def initialize(params = {}, option_list = EDGE_OPTS)
|
283
289
|
super(params, option_list)
|
284
|
-
@from = params['from']
|
285
|
-
@to = params['to']
|
290
|
+
@from = params['from'] || nil
|
291
|
+
@to = params['to'] || nil
|
286
292
|
end
|
287
293
|
|
288
294
|
def edge_link
|
@@ -292,9 +298,11 @@ module DOT
|
|
292
298
|
def to_s(t = '')
|
293
299
|
t + "#{@from} #{edge_link} #{to} [\n" +
|
294
300
|
@options.to_a.filter_map { |i|
|
295
|
-
i[1] && i[0] != 'label'
|
296
|
-
t + $tab + "#{i[0]} = #{i[1]}"
|
301
|
+
if i[1] && i[0] != 'label'
|
302
|
+
t + $tab + "#{i[0]} = #{i[1]}"
|
303
|
+
else
|
297
304
|
i[1] ? t + $tab + "#{i[0]} = \"#{i[1]}\"" : nil
|
305
|
+
end
|
298
306
|
}.join("\n") + "\n#{t}]\n"
|
299
307
|
end
|
300
308
|
end
|
data/lib/puppet/face/epp.rb
CHANGED
@@ -71,7 +71,7 @@ Puppet::Face.define(:epp, '0.0.1') do
|
|
71
71
|
status = true # no validation error yet
|
72
72
|
files = args
|
73
73
|
if files.empty?
|
74
|
-
if
|
74
|
+
if !STDIN.tty?
|
75
75
|
tmp = validate_template_string(STDIN.read)
|
76
76
|
status &&= tmp
|
77
77
|
else
|
@@ -194,7 +194,7 @@ Puppet::Face.define(:epp, '0.0.1') do
|
|
194
194
|
buffer.print dump_parse(Puppet::FileSystem.read(file, :encoding => 'utf-8'), file, options, show_filename)
|
195
195
|
end
|
196
196
|
|
197
|
-
|
197
|
+
unless missing_files.empty?
|
198
198
|
raise Puppet::Error, _("One or more file(s) specified did not exist:\n%{missing_files_list}") %
|
199
199
|
{ missing_files_list: missing_files.collect { |f| " #{f}" }.join("\n") }
|
200
200
|
end
|
@@ -350,12 +350,10 @@ Puppet::Face.define(:epp, '0.0.1') do
|
|
350
350
|
show_filename = args.count > 1
|
351
351
|
file_nbr = 0
|
352
352
|
args.each do |file|
|
353
|
-
|
354
|
-
|
355
|
-
|
356
|
-
|
357
|
-
status = false
|
358
|
-
end
|
353
|
+
buffer.print render_file(file, compiler, options, show_filename, file_nbr += 1)
|
354
|
+
rescue Puppet::ParseError => detail
|
355
|
+
Puppet.err(detail.message)
|
356
|
+
status = false
|
359
357
|
end
|
360
358
|
end
|
361
359
|
raise Puppet::Error, _("error while rendering epp") unless status
|
@@ -417,7 +415,7 @@ Puppet::Face.define(:epp, '0.0.1') do
|
|
417
415
|
rescue => e
|
418
416
|
Puppet.err(_("Could not load --values_file %{error}") % { error: e.message })
|
419
417
|
end
|
420
|
-
|
418
|
+
unless template_values.nil? || template_values.is_a?(Hash)
|
421
419
|
Puppet.err(_("--values_file option must evaluate to a Hash or undef/nil, got: '%{template_class}'") % { template_class: template_values.class })
|
422
420
|
end
|
423
421
|
end
|
data/lib/puppet/face/help.rb
CHANGED
@@ -95,7 +95,7 @@ Puppet::Face.define(:help, '0.0.1') do
|
|
95
95
|
end
|
96
96
|
|
97
97
|
def render_application_help(applicationname)
|
98
|
-
|
98
|
+
Puppet::Application[applicationname].help
|
99
99
|
rescue StandardError, LoadError => detail
|
100
100
|
message = []
|
101
101
|
message << _('Could not load help for the application %{application_name}.') % { application_name: applicationname }
|
@@ -107,7 +107,7 @@ Puppet::Face.define(:help, '0.0.1') do
|
|
107
107
|
|
108
108
|
def render_face_help(facename, actionname, version)
|
109
109
|
face, action = load_face_help(facename, actionname, version)
|
110
|
-
|
110
|
+
template_for(face, action).result(binding)
|
111
111
|
rescue StandardError, LoadError => detail
|
112
112
|
message = []
|
113
113
|
message << _('Could not load help for the face %{face_name}.') % { face_name: facename }
|
@@ -121,7 +121,7 @@ Puppet::Face.define(:help, '0.0.1') do
|
|
121
121
|
face = Puppet::Face[facename.to_sym, version]
|
122
122
|
if actionname
|
123
123
|
action = face.get_action(actionname.to_sym)
|
124
|
-
|
124
|
+
unless action
|
125
125
|
fail ArgumentError, _("Unable to load action %{actionname} from %{face}") % { actionname: actionname, face: face }
|
126
126
|
end
|
127
127
|
end
|
@@ -141,13 +141,13 @@ Puppet::Face.define(:help, '0.0.1') do
|
|
141
141
|
template = (Pathname(__FILE__).dirname + "help" + name)
|
142
142
|
erb = Puppet::Util.create_erb(template.read)
|
143
143
|
erb.filename = template.to_s
|
144
|
-
|
144
|
+
erb
|
145
145
|
end
|
146
146
|
|
147
147
|
# Return a list of applications that are not simply just stubs for Faces.
|
148
148
|
def legacy_applications
|
149
149
|
Puppet::Application.available_application_names.reject do |appname|
|
150
|
-
|
150
|
+
is_face_app?(appname) or exclude_from_docs?(appname)
|
151
151
|
end.sort
|
152
152
|
end
|
153
153
|
|
@@ -160,9 +160,9 @@ Puppet::Face.define(:help, '0.0.1') do
|
|
160
160
|
available_application_names_special_sort().inject([]) do |result, appname|
|
161
161
|
next result if exclude_from_docs?(appname)
|
162
162
|
|
163
|
-
if
|
163
|
+
if appname == COMMON || appname == SPECIALIZED || appname == BLANK
|
164
164
|
result << appname
|
165
|
-
elsif
|
165
|
+
elsif is_face_app?(appname)
|
166
166
|
begin
|
167
167
|
face = Puppet::Face[appname, :current]
|
168
168
|
# Add deprecation message to summary if the face is deprecated
|
@@ -194,7 +194,7 @@ Puppet::Face.define(:help, '0.0.1') do
|
|
194
194
|
BLANK = "\n"
|
195
195
|
def available_application_names_special_sort
|
196
196
|
full_list = Puppet::Application.available_application_names
|
197
|
-
a_list = full_list & %w
|
197
|
+
a_list = full_list & %w[apply agent config help lookup module resource]
|
198
198
|
a_list = a_list.sort
|
199
199
|
also_ran = full_list - a_list
|
200
200
|
also_ran = also_ran.sort
|
@@ -207,13 +207,13 @@ Puppet::Face.define(:help, '0.0.1') do
|
|
207
207
|
# depends on the implementation coincidence of how our pages are
|
208
208
|
# formatted. If we can't match the pattern we expect we return the empty
|
209
209
|
# string to ensure we don't blow up in the summary. --daniel 2011-04-11
|
210
|
-
while line = help.shift
|
211
|
-
md = /^puppet-#{appname}\([
|
210
|
+
while line = help.shift # rubocop:disable Lint/AssignmentInCondition
|
211
|
+
md = /^puppet-#{appname}\([^)]+\) -- (.*)$/.match(line)
|
212
212
|
if md
|
213
213
|
return md[1]
|
214
214
|
end
|
215
215
|
end
|
216
|
-
|
216
|
+
''
|
217
217
|
end
|
218
218
|
# This should absolutely be a private method, but for some reason it appears
|
219
219
|
# that you can't use the 'private' keyword inside of a Face definition.
|
@@ -221,7 +221,7 @@ Puppet::Face.define(:help, '0.0.1') do
|
|
221
221
|
# private :horribly_extract_summary_from
|
222
222
|
|
223
223
|
def exclude_from_docs?(appname)
|
224
|
-
%w
|
224
|
+
%w[face_base indirection_base report status].include? appname
|
225
225
|
end
|
226
226
|
# This should absolutely be a private method, but for some reason it appears
|
227
227
|
# that you can't use the 'private' keyword inside of a Face definition.
|
@@ -38,9 +38,7 @@ Puppet::Face.define(:module, '1.0.0') do
|
|
38
38
|
else
|
39
39
|
Puppet.warning _("%{count} files modified") % { count: return_value.size }
|
40
40
|
end
|
41
|
-
return_value.map
|
42
|
-
"#{changed_file}"
|
43
|
-
end.join("\n")
|
41
|
+
return_value.map(&:to_s).join("\n")
|
44
42
|
end
|
45
43
|
end
|
46
44
|
end
|
@@ -117,28 +117,28 @@ Puppet::Face.define(:module, '1.0.0') do
|
|
117
117
|
end
|
118
118
|
|
119
119
|
# Prepare the unmet dependencies for display on the console.
|
120
|
-
environment.modules.sort_by
|
120
|
+
environment.modules.sort_by(&:name).each do |mod|
|
121
121
|
unmet_grouped = Hash.new { |h, k| h[k] = [] }
|
122
122
|
unmet_grouped = mod.unmet_dependencies.each_with_object(unmet_grouped) do |dep, acc|
|
123
123
|
acc[dep[:reason]] << dep
|
124
124
|
end
|
125
125
|
unmet_grouped.each do |type, deps|
|
126
|
-
|
127
|
-
|
128
|
-
|
129
|
-
|
130
|
-
|
131
|
-
|
132
|
-
|
133
|
-
|
134
|
-
|
135
|
-
|
136
|
-
|
137
|
-
|
138
|
-
|
139
|
-
|
140
|
-
|
141
|
-
|
126
|
+
next if deps.empty?
|
127
|
+
|
128
|
+
unmet_grouped[type].sort_by { |dep| dep[:name] }.each do |dep|
|
129
|
+
dep_name = dep[:name].tr('/', '-')
|
130
|
+
installed_version = dep[:mod_details][:installed_version]
|
131
|
+
version_constraint = dep[:version_constraint]
|
132
|
+
parent_name = dep[:parent][:name].tr('/', '-')
|
133
|
+
parent_version = dep[:parent][:version]
|
134
|
+
|
135
|
+
msg = _("'%{parent_name}' (%{parent_version}) requires '%{dependency_name}' (%{dependency_version})") % { parent_name: parent_name, parent_version: parent_version, dependency_name: dep_name, dependency_version: version_constraint }
|
136
|
+
unmet_deps[type][dep[:name]][:errors] << msg
|
137
|
+
unmet_deps[type][dep[:name]][:parent] = {
|
138
|
+
:name => dep[:parent][:name],
|
139
|
+
:version => parent_version
|
140
|
+
}
|
141
|
+
unmet_deps[type][dep[:name]][:version] = installed_version
|
142
142
|
end
|
143
143
|
end
|
144
144
|
end
|
@@ -151,24 +151,24 @@ Puppet::Face.define(:module, '1.0.0') do
|
|
151
151
|
# Display unmet dependencies by category.
|
152
152
|
error_display_order = [:non_semantic_version, :version_mismatch, :missing]
|
153
153
|
error_display_order.each do |type|
|
154
|
-
|
155
|
-
|
156
|
-
|
157
|
-
|
158
|
-
|
159
|
-
|
160
|
-
|
161
|
-
|
162
|
-
|
163
|
-
|
164
|
-
|
165
|
-
|
166
|
-
|
167
|
-
|
168
|
-
|
169
|
-
|
170
|
-
|
171
|
-
|
154
|
+
next if @unmet_deps[type].empty?
|
155
|
+
|
156
|
+
@unmet_deps[type].keys.sort.each do |dep|
|
157
|
+
name = dep.tr('/', '-')
|
158
|
+
errors = @unmet_deps[type][dep][:errors]
|
159
|
+
version = @unmet_deps[type][dep][:version]
|
160
|
+
|
161
|
+
msg = case type
|
162
|
+
when :version_mismatch
|
163
|
+
_("Module '%{name}' (v%{version}) fails to meet some dependencies:\n") % { name: name, version: version }
|
164
|
+
when :non_semantic_version
|
165
|
+
_("Non semantic version dependency %{name} (v%{version}):\n") % { name: name, version: version }
|
166
|
+
else
|
167
|
+
_("Missing dependency '%{name}':\n") % { name: name }
|
168
|
+
end
|
169
|
+
|
170
|
+
errors.each { |error_string| msg << " #{error_string}\n" }
|
171
|
+
Puppet.warning msg.chomp
|
172
172
|
end
|
173
173
|
end
|
174
174
|
end
|
@@ -259,8 +259,8 @@ Puppet::Face.define(:module, '1.0.0') do
|
|
259
259
|
str << ' ' + colorize(:red, _('invalid'))
|
260
260
|
elsif parent.respond_to?(:forge_name)
|
261
261
|
unmet_parent = @unmet_deps[:version_mismatch][mod.forge_name][:parent]
|
262
|
-
if
|
263
|
-
|
262
|
+
if unmet_parent[:name] == parent.forge_name &&
|
263
|
+
unmet_parent[:version] == "v#{parent.version}"
|
264
264
|
str << ' ' + colorize(:red, _('invalid'))
|
265
265
|
end
|
266
266
|
end
|
data/lib/puppet/face/parser.rb
CHANGED
@@ -42,7 +42,7 @@ Puppet::Face.define(:parser, '0.0.1') do
|
|
42
42
|
parse_errors = {}
|
43
43
|
|
44
44
|
if files.empty?
|
45
|
-
if
|
45
|
+
if !STDIN.tty?
|
46
46
|
Puppet[:code] = STDIN.read
|
47
47
|
error = validate_manifest(nil)
|
48
48
|
parse_errors['STDIN'] = error if error
|
@@ -214,13 +214,11 @@ Puppet::Face.define(:parser, '0.0.1') do
|
|
214
214
|
loaders = Puppet::Pops::Loaders.new(env)
|
215
215
|
|
216
216
|
Puppet.override({ :loaders => loaders }, _('For puppet parser validate')) do
|
217
|
-
|
218
|
-
|
219
|
-
|
220
|
-
|
221
|
-
|
222
|
-
return parse_error
|
223
|
-
end
|
217
|
+
validation_environment = manifest ? env.override_with(:manifest => manifest) : env
|
218
|
+
validation_environment.check_for_reparse
|
219
|
+
validation_environment.known_resource_types.clear
|
220
|
+
rescue Puppet::ParseError => parse_error
|
221
|
+
return parse_error
|
224
222
|
end
|
225
223
|
|
226
224
|
nil
|
data/lib/puppet/face/report.rb
CHANGED
@@ -41,13 +41,11 @@ Puppet::Indirector::Face.define(:report, '0.0.1') do
|
|
41
41
|
return report
|
42
42
|
EOT
|
43
43
|
when_invoked do |report, _options|
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
Puppet.log_exception(detail, _("Could not send report: %{detail}") % { detail: detail })
|
50
|
-
end
|
44
|
+
Puppet::Transaction::Report.indirection.terminus_class = :rest
|
45
|
+
Puppet::Face[:report, "0.0.1"].save(report)
|
46
|
+
Puppet.notice _("Uploaded report for %{name}") % { name: report.name }
|
47
|
+
rescue => detail
|
48
|
+
Puppet.log_exception(detail, _("Could not send report: %{detail}") % { detail: detail })
|
51
49
|
end
|
52
50
|
end
|
53
51
|
deactivate_action(:find)
|
data/lib/puppet/facter_impl.rb
CHANGED
data/lib/puppet/feature/base.rb
CHANGED
@@ -24,7 +24,7 @@ raise Puppet::Error, _("Cannot determine basic system flavour") unless Puppet.fe
|
|
24
24
|
Puppet.features.add(:ldap, :libs => ["ldap"])
|
25
25
|
|
26
26
|
# We have the Rdoc::Usage library.
|
27
|
-
Puppet.features.add(:usage, :libs => %w
|
27
|
+
Puppet.features.add(:usage, :libs => %w[rdoc/ri/ri_paths rdoc/usage])
|
28
28
|
|
29
29
|
# We have libshadow, useful for managing passwords.
|
30
30
|
Puppet.features.add(:libshadow, :libs => ["shadow"])
|
@@ -36,7 +36,7 @@ Puppet.features.add(:root) do
|
|
36
36
|
end
|
37
37
|
|
38
38
|
# We have lcs diff
|
39
|
-
Puppet.features.add :diff, :libs => %w
|
39
|
+
Puppet.features.add :diff, :libs => %w[diff/lcs diff/lcs/hunk]
|
40
40
|
|
41
41
|
# We have OpenSSL
|
42
42
|
Puppet.features.add(:openssl, :libs => ["openssl"])
|
@@ -59,15 +59,13 @@ Puppet.features.add(:manages_symlinks) do
|
|
59
59
|
extend FFI::Library
|
60
60
|
|
61
61
|
def self.is_implemented # rubocop:disable Naming/PredicateName
|
62
|
-
|
63
|
-
|
64
|
-
|
65
|
-
|
66
|
-
|
67
|
-
|
68
|
-
|
69
|
-
false
|
70
|
-
end
|
62
|
+
ffi_lib :kernel32
|
63
|
+
attach_function :CreateSymbolicLinkW, [:lpwstr, :lpwstr, :dword], :boolean
|
64
|
+
|
65
|
+
true
|
66
|
+
rescue LoadError
|
67
|
+
Puppet.debug { "CreateSymbolicLink is not available" }
|
68
|
+
false
|
71
69
|
end
|
72
70
|
end
|
73
71
|
|
data/lib/puppet/feature/ssh.rb
CHANGED
data/lib/puppet/feature/zlib.rb
CHANGED
@@ -109,7 +109,7 @@ module Puppet::FFI::Windows
|
|
109
109
|
# https://msdn.microsoft.com/en-us/library/windows/desktop/aa364571(v=vs.85).aspx
|
110
110
|
FSCTL_GET_REPARSE_POINT = 0x900a8
|
111
111
|
|
112
|
-
MAXIMUM_REPARSE_DATA_BUFFER_SIZE =
|
112
|
+
MAXIMUM_REPARSE_DATA_BUFFER_SIZE = 16_384
|
113
113
|
|
114
114
|
# Priority constants
|
115
115
|
# https://docs.microsoft.com/en-us/windows/win32/api/processthreadsapi/nf-processthreadsapi-setpriorityclass
|
@@ -287,7 +287,7 @@ module Puppet::FFI::Windows
|
|
287
287
|
# LPDWORD pcbBytesNeeded
|
288
288
|
# );
|
289
289
|
SC_STATUS_TYPE = enum(
|
290
|
-
:SC_STATUS_PROCESS_INFO, 0
|
290
|
+
:SC_STATUS_PROCESS_INFO, 0
|
291
291
|
)
|
292
292
|
ffi_lib :advapi32
|
293
293
|
attach_function_private :QueryServiceStatusEx,
|
@@ -425,7 +425,7 @@ module Puppet::FFI::Windows
|
|
425
425
|
# LPCWSTR pszGroupName
|
426
426
|
# );
|
427
427
|
SC_ENUM_TYPE = enum(
|
428
|
-
:SC_ENUM_PROCESS_INFO, 0
|
428
|
+
:SC_ENUM_PROCESS_INFO, 0
|
429
429
|
)
|
430
430
|
ffi_lib :advapi32
|
431
431
|
attach_function_private :EnumServicesStatusExW,
|