openvox 7.37.2 → 8.19.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/CHANGELOG.md +6 -19
- data/Gemfile +18 -17
- data/README.md +25 -30
- data/Rakefile +44 -34
- data/bin/puppet +1 -0
- data/examples/hiera/README.md +68 -57
- data/examples/hiera/data/common.yaml +12 -0
- data/examples/hiera/data/dc1.yaml +6 -0
- data/examples/hiera/hiera.yaml +15 -0
- data/examples/hiera/modules/ntp/data/common.yaml +4 -0
- data/examples/hiera/modules/ntp/hiera.yaml +9 -0
- data/examples/hiera/modules/ntp/manifests/config.pp +16 -4
- data/examples/hiera/modules/ntp/templates/ntp.conf.epp +3 -0
- data/examples/hiera/modules/users/manifests/common.pp +7 -2
- data/examples/hiera/modules/users/manifests/dc1.pp +7 -2
- data/examples/hiera/site.pp +1 -1
- data/ext/build_defaults.yaml +1 -1
- data/ext/windows/service/daemon.rb +54 -60
- data/install.rb +21 -92
- data/lib/hiera/puppet_function.rb +8 -6
- data/lib/hiera/scope.rb +15 -13
- data/lib/hiera_puppet.rb +4 -6
- data/lib/puppet/agent/disabler.rb +5 -3
- data/lib/puppet/agent/locker.rb +2 -2
- data/lib/puppet/agent.rb +6 -4
- data/lib/puppet/application/agent.rb +305 -301
- data/lib/puppet/application/apply.rb +124 -117
- data/lib/puppet/application/catalog.rb +2 -0
- data/lib/puppet/application/config.rb +2 -0
- data/lib/puppet/application/describe.rb +50 -48
- data/lib/puppet/application/device.rb +224 -223
- data/lib/puppet/application/doc.rb +57 -58
- data/lib/puppet/application/epp.rb +2 -0
- data/lib/puppet/application/face_base.rb +18 -17
- data/lib/puppet/application/facts.rb +2 -0
- data/lib/puppet/application/filebucket.rb +174 -168
- data/lib/puppet/application/generate.rb +3 -1
- data/lib/puppet/application/help.rb +2 -0
- data/lib/puppet/application/indirection_base.rb +2 -0
- data/lib/puppet/application/lookup.rb +181 -181
- data/lib/puppet/application/module.rb +2 -0
- data/lib/puppet/application/node.rb +2 -0
- data/lib/puppet/application/parser.rb +2 -0
- data/lib/puppet/application/plugin.rb +2 -0
- data/lib/puppet/application/report.rb +2 -0
- data/lib/puppet/application/resource.rb +106 -96
- data/lib/puppet/application/script.rb +76 -74
- data/lib/puppet/application/ssl.rb +100 -92
- data/lib/puppet/application.rb +32 -32
- data/lib/puppet/application_support.rb +3 -2
- data/lib/puppet/coercion.rb +5 -3
- data/lib/puppet/compilable_resource_type.rb +4 -2
- data/lib/puppet/concurrent/lock.rb +2 -3
- data/lib/puppet/concurrent/synchronized.rb +2 -2
- data/lib/puppet/concurrent/thread_local_singleton.rb +1 -0
- data/lib/puppet/concurrent.rb +2 -0
- data/lib/puppet/configurer/downloader.rb +11 -5
- data/lib/puppet/configurer/fact_handler.rb +17 -16
- data/lib/puppet/configurer/plugin_handler.rb +2 -0
- data/lib/puppet/configurer.rb +40 -36
- data/lib/puppet/confine/any.rb +3 -1
- data/lib/puppet/confine/boolean.rb +3 -1
- data/lib/puppet/confine/exists.rb +3 -1
- data/lib/puppet/confine/false.rb +3 -1
- data/lib/puppet/confine/feature.rb +3 -2
- data/lib/puppet/confine/true.rb +3 -1
- data/lib/puppet/confine/variable.rb +4 -2
- data/lib/puppet/confine.rb +5 -2
- data/lib/puppet/confine_collection.rb +6 -3
- data/lib/puppet/confiner.rb +5 -3
- data/lib/puppet/context/trusted_information.rb +12 -10
- data/lib/puppet/context.rb +2 -0
- data/lib/puppet/daemon.rb +26 -10
- data/lib/puppet/data_binding.rb +3 -1
- data/lib/puppet/datatypes/error.rb +3 -1
- data/lib/puppet/datatypes/impl/error.rb +2 -0
- data/lib/puppet/datatypes.rb +12 -7
- data/lib/puppet/defaults.rb +164 -125
- data/lib/puppet/environments.rb +13 -15
- data/lib/puppet/error.rb +19 -15
- data/lib/puppet/etc.rb +10 -5
- data/lib/puppet/external/dot.rb +65 -75
- data/lib/puppet/face/catalog/select.rb +4 -2
- data/lib/puppet/face/catalog.rb +7 -5
- data/lib/puppet/face/config.rb +30 -31
- data/lib/puppet/face/epp.rb +25 -26
- data/lib/puppet/face/facts.rb +8 -6
- data/lib/puppet/face/generate.rb +5 -2
- data/lib/puppet/face/help/action.erb +0 -1
- data/lib/puppet/face/help/face.erb +0 -1
- data/lib/puppet/face/help/global.erb +1 -1
- data/lib/puppet/face/help.rb +80 -62
- data/lib/puppet/face/module/changes.rb +4 -3
- data/lib/puppet/face/module/install.rb +7 -4
- data/lib/puppet/face/module/list.rb +52 -53
- data/lib/puppet/face/module/uninstall.rb +2 -0
- data/lib/puppet/face/module/upgrade.rb +5 -3
- data/lib/puppet/face/module.rb +3 -1
- data/lib/puppet/face/node/clean.rb +4 -2
- data/lib/puppet/face/node.rb +5 -3
- data/lib/puppet/face/parser.rb +18 -19
- data/lib/puppet/face/plugin.rb +10 -8
- data/lib/puppet/face/report.rb +10 -10
- data/lib/puppet/face/resource.rb +2 -0
- data/lib/puppet/face.rb +2 -0
- data/lib/puppet/facter_impl.rb +1 -1
- data/lib/puppet/feature/base.rb +13 -13
- data/lib/puppet/feature/bolt.rb +2 -0
- data/lib/puppet/feature/cfpropertylist.rb +2 -0
- data/lib/puppet/feature/eventlog.rb +2 -0
- data/lib/puppet/feature/hiera_eyaml.rb +2 -0
- data/lib/puppet/feature/hocon.rb +2 -0
- data/lib/puppet/feature/libuser.rb +5 -3
- data/lib/puppet/feature/msgpack.rb +2 -0
- data/lib/puppet/feature/pe_license.rb +4 -2
- data/lib/puppet/feature/pson.rb +6 -0
- data/lib/puppet/feature/selinux.rb +2 -0
- data/lib/puppet/feature/ssh.rb +3 -1
- data/lib/puppet/feature/telnet.rb +3 -7
- data/lib/puppet/feature/zlib.rb +3 -1
- data/lib/puppet/ffi/posix/constants.rb +3 -1
- data/lib/puppet/ffi/posix/functions.rb +2 -1
- data/lib/puppet/ffi/posix.rb +2 -0
- data/lib/puppet/ffi/windows/api_types.rb +3 -1
- data/lib/puppet/ffi/windows/constants.rb +80 -78
- data/lib/puppet/ffi/windows/functions.rb +76 -75
- data/lib/puppet/ffi/windows/structs.rb +6 -5
- data/lib/puppet/ffi/windows.rb +2 -0
- data/lib/puppet/file_bucket/dipper.rb +20 -11
- data/lib/puppet/file_bucket/file.rb +8 -6
- data/lib/puppet/file_bucket.rb +2 -0
- data/lib/puppet/file_serving/base.rb +17 -9
- data/lib/puppet/file_serving/configuration/parser.rb +13 -10
- data/lib/puppet/file_serving/configuration.rb +10 -7
- data/lib/puppet/file_serving/content.rb +2 -0
- data/lib/puppet/file_serving/fileset.rb +23 -19
- data/lib/puppet/file_serving/http_metadata.rb +3 -4
- data/lib/puppet/file_serving/metadata.rb +26 -23
- data/lib/puppet/file_serving/mount/file.rb +15 -11
- data/lib/puppet/file_serving/mount/locales.rb +5 -5
- data/lib/puppet/file_serving/mount/modules.rb +3 -0
- data/lib/puppet/file_serving/mount/pluginfacts.rb +5 -5
- data/lib/puppet/file_serving/mount/plugins.rb +5 -5
- data/lib/puppet/file_serving/mount/scripts.rb +3 -0
- data/lib/puppet/file_serving/mount/tasks.rb +3 -0
- data/lib/puppet/file_serving/mount.rb +4 -1
- data/lib/puppet/file_serving/terminus_helper.rb +2 -0
- data/lib/puppet/file_serving/terminus_selector.rb +3 -1
- data/lib/puppet/file_serving.rb +2 -0
- data/lib/puppet/file_system/file_impl.rb +9 -8
- data/lib/puppet/file_system/jruby.rb +2 -0
- data/lib/puppet/file_system/memory_file.rb +3 -0
- data/lib/puppet/file_system/memory_impl.rb +5 -1
- data/lib/puppet/file_system/path_pattern.rb +4 -2
- data/lib/puppet/file_system/posix.rb +7 -2
- data/lib/puppet/file_system/uniquefile.rb +33 -31
- data/lib/puppet/file_system/windows.rb +33 -22
- data/lib/puppet/file_system.rb +5 -3
- data/lib/puppet/forge/cache.rb +4 -3
- data/lib/puppet/forge/errors.rb +3 -4
- data/lib/puppet/forge/repository.rb +6 -3
- data/lib/puppet/forge.rb +20 -22
- data/lib/puppet/functions/abs.rb +7 -4
- data/lib/puppet/functions/alert.rb +2 -0
- data/lib/puppet/functions/all.rb +3 -1
- data/lib/puppet/functions/annotate.rb +2 -0
- data/lib/puppet/functions/any.rb +3 -1
- data/lib/puppet/functions/assert_type.rb +5 -2
- data/lib/puppet/functions/binary_file.rb +4 -1
- data/lib/puppet/functions/break.rb +4 -2
- data/lib/puppet/functions/call.rb +2 -1
- data/lib/puppet/functions/camelcase.rb +4 -3
- data/lib/puppet/functions/capitalize.rb +4 -3
- data/lib/puppet/functions/ceiling.rb +3 -2
- data/lib/puppet/functions/chomp.rb +3 -2
- data/lib/puppet/functions/chop.rb +3 -2
- data/lib/puppet/functions/compare.rb +5 -3
- data/lib/puppet/functions/contain.rb +7 -4
- data/lib/puppet/functions/convert_to.rb +2 -0
- data/lib/puppet/functions/crit.rb +2 -0
- data/lib/puppet/functions/debug.rb +2 -0
- data/lib/puppet/functions/defined.rb +10 -6
- data/lib/puppet/functions/dig.rb +13 -10
- data/lib/puppet/functions/downcase.rb +4 -2
- data/lib/puppet/functions/each.rb +2 -0
- data/lib/puppet/functions/emerg.rb +2 -0
- data/lib/puppet/functions/empty.rb +2 -0
- data/lib/puppet/functions/epp.rb +2 -1
- data/lib/puppet/functions/err.rb +2 -0
- data/lib/puppet/functions/eyaml_lookup_key.rb +17 -16
- data/lib/puppet/functions/filter.rb +8 -7
- data/lib/puppet/functions/find_file.rb +6 -0
- data/lib/puppet/functions/find_template.rb +2 -0
- data/lib/puppet/functions/flatten.rb +2 -0
- data/lib/puppet/functions/floor.rb +3 -2
- data/lib/puppet/functions/get.rb +4 -2
- data/lib/puppet/functions/getvar.rb +7 -5
- data/lib/puppet/functions/group_by.rb +2 -2
- data/lib/puppet/functions/hiera.rb +2 -0
- data/lib/puppet/functions/hiera_array.rb +2 -0
- data/lib/puppet/functions/hiera_hash.rb +2 -0
- data/lib/puppet/functions/hiera_include.rb +3 -0
- data/lib/puppet/functions/hocon_data.rb +5 -5
- data/lib/puppet/functions/import.rb +3 -1
- data/lib/puppet/functions/include.rb +5 -2
- data/lib/puppet/functions/index.rb +5 -4
- data/lib/puppet/functions/info.rb +2 -0
- data/lib/puppet/functions/inline_epp.rb +2 -1
- data/lib/puppet/functions/join.rb +4 -2
- data/lib/puppet/functions/json_data.rb +6 -6
- data/lib/puppet/functions/keys.rb +2 -0
- data/lib/puppet/functions/length.rb +2 -1
- data/lib/puppet/functions/lest.rb +2 -0
- data/lib/puppet/functions/lookup.rb +12 -12
- data/lib/puppet/functions/lstrip.rb +3 -2
- data/lib/puppet/functions/map.rb +4 -2
- data/lib/puppet/functions/match.rb +8 -5
- data/lib/puppet/functions/max.rb +75 -8
- data/lib/puppet/functions/min.rb +75 -8
- data/lib/puppet/functions/module_directory.rb +2 -0
- data/lib/puppet/functions/new.rb +5 -3
- data/lib/puppet/functions/next.rb +3 -1
- data/lib/puppet/functions/notice.rb +2 -0
- data/lib/puppet/functions/reduce.rb +8 -11
- data/lib/puppet/functions/regsubst.rb +15 -16
- data/lib/puppet/functions/require.rb +7 -3
- data/lib/puppet/functions/return.rb +2 -0
- data/lib/puppet/functions/reverse_each.rb +2 -0
- data/lib/puppet/functions/round.rb +2 -0
- data/lib/puppet/functions/rstrip.rb +3 -2
- data/lib/puppet/functions/scanf.rb +2 -0
- data/lib/puppet/functions/size.rb +2 -2
- data/lib/puppet/functions/slice.rb +4 -1
- data/lib/puppet/functions/sort.rb +2 -0
- data/lib/puppet/functions/split.rb +2 -0
- data/lib/puppet/functions/step.rb +2 -0
- data/lib/puppet/functions/strftime.rb +5 -3
- data/lib/puppet/functions/strip.rb +3 -2
- data/lib/puppet/functions/then.rb +3 -0
- data/lib/puppet/functions/tree_each.rb +4 -3
- data/lib/puppet/functions/type.rb +2 -0
- data/lib/puppet/functions/unique.rb +12 -9
- data/lib/puppet/functions/unwrap.rb +2 -0
- data/lib/puppet/functions/upcase.rb +4 -2
- data/lib/puppet/functions/values.rb +2 -0
- data/lib/puppet/functions/versioncmp.rb +2 -1
- data/lib/puppet/functions/warning.rb +2 -0
- data/lib/puppet/functions/with.rb +2 -0
- data/lib/puppet/functions/yaml_data.rb +13 -13
- data/lib/puppet/functions.rb +57 -61
- data/lib/puppet/generate/models/type/property.rb +4 -1
- data/lib/puppet/generate/models/type/type.rb +5 -2
- data/lib/puppet/generate/type.rb +11 -5
- data/lib/puppet/gettext/config.rb +16 -9
- data/lib/puppet/gettext/module_translations.rb +2 -1
- data/lib/puppet/gettext/stubs.rb +2 -0
- data/lib/puppet/graph/key.rb +2 -0
- data/lib/puppet/graph/prioritizer.rb +2 -0
- data/lib/puppet/graph/rb_tree_map.rb +43 -24
- data/lib/puppet/graph/relationship_graph.rb +31 -29
- data/lib/puppet/graph/sequential_prioritizer.rb +2 -0
- data/lib/puppet/graph/simple_graph.rb +63 -57
- data/lib/puppet/graph.rb +2 -0
- data/lib/puppet/http/client.rb +10 -6
- data/lib/puppet/http/dns.rb +12 -12
- data/lib/puppet/http/errors.rb +4 -2
- data/lib/puppet/http/external_client.rb +4 -3
- data/lib/puppet/http/factory.rb +3 -1
- data/lib/puppet/http/pool.rb +3 -1
- data/lib/puppet/http/pool_entry.rb +2 -0
- data/lib/puppet/http/proxy.rb +21 -19
- data/lib/puppet/http/redirector.rb +5 -3
- data/lib/puppet/http/resolver/server_list.rb +5 -4
- data/lib/puppet/http/resolver/settings.rb +2 -1
- data/lib/puppet/http/resolver/srv.rb +2 -1
- data/lib/puppet/http/resolver.rb +4 -2
- data/lib/puppet/http/response.rb +2 -0
- data/lib/puppet/http/response_converter.rb +4 -3
- data/lib/puppet/http/response_net_http.rb +2 -1
- data/lib/puppet/http/retry_after_handler.rb +4 -3
- data/lib/puppet/http/service/ca.rb +37 -5
- data/lib/puppet/http/service/compiler.rb +13 -10
- data/lib/puppet/http/service/file_server.rb +5 -3
- data/lib/puppet/http/service/puppetserver.rb +3 -2
- data/lib/puppet/http/service/report.rb +5 -7
- data/lib/puppet/http/service.rb +17 -22
- data/lib/puppet/http/session.rb +6 -4
- data/lib/puppet/http/site.rb +3 -1
- data/lib/puppet/http.rb +4 -2
- data/lib/puppet/indirector/catalog/compiler.rb +81 -80
- data/lib/puppet/indirector/catalog/json.rb +2 -0
- data/lib/puppet/indirector/catalog/msgpack.rb +2 -0
- data/lib/puppet/indirector/catalog/rest.rb +2 -0
- data/lib/puppet/indirector/catalog/store_configs.rb +3 -3
- data/lib/puppet/indirector/catalog/yaml.rb +2 -0
- data/lib/puppet/indirector/code.rb +2 -0
- data/lib/puppet/indirector/data_binding/hiera.rb +2 -1
- data/lib/puppet/indirector/data_binding/none.rb +2 -0
- data/lib/puppet/indirector/direct_file_server.rb +4 -1
- data/lib/puppet/indirector/envelope.rb +2 -0
- data/lib/puppet/indirector/errors.rb +2 -0
- data/lib/puppet/indirector/exec.rb +5 -3
- data/lib/puppet/indirector/face.rb +17 -28
- data/lib/puppet/indirector/fact_search.rb +4 -2
- data/lib/puppet/indirector/facts/facter.rb +10 -7
- data/lib/puppet/indirector/facts/json.rb +4 -2
- data/lib/puppet/indirector/facts/memory.rb +2 -0
- data/lib/puppet/indirector/facts/network_device.rb +2 -0
- data/lib/puppet/indirector/facts/rest.rb +2 -0
- data/lib/puppet/indirector/facts/store_configs.rb +3 -2
- data/lib/puppet/indirector/facts/yaml.rb +2 -0
- data/lib/puppet/indirector/file_bucket_file/file.rb +33 -27
- data/lib/puppet/indirector/file_bucket_file/rest.rb +6 -3
- data/lib/puppet/indirector/file_bucket_file/selector.rb +2 -1
- data/lib/puppet/indirector/file_content/file.rb +2 -0
- data/lib/puppet/indirector/file_content/file_server.rb +2 -0
- data/lib/puppet/indirector/file_content/rest.rb +3 -1
- data/lib/puppet/indirector/file_content/selector.rb +2 -0
- data/lib/puppet/indirector/file_content.rb +2 -0
- data/lib/puppet/indirector/file_metadata/file.rb +2 -0
- data/lib/puppet/indirector/file_metadata/file_server.rb +2 -0
- data/lib/puppet/indirector/file_metadata/http.rb +4 -2
- data/lib/puppet/indirector/file_metadata/rest.rb +3 -1
- data/lib/puppet/indirector/file_metadata/selector.rb +2 -0
- data/lib/puppet/indirector/file_metadata.rb +2 -0
- data/lib/puppet/indirector/file_server.rb +3 -0
- data/lib/puppet/indirector/generic_http.rb +2 -0
- data/lib/puppet/indirector/hiera.rb +8 -7
- data/lib/puppet/indirector/indirection.rb +50 -41
- data/lib/puppet/indirector/json.rb +9 -6
- data/lib/puppet/indirector/memory.rb +5 -2
- data/lib/puppet/indirector/msgpack.rb +11 -7
- data/lib/puppet/indirector/node/exec.rb +6 -6
- data/lib/puppet/indirector/node/json.rb +2 -1
- data/lib/puppet/indirector/node/memory.rb +2 -0
- data/lib/puppet/indirector/node/msgpack.rb +2 -0
- data/lib/puppet/indirector/node/plain.rb +2 -0
- data/lib/puppet/indirector/node/rest.rb +2 -0
- data/lib/puppet/indirector/node/store_configs.rb +3 -3
- data/lib/puppet/indirector/node/yaml.rb +2 -0
- data/lib/puppet/indirector/none.rb +3 -2
- data/lib/puppet/indirector/plain.rb +2 -0
- data/lib/puppet/indirector/report/json.rb +4 -2
- data/lib/puppet/indirector/report/msgpack.rb +3 -1
- data/lib/puppet/indirector/report/processor.rb +3 -0
- data/lib/puppet/indirector/report/rest.rb +2 -13
- data/lib/puppet/indirector/report/yaml.rb +4 -2
- data/lib/puppet/indirector/request.rb +15 -12
- data/lib/puppet/indirector/resource/ral.rb +10 -10
- data/lib/puppet/indirector/resource/store_configs.rb +3 -1
- data/lib/puppet/indirector/resource/validator.rb +2 -0
- data/lib/puppet/indirector/rest.rb +3 -1
- data/lib/puppet/indirector/store_configs.rb +2 -0
- data/lib/puppet/indirector/terminus.rb +8 -4
- data/lib/puppet/indirector/yaml.rb +7 -5
- data/lib/puppet/indirector.rb +3 -0
- data/lib/puppet/info_service/class_information_service.rb +16 -17
- data/lib/puppet/info_service/plan_information_service.rb +5 -3
- data/lib/puppet/info_service/task_information_service.rb +10 -9
- data/lib/puppet/info_service.rb +1 -0
- data/lib/puppet/interface/action.rb +46 -42
- data/lib/puppet/interface/action_builder.rb +12 -6
- data/lib/puppet/interface/action_manager.rb +9 -6
- data/lib/puppet/interface/documentation.rb +40 -34
- data/lib/puppet/interface/face_collection.rb +18 -14
- data/lib/puppet/interface/option.rb +23 -11
- data/lib/puppet/interface/option_builder.rb +14 -9
- data/lib/puppet/interface/option_manager.rb +12 -10
- data/lib/puppet/interface.rb +9 -8
- data/lib/puppet/loaders.rb +2 -1
- data/lib/puppet/metatype/manager.rb +16 -15
- data/lib/puppet/module/plan.rb +22 -15
- data/lib/puppet/module/task.rb +33 -28
- data/lib/puppet/module.rb +59 -47
- data/lib/puppet/module_tool/applications/application.rb +17 -12
- data/lib/puppet/module_tool/applications/checksummer.rb +3 -3
- data/lib/puppet/module_tool/applications/installer.rb +78 -87
- data/lib/puppet/module_tool/applications/uninstaller.rb +24 -22
- data/lib/puppet/module_tool/applications/unpacker.rb +11 -9
- data/lib/puppet/module_tool/applications/upgrader.rb +66 -60
- data/lib/puppet/module_tool/applications.rb +2 -0
- data/lib/puppet/module_tool/checksums.rb +4 -3
- data/lib/puppet/module_tool/dependency.rb +5 -4
- data/lib/puppet/module_tool/errors/base.rb +3 -1
- data/lib/puppet/module_tool/errors/installer.rb +6 -5
- data/lib/puppet/module_tool/errors/shared.rb +16 -15
- data/lib/puppet/module_tool/errors/uninstaller.rb +3 -2
- data/lib/puppet/module_tool/errors/upgrader.rb +4 -3
- data/lib/puppet/module_tool/errors.rb +2 -0
- data/lib/puppet/module_tool/install_directory.rb +8 -5
- data/lib/puppet/module_tool/installed_modules.rb +5 -2
- data/lib/puppet/module_tool/local_tarball.rb +10 -8
- data/lib/puppet/module_tool/metadata.rb +36 -30
- data/lib/puppet/module_tool/shared_behaviors.rb +61 -43
- data/lib/puppet/module_tool/tar/gnu.rb +12 -8
- data/lib/puppet/module_tool/tar/mini.rb +6 -4
- data/lib/puppet/module_tool/tar.rb +4 -2
- data/lib/puppet/module_tool.rb +11 -11
- data/lib/puppet/network/authconfig.rb +2 -0
- data/lib/puppet/network/authorization.rb +2 -0
- data/lib/puppet/network/client_request.rb +7 -4
- data/lib/puppet/network/format.rb +9 -3
- data/lib/puppet/network/format_handler.rb +9 -7
- data/lib/puppet/network/format_support.rb +8 -7
- data/lib/puppet/network/formats.rb +34 -25
- data/lib/puppet/network/http/api/indirected_routes.rb +38 -45
- data/lib/puppet/network/http/api/indirection_type.rb +2 -1
- data/lib/puppet/network/http/api/master/v3/environments.rb +2 -1
- data/lib/puppet/network/http/api/master/v3.rb +2 -1
- data/lib/puppet/network/http/api/master.rb +2 -0
- data/lib/puppet/network/http/api/server/v3/environments.rb +21 -15
- data/lib/puppet/network/http/api/server/v3.rb +14 -13
- data/lib/puppet/network/http/api/server.rb +2 -0
- data/lib/puppet/network/http/api.rb +20 -18
- data/lib/puppet/network/http/connection.rb +6 -4
- data/lib/puppet/network/http/error.rb +5 -3
- data/lib/puppet/network/http/handler.rb +12 -14
- data/lib/puppet/network/http/issues.rb +2 -0
- data/lib/puppet/network/http/memory_response.rb +3 -1
- data/lib/puppet/network/http/request.rb +22 -10
- data/lib/puppet/network/http/response.rb +2 -0
- data/lib/puppet/network/http/route.rb +14 -11
- data/lib/puppet/network/http.rb +2 -0
- data/lib/puppet/network/http_pool.rb +4 -3
- data/lib/puppet/network/uri.rb +2 -0
- data/lib/puppet/network.rb +2 -0
- data/lib/puppet/node/environment.rb +36 -33
- data/lib/puppet/node/facts.rb +10 -10
- data/lib/puppet/node/server_facts.rb +7 -7
- data/lib/puppet/node.rb +12 -12
- data/lib/puppet/pal/catalog_compiler.rb +2 -3
- data/lib/puppet/pal/compiler.rb +11 -6
- data/lib/puppet/pal/function_signature.rb +5 -3
- data/lib/puppet/pal/json_catalog_encoder.rb +7 -2
- data/lib/puppet/pal/pal_api.rb +2 -0
- data/lib/puppet/pal/pal_impl.rb +103 -108
- data/lib/puppet/pal/plan_signature.rb +4 -2
- data/lib/puppet/pal/script_compiler.rb +4 -2
- data/lib/puppet/pal/task_signature.rb +15 -9
- data/lib/puppet/parameter/boolean.rb +2 -0
- data/lib/puppet/parameter/package_options.rb +3 -1
- data/lib/puppet/parameter/path.rb +7 -3
- data/lib/puppet/parameter/value.rb +5 -3
- data/lib/puppet/parameter/value_collection.rb +17 -16
- data/lib/puppet/parameter.rb +17 -16
- data/lib/puppet/parser/abstract_compiler.rb +2 -3
- data/lib/puppet/parser/ast/block_expression.rb +4 -2
- data/lib/puppet/parser/ast/branch.rb +2 -0
- data/lib/puppet/parser/ast/hostclass.rb +4 -2
- data/lib/puppet/parser/ast/leaf.rb +3 -0
- data/lib/puppet/parser/ast/node.rb +2 -0
- data/lib/puppet/parser/ast/pops_bridge.rb +13 -13
- data/lib/puppet/parser/ast/resource.rb +8 -8
- data/lib/puppet/parser/ast/resource_instance.rb +3 -0
- data/lib/puppet/parser/ast/resourceparam.rb +9 -7
- data/lib/puppet/parser/ast/top_level_construct.rb +2 -0
- data/lib/puppet/parser/ast.rb +16 -15
- data/lib/puppet/parser/catalog_compiler.rb +3 -3
- data/lib/puppet/parser/compiler/catalog_validator/relationship_validator.rb +4 -2
- data/lib/puppet/parser/compiler/catalog_validator.rb +2 -0
- data/lib/puppet/parser/compiler.rb +45 -44
- data/lib/puppet/parser/e4_parser_adapter.rb +17 -16
- data/lib/puppet/parser/files.rb +8 -6
- data/lib/puppet/parser/functions/assert_type.rb +43 -41
- data/lib/puppet/parser/functions/binary_file.rb +16 -14
- data/lib/puppet/parser/functions/break.rb +29 -27
- data/lib/puppet/parser/functions/contain.rb +3 -1
- data/lib/puppet/parser/functions/create_resources.rb +18 -14
- data/lib/puppet/parser/functions/defined.rb +104 -102
- data/lib/puppet/parser/functions/dig.rb +26 -24
- data/lib/puppet/parser/functions/digest.rb +3 -1
- data/lib/puppet/parser/functions/each.rb +101 -99
- data/lib/puppet/parser/functions/epp.rb +4 -3
- data/lib/puppet/parser/functions/fail.rb +11 -9
- data/lib/puppet/parser/functions/file.rb +16 -14
- data/lib/puppet/parser/functions/filter.rb +57 -55
- data/lib/puppet/parser/functions/find_file.rb +19 -18
- data/lib/puppet/parser/functions/fqdn_rand.rb +25 -23
- data/lib/puppet/parser/functions/generate.rb +23 -21
- data/lib/puppet/parser/functions/hiera.rb +95 -93
- data/lib/puppet/parser/functions/hiera_array.rb +83 -82
- data/lib/puppet/parser/functions/hiera_hash.rb +93 -92
- data/lib/puppet/parser/functions/hiera_include.rb +93 -92
- data/lib/puppet/parser/functions/include.rb +5 -3
- data/lib/puppet/parser/functions/inline_epp.rb +4 -3
- data/lib/puppet/parser/functions/inline_template.rb +15 -13
- data/lib/puppet/parser/functions/lest.rb +36 -34
- data/lib/puppet/parser/functions/lookup.rb +132 -130
- data/lib/puppet/parser/functions/map.rb +54 -52
- data/lib/puppet/parser/functions/match.rb +31 -29
- data/lib/puppet/parser/functions/md5.rb +4 -2
- data/lib/puppet/parser/functions/new.rb +916 -915
- data/lib/puppet/parser/functions/next.rb +36 -34
- data/lib/puppet/parser/functions/realize.rb +13 -11
- data/lib/puppet/parser/functions/reduce.rb +134 -132
- data/lib/puppet/parser/functions/regsubst.rb +8 -5
- data/lib/puppet/parser/functions/require.rb +8 -5
- data/lib/puppet/parser/functions/return.rb +90 -88
- data/lib/puppet/parser/functions/reverse_each.rb +59 -57
- data/lib/puppet/parser/functions/scanf.rb +25 -23
- data/lib/puppet/parser/functions/sha1.rb +4 -2
- data/lib/puppet/parser/functions/sha256.rb +3 -1
- data/lib/puppet/parser/functions/shellquote.rb +2 -0
- data/lib/puppet/parser/functions/slice.rb +27 -25
- data/lib/puppet/parser/functions/split.rb +7 -6
- data/lib/puppet/parser/functions/sprintf.rb +8 -7
- data/lib/puppet/parser/functions/step.rb +62 -60
- data/lib/puppet/parser/functions/strftime.rb +175 -173
- data/lib/puppet/parser/functions/tag.rb +10 -7
- data/lib/puppet/parser/functions/tagged.rb +16 -13
- data/lib/puppet/parser/functions/template.rb +27 -24
- data/lib/puppet/parser/functions/then.rb +54 -52
- data/lib/puppet/parser/functions/type.rb +36 -34
- data/lib/puppet/parser/functions/versioncmp.rb +3 -2
- data/lib/puppet/parser/functions/with.rb +22 -20
- data/lib/puppet/parser/functions.rb +12 -9
- data/lib/puppet/parser/parser_factory.rb +2 -0
- data/lib/puppet/parser/relationship.rb +9 -3
- data/lib/puppet/parser/resource/param.rb +4 -2
- data/lib/puppet/parser/resource.rb +42 -40
- data/lib/puppet/parser/scope.rb +84 -70
- data/lib/puppet/parser/script_compiler.rb +12 -12
- data/lib/puppet/parser/templatewrapper.rb +3 -2
- data/lib/puppet/parser/type_loader.rb +31 -30
- data/lib/puppet/parser.rb +3 -1
- data/lib/puppet/plugins/configuration.rb +2 -0
- data/lib/puppet/plugins/syntax_checkers.rb +2 -1
- data/lib/puppet/plugins.rb +3 -1
- data/lib/puppet/pops/adaptable.rb +5 -3
- data/lib/puppet/pops/adapters.rb +4 -1
- data/lib/puppet/pops/evaluator/access_operator.rb +133 -120
- data/lib/puppet/pops/evaluator/callable_signature.rb +6 -5
- data/lib/puppet/pops/evaluator/closure.rb +272 -277
- data/lib/puppet/pops/evaluator/collector_transformer.rb +18 -15
- data/lib/puppet/pops/evaluator/collectors/abstract_collector.rb +10 -8
- data/lib/puppet/pops/evaluator/collectors/catalog_collector.rb +4 -3
- data/lib/puppet/pops/evaluator/collectors/exported_collector.rb +6 -5
- data/lib/puppet/pops/evaluator/collectors/fixed_set_collector.rb +10 -10
- data/lib/puppet/pops/evaluator/compare_operator.rb +36 -21
- data/lib/puppet/pops/evaluator/deferred_resolver.rb +19 -17
- data/lib/puppet/pops/evaluator/epp_evaluator.rb +19 -18
- data/lib/puppet/pops/evaluator/evaluator_impl.rb +245 -245
- data/lib/puppet/pops/evaluator/external_syntax_support.rb +3 -2
- data/lib/puppet/pops/evaluator/json_strict_literal_evaluator.rb +6 -5
- data/lib/puppet/pops/evaluator/literal_evaluator.rb +5 -5
- data/lib/puppet/pops/evaluator/puppet_proc.rb +6 -3
- data/lib/puppet/pops/evaluator/relationship_operator.rb +14 -11
- data/lib/puppet/pops/evaluator/runtime3_converter.rb +34 -30
- data/lib/puppet/pops/evaluator/runtime3_resource_support.rb +35 -35
- data/lib/puppet/pops/evaluator/runtime3_support.rb +32 -39
- data/lib/puppet/pops/functions/dispatch.rb +7 -7
- data/lib/puppet/pops/functions/dispatcher.rb +8 -7
- data/lib/puppet/pops/functions/function.rb +18 -20
- data/lib/puppet/pops/issue_reporter.rb +25 -22
- data/lib/puppet/pops/issues.rb +10 -5
- data/lib/puppet/pops/label_provider.rb +6 -4
- data/lib/puppet/pops/loader/base_loader.rb +4 -4
- data/lib/puppet/pops/loader/dependency_loader.rb +8 -4
- data/lib/puppet/pops/loader/gem_support.rb +5 -2
- data/lib/puppet/pops/loader/generic_plan_instantiator.rb +2 -0
- data/lib/puppet/pops/loader/loader.rb +8 -8
- data/lib/puppet/pops/loader/loader_paths.rb +42 -41
- data/lib/puppet/pops/loader/module_loaders.rb +45 -49
- data/lib/puppet/pops/loader/predefined_loader.rb +3 -3
- data/lib/puppet/pops/loader/puppet_function_instantiator.rb +6 -2
- data/lib/puppet/pops/loader/puppet_plan_instantiator.rb +6 -2
- data/lib/puppet/pops/loader/puppet_resource_type_impl_instantiator.rb +6 -5
- data/lib/puppet/pops/loader/ruby_data_type_instantiator.rb +5 -1
- data/lib/puppet/pops/loader/ruby_function_instantiator.rb +5 -1
- data/lib/puppet/pops/loader/ruby_legacy_function_instantiator.rb +18 -8
- data/lib/puppet/pops/loader/runtime3_type_loader.rb +4 -3
- data/lib/puppet/pops/loader/simple_environment_loader.rb +3 -3
- data/lib/puppet/pops/loader/static_loader.rb +29 -27
- data/lib/puppet/pops/loader/task_instantiator.rb +4 -2
- data/lib/puppet/pops/loader/type_definition_instantiator.rb +9 -5
- data/lib/puppet/pops/loader/typed_name.rb +4 -2
- data/lib/puppet/pops/loader/uri_helper.rb +3 -1
- data/lib/puppet/pops/loaders.rb +27 -23
- data/lib/puppet/pops/lookup/configured_data_provider.rb +2 -0
- data/lib/puppet/pops/lookup/context.rb +32 -23
- data/lib/puppet/pops/lookup/data_adapter.rb +2 -0
- data/lib/puppet/pops/lookup/data_dig_function_provider.rb +8 -7
- data/lib/puppet/pops/lookup/data_hash_function_provider.rb +5 -3
- data/lib/puppet/pops/lookup/data_provider.rb +2 -0
- data/lib/puppet/pops/lookup/environment_data_provider.rb +2 -0
- data/lib/puppet/pops/lookup/explainer.rb +47 -45
- data/lib/puppet/pops/lookup/function_provider.rb +8 -6
- data/lib/puppet/pops/lookup/global_data_provider.rb +4 -3
- data/lib/puppet/pops/lookup/hiera_config.rb +208 -160
- data/lib/puppet/pops/lookup/interpolation.rb +21 -10
- data/lib/puppet/pops/lookup/invocation.rb +4 -0
- data/lib/puppet/pops/lookup/key_recorder.rb +6 -3
- data/lib/puppet/pops/lookup/location_resolver.rb +4 -2
- data/lib/puppet/pops/lookup/lookup_adapter.rb +39 -34
- data/lib/puppet/pops/lookup/lookup_key.rb +3 -1
- data/lib/puppet/pops/lookup/lookup_key_function_provider.rb +4 -2
- data/lib/puppet/pops/lookup/module_data_provider.rb +12 -9
- data/lib/puppet/pops/lookup/sub_lookup.rb +7 -3
- data/lib/puppet/pops/lookup.rb +16 -11
- data/lib/puppet/pops/merge_strategy.rb +22 -16
- data/lib/puppet/pops/migration/migration_checker.rb +8 -5
- data/lib/puppet/pops/model/ast.rb +786 -685
- data/lib/puppet/pops/model/ast_transformer.rb +18 -18
- data/lib/puppet/pops/model/factory.rb +33 -31
- data/lib/puppet/pops/model/model_label_provider.rb +5 -2
- data/lib/puppet/pops/model/model_tree_dumper.rb +32 -30
- data/lib/puppet/pops/model/pn_transformer.rb +5 -6
- data/lib/puppet/pops/model/tree_dumper.rb +7 -4
- data/lib/puppet/pops/parser/code_merger.rb +3 -3
- data/lib/puppet/pops/parser/epp_parser.rb +6 -5
- data/lib/puppet/pops/parser/epp_support.rb +10 -9
- data/lib/puppet/pops/parser/evaluating_parser.rb +13 -9
- data/lib/puppet/pops/parser/heredoc_support.rb +14 -14
- data/lib/puppet/pops/parser/interpolation_support.rb +25 -25
- data/lib/puppet/pops/parser/lexer2.rb +74 -62
- data/lib/puppet/pops/parser/lexer_support.rb +57 -57
- data/lib/puppet/pops/parser/locatable.rb +2 -2
- data/lib/puppet/pops/parser/locator.rb +47 -43
- data/lib/puppet/pops/parser/parser_support.rb +22 -21
- data/lib/puppet/pops/parser/pn_parser.rb +10 -9
- data/lib/puppet/pops/parser/slurp_support.rb +41 -40
- data/lib/puppet/pops/patterns.rb +14 -14
- data/lib/puppet/pops/pcore.rb +7 -6
- data/lib/puppet/pops/pn.rb +8 -5
- data/lib/puppet/pops/puppet_stack.rb +3 -1
- data/lib/puppet/pops/resource/param.rb +13 -12
- data/lib/puppet/pops/resource/resource_type_impl.rb +47 -45
- data/lib/puppet/pops/semantic_error.rb +3 -1
- data/lib/puppet/pops/serialization/abstract_reader.rb +6 -4
- data/lib/puppet/pops/serialization/abstract_writer.rb +11 -9
- data/lib/puppet/pops/serialization/deserializer.rb +3 -0
- data/lib/puppet/pops/serialization/extension.rb +8 -0
- data/lib/puppet/pops/serialization/from_data_converter.rb +16 -9
- data/lib/puppet/pops/serialization/instance_reader.rb +2 -0
- data/lib/puppet/pops/serialization/instance_writer.rb +2 -0
- data/lib/puppet/pops/serialization/json.rb +9 -5
- data/lib/puppet/pops/serialization/json_path.rb +3 -1
- data/lib/puppet/pops/serialization/object.rb +6 -3
- data/lib/puppet/pops/serialization/serializer.rb +20 -16
- data/lib/puppet/pops/serialization/time_factory.rb +2 -1
- data/lib/puppet/pops/serialization/to_data_converter.rb +9 -6
- data/lib/puppet/pops/serialization/to_stringified_converter.rb +8 -7
- data/lib/puppet/pops/serialization.rb +10 -8
- data/lib/puppet/pops/time/timespan.rb +33 -21
- data/lib/puppet/pops/time/timestamp.rb +12 -5
- data/lib/puppet/pops/types/annotatable.rb +3 -2
- data/lib/puppet/pops/types/annotation.rb +6 -4
- data/lib/puppet/pops/types/class_loader.rb +17 -15
- data/lib/puppet/pops/types/implementation_registry.rb +4 -1
- data/lib/puppet/pops/types/iterable.rb +24 -14
- data/lib/puppet/pops/types/p_binary_type.rb +6 -6
- data/lib/puppet/pops/types/p_init_type.rb +15 -12
- data/lib/puppet/pops/types/p_meta_type.rb +6 -5
- data/lib/puppet/pops/types/p_object_type.rb +104 -79
- data/lib/puppet/pops/types/p_object_type_extension.rb +15 -14
- data/lib/puppet/pops/types/p_runtime_type.rb +12 -10
- data/lib/puppet/pops/types/p_sem_ver_range_type.rb +3 -2
- data/lib/puppet/pops/types/p_sem_ver_type.rb +8 -8
- data/lib/puppet/pops/types/p_sensitive_type.rb +3 -5
- data/lib/puppet/pops/types/p_timespan_type.rb +7 -5
- data/lib/puppet/pops/types/p_timestamp_type.rb +4 -3
- data/lib/puppet/pops/types/p_type_set_type.rb +51 -44
- data/lib/puppet/pops/types/p_uri_type.rb +41 -33
- data/lib/puppet/pops/types/puppet_object.rb +2 -1
- data/lib/puppet/pops/types/recursion_guard.rb +12 -6
- data/lib/puppet/pops/types/ruby_generator.rb +19 -14
- data/lib/puppet/pops/types/ruby_method.rb +8 -7
- data/lib/puppet/pops/types/string_converter.rb +113 -103
- data/lib/puppet/pops/types/tree_iterators.rb +16 -20
- data/lib/puppet/pops/types/type_acceptor.rb +2 -0
- data/lib/puppet/pops/types/type_asserter.rb +5 -3
- data/lib/puppet/pops/types/type_assertion_error.rb +1 -1
- data/lib/puppet/pops/types/type_calculator.rb +56 -49
- data/lib/puppet/pops/types/type_conversion_error.rb +2 -10
- data/lib/puppet/pops/types/type_factory.rb +25 -16
- data/lib/puppet/pops/types/type_formatter.rb +60 -65
- data/lib/puppet/pops/types/type_mismatch_describer.rb +62 -53
- data/lib/puppet/pops/types/type_parser.rb +124 -117
- data/lib/puppet/pops/types/type_set_reference.rb +3 -0
- data/lib/puppet/pops/types/type_with_members.rb +2 -2
- data/lib/puppet/pops/types/types.rb +267 -249
- data/lib/puppet/pops/utils.rb +43 -45
- data/lib/puppet/pops/validation/checker4_0.rb +65 -58
- data/lib/puppet/pops/validation/tasks_checker.rb +7 -5
- data/lib/puppet/pops/validation/validator_factory_4_0.rb +2 -2
- data/lib/puppet/pops/validation.rb +26 -23
- data/lib/puppet/pops/visitable.rb +2 -0
- data/lib/puppet/pops/visitor.rb +18 -4
- data/lib/puppet/pops.rb +6 -3
- data/lib/puppet/property/boolean.rb +2 -0
- data/lib/puppet/property/ensure.rb +17 -16
- data/lib/puppet/property/keyvalue.rb +15 -14
- data/lib/puppet/property/list.rb +10 -9
- data/lib/puppet/property/ordered_list.rb +6 -5
- data/lib/puppet/property.rb +47 -48
- data/lib/puppet/provider/aix_object.rb +15 -9
- data/lib/puppet/provider/command.rb +2 -0
- data/lib/puppet/provider/confine.rb +2 -0
- data/lib/puppet/provider/exec/posix.rb +4 -1
- data/lib/puppet/provider/exec/shell.rb +2 -0
- data/lib/puppet/provider/exec/windows.rb +6 -4
- data/lib/puppet/provider/exec.rb +6 -4
- data/lib/puppet/provider/file/posix.rb +37 -19
- data/lib/puppet/provider/file/windows.rb +28 -29
- data/lib/puppet/provider/group/aix.rb +4 -2
- data/lib/puppet/provider/group/directoryservice.rb +7 -5
- data/lib/puppet/provider/group/groupadd.rb +16 -10
- data/lib/puppet/provider/group/ldap.rb +3 -0
- data/lib/puppet/provider/group/pw.rb +4 -3
- data/lib/puppet/provider/group/windows_adsi.rb +10 -7
- data/lib/puppet/provider/ldap.rb +5 -3
- data/lib/puppet/provider/nameservice/directoryservice.rb +72 -62
- data/lib/puppet/provider/nameservice/objectadd.rb +4 -4
- data/lib/puppet/provider/nameservice/pw.rb +8 -8
- data/lib/puppet/provider/nameservice.rb +23 -19
- data/lib/puppet/provider/network_device.rb +2 -2
- data/lib/puppet/provider/package/aix.rb +29 -27
- data/lib/puppet/provider/package/appdmg.rb +24 -22
- data/lib/puppet/provider/package/apple.rb +7 -5
- data/lib/puppet/provider/package/apt.rb +28 -25
- data/lib/puppet/provider/package/aptitude.rb +3 -3
- data/lib/puppet/provider/package/aptrpm.rb +18 -14
- data/lib/puppet/provider/package/blastwave.rb +19 -22
- data/lib/puppet/provider/package/dnf.rb +12 -5
- data/lib/puppet/provider/package/dnfmodule.rb +17 -15
- data/lib/puppet/provider/package/dpkg.rb +24 -25
- data/lib/puppet/provider/package/fink.rb +17 -15
- data/lib/puppet/provider/package/freebsd.rb +6 -4
- data/lib/puppet/provider/package/gem.rb +29 -26
- data/lib/puppet/provider/package/hpux.rb +9 -7
- data/lib/puppet/provider/package/macports.rb +6 -4
- data/lib/puppet/provider/package/nim.rb +27 -28
- data/lib/puppet/provider/package/openbsd.rb +37 -34
- data/lib/puppet/provider/package/opkg.rb +17 -14
- data/lib/puppet/provider/package/pacman.rb +39 -42
- data/lib/puppet/provider/package/pip.rb +32 -31
- data/lib/puppet/provider/package/pip2.rb +3 -2
- data/lib/puppet/provider/package/pip3.rb +3 -2
- data/lib/puppet/provider/package/pkg.rb +46 -41
- data/lib/puppet/provider/package/pkgdmg.rb +23 -17
- data/lib/puppet/provider/package/pkgin.rb +14 -13
- data/lib/puppet/provider/package/pkgng.rb +20 -15
- data/lib/puppet/provider/package/pkgutil.rb +40 -41
- data/lib/puppet/provider/package/portage.rb +73 -69
- data/lib/puppet/provider/package/ports.rb +19 -16
- data/lib/puppet/provider/package/portupgrade.rb +48 -55
- data/lib/puppet/provider/package/puppet_gem.rb +6 -15
- data/lib/puppet/provider/package/puppetserver_gem.rb +16 -13
- data/lib/puppet/provider/package/rpm.rb +45 -40
- data/lib/puppet/provider/package/rug.rb +11 -11
- data/lib/puppet/provider/package/sun.rb +28 -24
- data/lib/puppet/provider/package/sunfreeware.rb +3 -1
- data/lib/puppet/provider/package/tdnf.rb +9 -2
- data/lib/puppet/provider/package/up2date.rb +10 -10
- data/lib/puppet/provider/package/urpmi.rb +9 -7
- data/lib/puppet/provider/package/windows/exe_package.rb +11 -9
- data/lib/puppet/provider/package/windows/msi_package.rb +5 -3
- data/lib/puppet/provider/package/windows/package.rb +8 -5
- data/lib/puppet/provider/package/windows.rb +10 -9
- data/lib/puppet/provider/package/xbps.rb +127 -0
- data/lib/puppet/provider/package/yum.rb +65 -62
- data/lib/puppet/provider/package/zypper.rb +29 -29
- data/lib/puppet/provider/package.rb +9 -7
- data/lib/puppet/provider/package_targetable.rb +5 -3
- data/lib/puppet/provider/parsedfile.rb +21 -17
- data/lib/puppet/provider/service/base.rb +19 -23
- data/lib/puppet/provider/service/bsd.rb +7 -5
- data/lib/puppet/provider/service/daemontools.rb +42 -39
- data/lib/puppet/provider/service/debian.rb +12 -10
- data/lib/puppet/provider/service/freebsd.rb +50 -52
- data/lib/puppet/provider/service/gentoo.rb +11 -9
- data/lib/puppet/provider/service/init.rb +33 -31
- data/lib/puppet/provider/service/launchd.rb +38 -31
- data/lib/puppet/provider/service/openbsd.rb +17 -16
- data/lib/puppet/provider/service/openrc.rb +6 -5
- data/lib/puppet/provider/service/openwrt.rb +7 -6
- data/lib/puppet/provider/service/rcng.rb +7 -5
- data/lib/puppet/provider/service/redhat.rb +10 -7
- data/lib/puppet/provider/service/runit.rb +16 -15
- data/lib/puppet/provider/service/service.rb +7 -8
- data/lib/puppet/provider/service/smf.rb +42 -37
- data/lib/puppet/provider/service/src.rb +29 -29
- data/lib/puppet/provider/service/systemd.rb +48 -48
- data/lib/puppet/provider/service/upstart.rb +37 -37
- data/lib/puppet/provider/service/windows.rb +45 -48
- data/lib/puppet/provider/user/aix.rb +24 -20
- data/lib/puppet/provider/user/directoryservice.rb +98 -91
- data/lib/puppet/provider/user/hpux.rb +33 -35
- data/lib/puppet/provider/user/ldap.rb +13 -10
- data/lib/puppet/provider/user/openbsd.rb +24 -22
- data/lib/puppet/provider/user/pw.rb +8 -7
- data/lib/puppet/provider/user/user_role_add.rb +40 -36
- data/lib/puppet/provider/user/useradd.rb +64 -53
- data/lib/puppet/provider/user/windows_adsi.rb +14 -10
- data/lib/puppet/provider.rb +20 -19
- data/lib/puppet/reference/configuration.rb +55 -47
- data/lib/puppet/reference/function.rb +2 -0
- data/lib/puppet/reference/indirection.rb +33 -28
- data/lib/puppet/reference/metaparameter.rb +3 -1
- data/lib/puppet/reference/providers.rb +12 -10
- data/lib/puppet/reference/report.rb +2 -0
- data/lib/puppet/reference/type.rb +7 -5
- data/lib/puppet/relationship.rb +10 -9
- data/lib/puppet/reports/http.rb +3 -2
- data/lib/puppet/reports/log.rb +4 -3
- data/lib/puppet/reports/store.rb +9 -6
- data/lib/puppet/reports.rb +8 -6
- data/lib/puppet/resource/catalog.rb +54 -53
- data/lib/puppet/resource/status.rb +9 -7
- data/lib/puppet/resource/type.rb +65 -41
- data/lib/puppet/resource/type_collection.rb +10 -6
- data/lib/puppet/resource.rb +91 -81
- data/lib/puppet/runtime.rb +2 -0
- data/lib/puppet/scheduler/job.rb +2 -0
- data/lib/puppet/scheduler/scheduler.rb +4 -2
- data/lib/puppet/scheduler/splay_job.rb +16 -3
- data/lib/puppet/scheduler/timer.rb +2 -0
- data/lib/puppet/scheduler.rb +3 -1
- data/lib/puppet/settings/alias_setting.rb +5 -5
- data/lib/puppet/settings/array_setting.rb +2 -1
- data/lib/puppet/settings/autosign_setting.rb +2 -1
- data/lib/puppet/settings/base_setting.rb +23 -18
- data/lib/puppet/settings/boolean_setting.rb +5 -3
- data/lib/puppet/settings/certificate_revocation_setting.rb +2 -1
- data/lib/puppet/settings/config_file.rb +11 -9
- data/lib/puppet/settings/directory_setting.rb +2 -0
- data/lib/puppet/settings/duration_setting.rb +5 -4
- data/lib/puppet/settings/enum_setting.rb +3 -1
- data/lib/puppet/settings/environment_conf.rb +19 -15
- data/lib/puppet/settings/errors.rb +6 -3
- data/lib/puppet/settings/file_or_directory_setting.rb +4 -7
- data/lib/puppet/settings/file_setting.rb +15 -24
- data/lib/puppet/settings/http_extra_headers_setting.rb +2 -1
- data/lib/puppet/settings/ini_file.rb +5 -3
- data/lib/puppet/settings/integer_setting.rb +3 -1
- data/lib/puppet/settings/path_setting.rb +2 -0
- data/lib/puppet/settings/port_setting.rb +4 -2
- data/lib/puppet/settings/priority_setting.rb +13 -12
- data/lib/puppet/settings/server_list_setting.rb +7 -6
- data/lib/puppet/settings/string_setting.rb +2 -0
- data/lib/puppet/settings/symbolic_enum_setting.rb +3 -1
- data/lib/puppet/settings/terminus_setting.rb +2 -0
- data/lib/puppet/settings/ttl_setting.rb +7 -5
- data/lib/puppet/settings/value_translator.rb +9 -7
- data/lib/puppet/settings.rb +171 -163
- data/lib/puppet/ssl/base.rb +9 -6
- data/lib/puppet/ssl/certificate.rb +6 -4
- data/lib/puppet/ssl/certificate_request.rb +34 -38
- data/lib/puppet/ssl/certificate_request_attributes.rb +7 -4
- data/lib/puppet/ssl/certificate_signer.rb +3 -3
- data/lib/puppet/ssl/digest.rb +2 -0
- data/lib/puppet/ssl/error.rb +3 -0
- data/lib/puppet/ssl/oids.rb +11 -9
- data/lib/puppet/ssl/openssl_loader.rb +6 -4
- data/lib/puppet/ssl/ssl_context.rb +2 -0
- data/lib/puppet/ssl/ssl_provider.rb +13 -9
- data/lib/puppet/ssl/state_machine.rb +153 -22
- data/lib/puppet/ssl/verifier.rb +3 -2
- data/lib/puppet/ssl.rb +3 -1
- data/lib/puppet/syntax_checkers/base64.rb +7 -5
- data/lib/puppet/syntax_checkers/epp.rb +7 -6
- data/lib/puppet/syntax_checkers/json.rb +7 -7
- data/lib/puppet/syntax_checkers/pp.rb +7 -6
- data/lib/puppet/syntax_checkers.rb +3 -1
- data/lib/puppet/test/test_helper.rb +30 -44
- data/lib/puppet/thread_local.rb +2 -0
- data/lib/puppet/transaction/additional_resource_generator.rb +12 -7
- data/lib/puppet/transaction/event.rb +8 -5
- data/lib/puppet/transaction/event_manager.rb +12 -11
- data/lib/puppet/transaction/persistence.rb +16 -16
- data/lib/puppet/transaction/report.rb +34 -27
- data/lib/puppet/transaction/resource_harness.rb +17 -9
- data/lib/puppet/transaction.rb +37 -35
- data/lib/puppet/trusted_external.rb +10 -5
- data/lib/puppet/type/component.rb +14 -7
- data/lib/puppet/type/exec.rb +71 -61
- data/lib/puppet/type/file/checksum.rb +6 -2
- data/lib/puppet/type/file/checksum_value.rb +6 -4
- data/lib/puppet/type/file/content.rb +24 -20
- data/lib/puppet/type/file/ctime.rb +5 -4
- data/lib/puppet/type/file/data_sync.rb +9 -6
- data/lib/puppet/type/file/ensure.rb +24 -25
- data/lib/puppet/type/file/group.rb +3 -1
- data/lib/puppet/type/file/mode.rb +14 -11
- data/lib/puppet/type/file/mtime.rb +5 -3
- data/lib/puppet/type/file/owner.rb +3 -2
- data/lib/puppet/type/file/selcontext.rb +24 -23
- data/lib/puppet/type/file/source.rb +31 -30
- data/lib/puppet/type/file/target.rb +23 -25
- data/lib/puppet/type/file/type.rb +3 -2
- data/lib/puppet/type/file.rb +60 -54
- data/lib/puppet/type/filebucket.rb +6 -4
- data/lib/puppet/type/group.rb +14 -13
- data/lib/puppet/type/notify.rb +4 -3
- data/lib/puppet/type/package.rb +47 -45
- data/lib/puppet/type/resources.rb +39 -34
- data/lib/puppet/type/schedule.rb +21 -21
- data/lib/puppet/type/service.rb +19 -18
- data/lib/puppet/type/stage.rb +2 -0
- data/lib/puppet/type/tidy.rb +40 -34
- data/lib/puppet/type/user.rb +62 -56
- data/lib/puppet/type/whit.rb +2 -1
- data/lib/puppet/type.rb +180 -227
- data/lib/puppet/util/at_fork/noop.rb +2 -0
- data/lib/puppet/util/at_fork/solaris.rb +37 -39
- data/lib/puppet/util/at_fork.rb +3 -1
- data/lib/puppet/util/autoload.rb +10 -4
- data/lib/puppet/util/backups.rb +13 -11
- data/lib/puppet/util/character_encoding.rb +9 -6
- data/lib/puppet/util/checksums.rb +16 -12
- data/lib/puppet/util/classgen.rb +18 -23
- data/lib/puppet/util/colors.rb +67 -65
- data/lib/puppet/util/command_line/puppet_option_parser.rb +18 -16
- data/lib/puppet/util/command_line/trollop.rb +695 -673
- data/lib/puppet/util/command_line.rb +7 -5
- data/lib/puppet/util/constant_inflector.rb +4 -3
- data/lib/puppet/util/diff.rb +17 -18
- data/lib/puppet/util/docs.rb +8 -4
- data/lib/puppet/util/errors.rb +13 -11
- data/lib/puppet/util/execution.rb +58 -36
- data/lib/puppet/util/execution_stub.rb +2 -0
- data/lib/puppet/util/feature.rb +9 -9
- data/lib/puppet/util/file_watcher.rb +3 -0
- data/lib/puppet/util/fileparsing.rb +20 -24
- data/lib/puppet/util/filetype.rb +43 -43
- data/lib/puppet/util/http_proxy.rb +2 -0
- data/lib/puppet/util/inifile.rb +13 -18
- data/lib/puppet/util/instance_loader.rb +3 -0
- data/lib/puppet/util/json.rb +2 -0
- data/lib/puppet/util/json_lockfile.rb +4 -1
- data/lib/puppet/util/ldap/connection.rb +21 -19
- data/lib/puppet/util/ldap/generator.rb +2 -0
- data/lib/puppet/util/ldap/manager.rb +20 -21
- data/lib/puppet/util/ldap.rb +2 -0
- data/lib/puppet/util/libuser.rb +3 -2
- data/lib/puppet/util/limits.rb +2 -0
- data/lib/puppet/util/lockfile.rb +8 -8
- data/lib/puppet/util/log/destination.rb +4 -3
- data/lib/puppet/util/log/destinations.rb +20 -20
- data/lib/puppet/util/log.rb +40 -31
- data/lib/puppet/util/logging.rb +34 -30
- data/lib/puppet/util/metaid.rb +2 -1
- data/lib/puppet/util/metric.rb +9 -6
- data/lib/puppet/util/monkey_patches.rb +22 -30
- data/lib/puppet/util/multi_match.rb +9 -5
- data/lib/puppet/util/network_device/base.rb +3 -2
- data/lib/puppet/util/network_device/config.rb +9 -9
- data/lib/puppet/util/network_device/transport/base.rb +1 -1
- data/lib/puppet/util/network_device/transport.rb +2 -0
- data/lib/puppet/util/network_device.rb +2 -0
- data/lib/puppet/util/package/version/debian.rb +33 -31
- data/lib/puppet/util/package/version/gem.rb +3 -0
- data/lib/puppet/util/package/version/pip.rb +14 -8
- data/lib/puppet/util/package/version/range/eq.rb +4 -1
- data/lib/puppet/util/package/version/range/gt.rb +3 -0
- data/lib/puppet/util/package/version/range/gt_eq.rb +3 -0
- data/lib/puppet/util/package/version/range/lt.rb +4 -1
- data/lib/puppet/util/package/version/range/lt_eq.rb +3 -0
- data/lib/puppet/util/package/version/range/min_max.rb +5 -0
- data/lib/puppet/util/package/version/range/simple.rb +2 -0
- data/lib/puppet/util/package/version/range.rb +9 -5
- data/lib/puppet/util/package/version/rpm.rb +7 -5
- data/lib/puppet/util/package.rb +5 -2
- data/lib/puppet/util/pidlock.rb +11 -10
- data/lib/puppet/util/platform.rb +5 -3
- data/lib/puppet/util/plist.rb +16 -16
- data/lib/puppet/util/posix.rb +27 -24
- data/lib/puppet/util/profiler/aggregate.rb +7 -10
- data/lib/puppet/util/profiler/around_profiler.rb +2 -1
- data/lib/puppet/util/profiler/logging.rb +3 -1
- data/lib/puppet/util/profiler/object_counts.rb +2 -0
- data/lib/puppet/util/profiler/wall_clock.rb +6 -5
- data/lib/puppet/util/profiler.rb +2 -0
- data/lib/puppet/util/provider_features.rb +10 -6
- data/lib/puppet/util/psych_support.rb +2 -0
- data/lib/puppet/util/rdoc/code_objects.rb +18 -20
- data/lib/puppet/util/rdoc/generators/puppet_generator.rb +118 -128
- data/lib/puppet/util/rdoc/generators/template/puppet/puppet.rb +62 -79
- data/lib/puppet/util/rdoc/parser/puppet_parser_core.rb +32 -29
- data/lib/puppet/util/rdoc/parser/puppet_parser_rdoc2.rb +3 -1
- data/lib/puppet/util/rdoc/parser.rb +3 -1
- data/lib/puppet/util/rdoc.rb +10 -9
- data/lib/puppet/util/reference.rb +7 -32
- data/lib/puppet/util/resource_template.rb +3 -1
- data/lib/puppet/util/retry_action.rb +6 -5
- data/lib/puppet/util/rpm_compare.rb +31 -28
- data/lib/puppet/util/rubygems.rb +3 -3
- data/lib/puppet/util/run_mode.rb +46 -4
- data/lib/puppet/util/selinux.rb +72 -38
- data/lib/puppet/util/skip_tags.rb +2 -0
- data/lib/puppet/util/splayer.rb +2 -0
- data/lib/puppet/util/storage.rb +13 -13
- data/lib/puppet/util/suidmanager.rb +38 -37
- data/lib/puppet/util/symbolic_file_mode.rb +76 -76
- data/lib/puppet/util/tag_set.rb +4 -2
- data/lib/puppet/util/tagging.rb +12 -13
- data/lib/puppet/util/terminal.rb +6 -4
- data/lib/puppet/util/user_attr.rb +9 -7
- data/lib/puppet/util/warnings.rb +4 -0
- data/lib/puppet/util/watched_file.rb +4 -1
- data/lib/puppet/util/watcher/change_watcher.rb +2 -0
- data/lib/puppet/util/watcher/periodic_watcher.rb +2 -1
- data/lib/puppet/util/watcher/timer.rb +2 -0
- data/lib/puppet/util/watcher.rb +5 -5
- data/lib/puppet/util/windows/access_control_entry.rb +3 -1
- data/lib/puppet/util/windows/access_control_list.rb +10 -7
- data/lib/puppet/util/windows/adsi.rb +82 -74
- data/lib/puppet/util/windows/com.rb +10 -7
- data/lib/puppet/util/windows/daemon.rb +77 -80
- data/lib/puppet/util/windows/error.rb +7 -5
- data/lib/puppet/util/windows/eventlog.rb +13 -9
- data/lib/puppet/util/windows/file.rb +49 -45
- data/lib/puppet/util/windows/monkey_patches/process.rb +2 -3
- data/lib/puppet/util/windows/principal.rb +37 -34
- data/lib/puppet/util/windows/process.rb +36 -40
- data/lib/puppet/util/windows/registry.rb +60 -58
- data/lib/puppet/util/windows/root_certs.rb +5 -3
- data/lib/puppet/util/windows/security.rb +92 -90
- data/lib/puppet/util/windows/security_descriptor.rb +2 -0
- data/lib/puppet/util/windows/service.rb +24 -12
- data/lib/puppet/util/windows/sid.rb +23 -21
- data/lib/puppet/util/windows/string.rb +2 -0
- data/lib/puppet/util/windows/user.rb +56 -55
- data/lib/puppet/util/windows.rb +8 -1
- data/lib/puppet/util/yaml.rb +3 -1
- data/lib/puppet/util.rb +112 -161
- data/lib/puppet/vendor.rb +3 -1
- data/lib/puppet/version.rb +5 -2
- data/lib/puppet/x509/cert_provider.rb +48 -12
- data/lib/puppet/x509/pem_store.rb +3 -1
- data/lib/puppet/x509.rb +2 -0
- data/lib/puppet.rb +22 -19
- data/lib/puppet_pal.rb +2 -0
- data/lib/puppet_x.rb +2 -0
- data/locales/puppet.pot +9723 -5
- data/man/man5/puppet.conf.5 +121 -912
- data/man/man8/puppet-agent.8 +39 -107
- data/man/man8/puppet-apply.8 +18 -51
- data/man/man8/puppet-catalog.8 +25 -122
- data/man/man8/puppet-config.8 +22 -70
- data/man/man8/puppet-describe.8 +6 -22
- data/man/man8/puppet-device.8 +13 -49
- data/man/man8/puppet-doc.8 +8 -24
- data/man/man8/puppet-epp.8 +23 -168
- data/man/man8/puppet-facts.8 +14 -92
- data/man/man8/puppet-filebucket.8 +22 -54
- data/man/man8/puppet-generate.8 +5 -35
- data/man/man8/puppet-help.8 +8 -29
- data/man/man8/puppet-lookup.8 +25 -61
- data/man/man8/puppet-module.8 +19 -124
- data/man/man8/puppet-node.8 +47 -68
- data/man/man8/puppet-parser.8 +12 -55
- data/man/man8/puppet-plugin.8 +10 -33
- data/man/man8/puppet-report.8 +10 -53
- data/man/man8/puppet-resource.8 +19 -44
- data/man/man8/puppet-script.8 +11 -33
- data/man/man8/puppet-ssl.8 +12 -30
- data/man/man8/puppet.8 +90 -20
- data/tasks/tag.rake +34 -0
- metadata +77 -65
- data/CONTRIBUTING.md +0 -161
- data/examples/hiera/etc/hiera.yaml +0 -15
- data/examples/hiera/etc/hieradb/common.yaml +0 -3
- data/examples/hiera/etc/hieradb/dc1.yaml +0 -6
- data/examples/hiera/etc/hieradb/development.yaml +0 -2
- data/examples/hiera/etc/puppet.conf +0 -3
- data/examples/hiera/modules/data/manifests/common.pp +0 -4
- data/examples/hiera/modules/ntp/manifests/data.pp +0 -4
- data/examples/hiera/modules/ntp/templates/ntp.conf.erb +0 -3
- data/examples/hiera/modules/users/manifests/development.pp +0 -4
- data/lib/puppet/external/pson/common.rb +0 -374
- data/lib/puppet/external/pson/pure/generator.rb +0 -395
- data/lib/puppet/external/pson/pure/parser.rb +0 -308
- data/lib/puppet/external/pson/pure.rb +0 -15
- data/lib/puppet/external/pson/version.rb +0 -8
- data/lib/puppet/module_tool/contents_description.rb +0 -89
- data/tasks/benchmark.rake +0 -180
- data/tasks/ci.rake +0 -24
- data/tasks/generate_ast_model.rake +0 -90
- data/tasks/generate_cert_fixtures.rake +0 -194
- data/tasks/manpages.rake +0 -67
- data/tasks/memwalk.rake +0 -195
- data/tasks/parallel.rake +0 -410
- data/tasks/parser.rake +0 -22
- data/tasks/yard.rake +0 -59
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
# frozen_string_literal: true
|
|
2
|
+
|
|
1
3
|
require_relative '../../../puppet/parser/ast'
|
|
2
4
|
|
|
3
5
|
# The receiver of `import(file)` calls; once per imported file, or nil if imports are ignored
|
|
@@ -10,10 +12,11 @@ class Puppet::Pops::Model::AstTransformer
|
|
|
10
12
|
Model = Puppet::Pops::Model
|
|
11
13
|
|
|
12
14
|
attr_reader :importer
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
@@
|
|
16
|
-
@@
|
|
15
|
+
|
|
16
|
+
def initialize(source_file = "unknown-file", importer = nil)
|
|
17
|
+
@@transform_visitor ||= Puppet::Pops::Visitor.new(nil, "transform", 0, 0)
|
|
18
|
+
@@query_transform_visitor ||= Puppet::Pops::Visitor.new(nil, "query", 0, 0)
|
|
19
|
+
@@hostname_transform_visitor ||= Puppet::Pops::Visitor.new(nil, "hostname", 0, 0)
|
|
17
20
|
@importer = importer
|
|
18
21
|
@source_file = source_file
|
|
19
22
|
end
|
|
@@ -28,7 +31,7 @@ class Puppet::Pops::Model::AstTransformer
|
|
|
28
31
|
# @param klass [Class<Puppet::Parser::AST>] the ast class to create an instance of
|
|
29
32
|
# @param hash [Hash] hash with options for the class to create
|
|
30
33
|
#
|
|
31
|
-
def ast(o, klass, hash={})
|
|
34
|
+
def ast(o, klass, hash = {})
|
|
32
35
|
# create and pass hash with file and line information
|
|
33
36
|
# PUP-3274 - still needed since hostname transformation requires AST::HostName, and AST::Regexp
|
|
34
37
|
klass.new(**merge_location(hash, o))
|
|
@@ -58,14 +61,12 @@ class Puppet::Pops::Model::AstTransformer
|
|
|
58
61
|
|
|
59
62
|
# Transforms pops expressions into AST 3.1 statements/expressions
|
|
60
63
|
def transform(o)
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
loc_data[:file], loc_data[:line], loc_data[:pos], e)
|
|
68
|
-
end
|
|
64
|
+
@@transform_visitor.visit_this_0(self, o)
|
|
65
|
+
rescue StandardError => e
|
|
66
|
+
loc_data = {}
|
|
67
|
+
merge_location(loc_data, o)
|
|
68
|
+
raise Puppet::ParseError.new(_("Error while transforming to Puppet 3 AST: %{message}") % { message: e.message },
|
|
69
|
+
loc_data[:file], loc_data[:line], loc_data[:pos], e)
|
|
69
70
|
end
|
|
70
71
|
|
|
71
72
|
# Transforms pops expressions into AST 3.1 query expressions
|
|
@@ -78,7 +79,6 @@ class Puppet::Pops::Model::AstTransformer
|
|
|
78
79
|
@@hostname_transform_visitor.visit_this_0(self, o)
|
|
79
80
|
end
|
|
80
81
|
|
|
81
|
-
|
|
82
82
|
# Ensures transformation fails if a 3.1 non supported object is encountered in a query expression
|
|
83
83
|
#
|
|
84
84
|
def query_Object(o)
|
|
@@ -87,15 +87,15 @@ class Puppet::Pops::Model::AstTransformer
|
|
|
87
87
|
|
|
88
88
|
# Transforms Array of host matching expressions into a (Ruby) array of AST::HostName
|
|
89
89
|
def hostname_Array(o)
|
|
90
|
-
o.collect {|x| ast x, AST::HostName, :value => hostname(x) }
|
|
90
|
+
o.collect { |x| ast x, AST::HostName, :value => hostname(x) }
|
|
91
91
|
end
|
|
92
92
|
|
|
93
93
|
def hostname_LiteralValue(o)
|
|
94
|
-
|
|
94
|
+
o.value
|
|
95
95
|
end
|
|
96
96
|
|
|
97
97
|
def hostname_QualifiedName(o)
|
|
98
|
-
|
|
98
|
+
o.value
|
|
99
99
|
end
|
|
100
100
|
|
|
101
101
|
def hostname_LiteralNumber(o)
|
|
@@ -103,7 +103,7 @@ class Puppet::Pops::Model::AstTransformer
|
|
|
103
103
|
end
|
|
104
104
|
|
|
105
105
|
def hostname_LiteralDefault(o)
|
|
106
|
-
|
|
106
|
+
'default'
|
|
107
107
|
end
|
|
108
108
|
|
|
109
109
|
def hostname_LiteralRegularExpression(o)
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
|
+
|
|
2
3
|
# Factory is a helper class that makes construction of a Pops Model
|
|
3
4
|
# much more convenient. It can be viewed as a small internal DSL for model
|
|
4
5
|
# constructions.
|
|
@@ -115,7 +116,7 @@ class Factory
|
|
|
115
116
|
end
|
|
116
117
|
|
|
117
118
|
# Polymorphic interpolate
|
|
118
|
-
def interpolate
|
|
119
|
+
def interpolate
|
|
119
120
|
INTERPOLATION_VISITOR.visit_this_class(self, @model_class, EMPTY_ARRAY)
|
|
120
121
|
end
|
|
121
122
|
|
|
@@ -334,7 +335,7 @@ class Factory
|
|
|
334
335
|
#
|
|
335
336
|
def infer_Hash(o)
|
|
336
337
|
@model_class = LiteralHash
|
|
337
|
-
@init_hash['entries'] = o.sort_by { |k,_| k.to_s }.map { |k, v| Factory.new(KeyedEntry, Factory.infer(k), Factory.infer(v)) }
|
|
338
|
+
@init_hash['entries'] = o.sort_by { |k, _| k.to_s }.map { |k, v| Factory.new(KeyedEntry, Factory.infer(k), Factory.infer(v)) }
|
|
338
339
|
@unfolded = false
|
|
339
340
|
end
|
|
340
341
|
|
|
@@ -373,7 +374,7 @@ class Factory
|
|
|
373
374
|
@init_hash['return_type'] = return_type unless return_type.nil?
|
|
374
375
|
end
|
|
375
376
|
|
|
376
|
-
def build_PlanDefinition(o, name, parameters, body, return_type=nil)
|
|
377
|
+
def build_PlanDefinition(o, name, parameters, body, return_type = nil)
|
|
377
378
|
@init_hash[KEY_PARAMETERS] = parameters
|
|
378
379
|
b = f_build_body(body)
|
|
379
380
|
@init_hash[KEY_BODY] = b unless b.nil?
|
|
@@ -598,7 +599,6 @@ class Factory
|
|
|
598
599
|
|
|
599
600
|
def lambda=(lambda)
|
|
600
601
|
@init_hash['lambda'] = lambda
|
|
601
|
-
self
|
|
602
602
|
end
|
|
603
603
|
|
|
604
604
|
# Assignment =
|
|
@@ -646,8 +646,9 @@ class Factory
|
|
|
646
646
|
def self.set_resource_form(expr, form)
|
|
647
647
|
# Note: Validation handles illegal combinations
|
|
648
648
|
return false unless expr.instance_of?(self) && expr.model_class <= AbstractResource
|
|
649
|
+
|
|
649
650
|
expr['form'] = form
|
|
650
|
-
|
|
651
|
+
true
|
|
651
652
|
end
|
|
652
653
|
|
|
653
654
|
# Returns symbolic information about an expected shape of a resource expression given the LHS of a resource expr.
|
|
@@ -694,15 +695,15 @@ class Factory
|
|
|
694
695
|
|
|
695
696
|
def self.block(*args); new(BlockExpression, args.map { |arg| infer(arg) }); end
|
|
696
697
|
|
|
697
|
-
def self.string(*args); new(ConcatenatedString, args.map { |arg| infer(arg) });
|
|
698
|
+
def self.string(*args); new(ConcatenatedString, args.map { |arg| infer(arg) }); end
|
|
698
699
|
|
|
699
|
-
def self.text(o); infer(o).text;
|
|
700
|
+
def self.text(o); infer(o).text; end
|
|
700
701
|
|
|
701
|
-
def self.IF(test_e,then_e,else_e); new(IfExpression, test_e, then_e, else_e); end
|
|
702
|
+
def self.IF(test_e, then_e, else_e); new(IfExpression, test_e, then_e, else_e); end
|
|
702
703
|
|
|
703
|
-
def self.UNLESS(test_e,then_e,else_e); new(UnlessExpression, test_e, then_e, else_e); end
|
|
704
|
+
def self.UNLESS(test_e, then_e, else_e); new(UnlessExpression, test_e, then_e, else_e); end
|
|
704
705
|
|
|
705
|
-
def self.CASE(test_e
|
|
706
|
+
def self.CASE(test_e, *options); new(CaseExpression, test_e, options); end
|
|
706
707
|
|
|
707
708
|
def self.WHEN(values_list, block); new(CaseOption, values_list, block); end
|
|
708
709
|
|
|
@@ -720,9 +721,9 @@ class Factory
|
|
|
720
721
|
|
|
721
722
|
def self.LIST(entries); new(LiteralList, entries); end
|
|
722
723
|
|
|
723
|
-
def self.PARAM(name, expr=nil);
|
|
724
|
+
def self.PARAM(name, expr = nil); new(Parameter, name, expr); end
|
|
724
725
|
|
|
725
|
-
def self.NODE(hosts, parent, body);
|
|
726
|
+
def self.NODE(hosts, parent, body); new(NodeDefinition, hosts, parent, body); end
|
|
726
727
|
|
|
727
728
|
# Parameters
|
|
728
729
|
|
|
@@ -787,7 +788,7 @@ class Factory
|
|
|
787
788
|
LAMBDA(params, new(EppExpression, parameters_specified, body), nil)
|
|
788
789
|
end
|
|
789
790
|
|
|
790
|
-
def self.RESERVED(name, future=false)
|
|
791
|
+
def self.RESERVED(name, future = false)
|
|
791
792
|
new(ReservedWord, name, future)
|
|
792
793
|
end
|
|
793
794
|
|
|
@@ -809,9 +810,9 @@ class Factory
|
|
|
809
810
|
end
|
|
810
811
|
else
|
|
811
812
|
# Bad number should already have been caught by lexer - this should never happen
|
|
812
|
-
#TRANSLATORS 'NUMBER' refers to a method name and the 'name_or_numeric' was the passed in value and should not be translated
|
|
813
|
+
# TRANSLATORS 'NUMBER' refers to a method name and the 'name_or_numeric' was the passed in value and should not be translated
|
|
813
814
|
raise ArgumentError, _("Internal Error, NUMBER token does not contain a valid number, %{name_or_numeric}") %
|
|
814
|
-
|
|
815
|
+
{ name_or_numeric: name_or_numeric }
|
|
815
816
|
end
|
|
816
817
|
end
|
|
817
818
|
|
|
@@ -971,19 +972,19 @@ class Factory
|
|
|
971
972
|
'realize' => true,
|
|
972
973
|
'include' => true,
|
|
973
974
|
'contain' => true,
|
|
974
|
-
'tag'
|
|
975
|
+
'tag' => true,
|
|
975
976
|
|
|
976
|
-
'debug'
|
|
977
|
-
'info'
|
|
978
|
-
'notice'
|
|
977
|
+
'debug' => true,
|
|
978
|
+
'info' => true,
|
|
979
|
+
'notice' => true,
|
|
979
980
|
'warning' => true,
|
|
980
|
-
'err'
|
|
981
|
+
'err' => true,
|
|
981
982
|
|
|
982
|
-
'fail'
|
|
983
|
-
'import'
|
|
984
|
-
'break'
|
|
985
|
-
'next'
|
|
986
|
-
'return'
|
|
983
|
+
'fail' => true,
|
|
984
|
+
'import' => true, # discontinued, but transform it to make it call error reporting function
|
|
985
|
+
'break' => true,
|
|
986
|
+
'next' => true,
|
|
987
|
+
'return' => true
|
|
987
988
|
}.freeze
|
|
988
989
|
|
|
989
990
|
# Returns true if the given name is a "statement keyword" (require, include, contain,
|
|
@@ -995,6 +996,7 @@ class Factory
|
|
|
995
996
|
|
|
996
997
|
class ArgsToNonCallError < RuntimeError
|
|
997
998
|
attr_reader :args, :name_expr
|
|
999
|
+
|
|
998
1000
|
def initialize(args, name_expr)
|
|
999
1001
|
@args = args
|
|
1000
1002
|
@name_expr = name_expr
|
|
@@ -1005,7 +1007,7 @@ class Factory
|
|
|
1005
1007
|
# expression, or expression list.
|
|
1006
1008
|
#
|
|
1007
1009
|
def self.transform_calls(expressions)
|
|
1008
|
-
expressions.
|
|
1010
|
+
expressions.each_with_object([]) do |expr, memo|
|
|
1009
1011
|
name = memo[-1]
|
|
1010
1012
|
if name.instance_of?(Factory) && name.model_class <= QualifiedName && name_is_statement?(name[KEY_VALUE])
|
|
1011
1013
|
if expr.is_a?(Array)
|
|
@@ -1033,7 +1035,6 @@ class Factory
|
|
|
1033
1035
|
expr['rval_required'] = false
|
|
1034
1036
|
end
|
|
1035
1037
|
end
|
|
1036
|
-
memo
|
|
1037
1038
|
end
|
|
1038
1039
|
end
|
|
1039
1040
|
|
|
@@ -1043,14 +1044,15 @@ class Factory
|
|
|
1043
1044
|
# Returning nil means accepting the given as a potential resource expression
|
|
1044
1045
|
return nil unless attribute_ops.is_a? Array
|
|
1045
1046
|
return nil unless left.model_class <= QualifiedName
|
|
1047
|
+
|
|
1046
1048
|
keyed_entries = attribute_ops.map do |ao|
|
|
1047
1049
|
return nil if ao[KEY_OPERATOR] == '+>'
|
|
1050
|
+
|
|
1048
1051
|
KEY_ENTRY(infer(ao['attribute_name']), ao['value_expr'])
|
|
1049
1052
|
end
|
|
1050
1053
|
a_hash = HASH(keyed_entries)
|
|
1051
1054
|
a_hash.record_position(left[KEY_LOCATOR], lbrace_token, rbrace_token)
|
|
1052
|
-
|
|
1053
|
-
result
|
|
1055
|
+
block_or_expression(transform_calls([left, a_hash]))
|
|
1054
1056
|
end
|
|
1055
1057
|
|
|
1056
1058
|
def interpolate_Factory(c)
|
|
@@ -1059,7 +1061,7 @@ class Factory
|
|
|
1059
1061
|
|
|
1060
1062
|
def interpolate_LiteralInteger(c)
|
|
1061
1063
|
# convert number to a variable
|
|
1062
|
-
|
|
1064
|
+
var
|
|
1063
1065
|
end
|
|
1064
1066
|
|
|
1065
1067
|
def interpolate_Object(c)
|
|
@@ -1067,7 +1069,7 @@ class Factory
|
|
|
1067
1069
|
end
|
|
1068
1070
|
|
|
1069
1071
|
def interpolate_QualifiedName(c)
|
|
1070
|
-
|
|
1072
|
+
var
|
|
1071
1073
|
end
|
|
1072
1074
|
|
|
1073
1075
|
# rewrite left expression to variable if it is name, number, and recurse if it is an access expression
|
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
# frozen_string_literal: true
|
|
2
|
+
|
|
1
3
|
module Puppet::Pops
|
|
2
4
|
module Model
|
|
3
5
|
# A provider of labels for model object, producing a human name for the model object.
|
|
@@ -8,7 +10,7 @@ class ModelLabelProvider
|
|
|
8
10
|
include LabelProvider
|
|
9
11
|
|
|
10
12
|
def initialize
|
|
11
|
-
@@label_visitor ||= Visitor.new(self,"label",0,0)
|
|
13
|
+
@@label_visitor ||= Visitor.new(self, "label", 0, 0)
|
|
12
14
|
end
|
|
13
15
|
|
|
14
16
|
# Produces a label for the given objects type/operator without article.
|
|
@@ -18,6 +20,7 @@ class ModelLabelProvider
|
|
|
18
20
|
@@label_visitor.visit_this_0(self, o)
|
|
19
21
|
end
|
|
20
22
|
|
|
23
|
+
# rubocop:disable Layout/SpaceBeforeSemicolon
|
|
21
24
|
def label_Factory o ; label(o.model) end
|
|
22
25
|
def label_Array o ; "Array" end
|
|
23
26
|
def label_LiteralInteger o ; "Literal Integer" end
|
|
@@ -103,6 +106,7 @@ class ModelLabelProvider
|
|
|
103
106
|
def label_Timespan o ; "Timespan" end
|
|
104
107
|
def label_Version o ; "Semver" end
|
|
105
108
|
def label_VersionRange o ; "SemverRange" end
|
|
109
|
+
# rubocop:enable Layout/SpaceBeforeSemicolon
|
|
106
110
|
|
|
107
111
|
def label_PResourceType o
|
|
108
112
|
if o.title
|
|
@@ -116,7 +120,6 @@ class ModelLabelProvider
|
|
|
116
120
|
'Resource Statement'
|
|
117
121
|
end
|
|
118
122
|
|
|
119
|
-
|
|
120
123
|
def label_Class o
|
|
121
124
|
if o <= Types::PAnyType
|
|
122
125
|
simple_name = o.name.split('::').last
|
|
@@ -1,10 +1,12 @@
|
|
|
1
|
+
# frozen_string_literal: true
|
|
2
|
+
|
|
1
3
|
# Dumps a Pops::Model in reverse polish notation; i.e. LISP style
|
|
2
4
|
# The intention is to use this for debugging output
|
|
3
5
|
# TODO: BAD NAME - A DUMP is a Ruby Serialization
|
|
4
6
|
#
|
|
5
7
|
class Puppet::Pops::Model::ModelTreeDumper < Puppet::Pops::Model::TreeDumper
|
|
6
8
|
def dump_Array o
|
|
7
|
-
o.collect {|e| do_dump(e) }
|
|
9
|
+
o.collect { |e| do_dump(e) }
|
|
8
10
|
end
|
|
9
11
|
|
|
10
12
|
def dump_LiteralFloat o
|
|
@@ -59,13 +61,13 @@ class Puppet::Pops::Model::ModelTreeDumper < Puppet::Pops::Model::TreeDumper
|
|
|
59
61
|
o.operations do |ao|
|
|
60
62
|
result << :break << do_dump(ao)
|
|
61
63
|
end
|
|
62
|
-
result += [:dedent, :dedent
|
|
64
|
+
result += [:dedent, :dedent]
|
|
63
65
|
result
|
|
64
66
|
end
|
|
65
67
|
|
|
66
68
|
def dump_EppExpression o
|
|
67
69
|
result = ["epp"]
|
|
68
|
-
# result << ["parameters"] + o.parameters.collect {|p| do_dump(p) } if o.parameters.size() > 0
|
|
70
|
+
# result << ["parameters"] + o.parameters.collect {|p| do_dump(p) } if o.parameters.size() > 0
|
|
69
71
|
if o.body
|
|
70
72
|
result << do_dump(o.body)
|
|
71
73
|
else
|
|
@@ -120,11 +122,11 @@ class Puppet::Pops::Model::ModelTreeDumper < Puppet::Pops::Model::TreeDumper
|
|
|
120
122
|
end
|
|
121
123
|
|
|
122
124
|
def dump_LiteralList o
|
|
123
|
-
["[]"] + o.values.collect {|x| do_dump(x)}
|
|
125
|
+
["[]"] + o.values.collect { |x| do_dump(x) }
|
|
124
126
|
end
|
|
125
127
|
|
|
126
128
|
def dump_LiteralHash o
|
|
127
|
-
["{}"] + o.entries.collect {|x| do_dump(x)}
|
|
129
|
+
["{}"] + o.entries.collect { |x| do_dump(x) }
|
|
128
130
|
end
|
|
129
131
|
|
|
130
132
|
def dump_KeyedEntry o
|
|
@@ -141,7 +143,7 @@ class Puppet::Pops::Model::ModelTreeDumper < Puppet::Pops::Model::TreeDumper
|
|
|
141
143
|
|
|
142
144
|
def dump_LambdaExpression o
|
|
143
145
|
result = ["lambda"]
|
|
144
|
-
result << ["parameters"] + o.parameters.collect {|p| do_dump(p) } if o.parameters.size() > 0
|
|
146
|
+
result << ["parameters"] + o.parameters.collect { |p| do_dump(p) } if o.parameters.size() > 0
|
|
145
147
|
result << ['return_type', do_dump(o.return_type)] unless o.return_type.nil?
|
|
146
148
|
if o.body
|
|
147
149
|
result << do_dump(o.body)
|
|
@@ -198,14 +200,14 @@ class Puppet::Pops::Model::ModelTreeDumper < Puppet::Pops::Model::TreeDumper
|
|
|
198
200
|
|
|
199
201
|
def dump_BlockExpression o
|
|
200
202
|
result = ["block", :indent]
|
|
201
|
-
o.statements.each {|x| result << :break; result << do_dump(x) }
|
|
203
|
+
o.statements.each { |x| result << :break; result << do_dump(x) }
|
|
202
204
|
result << :dedent << :break
|
|
203
205
|
result
|
|
204
206
|
end
|
|
205
207
|
|
|
206
208
|
# Interpolated strings are shown as (cat seg0 seg1 ... segN)
|
|
207
209
|
def dump_ConcatenatedString o
|
|
208
|
-
["cat"] + o.segments.collect {|x| do_dump(x)}
|
|
210
|
+
["cat"] + o.segments.collect { |x| do_dump(x) }
|
|
209
211
|
end
|
|
210
212
|
|
|
211
213
|
def dump_HeredocExpression(o)
|
|
@@ -215,7 +217,7 @@ class Puppet::Pops::Model::ModelTreeDumper < Puppet::Pops::Model::TreeDumper
|
|
|
215
217
|
def dump_HostClassDefinition o
|
|
216
218
|
result = ["class", o.name]
|
|
217
219
|
result << ["inherits", o.parent_class] if o.parent_class
|
|
218
|
-
result << ["parameters"] + o.parameters.collect {|p| do_dump(p) } if o.parameters.size() > 0
|
|
220
|
+
result << ["parameters"] + o.parameters.collect { |p| do_dump(p) } if o.parameters.size() > 0
|
|
219
221
|
if o.body
|
|
220
222
|
result << do_dump(o.body)
|
|
221
223
|
else
|
|
@@ -226,7 +228,7 @@ class Puppet::Pops::Model::ModelTreeDumper < Puppet::Pops::Model::TreeDumper
|
|
|
226
228
|
|
|
227
229
|
def dump_PlanDefinition o
|
|
228
230
|
result = ["plan", o.name]
|
|
229
|
-
result << ["parameters"] + o.parameters.collect {|p| do_dump(p) } if o.parameters.size() > 0
|
|
231
|
+
result << ["parameters"] + o.parameters.collect { |p| do_dump(p) } if o.parameters.size() > 0
|
|
230
232
|
if o.body
|
|
231
233
|
result << do_dump(o.body)
|
|
232
234
|
else
|
|
@@ -237,7 +239,7 @@ class Puppet::Pops::Model::ModelTreeDumper < Puppet::Pops::Model::TreeDumper
|
|
|
237
239
|
|
|
238
240
|
def dump_NodeDefinition o
|
|
239
241
|
result = ["node"]
|
|
240
|
-
result << ["matches"] + o.host_matches.collect {|m| do_dump(m) }
|
|
242
|
+
result << ["matches"] + o.host_matches.collect { |m| do_dump(m) }
|
|
241
243
|
result << ["parent", do_dump(o.parent)] if o.parent
|
|
242
244
|
if o.body
|
|
243
245
|
result << do_dump(o.body)
|
|
@@ -250,7 +252,7 @@ class Puppet::Pops::Model::ModelTreeDumper < Puppet::Pops::Model::TreeDumper
|
|
|
250
252
|
def dump_NamedDefinition o
|
|
251
253
|
# the nil must be replaced with a string
|
|
252
254
|
result = [nil, o.name]
|
|
253
|
-
result << ["parameters"] + o.parameters.collect {|p| do_dump(p) } if o.parameters.size() > 0
|
|
255
|
+
result << ["parameters"] + o.parameters.collect { |p| do_dump(p) } if o.parameters.size() > 0
|
|
254
256
|
if o.body
|
|
255
257
|
result << do_dump(o.body)
|
|
256
258
|
else
|
|
@@ -261,7 +263,7 @@ class Puppet::Pops::Model::ModelTreeDumper < Puppet::Pops::Model::TreeDumper
|
|
|
261
263
|
|
|
262
264
|
def dump_FunctionDefinition o
|
|
263
265
|
result = ['function', o.name]
|
|
264
|
-
result << ['parameters'] + o.parameters.collect {|p| do_dump(p) } if o.parameters.size() > 0
|
|
266
|
+
result << ['parameters'] + o.parameters.collect { |p| do_dump(p) } if o.parameters.size() > 0
|
|
265
267
|
result << ['return_type', do_dump(o.return_type)] unless o.return_type.nil?
|
|
266
268
|
if o.body
|
|
267
269
|
result << do_dump(o.body)
|
|
@@ -279,7 +281,7 @@ class Puppet::Pops::Model::ModelTreeDumper < Puppet::Pops::Model::TreeDumper
|
|
|
279
281
|
|
|
280
282
|
def dump_ResourceOverrideExpression o
|
|
281
283
|
form = o.form == 'regular' ? '' : o.form + '-'
|
|
282
|
-
result = [form+'override', do_dump(o.resources), :indent]
|
|
284
|
+
result = [form + 'override', do_dump(o.resources), :indent]
|
|
283
285
|
o.operations.each do |p|
|
|
284
286
|
result << :break << do_dump(p)
|
|
285
287
|
end
|
|
@@ -288,7 +290,7 @@ class Puppet::Pops::Model::ModelTreeDumper < Puppet::Pops::Model::TreeDumper
|
|
|
288
290
|
end
|
|
289
291
|
|
|
290
292
|
def dump_ReservedWord o
|
|
291
|
-
[
|
|
293
|
+
['reserved', o.word]
|
|
292
294
|
end
|
|
293
295
|
|
|
294
296
|
# Produces parameters as name, or (= name value)
|
|
@@ -318,21 +320,21 @@ class Puppet::Pops::Model::ModelTreeDumper < Puppet::Pops::Model::TreeDumper
|
|
|
318
320
|
|
|
319
321
|
def dump_IfExpression o
|
|
320
322
|
result = ["if", do_dump(o.test), :indent, :break,
|
|
321
|
-
|
|
323
|
+
["then", :indent, do_dump(o.then_expr), :dedent]]
|
|
322
324
|
result +=
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
|
|
325
|
+
[:break,
|
|
326
|
+
["else", :indent, do_dump(o.else_expr), :dedent],
|
|
327
|
+
:dedent] unless is_nop? o.else_expr
|
|
326
328
|
result
|
|
327
329
|
end
|
|
328
330
|
|
|
329
331
|
def dump_UnlessExpression o
|
|
330
332
|
result = ["unless", do_dump(o.test), :indent, :break,
|
|
331
|
-
|
|
333
|
+
["then", :indent, do_dump(o.then_expr), :dedent]]
|
|
332
334
|
result +=
|
|
333
|
-
|
|
334
|
-
|
|
335
|
-
|
|
335
|
+
[:break,
|
|
336
|
+
["else", :indent, do_dump(o.else_expr), :dedent],
|
|
337
|
+
:dedent] unless is_nop? o.else_expr
|
|
336
338
|
result
|
|
337
339
|
end
|
|
338
340
|
|
|
@@ -341,7 +343,7 @@ class Puppet::Pops::Model::ModelTreeDumper < Puppet::Pops::Model::TreeDumper
|
|
|
341
343
|
#
|
|
342
344
|
def dump_CallNamedFunctionExpression o
|
|
343
345
|
result = [o.rval_required ? "call" : "invoke", do_dump(o.functor_expr)]
|
|
344
|
-
o.arguments.collect {|a| result << do_dump(a) }
|
|
346
|
+
o.arguments.collect { |a| result << do_dump(a) }
|
|
345
347
|
result << do_dump(o.lambda) if o.lambda
|
|
346
348
|
result
|
|
347
349
|
end
|
|
@@ -354,7 +356,7 @@ class Puppet::Pops::Model::ModelTreeDumper < Puppet::Pops::Model::TreeDumper
|
|
|
354
356
|
|
|
355
357
|
def dump_CallMethodExpression o
|
|
356
358
|
result = [o.rval_required ? "call-method" : "invoke-method", do_dump(o.functor_expr)]
|
|
357
|
-
o.arguments.collect {|a| result << do_dump(a) }
|
|
359
|
+
o.arguments.collect { |a| result << do_dump(a) }
|
|
358
360
|
result << do_dump(o.lambda) if o.lambda
|
|
359
361
|
result
|
|
360
362
|
end
|
|
@@ -369,8 +371,8 @@ class Puppet::Pops::Model::ModelTreeDumper < Puppet::Pops::Model::TreeDumper
|
|
|
369
371
|
|
|
370
372
|
def dump_CaseOption o
|
|
371
373
|
result = ["when"]
|
|
372
|
-
result << o.values.collect {|x| do_dump(x) }
|
|
373
|
-
result << ["then", do_dump(o.then_expr)
|
|
374
|
+
result << o.values.collect { |x| do_dump(x) }
|
|
375
|
+
result << ["then", do_dump(o.then_expr)]
|
|
374
376
|
result
|
|
375
377
|
end
|
|
376
378
|
|
|
@@ -397,7 +399,7 @@ class Puppet::Pops::Model::ModelTreeDumper < Puppet::Pops::Model::TreeDumper
|
|
|
397
399
|
|
|
398
400
|
def dump_ResourceDefaultsExpression o
|
|
399
401
|
form = o.form == 'regular' ? '' : o.form + '-'
|
|
400
|
-
result = [form+'resource-defaults', do_dump(o.type_ref), :indent]
|
|
402
|
+
result = [form + 'resource-defaults', do_dump(o.type_ref), :indent]
|
|
401
403
|
o.operations.each do |p|
|
|
402
404
|
result << :break << do_dump(p)
|
|
403
405
|
end
|
|
@@ -407,7 +409,7 @@ class Puppet::Pops::Model::ModelTreeDumper < Puppet::Pops::Model::TreeDumper
|
|
|
407
409
|
|
|
408
410
|
def dump_ResourceExpression o
|
|
409
411
|
form = o.form == 'regular' ? '' : o.form + '-'
|
|
410
|
-
result = [form+'resource', do_dump(o.type_name), :indent]
|
|
412
|
+
result = [form + 'resource', do_dump(o.type_name), :indent]
|
|
411
413
|
o.bodies.each do |b|
|
|
412
414
|
result << :break << do_dump(b)
|
|
413
415
|
end
|
|
@@ -416,7 +418,7 @@ class Puppet::Pops::Model::ModelTreeDumper < Puppet::Pops::Model::TreeDumper
|
|
|
416
418
|
end
|
|
417
419
|
|
|
418
420
|
def dump_SelectorExpression o
|
|
419
|
-
["?", do_dump(o.left_expr)] + o.selectors.collect {|x| do_dump(x) }
|
|
421
|
+
["?", do_dump(o.left_expr)] + o.selectors.collect { |x| do_dump(x) }
|
|
420
422
|
end
|
|
421
423
|
|
|
422
424
|
def dump_SelectorEntry o
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
+
# frozen_string_literal: true
|
|
2
|
+
|
|
1
3
|
require_relative '../../../puppet/concurrent/thread_local_singleton'
|
|
2
4
|
|
|
3
5
|
module Puppet::Pops
|
|
4
6
|
module Model
|
|
5
|
-
|
|
6
|
-
|
|
7
7
|
class PNTransformer
|
|
8
8
|
extend Puppet::Concurrent::ThreadLocalSingleton
|
|
9
9
|
|
|
@@ -247,9 +247,9 @@ class PNTransformer
|
|
|
247
247
|
|
|
248
248
|
def transform_ResourceBody(e)
|
|
249
249
|
PN::Map.new([
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
250
|
+
transform(e.title).with_name('title'),
|
|
251
|
+
transform(e.operations).with_name('ops')
|
|
252
|
+
]).as_call('resource_body')
|
|
253
253
|
end
|
|
254
254
|
|
|
255
255
|
def transform_ResourceDefaultsExpression(e)
|
|
@@ -380,6 +380,5 @@ class PNTransformer
|
|
|
380
380
|
PN::Map.new(entries).as_call(name)
|
|
381
381
|
end
|
|
382
382
|
end
|
|
383
|
-
|
|
384
383
|
end
|
|
385
384
|
end
|
|
@@ -1,9 +1,12 @@
|
|
|
1
|
+
# frozen_string_literal: true
|
|
2
|
+
|
|
1
3
|
# Base class for formatted textual dump of a "model"
|
|
2
4
|
#
|
|
3
5
|
class Puppet::Pops::Model::TreeDumper
|
|
4
6
|
attr_accessor :indent_count
|
|
7
|
+
|
|
5
8
|
def initialize initial_indentation = 0
|
|
6
|
-
@@dump_visitor ||= Puppet::Pops::Visitor.new(nil,"dump",0,0)
|
|
9
|
+
@@dump_visitor ||= Puppet::Pops::Visitor.new(nil, "dump", 0, 0)
|
|
7
10
|
@indent_count = initial_indentation
|
|
8
11
|
end
|
|
9
12
|
|
|
@@ -20,12 +23,12 @@ class Puppet::Pops::Model::TreeDumper
|
|
|
20
23
|
end
|
|
21
24
|
|
|
22
25
|
def format(x)
|
|
23
|
-
result =
|
|
26
|
+
result = ''.dup
|
|
24
27
|
parts = format_r(x)
|
|
25
28
|
parts.each_index do |i|
|
|
26
29
|
if i > 0
|
|
27
30
|
# separate with space unless previous ends with whitespace or (
|
|
28
|
-
result << ' ' if parts[i] != ")" && parts[i-1] !~ /.*(?:\s+|\()$/ && parts[i] !~ /^\s+/
|
|
31
|
+
result << ' ' if parts[i] != ")" && parts[i - 1] !~ /.*(?:\s+|\()$/ && parts[i] !~ /^\s+/
|
|
29
32
|
end
|
|
30
33
|
result << parts[i].to_s
|
|
31
34
|
end
|
|
@@ -43,7 +46,7 @@ class Puppet::Pops::Model::TreeDumper
|
|
|
43
46
|
@indent_count -= 1
|
|
44
47
|
when Array
|
|
45
48
|
result << '('
|
|
46
|
-
result += x.collect {|a| format_r(a) }.flatten
|
|
49
|
+
result += x.collect { |a| format_r(a) }.flatten
|
|
47
50
|
result << ')'
|
|
48
51
|
when Symbol
|
|
49
52
|
result << x.to_s # Allows Symbols in arrays e.g. ["text", =>, "text"]
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
+
# frozen_string_literal: true
|
|
1
2
|
|
|
2
3
|
class Puppet::Pops::Parser::CodeMerger
|
|
3
|
-
|
|
4
4
|
# Concatenates the logic in the array of parse results into one parse result.
|
|
5
5
|
# @return Puppet::Parser::AST::BlockExpression
|
|
6
6
|
#
|
|
@@ -11,11 +11,11 @@ class Puppet::Pops::Parser::CodeMerger
|
|
|
11
11
|
# PUP-5299, some sites have thousands of entries, and run out of stack when evaluating - the logic
|
|
12
12
|
# below maps the logic as flatly as possible.
|
|
13
13
|
#
|
|
14
|
-
children = parse_results.select {|x| !x.nil? && x.code}.flat_map do |parsed_class|
|
|
14
|
+
children = parse_results.select { |x| !x.nil? && x.code }.flat_map do |parsed_class|
|
|
15
15
|
case parsed_class.code
|
|
16
16
|
when Puppet::Parser::AST::BlockExpression
|
|
17
17
|
# the BlockExpression wraps a single 4x instruction that is most likely wrapped in a Factory
|
|
18
|
-
parsed_class.code.children.map {|c| c.is_a?(Puppet::Pops::Model::Factory) ? c.model : c }
|
|
18
|
+
parsed_class.code.children.map { |c| c.is_a?(Puppet::Pops::Model::Factory) ? c.model : c }
|
|
19
19
|
when Puppet::Pops::Model::Factory
|
|
20
20
|
# If it is a 4x instruction wrapped in a Factory
|
|
21
21
|
parsed_class.code.model
|
|
@@ -1,6 +1,7 @@
|
|
|
1
|
+
# frozen_string_literal: true
|
|
2
|
+
|
|
1
3
|
# The EppParser is a specialized Puppet Parser that starts parsing in Epp Text mode
|
|
2
4
|
class Puppet::Pops::Parser::EppParser < Puppet::Pops::Parser::Parser
|
|
3
|
-
|
|
4
5
|
# Initializes the epp parser support by creating a new instance of {Puppet::Pops::Parser::Lexer}
|
|
5
6
|
# configured to start in Epp Lexing mode.
|
|
6
7
|
# @return [void]
|
|
@@ -13,7 +14,7 @@ class Puppet::Pops::Parser::EppParser < Puppet::Pops::Parser::Parser
|
|
|
13
14
|
def parse_file(file)
|
|
14
15
|
unless FileTest.exist?(file)
|
|
15
16
|
unless file =~ /\.epp$/
|
|
16
|
-
file
|
|
17
|
+
file += ".epp"
|
|
17
18
|
end
|
|
18
19
|
end
|
|
19
20
|
@lexer.file = file
|
|
@@ -28,10 +29,10 @@ class Puppet::Pops::Parser::EppParser < Puppet::Pops::Parser::Parser
|
|
|
28
29
|
#
|
|
29
30
|
# @api private
|
|
30
31
|
#
|
|
31
|
-
def _parse
|
|
32
|
+
def _parse
|
|
32
33
|
begin
|
|
33
34
|
@yydebug = false
|
|
34
|
-
main = yyparse(@lexer
|
|
35
|
+
main = yyparse(@lexer, :scan_epp)
|
|
35
36
|
# #Commented out now because this hides problems in the racc grammar while developing
|
|
36
37
|
# # TODO include this when test coverage is good enough.
|
|
37
38
|
# rescue Puppet::ParseError => except
|
|
@@ -42,7 +43,7 @@ class Puppet::Pops::Parser::EppParser < Puppet::Pops::Parser::Parser
|
|
|
42
43
|
# rescue => except
|
|
43
44
|
# raise Puppet::ParseError.new(except.message, @lexer.file, @lexer.line, @lexer.pos, except)
|
|
44
45
|
end
|
|
45
|
-
|
|
46
|
+
main
|
|
46
47
|
ensure
|
|
47
48
|
@lexer.clear
|
|
48
49
|
@namestack = []
|