puppet 3.1.1 → 3.2.0.rc1
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/CONTRIBUTING.md +2 -2
- data/Gemfile +32 -19
- data/README_DEVELOPER.md +332 -14
- data/Rakefile +9 -5
- data/ext/build_defaults.yaml +2 -3
- data/ext/debian/changelog.erb +6 -0
- data/ext/debian/control +6 -6
- data/ext/envpuppet +4 -4
- data/ext/project_data.yaml +1 -0
- data/ext/puppet-nm-dispatcher +13 -0
- data/ext/redhat/puppet.spec.erb +17 -0
- data/ext/suse/client.init +1 -1
- data/ext/systemd/puppetagent.service +2 -2
- data/ext/systemd/puppetmaster.service +2 -2
- data/lib/hiera/scope.rb +29 -11
- data/lib/hiera_puppet.rb +1 -3
- data/lib/puppet/agent.rb +3 -3
- data/lib/puppet/application.rb +2 -2
- data/lib/puppet/application/agent.rb +27 -12
- data/lib/puppet/application/apply.rb +11 -1
- data/lib/puppet/application/describe.rb +1 -1
- data/lib/puppet/application/doc.rb +13 -9
- data/lib/puppet/application/filebucket.rb +0 -1
- data/lib/puppet/application/kick.rb +1 -0
- data/lib/puppet/application/master.rb +16 -8
- data/lib/puppet/daemon.rb +19 -64
- data/lib/puppet/defaults.rb +61 -5
- data/lib/puppet/error.rb +15 -4
- data/lib/puppet/external/nagios/grammar.ry +1 -1
- data/lib/puppet/external/nagios/makefile +1 -1
- data/lib/puppet/external/nagios/parser.rb +185 -618
- data/lib/puppet/external/pson/pure/parser.rb +47 -1
- data/lib/puppet/face/certificate.rb +3 -3
- data/lib/puppet/face/module.rb +1 -1
- data/lib/puppet/face/module/changes.rb +3 -1
- data/lib/puppet/face/module/uninstall.rb +1 -1
- data/lib/puppet/face/node/clean.rb +5 -5
- data/lib/puppet/feature/base.rb +3 -1
- data/lib/puppet/feature/libuser.rb +8 -0
- data/lib/puppet/file_serving/fileset.rb +9 -1
- data/lib/puppet/forge.rb +28 -5
- data/lib/puppet/forge/errors.rb +34 -0
- data/lib/puppet/forge/repository.rb +1 -1
- data/lib/puppet/indirector.rb +4 -1
- data/lib/puppet/indirector/catalog/compiler.rb +37 -30
- data/lib/puppet/indirector/facts/inventory_active_record.rb +1 -0
- data/lib/puppet/indirector/indirection.rb +28 -15
- data/lib/puppet/indirector/rest.rb +18 -10
- data/lib/puppet/interface.rb +11 -4
- data/lib/puppet/interface/action.rb +1 -3
- data/lib/puppet/interface/action_builder.rb +0 -3
- data/lib/puppet/interface/action_manager.rb +0 -3
- data/lib/puppet/interface/face_collection.rb +0 -2
- data/lib/puppet/interface/option.rb +0 -2
- data/lib/puppet/interface/option_builder.rb +0 -2
- data/lib/puppet/interface/option_manager.rb +0 -2
- data/lib/puppet/metatype/manager.rb +1 -1
- data/lib/puppet/module_tool.rb +1 -0
- data/lib/puppet/module_tool/applications/application.rb +0 -3
- data/lib/puppet/module_tool/applications/builder.rb +8 -20
- data/lib/puppet/module_tool/applications/checksummer.rb +1 -1
- data/lib/puppet/module_tool/applications/installer.rb +1 -0
- data/lib/puppet/module_tool/applications/unpacker.rb +3 -11
- data/lib/puppet/module_tool/checksums.rb +1 -1
- data/lib/puppet/module_tool/errors/installer.rb +18 -1
- data/lib/puppet/module_tool/modulefile.rb +2 -2
- data/lib/puppet/module_tool/skeleton/templates/generator/Modulefile.erb +1 -1
- data/lib/puppet/module_tool/tar.rb +17 -0
- data/lib/puppet/module_tool/tar/gnu.rb +9 -0
- data/lib/puppet/module_tool/tar/mini.rb +39 -0
- data/lib/puppet/module_tool/tar/solaris.rb +5 -0
- data/lib/puppet/network/http.rb +1 -0
- data/lib/puppet/network/http/connection.rb +9 -23
- data/lib/puppet/network/http/handler.rb +38 -7
- data/lib/puppet/network/http/rack/rest.rb +14 -3
- data/lib/puppet/network/http/webrick.rb +3 -1
- data/lib/puppet/network/http/webrick/rest.rb +11 -2
- data/lib/puppet/node/environment.rb +3 -1
- data/lib/puppet/parameter.rb +32 -29
- data/lib/puppet/parameter/package_options.rb +1 -1
- data/lib/puppet/parameter/path.rb +1 -1
- data/lib/puppet/parameter/value.rb +1 -1
- data/lib/puppet/parameter/value_collection.rb +7 -3
- data/lib/puppet/parser/ast.rb +3 -1
- data/lib/puppet/parser/ast/arithmetic_operator.rb +56 -12
- data/lib/puppet/parser/ast/astarray.rb +1 -1
- data/lib/puppet/parser/ast/block_expression.rb +41 -0
- data/lib/puppet/parser/ast/function.rb +13 -2
- data/lib/puppet/parser/ast/lambda.rb +107 -0
- data/lib/puppet/parser/ast/leaf.rb +1 -2
- data/lib/puppet/parser/ast/method_call.rb +77 -0
- data/lib/puppet/parser/ast/vardef.rb +7 -0
- data/lib/puppet/parser/compiler.rb +27 -16
- data/lib/puppet/parser/e_parser_adapter.rb +120 -0
- data/lib/puppet/parser/files.rb +7 -6
- data/lib/puppet/parser/functions.rb +10 -8
- data/lib/puppet/parser/functions/collect.rb +43 -0
- data/lib/puppet/parser/functions/each.rb +96 -0
- data/lib/puppet/parser/functions/foreach.rb +96 -0
- data/lib/puppet/parser/functions/fqdn_rand.rb +2 -2
- data/lib/puppet/parser/functions/hiera.rb +20 -2
- data/lib/puppet/parser/functions/hiera_array.rb +21 -2
- data/lib/puppet/parser/functions/hiera_hash.rb +23 -2
- data/lib/puppet/parser/functions/hiera_include.rb +33 -2
- data/lib/puppet/parser/functions/inline_template.rb +4 -4
- data/lib/puppet/parser/functions/reduce.rb +74 -0
- data/lib/puppet/parser/functions/reject.rb +46 -0
- data/lib/puppet/parser/functions/select.rb +46 -0
- data/lib/puppet/parser/functions/slice.rb +96 -0
- data/lib/puppet/parser/functions/template.rb +2 -2
- data/lib/puppet/parser/grammar.ra +7 -4
- data/lib/puppet/parser/lexer.rb +10 -0
- data/lib/puppet/parser/methods.rb +69 -0
- data/lib/puppet/parser/parser.rb +855 -808
- data/lib/puppet/parser/parser_factory.rb +62 -0
- data/lib/puppet/parser/parser_support.rb +8 -2
- data/lib/puppet/parser/scope.rb +153 -47
- data/lib/puppet/parser/templatewrapper.rb +28 -21
- data/lib/puppet/parser/type_loader.rb +3 -1
- data/lib/puppet/pops.rb +40 -0
- data/lib/puppet/pops/adaptable.rb +190 -0
- data/lib/puppet/pops/adapters.rb +65 -0
- data/lib/puppet/pops/containment.rb +37 -0
- data/lib/puppet/pops/issues.rb +258 -0
- data/lib/puppet/pops/label_provider.rb +71 -0
- data/lib/puppet/pops/model/ast_transformer.rb +636 -0
- data/lib/puppet/pops/model/ast_tree_dumper.rb +378 -0
- data/lib/puppet/pops/model/factory.rb +804 -0
- data/lib/puppet/pops/model/model.rb +567 -0
- data/lib/puppet/pops/model/model_label_provider.rb +75 -0
- data/lib/puppet/pops/model/model_tree_dumper.rb +352 -0
- data/lib/puppet/pops/model/tree_dumper.rb +59 -0
- data/lib/puppet/pops/parser/egrammar.ra +723 -0
- data/lib/puppet/pops/parser/eparser.rb +2300 -0
- data/lib/puppet/pops/parser/grammar.ra +746 -0
- data/lib/puppet/pops/parser/lexer.rb +842 -0
- data/lib/puppet/pops/parser/makefile +13 -0
- data/lib/puppet/pops/parser/parser_support.rb +203 -0
- data/lib/puppet/pops/patterns.rb +35 -0
- data/lib/puppet/pops/utils.rb +104 -0
- data/lib/puppet/pops/validation.rb +297 -0
- data/lib/puppet/pops/validation/checker3_1.rb +551 -0
- data/lib/puppet/pops/validation/validator_factory_3_1.rb +41 -0
- data/lib/puppet/pops/visitable.rb +6 -0
- data/lib/puppet/pops/visitor.rb +50 -0
- data/lib/puppet/property.rb +37 -28
- data/lib/puppet/property/ensure.rb +2 -2
- data/lib/puppet/property/ordered_list.rb +1 -1
- data/lib/puppet/provider.rb +26 -30
- data/lib/puppet/provider/aixobject.rb +45 -44
- data/lib/puppet/provider/augeas/augeas.rb +0 -1
- data/lib/puppet/provider/confiner.rb +1 -1
- data/lib/puppet/provider/cron/crontab.rb +107 -67
- data/lib/puppet/provider/group/groupadd.rb +59 -3
- data/lib/puppet/provider/interface/cisco.rb +4 -4
- data/lib/puppet/provider/mount/parsed.rb +1 -1
- data/lib/puppet/provider/nameservice.rb +22 -6
- data/lib/puppet/provider/nameservice/pw.rb +1 -1
- data/lib/puppet/provider/package/aix.rb +28 -4
- data/lib/puppet/provider/package/gem.rb +0 -2
- data/lib/puppet/provider/package/macports.rb +1 -1
- data/lib/puppet/provider/package/nim.rb +249 -4
- data/lib/puppet/provider/package/opkg.rb +77 -0
- data/lib/puppet/provider/package/pacman.rb +2 -2
- data/lib/puppet/provider/package/rpm.rb +30 -16
- data/lib/puppet/provider/package/yum.rb +3 -3
- data/lib/puppet/provider/parsedfile.rb +80 -3
- data/lib/puppet/provider/selmodule/semodule.rb +2 -2
- data/lib/puppet/provider/service/debian.rb +0 -4
- data/lib/puppet/provider/service/freebsd.rb +2 -2
- data/lib/puppet/provider/service/gentoo.rb +0 -9
- data/lib/puppet/provider/service/init.rb +27 -2
- data/lib/puppet/provider/service/launchd.rb +1 -1
- data/lib/puppet/provider/service/openwrt.rb +36 -0
- data/lib/puppet/provider/service/redhat.rb +0 -9
- data/lib/puppet/provider/service/src.rb +38 -4
- data/lib/puppet/provider/service/systemd.rb +2 -2
- data/lib/puppet/provider/service/upstart.rb +1 -8
- data/lib/puppet/provider/user/aix.rb +4 -10
- data/lib/puppet/provider/user/pw.rb +6 -10
- data/lib/puppet/provider/user/useradd.rb +129 -31
- data/lib/puppet/provider/vlan/cisco.rb +4 -4
- data/lib/puppet/reference/function.rb +2 -2
- data/lib/puppet/reference/indirection.rb +46 -5
- data/lib/puppet/reference/metaparameter.rb +2 -2
- data/lib/puppet/reports.rb +5 -5
- data/lib/puppet/reports/rrdgraph.rb +4 -4
- data/lib/puppet/reports/tagmail.rb +1 -1
- data/lib/puppet/resource.rb +1 -1
- data/lib/puppet/resource/type.rb +13 -11
- data/lib/puppet/scheduler.rb +16 -0
- data/lib/puppet/scheduler/job.rb +53 -0
- data/lib/puppet/scheduler/scheduler.rb +45 -0
- data/lib/puppet/scheduler/splay_job.rb +32 -0
- data/lib/puppet/scheduler/timer.rb +13 -0
- data/lib/puppet/settings/base_setting.rb +1 -1
- data/lib/puppet/simple_graph.rb +4 -4
- data/lib/puppet/ssl/base.rb +12 -2
- data/lib/puppet/ssl/certificate.rb +4 -1
- data/lib/puppet/ssl/certificate_request.rb +4 -1
- data/lib/puppet/ssl/certificate_revocation_list.rb +4 -1
- data/lib/puppet/ssl/configuration.rb +32 -0
- data/lib/puppet/ssl/host.rb +18 -21
- data/lib/puppet/ssl/key.rb +4 -1
- data/lib/puppet/ssl/validator.rb +116 -0
- data/lib/puppet/transaction.rb +1 -1
- data/lib/puppet/transaction/event.rb +3 -10
- data/lib/puppet/transaction/event_manager.rb +8 -1
- data/lib/puppet/transaction/report.rb +17 -16
- data/lib/puppet/type.rb +77 -69
- data/lib/puppet/type/cron.rb +20 -8
- data/lib/puppet/type/exec.rb +9 -3
- data/lib/puppet/type/file.rb +95 -21
- data/lib/puppet/type/file/content.rb +1 -1
- data/lib/puppet/type/file/mode.rb +7 -1
- data/lib/puppet/type/file/source.rb +2 -2
- data/lib/puppet/type/group.rb +11 -0
- data/lib/puppet/type/scheduled_task.rb +5 -1
- data/lib/puppet/type/service.rb +1 -1
- data/lib/puppet/type/ssh_authorized_key.rb +2 -2
- data/lib/puppet/type/user.rb +24 -6
- data/lib/puppet/util.rb +12 -2
- data/lib/puppet/util/classgen.rb +4 -4
- data/lib/puppet/util/colors.rb +55 -0
- data/lib/puppet/util/command_line/trollop.rb +4 -4
- data/lib/puppet/util/errors.rb +39 -3
- data/lib/puppet/util/fileparsing.rb +5 -0
- data/lib/puppet/util/filetype.rb +11 -9
- data/lib/puppet/util/instrumentation/instrumentable.rb +2 -2
- data/lib/puppet/util/libuser.conf +15 -0
- data/lib/puppet/util/libuser.rb +12 -0
- data/lib/puppet/util/monkey_patches.rb +48 -0
- data/lib/puppet/util/network_device.rb +1 -1
- data/lib/puppet/util/network_device/base.rb +2 -2
- data/lib/puppet/util/network_device/cisco/device.rb +29 -19
- data/lib/puppet/util/network_device/config.rb +5 -2
- data/lib/puppet/util/network_device/ipcalc.rb +1 -1
- data/lib/puppet/util/network_device/transport/ssh.rb +4 -3
- data/lib/puppet/util/network_device/transport/telnet.rb +4 -2
- data/lib/puppet/util/plugins.rb +4 -4
- data/lib/puppet/util/posix.rb +1 -1
- data/lib/puppet/util/profiler.rb +28 -0
- data/lib/puppet/util/profiler/logging.rb +47 -0
- data/lib/puppet/util/profiler/none.rb +8 -0
- data/lib/puppet/util/profiler/object_counts.rb +17 -0
- data/lib/puppet/util/profiler/wall_clock.rb +34 -0
- data/lib/puppet/util/provider_features.rb +1 -1
- data/lib/puppet/util/rdoc/parser.rb +5 -5
- data/lib/puppet/util/ssl.rb +38 -0
- data/lib/puppet/util/subclass_loader.rb +1 -5
- data/lib/puppet/util/windows.rb +1 -0
- data/lib/puppet/util/windows/process.rb +3 -0
- data/lib/puppet/util/windows/root_certs.rb +86 -0
- data/lib/puppet/util/windows/security.rb +1 -0
- data/lib/puppet/version.rb +1 -1
- data/spec/fixtures/integration/provider/cron/crontab/create_normal_entry +19 -0
- data/spec/fixtures/integration/provider/cron/crontab/create_special_entry +18 -0
- data/spec/fixtures/integration/provider/cron/crontab/crontab_user1 +15 -0
- data/spec/fixtures/integration/provider/cron/crontab/crontab_user2 +4 -0
- data/spec/fixtures/integration/provider/cron/crontab/modify_entry +13 -0
- data/spec/fixtures/integration/provider/cron/crontab/moved_cronjob_input1 +15 -0
- data/spec/fixtures/integration/provider/cron/crontab/moved_cronjob_input2 +6 -0
- data/spec/fixtures/integration/provider/cron/crontab/remove_named_resource +12 -0
- data/spec/fixtures/integration/provider/cron/crontab/remove_unnamed_resource +14 -0
- data/spec/fixtures/unit/pops/parser/lexer/aliastest.pp +16 -0
- data/spec/fixtures/unit/pops/parser/lexer/append.pp +11 -0
- data/spec/fixtures/unit/pops/parser/lexer/argumentdefaults.pp +14 -0
- data/spec/fixtures/unit/pops/parser/lexer/arithmetic_expression.pp +8 -0
- data/spec/fixtures/unit/pops/parser/lexer/arraytrailingcomma.pp +3 -0
- data/spec/fixtures/unit/pops/parser/lexer/casestatement.pp +65 -0
- data/spec/fixtures/unit/pops/parser/lexer/classheirarchy.pp +15 -0
- data/spec/fixtures/unit/pops/parser/lexer/classincludes.pp +17 -0
- data/spec/fixtures/unit/pops/parser/lexer/classpathtest.pp +11 -0
- data/spec/fixtures/unit/pops/parser/lexer/collection.pp +10 -0
- data/spec/fixtures/unit/pops/parser/lexer/collection_override.pp +8 -0
- data/spec/fixtures/unit/pops/parser/lexer/collection_within_virtual_definitions.pp +20 -0
- data/spec/fixtures/unit/pops/parser/lexer/componentmetaparams.pp +11 -0
- data/spec/fixtures/unit/pops/parser/lexer/componentrequire.pp +8 -0
- data/spec/fixtures/unit/pops/parser/lexer/deepclassheirarchy.pp +23 -0
- data/spec/fixtures/unit/pops/parser/lexer/defineoverrides.pp +17 -0
- data/spec/fixtures/unit/pops/parser/lexer/emptyclass.pp +9 -0
- data/spec/fixtures/unit/pops/parser/lexer/emptyexec.pp +3 -0
- data/spec/fixtures/unit/pops/parser/lexer/emptyifelse.pp +9 -0
- data/spec/fixtures/unit/pops/parser/lexer/falsevalues.pp +3 -0
- data/spec/fixtures/unit/pops/parser/lexer/filecreate.pp +11 -0
- data/spec/fixtures/unit/pops/parser/lexer/fqdefinition.pp +5 -0
- data/spec/fixtures/unit/pops/parser/lexer/fqparents.pp +11 -0
- data/spec/fixtures/unit/pops/parser/lexer/funccomma.pp +5 -0
- data/spec/fixtures/unit/pops/parser/lexer/hash.pp +33 -0
- data/spec/fixtures/unit/pops/parser/lexer/ifexpression.pp +12 -0
- data/spec/fixtures/unit/pops/parser/lexer/implicititeration.pp +15 -0
- data/spec/fixtures/unit/pops/parser/lexer/multilinecomments.pp +10 -0
- data/spec/fixtures/unit/pops/parser/lexer/multipleclass.pp +9 -0
- data/spec/fixtures/unit/pops/parser/lexer/multipleinstances.pp +7 -0
- data/spec/fixtures/unit/pops/parser/lexer/multisubs.pp +13 -0
- data/spec/fixtures/unit/pops/parser/lexer/namevartest.pp +9 -0
- data/spec/fixtures/unit/pops/parser/lexer/scopetest.pp +13 -0
- data/spec/fixtures/unit/pops/parser/lexer/selectorvalues.pp +49 -0
- data/spec/fixtures/unit/pops/parser/lexer/simpledefaults.pp +5 -0
- data/spec/fixtures/unit/pops/parser/lexer/simpleselector.pp +38 -0
- data/spec/fixtures/unit/pops/parser/lexer/singleary.pp +19 -0
- data/spec/fixtures/unit/pops/parser/lexer/singlequote.pp +11 -0
- data/spec/fixtures/unit/pops/parser/lexer/singleselector.pp +22 -0
- data/spec/fixtures/unit/pops/parser/lexer/subclass_name_duplication.pp +11 -0
- data/spec/fixtures/unit/pops/parser/lexer/tag.pp +9 -0
- data/spec/fixtures/unit/pops/parser/lexer/tagged.pp +35 -0
- data/spec/fixtures/unit/pops/parser/lexer/virtualresources.pp +14 -0
- data/spec/fixtures/unit/provider/cron/crontab/single_line.yaml +4 -4
- data/spec/fixtures/unit/provider/cron/crontab/vixie_header.txt +3 -0
- data/spec/fixtures/unit/provider/cron/parsed/managed +6 -0
- data/spec/fixtures/unit/provider/cron/parsed/simple +9 -0
- data/spec/fixtures/unit/provider/parsedfile/simple.txt +4 -0
- data/spec/fixtures/unit/provider/service/systemd/list_units +18 -0
- data/spec/integration/parser/collector_spec.rb +1 -1
- data/spec/integration/parser/compiler_spec.rb +252 -227
- data/spec/integration/parser/parser_spec.rb +171 -53
- data/spec/integration/parser/scope_spec.rb +1 -1
- data/spec/integration/provider/cron/crontab_spec.rb +187 -0
- data/spec/integration/provider/service/systemd_spec.rb +20 -0
- data/spec/integration/type/file_spec.rb +21 -21
- data/spec/integration/type/package_spec.rb +1 -1
- data/spec/lib/puppet_spec/database.rb +2 -5
- data/spec/spec_helper.rb +6 -1
- data/spec/unit/application/apply_spec.rb +16 -1
- data/spec/unit/application/describe_spec.rb +1 -1
- data/spec/unit/application/doc_spec.rb +55 -32
- data/spec/unit/application/kick_spec.rb +8 -6
- data/spec/unit/application/master_spec.rb +4 -4
- data/spec/unit/daemon_spec.rb +1 -1
- data/spec/unit/forge/errors_spec.rb +40 -0
- data/spec/unit/forge/repository_spec.rb +11 -1
- data/spec/unit/forge_spec.rb +13 -3
- data/spec/unit/hiera/backend/puppet_backend_spec.rb +1 -0
- data/spec/unit/hiera/scope_spec.rb +48 -25
- data/spec/unit/indirector/catalog/active_record_spec.rb +6 -3
- data/spec/unit/indirector/catalog/compiler_spec.rb +3 -28
- data/spec/unit/indirector/catalog/static_compiler_spec.rb +1 -1
- data/spec/unit/indirector/facts/inventory_active_record_spec.rb +154 -150
- data/spec/unit/indirector/indirection_spec.rb +5 -0
- data/spec/unit/indirector/resource/active_record_spec.rb +5 -22
- data/spec/unit/indirector_spec.rb +7 -1
- data/spec/unit/interface/action_builder_spec.rb +1 -1
- data/spec/unit/interface/action_manager_spec.rb +0 -2
- data/spec/unit/interface/action_spec.rb +1 -1
- data/spec/unit/interface/documentation_spec.rb +0 -2
- data/spec/unit/interface/face_collection_spec.rb +1 -1
- data/spec/unit/interface/option_builder_spec.rb +1 -1
- data/spec/unit/interface/option_spec.rb +0 -1
- data/spec/unit/module_spec.rb +17 -19
- data/spec/unit/module_tool/application_spec.rb +1 -3
- data/spec/unit/module_tool/applications/builder_spec.rb +38 -0
- data/spec/unit/module_tool/applications/checksummer_spec.rb +134 -0
- data/spec/unit/module_tool/applications/installer_spec.rb +71 -91
- data/spec/unit/module_tool/applications/searcher_spec.rb +1 -3
- data/spec/unit/module_tool/applications/uninstaller_spec.rb +18 -26
- data/spec/unit/module_tool/applications/unpacker_spec.rb +19 -52
- data/spec/unit/module_tool/tar/gnu_spec.rb +19 -0
- data/spec/unit/module_tool/tar/mini_spec.rb +59 -0
- data/spec/unit/module_tool/tar/solaris_spec.rb +19 -0
- data/spec/unit/network/http/connection_spec.rb +17 -2
- data/spec/unit/network/http/handler_spec.rb +195 -167
- data/spec/unit/network/http/rack/rest_spec.rb +26 -4
- data/spec/unit/network/http/webrick/rest_spec.rb +28 -1
- data/spec/unit/network/http/webrick_spec.rb +12 -3
- data/spec/unit/node/environment_spec.rb +421 -404
- data/spec/unit/parser/ast/arithmetic_operator_spec.rb +98 -2
- data/spec/unit/parser/collector_spec.rb +4 -4
- data/spec/unit/parser/compiler_spec.rb +13 -13
- data/spec/unit/parser/eparser_adapter_spec.rb +407 -0
- data/spec/unit/parser/functions/extlookup_spec.rb +20 -17
- data/spec/unit/parser/functions/fqdn_rand_spec.rb +5 -0
- data/spec/unit/parser/functions/hiera_include_spec.rb +0 -2
- data/spec/unit/parser/functions/hiera_spec.rb +0 -2
- data/spec/unit/parser/functions_spec.rb +27 -15
- data/spec/unit/parser/methods/collect_spec.rb +110 -0
- data/spec/unit/parser/methods/each_spec.rb +91 -0
- data/spec/unit/parser/methods/foreach_spec.rb +91 -0
- data/spec/unit/parser/methods/reduce_spec.rb +67 -0
- data/spec/unit/parser/methods/reject_spec.rb +73 -0
- data/spec/unit/parser/methods/select_spec.rb +79 -0
- data/spec/unit/parser/methods/shared.rb +61 -0
- data/spec/unit/parser/methods/slice_spec.rb +97 -0
- data/spec/unit/parser/parser_spec.rb +2 -2
- data/spec/unit/parser/scope_spec.rb +39 -16
- data/spec/unit/parser/templatewrapper_spec.rb +6 -5
- data/spec/unit/parser/type_loader_spec.rb +191 -165
- data/spec/unit/pops/adaptable_spec.rb +143 -0
- data/spec/unit/pops/containment_spec.rb +25 -0
- data/spec/unit/pops/factory_rspec_helper.rb +77 -0
- data/spec/unit/pops/factory_spec.rb +329 -0
- data/spec/unit/pops/issues_spec.rb +26 -0
- data/spec/unit/pops/label_provider_spec.rb +42 -0
- data/spec/unit/pops/model/ast_transformer_spec.rb +65 -0
- data/spec/unit/pops/model/model_spec.rb +37 -0
- data/spec/unit/pops/parser/lexer_spec.rb +884 -0
- data/spec/unit/pops/parser/parse_basic_expressions_spec.rb +248 -0
- data/spec/unit/pops/parser/parse_calls_spec.rb +93 -0
- data/spec/unit/pops/parser/parse_conditionals_spec.rb +159 -0
- data/spec/unit/pops/parser/parse_containers_spec.rb +175 -0
- data/spec/unit/pops/parser/parse_resource_spec.rb +228 -0
- data/spec/unit/pops/parser/parser_rspec_helper.rb +11 -0
- data/spec/unit/pops/parser/parser_spec.rb +15 -0
- data/spec/unit/pops/parser/rgen_sanitycheck_spec.rb +16 -0
- data/spec/unit/pops/transformer/transform_basic_expressions_spec.rb +243 -0
- data/spec/unit/pops/transformer/transform_calls_spec.rb +80 -0
- data/spec/unit/pops/transformer/transform_conditionals_spec.rb +132 -0
- data/spec/unit/pops/transformer/transform_containers_spec.rb +182 -0
- data/spec/unit/pops/transformer/transform_resource_spec.rb +185 -0
- data/spec/unit/pops/transformer/transformer_rspec_helper.rb +27 -0
- data/spec/unit/pops/visitor_spec.rb +94 -0
- data/spec/unit/property_spec.rb +11 -0
- data/spec/unit/provider/augeas/augeas_spec.rb +3 -0
- data/spec/unit/provider/cron/crontab_spec.rb +97 -7
- data/spec/unit/provider/cron/parsed_spec.rb +325 -0
- data/spec/unit/provider/exec/posix_spec.rb +1 -1
- data/spec/unit/provider/group/groupadd_spec.rb +33 -3
- data/spec/unit/provider/group/pw_spec.rb +5 -5
- data/spec/unit/provider/nameservice_spec.rb +304 -0
- data/spec/unit/provider/package/aix_spec.rb +53 -11
- data/spec/unit/provider/package/aptrpm_spec.rb +6 -0
- data/spec/unit/provider/package/gem_spec.rb +6 -11
- data/spec/unit/provider/package/nim_spec.rb +216 -7
- data/spec/unit/provider/package/opkg_spec.rb +180 -0
- data/spec/unit/provider/package/rpm_spec.rb +149 -3
- data/spec/unit/provider/package/yum_spec.rb +6 -5
- data/spec/unit/provider/parsedfile_spec.rb +122 -28
- data/spec/unit/provider/service/freebsd_spec.rb +18 -0
- data/spec/unit/provider/service/init_spec.rb +108 -87
- data/spec/unit/provider/service/launchd_spec.rb +2 -2
- data/spec/unit/provider/service/openwrt_spec.rb +109 -0
- data/spec/unit/provider/service/src_spec.rb +117 -41
- data/spec/unit/provider/service/systemd_spec.rb +125 -17
- data/spec/unit/provider/service/upstart_spec.rb +1 -1
- data/spec/unit/provider/user/aix_spec.rb +42 -0
- data/spec/unit/provider/user/directoryservice_spec.rb +1 -0
- data/spec/unit/provider/user/pw_spec.rb +24 -12
- data/spec/unit/provider/user/user_role_add_spec.rb +1 -1
- data/spec/unit/provider/user/useradd_spec.rb +179 -15
- data/spec/unit/resource/type_spec.rb +3 -3
- data/spec/unit/scheduler/job_spec.rb +79 -0
- data/spec/unit/scheduler/scheduler_spec.rb +129 -0
- data/spec/unit/scheduler/splay_job_spec.rb +35 -0
- data/spec/unit/ssl/base_spec.rb +3 -9
- data/spec/unit/ssl/certificate_authority_spec.rb +1 -0
- data/spec/unit/ssl/certificate_request_spec.rb +3 -1
- data/spec/unit/ssl/certificate_spec.rb +3 -1
- data/spec/unit/ssl/configuration_spec.rb +74 -0
- data/spec/unit/ssl/host_spec.rb +28 -7
- data/spec/unit/ssl/validator_spec.rb +311 -0
- data/spec/unit/transaction/event_manager_spec.rb +49 -0
- data/spec/unit/transaction/event_spec.rb +20 -5
- data/spec/unit/transaction/report_spec.rb +8 -0
- data/spec/unit/type/cron_spec.rb +9 -0
- data/spec/unit/type/exec_spec.rb +11 -0
- data/spec/unit/type/file/content_spec.rb +20 -20
- data/spec/unit/type/file/mode_spec.rb +6 -0
- data/spec/unit/type/file/source_spec.rb +9 -7
- data/spec/unit/type/file_spec.rb +22 -3
- data/spec/unit/type/service_spec.rb +34 -21
- data/spec/unit/type_spec.rb +46 -1
- data/spec/unit/util/backups_spec.rb +2 -2
- data/spec/unit/util/execution_spec.rb +4 -1
- data/spec/unit/util/filetype_spec.rb +6 -0
- data/spec/unit/util/monkey_patches_spec.rb +18 -0
- data/spec/unit/util/network_device/cisco/device_spec.rb +37 -0
- data/spec/unit/util/network_device/config_spec.rb +14 -0
- data/spec/unit/util/network_device_spec.rb +3 -3
- data/spec/unit/util/profiler/logging_spec.rb +81 -0
- data/spec/unit/util/profiler/none_spec.rb +12 -0
- data/spec/unit/util/profiler/object_counts_spec.rb +14 -0
- data/spec/unit/util/profiler/wall_clock_spec.rb +13 -0
- data/spec/unit/util/pson_spec.rb +5 -0
- data/spec/unit/util/ssl_spec.rb +51 -0
- data/spec/unit/util/windows/root_certs_spec.rb +15 -0
- data/spec/unit/util_spec.rb +28 -0
- metadata +2593 -2307
- data/spec/unit/module_tool/applications/application_spec.rb +0 -19
|
@@ -0,0 +1,723 @@
|
|
|
1
|
+
# vim: syntax=ruby
|
|
2
|
+
|
|
3
|
+
# Parser using the Pops model, expression based
|
|
4
|
+
|
|
5
|
+
class Puppet::Pops::Parser::Parser
|
|
6
|
+
|
|
7
|
+
token STRING DQPRE DQMID DQPOST
|
|
8
|
+
token LBRACK RBRACK LBRACE RBRACE SYMBOL FARROW COMMA TRUE
|
|
9
|
+
token FALSE EQUALS APPENDS LESSEQUAL NOTEQUAL DOT COLON LLCOLLECT RRCOLLECT
|
|
10
|
+
token QMARK LPAREN RPAREN ISEQUAL GREATEREQUAL GREATERTHAN LESSTHAN
|
|
11
|
+
token IF ELSE
|
|
12
|
+
token DEFINE ELSIF VARIABLE CLASS INHERITS NODE BOOLEAN
|
|
13
|
+
token NAME SEMIC CASE DEFAULT AT LCOLLECT RCOLLECT CLASSREF
|
|
14
|
+
token NOT OR AND UNDEF PARROW PLUS MINUS TIMES DIV LSHIFT RSHIFT UMINUS
|
|
15
|
+
token MATCH NOMATCH REGEX IN_EDGE OUT_EDGE IN_EDGE_SUB OUT_EDGE_SUB
|
|
16
|
+
token IN UNLESS PIPE
|
|
17
|
+
token LAMBDA SELBRACE
|
|
18
|
+
token LOW
|
|
19
|
+
|
|
20
|
+
prechigh
|
|
21
|
+
left HIGH
|
|
22
|
+
left SEMIC
|
|
23
|
+
left PIPE
|
|
24
|
+
left LPAREN
|
|
25
|
+
left RPAREN
|
|
26
|
+
left AT
|
|
27
|
+
left DOT
|
|
28
|
+
left CALL
|
|
29
|
+
left LBRACK
|
|
30
|
+
left QMARK
|
|
31
|
+
left LCOLLECT LLCOLLECT
|
|
32
|
+
right NOT
|
|
33
|
+
nonassoc UMINUS
|
|
34
|
+
left IN
|
|
35
|
+
left MATCH NOMATCH
|
|
36
|
+
left TIMES DIV MODULO
|
|
37
|
+
left MINUS PLUS
|
|
38
|
+
left LSHIFT RSHIFT
|
|
39
|
+
left NOTEQUAL ISEQUAL
|
|
40
|
+
left GREATEREQUAL GREATERTHAN LESSTHAN LESSEQUAL
|
|
41
|
+
left AND
|
|
42
|
+
left OR
|
|
43
|
+
right APPENDS EQUALS
|
|
44
|
+
left LBRACE
|
|
45
|
+
left SELBRACE
|
|
46
|
+
left RBRACE
|
|
47
|
+
left IN_EDGE OUT_EDGE IN_EDGE_SUB OUT_EDGE_SUB
|
|
48
|
+
left TITLE_COLON
|
|
49
|
+
left CASE_COLON
|
|
50
|
+
left FARROW
|
|
51
|
+
left COMMA
|
|
52
|
+
left LOW
|
|
53
|
+
preclow
|
|
54
|
+
|
|
55
|
+
rule
|
|
56
|
+
# Produces [Model::BlockExpression, Model::Expression, nil] depending on multiple statements, single statement or empty
|
|
57
|
+
program
|
|
58
|
+
: statements { result = Factory.block_or_expression(*val[0]) }
|
|
59
|
+
| nil
|
|
60
|
+
|
|
61
|
+
# Produces a semantic model (non validated, but semantically adjusted).
|
|
62
|
+
statements
|
|
63
|
+
: syntactic_statements { result = transform_calls(val[0]) }
|
|
64
|
+
|
|
65
|
+
# Change may have issues with nil; i.e. program is a sequence of nils/nops
|
|
66
|
+
# Simplified from original which had validation for top level constructs - see statement rule
|
|
67
|
+
# Produces Array<Model::Expression>
|
|
68
|
+
syntactic_statements
|
|
69
|
+
: syntactic_statement { result = [val[0]]}
|
|
70
|
+
| syntactic_statements SEMIC syntactic_statement { result = val[0].push val[2] }
|
|
71
|
+
| syntactic_statements syntactic_statement { result = val[0].push val[1] }
|
|
72
|
+
|
|
73
|
+
# Produce a single expression or Array of expression
|
|
74
|
+
syntactic_statement
|
|
75
|
+
: any_expression { result = val[0] }
|
|
76
|
+
| syntactic_statement COMMA any_expression { result = aryfy(val[0]).push val[2] }
|
|
77
|
+
|
|
78
|
+
any_expression
|
|
79
|
+
: relationship_expression
|
|
80
|
+
|
|
81
|
+
relationship_expression
|
|
82
|
+
: resource_expression =LOW { result = val[0] }
|
|
83
|
+
| relationship_expression IN_EDGE relationship_expression { result = val[0].relop(val[1][:value], val[2]); loc result, val[1] }
|
|
84
|
+
| relationship_expression IN_EDGE_SUB relationship_expression { result = val[0].relop(val[1][:value], val[2]); loc result, val[1] }
|
|
85
|
+
| relationship_expression OUT_EDGE relationship_expression { result = val[0].relop(val[1][:value], val[2]); loc result, val[1] }
|
|
86
|
+
| relationship_expression OUT_EDGE_SUB relationship_expression { result = val[0].relop(val[1][:value], val[2]); loc result, val[1] }
|
|
87
|
+
|
|
88
|
+
#---EXPRESSION
|
|
89
|
+
#
|
|
90
|
+
# Produces Model::Expression
|
|
91
|
+
expression
|
|
92
|
+
: higher_precedence
|
|
93
|
+
| expression LBRACK expressions RBRACK =LBRACK { result = val[0][*val[2]] ; loc result, val[0], val[3] }
|
|
94
|
+
| expression IN expression { result = val[0].in val[2] ; loc result, val[1] }
|
|
95
|
+
| expression MATCH match_rvalue { result = val[0] =~ val[2] ; loc result, val[1] }
|
|
96
|
+
| expression NOMATCH match_rvalue { result = val[0].mne val[2] ; loc result, val[1] }
|
|
97
|
+
| expression PLUS expression { result = val[0] + val[2] ; loc result, val[1] }
|
|
98
|
+
| expression MINUS expression { result = val[0] - val[2] ; loc result, val[1] }
|
|
99
|
+
| expression DIV expression { result = val[0] / val[2] ; loc result, val[1] }
|
|
100
|
+
| expression TIMES expression { result = val[0] * val[2] ; loc result, val[1] }
|
|
101
|
+
| expression MODULO expression { result = val[0] % val[2] ; loc result, val[1] }
|
|
102
|
+
| expression LSHIFT expression { result = val[0] << val[2] ; loc result, val[1] }
|
|
103
|
+
| expression RSHIFT expression { result = val[0] >> val[2] ; loc result, val[1] }
|
|
104
|
+
| MINUS expression =UMINUS { result = val[1].minus() ; loc result, val[0] }
|
|
105
|
+
| expression NOTEQUAL expression { result = val[0].ne val[2] ; loc result, val[1] }
|
|
106
|
+
| expression ISEQUAL expression { result = val[0] == val[2] ; loc result, val[1] }
|
|
107
|
+
| expression GREATERTHAN expression { result = val[0] > val[2] ; loc result, val[1] }
|
|
108
|
+
| expression GREATEREQUAL expression { result = val[0] >= val[2] ; loc result, val[1] }
|
|
109
|
+
| expression LESSTHAN expression { result = val[0] < val[2] ; loc result, val[1] }
|
|
110
|
+
| expression LESSEQUAL expression { result = val[0] <= val[2] ; loc result, val[1] }
|
|
111
|
+
| NOT expression { result = val[1].not ; loc result, val[0] }
|
|
112
|
+
| expression AND expression { result = val[0].and val[2] ; loc result, val[1] }
|
|
113
|
+
| expression OR expression { result = val[0].or val[2] ; loc result, val[1] }
|
|
114
|
+
| expression EQUALS expression { result = val[0].set(val[2]) ; loc result, val[1] }
|
|
115
|
+
| expression APPENDS expression { result = val[0].plus_set(val[2]) ; loc result, val[1] }
|
|
116
|
+
| expression QMARK selector_entries { result = val[0].select(*val[2]) ; loc result, val[0] }
|
|
117
|
+
| LPAREN expression RPAREN { result = val[1].paren() ; loc result, val[0] }
|
|
118
|
+
|
|
119
|
+
#---EXPRESSIONS
|
|
120
|
+
# (e.g. argument list)
|
|
121
|
+
#
|
|
122
|
+
# This expression list can not contain function calls without parentheses around arguments
|
|
123
|
+
# Produces Array<Model::Expression>
|
|
124
|
+
expressions
|
|
125
|
+
: expression { result = [val[0]] }
|
|
126
|
+
| expressions COMMA expression { result = val[0].push(val[2]) }
|
|
127
|
+
|
|
128
|
+
# These go through a chain of left recursion, ending with primary_expression
|
|
129
|
+
higher_precedence
|
|
130
|
+
: call_function_expression
|
|
131
|
+
|
|
132
|
+
primary_expression
|
|
133
|
+
: literal_expression
|
|
134
|
+
| variable
|
|
135
|
+
| call_method_with_lambda_expression
|
|
136
|
+
| collection_expression
|
|
137
|
+
| case_expression
|
|
138
|
+
| if_expression
|
|
139
|
+
| unless_expression
|
|
140
|
+
| definition_expression
|
|
141
|
+
| hostclass_expression
|
|
142
|
+
| node_definition_expression
|
|
143
|
+
|
|
144
|
+
# Aleways have the same value
|
|
145
|
+
literal_expression
|
|
146
|
+
: array
|
|
147
|
+
| boolean
|
|
148
|
+
| default
|
|
149
|
+
| hash
|
|
150
|
+
| regex
|
|
151
|
+
| text_or_name =LOW # resolves hash key ambiguity (racc W U require this?)
|
|
152
|
+
| type
|
|
153
|
+
| undef
|
|
154
|
+
|
|
155
|
+
text_or_name
|
|
156
|
+
: name { result = val[0] }
|
|
157
|
+
| quotedtext { result = val[0] }
|
|
158
|
+
|
|
159
|
+
#---CALL FUNCTION
|
|
160
|
+
#
|
|
161
|
+
# Produces Model::CallNamedFunction
|
|
162
|
+
|
|
163
|
+
call_function_expression
|
|
164
|
+
: primary_expression LPAREN expressions endcomma RPAREN {
|
|
165
|
+
result = Factory.CALL_NAMED(val[0], true, val[2])
|
|
166
|
+
loc result, val[0], val[4]
|
|
167
|
+
}
|
|
168
|
+
| primary_expression LPAREN RPAREN {
|
|
169
|
+
result = Factory.CALL_NAMED(val[0], true, [])
|
|
170
|
+
loc result, val[0], val[2]
|
|
171
|
+
}
|
|
172
|
+
| primary_expression LPAREN expressions endcomma RPAREN lambda {
|
|
173
|
+
result = Factory.CALL_NAMED(val[0], true, val[2])
|
|
174
|
+
loc result, val[0], val[4]
|
|
175
|
+
result.lambda = val[5]
|
|
176
|
+
}
|
|
177
|
+
| primary_expression LPAREN RPAREN lambda {
|
|
178
|
+
result = Factory.CALL_NAMED(val[0], true, [])
|
|
179
|
+
loc result, val[0], val[2]
|
|
180
|
+
result.lambda = val[3]
|
|
181
|
+
}
|
|
182
|
+
| primary_expression = LOW { result = val[0] }
|
|
183
|
+
|
|
184
|
+
#---CALL METHOD
|
|
185
|
+
#
|
|
186
|
+
call_method_with_lambda_expression
|
|
187
|
+
: call_method_expression =LOW { result = val[0] }
|
|
188
|
+
| call_method_expression lambda { result = val[0]; val[0].lambda = val[1] }
|
|
189
|
+
|
|
190
|
+
call_method_expression
|
|
191
|
+
: named_access LPAREN expressions RPAREN { result = Factory.CALL_METHOD(val[0], val[2]); loc result, val[1], val[3] }
|
|
192
|
+
| named_access LPAREN RPAREN { result = Factory.CALL_METHOD(val[0], []); loc result, val[1], val[3] }
|
|
193
|
+
| named_access =LOW { result = Factory.CALL_METHOD(val[0], []); loc result, val[0] }
|
|
194
|
+
|
|
195
|
+
# TODO: It may be of value to access named elements of types too
|
|
196
|
+
named_access
|
|
197
|
+
: expression DOT NAME {
|
|
198
|
+
result = val[0].dot(Factory.fqn(val[2][:value]))
|
|
199
|
+
loc result, val[1], val[2]
|
|
200
|
+
}
|
|
201
|
+
|
|
202
|
+
#---LAMBDA
|
|
203
|
+
#
|
|
204
|
+
# This is a temporary switch while experimenting with concrete syntax
|
|
205
|
+
# One should be picked for inclusion in puppet.
|
|
206
|
+
lambda
|
|
207
|
+
: lambda_j8
|
|
208
|
+
| lambda_ruby
|
|
209
|
+
|
|
210
|
+
# Java8-like lambda with parameters to the left of the body
|
|
211
|
+
lambda_j8
|
|
212
|
+
: lambda_parameter_list optional_farrow lambda_rest {
|
|
213
|
+
result = Factory.LAMBDA(val[0], val[2])
|
|
214
|
+
# loc result, val[1] # TODO
|
|
215
|
+
}
|
|
216
|
+
|
|
217
|
+
lambda_rest
|
|
218
|
+
: LBRACE statements RBRACE { result = val[1] }
|
|
219
|
+
| LBRACE RBRACE { result = nil }
|
|
220
|
+
|
|
221
|
+
optional_farrow
|
|
222
|
+
: nil
|
|
223
|
+
| FARROW
|
|
224
|
+
|
|
225
|
+
# Ruby-like lambda with parameters inside the body
|
|
226
|
+
#
|
|
227
|
+
lambda_ruby
|
|
228
|
+
: LAMBDA lambda_parameter_list statements RBRACE {
|
|
229
|
+
result = Factory.LAMBDA(val[1], val[2])
|
|
230
|
+
loc result, val[0], val[3]
|
|
231
|
+
}
|
|
232
|
+
| LAMBDA lambda_parameter_list RBRACE {
|
|
233
|
+
result = Factory.LAMBDA(val[1], nil)
|
|
234
|
+
loc result, val[0], val[2]
|
|
235
|
+
}
|
|
236
|
+
|
|
237
|
+
# Produces Array<Model::Parameter>
|
|
238
|
+
lambda_parameter_list
|
|
239
|
+
: PIPE PIPE { result = [] }
|
|
240
|
+
| PIPE parameters endcomma PIPE { result = val[1] }
|
|
241
|
+
|
|
242
|
+
#---CONDITIONALS
|
|
243
|
+
#
|
|
244
|
+
|
|
245
|
+
#--IF
|
|
246
|
+
#
|
|
247
|
+
# Produces Model::IfExpression
|
|
248
|
+
if_expression
|
|
249
|
+
: IF if_part {
|
|
250
|
+
result = val[1]
|
|
251
|
+
loc(result, val[0], val[1])
|
|
252
|
+
}
|
|
253
|
+
|
|
254
|
+
# Produces Model::IfExpression
|
|
255
|
+
if_part
|
|
256
|
+
: expression LBRACE statements RBRACE else {
|
|
257
|
+
result = Factory.IF(val[0], Factory.block_or_expression(*val[2]), val[4])
|
|
258
|
+
loc(result, val[0], (val[4] ? val[4] : val[3]))
|
|
259
|
+
}
|
|
260
|
+
| expression LBRACE RBRACE else {
|
|
261
|
+
result = Factory.IF(val[0], nil, val[3])
|
|
262
|
+
loc(result, val[0], (val[3] ? val[3] : val[2]))
|
|
263
|
+
}
|
|
264
|
+
|
|
265
|
+
# Produces [Model::Expression, nil] - nil if there is no else or elsif part
|
|
266
|
+
else
|
|
267
|
+
: # nothing
|
|
268
|
+
| ELSIF if_part {
|
|
269
|
+
result = val[1]
|
|
270
|
+
loc(result, val[0], val[1])
|
|
271
|
+
}
|
|
272
|
+
| ELSE LBRACE statements RBRACE {
|
|
273
|
+
result = Factory.block_or_expression(*val[2])
|
|
274
|
+
loc result, val[0], val[3]
|
|
275
|
+
}
|
|
276
|
+
| ELSE LBRACE RBRACE {
|
|
277
|
+
result = nil # don't think a nop is needed here either
|
|
278
|
+
}
|
|
279
|
+
|
|
280
|
+
#--UNLESS
|
|
281
|
+
#
|
|
282
|
+
# Changed from Puppet 3x where there is no else part on unless
|
|
283
|
+
#
|
|
284
|
+
unless_expression
|
|
285
|
+
: UNLESS expression LBRACE statements RBRACE unless_else {
|
|
286
|
+
result = Factory.UNLESS(val[1], Factory.block_or_expression(*val[3]), val[5])
|
|
287
|
+
loc result, val[0], val[4]
|
|
288
|
+
}
|
|
289
|
+
| UNLESS expression LBRACE RBRACE unless_else {
|
|
290
|
+
result = Factory.UNLESS(val[1], nil, nil)
|
|
291
|
+
loc result, val[0], val[4]
|
|
292
|
+
}
|
|
293
|
+
|
|
294
|
+
# Different from else part of if, since "elsif" is not supported, but 'else' is
|
|
295
|
+
#
|
|
296
|
+
# Produces [Model::Expression, nil] - nil if there is no else or elsif part
|
|
297
|
+
unless_else
|
|
298
|
+
: # nothing
|
|
299
|
+
| ELSE LBRACE statements RBRACE {
|
|
300
|
+
result = Factory.block_or_expression(*val[2])
|
|
301
|
+
loc result, val[0], val[3]
|
|
302
|
+
}
|
|
303
|
+
| ELSE LBRACE RBRACE {
|
|
304
|
+
result = nil # don't think a nop is needed here either
|
|
305
|
+
}
|
|
306
|
+
|
|
307
|
+
#--- CASE EXPRESSION
|
|
308
|
+
#
|
|
309
|
+
# Produces Model::CaseExpression
|
|
310
|
+
case_expression
|
|
311
|
+
: CASE expression LBRACE case_options RBRACE {
|
|
312
|
+
result = Factory.CASE(val[1], *val[3])
|
|
313
|
+
loc result, val[0], val[4]
|
|
314
|
+
}
|
|
315
|
+
|
|
316
|
+
# Produces Array<Model::CaseOption>
|
|
317
|
+
case_options
|
|
318
|
+
: case_option { result = [val[0]] }
|
|
319
|
+
| case_options case_option { result = val[0].push val[1] }
|
|
320
|
+
|
|
321
|
+
# Produced Model::CaseOption (aka When)
|
|
322
|
+
case_option
|
|
323
|
+
: expressions case_colon LBRACE statements RBRACE {
|
|
324
|
+
result = Factory.WHEN(val[0], val[3])
|
|
325
|
+
loc result, val[1], val[4]
|
|
326
|
+
}
|
|
327
|
+
| expressions case_colon LBRACE RBRACE = LOW {
|
|
328
|
+
result = Factory.WHEN(val[0], nil)
|
|
329
|
+
loc result, val[1], val[3]
|
|
330
|
+
}
|
|
331
|
+
|
|
332
|
+
case_colon: COLON =CASE_COLON { result = val[0] }
|
|
333
|
+
|
|
334
|
+
# This special construct is required or racc will produce the wrong result when the selector entry
|
|
335
|
+
# LHS is generalized to any expression (LBRACE looks like a hash). Thus it is not possible to write
|
|
336
|
+
# a selector with a single entry where the entry LHS is a hash.
|
|
337
|
+
# The SELBRACE token is a LBRACE that follows a QMARK, and this is produced by the lexer with a lookback
|
|
338
|
+
# Produces Array<Model::SelectorEntry>
|
|
339
|
+
#
|
|
340
|
+
selector_entries
|
|
341
|
+
: selector_entry
|
|
342
|
+
| SELBRACE selector_entry_list endcomma RBRACE {
|
|
343
|
+
result = val[1]
|
|
344
|
+
}
|
|
345
|
+
|
|
346
|
+
# Produces Array<Model::SelectorEntry>
|
|
347
|
+
selector_entry_list
|
|
348
|
+
: selector_entry { result = [val[0]] }
|
|
349
|
+
| selector_entry_list COMMA selector_entry { result = val[0].push val[2] }
|
|
350
|
+
|
|
351
|
+
# Produces a Model::SelectorEntry
|
|
352
|
+
# This FARROW wins over FARROW in Hash
|
|
353
|
+
selector_entry
|
|
354
|
+
: expression FARROW expression { result = Factory.MAP(val[0], val[2]) ; loc result, val[1] }
|
|
355
|
+
|
|
356
|
+
# --- IMPORT
|
|
357
|
+
# IMPORT is handled as a non parenthesized call and is transformed to an ImportExpression.
|
|
358
|
+
# i.e. there is no special grammar for it - it is just a "call statement".
|
|
359
|
+
|
|
360
|
+
#---RESOURCE
|
|
361
|
+
#
|
|
362
|
+
# Produces [Model::ResourceExpression, Model::ResourceDefaultsExpression]
|
|
363
|
+
|
|
364
|
+
# The resource expression parses a generalized syntax and then selects the correct
|
|
365
|
+
# resulting model based on the combinatoin of the LHS and what follows.
|
|
366
|
+
# It also handled exported and virtual resources, and the class case
|
|
367
|
+
#
|
|
368
|
+
resource_expression
|
|
369
|
+
: expression =LOW {
|
|
370
|
+
result = val[0]
|
|
371
|
+
}
|
|
372
|
+
| at expression LBRACE resourceinstances endsemi RBRACE {
|
|
373
|
+
result = case Factory.resource_shape(val[1])
|
|
374
|
+
when :resource, :class
|
|
375
|
+
tmp = Factory.RESOURCE(Factory.fqn(token_text(val[1])), val[3])
|
|
376
|
+
tmp.form = val[0]
|
|
377
|
+
tmp
|
|
378
|
+
when :defaults
|
|
379
|
+
error "A resource default can not be virtual or exported"
|
|
380
|
+
when :override
|
|
381
|
+
error "A resource override can not be virtual or exported"
|
|
382
|
+
else
|
|
383
|
+
error "Expression is not valid as a resource, resource-default, or resource-override"
|
|
384
|
+
end
|
|
385
|
+
loc result, val[1], val[4]
|
|
386
|
+
}
|
|
387
|
+
| at expression LBRACE attribute_operations endcomma RBRACE {
|
|
388
|
+
result = case Factory.resource_shape(val[1])
|
|
389
|
+
when :resource, :class
|
|
390
|
+
error "Defaults are not virtualizable"
|
|
391
|
+
when :defaults
|
|
392
|
+
error "Defaults are not virtualizable"
|
|
393
|
+
when :override
|
|
394
|
+
error "Defaults are not virtualizable"
|
|
395
|
+
else
|
|
396
|
+
error "Expression is not valid as a resource, resource-default, or resource-override"
|
|
397
|
+
end
|
|
398
|
+
}
|
|
399
|
+
| expression LBRACE resourceinstances endsemi RBRACE {
|
|
400
|
+
result = case Factory.resource_shape(val[0])
|
|
401
|
+
when :resource, :class
|
|
402
|
+
Factory.RESOURCE(Factory.fqn(token_text(val[0])), val[2])
|
|
403
|
+
when :defaults
|
|
404
|
+
error "A resource default can not specify a resource name"
|
|
405
|
+
when :override
|
|
406
|
+
error "A resource override does not allow override of name of resource"
|
|
407
|
+
else
|
|
408
|
+
error "Expression is not valid as a resource, resource-default, or resource-override"
|
|
409
|
+
end
|
|
410
|
+
loc result, val[0], val[4]
|
|
411
|
+
}
|
|
412
|
+
| expression LBRACE attribute_operations endcomma RBRACE {
|
|
413
|
+
result = case Factory.resource_shape(val[0])
|
|
414
|
+
when :resource, :class
|
|
415
|
+
# This catches deprecated syntax.
|
|
416
|
+
error "All resource specifications require names"
|
|
417
|
+
when :defaults
|
|
418
|
+
Factory.RESOURCE_DEFAULTS(val[0], val[2])
|
|
419
|
+
when :override
|
|
420
|
+
# This was only done for override in original - TODO shuld it be here at all
|
|
421
|
+
Factory.RESOURCE_OVERRIDE(val[0], val[2])
|
|
422
|
+
else
|
|
423
|
+
error "Expression is not valid as a resource, resource-default, or resource-override"
|
|
424
|
+
end
|
|
425
|
+
loc result, val[0], val[4]
|
|
426
|
+
}
|
|
427
|
+
| CLASS LBRACE resourceinstances endsemi RBRACE {
|
|
428
|
+
result = Factory.RESOURCE(Factory.fqn(token_text(val[0])), val[2])
|
|
429
|
+
loc result, val[0], val[4]
|
|
430
|
+
}
|
|
431
|
+
|
|
432
|
+
resourceinst
|
|
433
|
+
: expression title_colon attribute_operations endcomma { result = Factory.RESOURCE_BODY(val[0], val[2]) }
|
|
434
|
+
|
|
435
|
+
title_colon : COLON =TITLE_COLON { result = val[0] }
|
|
436
|
+
|
|
437
|
+
resourceinstances
|
|
438
|
+
: resourceinst { result = [val[0]] }
|
|
439
|
+
| resourceinstances SEMIC resourceinst { result = val[0].push val[2] }
|
|
440
|
+
|
|
441
|
+
# Produces Symbol corresponding to resource form
|
|
442
|
+
#
|
|
443
|
+
at
|
|
444
|
+
: AT { result = :virtual }
|
|
445
|
+
| AT AT { result = :exported }
|
|
446
|
+
|
|
447
|
+
#---COLLECTION
|
|
448
|
+
#
|
|
449
|
+
# A Collection is a predicate applied to a set of objects with an implied context (used variables are
|
|
450
|
+
# attributes of the object.
|
|
451
|
+
# i.e. this is equivalent for source.select(QUERY).apply(ATTRIBUTE_OPERATIONS)
|
|
452
|
+
#
|
|
453
|
+
# Produces Model::CollectExpression
|
|
454
|
+
#
|
|
455
|
+
collection_expression
|
|
456
|
+
: expression collect_query LBRACE attribute_operations endcomma RBRACE {
|
|
457
|
+
result = Factory.COLLECT(val[0], val[1], val[3])
|
|
458
|
+
loc result, val[0], val[5]
|
|
459
|
+
}
|
|
460
|
+
| expression collect_query =LOW {
|
|
461
|
+
result = Factory.COLLECT(val[0], val[1], [])
|
|
462
|
+
loc result, val[0], val[1]
|
|
463
|
+
}
|
|
464
|
+
|
|
465
|
+
collect_query
|
|
466
|
+
: LCOLLECT optional_query RCOLLECT { result = Factory.VIRTUAL_QUERY(val[1]) ; loc result, val[0], val[2] }
|
|
467
|
+
| LLCOLLECT optional_query RRCOLLECT { result = Factory.EXPORTED_QUERY(val[1]) ; loc result, val[0], val[2] }
|
|
468
|
+
|
|
469
|
+
optional_query
|
|
470
|
+
: nil
|
|
471
|
+
| expression
|
|
472
|
+
|
|
473
|
+
#---ATTRIBUTE OPERATIONS
|
|
474
|
+
#
|
|
475
|
+
# (Not an expression)
|
|
476
|
+
#
|
|
477
|
+
# Produces Array<Model::AttributeOperation>
|
|
478
|
+
#
|
|
479
|
+
attribute_operations
|
|
480
|
+
: { result = [] }
|
|
481
|
+
| attribute_operation { result = [val[0]] }
|
|
482
|
+
| attribute_operations COMMA attribute_operation { result = val[0].push(val[2]) }
|
|
483
|
+
|
|
484
|
+
# Produces String
|
|
485
|
+
# QUESTION: Why is BOOLEAN valid as an attribute name?
|
|
486
|
+
#
|
|
487
|
+
attribute_name
|
|
488
|
+
: NAME
|
|
489
|
+
| keyword
|
|
490
|
+
| BOOLEAN
|
|
491
|
+
|
|
492
|
+
# In this version, illegal combinations are validated instead of producing syntax errors
|
|
493
|
+
# (Can give nicer error message "+> is not applicable to...")
|
|
494
|
+
# Produces Model::AttributeOperation
|
|
495
|
+
#
|
|
496
|
+
attribute_operation
|
|
497
|
+
: attribute_name FARROW expression {
|
|
498
|
+
result = Factory.ATTRIBUTE_OP(val[0][:value], :'=>', val[2])
|
|
499
|
+
loc result, val[0], val[2]
|
|
500
|
+
}
|
|
501
|
+
| attribute_name PARROW expression {
|
|
502
|
+
result = Factory.ATTRIBUTE_OP(val[0][:value], :'+>', val[2])
|
|
503
|
+
loc result, val[0], val[2]
|
|
504
|
+
}
|
|
505
|
+
|
|
506
|
+
#---DEFINE
|
|
507
|
+
#
|
|
508
|
+
# Produces Model::Definition
|
|
509
|
+
#
|
|
510
|
+
definition_expression
|
|
511
|
+
: DEFINE classname parameter_list LBRACE statements RBRACE {
|
|
512
|
+
result = Factory.DEFINITION(classname(val[1][:value]), val[2], val[4])
|
|
513
|
+
loc result, val[0], val[5]
|
|
514
|
+
@lexer.indefine = false
|
|
515
|
+
}
|
|
516
|
+
| DEFINE classname parameter_list LBRACE RBRACE {
|
|
517
|
+
result = Factory.DEFINITION(classname(val[1][:value]), val[2], nil)
|
|
518
|
+
loc result, val[0], val[4]
|
|
519
|
+
@lexer.indefine = false
|
|
520
|
+
}
|
|
521
|
+
|
|
522
|
+
#---HOSTCLASS
|
|
523
|
+
# ORIGINAL COMMENT: Our class gets defined in the parent namespace, not our own.
|
|
524
|
+
# WAT ??! This is way odd; should get its complete name, classnames do not nest
|
|
525
|
+
# Seems like the call to classname makes use of the name scope
|
|
526
|
+
# (This is uneccesary, since the parent name is known when evaluating)
|
|
527
|
+
#
|
|
528
|
+
# Produces Model::HostClassDefinition
|
|
529
|
+
#
|
|
530
|
+
hostclass_expression
|
|
531
|
+
: CLASS classname parameter_list classparent LBRACE statements RBRACE {
|
|
532
|
+
@lexer.namepop
|
|
533
|
+
result = Factory.HOSTCLASS(classname(val[1][:value]), val[2], token_text(val[3]), val[5])
|
|
534
|
+
loc result, val[0], val[6]
|
|
535
|
+
}
|
|
536
|
+
| CLASS classname parameter_list classparent LBRACE RBRACE {
|
|
537
|
+
@lexer.namepop
|
|
538
|
+
result = Factory.HOSTCLASS(classname(val[1][:value]), val[2], token_text(val[3]), nil)
|
|
539
|
+
loc result, val[0], val[5]
|
|
540
|
+
}
|
|
541
|
+
|
|
542
|
+
# Produces String, name or nil result
|
|
543
|
+
classparent
|
|
544
|
+
: nil
|
|
545
|
+
| INHERITS classnameordefault { result = val[1] }
|
|
546
|
+
|
|
547
|
+
# Produces String (this construct allows a class to be named "default" and to be referenced as
|
|
548
|
+
# the parent class.
|
|
549
|
+
# TODO: Investigate the validity
|
|
550
|
+
# Produces a String (classname), or a token (DEFAULT).
|
|
551
|
+
#
|
|
552
|
+
classnameordefault
|
|
553
|
+
: classname
|
|
554
|
+
| DEFAULT
|
|
555
|
+
|
|
556
|
+
#---NODE
|
|
557
|
+
#
|
|
558
|
+
# Produces Model::NodeDefinition
|
|
559
|
+
#
|
|
560
|
+
node_definition_expression
|
|
561
|
+
: NODE hostnames nodeparent LBRACE statements RBRACE {
|
|
562
|
+
result = Factory.NODE(val[1], val[2], val[4])
|
|
563
|
+
loc result, val[0], val[5]
|
|
564
|
+
}
|
|
565
|
+
| NODE hostnames nodeparent LBRACE RBRACE {
|
|
566
|
+
result = Factory.NODE(val[1], val[2], nil)
|
|
567
|
+
loc result, val[0], val[4]
|
|
568
|
+
}
|
|
569
|
+
|
|
570
|
+
# Hostnames is not a list of names, it is a list of name matchers (including a Regexp).
|
|
571
|
+
# (The old implementation had a special "Hostname" object with some minimal validation)
|
|
572
|
+
#
|
|
573
|
+
# Produces Array<Model::LiteralExpression>
|
|
574
|
+
#
|
|
575
|
+
hostnames
|
|
576
|
+
: hostname { result = [result] }
|
|
577
|
+
| hostnames COMMA hostname { result = val[0].push(val[2]) }
|
|
578
|
+
|
|
579
|
+
# Produces a LiteralExpression (string, :default, or regexp)
|
|
580
|
+
# String with interpolation is validated for better error message
|
|
581
|
+
hostname
|
|
582
|
+
: NAME { result = Factory.fqn(val[0][:value]); loc result, val[0] }
|
|
583
|
+
| quotedtext { result = val[0] }
|
|
584
|
+
| DEFAULT { result = Factory.literal(:default); loc result, val[0] }
|
|
585
|
+
| regex
|
|
586
|
+
|
|
587
|
+
# Produces Expression, since hostname is an Expression
|
|
588
|
+
nodeparent
|
|
589
|
+
: nil
|
|
590
|
+
| INHERITS hostname { result = val[1] }
|
|
591
|
+
|
|
592
|
+
#---NAMES AND PARAMTERS COMMON TO SEVERAL RULES
|
|
593
|
+
# String result
|
|
594
|
+
classname
|
|
595
|
+
: NAME { result = val[0] }
|
|
596
|
+
| CLASS { result = val[0] }
|
|
597
|
+
|
|
598
|
+
# Produces Array<Model::Parameter>
|
|
599
|
+
parameter_list
|
|
600
|
+
: nil { result = [] }
|
|
601
|
+
| LPAREN RPAREN { result = [] }
|
|
602
|
+
| LPAREN parameters endcomma RPAREN { result = val[1] }
|
|
603
|
+
|
|
604
|
+
# Produces Array<Model::Parameter>
|
|
605
|
+
parameters
|
|
606
|
+
: parameter { result = [val[0]] }
|
|
607
|
+
| parameters COMMA parameter { result = val[0].push(val[2]) }
|
|
608
|
+
|
|
609
|
+
# Produces Model::Parameter
|
|
610
|
+
parameter
|
|
611
|
+
: VARIABLE EQUALS expression { result = Factory.PARAM(val[0][:value], val[2]) ; loc result, val[0] }
|
|
612
|
+
| VARIABLE { result = Factory.PARAM(val[0][:value]); loc result, val[0] }
|
|
613
|
+
|
|
614
|
+
#--RESTRICTED EXPRESSIONS
|
|
615
|
+
# i.e. where one could have expected an expression, but the set is limited
|
|
616
|
+
|
|
617
|
+
# What is allowed RHS of match operators (see expression)
|
|
618
|
+
match_rvalue
|
|
619
|
+
: regex
|
|
620
|
+
| text_or_name
|
|
621
|
+
|
|
622
|
+
#--VARIABLE
|
|
623
|
+
#
|
|
624
|
+
variable
|
|
625
|
+
: VARIABLE { result = Factory.fqn(val[0][:value]).var ; loc result, val[0] }
|
|
626
|
+
|
|
627
|
+
#---LITERALS (dynamic and static)
|
|
628
|
+
#
|
|
629
|
+
|
|
630
|
+
array
|
|
631
|
+
: LBRACK expressions RBRACK { result = Factory.LIST(val[1]); loc result, val[0], val[2] }
|
|
632
|
+
| LBRACK expressions COMMA RBRACK { result = Factory.LIST(val[1]); loc result, val[0], val[3] }
|
|
633
|
+
| LBRACK RBRACK { result = Factory.literal([]) ; loc result, val[0] }
|
|
634
|
+
|
|
635
|
+
hash
|
|
636
|
+
: LBRACE hashpairs RBRACE { result = Factory.HASH(val[1]); loc result, val[0], val[2] }
|
|
637
|
+
| LBRACE hashpairs COMMA RBRACE { result = Factory.HASH(val[1]); loc result, val[0], val[3] }
|
|
638
|
+
| LBRACE RBRACE { result = Factory.literal({}) ; loc result, val[0], val[3] }
|
|
639
|
+
|
|
640
|
+
hashpairs
|
|
641
|
+
: hashpair { result = [val[0]] }
|
|
642
|
+
| hashpairs COMMA hashpair { result = val[0].push val[2] }
|
|
643
|
+
|
|
644
|
+
hashpair
|
|
645
|
+
: text_or_name FARROW expression { result = Factory.KEY_ENTRY(val[0], val[2]); loc result, val[1] }
|
|
646
|
+
|
|
647
|
+
quotedtext
|
|
648
|
+
: string
|
|
649
|
+
| dq_string
|
|
650
|
+
|
|
651
|
+
string : STRING { result = Factory.literal(val[0][:value]) ; loc result, val[0] }
|
|
652
|
+
dq_string : dqpre dqrval { result = Factory.string(val[0], *val[1]) ; loc result, val[0], val[1][-1] }
|
|
653
|
+
dqpre : DQPRE { result = Factory.literal(val[0][:value]); loc result, val[0] }
|
|
654
|
+
dqpost : DQPOST { result = Factory.literal(val[0][:value]); loc result, val[0] }
|
|
655
|
+
dqmid : DQMID { result = Factory.literal(val[0][:value]); loc result, val[0] }
|
|
656
|
+
dqrval : text_expression dqtail { result = [val[0]] + val[1] }
|
|
657
|
+
text_expression : expression { result = Factory.TEXT(val[0]) }
|
|
658
|
+
|
|
659
|
+
dqtail
|
|
660
|
+
: dqpost { result = [val[0]] }
|
|
661
|
+
| dqmid dqrval { result = [val[0]] + val[1] }
|
|
662
|
+
|
|
663
|
+
name : NAME { result = Factory.QNAME_OR_NUMBER(val[0][:value]) ; loc result, val[0] }
|
|
664
|
+
type : CLASSREF { result = Factory.QREF(val[0][:value]) ; loc result, val[0] }
|
|
665
|
+
undef : UNDEF { result = Factory.literal(:undef); loc result, val[0] }
|
|
666
|
+
default : DEFAULT { result = Factory.literal(:default); loc result, val[0] }
|
|
667
|
+
|
|
668
|
+
# Assumes lexer produces a Boolean value for booleans, or this will go wrong and produce a literal string
|
|
669
|
+
# with the text 'true'.
|
|
670
|
+
#TODO: could be changed to a specific boolean literal factory method to prevent this possible glitch.
|
|
671
|
+
boolean : BOOLEAN { result = Factory.literal(val[0][:value]) ; loc result, val[0] }
|
|
672
|
+
|
|
673
|
+
regex
|
|
674
|
+
: REGEX { result = Factory.literal(val[0][:value]); loc result, val[0] }
|
|
675
|
+
|
|
676
|
+
#---MARKERS, SPECIAL TOKENS, SYNTACTIC SUGAR, etc.
|
|
677
|
+
|
|
678
|
+
endcomma
|
|
679
|
+
: #
|
|
680
|
+
| COMMA { result = nil }
|
|
681
|
+
|
|
682
|
+
endsemi
|
|
683
|
+
: #
|
|
684
|
+
| SEMIC
|
|
685
|
+
|
|
686
|
+
keyword
|
|
687
|
+
: AND
|
|
688
|
+
| CASE
|
|
689
|
+
| CLASS
|
|
690
|
+
| DEFAULT
|
|
691
|
+
| DEFINE
|
|
692
|
+
| ELSE
|
|
693
|
+
| ELSIF
|
|
694
|
+
| IF
|
|
695
|
+
| IN
|
|
696
|
+
| INHERITS
|
|
697
|
+
| NODE
|
|
698
|
+
| OR
|
|
699
|
+
| UNDEF
|
|
700
|
+
| UNLESS
|
|
701
|
+
|
|
702
|
+
nil
|
|
703
|
+
: { result = nil}
|
|
704
|
+
|
|
705
|
+
end
|
|
706
|
+
|
|
707
|
+
---- header ----
|
|
708
|
+
require 'puppet'
|
|
709
|
+
require 'puppet/util/loadedfile'
|
|
710
|
+
require 'puppet/pops'
|
|
711
|
+
|
|
712
|
+
module Puppet
|
|
713
|
+
class ParseError < Puppet::Error; end
|
|
714
|
+
class ImportError < Racc::ParseError; end
|
|
715
|
+
class AlreadyImportedError < ImportError; end
|
|
716
|
+
end
|
|
717
|
+
|
|
718
|
+
---- inner ----
|
|
719
|
+
|
|
720
|
+
# Make emacs happy
|
|
721
|
+
# Local Variables:
|
|
722
|
+
# mode: ruby
|
|
723
|
+
# End:
|