puppet 4.0.0 → 4.5.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/COMMITTERS.md +2 -2
- data/CONTRIBUTING.md +10 -10
- data/Gemfile +6 -8
- data/LICENSE +3 -3
- data/README.md +14 -10
- data/Rakefile +20 -0
- data/conf/auth.conf +2 -2
- data/conf/puppet.conf +1 -1
- data/ext/README.environment +1 -1
- data/ext/build_defaults.yaml +9 -36
- data/ext/debian/README.source +1 -1
- data/ext/debian/control +1 -1
- data/ext/debian/copyright +4 -4
- data/ext/debian/puppet.default +0 -5
- data/ext/debian/puppet.init +1 -16
- data/ext/debian/puppet.logrotate +14 -5
- data/ext/debian/puppetmaster.README.debian +11 -9
- data/ext/emacs/puppet-mode.el +1 -1
- data/ext/envpuppet +2 -2
- data/ext/ips/puppetagent.xml +1 -1
- data/ext/ips/puppetmaster.xml +1 -1
- data/ext/osx/puppet.plist +30 -0
- data/ext/project_data.yaml +11 -1
- data/ext/puppet-test +3 -3
- data/ext/rack/example-passenger-vhost.conf +1 -1
- data/ext/redhat/client.init +67 -17
- data/ext/redhat/client.sysconfig +1 -10
- data/ext/redhat/logrotate +15 -3
- data/ext/redhat/puppet.spec.erb +6 -11
- data/ext/redhat/server.init +1 -1
- data/ext/regexp_nodes/regexp_nodes.rb +1 -1
- data/ext/solaris/pkginfo +1 -1
- data/ext/solaris/smf/puppet +44 -0
- data/ext/solaris/smf/puppet.xml +44 -0
- data/ext/suse/client.init +30 -33
- data/ext/suse/puppet.spec +2 -2
- data/ext/suse/server.init +2 -2
- data/ext/systemd/puppet.service +3 -1
- data/ext/upload_facts.rb +1 -1
- data/ext/windows/puppet_interactive.bat +6 -0
- data/ext/windows/puppet_shell.bat +9 -0
- data/ext/windows/run_puppet_interactive.bat +9 -0
- data/ext/yaml_nodes.rb +1 -1
- data/install.rb +51 -59
- data/lib/hiera/puppet_function.rb +18 -7
- data/lib/hiera/scope.rb +1 -1
- data/lib/hiera_puppet.rb +6 -14
- data/lib/puppet/agent/locker.rb +11 -2
- data/lib/puppet/agent.rb +9 -24
- data/lib/puppet/application/agent.rb +39 -19
- data/lib/puppet/application/apply.rb +68 -15
- data/lib/puppet/application/ca.rb +1 -0
- data/lib/puppet/application/cert.rb +17 -1
- data/lib/puppet/application/device.rb +9 -4
- data/lib/puppet/application/filebucket.rb +79 -5
- data/lib/puppet/application/inspect.rb +2 -2
- data/lib/puppet/application/lookup.rb +342 -0
- data/lib/puppet/application/master.rb +22 -7
- data/lib/puppet/application/resource.rb +1 -5
- data/lib/puppet/configurer/plugin_handler.rb +6 -2
- data/lib/puppet/configurer.rb +116 -31
- data/lib/puppet/context/trusted_information.rb +21 -1
- data/lib/puppet/context.rb +16 -1
- data/lib/puppet/daemon.rb +17 -13
- data/lib/puppet/data_binding.rb +4 -2
- data/lib/puppet/data_providers/data_adapter.rb +7 -68
- data/lib/puppet/data_providers/data_function_support.rb +5 -26
- data/lib/puppet/data_providers/function_env_data_provider.rb +0 -10
- data/lib/puppet/data_providers/function_module_data_provider.rb +0 -22
- data/lib/puppet/data_providers/hiera_config.rb +129 -0
- data/lib/puppet/data_providers/hiera_env_data_provider.rb +18 -0
- data/lib/puppet/data_providers/hiera_interpolate.rb +19 -0
- data/lib/puppet/data_providers/hiera_module_data_provider.rb +23 -0
- data/lib/puppet/data_providers/hiera_support.rb +37 -0
- data/lib/puppet/data_providers/json_data_provider_factory.rb +24 -0
- data/lib/puppet/data_providers/lookup_adapter.rb +247 -0
- data/lib/puppet/data_providers/yaml_data_provider_factory.rb +26 -0
- data/lib/puppet/data_providers.rb +12 -13
- data/lib/puppet/defaults.rb +202 -47
- data/lib/puppet/environments.rb +98 -8
- data/lib/puppet/error.rb +31 -1
- data/lib/puppet/face/config.rb +1 -1
- data/lib/puppet/face/epp.rb +1 -1
- data/lib/puppet/face/help/man.erb +1 -1
- data/lib/puppet/face/module/changes.rb +2 -1
- data/lib/puppet/face/module/install.rb +6 -6
- data/lib/puppet/face/parser.rb +12 -9
- data/lib/puppet/face/plugin.rb +7 -14
- data/lib/puppet/face/status.rb +2 -1
- data/lib/puppet/feature/cfacter.rb +1 -0
- data/lib/puppet/feature/cfpropertylist.rb +3 -0
- data/lib/puppet/feature/telnet.rb +9 -0
- data/lib/puppet/file_bucket/dipper.rb +58 -2
- data/lib/puppet/file_serving/http_metadata.rb +46 -0
- data/lib/puppet/file_serving/metadata.rb +30 -9
- data/lib/puppet/file_serving/terminus_helper.rb +7 -8
- data/lib/puppet/file_serving/terminus_selector.rb +2 -0
- data/lib/puppet/file_system/file_impl.rb +6 -2
- data/lib/puppet/file_system/memory_impl.rb +5 -1
- data/lib/puppet/file_system/uniquefile.rb +3 -3
- data/lib/puppet/file_system/windows.rb +12 -16
- data/lib/puppet/file_system.rb +15 -2
- data/lib/puppet/forge/repository.rb +1 -32
- data/lib/puppet/forge.rb +1 -1
- data/lib/puppet/functions/assert_type.rb +57 -21
- data/lib/puppet/functions/defined.rb +161 -0
- data/lib/puppet/functions/dig.rb +39 -0
- data/lib/puppet/functions/each.rb +89 -39
- data/lib/puppet/functions/epp.rb +29 -37
- data/lib/puppet/functions/filter.rb +64 -38
- data/lib/puppet/functions/hiera.rb +76 -3
- data/lib/puppet/functions/hiera_array.rb +65 -3
- data/lib/puppet/functions/hiera_hash.rb +74 -2
- data/lib/puppet/functions/hiera_include.rb +77 -4
- data/lib/puppet/functions/inline_epp.rb +44 -71
- data/lib/puppet/functions/lest.rb +53 -0
- data/lib/puppet/functions/lookup.rb +172 -184
- data/lib/puppet/functions/map.rb +60 -33
- data/lib/puppet/functions/match.rb +30 -12
- data/lib/puppet/functions/new.rb +502 -0
- data/lib/puppet/functions/reduce.rb +99 -70
- data/lib/puppet/functions/regsubst.rb +12 -11
- data/lib/puppet/functions/reverse_each.rb +82 -0
- data/lib/puppet/functions/scanf.rb +15 -18
- data/lib/puppet/functions/slice.rb +22 -36
- data/lib/puppet/functions/split.rb +3 -3
- data/lib/puppet/functions/step.rb +88 -0
- data/lib/puppet/functions/then.rb +74 -0
- data/lib/puppet/functions/type.rb +70 -0
- data/lib/puppet/functions/versioncmp.rb +36 -0
- data/lib/puppet/functions/with.rb +15 -7
- data/lib/puppet/functions.rb +149 -13
- data/lib/puppet/graph/rb_tree_map.rb +1 -1
- data/lib/puppet/indirector/catalog/compiler.rb +196 -9
- data/lib/puppet/indirector/catalog/static_compiler.rb +46 -30
- data/lib/puppet/indirector/data_binding/none.rb +4 -1
- data/lib/puppet/indirector/facts/facter.rb +8 -0
- data/lib/puppet/indirector/file_bucket_file/file.rb +58 -1
- data/lib/puppet/indirector/file_content/http.rb +15 -0
- data/lib/puppet/indirector/file_metadata/http.rb +27 -0
- data/lib/puppet/indirector/generic_http.rb +16 -0
- data/lib/puppet/indirector/hiera.rb +7 -1
- data/lib/puppet/indirector/indirection.rb +12 -3
- data/lib/puppet/indirector/json.rb +3 -3
- data/lib/puppet/indirector/msgpack.rb +2 -2
- data/lib/puppet/indirector/node/exec.rb +1 -1
- data/lib/puppet/indirector/node/ldap.rb +1 -1
- data/lib/puppet/indirector/request.rb +7 -8
- data/lib/puppet/indirector/resource_type/parser.rb +10 -3
- data/lib/puppet/indirector/rest.rb +7 -2
- data/lib/puppet/indirector/terminus.rb +4 -4
- data/lib/puppet/info_service/class_information_service.rb +112 -0
- data/lib/puppet/info_service.rb +7 -0
- data/lib/puppet/loaders.rb +4 -0
- data/lib/puppet/metatype/manager.rb +19 -2
- data/lib/puppet/module.rb +26 -17
- data/lib/puppet/module_tool/applications/application.rb +1 -1
- data/lib/puppet/module_tool/applications/builder.rb +2 -2
- data/lib/puppet/module_tool/applications/unpacker.rb +1 -1
- data/lib/puppet/module_tool/metadata.rb +32 -9
- data/lib/puppet/module_tool/skeleton/templates/generator/Gemfile +14 -3
- data/lib/puppet/module_tool/skeleton/templates/generator/README.md.erb +42 -38
- data/lib/puppet/module_tool/skeleton/templates/generator/Rakefile +19 -4
- data/lib/puppet/module_tool/skeleton/templates/generator/{tests → examples}/init.pp.erb +2 -2
- data/lib/puppet/module_tool/skeleton/templates/generator/manifests/init.pp.erb +25 -18
- data/lib/puppet/module_tool/skeleton/templates/generator/spec/classes/init_spec.rb.erb +1 -2
- data/lib/puppet/module_tool/tar/mini.rb +3 -3
- data/lib/puppet/network/auth_config_parser.rb +1 -1
- data/lib/puppet/network/authconfig.rb +21 -1
- data/lib/puppet/network/authorization.rb +8 -1
- data/lib/puppet/network/http/api/indirected_routes.rb +0 -2
- data/lib/puppet/network/http/api/master/v3/environment.rb +63 -0
- data/lib/puppet/network/http/api/master/v3.rb +7 -1
- data/lib/puppet/network/http/factory.rb +8 -4
- data/lib/puppet/network/http/pool.rb +9 -0
- data/lib/puppet/network/http/rack/rest.rb +10 -1
- data/lib/puppet/node/environment.rb +35 -11
- data/lib/puppet/node.rb +39 -8
- data/lib/puppet/parser/ast/pops_bridge.rb +85 -24
- data/lib/puppet/parser/compiler/catalog_validator/env_relationship_validator.rb +64 -0
- data/lib/puppet/parser/compiler/catalog_validator/relationship_validator.rb +60 -0
- data/lib/puppet/parser/compiler/catalog_validator/site_validator.rb +20 -0
- data/lib/puppet/parser/compiler/catalog_validator.rb +33 -0
- data/lib/puppet/parser/compiler.rb +305 -15
- data/lib/puppet/parser/e4_parser_adapter.rb +13 -12
- data/lib/puppet/parser/environment_compiler.rb +164 -0
- data/lib/puppet/parser/functions/assert_type.rb +46 -16
- data/lib/puppet/parser/functions/defined.rb +105 -44
- data/lib/puppet/parser/functions/each.rb +85 -27
- data/lib/puppet/parser/functions/epp.rb +29 -37
- data/lib/puppet/parser/functions/file.rb +3 -1
- data/lib/puppet/parser/functions/filter.rb +59 -23
- data/lib/puppet/parser/functions/fqdn_rand.rb +3 -3
- data/lib/puppet/parser/functions/hiera.rb +83 -27
- data/lib/puppet/parser/functions/hiera_array.rb +71 -28
- data/lib/puppet/parser/functions/hiera_hash.rb +81 -30
- data/lib/puppet/parser/functions/hiera_include.rb +81 -40
- data/lib/puppet/parser/functions/inline_epp.rb +35 -60
- data/lib/puppet/parser/functions/inline_template.rb +2 -2
- data/lib/puppet/parser/functions/lookup.rb +125 -149
- data/lib/puppet/parser/functions/map.rb +55 -20
- data/lib/puppet/parser/functions/match.rb +28 -12
- data/lib/puppet/parser/functions/reduce.rb +97 -60
- data/lib/puppet/parser/functions/scanf.rb +15 -26
- data/lib/puppet/parser/functions/slice.rb +17 -24
- data/lib/puppet/parser/functions/split.rb +1 -1
- data/lib/puppet/parser/functions/with.rb +16 -8
- data/lib/puppet/parser/functions.rb +28 -16
- data/lib/puppet/parser/resource.rb +119 -26
- data/lib/puppet/parser/scope.rb +233 -24
- data/lib/puppet/parser/templatewrapper.rb +2 -1
- data/lib/puppet/parser.rb +3 -0
- data/lib/puppet/plugins/configuration.rb +3 -2
- data/lib/puppet/plugins/data_providers/data_provider.rb +336 -0
- data/lib/puppet/plugins/data_providers/registry.rb +84 -0
- data/lib/puppet/plugins/data_providers.rb +12 -60
- data/lib/puppet/pops/adaptable.rb +4 -1
- data/lib/puppet/pops/adapters.rb +96 -12
- data/lib/puppet/pops/binder/binder.rb +21 -17
- data/lib/puppet/pops/binder/binder_issues.rb +8 -6
- data/lib/puppet/pops/binder/bindings_checker.rb +12 -8
- data/lib/puppet/pops/binder/bindings_composer.rb +16 -12
- data/lib/puppet/pops/binder/bindings_factory.rb +108 -104
- data/lib/puppet/pops/binder/bindings_label_provider.rb +3 -1
- data/lib/puppet/pops/binder/bindings_loader.rb +6 -2
- data/lib/puppet/pops/binder/bindings_model.rb +49 -47
- data/lib/puppet/pops/binder/bindings_model_meta.rb +2 -2
- data/lib/puppet/pops/binder/config/binder_config.rb +1 -1
- data/lib/puppet/pops/binder/config/diagnostic_producer.rb +10 -6
- data/lib/puppet/pops/binder/injector.rb +55 -50
- data/lib/puppet/pops/binder/key_factory.rb +10 -12
- data/lib/puppet/pops/binder/producers.rb +67 -62
- data/lib/puppet/pops/binder/scheme_handler/module_scheme.rb +68 -9
- data/lib/puppet/pops/evaluator/access_operator.rb +189 -138
- data/lib/puppet/pops/evaluator/closure.rb +151 -104
- data/lib/puppet/pops/evaluator/collector_transformer.rb +35 -25
- data/lib/puppet/pops/evaluator/collectors/abstract_collector.rb +1 -1
- data/lib/puppet/pops/evaluator/collectors/catalog_collector.rb +4 -0
- data/lib/puppet/pops/evaluator/collectors/exported_collector.rb +4 -1
- data/lib/puppet/pops/evaluator/compare_operator.rb +87 -10
- data/lib/puppet/pops/evaluator/epp_evaluator.rb +16 -10
- data/lib/puppet/pops/evaluator/evaluator_impl.rb +204 -111
- data/lib/puppet/pops/evaluator/json_strict_literal_evaluator.rb +85 -0
- data/lib/puppet/pops/evaluator/literal_evaluator.rb +88 -0
- data/lib/puppet/pops/evaluator/relationship_operator.rb +19 -11
- data/lib/puppet/pops/evaluator/runtime3_converter.rb +19 -2
- data/lib/puppet/pops/evaluator/runtime3_support.rb +95 -44
- data/lib/puppet/pops/functions/dispatch.rb +6 -1
- data/lib/puppet/pops/functions/dispatcher.rb +10 -4
- data/lib/puppet/pops/functions/function.rb +6 -2
- data/lib/puppet/pops/issue_reporter.rb +48 -20
- data/lib/puppet/pops/issues.rb +194 -17
- data/lib/puppet/pops/label_provider.rb +1 -1
- data/lib/puppet/pops/loader/base_loader.rb +48 -7
- data/lib/puppet/pops/loader/dependency_loader.rb +27 -2
- data/lib/puppet/pops/loader/loader.rb +23 -0
- data/lib/puppet/pops/loader/loader_paths.rb +82 -6
- data/lib/puppet/pops/loader/module_loaders.rb +36 -21
- data/lib/puppet/pops/loader/predefined_loader.rb +29 -0
- data/lib/puppet/pops/loader/puppet_function_instantiator.rb +83 -0
- data/lib/puppet/pops/loader/ruby_function_instantiator.rb +16 -3
- data/lib/puppet/pops/loader/runtime3_type_loader.rb +57 -0
- data/lib/puppet/pops/loader/static_loader.rb +92 -5
- data/lib/puppet/pops/loader/type_definition_instantiator.rb +77 -0
- data/lib/puppet/pops/loaders.rb +133 -19
- data/lib/puppet/pops/lookup/explainer.rb +509 -0
- data/lib/puppet/pops/lookup/interpolation.rb +115 -0
- data/lib/puppet/pops/lookup/invocation.rb +119 -0
- data/lib/puppet/pops/lookup/sub_lookup.rb +86 -0
- data/lib/puppet/pops/lookup.rb +35 -52
- data/lib/puppet/pops/merge_strategy.rb +85 -30
- data/lib/puppet/pops/migration/migration_checker.rb +54 -0
- data/lib/puppet/pops/model/ast_transformer.rb +8 -1
- data/lib/puppet/pops/model/factory.rb +242 -158
- data/lib/puppet/pops/model/model.rb +25 -8
- data/lib/puppet/pops/model/model_label_provider.rb +25 -6
- data/lib/puppet/pops/model/model_meta.rb +48 -3
- data/lib/puppet/pops/model/model_tree_dumper.rb +30 -0
- data/lib/puppet/pops/parser/code_merger.rb +13 -1
- data/lib/puppet/pops/parser/egrammar.ra +133 -30
- data/lib/puppet/pops/parser/eparser.rb +1738 -1254
- data/lib/puppet/pops/parser/epp_support.rb +27 -12
- data/lib/puppet/pops/parser/evaluating_parser.rb +27 -13
- data/lib/puppet/pops/parser/heredoc_support.rb +19 -14
- data/lib/puppet/pops/parser/interpolation_support.rb +7 -1
- data/lib/puppet/pops/parser/lexer2.rb +452 -379
- data/lib/puppet/pops/parser/lexer_support.rb +132 -25
- data/lib/puppet/pops/parser/locator.rb +30 -5
- data/lib/puppet/pops/parser/parser_support.rb +49 -37
- data/lib/puppet/pops/parser/slurp_support.rb +32 -8
- data/lib/puppet/pops/patterns.rb +3 -0
- data/lib/puppet/pops/pcore.rb +30 -0
- data/lib/puppet/pops/types/class_loader.rb +25 -23
- data/lib/puppet/pops/types/enumeration.rb +9 -27
- data/lib/puppet/pops/types/implementation_registry.rb +146 -0
- data/lib/puppet/pops/types/iterable.rb +308 -0
- data/lib/puppet/pops/types/p_object_type.rb +846 -0
- data/lib/puppet/pops/types/p_runtime_type.rb +102 -0
- data/lib/puppet/pops/types/p_sem_ver_range_type.rb +164 -0
- data/lib/puppet/pops/types/p_sem_ver_type.rb +113 -0
- data/lib/puppet/pops/types/puppet_object.rb +21 -0
- data/lib/puppet/pops/types/recursion_guard.rb +92 -0
- data/lib/puppet/pops/types/ruby_generator.rb +258 -0
- data/lib/puppet/pops/types/string_converter.rb +922 -0
- data/lib/puppet/pops/types/type_acceptor.rb +25 -0
- data/lib/puppet/pops/types/type_asserter.rb +21 -19
- data/lib/puppet/pops/types/type_assertion_error.rb +1 -0
- data/lib/puppet/pops/types/type_calculator.rb +213 -1184
- data/lib/puppet/pops/types/type_conversion_error.rb +15 -0
- data/lib/puppet/pops/types/type_factory.rb +216 -157
- data/lib/puppet/pops/types/type_formatter.rb +569 -0
- data/lib/puppet/pops/types/type_mismatch_describer.rb +1001 -0
- data/lib/puppet/pops/types/type_parser.rb +332 -279
- data/lib/puppet/pops/types/types.rb +2770 -288
- data/lib/puppet/pops/utils.rb +11 -10
- data/lib/puppet/pops/validation/checker4_0.rb +266 -72
- data/lib/puppet/pops/validation/validator_factory_4_0.rb +12 -5
- data/lib/puppet/pops/validation.rb +43 -13
- data/lib/puppet/pops/visitor.rb +3 -1
- data/lib/puppet/pops.rb +29 -24
- data/lib/puppet/property/ensure.rb +1 -1
- data/lib/puppet/property.rb +1 -1
- data/lib/puppet/provider/aixobject.rb +1 -1
- data/lib/puppet/provider/augeas/augeas.rb +57 -2
- data/lib/puppet/provider/cron/crontab.rb +1 -1
- data/lib/puppet/provider/exec/windows.rb +1 -1
- data/lib/puppet/provider/exec.rb +6 -1
- data/lib/puppet/provider/group/directoryservice.rb +10 -0
- data/lib/puppet/provider/group/pw.rb +1 -0
- data/lib/puppet/provider/group/windows_adsi.rb +19 -6
- data/lib/puppet/provider/macauthorization/macauthorization.rb +10 -9
- data/lib/puppet/provider/mount/parsed.rb +159 -2
- data/lib/puppet/provider/nameservice/directoryservice.rb +35 -50
- data/lib/puppet/provider/package/appdmg.rb +3 -2
- data/lib/puppet/provider/package/apt.rb +1 -1
- data/lib/puppet/provider/package/dnf.rb +41 -0
- data/lib/puppet/provider/package/gem.rb +23 -2
- data/lib/puppet/provider/package/nim.rb +1 -1
- data/lib/puppet/provider/package/openbsd.rb +7 -7
- data/lib/puppet/provider/package/pacman.rb +9 -8
- data/lib/puppet/provider/package/pip.rb +80 -20
- data/lib/puppet/provider/package/pip3.rb +20 -0
- data/lib/puppet/provider/package/pkg.rb +1 -1
- data/lib/puppet/provider/package/pkgdmg.rb +7 -4
- data/lib/puppet/provider/package/pkgin.rb +3 -3
- data/lib/puppet/provider/package/pkgng.rb +143 -0
- data/lib/puppet/provider/package/portage.rb +1 -1
- data/lib/puppet/provider/package/ports.rb +0 -3
- data/lib/puppet/provider/package/puppet_gem.rb +0 -0
- data/lib/puppet/provider/package/rpm.rb +120 -14
- data/lib/puppet/provider/package/windows/exe_package.rb +10 -9
- data/lib/puppet/provider/package/windows/msi_package.rb +4 -4
- data/lib/puppet/provider/package/windows/package.rb +9 -1
- data/lib/puppet/provider/package/windows.rb +1 -1
- data/lib/puppet/provider/package/yum.rb +31 -80
- data/lib/puppet/provider/package/zypper.rb +69 -15
- data/lib/puppet/provider/package.rb +6 -2
- data/lib/puppet/provider/scheduled_task/win32_taskscheduler.rb +32 -7
- data/lib/puppet/provider/service/base.rb +3 -2
- data/lib/puppet/provider/service/bsd.rb +8 -8
- data/lib/puppet/provider/service/daemontools.rb +3 -3
- data/lib/puppet/provider/service/debian.rb +12 -3
- data/lib/puppet/provider/service/freebsd.rb +1 -1
- data/lib/puppet/provider/service/init.rb +22 -0
- data/lib/puppet/provider/service/launchd.rb +41 -18
- data/lib/puppet/provider/service/rcng.rb +51 -0
- data/lib/puppet/provider/service/redhat.rb +2 -1
- data/lib/puppet/provider/service/runit.rb +3 -3
- data/lib/puppet/provider/service/smf.rb +48 -4
- data/lib/puppet/provider/service/src.rb +27 -0
- data/lib/puppet/provider/service/systemd.rb +104 -22
- data/lib/puppet/provider/service/upstart.rb +1 -1
- data/lib/puppet/provider/sshkey/parsed.rb +20 -10
- data/lib/puppet/provider/user/aix.rb +1 -1
- data/lib/puppet/provider/user/directoryservice.rb +33 -58
- data/lib/puppet/provider/user/openbsd.rb +1 -0
- data/lib/puppet/provider/user/pw.rb +1 -0
- data/lib/puppet/provider/user/user_role_add.rb +3 -1
- data/lib/puppet/provider/user/windows_adsi.rb +45 -2
- data/lib/puppet/provider/yumrepo/inifile.rb +6 -3
- data/lib/puppet/provider/zfs/zfs.rb +1 -1
- data/lib/puppet/provider/zone/solaris.rb +2 -2
- data/lib/puppet/provider/zpool/zpool.rb +1 -1
- data/lib/puppet/provider.rb +5 -0
- data/lib/puppet/reference/configuration.rb +11 -5
- data/lib/puppet/reference/indirection.rb +1 -1
- data/lib/puppet/reference/providers.rb +2 -3
- data/lib/puppet/reference/report.rb +9 -12
- data/lib/puppet/reports.rb +5 -1
- data/lib/puppet/resource/capability_finder.rb +102 -0
- data/lib/puppet/resource/catalog.rb +133 -36
- data/lib/puppet/resource/status.rb +19 -3
- data/lib/puppet/resource/type.rb +236 -49
- data/lib/puppet/resource/type_collection.rb +83 -10
- data/lib/puppet/resource.rb +116 -119
- data/lib/puppet/settings/base_setting.rb +9 -3
- data/lib/puppet/settings/config_file.rb +1 -1
- data/lib/puppet/settings/environment_conf.rb +13 -5
- data/lib/puppet/settings/file_setting.rb +10 -9
- data/lib/puppet/settings/symbolic_enum_setting.rb +17 -0
- data/lib/puppet/settings.rb +68 -20
- data/lib/puppet/ssl/certificate_authority/interface.rb +2 -2
- data/lib/puppet/ssl/certificate_factory.rb +3 -3
- data/lib/puppet/ssl/certificate_request.rb +4 -4
- data/lib/puppet/ssl/certificate_signer.rb +1 -1
- data/lib/puppet/ssl/oids.rb +33 -3
- data/lib/puppet/ssl/validator/default_validator.rb +1 -1
- data/lib/puppet/test/test_helper.rb +16 -5
- data/lib/puppet/transaction/additional_resource_generator.rb +89 -8
- data/lib/puppet/transaction/report.rb +31 -1
- data/lib/puppet/transaction/resource_harness.rb +0 -20
- data/lib/puppet/transaction.rb +46 -36
- data/lib/puppet/type/augeas.rb +10 -1
- data/lib/puppet/type/cron.rb +12 -12
- data/lib/puppet/type/exec.rb +27 -18
- data/lib/puppet/type/file/checksum_value.rb +53 -0
- data/lib/puppet/type/file/content.rb +32 -117
- data/lib/puppet/type/file/data_sync.rb +84 -0
- data/lib/puppet/type/file/ensure.rb +22 -19
- data/lib/puppet/type/file/selcontext.rb +1 -1
- data/lib/puppet/type/file/source.rb +121 -34
- data/lib/puppet/type/file/target.rb +2 -2
- data/lib/puppet/type/file.rb +107 -44
- data/lib/puppet/type/filebucket.rb +1 -1
- data/lib/puppet/type/group.rb +15 -3
- data/lib/puppet/type/interface.rb +8 -3
- data/lib/puppet/type/macauthorization.rb +1 -1
- data/lib/puppet/type/mount.rb +29 -2
- data/lib/puppet/type/package.rb +31 -11
- data/lib/puppet/type/schedule.rb +5 -5
- data/lib/puppet/type/scheduled_task.rb +13 -0
- data/lib/puppet/type/service.rb +24 -0
- data/lib/puppet/type/sshkey.rb +5 -3
- data/lib/puppet/type/stage.rb +1 -1
- data/lib/puppet/type/tidy.rb +6 -4
- data/lib/puppet/type/user.rb +55 -19
- data/lib/puppet/type/yumrepo.rb +25 -5
- data/lib/puppet/type/zone.rb +5 -5
- data/lib/puppet/type.rb +95 -18
- data/lib/puppet/util/autoload.rb +16 -11
- data/lib/puppet/util/checksums.rb +74 -31
- data/lib/puppet/util/command_line.rb +4 -0
- data/lib/puppet/util/execution.rb +21 -5
- data/lib/puppet/util/feature.rb +1 -1
- data/lib/puppet/util/http_proxy.rb +132 -0
- data/lib/puppet/util/log/destinations.rb +23 -2
- data/lib/puppet/util/log.rb +53 -9
- data/lib/puppet/util/logging.rb +80 -2
- data/lib/puppet/util/monkey_patches.rb +20 -7
- data/lib/puppet/util/multi_match.rb +51 -0
- data/lib/puppet/util/network_device/cisco/device.rb +24 -6
- data/lib/puppet/util/network_device/cisco/interface.rb +21 -9
- data/lib/puppet/util/network_device/transport/ssh.rb +7 -3
- data/lib/puppet/util/network_device/transport/telnet.rb +39 -36
- data/lib/puppet/util/plist.rb +130 -0
- data/lib/puppet/util/resource_template.rb +1 -1
- data/lib/puppet/util/run_mode.rb +3 -16
- data/lib/puppet/util/skip_tags.rb +9 -0
- data/lib/puppet/util/splayer.rb +18 -0
- data/lib/puppet/util/tagging.rb +7 -1
- data/lib/puppet/util/windows/access_control_entry.rb +1 -1
- data/lib/puppet/util/windows/access_control_list.rb +3 -3
- data/lib/puppet/util/windows/adsi.rb +186 -74
- data/lib/puppet/util/windows/api_types.rb +24 -18
- data/lib/puppet/util/windows/com.rb +3 -3
- data/lib/puppet/util/windows/error.rb +1 -1
- data/lib/puppet/util/windows/file.rb +48 -18
- data/lib/puppet/util/windows/principal.rb +190 -0
- data/lib/puppet/util/windows/process.rb +78 -11
- data/lib/puppet/util/windows/registry.rb +22 -16
- data/lib/puppet/util/windows/root_certs.rb +5 -5
- data/lib/puppet/util/windows/security.rb +37 -36
- data/lib/puppet/util/windows/security_descriptor.rb +1 -1
- data/lib/puppet/util/windows/sid.rb +84 -15
- data/lib/puppet/util/windows/taskscheduler.rb +16 -16
- data/lib/puppet/util/windows/user.rb +10 -10
- data/lib/puppet/util/windows.rb +5 -0
- data/lib/puppet/util.rb +123 -23
- data/lib/puppet/vendor/deep_merge/deep_merge.gemspec +1 -1
- data/lib/puppet/vendor/pathspec/LICENSE +2 -2
- data/lib/puppet/vendor/pathspec/README.md +1 -1
- data/lib/puppet/vendor/rgen/README.rdoc +1 -1
- data/lib/puppet/vendor/semantic/lib/semantic/dependency/module_release.rb +14 -0
- data/lib/puppet/version.rb +1 -1
- data/lib/puppet.rb +30 -1
- data/lib/semver.rb +17 -1
- data/man/man5/puppet.conf.5 +60 -18
- data/man/man8/extlookup2hiera.8 +2 -2
- data/man/man8/puppet-agent.8 +6 -3
- data/man/man8/puppet-apply.8 +6 -3
- data/man/man8/puppet-ca.8 +3 -3
- data/man/man8/puppet-catalog.8 +3 -3
- data/man/man8/puppet-cert.8 +3 -3
- data/man/man8/puppet-certificate.8 +3 -3
- data/man/man8/puppet-certificate_request.8 +3 -3
- data/man/man8/puppet-certificate_revocation_list.8 +3 -3
- data/man/man8/puppet-config.8 +4 -4
- data/man/man8/puppet-describe.8 +2 -2
- data/man/man8/puppet-device.8 +7 -4
- data/man/man8/puppet-doc.8 +2 -2
- data/man/man8/puppet-epp.8 +3 -3
- data/man/man8/puppet-facts.8 +3 -3
- data/man/man8/puppet-file.8 +3 -3
- data/man/man8/puppet-filebucket.8 +3 -3
- data/man/man8/puppet-help.8 +3 -3
- data/man/man8/puppet-inspect.8 +3 -3
- data/man/man8/puppet-key.8 +3 -3
- data/man/man8/puppet-man.8 +3 -3
- data/man/man8/puppet-master.8 +6 -3
- data/man/man8/puppet-module.8 +10 -10
- data/man/man8/puppet-node.8 +3 -3
- data/man/man8/puppet-parser.8 +3 -3
- data/man/man8/puppet-plugin.8 +3 -3
- data/man/man8/puppet-report.8 +3 -3
- data/man/man8/puppet-resource.8 +3 -3
- data/man/man8/puppet-resource_type.8 +3 -3
- data/man/man8/puppet-status.8 +4 -4
- data/man/man8/puppet.8 +2 -2
- data/spec/fixtures/module.tar.gz +0 -0
- data/spec/fixtures/unit/application/environments/production/data/common.yaml +20 -0
- data/spec/fixtures/unit/application/environments/production/environment.conf +1 -0
- data/spec/fixtures/unit/application/environments/production/manifests/site.pp +1 -0
- data/spec/fixtures/unit/application/environments/puppet_func_provider/environment.conf +1 -0
- data/spec/fixtures/unit/application/environments/puppet_func_provider/functions/data.pp +10 -0
- data/spec/fixtures/unit/application/environments/puppet_func_provider/manifests/site.pp +1 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_bad_syntax_json/data/bad.json +3 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_bad_syntax_json/environment.conf +2 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_bad_syntax_json/hiera.yaml +5 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_bad_syntax_json/manifests/site.pp +5 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_bad_syntax_yaml/data/bad.yaml +3 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_bad_syntax_yaml/environment.conf +2 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_bad_syntax_yaml/hiera.yaml +5 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_bad_syntax_yaml/manifests/site.pp +5 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_defaults/data/common.yaml +2 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_defaults/environment.conf +2 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_defaults/manifests/site.pp +1 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_defaults/modules/one/data/common.yaml +2 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_defaults/modules/one/manifests/init.pp +5 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_defaults/modules/one/metadata.json +9 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_env_config/data1/first.json +3 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_env_config/data1/name.yaml +2 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_env_config/data1/second.json +3 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_env_config/data1/single.yaml +2 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_env_config/data1/third_utf8.json +3 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_env_config/data1/utf8.yaml +3 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_env_config/data2/single.yaml +2 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_env_config/environment.conf +2 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_env_config/hiera.yaml +22 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_env_config/manifests/site.pp +5 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_misc/data/common.yaml +46 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_misc/environment.conf +2 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_misc/manifests/site.pp +1 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_misc/modules/one/data/common.yaml +30 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_misc/modules/one/manifests/init.pp +13 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_misc/modules/one/metadata.json +9 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_module_config/data/common.yaml +4 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_module_config/data/specific.yaml +4 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_module_config/environment.conf +2 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_module_config/hiera.yaml +7 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_module_config/manifests/site.pp +1 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_module_config/modules/one/data1/first.json +3 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_module_config/modules/one/data1/name.yaml +1 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_module_config/modules/one/data1/second.json +3 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_module_config/modules/one/data1/single.yaml +2 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_module_config/modules/one/data2/single.yaml +2 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_module_config/modules/one/hiera.yaml +18 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_module_config/modules/one/manifests/init.pp +5 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_module_config/modules/one/metadata.json +9 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_modules/data/common.yaml +4 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_modules/data/specific.yaml +4 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_modules/environment.conf +2 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_modules/hiera.yaml +7 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_modules/manifests/site.pp +1 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_modules/modules/one/data/common.yaml +6 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_modules/modules/one/hiera.yaml +5 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_modules/modules/one/manifests/init.pp +2 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_modules/modules/one/metadata.json +9 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_modules/modules/two/data/common.yaml +4 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_modules/modules/two/hiera.yaml +5 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_modules/modules/two/manifests/init.pp +3 -0
- data/spec/fixtures/unit/data_providers/environments/hiera_modules/modules/two/metadata.json +9 -0
- data/spec/fixtures/unit/data_providers/environments/production/lib/puppet/functions/environment/data.rb +3 -1
- data/spec/fixtures/unit/data_providers/environments/production/modules/abc/lib/puppet/functions/abc/data.rb +2 -1
- data/spec/fixtures/unit/data_providers/environments/production/modules/abc/manifests/init.pp +2 -1
- data/spec/fixtures/unit/data_providers/environments/production/modules/xyz/functions/data.pp +6 -0
- data/spec/fixtures/unit/data_providers/environments/production/modules/xyz/lib/puppet/bindings/xyz/default.rb +9 -0
- data/spec/fixtures/unit/data_providers/environments/production/modules/xyz/manifests/init.pp +9 -0
- data/spec/fixtures/unit/data_providers/environments/sample/modules/dataprovider/lib/puppet_x/helindbe/sample_env_data.rb +1 -0
- data/spec/fixtures/unit/data_providers/environments/sample/modules/dataprovider/lib/puppet_x/helindbe/sample_module_data.rb +1 -0
- data/spec/fixtures/unit/functions/lookup/environments/production/modules/bad_data/lib/puppet/functions/bad_data/data.rb +1 -0
- data/spec/fixtures/unit/functions/lookup/environments/production/modules/bad_data/manifests/init.pp +0 -1
- data/spec/fixtures/unit/functions/lookup/environments/production/modules/empty_json/data/empty.json +0 -0
- data/spec/fixtures/unit/functions/lookup/environments/production/modules/empty_json/hiera.yaml +5 -0
- data/spec/fixtures/unit/functions/lookup/environments/production/modules/empty_json/manifests/init.pp +2 -0
- data/spec/fixtures/unit/functions/lookup/environments/production/modules/empty_json/metadata.json +9 -0
- data/spec/fixtures/unit/functions/lookup/environments/production/modules/empty_key_json/data/empty_key.json +1 -0
- data/spec/fixtures/unit/functions/lookup/environments/production/modules/empty_key_json/hiera.yaml +5 -0
- data/spec/fixtures/unit/functions/lookup/environments/production/modules/empty_key_json/manifests/init.pp +2 -0
- data/spec/fixtures/unit/functions/lookup/environments/production/modules/empty_key_json/metadata.json +9 -0
- data/spec/fixtures/unit/functions/lookup/environments/production/modules/empty_key_yaml/data/empty_key.yaml +1 -0
- data/spec/fixtures/unit/functions/lookup/environments/production/modules/empty_key_yaml/hiera.yaml +5 -0
- data/spec/fixtures/unit/functions/lookup/environments/production/modules/empty_key_yaml/manifests/init.pp +2 -0
- data/spec/fixtures/unit/functions/lookup/environments/production/modules/empty_key_yaml/metadata.json +9 -0
- data/spec/fixtures/unit/functions/lookup/environments/production/modules/empty_yaml/data/empty.yaml +2 -0
- data/spec/fixtures/unit/functions/lookup/environments/production/modules/empty_yaml/hiera.yaml +5 -0
- data/spec/fixtures/unit/functions/lookup/environments/production/modules/empty_yaml/manifests/init.pp +2 -0
- data/spec/fixtures/unit/functions/lookup/environments/production/modules/empty_yaml/metadata.json +9 -0
- data/spec/fixtures/unit/functions/lookup/environments/production/modules/hieraprovider/data/first.json +4 -0
- data/spec/fixtures/unit/functions/lookup/environments/production/modules/hieraprovider/hiera.yaml +8 -0
- data/spec/fixtures/unit/functions/lookup/environments/production/modules/hieraprovider/manifests/init.pp +5 -0
- data/spec/fixtures/unit/functions/lookup/environments/production/modules/hieraprovider/metadata.json +9 -0
- data/spec/fixtures/unit/functions/lookup/environments/production/modules/meta/lib/puppet/functions/meta/data.rb +9 -0
- data/spec/fixtures/unit/functions/lookup/environments/production/modules/meta/manifests/init.pp +3 -0
- data/spec/fixtures/unit/functions/lookup/environments/production/modules/meta/metadata.json +9 -0
- data/spec/fixtures/unit/functions/lookup/environments/production/modules/metawcp/lib/puppet/bindings/metawcp/default.rb +10 -0
- data/spec/fixtures/unit/functions/lookup/environments/production/modules/metawcp/lib/puppet_x/thallgren/sample_module_data.rb +23 -0
- data/spec/fixtures/unit/functions/lookup/environments/production/modules/metawcp/manifests/init.pp +3 -0
- data/spec/fixtures/unit/functions/lookup/environments/production/modules/metawcp/metadata.json +9 -0
- data/spec/fixtures/unit/module/trailing-comma.json +1 -1
- data/spec/fixtures/unit/parser/lexer/subclass_name_duplication.pp +0 -0
- data/spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/usee/functions/usee_puppet.pp +3 -0
- data/spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/usee/lib/puppet/functions/usee/usee_ruby.rb +6 -0
- data/spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/usee/lib/puppet/type/usee_type.rb +5 -0
- data/spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/usee/manifests/init.pp +8 -0
- data/spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/usee/types/zero.pp +1 -0
- data/spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/usee2/lib/puppet/functions/usee2/callee.rb +5 -0
- data/spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/user/functions/puppet_calling_puppet.pp +5 -0
- data/spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/user/functions/puppet_calling_puppet_init.pp +5 -0
- data/spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/user/functions/puppet_calling_ruby.pp +5 -0
- data/spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/user/lib/puppet/functions/user/caller2.rb +5 -0
- data/spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/user/lib/puppet/functions/user/ruby_calling_puppet.rb +5 -0
- data/spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/user/lib/puppet/functions/user/ruby_calling_puppet_init.rb +5 -0
- data/spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/user/lib/puppet/functions/user/ruby_calling_ruby.rb +5 -0
- data/spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/user/manifests/init.pp +87 -0
- data/spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/{user → modules/user}/metadata.json +2 -1
- data/spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/user/types/withuseeone.pp +1 -0
- data/spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/user/types/withuseezero.pp +1 -0
- data/spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/user/functions/puppetcalled.pp +3 -0
- data/spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/user/functions/puppetcaller.pp +3 -0
- data/spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/user/functions/puppetcaller4.pp +3 -0
- data/spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/user/lib/puppet/functions/user/callingpuppet.rb +5 -0
- data/spec/fixtures/unit/pops/loaders/loaders/module_no_lib/modules/modulea/functions/hello.pp +3 -0
- data/spec/fixtures/unit/pops/loaders/loaders/module_no_lib/modules/modulea/manifests/init.pp +3 -0
- data/spec/fixtures/unit/pops/loaders/loaders/module_no_lib/modules/modulea/metadata.json +10 -0
- data/spec/fixtures/unit/pops/loaders/loaders/single_module/modules/modulea/functions/hello.pp +3 -0
- data/spec/fixtures/unit/pops/loaders/loaders/single_module/modules/modulea/functions/subspace/hello.pp +3 -0
- data/spec/fixtures/unit/pops/loaders/loaders/single_module/modules/modulea/metadata.json +1 -10
- data/spec/fixtures/unit/pops/parser/lexer/subclass_name_duplication.pp +0 -0
- data/spec/fixtures/unit/provider/mount/parsed/aix.filesystems +93 -85
- data/spec/fixtures/unit/provider/mount/parsed/aix.mount +11 -7
- data/spec/fixtures/unit/provider/package/pkgng/pkg.info +8 -0
- data/spec/fixtures/unit/provider/package/pkgng/pkg.query +1 -0
- data/spec/fixtures/unit/provider/package/pkgng/pkg.query_absent +1 -0
- data/spec/fixtures/unit/provider/package/pkgng/pkg.version +3 -0
- data/spec/fixtures/unit/provider/package/yum/yum-check-update-broken-notices.txt +187 -0
- data/spec/fixtures/unit/provider/package/yum/yum-check-update-obsoletes.txt +195 -0
- data/spec/fixtures/unit/provider/package/yum/yum-check-update-security.txt +184 -0
- data/spec/fixtures/unit/provider/package/zypper/zypper-list-updates-empty.out +3 -0
- data/spec/fixtures/unit/provider/service/smf/svcs.out +4 -3
- data/spec/fixtures/unit/provider/sshkey/parsed/sample_with_blank_lines +8 -0
- data/spec/fixtures/vcr/cassettes/Puppet_Network_HTTP_Connection/when_handling_requests/_request_get/should_yield_to_the_block.yml +24 -0
- data/spec/fixtures/vcr/cassettes/Puppet_Network_HTTP_Connection/when_handling_requests/_request_head/should_yield_to_the_block.yml +24 -0
- data/spec/fixtures/vcr/cassettes/Puppet_Network_HTTP_Connection/when_handling_requests/_request_post/should_yield_to_the_block.yml +24 -0
- data/spec/fixtures/vcr/cassettes/Puppet_Type_File/when_sourcing/from_http/using_md5/should_fetch_if_not_on_the_local_disk.yml +205 -0
- data/spec/fixtures/vcr/cassettes/Puppet_Type_File/when_sourcing/from_http/using_md5/should_not_update_if_content_on_disk_is_up-to-date.yml +213 -0
- data/spec/fixtures/vcr/cassettes/Puppet_Type_File/when_sourcing/from_http/using_md5/should_update_if_content_differs_on_disk.yml +213 -0
- data/spec/fixtures/vcr/cassettes/Puppet_Type_File/when_sourcing/from_http/using_mtime/should_fetch_if_mtime_is_older_on_disk.yml +205 -0
- data/spec/fixtures/vcr/cassettes/Puppet_Type_File/when_sourcing/from_http/using_mtime/should_fetch_if_no_header_specified.yml +197 -0
- data/spec/fixtures/vcr/cassettes/Puppet_Type_File/when_sourcing/from_http/using_mtime/should_fetch_if_not_on_the_local_disk.yml +205 -0
- data/spec/fixtures/vcr/cassettes/Puppet_Type_File/when_sourcing/from_http/using_mtime/should_not_update_if_mtime_is_newer_on_disk.yml +205 -0
- data/spec/integration/agent/logging_spec.rb +0 -0
- data/spec/integration/application/apply_spec.rb +121 -30
- data/spec/integration/application/doc_spec.rb +0 -0
- data/spec/integration/configurer_spec.rb +0 -0
- data/spec/integration/data_binding_spec.rb +195 -0
- data/spec/integration/defaults_spec.rb +14 -2
- data/spec/integration/faces/ca_spec.rb +0 -0
- data/spec/integration/faces/documentation_spec.rb +0 -0
- data/spec/integration/faces/plugin_spec.rb +0 -4
- data/spec/integration/file_bucket/file_spec.rb +2 -2
- data/spec/integration/file_serving/fileset_spec.rb +0 -0
- data/spec/integration/file_serving/terminus_helper_spec.rb +0 -0
- data/spec/integration/file_system/uniquefile_spec.rb +29 -0
- data/spec/integration/indirector/catalog/compiler_spec.rb +0 -0
- data/spec/integration/indirector/direct_file_server_spec.rb +0 -0
- data/spec/integration/indirector/facts/facter_spec.rb +97 -0
- data/spec/integration/indirector/file_content/file_server_spec.rb +0 -0
- data/spec/integration/indirector/file_metadata/file_server_spec.rb +0 -0
- data/spec/integration/indirector/node/ldap_spec.rb +0 -0
- data/spec/integration/module_tool/tar/mini_spec.rb +28 -0
- data/spec/integration/network/formats_spec.rb +0 -0
- data/spec/integration/node/environment_spec.rb +13 -0
- data/spec/integration/node/facts_spec.rb +0 -0
- data/spec/integration/node_spec.rb +0 -0
- data/spec/integration/parser/catalog_spec.rb +14 -2
- data/spec/integration/parser/collection_spec.rb +8 -0
- data/spec/integration/parser/compiler_spec.rb +949 -2
- data/spec/integration/parser/dynamic_scoping_spec.rb +67 -0
- data/spec/integration/parser/functions/require_spec.rb +0 -0
- data/spec/integration/parser/parameter_defaults_spec.rb +354 -0
- data/spec/integration/parser/resource_expressions_spec.rb +8 -5
- data/spec/integration/parser/scope_spec.rb +46 -7
- data/spec/integration/parser/undef_param_spec.rb +9 -1
- data/spec/integration/provider/mailalias/aliases_spec.rb +0 -0
- data/spec/integration/provider/mount_spec.rb +23 -36
- data/spec/integration/provider/service/init_spec.rb +0 -0
- data/spec/integration/provider/ssh_authorized_key_spec.rb +0 -0
- data/spec/integration/provider/yumrepo_spec.rb +1 -1
- data/spec/integration/reference/providers_spec.rb +0 -0
- data/spec/integration/reports_spec.rb +0 -0
- data/spec/integration/resource/catalog_spec.rb +1 -1
- data/spec/integration/resource/type_collection_spec.rb +8 -0
- data/spec/integration/ssl/certificate_authority_spec.rb +0 -1
- data/spec/integration/ssl/certificate_request_spec.rb +0 -1
- data/spec/integration/ssl/certificate_revocation_list_spec.rb +0 -1
- data/spec/integration/ssl/host_spec.rb +0 -1
- data/spec/integration/test/test_helper_spec.rb +28 -0
- data/spec/integration/transaction/report_spec.rb +16 -0
- data/spec/integration/transaction_spec.rb +52 -2
- data/spec/integration/type/exec_spec.rb +0 -0
- data/spec/integration/type/file_spec.rb +548 -45
- data/spec/integration/type/package_spec.rb +72 -1
- data/spec/integration/type/tidy_spec.rb +21 -9
- data/spec/integration/type_spec.rb +0 -0
- data/spec/integration/util/autoload_spec.rb +0 -0
- data/spec/integration/util/execution_spec.rb +22 -0
- data/spec/integration/util/rdoc/parser_spec.rb +1 -1
- data/spec/integration/util/settings_spec.rb +26 -0
- data/spec/integration/util/windows/principal_spec.rb +201 -0
- data/spec/integration/util/windows/process_spec.rb +31 -0
- data/spec/{unit → integration}/util/windows/registry_spec.rb +91 -1
- data/spec/integration/util/windows/security_spec.rb +40 -13
- data/spec/integration/util/windows/user_spec.rb +1 -1
- data/spec/integration/util_spec.rb +49 -27
- data/spec/lib/matchers/include_in_order.rb +2 -3
- data/spec/lib/matchers/resource.rb +22 -1
- data/spec/lib/puppet/face/1.0.0/huzzah.rb +0 -0
- data/spec/lib/puppet/face/basetest.rb +0 -0
- data/spec/lib/puppet/face/huzzah.rb +0 -0
- data/spec/lib/puppet_spec/compiler.rb +27 -3
- data/spec/lib/puppet_spec/files.rb +16 -2
- data/spec/lib/puppet_spec/fixtures.rb +0 -0
- data/spec/lib/puppet_spec/matchers.rb +6 -4
- data/spec/lib/puppet_spec/pops.rb +13 -0
- data/spec/lib/puppet_spec/verbose.rb +0 -0
- data/spec/shared_behaviours/all_parsedfile_providers.rb +0 -0
- data/spec/shared_behaviours/file_server_terminus.rb +0 -0
- data/spec/shared_behaviours/file_serving.rb +0 -0
- data/spec/shared_behaviours/iterative_functions.rb +9 -9
- data/spec/shared_behaviours/memory_terminus.rb +0 -0
- data/spec/shared_behaviours/path_parameters.rb +0 -0
- data/spec/shared_behaviours/things_that_declare_options.rb +0 -0
- data/spec/shared_contexts/types_setup.rb +100 -0
- data/spec/spec_helper.rb +7 -0
- data/spec/unit/agent/locker_spec.rb +4 -4
- data/spec/unit/agent_spec.rb +1 -46
- data/spec/unit/application/agent_spec.rb +15 -0
- data/spec/unit/application/apply_spec.rb +31 -1
- data/spec/unit/application/cert_spec.rb +0 -0
- data/spec/unit/application/certificate_spec.rb +0 -0
- data/spec/unit/application/config_spec.rb +0 -0
- data/spec/unit/application/describe_spec.rb +0 -0
- data/spec/unit/application/device_spec.rb +0 -0
- data/spec/unit/application/doc_spec.rb +0 -0
- data/spec/unit/application/face_base_spec.rb +0 -0
- data/spec/unit/application/facts_spec.rb +0 -0
- data/spec/unit/application/filebucket_spec.rb +88 -2
- data/spec/unit/application/indirection_base_spec.rb +0 -0
- data/spec/unit/application/inspect_spec.rb +19 -8
- data/spec/unit/application/lookup_spec.rb +387 -0
- data/spec/unit/application/master_spec.rb +33 -7
- data/spec/unit/application/resource_spec.rb +0 -0
- data/spec/unit/application_spec.rb +3 -3
- data/spec/unit/appmgmt_spec.rb +666 -0
- data/spec/unit/capability_spec.rb +394 -0
- data/spec/unit/configurer/downloader_factory_spec.rb +0 -0
- data/spec/unit/configurer/downloader_spec.rb +5 -5
- data/spec/unit/configurer/fact_handler_spec.rb +0 -0
- data/spec/unit/configurer/plugin_handler_spec.rb +42 -13
- data/spec/unit/configurer_spec.rb +282 -39
- data/spec/unit/confine/exists_spec.rb +0 -0
- data/spec/unit/confine/false_spec.rb +0 -0
- data/spec/unit/confine/feature_spec.rb +0 -0
- data/spec/unit/confine/true_spec.rb +0 -0
- data/spec/unit/confine/variable_spec.rb +0 -0
- data/spec/unit/confine_collection_spec.rb +0 -0
- data/spec/unit/confine_spec.rb +0 -0
- data/spec/unit/confiner_spec.rb +0 -0
- data/spec/unit/context/trusted_information_spec.rb +24 -1
- data/spec/unit/daemon_spec.rb +18 -8
- data/spec/unit/data_providers/function_data_provider_spec.rb +28 -1
- data/spec/unit/data_providers/hiera_data_provider_spec.rb +378 -0
- data/spec/unit/defaults_spec.rb +33 -0
- data/spec/unit/environments_spec.rb +26 -4
- data/spec/unit/external/pson_spec.rb +0 -0
- data/spec/unit/face/catalog_spec.rb +0 -0
- data/spec/unit/face/certificate_spec.rb +0 -0
- data/spec/unit/face/config_spec.rb +0 -0
- data/spec/unit/face/epp_face_spec.rb +2 -2
- data/spec/unit/face/facts_spec.rb +0 -0
- data/spec/unit/face/file_spec.rb +0 -0
- data/spec/unit/face/help_spec.rb +0 -0
- data/spec/unit/face/node_spec.rb +1 -1
- data/spec/unit/face/parser_spec.rb +43 -2
- data/spec/unit/face/plugin_spec.rb +33 -4
- data/spec/unit/face_spec.rb +0 -0
- data/spec/unit/file_bucket/dipper_spec.rb +210 -1
- data/spec/unit/file_bucket/file_spec.rb +0 -0
- data/spec/unit/file_serving/base_spec.rb +0 -0
- data/spec/unit/file_serving/configuration/parser_spec.rb +25 -30
- data/spec/unit/file_serving/configuration_spec.rb +1 -1
- data/spec/unit/file_serving/content_spec.rb +0 -0
- data/spec/unit/file_serving/fileset_spec.rb +0 -0
- data/spec/unit/file_serving/http_metadata_spec.rb +85 -0
- data/spec/unit/file_serving/metadata_spec.rb +51 -1
- data/spec/unit/file_serving/mount/file_spec.rb +0 -0
- data/spec/unit/file_serving/mount/modules_spec.rb +0 -0
- data/spec/unit/file_serving/mount/pluginfacts_spec.rb +0 -0
- data/spec/unit/file_serving/mount/plugins_spec.rb +0 -0
- data/spec/unit/file_serving/mount_spec.rb +0 -0
- data/spec/unit/file_serving/terminus_helper_spec.rb +2 -3
- data/spec/unit/file_serving/terminus_selector_spec.rb +12 -2
- data/spec/unit/file_system/uniquefile_spec.rb +20 -0
- data/spec/unit/file_system_spec.rb +145 -0
- data/spec/unit/functions/assert_type_spec.rb +48 -8
- data/spec/unit/functions/defined_spec.rb +289 -0
- data/spec/unit/functions/dig_spec.rb +58 -0
- data/spec/unit/functions/epp_spec.rb +17 -9
- data/spec/unit/functions/filter_spec.rb +18 -0
- data/spec/unit/functions/hiera_spec.rb +10 -8
- data/spec/unit/functions/inline_epp_spec.rb +4 -4
- data/spec/unit/functions/lest_spec.rb +34 -0
- data/spec/unit/functions/lookup_spec.rb +391 -22
- data/spec/unit/functions/new_spec.rb +543 -0
- data/spec/unit/functions/regsubst_spec.rb +29 -8
- data/spec/unit/functions/reverse_each_spec.rb +108 -0
- data/spec/unit/functions/scanf_spec.rb +1 -1
- data/spec/unit/functions/split_spec.rb +10 -2
- data/spec/unit/functions/step_spec.rb +113 -0
- data/spec/unit/functions/then_spec.rb +40 -0
- data/spec/unit/functions/type_spec.rb +35 -0
- data/spec/unit/functions/versioncmp_spec.rb +36 -0
- data/spec/unit/functions4_spec.rb +275 -70
- data/spec/unit/graph/relationship_graph_spec.rb +0 -0
- data/spec/unit/graph/sequential_prioritizer_spec.rb +1 -1
- data/spec/unit/graph/simple_graph_spec.rb +0 -0
- data/spec/unit/hiera/scope_spec.rb +5 -2
- data/spec/unit/hiera_puppet_spec.rb +49 -8
- data/spec/unit/indirector/catalog/compiler_spec.rb +752 -8
- data/spec/unit/indirector/catalog/json_spec.rb +0 -0
- data/spec/unit/indirector/catalog/msgpack_spec.rb +0 -0
- data/spec/unit/indirector/catalog/rest_spec.rb +0 -0
- data/spec/unit/indirector/catalog/static_compiler_spec.rb +38 -20
- data/spec/unit/indirector/catalog/store_configs_spec.rb +0 -0
- data/spec/unit/indirector/catalog/yaml_spec.rb +0 -0
- data/spec/unit/indirector/certificate/ca_spec.rb +0 -0
- data/spec/unit/indirector/certificate/disabled_ca_spec.rb +0 -0
- data/spec/unit/indirector/certificate/file_spec.rb +0 -0
- data/spec/unit/indirector/certificate/rest_spec.rb +0 -0
- data/spec/unit/indirector/certificate_request/ca_spec.rb +0 -0
- data/spec/unit/indirector/certificate_request/disabled_ca_spec.rb +0 -0
- data/spec/unit/indirector/certificate_request/file_spec.rb +0 -0
- data/spec/unit/indirector/certificate_request/rest_spec.rb +0 -0
- data/spec/unit/indirector/certificate_revocation_list/ca_spec.rb +0 -0
- data/spec/unit/indirector/certificate_revocation_list/disabled_ca_spec.rb +0 -0
- data/spec/unit/indirector/certificate_revocation_list/file_spec.rb +0 -0
- data/spec/unit/indirector/certificate_revocation_list/rest_spec.rb +0 -0
- data/spec/unit/indirector/certificate_status/file_spec.rb +0 -0
- data/spec/unit/indirector/certificate_status/rest_spec.rb +0 -0
- data/spec/unit/indirector/code_spec.rb +0 -0
- data/spec/unit/indirector/data_binding/none_spec.rb +2 -2
- data/spec/unit/indirector/direct_file_server_spec.rb +0 -0
- data/spec/unit/indirector/envelope_spec.rb +0 -0
- data/spec/unit/indirector/exec_spec.rb +0 -0
- data/spec/unit/indirector/face_spec.rb +0 -0
- data/spec/unit/indirector/facts/facter_spec.rb +8 -0
- data/spec/unit/indirector/facts/network_device_spec.rb +0 -0
- data/spec/unit/indirector/facts/store_configs_spec.rb +0 -0
- data/spec/unit/indirector/facts/yaml_spec.rb +0 -0
- data/spec/unit/indirector/file_bucket_file/file_spec.rb +53 -2
- data/spec/unit/indirector/file_bucket_file/rest_spec.rb +0 -0
- data/spec/unit/indirector/file_content/file_server_spec.rb +0 -0
- data/spec/unit/indirector/file_content/file_spec.rb +0 -0
- data/spec/unit/indirector/file_content/rest_spec.rb +0 -0
- data/spec/unit/indirector/file_metadata/file_server_spec.rb +0 -0
- data/spec/unit/indirector/file_metadata/file_spec.rb +0 -0
- data/spec/unit/indirector/file_metadata/rest_spec.rb +0 -0
- data/spec/unit/indirector/file_server_spec.rb +0 -0
- data/spec/unit/indirector/indirection_spec.rb +13 -2
- data/spec/unit/indirector/json_spec.rb +1 -1
- data/spec/unit/indirector/key/ca_spec.rb +0 -0
- data/spec/unit/indirector/key/disabled_ca_spec.rb +0 -0
- data/spec/unit/indirector/key/file_spec.rb +0 -0
- data/spec/unit/indirector/ldap_spec.rb +0 -0
- data/spec/unit/indirector/memory_spec.rb +0 -0
- data/spec/unit/indirector/msgpack_spec.rb +11 -1
- data/spec/unit/indirector/node/exec_spec.rb +0 -0
- data/spec/unit/indirector/node/ldap_spec.rb +0 -0
- data/spec/unit/indirector/node/memory_spec.rb +0 -0
- data/spec/unit/indirector/node/msgpack_spec.rb +0 -0
- data/spec/unit/indirector/node/plain_spec.rb +0 -0
- data/spec/unit/indirector/node/rest_spec.rb +0 -0
- data/spec/unit/indirector/node/store_configs_spec.rb +0 -0
- data/spec/unit/indirector/node/yaml_spec.rb +0 -0
- data/spec/unit/indirector/plain_spec.rb +0 -0
- data/spec/unit/indirector/report/msgpack_spec.rb +0 -0
- data/spec/unit/indirector/report/processor_spec.rb +0 -0
- data/spec/unit/indirector/report/rest_spec.rb +0 -0
- data/spec/unit/indirector/report/yaml_spec.rb +0 -0
- data/spec/unit/indirector/request_spec.rb +8 -8
- data/spec/unit/indirector/resource/ral_spec.rb +0 -0
- data/spec/unit/indirector/resource/store_configs_spec.rb +0 -0
- data/spec/unit/indirector/resource_type/parser_spec.rb +5 -0
- data/spec/unit/indirector/resource_type/rest_spec.rb +0 -0
- data/spec/unit/indirector/rest_spec.rb +12 -0
- data/spec/unit/indirector/ssl_file_spec.rb +1 -1
- data/spec/unit/indirector/status/rest_spec.rb +0 -0
- data/spec/unit/indirector/store_configs_spec.rb +0 -0
- data/spec/unit/indirector/terminus_spec.rb +0 -0
- data/spec/unit/indirector/yaml_spec.rb +1 -1
- data/spec/unit/indirector_spec.rb +0 -0
- data/spec/unit/info_service_spec.rb +298 -0
- data/spec/unit/interface/action_builder_spec.rb +0 -0
- data/spec/unit/interface/action_manager_spec.rb +0 -0
- data/spec/unit/interface/action_spec.rb +0 -0
- data/spec/unit/interface/documentation_spec.rb +0 -0
- data/spec/unit/interface/face_collection_spec.rb +0 -0
- data/spec/unit/interface/option_builder_spec.rb +0 -0
- data/spec/unit/interface/option_spec.rb +0 -0
- data/spec/unit/interface_spec.rb +0 -0
- data/spec/unit/man_spec.rb +0 -0
- data/spec/unit/module_spec.rb +42 -27
- data/spec/unit/module_tool/application_spec.rb +1 -1
- data/spec/unit/module_tool/applications/builder_spec.rb +28 -8
- data/spec/unit/module_tool/metadata_spec.rb +31 -2
- data/spec/unit/module_tool_spec.rb +0 -0
- data/spec/unit/network/auth_config_parser_spec.rb +16 -0
- data/spec/unit/network/authconfig_spec.rb +62 -32
- data/spec/unit/network/authorization_spec.rb +30 -2
- data/spec/unit/network/authstore_spec.rb +2 -2
- data/spec/unit/network/format_handler_spec.rb +0 -0
- data/spec/unit/network/format_spec.rb +0 -0
- data/spec/unit/network/formats_spec.rb +0 -0
- data/spec/unit/network/http/api/indirected_routes_spec.rb +21 -13
- data/spec/unit/network/http/api/master/v3/environment_spec.rb +60 -0
- data/spec/unit/network/http/api/master/v3_spec.rb +0 -0
- data/spec/unit/network/http/compression_spec.rb +1 -1
- data/spec/unit/network/http/connection_spec.rb +15 -19
- data/spec/unit/network/http/factory_spec.rb +14 -0
- data/spec/unit/network/http/handler_spec.rb +0 -5
- data/spec/unit/network/http/nocache_pool_spec.rb +0 -0
- data/spec/unit/network/http/pool_spec.rb +30 -0
- data/spec/unit/network/http/rack/rest_spec.rb +7 -0
- data/spec/unit/network/http/rack_spec.rb +0 -0
- data/spec/unit/network/http/session_spec.rb +0 -0
- data/spec/unit/network/http/site_spec.rb +0 -0
- data/spec/unit/network/http/webrick/rest_spec.rb +0 -0
- data/spec/unit/network/http/webrick_spec.rb +0 -0
- data/spec/unit/network/http_pool_spec.rb +0 -0
- data/spec/unit/network/http_spec.rb +0 -0
- data/spec/unit/network/resolver_spec.rb +0 -0
- data/spec/unit/network/rights_spec.rb +3 -3
- data/spec/unit/network/server_spec.rb +0 -0
- data/spec/unit/node/environment_spec.rb +10 -0
- data/spec/unit/node/facts_spec.rb +0 -0
- data/spec/unit/node_spec.rb +41 -0
- data/spec/unit/other/selinux_spec.rb +0 -0
- data/spec/unit/parameter/path_spec.rb +0 -0
- data/spec/unit/parameter/value_collection_spec.rb +0 -0
- data/spec/unit/parameter/value_spec.rb +0 -0
- data/spec/unit/parameter_spec.rb +0 -0
- data/spec/unit/parser/ast/leaf_spec.rb +1 -1
- data/spec/unit/parser/compiler_spec.rb +103 -2
- data/spec/unit/parser/files_spec.rb +0 -0
- data/spec/unit/parser/functions/create_resources_spec.rb +2 -2
- data/spec/unit/parser/functions/defined_spec.rb +0 -0
- data/spec/unit/parser/functions/digest_spec.rb +0 -0
- data/spec/unit/parser/functions/fail_spec.rb +0 -0
- data/spec/unit/parser/functions/file_spec.rb +7 -1
- data/spec/unit/parser/functions/fqdn_rand_spec.rb +6 -2
- data/spec/unit/parser/functions/generate_spec.rb +3 -12
- data/spec/unit/parser/functions/hiera_spec.rb +0 -0
- data/spec/unit/parser/functions/include_spec.rb +0 -0
- data/spec/unit/parser/functions/inline_template_spec.rb +0 -0
- data/spec/unit/parser/functions/realize_spec.rb +0 -0
- data/spec/unit/parser/functions/regsubst_spec.rb +0 -0
- data/spec/unit/parser/functions/require_spec.rb +0 -0
- data/spec/unit/parser/functions/scanf_spec.rb +0 -0
- data/spec/unit/parser/functions/shared.rb +1 -1
- data/spec/unit/parser/functions/shellquote_spec.rb +0 -0
- data/spec/unit/parser/functions/split_spec.rb +0 -0
- data/spec/unit/parser/functions/sprintf_spec.rb +0 -0
- data/spec/unit/parser/functions/tag_spec.rb +0 -0
- data/spec/unit/parser/functions/template_spec.rb +1 -1
- data/spec/unit/parser/functions/versioncmp_spec.rb +0 -0
- data/spec/unit/parser/functions_spec.rb +0 -0
- data/spec/unit/parser/relationship_spec.rb +0 -0
- data/spec/unit/parser/resource/param_spec.rb +0 -0
- data/spec/unit/parser/resource_spec.rb +10 -21
- data/spec/unit/parser/scope_spec.rb +84 -13
- data/spec/unit/parser/templatewrapper_spec.rb +1 -1
- data/spec/unit/parser/type_loader_spec.rb +0 -0
- data/spec/unit/pops/binder/config/binder_config_spec.rb +1 -1
- data/spec/unit/pops/binder/injector_spec.rb +3 -3
- data/spec/unit/pops/evaluator/access_ops_spec.rb +52 -17
- data/spec/unit/pops/evaluator/basic_expressions_spec.rb +1 -2
- data/spec/unit/pops/evaluator/comparison_ops_spec.rb +3 -0
- data/spec/unit/pops/evaluator/evaluating_parser_spec.rb +125 -36
- data/spec/unit/pops/evaluator/evaluator_rspec_helper.rb +4 -4
- data/spec/unit/pops/evaluator/json_strict_literal_evaluator_spec.rb +63 -0
- data/spec/unit/pops/evaluator/literal_evaluator_spec.rb +43 -0
- data/spec/unit/pops/evaluator/runtime3_converter_spec.rb +25 -0
- data/spec/unit/pops/evaluator/variables_spec.rb +2 -2
- data/spec/unit/pops/issues_spec.rb +16 -16
- data/spec/unit/pops/label_provider_spec.rb +5 -1
- data/spec/unit/pops/loaders/dependency_loader_spec.rb +53 -0
- data/spec/unit/pops/loaders/loaders_spec.rb +230 -47
- data/spec/unit/pops/loaders/static_loader_spec.rb +92 -1
- data/spec/unit/pops/lookup/interpolation_spec.rb +313 -0
- data/spec/unit/pops/migration_spec.rb +53 -0
- data/spec/unit/pops/parser/lexer2_spec.rb +326 -6
- data/spec/unit/pops/parser/parse_application_spec.rb +35 -0
- data/spec/unit/pops/parser/parse_basic_expressions_spec.rb +23 -0
- data/spec/unit/pops/parser/parse_calls_spec.rb +8 -0
- data/spec/unit/pops/parser/parse_capabilities_spec.rb +40 -0
- data/spec/unit/pops/parser/parse_heredoc_spec.rb +26 -0
- data/spec/unit/pops/parser/parse_site_spec.rb +47 -0
- data/spec/unit/pops/parser/parser_rspec_helper.rb +6 -0
- data/spec/unit/pops/parser/parser_spec.rb +28 -0
- data/spec/unit/pops/parser/source_pos_adapter_spec.rb +26 -0
- data/spec/unit/pops/types/enumeration_spec.rb +13 -12
- data/spec/unit/pops/types/iterable_spec.rb +262 -0
- data/spec/unit/pops/types/p_object_type_spec.rb +1060 -0
- data/spec/unit/pops/types/p_sem_ver_type_spec.rb +285 -0
- data/spec/unit/pops/types/recursion_guard_spec.rb +93 -0
- data/spec/unit/pops/types/ruby_generator_spec.rb +261 -0
- data/spec/unit/pops/types/string_converter_spec.rb +904 -0
- data/spec/unit/pops/types/type_acceptor_spec.rb +105 -0
- data/spec/unit/pops/types/type_asserter_spec.rb +43 -0
- data/spec/unit/pops/types/type_calculator_spec.rb +960 -849
- data/spec/unit/pops/types/type_factory_spec.rb +132 -91
- data/spec/unit/pops/types/type_formatter_spec.rb +352 -0
- data/spec/unit/pops/types/type_mismatch_describer_spec.rb +177 -0
- data/spec/unit/pops/types/type_parser_spec.rb +119 -32
- data/spec/unit/pops/types/types_spec.rb +561 -0
- data/spec/unit/pops/validation_spec.rb +66 -0
- data/spec/unit/pops/validator/validator_spec.rb +303 -17
- data/spec/unit/property/ensure_spec.rb +0 -0
- data/spec/unit/property/keyvalue_spec.rb +0 -0
- data/spec/unit/property/list_spec.rb +0 -0
- data/spec/unit/property/ordered_list_spec.rb +0 -0
- data/spec/unit/property_spec.rb +1 -1
- data/spec/unit/provider/augeas/augeas_spec.rb +59 -0
- data/spec/unit/provider/cisco_spec.rb +0 -0
- data/spec/unit/provider/command_spec.rb +0 -0
- data/spec/unit/provider/cron/crontab_spec.rb +0 -0
- data/spec/unit/provider/cron/parsed_spec.rb +1 -0
- data/spec/unit/provider/exec/posix_spec.rb +0 -0
- data/spec/unit/provider/exec/shell_spec.rb +0 -0
- data/spec/unit/provider/exec/windows_spec.rb +0 -0
- data/spec/unit/provider/exec_spec.rb +0 -0
- data/spec/unit/provider/file/posix_spec.rb +0 -0
- data/spec/unit/provider/file/windows_spec.rb +0 -0
- data/spec/unit/provider/group/directoryservice_spec.rb +33 -0
- data/spec/unit/provider/group/groupadd_spec.rb +0 -0
- data/spec/unit/provider/group/ldap_spec.rb +0 -0
- data/spec/unit/provider/group/pw_spec.rb +0 -0
- data/spec/unit/provider/group/windows_adsi_spec.rb +73 -17
- data/spec/unit/provider/host/parsed_spec.rb +0 -0
- data/spec/unit/provider/interface/cisco_spec.rb +0 -0
- data/spec/unit/provider/ldap_spec.rb +0 -0
- data/spec/unit/provider/macauthorization_spec.rb +5 -2
- data/spec/unit/provider/mcx/mcxcontent_spec.rb +0 -0
- data/spec/unit/provider/mount/parsed_spec.rb +31 -5
- data/spec/unit/provider/mount_spec.rb +0 -0
- data/spec/unit/provider/naginator_spec.rb +0 -0
- data/spec/unit/provider/nameservice/directoryservice_spec.rb +14 -19
- data/spec/unit/provider/nameservice_spec.rb +0 -0
- data/spec/unit/provider/network_device_spec.rb +0 -0
- data/spec/unit/provider/package/aix_spec.rb +0 -0
- data/spec/unit/provider/package/appdmg_spec.rb +3 -3
- data/spec/unit/provider/package/apt_spec.rb +5 -0
- data/spec/unit/provider/package/aptitude_spec.rb +0 -0
- data/spec/unit/provider/package/aptrpm_spec.rb +2 -2
- data/spec/unit/provider/package/base_spec.rb +18 -0
- data/spec/unit/provider/package/dnf_spec.rb +108 -0
- data/spec/unit/provider/package/dpkg_spec.rb +0 -0
- data/spec/unit/provider/package/freebsd_spec.rb +0 -0
- data/spec/unit/provider/package/gem_spec.rb +77 -0
- data/spec/unit/provider/package/hpux_spec.rb +0 -0
- data/spec/unit/provider/package/macports_spec.rb +0 -0
- data/spec/unit/provider/package/nim_spec.rb +6 -6
- data/spec/unit/provider/package/openbsd_spec.rb +0 -0
- data/spec/unit/provider/package/opkg_spec.rb +0 -0
- data/spec/unit/provider/package/pacman_spec.rb +55 -0
- data/spec/unit/provider/package/pip3_spec.rb +22 -0
- data/spec/unit/provider/package/pip_spec.rb +159 -46
- data/spec/unit/provider/package/pkg_spec.rb +0 -0
- data/spec/unit/provider/package/pkgdmg_spec.rb +35 -8
- data/spec/unit/provider/package/pkgin_spec.rb +23 -13
- data/spec/unit/provider/package/pkgng_spec.rb +174 -0
- data/spec/unit/provider/package/pkgutil_spec.rb +0 -0
- data/spec/unit/provider/package/puppet_gem_spec.rb +0 -0
- data/spec/unit/provider/package/rpm_spec.rb +160 -3
- data/spec/unit/provider/package/sun_spec.rb +0 -0
- data/spec/unit/provider/package/windows/exe_package_spec.rb +0 -1
- data/spec/unit/provider/package/windows/msi_package_spec.rb +0 -1
- data/spec/unit/provider/package/windows/package_spec.rb +41 -0
- data/spec/unit/provider/package/windows_spec.rb +0 -0
- data/spec/unit/provider/package/yum_spec.rb +81 -147
- data/spec/unit/provider/package/zypper_spec.rb +64 -19
- data/spec/unit/provider/parsedfile_spec.rb +0 -0
- data/spec/unit/provider/scheduled_task/win32_taskscheduler_spec.rb +322 -70
- data/spec/unit/provider/selboolean_spec.rb +0 -0
- data/spec/unit/provider/selmodule_spec.rb +0 -0
- data/spec/unit/provider/service/base_spec.rb +38 -27
- data/spec/unit/provider/service/bsd_spec.rb +130 -0
- data/spec/unit/provider/service/daemontools_spec.rb +0 -0
- data/spec/unit/provider/service/debian_spec.rb +29 -0
- data/spec/unit/provider/service/freebsd_spec.rb +17 -0
- data/spec/unit/provider/service/gentoo_spec.rb +2 -0
- data/spec/unit/provider/service/init_spec.rb +35 -1
- data/spec/unit/provider/service/launchd_spec.rb +89 -21
- data/spec/unit/provider/service/openbsd_spec.rb +1 -0
- data/spec/unit/provider/service/openrc_spec.rb +1 -0
- data/spec/unit/provider/service/openwrt_spec.rb +0 -0
- data/spec/unit/provider/service/rcng_spec.rb +41 -0
- data/spec/unit/provider/service/redhat_spec.rb +9 -1
- data/spec/unit/provider/service/runit_spec.rb +0 -0
- data/spec/unit/provider/service/smf_spec.rb +43 -6
- data/spec/unit/provider/service/src_spec.rb +20 -4
- data/spec/unit/provider/service/systemd_spec.rb +169 -37
- data/spec/unit/provider/service/upstart_spec.rb +58 -0
- data/spec/unit/provider/service/windows_spec.rb +0 -0
- data/spec/unit/provider/ssh_authorized_key/parsed_spec.rb +1 -1
- data/spec/unit/provider/sshkey/parsed_spec.rb +42 -18
- data/spec/unit/provider/user/directoryservice_spec.rb +40 -59
- data/spec/unit/provider/user/hpux_spec.rb +0 -0
- data/spec/unit/provider/user/ldap_spec.rb +0 -0
- data/spec/unit/provider/user/openbsd_spec.rb +0 -0
- data/spec/unit/provider/user/pw_spec.rb +0 -0
- data/spec/unit/provider/user/user_role_add_spec.rb +0 -0
- data/spec/unit/provider/user/useradd_spec.rb +0 -0
- data/spec/unit/provider/user/windows_adsi_spec.rb +137 -7
- data/spec/unit/provider/vlan/cisco_spec.rb +0 -0
- data/spec/unit/provider/yumrepo/inifile_spec.rb +16 -0
- data/spec/unit/provider/zfs/zfs_spec.rb +0 -0
- data/spec/unit/provider/zone/solaris_spec.rb +64 -12
- data/spec/unit/provider/zpool/zpool_spec.rb +0 -0
- data/spec/unit/provider_spec.rb +0 -0
- data/spec/unit/puppet_spec.rb +1 -1
- data/spec/unit/relationship_spec.rb +0 -0
- data/spec/unit/reports/http_spec.rb +0 -0
- data/spec/unit/reports/store_spec.rb +0 -0
- data/spec/unit/reports_spec.rb +10 -0
- data/spec/unit/resource/capability_finder_spec.rb +77 -0
- data/spec/unit/resource/catalog_spec.rb +95 -8
- data/spec/unit/resource/status_spec.rb +0 -0
- data/spec/unit/resource/type_collection_helper_spec.rb +0 -0
- data/spec/unit/resource/type_collection_spec.rb +23 -2
- data/spec/unit/resource/type_spec.rb +150 -8
- data/spec/unit/resource_spec.rb +115 -48
- data/spec/unit/settings/directory_setting_spec.rb +0 -0
- data/spec/unit/settings/duration_setting_spec.rb +0 -0
- data/spec/unit/settings/environment_conf_spec.rb +18 -1
- data/spec/unit/settings/file_setting_spec.rb +37 -0
- data/spec/unit/settings/path_setting_spec.rb +0 -0
- data/spec/unit/settings/priority_setting_spec.rb +0 -0
- data/spec/unit/settings_spec.rb +103 -3
- data/spec/unit/ssl/base_spec.rb +0 -0
- data/spec/unit/ssl/certificate_authority/interface_spec.rb +4 -3
- data/spec/unit/ssl/certificate_authority_spec.rb +5 -3
- data/spec/unit/ssl/certificate_factory_spec.rb +0 -0
- data/spec/unit/ssl/certificate_request_spec.rb +0 -0
- data/spec/unit/ssl/certificate_revocation_list_spec.rb +3 -3
- data/spec/unit/ssl/certificate_spec.rb +0 -0
- data/spec/unit/ssl/configuration_spec.rb +0 -0
- data/spec/unit/ssl/host_spec.rb +2 -2
- data/spec/unit/ssl/inventory_spec.rb +0 -0
- data/spec/unit/ssl/key_spec.rb +0 -0
- data/spec/unit/ssl/oids_spec.rb +8 -0
- data/spec/unit/status_spec.rb +0 -0
- data/spec/unit/transaction/additional_resource_generator_spec.rb +120 -32
- data/spec/unit/transaction/event_manager_spec.rb +0 -0
- data/spec/unit/transaction/event_spec.rb +0 -0
- data/spec/unit/transaction/report_spec.rb +51 -1
- data/spec/unit/transaction/resource_harness_spec.rb +0 -47
- data/spec/unit/transaction_spec.rb +12 -0
- data/spec/unit/type/augeas_spec.rb +0 -0
- data/spec/unit/type/component_spec.rb +0 -0
- data/spec/unit/type/computer_spec.rb +0 -0
- data/spec/unit/type/cron_spec.rb +0 -0
- data/spec/unit/type/exec_spec.rb +16 -8
- data/spec/unit/type/file/checksum_spec.rb +6 -0
- data/spec/unit/type/file/checksum_value_spec.rb +286 -0
- data/spec/unit/type/file/content_spec.rb +12 -193
- data/spec/unit/type/file/ctime_spec.rb +0 -0
- data/spec/unit/type/file/ensure_spec.rb +0 -0
- data/spec/unit/type/file/group_spec.rb +0 -0
- data/spec/unit/type/file/mode_spec.rb +0 -0
- data/spec/unit/type/file/mtime_spec.rb +0 -0
- data/spec/unit/type/file/owner_spec.rb +0 -0
- data/spec/unit/type/file/selinux_spec.rb +0 -0
- data/spec/unit/type/file/source_spec.rb +211 -119
- data/spec/unit/type/file/type_spec.rb +0 -0
- data/spec/unit/type/file_spec.rb +133 -34
- data/spec/unit/type/filebucket_spec.rb +0 -0
- data/spec/unit/type/group_spec.rb +0 -0
- data/spec/unit/type/host_spec.rb +4 -4
- data/spec/unit/type/interface_spec.rb +32 -0
- data/spec/unit/type/k5login_spec.rb +0 -0
- data/spec/unit/type/macauthorization_spec.rb +4 -1
- data/spec/unit/type/mailalias_spec.rb +0 -0
- data/spec/unit/type/maillist_spec.rb +0 -0
- data/spec/unit/type/mcx_spec.rb +0 -0
- data/spec/unit/type/mount_spec.rb +59 -10
- data/spec/unit/type/nagios_spec.rb +0 -0
- data/spec/unit/type/noop_metaparam_spec.rb +0 -0
- data/spec/unit/type/package/package_settings_spec.rb +0 -0
- data/spec/unit/type/package_spec.rb +1 -0
- data/spec/unit/type/resources_spec.rb +0 -0
- data/spec/unit/type/schedule_spec.rb +0 -0
- data/spec/unit/type/selboolean_spec.rb +0 -0
- data/spec/unit/type/selmodule_spec.rb +0 -0
- data/spec/unit/type/service_spec.rb +21 -0
- data/spec/unit/type/ssh_authorized_key_spec.rb +0 -0
- data/spec/unit/type/sshkey_spec.rb +0 -0
- data/spec/unit/type/stage_spec.rb +0 -0
- data/spec/unit/type/tidy_spec.rb +4 -4
- data/spec/unit/type/user_spec.rb +14 -7
- data/spec/unit/type/vlan_spec.rb +1 -1
- data/spec/unit/type/whit_spec.rb +0 -0
- data/spec/unit/type/yumrepo_spec.rb +2 -2
- data/spec/unit/type/zfs_spec.rb +0 -0
- data/spec/unit/type/zone_spec.rb +0 -0
- data/spec/unit/type/zpool_spec.rb +0 -0
- data/spec/unit/type_spec.rb +15 -1
- data/spec/unit/util/autoload_spec.rb +0 -0
- data/spec/unit/util/backups_spec.rb +0 -0
- data/spec/unit/util/checksums_spec.rb +0 -0
- data/spec/unit/util/colors_spec.rb +0 -0
- data/spec/unit/util/command_line_spec.rb +0 -0
- data/spec/unit/util/constant_inflector_spec.rb +0 -0
- data/spec/unit/util/diff_spec.rb +0 -0
- data/spec/unit/util/errors_spec.rb +0 -0
- data/spec/unit/util/execution_spec.rb +0 -0
- data/spec/unit/util/execution_stub_spec.rb +0 -0
- data/spec/unit/util/feature_spec.rb +1 -1
- data/spec/unit/util/filetype_spec.rb +1 -1
- data/spec/unit/util/http_proxy_spec.rb +87 -0
- data/spec/unit/util/ldap/connection_spec.rb +0 -0
- data/spec/unit/util/ldap/generator_spec.rb +1 -1
- data/spec/unit/util/ldap/manager_spec.rb +0 -0
- data/spec/unit/util/log/destinations_spec.rb +0 -2
- data/spec/unit/util/log_spec.rb +125 -1
- data/spec/unit/util/logging_spec.rb +69 -0
- data/spec/unit/util/metric_spec.rb +0 -0
- data/spec/unit/util/monkey_patches_spec.rb +79 -3
- data/spec/unit/util/multi_match_spec.rb +39 -0
- data/spec/unit/util/nagios_maker_spec.rb +0 -0
- data/spec/unit/util/network_device/cisco/device_spec.rb +253 -216
- data/spec/unit/util/network_device/cisco/facts_spec.rb +0 -0
- data/spec/unit/util/network_device/cisco/interface_spec.rb +0 -0
- data/spec/unit/util/network_device/config_spec.rb +0 -0
- data/spec/unit/util/network_device/ipcalc_spec.rb +0 -0
- data/spec/unit/util/network_device/transport/base_spec.rb +0 -0
- data/spec/unit/util/network_device/transport/ssh_spec.rb +1 -1
- data/spec/unit/util/network_device/transport/telnet_spec.rb +60 -58
- data/spec/unit/util/network_device_spec.rb +1 -1
- data/spec/unit/util/package_spec.rb +0 -0
- data/spec/unit/util/plist_spec.rb +110 -0
- data/spec/unit/util/posix_spec.rb +0 -0
- data/spec/unit/util/rdoc_spec.rb +0 -0
- data/spec/unit/util/resource_template_spec.rb +2 -2
- data/spec/unit/util/retry_action_spec.rb +0 -0
- data/spec/unit/util/run_mode_spec.rb +27 -3
- data/spec/unit/util/selinux_spec.rb +0 -0
- data/spec/unit/util/splayer_spec.rb +45 -0
- data/spec/unit/util/storage_spec.rb +5 -1
- data/spec/unit/util/suidmanager_spec.rb +0 -0
- data/spec/unit/util/symbolic_file_mode_spec.rb +0 -0
- data/spec/unit/util/tagging_spec.rb +0 -0
- data/spec/unit/util/user_attr_spec.rb +0 -0
- data/spec/unit/util/warnings_spec.rb +0 -0
- data/spec/unit/util/windows/adsi_spec.rb +175 -60
- data/spec/unit/util/windows/api_types_spec.rb +42 -0
- data/spec/unit/util/windows/file_spec.rb +34 -0
- data/spec/unit/util/windows/root_certs_spec.rb +0 -0
- data/spec/unit/util/windows/security_descriptor_spec.rb +3 -3
- data/spec/unit/util/windows/sid_spec.rb +48 -21
- data/spec/unit/util_spec.rb +144 -15
- data/spec/watchr.rb +0 -0
- data/tasks/cfpropertylist.rake +15 -0
- metadata +3427 -2981
- checksums.yaml +0 -7
- data/ext/puppet-nm-dispatcher +0 -13
- data/ext/systemd/puppetmaster.service +0 -11
- data/lib/puppet/pops/evaluator/callable_mismatch_describer.rb +0 -175
- data/lib/puppet/pops/types/types_meta.rb +0 -223
- data/lib/puppet/vendor/load_plist.rb +0 -1
- data/lib/puppet/vendor/plist/CHANGELOG +0 -82
- data/lib/puppet/vendor/plist/MIT-LICENSE +0 -21
- data/lib/puppet/vendor/plist/PUPPET_README.md +0 -6
- data/lib/puppet/vendor/plist/README +0 -36
- data/lib/puppet/vendor/plist/Rakefile +0 -144
- data/lib/puppet/vendor/plist/docs/USAGE +0 -104
- data/lib/puppet/vendor/plist/docs/jamis-template.rb +0 -591
- data/lib/puppet/vendor/plist/lib/plist/generator.rb +0 -224
- data/lib/puppet/vendor/plist/lib/plist/parser.rb +0 -225
- data/lib/puppet/vendor/plist/lib/plist.rb +0 -22
- data/lib/puppet/vendor/plist/test/assets/AlbumData.xml +0 -203
- data/lib/puppet/vendor/plist/test/assets/Cookies.plist +0 -104
- data/lib/puppet/vendor/plist/test/assets/commented.plist +0 -9
- data/lib/puppet/vendor/plist/test/assets/example_data.bin +0 -0
- data/lib/puppet/vendor/plist/test/assets/example_data.jpg +0 -0
- data/lib/puppet/vendor/plist/test/assets/example_data.plist +0 -259
- data/lib/puppet/vendor/plist/test/assets/test_data_elements.plist +0 -24
- data/lib/puppet/vendor/plist/test/assets/test_empty_key.plist +0 -13
- data/lib/puppet/vendor/plist/test/test_data_elements.rb +0 -115
- data/lib/puppet/vendor/plist/test/test_generator.rb +0 -59
- data/lib/puppet/vendor/plist/test/test_generator_basic_types.rb +0 -58
- data/lib/puppet/vendor/plist/test/test_generator_collections.rb +0 -82
- data/lib/puppet/vendor/plist/test/test_parser.rb +0 -90
- data/spec/integration/data_binding.rb +0 -104
- data/spec/integration/provider/package_spec.rb +0 -33
- /data/spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/{usee → modules/usee}/lib/puppet/functions/usee/callee.rb +0 -0
- /data/spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/{user → modules/user}/lib/puppet/functions/user/caller.rb +0 -0
|
@@ -0,0 +1,904 @@
|
|
|
1
|
+
require 'spec_helper'
|
|
2
|
+
require 'puppet/pops'
|
|
3
|
+
|
|
4
|
+
describe 'The string converter' do
|
|
5
|
+
let(:converter) { Puppet::Pops::Types::StringConverter.singleton }
|
|
6
|
+
let(:factory) { Puppet::Pops::Types::TypeFactory }
|
|
7
|
+
let(:format) { Puppet::Pops::Types::StringConverter::Format }
|
|
8
|
+
|
|
9
|
+
describe 'helper Format' do
|
|
10
|
+
it 'parses a single character like "%d" as a format' do
|
|
11
|
+
fmt = format.new("%d")
|
|
12
|
+
expect(fmt.format()).to be(:d)
|
|
13
|
+
expect(fmt.alt()).to be(false)
|
|
14
|
+
expect(fmt.left()).to be(false)
|
|
15
|
+
expect(fmt.width()).to be_nil
|
|
16
|
+
expect(fmt.prec()).to be_nil
|
|
17
|
+
expect(fmt.plus()).to eq(:ignore)
|
|
18
|
+
end
|
|
19
|
+
|
|
20
|
+
it 'alternative form can be given with "%#d"' do
|
|
21
|
+
fmt = format.new("%#d")
|
|
22
|
+
expect(fmt.format()).to be(:d)
|
|
23
|
+
expect(fmt.alt()).to be(true)
|
|
24
|
+
end
|
|
25
|
+
|
|
26
|
+
it 'left adjust can be given with "%-d"' do
|
|
27
|
+
fmt = format.new("%-d")
|
|
28
|
+
expect(fmt.format()).to be(:d)
|
|
29
|
+
expect(fmt.left()).to be(true)
|
|
30
|
+
end
|
|
31
|
+
|
|
32
|
+
it 'plus sign can be used to indicate how positive numbers are displayed' do
|
|
33
|
+
fmt = format.new("%+d")
|
|
34
|
+
expect(fmt.format()).to be(:d)
|
|
35
|
+
expect(fmt.plus()).to eq(:plus)
|
|
36
|
+
end
|
|
37
|
+
|
|
38
|
+
it 'a space can be used to output " " instead of "+" for positive numbers' do
|
|
39
|
+
fmt = format.new("% d")
|
|
40
|
+
expect(fmt.format()).to be(:d)
|
|
41
|
+
expect(fmt.plus()).to eq(:space)
|
|
42
|
+
end
|
|
43
|
+
|
|
44
|
+
it 'padding with zero can be specified with a "0" flag' do
|
|
45
|
+
fmt = format.new("%0d")
|
|
46
|
+
expect(fmt.format()).to be(:d)
|
|
47
|
+
expect(fmt.zero_pad()).to be(true)
|
|
48
|
+
end
|
|
49
|
+
|
|
50
|
+
it 'width can be specified as an integer >= 1' do
|
|
51
|
+
fmt = format.new("%1d")
|
|
52
|
+
expect(fmt.format()).to be(:d)
|
|
53
|
+
expect(fmt.width()).to be(1)
|
|
54
|
+
fmt = format.new("%10d")
|
|
55
|
+
expect(fmt.width()).to be(10)
|
|
56
|
+
end
|
|
57
|
+
|
|
58
|
+
it 'precision can be specified as an integer >= 0' do
|
|
59
|
+
fmt = format.new("%.0d")
|
|
60
|
+
expect(fmt.format()).to be(:d)
|
|
61
|
+
expect(fmt.prec()).to be(0)
|
|
62
|
+
fmt = format.new("%.10d")
|
|
63
|
+
expect(fmt.prec()).to be(10)
|
|
64
|
+
end
|
|
65
|
+
|
|
66
|
+
it 'width and precision can both be specified' do
|
|
67
|
+
fmt = format.new("%2.3d")
|
|
68
|
+
expect(fmt.format()).to be(:d)
|
|
69
|
+
expect(fmt.width()).to be(2)
|
|
70
|
+
expect(fmt.prec()).to be(3)
|
|
71
|
+
end
|
|
72
|
+
|
|
73
|
+
[
|
|
74
|
+
'[', '{', '(', '<', '|',
|
|
75
|
+
].each do | delim |
|
|
76
|
+
it "a container delimiter pair can be set with '#{delim}'" do
|
|
77
|
+
fmt = format.new("%#{delim}d")
|
|
78
|
+
expect(fmt.format()).to be(:d)
|
|
79
|
+
expect(fmt.delimiters()).to eql(delim)
|
|
80
|
+
end
|
|
81
|
+
end
|
|
82
|
+
|
|
83
|
+
it "Is an error to specify different delimiters at the same time" do
|
|
84
|
+
expect do
|
|
85
|
+
fmt = format.new("%[{d")
|
|
86
|
+
end.to raise_error(/Only one of the delimiters/)
|
|
87
|
+
end
|
|
88
|
+
|
|
89
|
+
it "Is an error to specify the same flag more than once" do
|
|
90
|
+
expect do
|
|
91
|
+
fmt = format.new("%[[d")
|
|
92
|
+
end.to raise_error(/The same flag can only be used once/)
|
|
93
|
+
end
|
|
94
|
+
end
|
|
95
|
+
|
|
96
|
+
context 'when converting to string' do
|
|
97
|
+
{
|
|
98
|
+
42 => "42",
|
|
99
|
+
3.14 => "3.140000",
|
|
100
|
+
"hello world" => "hello world",
|
|
101
|
+
"hello\tworld" => "hello\tworld",
|
|
102
|
+
}.each do |from, to|
|
|
103
|
+
it "the string value of #{from} is '#{to}'" do
|
|
104
|
+
expect(converter.convert(from, :default)).to eq(to)
|
|
105
|
+
end
|
|
106
|
+
end
|
|
107
|
+
|
|
108
|
+
it 'float point value decimal digits can be specified' do
|
|
109
|
+
string_formats = { Puppet::Pops::Types::PFloatType::DEFAULT => '%.2f'}
|
|
110
|
+
expect(converter.convert(3.14, string_formats)).to eq('3.14')
|
|
111
|
+
end
|
|
112
|
+
|
|
113
|
+
it 'when specifying format for one type, other formats are not affected' do
|
|
114
|
+
string_formats = { Puppet::Pops::Types::PFloatType::DEFAULT => '%.2f'}
|
|
115
|
+
expect(converter.convert('3.1415', string_formats)).to eq('3.1415')
|
|
116
|
+
end
|
|
117
|
+
|
|
118
|
+
it 'The %p format for string produces quoted string' do
|
|
119
|
+
string_formats = { Puppet::Pops::Types::PStringType::DEFAULT => '%p'}
|
|
120
|
+
expect(converter.convert("hello\tworld", string_formats)).to eq('"hello\\tworld"')
|
|
121
|
+
end
|
|
122
|
+
|
|
123
|
+
{
|
|
124
|
+
'%s' => 'hello::world',
|
|
125
|
+
'%p' => '"hello::world"',
|
|
126
|
+
'%c' => 'Hello::world',
|
|
127
|
+
'%#c' => '"Hello::world"',
|
|
128
|
+
'%u' => 'HELLO::WORLD',
|
|
129
|
+
'%#u' => '"HELLO::WORLD"',
|
|
130
|
+
}.each do |fmt, result |
|
|
131
|
+
it "the format #{fmt} produces #{result}" do
|
|
132
|
+
string_formats = { Puppet::Pops::Types::PStringType::DEFAULT => fmt}
|
|
133
|
+
expect(converter.convert('hello::world', string_formats)).to eq(result)
|
|
134
|
+
end
|
|
135
|
+
end
|
|
136
|
+
|
|
137
|
+
{
|
|
138
|
+
'%c' => 'Hello::world',
|
|
139
|
+
'%#c' => '"Hello::world"',
|
|
140
|
+
'%d' => 'hello::world',
|
|
141
|
+
'%#d' => '"hello::world"',
|
|
142
|
+
}.each do |fmt, result |
|
|
143
|
+
it "the format #{fmt} produces #{result}" do
|
|
144
|
+
string_formats = { Puppet::Pops::Types::PStringType::DEFAULT => fmt}
|
|
145
|
+
expect(converter.convert('HELLO::WORLD', string_formats)).to eq(result)
|
|
146
|
+
end
|
|
147
|
+
end
|
|
148
|
+
|
|
149
|
+
{
|
|
150
|
+
' a b ' => 'a b',
|
|
151
|
+
'a b ' => 'a b',
|
|
152
|
+
' a b' => 'a b',
|
|
153
|
+
}.each do |input, result |
|
|
154
|
+
it "the input #{input} is trimmed to #{result} by using format '%t'" do
|
|
155
|
+
string_formats = { Puppet::Pops::Types::PStringType::DEFAULT => '%t'}
|
|
156
|
+
expect(converter.convert(input, string_formats)).to eq(result)
|
|
157
|
+
end
|
|
158
|
+
end
|
|
159
|
+
|
|
160
|
+
{
|
|
161
|
+
' a b ' => '"a b"',
|
|
162
|
+
'a b ' => '"a b"',
|
|
163
|
+
' a b' => '"a b"',
|
|
164
|
+
}.each do |input, result |
|
|
165
|
+
it "the input #{input} is trimmed to #{result} by using format '%#t'" do
|
|
166
|
+
string_formats = { Puppet::Pops::Types::PStringType::DEFAULT => '%#t'}
|
|
167
|
+
expect(converter.convert(input, string_formats)).to eq(result)
|
|
168
|
+
end
|
|
169
|
+
end
|
|
170
|
+
|
|
171
|
+
it 'errors when format is not recognized' do
|
|
172
|
+
expect do
|
|
173
|
+
string_formats = { Puppet::Pops::Types::PStringType::DEFAULT => "%k"}
|
|
174
|
+
converter.convert('wat', string_formats)
|
|
175
|
+
end.to raise_error(/Illegal format 'k' specified for value of String type - expected one of the characters 'cCudspt'/)
|
|
176
|
+
end
|
|
177
|
+
|
|
178
|
+
it 'Width pads a string left with spaces to given width' do
|
|
179
|
+
string_formats = { Puppet::Pops::Types::PStringType::DEFAULT => '%6s'}
|
|
180
|
+
expect(converter.convert("abcd", string_formats)).to eq(' abcd')
|
|
181
|
+
end
|
|
182
|
+
|
|
183
|
+
it 'Width pads a string right with spaces to given width and - flag' do
|
|
184
|
+
string_formats = { Puppet::Pops::Types::PStringType::DEFAULT => '%-6s'}
|
|
185
|
+
expect(converter.convert("abcd", string_formats)).to eq('abcd ')
|
|
186
|
+
end
|
|
187
|
+
|
|
188
|
+
it 'Precision truncates the string if precision < length' do
|
|
189
|
+
string_formats = { Puppet::Pops::Types::PStringType::DEFAULT => '%-6.2s'}
|
|
190
|
+
expect(converter.convert("abcd", string_formats)).to eq('ab ')
|
|
191
|
+
end
|
|
192
|
+
|
|
193
|
+
{
|
|
194
|
+
'%4.2s' => ' he',
|
|
195
|
+
'%4.2p' => ' "h',
|
|
196
|
+
'%4.2c' => ' He',
|
|
197
|
+
'%#4.2c' => ' "H',
|
|
198
|
+
'%4.2u' => ' HE',
|
|
199
|
+
'%#4.2u' => ' "H',
|
|
200
|
+
'%4.2c' => ' He',
|
|
201
|
+
'%#4.2c' => ' "H',
|
|
202
|
+
'%4.2d' => ' he',
|
|
203
|
+
'%#4.2d' => ' "h',
|
|
204
|
+
}.each do |fmt, result |
|
|
205
|
+
it "width and precision can be combined with #{fmt}" do
|
|
206
|
+
string_formats = { Puppet::Pops::Types::PStringType::DEFAULT => fmt}
|
|
207
|
+
expect(converter.convert('hello::world', string_formats)).to eq(result)
|
|
208
|
+
end
|
|
209
|
+
end
|
|
210
|
+
|
|
211
|
+
end
|
|
212
|
+
|
|
213
|
+
context 'when converting integer' do
|
|
214
|
+
it 'the default string representation is decimal' do
|
|
215
|
+
expect(converter.convert(42, :default)).to eq('42')
|
|
216
|
+
end
|
|
217
|
+
|
|
218
|
+
{
|
|
219
|
+
'%s' => '18',
|
|
220
|
+
'%4.1s' => ' 1',
|
|
221
|
+
'%p' => '18',
|
|
222
|
+
'%4.2p' => ' 18',
|
|
223
|
+
'%4.1p' => ' 1',
|
|
224
|
+
'%#s' => '"18"',
|
|
225
|
+
'%#6.4s' => ' "18"',
|
|
226
|
+
'%#p' => '18',
|
|
227
|
+
'%#6.4p' => ' 18',
|
|
228
|
+
'%d' => '18',
|
|
229
|
+
'%4.1d' => ' 18',
|
|
230
|
+
'%4.3d' => ' 018',
|
|
231
|
+
'%x' => '12',
|
|
232
|
+
'%4.3x' => ' 012',
|
|
233
|
+
'%#x' => '0x12',
|
|
234
|
+
'%#6.4x' => '0x0012',
|
|
235
|
+
'%X' => '12',
|
|
236
|
+
'%4.3X' => ' 012',
|
|
237
|
+
'%#X' => '0X12',
|
|
238
|
+
'%#6.4X' => '0X0012',
|
|
239
|
+
'%o' => '22',
|
|
240
|
+
'%4.2o' => ' 22',
|
|
241
|
+
'%#o' => '022',
|
|
242
|
+
'%#6.4o' => ' 0022',
|
|
243
|
+
'%b' => '10010',
|
|
244
|
+
'%7.6b' => ' 010010',
|
|
245
|
+
'%#b' => '0b10010',
|
|
246
|
+
'%#9.6b' => ' 0b010010',
|
|
247
|
+
'%#B' => '0B10010',
|
|
248
|
+
'%#9.6B' => ' 0B010010',
|
|
249
|
+
# Integer to float then a float format - fully tested for float
|
|
250
|
+
'%e' => '1.800000e+01',
|
|
251
|
+
'%E' => '1.800000E+01',
|
|
252
|
+
'%f' => '18.000000',
|
|
253
|
+
'%g' => '18',
|
|
254
|
+
'%a' => '0x1.2p+4',
|
|
255
|
+
'%A' => '0X1.2P+4',
|
|
256
|
+
'%.1f' => '18.0',
|
|
257
|
+
}.each do |fmt, result |
|
|
258
|
+
it "the format #{fmt} produces #{result}" do
|
|
259
|
+
string_formats = { Puppet::Pops::Types::PIntegerType::DEFAULT => fmt}
|
|
260
|
+
expect(converter.convert(18, string_formats)).to eq(result)
|
|
261
|
+
end
|
|
262
|
+
end
|
|
263
|
+
|
|
264
|
+
it 'produces a unicode char string by using format %c' do
|
|
265
|
+
string_formats = { Puppet::Pops::Types::PIntegerType::DEFAULT => '%c'}
|
|
266
|
+
expect(converter.convert(0x1F603, string_formats)).to eq("\u{1F603}")
|
|
267
|
+
end
|
|
268
|
+
|
|
269
|
+
it 'produces a quoted unicode char string by using format %#c' do
|
|
270
|
+
string_formats = { Puppet::Pops::Types::PIntegerType::DEFAULT => '%#c'}
|
|
271
|
+
expect(converter.convert(0x1F603, string_formats)).to eq("\"\u{1F603}\"")
|
|
272
|
+
end
|
|
273
|
+
|
|
274
|
+
it 'errors when format is not recognized' do
|
|
275
|
+
expect do
|
|
276
|
+
string_formats = { Puppet::Pops::Types::PIntegerType::DEFAULT => "%k"}
|
|
277
|
+
converter.convert(18, string_formats)
|
|
278
|
+
end.to raise_error(/Illegal format 'k' specified for value of Integer type - expected one of the characters 'dxXobBeEfgGaAspc'/)
|
|
279
|
+
end
|
|
280
|
+
end
|
|
281
|
+
|
|
282
|
+
context 'when converting float' do
|
|
283
|
+
it 'the default string representation is decimal' do
|
|
284
|
+
expect(converter.convert(42.0, :default)).to eq('42.000000')
|
|
285
|
+
end
|
|
286
|
+
|
|
287
|
+
{
|
|
288
|
+
'%s' => '18.0',
|
|
289
|
+
'%#s' => '"18.0"',
|
|
290
|
+
'%5s' => ' 18.0',
|
|
291
|
+
'%#8s' => ' "18.0"',
|
|
292
|
+
'%05.1s' => ' 1',
|
|
293
|
+
'%p' => '18.0',
|
|
294
|
+
'%7.2p' => ' 18',
|
|
295
|
+
|
|
296
|
+
'%e' => '1.800000e+01',
|
|
297
|
+
'%+e' => '+1.800000e+01',
|
|
298
|
+
'% e' => ' 1.800000e+01',
|
|
299
|
+
'%.2e' => '1.80e+01',
|
|
300
|
+
'%10.2e' => ' 1.80e+01',
|
|
301
|
+
'%-10.2e' => '1.80e+01 ',
|
|
302
|
+
'%010.2e' => '001.80e+01',
|
|
303
|
+
|
|
304
|
+
'%E' => '1.800000E+01',
|
|
305
|
+
'%+E' => '+1.800000E+01',
|
|
306
|
+
'% E' => ' 1.800000E+01',
|
|
307
|
+
'%.2E' => '1.80E+01',
|
|
308
|
+
'%10.2E' => ' 1.80E+01',
|
|
309
|
+
'%-10.2E' => '1.80E+01 ',
|
|
310
|
+
'%010.2E' => '001.80E+01',
|
|
311
|
+
|
|
312
|
+
'%f' => '18.000000',
|
|
313
|
+
'%+f' => '+18.000000',
|
|
314
|
+
'% f' => ' 18.000000',
|
|
315
|
+
'%.2f' => '18.00',
|
|
316
|
+
'%10.2f' => ' 18.00',
|
|
317
|
+
'%-10.2f' => '18.00 ',
|
|
318
|
+
'%010.2f' => '0000018.00',
|
|
319
|
+
|
|
320
|
+
'%g' => '18',
|
|
321
|
+
'%5g' => ' 18',
|
|
322
|
+
'%05g' => '00018',
|
|
323
|
+
'%-5g' => '18 ',
|
|
324
|
+
'%5.4g' => ' 18', # precision has no effect
|
|
325
|
+
|
|
326
|
+
'%a' => '0x1.2p+4',
|
|
327
|
+
'%.4a' => '0x1.2000p+4',
|
|
328
|
+
'%10a' => ' 0x1.2p+4',
|
|
329
|
+
'%010a' => '0x001.2p+4',
|
|
330
|
+
'%-10a' => '0x1.2p+4 ',
|
|
331
|
+
'%A' => '0X1.2P+4',
|
|
332
|
+
'%.4A' => '0X1.2000P+4',
|
|
333
|
+
'%10A' => ' 0X1.2P+4',
|
|
334
|
+
'%-10A' => '0X1.2P+4 ',
|
|
335
|
+
'%010A' => '0X001.2P+4',
|
|
336
|
+
|
|
337
|
+
# integer formats fully tested for integer
|
|
338
|
+
'%d' => '18',
|
|
339
|
+
'%x' => '12',
|
|
340
|
+
'%X' => '12',
|
|
341
|
+
'%o' => '22',
|
|
342
|
+
'%b' => '10010',
|
|
343
|
+
'%#B' => '0B10010',
|
|
344
|
+
}.each do |fmt, result |
|
|
345
|
+
it "the format #{fmt} produces #{result}" do
|
|
346
|
+
string_formats = { Puppet::Pops::Types::PFloatType::DEFAULT => fmt}
|
|
347
|
+
expect(converter.convert(18.0, string_formats)).to eq(result)
|
|
348
|
+
end
|
|
349
|
+
end
|
|
350
|
+
|
|
351
|
+
it 'errors when format is not recognized' do
|
|
352
|
+
expect do
|
|
353
|
+
string_formats = { Puppet::Pops::Types::PFloatType::DEFAULT => "%k"}
|
|
354
|
+
converter.convert(18.0, string_formats)
|
|
355
|
+
end.to raise_error(/Illegal format 'k' specified for value of Float type - expected one of the characters 'dxXobBeEfgGaAsp'/)
|
|
356
|
+
end
|
|
357
|
+
end
|
|
358
|
+
|
|
359
|
+
context 'when converting undef' do
|
|
360
|
+
it 'the default string representation is empty string' do
|
|
361
|
+
expect(converter.convert(nil, :default)).to eq('')
|
|
362
|
+
end
|
|
363
|
+
|
|
364
|
+
{ "%u" => "undef",
|
|
365
|
+
"%#u" => "undefined",
|
|
366
|
+
"%s" => "",
|
|
367
|
+
"%#s" => '""',
|
|
368
|
+
"%p" => 'undef',
|
|
369
|
+
"%#p" => '"undef"',
|
|
370
|
+
"%n" => 'nil',
|
|
371
|
+
"%#n" => 'null',
|
|
372
|
+
"%v" => 'n/a',
|
|
373
|
+
"%V" => 'N/A',
|
|
374
|
+
"%d" => 'NaN',
|
|
375
|
+
"%x" => 'NaN',
|
|
376
|
+
"%o" => 'NaN',
|
|
377
|
+
"%b" => 'NaN',
|
|
378
|
+
"%B" => 'NaN',
|
|
379
|
+
"%e" => 'NaN',
|
|
380
|
+
"%E" => 'NaN',
|
|
381
|
+
"%f" => 'NaN',
|
|
382
|
+
"%g" => 'NaN',
|
|
383
|
+
"%G" => 'NaN',
|
|
384
|
+
"%a" => 'NaN',
|
|
385
|
+
"%A" => 'NaN',
|
|
386
|
+
}.each do |fmt, result |
|
|
387
|
+
it "the format #{fmt} produces #{result}" do
|
|
388
|
+
string_formats = { Puppet::Pops::Types::PUndefType::DEFAULT => fmt}
|
|
389
|
+
expect(converter.convert(nil, string_formats)).to eq(result)
|
|
390
|
+
end
|
|
391
|
+
end
|
|
392
|
+
|
|
393
|
+
{ "%7u" => " undef",
|
|
394
|
+
"%-7u" => "undef ",
|
|
395
|
+
"%#10u" => " undefined",
|
|
396
|
+
"%#-10u" => "undefined ",
|
|
397
|
+
"%7.2u" => " un",
|
|
398
|
+
"%4s" => " ",
|
|
399
|
+
"%#4s" => ' ""',
|
|
400
|
+
"%7p" => ' undef',
|
|
401
|
+
"%7.1p" => ' u',
|
|
402
|
+
"%#8p" => ' "undef"',
|
|
403
|
+
"%5n" => ' nil',
|
|
404
|
+
"%.1n" => 'n',
|
|
405
|
+
"%-5n" => 'nil ',
|
|
406
|
+
"%#5n" => ' null',
|
|
407
|
+
"%#-5n" => 'null ',
|
|
408
|
+
"%5v" => ' n/a',
|
|
409
|
+
"%5.2v" => ' n/',
|
|
410
|
+
"%-5v" => 'n/a ',
|
|
411
|
+
"%5V" => ' N/A',
|
|
412
|
+
"%5.1V" => ' N',
|
|
413
|
+
"%-5V" => 'N/A ',
|
|
414
|
+
"%5d" => ' NaN',
|
|
415
|
+
"%5.2d" => ' Na',
|
|
416
|
+
"%-5d" => 'NaN ',
|
|
417
|
+
"%5x" => ' NaN',
|
|
418
|
+
"%5.2x" => ' Na',
|
|
419
|
+
"%-5x" => 'NaN ',
|
|
420
|
+
"%5o" => ' NaN',
|
|
421
|
+
"%5.2o" => ' Na',
|
|
422
|
+
"%-5o" => 'NaN ',
|
|
423
|
+
"%5b" => ' NaN',
|
|
424
|
+
"%5.2b" => ' Na',
|
|
425
|
+
"%-5b" => 'NaN ',
|
|
426
|
+
"%5B" => ' NaN',
|
|
427
|
+
"%5.2B" => ' Na',
|
|
428
|
+
"%-5B" => 'NaN ',
|
|
429
|
+
"%5e" => ' NaN',
|
|
430
|
+
"%5.2e" => ' Na',
|
|
431
|
+
"%-5e" => 'NaN ',
|
|
432
|
+
"%5E" => ' NaN',
|
|
433
|
+
"%5.2E" => ' Na',
|
|
434
|
+
"%-5E" => 'NaN ',
|
|
435
|
+
"%5f" => ' NaN',
|
|
436
|
+
"%5.2f" => ' Na',
|
|
437
|
+
"%-5f" => 'NaN ',
|
|
438
|
+
"%5g" => ' NaN',
|
|
439
|
+
"%5.2g" => ' Na',
|
|
440
|
+
"%-5g" => 'NaN ',
|
|
441
|
+
"%5G" => ' NaN',
|
|
442
|
+
"%5.2G" => ' Na',
|
|
443
|
+
"%-5G" => 'NaN ',
|
|
444
|
+
"%5a" => ' NaN',
|
|
445
|
+
"%5.2a" => ' Na',
|
|
446
|
+
"%-5a" => 'NaN ',
|
|
447
|
+
"%5A" => ' NaN',
|
|
448
|
+
"%5.2A" => ' Na',
|
|
449
|
+
"%-5A" => 'NaN ',
|
|
450
|
+
}.each do |fmt, result |
|
|
451
|
+
it "the format #{fmt} produces #{result}" do
|
|
452
|
+
string_formats = { Puppet::Pops::Types::PUndefType::DEFAULT => fmt}
|
|
453
|
+
expect(converter.convert(nil, string_formats)).to eq(result)
|
|
454
|
+
end
|
|
455
|
+
end
|
|
456
|
+
|
|
457
|
+
it 'errors when format is not recognized' do
|
|
458
|
+
expect do
|
|
459
|
+
string_formats = { Puppet::Pops::Types::PUndefType::DEFAULT => "%k"}
|
|
460
|
+
converter.convert(nil, string_formats)
|
|
461
|
+
end.to raise_error(/Illegal format 'k' specified for value of Undef type - expected one of the characters 'nudxXobBeEfgGaAvVsp'/)
|
|
462
|
+
end
|
|
463
|
+
end
|
|
464
|
+
|
|
465
|
+
context 'when converting default' do
|
|
466
|
+
it 'the default string representation is unquoted "default"' do
|
|
467
|
+
expect(converter.convert(:default, :default)).to eq('default')
|
|
468
|
+
end
|
|
469
|
+
|
|
470
|
+
{ "%d" => 'default',
|
|
471
|
+
"%D" => 'Default',
|
|
472
|
+
"%#d" => '"default"',
|
|
473
|
+
"%#D" => '"Default"',
|
|
474
|
+
"%s" => 'default',
|
|
475
|
+
"%p" => 'default',
|
|
476
|
+
}.each do |fmt, result |
|
|
477
|
+
it "the format #{fmt} produces #{result}" do
|
|
478
|
+
string_formats = { Puppet::Pops::Types::PDefaultType::DEFAULT => fmt}
|
|
479
|
+
expect(converter.convert(:default, string_formats)).to eq(result)
|
|
480
|
+
end
|
|
481
|
+
end
|
|
482
|
+
|
|
483
|
+
it 'errors when format is not recognized' do
|
|
484
|
+
expect do
|
|
485
|
+
string_formats = { Puppet::Pops::Types::PDefaultType::DEFAULT => "%k"}
|
|
486
|
+
converter.convert(:default, string_formats)
|
|
487
|
+
end.to raise_error(/Illegal format 'k' specified for value of Default type - expected one of the characters 'dDsp'/)
|
|
488
|
+
end
|
|
489
|
+
end
|
|
490
|
+
|
|
491
|
+
context 'when converting boolean true' do
|
|
492
|
+
it 'the default string representation is unquoted "true"' do
|
|
493
|
+
expect(converter.convert(true, :default)).to eq('true')
|
|
494
|
+
end
|
|
495
|
+
|
|
496
|
+
{ "%t" => 'true',
|
|
497
|
+
"%#t" => 't',
|
|
498
|
+
"%T" => 'True',
|
|
499
|
+
"%#T" => 'T',
|
|
500
|
+
"%s" => 'true',
|
|
501
|
+
"%p" => 'true',
|
|
502
|
+
"%d" => '1',
|
|
503
|
+
"%x" => '1',
|
|
504
|
+
"%#x" => '0x1',
|
|
505
|
+
"%o" => '1',
|
|
506
|
+
"%#o" => '01',
|
|
507
|
+
"%b" => '1',
|
|
508
|
+
"%#b" => '0b1',
|
|
509
|
+
"%#B" => '0B1',
|
|
510
|
+
"%e" => '1.000000e+00',
|
|
511
|
+
"%f" => '1.000000',
|
|
512
|
+
"%g" => '1',
|
|
513
|
+
"%a" => '0x1p+0',
|
|
514
|
+
"%A" => '0X1P+0',
|
|
515
|
+
"%.1f" => '1.0',
|
|
516
|
+
"%y" => 'yes',
|
|
517
|
+
"%Y" => 'Yes',
|
|
518
|
+
"%#y" => 'y',
|
|
519
|
+
"%#Y" => 'Y',
|
|
520
|
+
}.each do |fmt, result |
|
|
521
|
+
it "the format #{fmt} produces #{result}" do
|
|
522
|
+
string_formats = { Puppet::Pops::Types::PBooleanType::DEFAULT => fmt}
|
|
523
|
+
expect(converter.convert(true, string_formats)).to eq(result)
|
|
524
|
+
end
|
|
525
|
+
end
|
|
526
|
+
|
|
527
|
+
it 'errors when format is not recognized' do
|
|
528
|
+
expect do
|
|
529
|
+
string_formats = { Puppet::Pops::Types::PBooleanType::DEFAULT => "%k"}
|
|
530
|
+
converter.convert(true, string_formats)
|
|
531
|
+
end.to raise_error(/Illegal format 'k' specified for value of Boolean type - expected one of the characters 'tTyYdxXobBeEfgGaAsp'/)
|
|
532
|
+
end
|
|
533
|
+
|
|
534
|
+
end
|
|
535
|
+
|
|
536
|
+
context 'when converting boolean false' do
|
|
537
|
+
it 'the default string representation is unquoted "false"' do
|
|
538
|
+
expect(converter.convert(false, :default)).to eq('false')
|
|
539
|
+
end
|
|
540
|
+
|
|
541
|
+
{ "%t" => 'false',
|
|
542
|
+
"%#t" => 'f',
|
|
543
|
+
"%T" => 'False',
|
|
544
|
+
"%#T" => 'F',
|
|
545
|
+
"%s" => 'false',
|
|
546
|
+
"%p" => 'false',
|
|
547
|
+
"%d" => '0',
|
|
548
|
+
"%x" => '0',
|
|
549
|
+
"%#x" => '0',
|
|
550
|
+
"%o" => '0',
|
|
551
|
+
"%#o" => '0',
|
|
552
|
+
"%b" => '0',
|
|
553
|
+
"%#b" => '0',
|
|
554
|
+
"%#B" => '0',
|
|
555
|
+
"%e" => '0.000000e+00',
|
|
556
|
+
"%E" => '0.000000E+00',
|
|
557
|
+
"%f" => '0.000000',
|
|
558
|
+
"%g" => '0',
|
|
559
|
+
"%a" => '0x0p+0',
|
|
560
|
+
"%A" => '0X0P+0',
|
|
561
|
+
"%.1f" => '0.0',
|
|
562
|
+
"%y" => 'no',
|
|
563
|
+
"%Y" => 'No',
|
|
564
|
+
"%#y" => 'n',
|
|
565
|
+
"%#Y" => 'N',
|
|
566
|
+
}.each do |fmt, result |
|
|
567
|
+
it "the format #{fmt} produces #{result}" do
|
|
568
|
+
string_formats = { Puppet::Pops::Types::PBooleanType::DEFAULT => fmt}
|
|
569
|
+
expect(converter.convert(false, string_formats)).to eq(result)
|
|
570
|
+
end
|
|
571
|
+
end
|
|
572
|
+
|
|
573
|
+
it 'errors when format is not recognized' do
|
|
574
|
+
expect do
|
|
575
|
+
string_formats = { Puppet::Pops::Types::PBooleanType::DEFAULT => "%k"}
|
|
576
|
+
converter.convert(false, string_formats)
|
|
577
|
+
end.to raise_error(/Illegal format 'k' specified for value of Boolean type - expected one of the characters 'tTyYdxXobBeEfgGaAsp'/)
|
|
578
|
+
end
|
|
579
|
+
end
|
|
580
|
+
|
|
581
|
+
context 'when converting array' do
|
|
582
|
+
it 'the default string representation is using [] delimiters, joins with ',' and uses %p for values' do
|
|
583
|
+
expect(converter.convert(["hello", "world"], :default)).to eq('["hello", "world"]')
|
|
584
|
+
end
|
|
585
|
+
|
|
586
|
+
{ "%s" => '[1, "hello"]',
|
|
587
|
+
"%p" => '[1, "hello"]',
|
|
588
|
+
"%a" => '[1, "hello"]',
|
|
589
|
+
"%<a" => '<1, "hello">',
|
|
590
|
+
"%[a" => '[1, "hello"]',
|
|
591
|
+
"%(a" => '(1, "hello")',
|
|
592
|
+
"%{a" => '{1, "hello"}',
|
|
593
|
+
"% a" => '1, "hello"',
|
|
594
|
+
|
|
595
|
+
{'format' => '%(a',
|
|
596
|
+
'separator' => ''
|
|
597
|
+
} => '(1 "hello")',
|
|
598
|
+
|
|
599
|
+
{'format' => '%|a',
|
|
600
|
+
'separator' => ''
|
|
601
|
+
} => '|1 "hello"|',
|
|
602
|
+
|
|
603
|
+
{'format' => '%(a',
|
|
604
|
+
'separator' => '',
|
|
605
|
+
'string_formats' => {Puppet::Pops::Types::PIntegerType::DEFAULT => '%#x'}
|
|
606
|
+
} => '(0x1 "hello")',
|
|
607
|
+
}.each do |fmt, result |
|
|
608
|
+
it "the format #{fmt} produces #{result}" do
|
|
609
|
+
string_formats = { Puppet::Pops::Types::PArrayType::DEFAULT => fmt}
|
|
610
|
+
expect(converter.convert([1, "hello"], string_formats)).to eq(result)
|
|
611
|
+
end
|
|
612
|
+
end
|
|
613
|
+
|
|
614
|
+
it "multiple rules selects most specific" do
|
|
615
|
+
short_array_t = factory.array_of(factory.integer, factory.range(1,2))
|
|
616
|
+
long_array_t = factory.array_of(factory.integer, factory.range(3,100))
|
|
617
|
+
string_formats = {
|
|
618
|
+
short_array_t => "%(a",
|
|
619
|
+
long_array_t => "%[a",
|
|
620
|
+
}
|
|
621
|
+
expect(converter.convert([1, 2], string_formats)).to eq('(1, 2)')
|
|
622
|
+
expect(converter.convert([1, 2, 3], string_formats)).to eq('[1, 2, 3]')
|
|
623
|
+
end
|
|
624
|
+
|
|
625
|
+
it 'indents elements in alternate mode' do
|
|
626
|
+
string_formats = { Puppet::Pops::Types::PArrayType::DEFAULT => { 'format' => '%#a', 'separator' =>"," } }
|
|
627
|
+
# formatting matters here
|
|
628
|
+
result = [
|
|
629
|
+
"[1, 2, 9, 9,",
|
|
630
|
+
" [3, 4],",
|
|
631
|
+
" [5,",
|
|
632
|
+
" [6, 7]],",
|
|
633
|
+
" 8, 9]"
|
|
634
|
+
].join("\n")
|
|
635
|
+
|
|
636
|
+
formatted = converter.convert([1, 2, 9, 9, [3, 4], [5, [6, 7]], 8, 9], string_formats)
|
|
637
|
+
expect(formatted).to eq(result)
|
|
638
|
+
end
|
|
639
|
+
|
|
640
|
+
it 'treats hashes as nested arrays wrt indentation' do
|
|
641
|
+
string_formats = { Puppet::Pops::Types::PArrayType::DEFAULT => { 'format' => '%#a', 'separator' =>"," } }
|
|
642
|
+
# formatting matters here
|
|
643
|
+
result = [
|
|
644
|
+
"[1, 2, 9, 9,",
|
|
645
|
+
" {3 => 4, 5 => 6},",
|
|
646
|
+
" [5,",
|
|
647
|
+
" [6, 7]],",
|
|
648
|
+
" 8, 9]"
|
|
649
|
+
].join("\n")
|
|
650
|
+
|
|
651
|
+
formatted = converter.convert([1, 2, 9, 9, {3 => 4, 5 => 6}, [5, [6, 7]], 8, 9], string_formats)
|
|
652
|
+
expect(formatted).to eq(result)
|
|
653
|
+
end
|
|
654
|
+
|
|
655
|
+
it 'indents and breaks when a sequence > given width, in alternate mode' do
|
|
656
|
+
string_formats = { Puppet::Pops::Types::PArrayType::DEFAULT => { 'format' => '%#3a', 'separator' =>"," } }
|
|
657
|
+
# formatting matters here
|
|
658
|
+
result = [
|
|
659
|
+
"[ 1,",
|
|
660
|
+
" 2,",
|
|
661
|
+
" 90,", # this sequence has length 4 (1,2,90) which is > 3
|
|
662
|
+
" [3, 4],",
|
|
663
|
+
" [5,",
|
|
664
|
+
" [6, 7]],",
|
|
665
|
+
" 8,",
|
|
666
|
+
" 9]",
|
|
667
|
+
].join("\n")
|
|
668
|
+
|
|
669
|
+
formatted = converter.convert([1, 2, 90, [3, 4], [5, [6, 7]], 8, 9], string_formats)
|
|
670
|
+
expect(formatted).to eq(result)
|
|
671
|
+
end
|
|
672
|
+
|
|
673
|
+
it 'indents and breaks when a sequence (placed last) > given width, in alternate mode' do
|
|
674
|
+
string_formats = { Puppet::Pops::Types::PArrayType::DEFAULT => { 'format' => '%#3a', 'separator' =>"," } }
|
|
675
|
+
# formatting matters here
|
|
676
|
+
result = [
|
|
677
|
+
"[ 1,",
|
|
678
|
+
" 2,",
|
|
679
|
+
" 9,", # this sequence has length 3 (1,2,9) which does not cause breaking on each
|
|
680
|
+
" [3, 4],",
|
|
681
|
+
" [5,",
|
|
682
|
+
" [6, 7]],",
|
|
683
|
+
" 8,",
|
|
684
|
+
" 900]", # this sequence has length 4 (8, 900) which causes breaking on each
|
|
685
|
+
].join("\n")
|
|
686
|
+
|
|
687
|
+
formatted = converter.convert([1, 2, 9, [3, 4], [5, [6, 7]], 8, 900], string_formats)
|
|
688
|
+
expect(formatted).to eq(result)
|
|
689
|
+
end
|
|
690
|
+
|
|
691
|
+
it 'indents and breaks nested sequences when one is placed first' do
|
|
692
|
+
string_formats = { Puppet::Pops::Types::PArrayType::DEFAULT => { 'format' => '%#a', 'separator' =>"," } }
|
|
693
|
+
# formatting matters here
|
|
694
|
+
result = [
|
|
695
|
+
"[",
|
|
696
|
+
" [",
|
|
697
|
+
" [1, 2,",
|
|
698
|
+
" [3, 4]]],",
|
|
699
|
+
" [5,",
|
|
700
|
+
" [6, 7]],",
|
|
701
|
+
" 8, 900]",
|
|
702
|
+
].join("\n")
|
|
703
|
+
|
|
704
|
+
formatted = converter.convert([[[1, 2, [3, 4]]], [5, [6, 7]], 8, 900], string_formats)
|
|
705
|
+
expect(formatted).to eq(result)
|
|
706
|
+
end
|
|
707
|
+
|
|
708
|
+
it 'errors when format is not recognized' do
|
|
709
|
+
expect do
|
|
710
|
+
string_formats = { Puppet::Pops::Types::PArrayType::DEFAULT => "%k"}
|
|
711
|
+
converter.convert([1,2], string_formats)
|
|
712
|
+
end.to raise_error(/Illegal format 'k' specified for value of Array type - expected one of the characters 'asp'/)
|
|
713
|
+
end
|
|
714
|
+
end
|
|
715
|
+
|
|
716
|
+
context 'when converting hash' do
|
|
717
|
+
it 'the default string representation is using {} delimiters, joins with '=>' and uses %p for values' do
|
|
718
|
+
expect(converter.convert({"hello" => "world"}, :default)).to eq('{"hello" => "world"}')
|
|
719
|
+
end
|
|
720
|
+
|
|
721
|
+
{ "%s" => '{1 => "world"}',
|
|
722
|
+
"%p" => '{1 => "world"}',
|
|
723
|
+
"%h" => '{1 => "world"}',
|
|
724
|
+
"%a" => '[[1, "world"]]',
|
|
725
|
+
"%<h" => '<1 => "world">',
|
|
726
|
+
"%[h" => '[1 => "world"]',
|
|
727
|
+
"%(h" => '(1 => "world")',
|
|
728
|
+
"%{h" => '{1 => "world"}',
|
|
729
|
+
"% h" => '1 => "world"',
|
|
730
|
+
|
|
731
|
+
{'format' => '%(h',
|
|
732
|
+
'separator2' => ' '
|
|
733
|
+
} => '(1 "world")',
|
|
734
|
+
|
|
735
|
+
{'format' => '%(h',
|
|
736
|
+
'separator2' => ' ',
|
|
737
|
+
'string_formats' => {Puppet::Pops::Types::PIntegerType::DEFAULT => '%#x'}
|
|
738
|
+
} => '(0x1 "world")',
|
|
739
|
+
}.each do |fmt, result |
|
|
740
|
+
it "the format #{fmt} produces #{result}" do
|
|
741
|
+
string_formats = { Puppet::Pops::Types::PHashType::DEFAULT => fmt}
|
|
742
|
+
expect(converter.convert({1 => "world"}, string_formats)).to eq(result)
|
|
743
|
+
end
|
|
744
|
+
end
|
|
745
|
+
|
|
746
|
+
{ "%s" => '{1 => "hello", 2 => "world"}',
|
|
747
|
+
|
|
748
|
+
{'format' => '%(h',
|
|
749
|
+
'separator2' => ' '
|
|
750
|
+
} => '(1 "hello", 2 "world")',
|
|
751
|
+
|
|
752
|
+
{'format' => '%(h',
|
|
753
|
+
'separator' => ' >>',
|
|
754
|
+
'separator2' => ' <=> ',
|
|
755
|
+
'string_formats' => {Puppet::Pops::Types::PIntegerType::DEFAULT => '%#x'}
|
|
756
|
+
} => '(0x1 <=> "hello" >> 0x2 <=> "world")',
|
|
757
|
+
}.each do |fmt, result |
|
|
758
|
+
it "the format #{fmt} produces #{result}" do
|
|
759
|
+
string_formats = { Puppet::Pops::Types::PHashType::DEFAULT => fmt}
|
|
760
|
+
expect(converter.convert({1 => "hello", 2 => "world"}, string_formats)).to eq(result)
|
|
761
|
+
end
|
|
762
|
+
end
|
|
763
|
+
|
|
764
|
+
it 'indents elements in alternative mode #' do
|
|
765
|
+
string_formats = {
|
|
766
|
+
Puppet::Pops::Types::PHashType::DEFAULT => {
|
|
767
|
+
'format' => '%#h',
|
|
768
|
+
}
|
|
769
|
+
}
|
|
770
|
+
# formatting matters here
|
|
771
|
+
result = [
|
|
772
|
+
"{",
|
|
773
|
+
" 1 => \"hello\",",
|
|
774
|
+
" 2 => {",
|
|
775
|
+
" 3 => \"world\"",
|
|
776
|
+
" }",
|
|
777
|
+
"}"
|
|
778
|
+
].join("\n")
|
|
779
|
+
|
|
780
|
+
expect(converter.convert({1 => "hello", 2 => {3=> "world"}}, string_formats)).to eq(result)
|
|
781
|
+
end
|
|
782
|
+
|
|
783
|
+
context "containing an array" do
|
|
784
|
+
it 'the hash and array renders without breaks and indentation by default' do
|
|
785
|
+
result = '{1 => [1, 2, 3]}'
|
|
786
|
+
formatted = converter.convert({ 1 => [1, 2, 3] }, :default)
|
|
787
|
+
expect(formatted).to eq(result)
|
|
788
|
+
end
|
|
789
|
+
|
|
790
|
+
it 'the array renders with breaks if so specified' do
|
|
791
|
+
string_formats = { Puppet::Pops::Types::PArrayType::DEFAULT => { 'format' => '%#1a', 'separator' =>"," } }
|
|
792
|
+
result = [
|
|
793
|
+
"{1 => [ 1,",
|
|
794
|
+
" 2,",
|
|
795
|
+
" 3]}"
|
|
796
|
+
].join("\n")
|
|
797
|
+
formatted = converter.convert({ 1 => [1, 2, 3] }, string_formats)
|
|
798
|
+
expect(formatted).to eq(result)
|
|
799
|
+
end
|
|
800
|
+
|
|
801
|
+
it 'both hash and array renders with breaks and indentation if so specified for both' do
|
|
802
|
+
string_formats = {
|
|
803
|
+
Puppet::Pops::Types::PArrayType::DEFAULT => { 'format' => '%#1a', 'separator' =>"," },
|
|
804
|
+
Puppet::Pops::Types::PHashType::DEFAULT => { 'format' => '%#h', 'separator' =>"," }
|
|
805
|
+
}
|
|
806
|
+
result = [
|
|
807
|
+
"{",
|
|
808
|
+
" 1 => [ 1,",
|
|
809
|
+
" 2,",
|
|
810
|
+
" 3]",
|
|
811
|
+
"}"
|
|
812
|
+
].join("\n")
|
|
813
|
+
formatted = converter.convert({ 1 => [1, 2, 3] }, string_formats)
|
|
814
|
+
expect(formatted).to eq(result)
|
|
815
|
+
end
|
|
816
|
+
|
|
817
|
+
it 'hash, but not array is rendered with breaks and indentation if so specified only for the hash' do
|
|
818
|
+
string_formats = {
|
|
819
|
+
Puppet::Pops::Types::PArrayType::DEFAULT => { 'format' => '%a', 'separator' =>"," },
|
|
820
|
+
Puppet::Pops::Types::PHashType::DEFAULT => { 'format' => '%#h', 'separator' =>"," }
|
|
821
|
+
}
|
|
822
|
+
result = [
|
|
823
|
+
"{",
|
|
824
|
+
" 1 => [1, 2, 3]",
|
|
825
|
+
"}"
|
|
826
|
+
].join("\n")
|
|
827
|
+
formatted = converter.convert({ 1 => [1, 2, 3] }, string_formats)
|
|
828
|
+
expect(formatted).to eq(result)
|
|
829
|
+
end
|
|
830
|
+
end
|
|
831
|
+
|
|
832
|
+
it 'errors when format is not recognized' do
|
|
833
|
+
expect do
|
|
834
|
+
string_formats = { Puppet::Pops::Types::PHashType::DEFAULT => "%k"}
|
|
835
|
+
converter.convert({1 => 2}, string_formats)
|
|
836
|
+
end.to raise_error(/Illegal format 'k' specified for value of Hash type - expected one of the characters 'hasp'/)
|
|
837
|
+
end
|
|
838
|
+
end
|
|
839
|
+
|
|
840
|
+
context 'when converting regexp' do
|
|
841
|
+
it 'the default string representation is /regexp/' do
|
|
842
|
+
expect(converter.convert(/.*/, :default)).to eq('/.*/')
|
|
843
|
+
end
|
|
844
|
+
|
|
845
|
+
{ "%s" => '/.*/',
|
|
846
|
+
"%6s" => ' /.*/',
|
|
847
|
+
"%.2s" => '/.',
|
|
848
|
+
"%-6s" => '/.*/ ',
|
|
849
|
+
"%p" => '/.*/',
|
|
850
|
+
"%6p" => ' /.*/',
|
|
851
|
+
"%-6p" => '/.*/ ',
|
|
852
|
+
"%.2p" => '/.',
|
|
853
|
+
"%#s" => '".*"',
|
|
854
|
+
"%#p" => '/.*/',
|
|
855
|
+
}.each do |fmt, result |
|
|
856
|
+
it "the format #{fmt} produces #{result}" do
|
|
857
|
+
string_formats = { Puppet::Pops::Types::PRegexpType::DEFAULT => fmt}
|
|
858
|
+
expect(converter.convert(/.*/, string_formats)).to eq(result)
|
|
859
|
+
end
|
|
860
|
+
end
|
|
861
|
+
|
|
862
|
+
it 'errors when format is not recognized' do
|
|
863
|
+
expect do
|
|
864
|
+
string_formats = { Puppet::Pops::Types::PRegexpType::DEFAULT => "%k"}
|
|
865
|
+
converter.convert(/.*/, string_formats)
|
|
866
|
+
end.to raise_error(/Illegal format 'k' specified for value of Regexp type - expected one of the characters 'rsp'/)
|
|
867
|
+
end
|
|
868
|
+
end
|
|
869
|
+
|
|
870
|
+
context 'when converting iterator' do
|
|
871
|
+
it 'the iterator is transformed to an array and formatted using array rules' do
|
|
872
|
+
itor = Puppet::Pops::Types::Iterator.new(Puppet::Pops::Types::PIntegerType::DEFAULT, [1,2,3]).reverse_each
|
|
873
|
+
expect(converter.convert(itor, :default)).to eq('[3, 2, 1]')
|
|
874
|
+
end
|
|
875
|
+
end
|
|
876
|
+
|
|
877
|
+
context 'when converting type' do
|
|
878
|
+
it 'the default string representation of a type is its programmatic string form' do
|
|
879
|
+
expect(converter.convert(factory.integer, :default)).to eq('Integer')
|
|
880
|
+
end
|
|
881
|
+
|
|
882
|
+
{ "%s" => 'Integer',
|
|
883
|
+
"%p" => 'Integer',
|
|
884
|
+
"%#s" => '"Integer"',
|
|
885
|
+
"%#p" => 'Integer',
|
|
886
|
+
}.each do |fmt, result |
|
|
887
|
+
it "the format #{fmt} produces #{result}" do
|
|
888
|
+
string_formats = { Puppet::Pops::Types::PType::DEFAULT => fmt}
|
|
889
|
+
expect(converter.convert(factory.integer, string_formats)).to eq(result)
|
|
890
|
+
end
|
|
891
|
+
end
|
|
892
|
+
|
|
893
|
+
it 'errors when format is not recognized' do
|
|
894
|
+
expect do
|
|
895
|
+
string_formats = { Puppet::Pops::Types::PType::DEFAULT => "%k"}
|
|
896
|
+
converter.convert(factory.integer, string_formats)
|
|
897
|
+
end.to raise_error(/Illegal format 'k' specified for value of Type type - expected one of the characters 'sp'/)
|
|
898
|
+
end
|
|
899
|
+
end
|
|
900
|
+
|
|
901
|
+
it "allows format to be directly given (instead of as a type=> format hash)" do
|
|
902
|
+
expect(converter.convert('hello', '%5.1s')).to eq(' h')
|
|
903
|
+
end
|
|
904
|
+
end
|