puppet 3.6.2 → 3.7.0
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of puppet might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/CONTRIBUTING.md +2 -3
- data/Gemfile +14 -10
- data/README.md +1 -1
- data/ext/build_defaults.yaml +16 -1
- data/ext/debian/control +3 -2
- data/ext/debian/puppet-common.dirs +1 -0
- data/ext/debian/puppet-common.postinst +8 -8
- data/ext/debian/puppet-common.postrm +2 -1
- data/ext/project_data.yaml +16 -12
- data/ext/rack/example-passenger-vhost.conf +2 -2
- data/ext/redhat/puppet.spec.erb +6 -3
- data/ext/windows/service/daemon.rb +47 -41
- data/install.rb +1 -1
- data/lib/puppet.rb +34 -24
- data/lib/puppet/application.rb +34 -1
- data/lib/puppet/application/agent.rb +9 -8
- data/lib/puppet/application/apply.rb +14 -5
- data/lib/puppet/application/doc.rb +4 -11
- data/lib/puppet/application/master.rb +19 -17
- data/lib/puppet/application/queue.rb +1 -1
- data/lib/puppet/application/resource.rb +0 -1
- data/lib/puppet/configurer.rb +39 -2
- data/lib/puppet/configurer/downloader.rb +5 -10
- data/lib/puppet/configurer/downloader_factory.rb +34 -0
- data/lib/puppet/configurer/plugin_handler.rb +11 -17
- data/lib/puppet/defaults.rb +244 -119
- data/lib/puppet/environments.rb +8 -0
- data/lib/puppet/external/nagios/base.rb +1 -1
- data/lib/puppet/external/pson/pure/generator.rb +1 -8
- data/lib/puppet/face/ca.rb +7 -0
- data/lib/puppet/face/file/download.rb +5 -2
- data/lib/puppet/face/file/store.rb +1 -1
- data/lib/puppet/face/instrumentation_data.rb +2 -1
- data/lib/puppet/face/instrumentation_listener.rb +2 -1
- data/lib/puppet/face/instrumentation_probe.rb +2 -1
- data/lib/puppet/face/module/build.rb +2 -2
- data/lib/puppet/face/module/generate.rb +20 -12
- data/lib/puppet/face/module/install.rb +4 -3
- data/lib/puppet/face/module/uninstall.rb +7 -0
- data/lib/puppet/face/module/upgrade.rb +11 -3
- data/lib/puppet/face/node/clean.rb +1 -1
- data/lib/puppet/face/parser.rb +99 -7
- data/lib/puppet/feature/base.rb +18 -12
- data/lib/puppet/feature/cfacter.rb +14 -0
- data/lib/puppet/feature/pe_license.rb +4 -0
- data/lib/puppet/file_bucket/dipper.rb +19 -12
- data/lib/puppet/file_bucket/file.rb +73 -10
- data/lib/puppet/file_serving/configuration/parser.rb +3 -3
- data/lib/puppet/file_system.rb +1 -1
- data/lib/puppet/file_system/file19.rb +41 -0
- data/lib/puppet/file_system/file19windows.rb +0 -1
- data/lib/puppet/file_system/uniquefile.rb +190 -0
- data/lib/puppet/forge.rb +34 -7
- data/lib/puppet/forge/errors.rb +5 -6
- data/lib/puppet/forge/repository.rb +14 -2
- data/lib/puppet/functions.rb +19 -12
- data/lib/puppet/functions/assert_type.rb +27 -10
- data/lib/puppet/functions/each.rb +111 -0
- data/lib/puppet/functions/epp.rb +54 -0
- data/lib/puppet/functions/filter.rb +113 -0
- data/lib/puppet/functions/inline_epp.rb +88 -0
- data/lib/puppet/functions/map.rb +97 -0
- data/lib/puppet/functions/match.rb +102 -0
- data/lib/puppet/functions/reduce.rb +94 -0
- data/lib/puppet/functions/slice.rb +126 -0
- data/lib/puppet/functions/with.rb +23 -0
- data/lib/puppet/indirector/catalog/compiler.rb +4 -4
- data/lib/puppet/indirector/data_binding/hiera.rb +2 -45
- data/lib/puppet/indirector/facts/couch.rb +3 -1
- data/lib/puppet/indirector/facts/facter.rb +52 -65
- data/lib/puppet/indirector/file_bucket_file/file.rb +6 -3
- data/lib/puppet/indirector/hiera.rb +48 -0
- data/lib/puppet/indirector/indirection.rb +1 -1
- data/lib/puppet/indirector/request.rb +9 -3
- data/lib/puppet/indirector/resource/ral.rb +1 -1
- data/lib/puppet/indirector/rest.rb +7 -3
- data/lib/puppet/loaders.rb +0 -1
- data/lib/puppet/module.rb +2 -1
- data/lib/puppet/module_tool.rb +2 -0
- data/lib/puppet/module_tool/applications/application.rb +4 -5
- data/lib/puppet/module_tool/applications/builder.rb +64 -5
- data/lib/puppet/module_tool/applications/uninstaller.rb +3 -2
- data/lib/puppet/module_tool/applications/unpacker.rb +14 -0
- data/lib/puppet/module_tool/applications/upgrader.rb +23 -13
- data/lib/puppet/module_tool/dependency.rb +12 -0
- data/lib/puppet/module_tool/errors/shared.rb +1 -1
- data/lib/puppet/module_tool/errors/upgrader.rb +20 -0
- data/lib/puppet/module_tool/installed_modules.rb +6 -1
- data/lib/puppet/module_tool/metadata.rb +53 -3
- data/lib/puppet/module_tool/modulefile.rb +1 -1
- data/lib/puppet/module_tool/skeleton/templates/generator/Gemfile +7 -0
- data/lib/puppet/module_tool/skeleton/templates/generator/manifests/init.pp.erb +1 -1
- data/lib/puppet/module_tool/skeleton/templates/generator/spec/spec_helper.rb +1 -17
- data/lib/puppet/module_tool/tar/mini.rb +20 -2
- data/lib/puppet/network/http.rb +5 -0
- data/lib/puppet/network/http/api/v1.rb +2 -2
- data/lib/puppet/network/http/api/v2/environments.rb +15 -1
- data/lib/puppet/network/http/connection.rb +54 -68
- data/lib/puppet/network/http/factory.rb +44 -0
- data/lib/puppet/network/http/handler.rb +12 -6
- data/lib/puppet/network/http/nocache_pool.rb +21 -0
- data/lib/puppet/network/http/pool.rb +120 -0
- data/lib/puppet/network/http/rack/rest.rb +3 -1
- data/lib/puppet/network/http/session.rb +17 -0
- data/lib/puppet/network/http/site.rb +39 -0
- data/lib/puppet/network/http/webrick/rest.rb +3 -1
- data/lib/puppet/network/http_pool.rb +3 -4
- data/lib/puppet/node.rb +19 -6
- data/lib/puppet/node/environment.rb +34 -8
- data/lib/puppet/parser/ast/collection.rb +4 -0
- data/lib/puppet/parser/ast/collexpr.rb +1 -1
- data/lib/puppet/parser/ast/node.rb +5 -0
- data/lib/puppet/parser/ast/pops_bridge.rb +49 -6
- data/lib/puppet/parser/compiler.rb +66 -38
- data/lib/puppet/parser/e4_parser_adapter.rb +2 -2
- data/lib/puppet/parser/files.rb +76 -33
- data/lib/puppet/parser/functions.rb +1 -7
- data/lib/puppet/parser/functions/assert_type.rb +31 -0
- data/lib/puppet/parser/functions/contain.rb +15 -5
- data/lib/puppet/parser/functions/create_resources.rb +5 -1
- data/lib/puppet/parser/functions/digest.rb +5 -0
- data/lib/puppet/parser/functions/each.rb +46 -107
- data/lib/puppet/parser/functions/epp.rb +13 -9
- data/lib/puppet/parser/functions/file.rb +20 -12
- data/lib/puppet/parser/functions/filter.rb +32 -88
- data/lib/puppet/parser/functions/include.rb +12 -24
- data/lib/puppet/parser/functions/inline_epp.rb +9 -12
- data/lib/puppet/parser/functions/lookup.rb +1 -1
- data/lib/puppet/parser/functions/map.rb +30 -83
- data/lib/puppet/parser/functions/match.rb +28 -0
- data/lib/puppet/parser/functions/reduce.rb +69 -98
- data/lib/puppet/parser/functions/require.rb +13 -5
- data/lib/puppet/parser/functions/search.rb +6 -1
- data/lib/puppet/parser/functions/slice.rb +35 -103
- data/lib/puppet/parser/functions/template.rb +12 -5
- data/lib/puppet/parser/functions/with.rb +21 -0
- data/lib/puppet/parser/lexer.rb +1 -1
- data/lib/puppet/parser/parser_factory.rb +21 -33
- data/lib/puppet/parser/resource.rb +2 -3
- data/lib/puppet/parser/scope.rb +85 -15
- data/lib/puppet/pops.rb +9 -11
- data/lib/puppet/pops/adapters.rb +2 -1
- data/lib/puppet/pops/binder/bindings_checker.rb +4 -4
- data/lib/puppet/pops/binder/bindings_factory.rb +6 -6
- data/lib/puppet/pops/binder/bindings_label_provider.rb +1 -1
- data/lib/puppet/pops/binder/bindings_loader.rb +2 -2
- data/lib/puppet/pops/binder/bindings_model.rb +58 -191
- data/lib/puppet/pops/binder/bindings_model_dumper.rb +1 -1
- data/lib/puppet/pops/binder/bindings_model_meta.rb +215 -0
- data/lib/puppet/pops/binder/injector.rb +9 -9
- data/lib/puppet/pops/binder/key_factory.rb +2 -2
- data/lib/puppet/pops/binder/lookup.rb +14 -6
- data/lib/puppet/pops/binder/producers.rb +9 -12
- data/lib/puppet/pops/evaluator/access_operator.rb +35 -29
- data/lib/puppet/pops/evaluator/callable_mismatch_describer.rb +175 -0
- data/lib/puppet/pops/evaluator/callable_signature.rb +1 -2
- data/lib/puppet/pops/evaluator/closure.rb +151 -35
- data/lib/puppet/pops/evaluator/compare_operator.rb +26 -22
- data/lib/puppet/pops/evaluator/epp_evaluator.rb +16 -15
- data/lib/puppet/pops/evaluator/evaluator_impl.rb +277 -229
- data/lib/puppet/pops/evaluator/relationship_operator.rb +3 -2
- data/lib/puppet/pops/evaluator/runtime3_support.rb +86 -53
- data/lib/puppet/pops/functions/dispatch.rb +9 -4
- data/lib/puppet/pops/functions/dispatcher.rb +2 -169
- data/lib/puppet/pops/issue_reporter.rb +14 -6
- data/lib/puppet/pops/issues.rb +96 -21
- data/lib/puppet/pops/loader/base_loader.rb +3 -3
- data/lib/puppet/pops/loader/loader.rb +1 -1
- data/lib/puppet/pops/loader/loader_paths.rb +2 -21
- data/lib/puppet/pops/loader/ruby_function_instantiator.rb +1 -1
- data/lib/puppet/pops/loader/static_loader.rb +12 -2
- data/lib/puppet/pops/model/ast_transformer.rb +4 -24
- data/lib/puppet/pops/model/factory.rb +72 -10
- data/lib/puppet/pops/model/model.rb +82 -574
- data/lib/puppet/pops/model/model_label_provider.rb +4 -2
- data/lib/puppet/pops/model/model_meta.rb +576 -0
- data/lib/puppet/pops/model/model_tree_dumper.rb +27 -5
- data/lib/puppet/pops/parser/egrammar.ra +209 -221
- data/lib/puppet/pops/parser/eparser.rb +1459 -1431
- data/lib/puppet/pops/parser/evaluating_parser.rb +15 -75
- data/lib/puppet/pops/parser/lexer2.rb +14 -10
- data/lib/puppet/pops/parser/lexer_support.rb +6 -0
- data/lib/puppet/pops/parser/locator.rb +1 -1
- data/lib/puppet/pops/parser/parser_support.rb +31 -49
- data/lib/puppet/pops/patterns.rb +10 -10
- data/lib/puppet/pops/semantic_error.rb +1 -1
- data/lib/puppet/pops/types/class_loader.rb +24 -13
- data/lib/puppet/pops/types/type_calculator.rb +188 -87
- data/lib/puppet/pops/types/type_factory.rb +79 -53
- data/lib/puppet/pops/types/type_parser.rb +22 -16
- data/lib/puppet/pops/types/types.rb +283 -392
- data/lib/puppet/pops/types/types_meta.rb +223 -0
- data/lib/puppet/pops/utils.rb +16 -14
- data/lib/puppet/pops/validation/checker4_0.rb +264 -18
- data/lib/puppet/pops/validation/validator_factory_4_0.rb +0 -1
- data/lib/puppet/pops/visitor.rb +0 -103
- data/lib/puppet/provider/exec.rb +10 -1
- data/lib/puppet/provider/file/windows.rb +3 -4
- data/lib/puppet/provider/group/windows_adsi.rb +10 -10
- data/lib/puppet/provider/nameservice/directoryservice.rb +3 -4
- data/lib/puppet/provider/package/apt.rb +5 -1
- data/lib/puppet/provider/package/gem.rb +7 -3
- data/lib/puppet/provider/package/openbsd.rb +84 -7
- data/lib/puppet/provider/package/pacman.rb +29 -4
- data/lib/puppet/provider/package/rpm.rb +5 -7
- data/lib/puppet/provider/package/sun.rb +5 -1
- data/lib/puppet/provider/package/windows.rb +6 -1
- data/lib/puppet/provider/package/windows/exe_package.rb +1 -1
- data/lib/puppet/provider/package/windows/msi_package.rb +1 -1
- data/lib/puppet/provider/package/windows/package.rb +13 -1
- data/lib/puppet/provider/package/yum.rb +7 -3
- data/lib/puppet/provider/package/zypper.rb +5 -1
- data/lib/puppet/provider/parsedfile.rb +17 -1
- data/lib/puppet/provider/scheduled_task/win32_taskscheduler.rb +6 -12
- data/lib/puppet/provider/service/freebsd.rb +12 -12
- data/lib/puppet/provider/service/init.rb +5 -0
- data/lib/puppet/provider/service/launchd.rb +0 -3
- data/lib/puppet/provider/service/openbsd.rb +8 -7
- data/lib/puppet/provider/ssh_authorized_key/parsed.rb +2 -2
- data/lib/puppet/provider/sshkey/parsed.rb +5 -0
- data/lib/puppet/provider/user/user_role_add.rb +5 -4
- data/lib/puppet/provider/user/windows_adsi.rb +8 -8
- data/lib/puppet/provider/zone/solaris.rb +1 -1
- data/lib/puppet/reference/metaparameter.rb +8 -6
- data/lib/puppet/reports/store.rb +4 -9
- data/lib/puppet/resource.rb +75 -11
- data/lib/puppet/resource/catalog.rb +9 -7
- data/lib/puppet/resource/type.rb +27 -0
- data/lib/puppet/settings.rb +61 -41
- data/lib/puppet/settings/base_setting.rb +9 -3
- data/lib/puppet/settings/environment_conf.rb +32 -4
- data/lib/puppet/settings/file_setting.rb +9 -1
- data/lib/puppet/settings/priority_setting.rb +5 -5
- data/lib/puppet/ssl.rb +1 -0
- data/lib/puppet/ssl/certificate_authority.rb +15 -6
- data/lib/puppet/ssl/certificate_authority/autosign_command.rb +2 -1
- data/lib/puppet/ssl/host.rb +3 -2
- data/lib/puppet/ssl/inventory.rb +11 -6
- data/lib/puppet/ssl/validator/default_validator.rb +1 -0
- data/lib/puppet/ssl/validator/no_validator.rb +3 -0
- data/lib/puppet/transaction.rb +29 -0
- data/lib/puppet/transaction/resource_harness.rb +16 -3
- data/lib/puppet/type.rb +71 -49
- data/lib/puppet/type/exec.rb +36 -8
- data/lib/puppet/type/file.rb +56 -16
- data/lib/puppet/type/file/content.rb +3 -3
- data/lib/puppet/type/file/mode.rb +12 -3
- data/lib/puppet/type/file/source.rb +4 -1
- data/lib/puppet/type/group.rb +1 -1
- data/lib/puppet/type/mount.rb +1 -3
- data/lib/puppet/type/resources.rb +59 -35
- data/lib/puppet/type/ssh_authorized_key.rb +54 -16
- data/lib/puppet/type/sshkey.rb +1 -1
- data/lib/puppet/type/user.rb +17 -11
- data/lib/puppet/type/yumrepo.rb +59 -8
- data/lib/puppet/type/zone.rb +3 -6
- data/lib/puppet/util.rb +64 -55
- data/lib/puppet/util/autoload.rb +2 -2
- data/lib/puppet/util/colors.rb +61 -19
- data/lib/puppet/util/command_line.rb +21 -4
- data/lib/puppet/util/execution.rb +41 -29
- data/lib/puppet/util/feature.rb +15 -4
- data/lib/puppet/util/filetype.rb +6 -2
- data/lib/puppet/util/http_proxy.rb +29 -2
- data/lib/puppet/util/lockfile.rb +1 -1
- data/lib/puppet/util/log/destinations.rb +7 -3
- data/lib/puppet/util/logging.rb +44 -14
- data/lib/puppet/util/pidlock.rb +11 -5
- data/lib/puppet/util/posix.rb +21 -31
- data/lib/puppet/util/profiler.rb +17 -9
- data/lib/puppet/util/profiler/aggregate.rb +85 -0
- data/lib/puppet/util/profiler/around_profiler.rb +67 -0
- data/lib/puppet/util/profiler/logging.rb +12 -11
- data/lib/puppet/util/profiler/wall_clock.rb +7 -6
- data/lib/puppet/util/rdoc.rb +8 -1
- data/lib/puppet/util/rdoc/parser/puppet_parser_core.rb +1 -1
- data/lib/puppet/util/suidmanager.rb +1 -8
- data/lib/puppet/util/windows.rb +14 -3
- data/lib/puppet/util/windows/access_control_list.rb +4 -4
- data/lib/puppet/util/{adsi.rb → windows/adsi.rb} +99 -37
- data/lib/puppet/util/windows/api_types.rb +255 -0
- data/lib/puppet/util/windows/com.rb +224 -0
- data/lib/puppet/util/windows/error.rb +72 -5
- data/lib/puppet/util/windows/file.rb +254 -132
- data/lib/puppet/util/windows/process.rb +293 -177
- data/lib/puppet/util/windows/registry.rb +12 -2
- data/lib/puppet/util/windows/root_certs.rb +16 -9
- data/lib/puppet/util/windows/security.rb +501 -232
- data/lib/puppet/util/windows/sid.rb +80 -36
- data/lib/puppet/util/windows/string.rb +2 -0
- data/lib/puppet/util/windows/taskscheduler.rb +1241 -0
- data/lib/puppet/util/windows/user.rb +241 -57
- data/lib/puppet/vendor.rb +3 -1
- data/lib/puppet/vendor/load_pathspec.rb +1 -0
- data/lib/puppet/vendor/load_rgen.rb +1 -0
- data/lib/puppet/vendor/pathspec/CHANGELOG.md +2 -0
- data/lib/puppet/vendor/pathspec/LICENSE +201 -0
- data/lib/puppet/vendor/pathspec/PUPPET_README.md +6 -0
- data/lib/puppet/vendor/pathspec/README.md +53 -0
- data/lib/puppet/vendor/pathspec/lib/pathspec.rb +121 -0
- data/lib/puppet/vendor/pathspec/lib/pathspec/gitignorespec.rb +275 -0
- data/lib/puppet/vendor/pathspec/lib/pathspec/regexspec.rb +17 -0
- data/lib/puppet/vendor/pathspec/lib/pathspec/spec.rb +14 -0
- data/lib/puppet/vendor/require_vendored.rb +2 -0
- data/lib/puppet/vendor/rgen/CHANGELOG +197 -0
- data/lib/puppet/vendor/rgen/MIT-LICENSE +20 -0
- data/lib/puppet/vendor/rgen/PUPPET_README.md +6 -0
- data/lib/puppet/vendor/rgen/README.rdoc +78 -0
- data/lib/puppet/vendor/rgen/Rakefile +41 -0
- data/lib/puppet/vendor/rgen/TODO +41 -0
- data/lib/puppet/vendor/rgen/anounce.txt +61 -0
- data/lib/puppet/vendor/rgen/design_rationale.txt +71 -0
- data/lib/puppet/vendor/rgen/lib/ea_support/ea_support.rb +54 -0
- data/lib/puppet/vendor/rgen/lib/ea_support/id_store.rb +32 -0
- data/lib/puppet/vendor/rgen/lib/ea_support/uml13_ea_metamodel.rb +562 -0
- data/lib/puppet/vendor/rgen/lib/ea_support/uml13_ea_metamodel_ext.rb +45 -0
- data/lib/puppet/vendor/rgen/lib/ea_support/uml13_ea_metamodel_generator.rb +43 -0
- data/lib/puppet/vendor/rgen/lib/ea_support/uml13_ea_to_uml13.rb +103 -0
- data/lib/puppet/vendor/rgen/lib/ea_support/uml13_to_uml13_ea.rb +89 -0
- data/lib/puppet/vendor/rgen/lib/metamodels/uml13_metamodel.rb +559 -0
- data/lib/puppet/vendor/rgen/lib/metamodels/uml13_metamodel_ext.rb +26 -0
- data/lib/puppet/vendor/rgen/lib/mmgen/metamodel_generator.rb +20 -0
- data/lib/puppet/vendor/rgen/lib/mmgen/mm_ext/ecore_mmgen_ext.rb +91 -0
- data/lib/puppet/vendor/rgen/lib/mmgen/mmgen.rb +28 -0
- data/lib/puppet/vendor/rgen/lib/mmgen/templates/annotations.tpl +37 -0
- data/lib/puppet/vendor/rgen/lib/mmgen/templates/metamodel_generator.tpl +172 -0
- data/lib/puppet/vendor/rgen/lib/rgen/array_extensions.rb +45 -0
- data/lib/puppet/vendor/rgen/lib/rgen/ecore/ecore.rb +218 -0
- data/lib/puppet/vendor/rgen/lib/rgen/ecore/ecore_builder_methods.rb +81 -0
- data/lib/puppet/vendor/rgen/lib/rgen/ecore/ecore_ext.rb +69 -0
- data/lib/puppet/vendor/rgen/lib/rgen/ecore/ecore_interface.rb +47 -0
- data/lib/puppet/vendor/rgen/lib/rgen/ecore/ecore_to_ruby.rb +167 -0
- data/lib/puppet/vendor/rgen/lib/rgen/ecore/ruby_to_ecore.rb +91 -0
- data/lib/puppet/vendor/rgen/lib/rgen/environment.rb +129 -0
- data/lib/puppet/vendor/rgen/lib/rgen/fragment/dump_file_cache.rb +63 -0
- data/lib/puppet/vendor/rgen/lib/rgen/fragment/fragmented_model.rb +140 -0
- data/lib/puppet/vendor/rgen/lib/rgen/fragment/model_fragment.rb +289 -0
- data/lib/puppet/vendor/rgen/lib/rgen/instantiator/abstract_instantiator.rb +66 -0
- data/lib/puppet/vendor/rgen/lib/rgen/instantiator/abstract_xml_instantiator.rb +66 -0
- data/lib/puppet/vendor/rgen/lib/rgen/instantiator/default_xml_instantiator.rb +117 -0
- data/lib/puppet/vendor/rgen/lib/rgen/instantiator/ecore_xml_instantiator.rb +169 -0
- data/lib/puppet/vendor/rgen/lib/rgen/instantiator/json_instantiator.rb +126 -0
- data/lib/puppet/vendor/rgen/lib/rgen/instantiator/json_parser.rb +331 -0
- data/lib/puppet/vendor/rgen/lib/rgen/instantiator/json_parser.y +94 -0
- data/lib/puppet/vendor/rgen/lib/rgen/instantiator/nodebased_xml_instantiator.rb +137 -0
- data/lib/puppet/vendor/rgen/lib/rgen/instantiator/qualified_name_resolver.rb +97 -0
- data/lib/puppet/vendor/rgen/lib/rgen/instantiator/reference_resolver.rb +128 -0
- data/lib/puppet/vendor/rgen/lib/rgen/instantiator/resolution_helper.rb +47 -0
- data/lib/puppet/vendor/rgen/lib/rgen/instantiator/xmi11_instantiator.rb +168 -0
- data/lib/puppet/vendor/rgen/lib/rgen/metamodel_builder.rb +224 -0
- data/lib/puppet/vendor/rgen/lib/rgen/metamodel_builder/builder_extensions.rb +556 -0
- data/lib/puppet/vendor/rgen/lib/rgen/metamodel_builder/builder_runtime.rb +174 -0
- data/lib/puppet/vendor/rgen/lib/rgen/metamodel_builder/constant_order_helper.rb +89 -0
- data/lib/puppet/vendor/rgen/lib/rgen/metamodel_builder/data_types.rb +77 -0
- data/lib/puppet/vendor/rgen/lib/rgen/metamodel_builder/intermediate/annotation.rb +30 -0
- data/lib/puppet/vendor/rgen/lib/rgen/metamodel_builder/intermediate/feature.rb +168 -0
- data/lib/puppet/vendor/rgen/lib/rgen/metamodel_builder/mm_multiple.rb +23 -0
- data/lib/puppet/vendor/rgen/lib/rgen/metamodel_builder/module_extension.rb +42 -0
- data/lib/puppet/vendor/rgen/lib/rgen/model_builder.rb +32 -0
- data/lib/puppet/vendor/rgen/lib/rgen/model_builder/builder_context.rb +334 -0
- data/lib/puppet/vendor/rgen/lib/rgen/model_builder/model_serializer.rb +225 -0
- data/lib/puppet/vendor/rgen/lib/rgen/model_builder/reference_resolver.rb +156 -0
- data/lib/puppet/vendor/rgen/lib/rgen/serializer/json_serializer.rb +121 -0
- data/lib/puppet/vendor/rgen/lib/rgen/serializer/opposite_reference_filter.rb +18 -0
- data/lib/puppet/vendor/rgen/lib/rgen/serializer/qualified_name_provider.rb +47 -0
- data/lib/puppet/vendor/rgen/lib/rgen/serializer/xmi11_serializer.rb +116 -0
- data/lib/puppet/vendor/rgen/lib/rgen/serializer/xmi20_serializer.rb +71 -0
- data/lib/puppet/vendor/rgen/lib/rgen/serializer/xml_serializer.rb +98 -0
- data/lib/puppet/vendor/rgen/lib/rgen/template_language.rb +297 -0
- data/lib/puppet/vendor/rgen/lib/rgen/template_language/directory_template_container.rb +83 -0
- data/lib/puppet/vendor/rgen/lib/rgen/template_language/output_handler.rb +87 -0
- data/lib/puppet/vendor/rgen/lib/rgen/template_language/template_container.rb +234 -0
- data/lib/puppet/vendor/rgen/lib/rgen/template_language/template_helper.rb +26 -0
- data/lib/puppet/vendor/rgen/lib/rgen/transformer.rb +475 -0
- data/lib/puppet/vendor/rgen/lib/rgen/util/auto_class_creator.rb +61 -0
- data/lib/puppet/vendor/rgen/lib/rgen/util/cached_glob.rb +67 -0
- data/lib/puppet/vendor/rgen/lib/rgen/util/file_cache_map.rb +124 -0
- data/lib/puppet/vendor/rgen/lib/rgen/util/file_change_detector.rb +84 -0
- data/lib/puppet/vendor/rgen/lib/rgen/util/method_delegation.rb +114 -0
- data/lib/puppet/vendor/rgen/lib/rgen/util/model_comparator.rb +68 -0
- data/lib/puppet/vendor/rgen/lib/rgen/util/model_comparator_base.rb +142 -0
- data/lib/puppet/vendor/rgen/lib/rgen/util/model_dumper.rb +29 -0
- data/lib/puppet/vendor/rgen/lib/rgen/util/name_helper.rb +42 -0
- data/lib/puppet/vendor/rgen/lib/rgen/util/pattern_matcher.rb +329 -0
- data/lib/puppet/vendor/rgen/lib/transformers/ecore_to_uml13.rb +79 -0
- data/lib/puppet/vendor/rgen/lib/transformers/uml13_to_ecore.rb +127 -0
- data/lib/puppet/vendor/rgen/test/array_extensions_test.rb +64 -0
- data/lib/puppet/vendor/rgen/test/ea_instantiator_test.rb +35 -0
- data/lib/puppet/vendor/rgen/test/ea_serializer_test.rb +23 -0
- data/lib/puppet/vendor/rgen/test/ecore_self_test.rb +54 -0
- data/lib/puppet/vendor/rgen/test/environment_test.rb +90 -0
- data/lib/puppet/vendor/rgen/test/json_test.rb +171 -0
- data/lib/puppet/vendor/rgen/test/metamodel_builder_test.rb +1482 -0
- data/lib/puppet/vendor/rgen/test/metamodel_from_ecore_test.rb +57 -0
- data/lib/puppet/vendor/rgen/test/metamodel_order_test.rb +131 -0
- data/lib/puppet/vendor/rgen/test/metamodel_roundtrip_test.rb +98 -0
- data/lib/puppet/vendor/rgen/test/metamodel_roundtrip_test/TestModel.rb +70 -0
- data/lib/puppet/vendor/rgen/test/metamodel_roundtrip_test/houseMetamodel.ecore +42 -0
- data/lib/puppet/vendor/rgen/test/metamodel_roundtrip_test/houseMetamodel_from_ecore.rb +44 -0
- data/lib/puppet/vendor/rgen/test/metamodel_roundtrip_test/using_builtin_types.ecore +9 -0
- data/lib/puppet/vendor/rgen/test/method_delegation_test.rb +178 -0
- data/lib/puppet/vendor/rgen/test/model_builder/builder_context_test.rb +59 -0
- data/lib/puppet/vendor/rgen/test/model_builder/builder_test.rb +242 -0
- data/lib/puppet/vendor/rgen/test/model_builder/ecore_original.rb +163 -0
- data/lib/puppet/vendor/rgen/test/model_builder/ecore_original_regenerated.rb +163 -0
- data/lib/puppet/vendor/rgen/test/model_builder/reference_resolver_test.rb +156 -0
- data/lib/puppet/vendor/rgen/test/model_builder/serializer_test.rb +94 -0
- data/lib/puppet/vendor/rgen/test/model_builder/statemachine_metamodel.rb +42 -0
- data/lib/puppet/vendor/rgen/test/model_builder/test_model/statemachine1.rb +23 -0
- data/lib/puppet/vendor/rgen/test/model_builder_test.rb +6 -0
- data/lib/puppet/vendor/rgen/test/model_fragment_test.rb +30 -0
- data/lib/puppet/vendor/rgen/test/output_handler_test.rb +58 -0
- data/lib/puppet/vendor/rgen/test/qualified_name_provider_test.rb +48 -0
- data/lib/puppet/vendor/rgen/test/qualified_name_resolver_test.rb +102 -0
- data/lib/puppet/vendor/rgen/test/reference_resolver_test.rb +117 -0
- data/lib/puppet/vendor/rgen/test/rgen_test.rb +26 -0
- data/lib/puppet/vendor/rgen/test/template_language_test.rb +163 -0
- data/lib/puppet/vendor/rgen/test/template_language_test/expected_result1.txt +29 -0
- data/lib/puppet/vendor/rgen/test/template_language_test/expected_result2.txt +9 -0
- data/lib/puppet/vendor/rgen/test/template_language_test/expected_result3.txt +4 -0
- data/lib/puppet/vendor/rgen/test/template_language_test/indentStringTestDefaultIndent.out +1 -0
- data/lib/puppet/vendor/rgen/test/template_language_test/indentStringTestTabIndent.out +1 -0
- data/lib/puppet/vendor/rgen/test/template_language_test/templates/callback_indent_test/a.tpl +12 -0
- data/lib/puppet/vendor/rgen/test/template_language_test/templates/callback_indent_test/b.tpl +5 -0
- data/lib/puppet/vendor/rgen/test/template_language_test/templates/code/array.tpl +11 -0
- data/lib/puppet/vendor/rgen/test/template_language_test/templates/content/author.tpl +7 -0
- data/lib/puppet/vendor/rgen/test/template_language_test/templates/content/chapter.tpl +5 -0
- data/lib/puppet/vendor/rgen/test/template_language_test/templates/define_local_test/local.tpl +8 -0
- data/lib/puppet/vendor/rgen/test/template_language_test/templates/define_local_test/test.tpl +8 -0
- data/lib/puppet/vendor/rgen/test/template_language_test/templates/evaluate_test/test.tpl +7 -0
- data/lib/puppet/vendor/rgen/test/template_language_test/templates/indent_string_test.tpl +12 -0
- data/lib/puppet/vendor/rgen/test/template_language_test/templates/index/c/cmod.tpl +1 -0
- data/lib/puppet/vendor/rgen/test/template_language_test/templates/index/chapter.tpl +3 -0
- data/lib/puppet/vendor/rgen/test/template_language_test/templates/no_backslash_r_test.tpl +5 -0
- data/lib/puppet/vendor/rgen/test/template_language_test/templates/no_indent_test/no_indent.tpl +3 -0
- data/lib/puppet/vendor/rgen/test/template_language_test/templates/no_indent_test/sub1/no_indent.tpl +3 -0
- data/lib/puppet/vendor/rgen/test/template_language_test/templates/no_indent_test/test.tpl +24 -0
- data/lib/puppet/vendor/rgen/test/template_language_test/templates/no_indent_test/test2.tpl +13 -0
- data/lib/puppet/vendor/rgen/test/template_language_test/templates/no_indent_test/test3.tpl +10 -0
- data/lib/puppet/vendor/rgen/test/template_language_test/templates/null_context_test.tpl +17 -0
- data/lib/puppet/vendor/rgen/test/template_language_test/templates/root.tpl +31 -0
- data/lib/puppet/vendor/rgen/test/template_language_test/templates/template_resolution_test/sub1.tpl +9 -0
- data/lib/puppet/vendor/rgen/test/template_language_test/templates/template_resolution_test/sub1/sub1.tpl +3 -0
- data/lib/puppet/vendor/rgen/test/template_language_test/templates/template_resolution_test/test.tpl +4 -0
- data/lib/puppet/vendor/rgen/test/template_language_test/testout.txt +29 -0
- data/lib/puppet/vendor/rgen/test/testmodel/class_model_checker.rb +119 -0
- data/lib/puppet/vendor/rgen/test/testmodel/ea_testmodel.eap +0 -0
- data/lib/puppet/vendor/rgen/test/testmodel/ea_testmodel.xml +1029 -0
- data/lib/puppet/vendor/rgen/test/testmodel/ea_testmodel_partial.xml +317 -0
- data/lib/puppet/vendor/rgen/test/testmodel/ecore_model_checker.rb +101 -0
- data/lib/puppet/vendor/rgen/test/testmodel/manual_testmodel.xml +22 -0
- data/lib/puppet/vendor/rgen/test/testmodel/object_model_checker.rb +67 -0
- data/lib/puppet/vendor/rgen/test/transformer_test.rb +254 -0
- data/lib/puppet/vendor/rgen/test/util/file_cache_map_test.rb +99 -0
- data/lib/puppet/vendor/rgen/test/util/pattern_matcher_test.rb +97 -0
- data/lib/puppet/vendor/rgen/test/util_test.rb +5 -0
- data/lib/puppet/vendor/rgen/test/xml_instantiator_test.rb +160 -0
- data/lib/puppet/vendor/rgen/test/xml_instantiator_test/simple_ecore_model_checker.rb +94 -0
- data/lib/puppet/vendor/rgen/test/xml_instantiator_test/simple_xmi_ecore_instantiator.rb +53 -0
- data/lib/puppet/vendor/rgen/test/xml_instantiator_test/simple_xmi_metamodel.rb +49 -0
- data/lib/puppet/vendor/rgen/test/xml_instantiator_test/simple_xmi_to_ecore.rb +75 -0
- data/lib/puppet/vendor/safe_yaml/PUPPET_README.md +6 -0
- data/lib/puppet/vendor/semantic/PUPPET_README.md +6 -0
- data/lib/puppet/version.rb +1 -1
- data/spec/fixtures/integration/node/environment/sitedir2/00_a.pp +2 -0
- data/spec/fixtures/integration/node/environment/sitedir2/02_folder/01_b.pp +6 -0
- data/spec/fixtures/integration/node/environment/sitedir2/03_c.pp +1 -0
- data/spec/fixtures/integration/node/environment/sitedir2/04_include.pp +2 -0
- data/spec/fixtures/releases/jamtur01-apache/manifests/vhost.pp +1 -1
- data/spec/fixtures/unit/indirector/hiera/global.yaml +10 -0
- data/spec/fixtures/unit/indirector/hiera/invalid.yaml +1 -0
- data/spec/fixtures/unit/parser/functions/create_resources/foo/manifests/init.pp +3 -0
- data/spec/fixtures/unit/parser/functions/create_resources/foo/manifests/wrongdefine.pp +3 -0
- data/spec/fixtures/unit/parser/lexer/argumentdefaults.pp +2 -2
- data/spec/fixtures/unit/parser/lexer/casestatement.pp +14 -14
- data/spec/fixtures/unit/parser/lexer/classheirarchy.pp +3 -3
- data/spec/fixtures/unit/parser/lexer/classincludes.pp +3 -3
- data/spec/fixtures/unit/parser/lexer/classpathtest.pp +1 -1
- data/spec/fixtures/unit/parser/lexer/collection_override.pp +1 -1
- data/spec/fixtures/unit/parser/lexer/componentrequire.pp +2 -2
- data/spec/fixtures/unit/parser/lexer/deepclassheirarchy.pp +5 -5
- data/spec/fixtures/unit/parser/lexer/defineoverrides.pp +2 -2
- data/spec/fixtures/unit/parser/lexer/filecreate.pp +2 -2
- data/spec/fixtures/unit/parser/lexer/ifexpression.pp +1 -1
- data/spec/fixtures/unit/parser/lexer/implicititeration.pp +4 -4
- data/spec/fixtures/unit/parser/lexer/multipleinstances.pp +3 -3
- data/spec/fixtures/unit/parser/lexer/multisubs.pp +2 -2
- data/spec/fixtures/unit/parser/lexer/namevartest.pp +2 -2
- data/spec/fixtures/unit/parser/lexer/simpledefaults.pp +1 -1
- data/spec/fixtures/unit/pops/parser/lexer/argumentdefaults.pp +1 -1
- data/spec/fixtures/unit/pops/parser/lexer/casestatement.pp +14 -14
- data/spec/fixtures/unit/pops/parser/lexer/classheirarchy.pp +3 -3
- data/spec/fixtures/unit/pops/parser/lexer/classincludes.pp +3 -3
- data/spec/fixtures/unit/pops/parser/lexer/classpathtest.pp +1 -1
- data/spec/fixtures/unit/pops/parser/lexer/collection_override.pp +1 -1
- data/spec/fixtures/unit/pops/parser/lexer/componentrequire.pp +2 -2
- data/spec/fixtures/unit/pops/parser/lexer/deepclassheirarchy.pp +5 -5
- data/spec/fixtures/unit/pops/parser/lexer/defineoverrides.pp +2 -2
- data/spec/fixtures/unit/pops/parser/lexer/filecreate.pp +2 -2
- data/spec/fixtures/unit/pops/parser/lexer/ifexpression.pp +1 -1
- data/spec/fixtures/unit/pops/parser/lexer/implicititeration.pp +4 -4
- data/spec/fixtures/unit/pops/parser/lexer/multipleinstances.pp +3 -3
- data/spec/fixtures/unit/pops/parser/lexer/multisubs.pp +2 -2
- data/spec/fixtures/unit/pops/parser/lexer/namevartest.pp +2 -2
- data/spec/fixtures/unit/pops/parser/lexer/simpledefaults.pp +1 -1
- data/spec/fixtures/unit/provider/package/gem/gem-list-single-package +4 -0
- data/spec/fixtures/unit/type/user/authorized_keys +1 -1
- data/spec/integration/agent/logging_spec.rb +4 -0
- data/spec/integration/application/doc_spec.rb +4 -3
- data/spec/integration/configurer_spec.rb +0 -14
- data/spec/integration/defaults_spec.rb +26 -0
- data/spec/integration/environments/default_manifest_spec.rb +274 -0
- data/spec/integration/faces/documentation_spec.rb +0 -4
- data/spec/integration/file_bucket/file_spec.rb +21 -0
- data/spec/integration/indirector/catalog/compiler_spec.rb +0 -2
- data/spec/integration/indirector/catalog/queue_spec.rb +0 -2
- data/spec/integration/indirector/facts/facter_spec.rb +1 -1
- data/spec/integration/indirector/file_content/file_server_spec.rb +2 -2
- data/spec/integration/node/environment_spec.rb +24 -8
- data/spec/integration/parser/catalog_spec.rb +10 -10
- data/spec/integration/parser/class_spec.rb +37 -0
- data/spec/integration/parser/collector_spec.rb +234 -75
- data/spec/integration/parser/compiler_spec.rb +385 -401
- data/spec/integration/parser/conditionals_spec.rb +117 -0
- data/spec/integration/parser/future_compiler_spec.rb +359 -8
- data/spec/integration/parser/node_spec.rb +185 -0
- data/spec/integration/parser/resource_expressions_spec.rb +286 -0
- data/spec/integration/parser/ruby_manifest_spec.rb +0 -4
- data/spec/integration/parser/scope_spec.rb +94 -151
- data/spec/integration/provider/cron/crontab_spec.rb +137 -148
- data/spec/integration/ssl/certificate_authority_spec.rb +26 -0
- data/spec/integration/ssl/certificate_request_spec.rb +0 -6
- data/spec/integration/ssl/certificate_revocation_list_spec.rb +0 -2
- data/spec/integration/ssl/host_spec.rb +0 -2
- data/spec/integration/transaction_spec.rb +16 -0
- data/spec/integration/type/file_spec.rb +14 -13
- data/spec/integration/type/nagios_spec.rb +6 -15
- data/spec/integration/type/sshkey_spec.rb +22 -0
- data/spec/integration/type/tidy_spec.rb +3 -0
- data/spec/integration/type/user_spec.rb +8 -3
- data/spec/integration/util/autoload_spec.rb +6 -6
- data/spec/integration/util/rdoc/parser_spec.rb +7 -0
- data/spec/integration/util/windows/process_spec.rb +12 -0
- data/spec/integration/util/windows/security_spec.rb +36 -35
- data/spec/integration/util/windows/user_spec.rb +75 -9
- data/spec/integration/util_spec.rb +2 -2
- data/spec/lib/matchers/resource.rb +1 -0
- data/spec/lib/puppet_spec/compiler.rb +15 -2
- data/spec/lib/puppet_spec/files.rb +10 -0
- data/spec/lib/puppet_spec/language.rb +74 -0
- data/spec/lib/puppet_spec/matchers.rb +59 -32
- data/spec/lib/puppet_spec/module_tool/stub_source.rb +3 -0
- data/spec/shared_behaviours/hiera_indirections.rb +99 -0
- data/spec/shared_behaviours/iterative_functions.rb +69 -0
- data/spec/unit/application/apply_spec.rb +4 -2
- data/spec/unit/application/doc_spec.rb +17 -13
- data/spec/unit/application/master_spec.rb +35 -27
- data/spec/unit/application/resource_spec.rb +0 -5
- data/spec/unit/configurer/downloader_factory_spec.rb +96 -0
- data/spec/unit/configurer/downloader_spec.rb +3 -24
- data/spec/unit/configurer/plugin_handler_spec.rb +22 -22
- data/spec/unit/configurer_spec.rb +0 -4
- data/spec/unit/defaults_spec.rb +30 -0
- data/spec/unit/face/config_spec.rb +2 -1
- data/spec/unit/face/module/build_spec.rb +2 -2
- data/spec/unit/face/module/install_spec.rb +8 -8
- data/spec/unit/face/parser_spec.rb +71 -33
- data/spec/unit/file_bucket/file_spec.rb +2 -2
- data/spec/unit/file_system/uniquefile_spec.rb +184 -0
- data/spec/unit/forge/errors_spec.rb +4 -6
- data/spec/unit/forge/module_release_spec.rb +178 -89
- data/spec/unit/forge/repository_spec.rb +110 -2
- data/spec/unit/forge_spec.rb +39 -3
- data/spec/unit/functions/assert_type_spec.rb +22 -3
- data/spec/unit/{parser/methods → functions}/each_spec.rb +21 -1
- data/spec/unit/{parser/functions → functions}/epp_spec.rb +61 -9
- data/spec/unit/{parser/methods → functions}/filter_spec.rb +34 -38
- data/spec/unit/{parser/functions → functions}/inline_epp_spec.rb +18 -3
- data/spec/unit/functions/map_spec.rb +169 -0
- data/spec/unit/functions/match_spec.rb +57 -0
- data/spec/unit/{parser/methods → functions}/reduce_spec.rb +23 -5
- data/spec/unit/{parser/methods → functions}/slice_spec.rb +34 -21
- data/spec/unit/functions/with_spec.rb +35 -0
- data/spec/unit/functions4_spec.rb +7 -8
- data/spec/unit/indirector/catalog/compiler_spec.rb +0 -2
- data/spec/unit/indirector/catalog/static_compiler_spec.rb +11 -0
- data/spec/unit/indirector/data_binding/hiera_spec.rb +1 -96
- data/spec/unit/indirector/facts/facter_spec.rb +69 -102
- data/spec/unit/indirector/hiera_spec.rb +17 -0
- data/spec/unit/indirector/request_spec.rb +2 -4
- data/spec/unit/indirector/resource/ral_spec.rb +5 -0
- data/spec/unit/indirector/resource_type/parser_spec.rb +17 -12
- data/spec/unit/indirector/rest_spec.rb +36 -6
- data/spec/unit/interface/face_collection_spec.rb +2 -2
- data/spec/unit/module_tool/applications/builder_spec.rb +364 -14
- data/spec/unit/module_tool/applications/uninstaller_spec.rb +22 -0
- data/spec/unit/module_tool/applications/unpacker_spec.rb +40 -0
- data/spec/unit/module_tool/applications/upgrader_spec.rb +22 -0
- data/spec/unit/module_tool/installed_modules_spec.rb +49 -0
- data/spec/unit/module_tool/metadata_spec.rb +72 -4
- data/spec/unit/module_tool/tar/mini_spec.rb +2 -1
- data/spec/unit/network/authentication_spec.rb +4 -0
- data/spec/unit/network/http/api/v2/environments_spec.rb +24 -3
- data/spec/unit/network/http/connection_spec.rb +127 -92
- data/spec/unit/network/http/factory_spec.rb +82 -0
- data/spec/unit/network/http/handler_spec.rb +23 -13
- data/spec/unit/network/http/nocache_pool_spec.rb +43 -0
- data/spec/unit/network/http/pool_spec.rb +269 -0
- data/spec/unit/network/http/rack/rest_spec.rb +1 -1
- data/spec/unit/network/http/session_spec.rb +43 -0
- data/spec/unit/network/http/site_spec.rb +90 -0
- data/spec/unit/network/http/webrick_spec.rb +1 -1
- data/spec/unit/network/http_pool_spec.rb +9 -6
- data/spec/unit/network/http_spec.rb +10 -0
- data/spec/unit/node/environment_spec.rb +54 -0
- data/spec/unit/node_spec.rb +3 -5
- data/spec/unit/parser/compiler_spec.rb +9 -2
- data/spec/unit/parser/files_spec.rb +19 -0
- data/spec/unit/parser/functions/contain_spec.rb +51 -0
- data/spec/unit/parser/functions/create_resources_spec.rb +8 -1
- data/spec/unit/parser/functions/digest_spec.rb +31 -0
- data/spec/unit/parser/functions/file_spec.rb +48 -5
- data/spec/unit/parser/functions/include_spec.rb +15 -1
- data/spec/unit/parser/functions/realize_spec.rb +43 -35
- data/spec/unit/parser/functions/require_spec.rb +19 -5
- data/spec/unit/parser/functions/search_spec.rb +5 -0
- data/spec/unit/parser/functions/shared.rb +82 -0
- data/spec/unit/parser/functions_spec.rb +1 -1
- data/spec/unit/parser/lexer_spec.rb +10 -1
- data/spec/unit/parser/type_loader_spec.rb +0 -1
- data/spec/unit/pops/benchmark_spec.rb +1 -1
- data/spec/unit/pops/binder/bindings_composer_spec.rb +24 -22
- data/spec/unit/pops/binder/injector_spec.rb +8 -6
- data/spec/unit/pops/evaluator/access_ops_spec.rb +3 -3
- data/spec/unit/pops/evaluator/comparison_ops_spec.rb +7 -4
- data/spec/unit/pops/evaluator/evaluating_parser_spec.rb +250 -30
- data/spec/unit/pops/evaluator/logical_ops_spec.rb +2 -2
- data/spec/unit/pops/evaluator/variables_spec.rb +0 -105
- data/spec/unit/pops/issues_spec.rb +170 -0
- data/spec/unit/pops/loaders/dependency_loader_spec.rb +17 -0
- data/spec/unit/pops/loaders/loader_paths_spec.rb +4 -15
- data/spec/unit/pops/loaders/loaders_spec.rb +31 -11
- data/spec/unit/pops/loaders/module_loaders_spec.rb +0 -29
- data/spec/unit/pops/loaders/static_loader_spec.rb +6 -0
- data/spec/unit/pops/parser/epp_parser_spec.rb +38 -9
- data/spec/unit/pops/parser/evaluating_parser_spec.rb +0 -1
- data/spec/unit/pops/parser/lexer2_spec.rb +21 -4
- data/spec/unit/pops/parser/parse_basic_expressions_spec.rb +5 -0
- data/spec/unit/pops/parser/parse_calls_spec.rb +6 -3
- data/spec/unit/pops/parser/parse_conditionals_spec.rb +12 -5
- data/spec/unit/pops/parser/parse_containers_spec.rb +62 -7
- data/spec/unit/pops/parser/parse_resource_spec.rb +155 -73
- data/spec/unit/pops/parser/parser_spec.rb +16 -0
- data/spec/unit/pops/parser/parsing_typed_parameters_spec.rb +72 -0
- data/spec/unit/pops/transformer/transform_calls_spec.rb +1 -1
- data/spec/unit/pops/types/type_calculator_spec.rb +254 -57
- data/spec/unit/pops/types/type_factory_spec.rb +8 -3
- data/spec/unit/pops/types/type_parser_spec.rb +26 -5
- data/spec/unit/pops/validator/validator_spec.rb +143 -27
- data/spec/unit/provider/exec/posix_spec.rb +22 -14
- data/spec/unit/provider/exec/shell_spec.rb +2 -2
- data/spec/unit/provider/file/windows_spec.rb +7 -7
- data/spec/unit/provider/group/windows_adsi_spec.rb +17 -17
- data/spec/unit/provider/package/gem_spec.rb +10 -0
- data/spec/unit/provider/package/openbsd_spec.rb +66 -9
- data/spec/unit/provider/package/pacman_spec.rb +90 -71
- data/spec/unit/provider/package/windows/package_spec.rb +21 -6
- data/spec/unit/provider/package/yum_spec.rb +1 -0
- data/spec/unit/provider/parsedfile_spec.rb +1 -1
- data/spec/unit/provider/scheduled_task/win32_taskscheduler_spec.rb +9 -9
- data/spec/unit/provider/service/openbsd_spec.rb +26 -2
- data/spec/unit/provider/service/upstart_spec.rb +12 -1
- data/spec/unit/provider/ssh_authorized_key/parsed_spec.rb +6 -0
- data/spec/unit/provider/user/user_role_add_spec.rb +23 -1
- data/spec/unit/provider/user/windows_adsi_spec.rb +17 -17
- data/spec/unit/reports/store_spec.rb +0 -16
- data/spec/unit/resource/catalog_spec.rb +0 -5
- data/spec/unit/resource_spec.rb +2 -2
- data/spec/unit/settings/autosign_setting_spec.rb +2 -2
- data/spec/unit/settings/environment_conf_spec.rb +77 -10
- data/spec/unit/settings/file_setting_spec.rb +5 -4
- data/spec/unit/settings/priority_setting_spec.rb +4 -4
- data/spec/unit/settings_spec.rb +41 -3
- data/spec/unit/ssl/certificate_authority_spec.rb +25 -2
- data/spec/unit/ssl/inventory_spec.rb +13 -0
- data/spec/unit/ssl/validator_spec.rb +0 -1
- data/spec/unit/transaction/resource_harness_spec.rb +64 -0
- data/spec/unit/transaction_spec.rb +98 -47
- data/spec/unit/type/cron_spec.rb +3 -3
- data/spec/unit/type/exec_spec.rb +9 -0
- data/spec/unit/type/file/content_spec.rb +54 -71
- data/spec/unit/type/file/mode_spec.rb +26 -1
- data/spec/unit/type/file/source_spec.rb +26 -4
- data/spec/unit/type/file_spec.rb +3 -3
- data/spec/unit/type/nagios_spec.rb +12 -3
- data/spec/unit/type/resources_spec.rb +64 -30
- data/spec/unit/type/user_spec.rb +1 -1
- data/spec/unit/type/yumrepo_spec.rb +136 -0
- data/spec/unit/type/zone_spec.rb +44 -1
- data/spec/unit/type_spec.rb +20 -0
- data/spec/unit/util/colors_spec.rb +14 -8
- data/spec/unit/util/command_line_spec.rb +11 -7
- data/spec/unit/util/execution_spec.rb +35 -42
- data/spec/unit/util/feature_spec.rb +12 -0
- data/spec/unit/util/http_proxy_spec.rb +43 -1
- data/spec/unit/util/log/destinations_spec.rb +45 -1
- data/spec/unit/util/logging_spec.rb +38 -0
- data/spec/unit/util/pidlock_spec.rb +37 -1
- data/spec/unit/util/profiler/aggregate_spec.rb +59 -0
- data/spec/unit/util/profiler/around_profiler_spec.rb +61 -0
- data/spec/unit/util/profiler/logging_spec.rb +18 -29
- data/spec/unit/util/profiler/wall_clock_spec.rb +1 -1
- data/spec/unit/util/profiler_spec.rb +55 -0
- data/spec/unit/util/queue_spec.rb +0 -1
- data/spec/unit/util/rdoc/parser_spec.rb +14 -6
- data/spec/unit/util/tagging_spec.rb +1 -1
- data/spec/unit/util/windows/access_control_entry_spec.rb +1 -1
- data/spec/unit/util/{adsi_spec.rb → windows/adsi_spec.rb} +111 -108
- data/spec/unit/util/windows/api_types_spec.rb +28 -0
- data/spec/unit/util/windows/registry_spec.rb +7 -6
- data/spec/unit/util/windows/sid_spec.rb +3 -6
- data/spec/unit/util/windows/string_spec.rb +4 -0
- data/spec/unit/util/zaml_spec.rb +5 -1
- data/tasks/benchmark.rake +40 -5
- data/tasks/parser.rake +16 -2
- data/tasks/yard.rake +1 -1
- metadata +296 -68
- data/lib/puppet/file_system/tempfile.rb +0 -20
- data/lib/puppet/parser/e_parser_adapter.rb +0 -119
- data/lib/puppet/parser/functions/collect.rb +0 -15
- data/lib/puppet/parser/functions/select.rb +0 -15
- data/lib/puppet/pops/loader/ruby_legacy_function_instantiator.rb +0 -109
- data/lib/puppet/pops/parser/lexer.rb +0 -753
- data/lib/puppet/pops/parser/makefile +0 -6
- data/lib/puppet/pops/validation/checker3_1.rb +0 -558
- data/lib/puppet/pops/validation/validator_factory_3_1.rb +0 -31
- data/lib/puppet/util/profiler/none.rb +0 -8
- data/spec/unit/face/certificate_request_spec.rb +0 -7
- data/spec/unit/face/certificate_revocation_list_spec.rb +0 -7
- data/spec/unit/face/key_spec.rb +0 -7
- data/spec/unit/face/report_spec.rb +0 -7
- data/spec/unit/face/resource_spec.rb +0 -7
- data/spec/unit/face/resource_type_spec.rb +0 -7
- data/spec/unit/file_system/tempfile_spec.rb +0 -48
- data/spec/unit/parser/eparser_adapter_spec.rb +0 -407
- data/spec/unit/parser/methods/map_spec.rb +0 -184
- data/spec/unit/parser/methods/shared.rb +0 -45
- data/spec/unit/pops/parser/lexer_spec.rb +0 -840
- data/spec/unit/pops/transformer/transform_resource_spec.rb +0 -185
- data/spec/unit/util/profiler/none_spec.rb +0 -12
@@ -0,0 +1,23 @@
|
|
1
|
+
|
2
|
+
module RGen
|
3
|
+
|
4
|
+
module MetamodelBuilder
|
5
|
+
|
6
|
+
def self.MMMultiple(*superclasses)
|
7
|
+
c = Class.new(MMBase)
|
8
|
+
class << c
|
9
|
+
attr_reader :multiple_superclasses
|
10
|
+
end
|
11
|
+
c.instance_variable_set(:@multiple_superclasses, superclasses)
|
12
|
+
superclasses.collect{|sc| sc.ancestors}.flatten.
|
13
|
+
reject{|m| m.is_a?(Class)}.each do |arg|
|
14
|
+
c.instance_eval do
|
15
|
+
include arg
|
16
|
+
end
|
17
|
+
end
|
18
|
+
return c
|
19
|
+
end
|
20
|
+
|
21
|
+
end
|
22
|
+
|
23
|
+
end
|
@@ -0,0 +1,42 @@
|
|
1
|
+
require 'rgen/ecore/ecore_interface'
|
2
|
+
require 'rgen/metamodel_builder/intermediate/annotation'
|
3
|
+
|
4
|
+
module RGen
|
5
|
+
|
6
|
+
module MetamodelBuilder
|
7
|
+
|
8
|
+
# This module is used to extend modules which should be
|
9
|
+
# part of RGen metamodels
|
10
|
+
module ModuleExtension
|
11
|
+
include RGen::ECore::ECoreInterface
|
12
|
+
|
13
|
+
def annotation(hash)
|
14
|
+
_annotations << Intermediate::Annotation.new(hash)
|
15
|
+
end
|
16
|
+
|
17
|
+
def _annotations
|
18
|
+
@_annotations ||= []
|
19
|
+
end
|
20
|
+
|
21
|
+
def _constantOrder
|
22
|
+
@_constantOrder ||= []
|
23
|
+
end
|
24
|
+
|
25
|
+
def final_method(m)
|
26
|
+
@final_methods ||= []
|
27
|
+
@final_methods << m
|
28
|
+
end
|
29
|
+
|
30
|
+
def method_added(m)
|
31
|
+
raise "Method #{m} can not be redefined" if @final_methods && @final_methods.include?(m)
|
32
|
+
end
|
33
|
+
|
34
|
+
def self.extended(m)
|
35
|
+
MetamodelBuilder::ConstantOrderHelper.moduleCreated(m)
|
36
|
+
end
|
37
|
+
|
38
|
+
end
|
39
|
+
|
40
|
+
end
|
41
|
+
|
42
|
+
end
|
@@ -0,0 +1,32 @@
|
|
1
|
+
require 'rgen/model_builder/builder_context'
|
2
|
+
require 'rgen/util/method_delegation'
|
3
|
+
#require 'ruby-prof'
|
4
|
+
|
5
|
+
module RGen
|
6
|
+
|
7
|
+
module ModelBuilder
|
8
|
+
|
9
|
+
def self.build(package, env=nil, builderMethodsModule=nil, &block)
|
10
|
+
resolver = ReferenceResolver.new
|
11
|
+
bc = BuilderContext.new(package, builderMethodsModule, resolver, env)
|
12
|
+
contextModule = eval("Module.nesting", block.binding).first
|
13
|
+
Util::MethodDelegation.registerDelegate(bc, contextModule, "const_missing")
|
14
|
+
BuilderContext.currentBuilderContext = bc
|
15
|
+
begin
|
16
|
+
#RubyProf.start
|
17
|
+
bc.instance_eval(&block)
|
18
|
+
#prof = RubyProf.stop
|
19
|
+
#File.open("profile_flat.txt","w+") do |f|
|
20
|
+
# RubyProf::FlatPrinter.new(prof).print(f, 0)
|
21
|
+
# end
|
22
|
+
ensure
|
23
|
+
BuilderContext.currentBuilderContext = nil
|
24
|
+
end
|
25
|
+
Util::MethodDelegation.unregisterDelegate(bc, contextModule, "const_missing")
|
26
|
+
#puts "Resolving..."
|
27
|
+
resolver.resolve(bc.toplevelElements)
|
28
|
+
bc.toplevelElements
|
29
|
+
end
|
30
|
+
end
|
31
|
+
|
32
|
+
end
|
@@ -0,0 +1,334 @@
|
|
1
|
+
require 'rgen/ecore/ecore_ext'
|
2
|
+
require 'rgen/model_builder/reference_resolver'
|
3
|
+
|
4
|
+
module RGen
|
5
|
+
|
6
|
+
module ModelBuilder
|
7
|
+
|
8
|
+
class BuilderContext
|
9
|
+
attr_reader :toplevelElements
|
10
|
+
|
11
|
+
def initialize(package, extensionsModule, resolver, env=nil)
|
12
|
+
package = package.ecore unless package.is_a?(RGen::ECore::EPackage)
|
13
|
+
raise "First argument must be a metamodel package" \
|
14
|
+
unless package.is_a?(RGen::ECore::EPackage)
|
15
|
+
@rootPackage, @env = package, env
|
16
|
+
@commandResolver = CommandResolver.new(package, extensionsModule, self)
|
17
|
+
@package = @rootPackage
|
18
|
+
@resolver = resolver
|
19
|
+
@contextStack = []
|
20
|
+
@toplevelElements = []
|
21
|
+
@helperNames = {}
|
22
|
+
end
|
23
|
+
|
24
|
+
def const_missing_delegated(delegator, const)
|
25
|
+
ConstPathElement.new(const, self)
|
26
|
+
end
|
27
|
+
|
28
|
+
# in Ruby 1.9.0 and 1.9.1 #instance_eval looks up constants in the calling scope
|
29
|
+
# that's why const_missing needs to be prepared in BuilderContext, too
|
30
|
+
class << self
|
31
|
+
def currentBuilderContext=(bc)
|
32
|
+
@@currentBuilderContext = bc
|
33
|
+
end
|
34
|
+
|
35
|
+
def const_missing(name)
|
36
|
+
if @@currentBuilderContext
|
37
|
+
ConstPathElement.new(name, @@currentBuilderContext)
|
38
|
+
else
|
39
|
+
super
|
40
|
+
end
|
41
|
+
end
|
42
|
+
end
|
43
|
+
|
44
|
+
class CommandResolver
|
45
|
+
def initialize(rootPackage, extensionsModule, builderContext)
|
46
|
+
@extensionFactory = ExtensionContainerFactory.new(rootPackage, extensionsModule, builderContext)
|
47
|
+
@packageResolver = PackageResolver.new(rootPackage, @extensionFactory)
|
48
|
+
@resolveCommand = {}
|
49
|
+
end
|
50
|
+
|
51
|
+
def resolveCommand(cmd, parentPackage)
|
52
|
+
return @resolveCommand[[parentPackage, cmd]] if @resolveCommand.has_key?([parentPackage, cmd])
|
53
|
+
package = @packageResolver.packageByCommand(parentPackage, cmd)
|
54
|
+
result = nil
|
55
|
+
if package
|
56
|
+
extensionContainer = @extensionFactory.extensionContainer(package)
|
57
|
+
if extensionContainer.respond_to?(cmd)
|
58
|
+
result = extensionContainer
|
59
|
+
else
|
60
|
+
className = cmd.to_s[0..0].upcase + cmd.to_s[1..-1]
|
61
|
+
result = package.eClasses.find{|c| c.name == className}
|
62
|
+
end
|
63
|
+
end
|
64
|
+
@resolveCommand[[parentPackage, cmd]] = [package, result]
|
65
|
+
end
|
66
|
+
end
|
67
|
+
|
68
|
+
def method_missing(m, *args, &block)
|
69
|
+
package, classOrContainer = @commandResolver.resolveCommand(m, @package)
|
70
|
+
return super if package.nil?
|
71
|
+
return classOrContainer.send(m, *args, &block) if classOrContainer.is_a?(ExtensionContainerFactory::ExtensionContainer)
|
72
|
+
eClass = classOrContainer
|
73
|
+
nameArg, argHash = self.class.processArguments(args)
|
74
|
+
internalName = nameArg || argHash[:name]
|
75
|
+
argHash[:name] ||= nameArg if nameArg && self.class.hasNameAttribute(eClass)
|
76
|
+
resolverJobs, asRole, helperName = self.class.filterArgHash(argHash, eClass)
|
77
|
+
element = eClass.instanceClass.new(argHash)
|
78
|
+
@resolver.setElementName(element, internalName)
|
79
|
+
@env << element if @env
|
80
|
+
contextElement = @contextStack.last
|
81
|
+
if contextElement
|
82
|
+
self.class.associateWithContextElement(element, contextElement, asRole)
|
83
|
+
else
|
84
|
+
@toplevelElements << element
|
85
|
+
end
|
86
|
+
resolverJobs.each do |job|
|
87
|
+
job.receiver = element
|
88
|
+
job.namespace = contextElement
|
89
|
+
@resolver.addJob(job)
|
90
|
+
end
|
91
|
+
# process block
|
92
|
+
if block
|
93
|
+
@contextStack.push(element)
|
94
|
+
@package, oldPackage = package, @package
|
95
|
+
instance_eval(&block)
|
96
|
+
@package = oldPackage
|
97
|
+
@contextStack.pop
|
98
|
+
end
|
99
|
+
element
|
100
|
+
end
|
101
|
+
|
102
|
+
def _using(constPathElement, &block)
|
103
|
+
@package, oldPackage =
|
104
|
+
self.class.resolvePackage(@package, @rootPackage, constPathElement.constPath), @package
|
105
|
+
instance_eval(&block)
|
106
|
+
@package = oldPackage
|
107
|
+
end
|
108
|
+
|
109
|
+
def _context(depth=1)
|
110
|
+
@contextStack[-depth]
|
111
|
+
end
|
112
|
+
|
113
|
+
class ExtensionContainerFactory
|
114
|
+
|
115
|
+
class ExtensionContainer
|
116
|
+
def initialize(builderContext)
|
117
|
+
@builderContext = builderContext
|
118
|
+
end
|
119
|
+
def method_missing(m, *args, &block)
|
120
|
+
@builderContext.send(m, *args, &block)
|
121
|
+
end
|
122
|
+
end
|
123
|
+
|
124
|
+
def initialize(rootPackage, extensionsModule, builderContext)
|
125
|
+
@rootPackage, @extensionsModule, @builderContext = rootPackage, extensionsModule, builderContext
|
126
|
+
@extensionContainer = {}
|
127
|
+
end
|
128
|
+
|
129
|
+
def moduleForPackage(package)
|
130
|
+
qName = package.qualifiedName
|
131
|
+
rqName = @rootPackage.qualifiedName
|
132
|
+
raise "Package #{qName} is not contained within #{rqName}" unless qName.index(rqName) == 0
|
133
|
+
path = qName.sub(rqName,'').split('::')
|
134
|
+
path.shift if path.first == ""
|
135
|
+
mod = @extensionsModule
|
136
|
+
path.each do |p|
|
137
|
+
if mod && mod.const_defined?(p)
|
138
|
+
mod = mod.const_get(p)
|
139
|
+
else
|
140
|
+
mod = nil
|
141
|
+
break
|
142
|
+
end
|
143
|
+
end
|
144
|
+
mod
|
145
|
+
end
|
146
|
+
|
147
|
+
def extensionContainer(package)
|
148
|
+
return @extensionContainer[package] if @extensionContainer[package]
|
149
|
+
container = ExtensionContainer.new(@builderContext)
|
150
|
+
extensionModule = moduleForPackage(package)
|
151
|
+
container.extend(extensionModule) if extensionModule
|
152
|
+
@extensionContainer[package] = container
|
153
|
+
end
|
154
|
+
end
|
155
|
+
|
156
|
+
class PackageResolver
|
157
|
+
def initialize(rootPackage, extensionFactory)
|
158
|
+
@rootPackage = rootPackage
|
159
|
+
@extensionFactory = extensionFactory
|
160
|
+
@packageByCommand = {}
|
161
|
+
end
|
162
|
+
|
163
|
+
def packageByCommand(contextPackage, name)
|
164
|
+
return @packageByCommand[[contextPackage, name]] if @packageByCommand.has_key?([contextPackage, name])
|
165
|
+
if @extensionFactory.extensionContainer(contextPackage).respond_to?(name)
|
166
|
+
result = contextPackage
|
167
|
+
else
|
168
|
+
className = name.to_s[0..0].upcase + name.to_s[1..-1]
|
169
|
+
eClass = contextPackage.eClasses.find{|c| c.name == className}
|
170
|
+
if eClass
|
171
|
+
result = contextPackage
|
172
|
+
elsif contextPackage != @rootPackage
|
173
|
+
result = packageByCommand(contextPackage.eSuperPackage, name)
|
174
|
+
else
|
175
|
+
result = nil
|
176
|
+
end
|
177
|
+
end
|
178
|
+
@packageByCommand[[contextPackage, name]] = result
|
179
|
+
end
|
180
|
+
end
|
181
|
+
|
182
|
+
class ConstPathElement < Module
|
183
|
+
def initialize(name, builderContext, parent=nil)
|
184
|
+
@name = name.to_s
|
185
|
+
@builderContext = builderContext
|
186
|
+
@parent = parent
|
187
|
+
end
|
188
|
+
|
189
|
+
def const_missing(const)
|
190
|
+
ConstPathElement.new(const, @builderContext, self)
|
191
|
+
end
|
192
|
+
|
193
|
+
def method_missing(m, *args, &block)
|
194
|
+
@builderContext._using(self) do
|
195
|
+
send(m, *args, &block)
|
196
|
+
end
|
197
|
+
end
|
198
|
+
|
199
|
+
def constPath
|
200
|
+
if @parent
|
201
|
+
@parent.constPath << @name
|
202
|
+
else
|
203
|
+
[@name]
|
204
|
+
end
|
205
|
+
end
|
206
|
+
end
|
207
|
+
|
208
|
+
# helper methods put in the class object to be out of the way of
|
209
|
+
# method evaluation in the builder context
|
210
|
+
class << self
|
211
|
+
class PackageNotFoundException < Exception
|
212
|
+
end
|
213
|
+
|
214
|
+
def resolvePackage(contextPackage, rootPackage, path)
|
215
|
+
begin
|
216
|
+
return resolvePackageDownwards(contextPackage, path)
|
217
|
+
rescue PackageNotFoundException
|
218
|
+
if contextPackage.eSuperPackage && contextPackage != rootPackage
|
219
|
+
return resolvePackage(contextPackage.eSuperPackage, rootPackage, path)
|
220
|
+
else
|
221
|
+
raise
|
222
|
+
end
|
223
|
+
end
|
224
|
+
end
|
225
|
+
|
226
|
+
def resolvePackageDownwards(contextPackage, path)
|
227
|
+
first, *rest = path
|
228
|
+
package = contextPackage.eSubpackages.find{|p| p.name == first}
|
229
|
+
raise PackageNotFoundException.new("Could not resolve package: #{first} is not a subpackage of #{contextPackage.name}") unless package
|
230
|
+
if rest.empty?
|
231
|
+
package
|
232
|
+
else
|
233
|
+
resolvePackageDownwards(package, rest)
|
234
|
+
end
|
235
|
+
end
|
236
|
+
|
237
|
+
def processArguments(args)
|
238
|
+
unless (args.size == 2 && args.first.is_a?(String) && args.last.is_a?(Hash)) ||
|
239
|
+
(args.size == 1 && (args.first.is_a?(String) || args.first.is_a?(Hash))) ||
|
240
|
+
args.size == 0
|
241
|
+
raise "Provide a Hash to set feature values, " +
|
242
|
+
"optionally the first argument may be a String specifying " +
|
243
|
+
"the value of the \"name\" attribute."
|
244
|
+
end
|
245
|
+
if args.last.is_a?(Hash)
|
246
|
+
argHash = args.last
|
247
|
+
else
|
248
|
+
argHash = {}
|
249
|
+
end
|
250
|
+
nameArg = args.first if args.first.is_a?(String)
|
251
|
+
[nameArg, argHash]
|
252
|
+
end
|
253
|
+
|
254
|
+
def filterArgHash(argHash, eClass)
|
255
|
+
resolverJobs = []
|
256
|
+
asRole, helperName = nil, nil
|
257
|
+
refByName = {}
|
258
|
+
eAllReferences(eClass).each {|r| refByName[r.name] = r}
|
259
|
+
argHash.each_pair do |k,v|
|
260
|
+
if k == :as
|
261
|
+
asRole = v
|
262
|
+
argHash.delete(k)
|
263
|
+
elsif k == :name && !hasNameAttribute(eClass)
|
264
|
+
helperName = v
|
265
|
+
argHash.delete(k)
|
266
|
+
elsif v.is_a?(String)
|
267
|
+
ref = refByName[k.to_s]#eAllReferences(eClass).find{|r| r.name == k.to_s}
|
268
|
+
if ref
|
269
|
+
argHash.delete(k)
|
270
|
+
resolverJobs << ReferenceResolver::ResolverJob.new(nil, ref, nil, v)
|
271
|
+
end
|
272
|
+
elsif v.is_a?(Array)
|
273
|
+
ref = refByName[k.to_s] #eAllReferences(eClass).find{|r| r.name == k.to_s}
|
274
|
+
ref && v.dup.each do |e|
|
275
|
+
if e.is_a?(String)
|
276
|
+
v.delete(e)
|
277
|
+
resolverJobs << ReferenceResolver::ResolverJob.new(nil, ref, nil, e)
|
278
|
+
end
|
279
|
+
end
|
280
|
+
end
|
281
|
+
end
|
282
|
+
[ resolverJobs, asRole, helperName ]
|
283
|
+
end
|
284
|
+
|
285
|
+
def hasNameAttribute(eClass)
|
286
|
+
@hasNameAttribute ||= {}
|
287
|
+
@hasNameAttribute[eClass] ||= eClass.eAllAttributes.any?{|a| a.name == "name"}
|
288
|
+
end
|
289
|
+
|
290
|
+
def eAllReferences(eClass)
|
291
|
+
@eAllReferences ||= {}
|
292
|
+
@eAllReferences[eClass] ||= eClass.eAllReferences
|
293
|
+
end
|
294
|
+
|
295
|
+
def containmentRefs(contextClass, eClass)
|
296
|
+
@containmentRefs ||= {}
|
297
|
+
@containmentRefs[[contextClass, eClass]] ||=
|
298
|
+
eAllReferences(contextClass).select do |r|
|
299
|
+
r.containment && (eClass.eAllSuperTypes << eClass).include?(r.eType)
|
300
|
+
end
|
301
|
+
end
|
302
|
+
|
303
|
+
def associateWithContextElement(element, contextElement, asRole)
|
304
|
+
return unless contextElement
|
305
|
+
contextClass = contextElement.class.ecore
|
306
|
+
if asRole
|
307
|
+
asRoleRef = eAllReferences(contextClass).find{|r| r.name == asRole.to_s}
|
308
|
+
raise "Context class #{contextClass.name} has no reference named #{asRole}" unless asRoleRef
|
309
|
+
ref = asRoleRef
|
310
|
+
else
|
311
|
+
possibleContainmentRefs = containmentRefs(contextClass, element.class.ecore)
|
312
|
+
if possibleContainmentRefs.size == 1
|
313
|
+
ref = possibleContainmentRefs.first
|
314
|
+
elsif possibleContainmentRefs.size == 0
|
315
|
+
raise "Context class #{contextClass.name} can not contain a #{element.class.ecore.name}"
|
316
|
+
else
|
317
|
+
raise "Context class #{contextClass.name} has several containment references to a #{element.class.ecore.name}." +
|
318
|
+
" Clearify using \":as => <role>\""
|
319
|
+
end
|
320
|
+
end
|
321
|
+
if ref.many
|
322
|
+
contextElement.addGeneric(ref.name, element)
|
323
|
+
else
|
324
|
+
contextElement.setGeneric(ref.name, element)
|
325
|
+
end
|
326
|
+
end
|
327
|
+
|
328
|
+
end
|
329
|
+
|
330
|
+
end
|
331
|
+
|
332
|
+
end
|
333
|
+
|
334
|
+
end
|
@@ -0,0 +1,225 @@
|
|
1
|
+
require 'rgen/array_extensions'
|
2
|
+
require 'rgen/ecore/ecore_ext'
|
3
|
+
|
4
|
+
module RGen
|
5
|
+
|
6
|
+
module ModelBuilder
|
7
|
+
|
8
|
+
class ModelSerializer
|
9
|
+
|
10
|
+
def initialize(writable, rootPackage)
|
11
|
+
@writable = writable
|
12
|
+
@currentPackage = rootPackage
|
13
|
+
@qualifiedElementName = {}
|
14
|
+
@internalElementName = {}
|
15
|
+
@relativeQualifiedElementName = {}
|
16
|
+
end
|
17
|
+
|
18
|
+
def serialize(elements)
|
19
|
+
calcQualifiedElementNames(elements)
|
20
|
+
unifyQualifiedElementNames
|
21
|
+
elements = [elements] unless elements.is_a?(Enumerable)
|
22
|
+
elements.each do |e|
|
23
|
+
serializeElement(e)
|
24
|
+
end
|
25
|
+
end
|
26
|
+
|
27
|
+
private
|
28
|
+
|
29
|
+
def serializeElement(element, viaRef=nil, namePath=[], indent=0)
|
30
|
+
className = element.class.ecore.name
|
31
|
+
cmd = className[0..0].downcase+className[1..-1]
|
32
|
+
args = ["\"#{@internalElementName[element]}\""]
|
33
|
+
namePath = namePath + [@internalElementName[element]]
|
34
|
+
childs = []
|
35
|
+
eAllStructuralFeatures(element).each do |f|
|
36
|
+
next if f.derived
|
37
|
+
if f.is_a?(RGen::ECore::EAttribute)
|
38
|
+
next if f.name == "name" && element.name == @internalElementName[element]
|
39
|
+
val = element.getGeneric(f.name)
|
40
|
+
#puts f.defaultValue.inspect if f.name == "isRoot"
|
41
|
+
args << ":#{f.name} => #{serializeAttribute(val)}" unless val == f.defaultValue || val.nil?
|
42
|
+
elsif !f.containment
|
43
|
+
next if f.eOpposite && f.eOpposite == viaRef
|
44
|
+
val = element.getGeneric(f.name)
|
45
|
+
refString = serializeReference(element, f, val)
|
46
|
+
args << ":#{f.name} => #{refString}" if refString
|
47
|
+
else
|
48
|
+
cs = element.getGeneric(f.name)
|
49
|
+
refString = nil
|
50
|
+
if cs.is_a?(Array)
|
51
|
+
cs.compact!
|
52
|
+
rcs = cs.select{|c| serializeChild?(c, namePath)}
|
53
|
+
childs << [f, rcs] unless rcs.empty?
|
54
|
+
refString = serializeReference(element, f, cs-rcs)
|
55
|
+
else
|
56
|
+
if cs && serializeChild?(cs, namePath)
|
57
|
+
childs << [f, [cs]]
|
58
|
+
else
|
59
|
+
refString = serializeReference(element, f, cs)
|
60
|
+
end
|
61
|
+
end
|
62
|
+
args << ":#{f.name} => #{refString}" if refString
|
63
|
+
end
|
64
|
+
end
|
65
|
+
|
66
|
+
args << ":as => :#{viaRef.name}" if viaRef && containmentRefs(viaRef.eContainingClass, element.class.ecore).size > 1
|
67
|
+
cmd = elementPackage(element)+"."+cmd if elementPackage(element).size > 0
|
68
|
+
@writable.write " " * indent + cmd + " " + args.join(", ")
|
69
|
+
if childs.size > 0
|
70
|
+
@writable.write " do\n"
|
71
|
+
oldPackage, @currentPackage = @currentPackage, element.class.ecore.ePackage
|
72
|
+
childs.each do |pair|
|
73
|
+
f, cs = pair
|
74
|
+
cs.each {|c| serializeElement(c, f, namePath, indent+1) }
|
75
|
+
end
|
76
|
+
@currentPackage = oldPackage
|
77
|
+
@writable.write " " * indent + "end\n"
|
78
|
+
else
|
79
|
+
@writable.write "\n"
|
80
|
+
end
|
81
|
+
end
|
82
|
+
|
83
|
+
def serializeChild?(child, namePath)
|
84
|
+
@qualifiedElementName[child][0..-2] == namePath
|
85
|
+
end
|
86
|
+
|
87
|
+
def serializeAttribute(value)
|
88
|
+
if value.is_a?(String)
|
89
|
+
"\"#{value.gsub("\"","\\\"")}\""
|
90
|
+
elsif value.is_a?(Symbol)
|
91
|
+
":#{value}"
|
92
|
+
elsif value.nil?
|
93
|
+
"nil"
|
94
|
+
else
|
95
|
+
value.to_s
|
96
|
+
end
|
97
|
+
end
|
98
|
+
|
99
|
+
def serializeReference(element, ref, value)
|
100
|
+
if value.is_a?(Array)
|
101
|
+
value = value.compact
|
102
|
+
value = value.select{|v| compareWithOppositeReference(ref, element, v) > 0} if ref.eOpposite
|
103
|
+
qualNames = value.collect do |v|
|
104
|
+
relativeQualifiedElementName(v, element).join(".")
|
105
|
+
end
|
106
|
+
!qualNames.empty? && ("[" + qualNames.collect { |v| "\"#{v}\"" }.join(", ") + "]")
|
107
|
+
elsif value && (!ref.eOpposite || compareWithOppositeReference(ref, element, value) > 0)
|
108
|
+
qualName = relativeQualifiedElementName(value, element).join(".")
|
109
|
+
("\"#{qualName}\"")
|
110
|
+
end
|
111
|
+
end
|
112
|
+
|
113
|
+
# descide which part of a bidirectional reference get serialized
|
114
|
+
def compareWithOppositeReference(ref, element, target)
|
115
|
+
result = 0
|
116
|
+
# first try to make the reference from the many side to the one side
|
117
|
+
result = -1 if ref.many && !ref.eOpposite.many
|
118
|
+
result = 1 if !ref.many && ref.eOpposite.many
|
119
|
+
return result if result != 0
|
120
|
+
# for 1:1 or many:many perfer, shorter references
|
121
|
+
result = relativeQualifiedElementName(element, target).size <=>
|
122
|
+
relativeQualifiedElementName(target, element).size
|
123
|
+
return result if result != 0
|
124
|
+
# there just needs to be a descision, use class name or object_id
|
125
|
+
result = element.class.name <=> target.class.name
|
126
|
+
return result if result != 0
|
127
|
+
element.object_id <=> target.object_id
|
128
|
+
end
|
129
|
+
|
130
|
+
def elementPackage(element)
|
131
|
+
@elementPackage ||= {}
|
132
|
+
return @elementPackage[element] if @elementPackage[element]
|
133
|
+
eNames = element.class.ecore.ePackage.qualifiedName.split("::")
|
134
|
+
rNames = @currentPackage.qualifiedName.split("::")
|
135
|
+
while eNames.first == rNames.first && !eNames.first.nil?
|
136
|
+
eNames.shift
|
137
|
+
rNames.shift
|
138
|
+
end
|
139
|
+
@elementPackage[element] = eNames.join("::")
|
140
|
+
end
|
141
|
+
|
142
|
+
def relativeQualifiedElementName(element, context)
|
143
|
+
return @relativeQualifiedElementName[[element, context]] if @relativeQualifiedElementName[[element, context]]
|
144
|
+
# elements which are not in the @qualifiedElementName Hash are not in the scope
|
145
|
+
# of this serialization and will be ignored
|
146
|
+
return [] if element.nil? || @qualifiedElementName[element].nil?
|
147
|
+
return [] if context.nil? || @qualifiedElementName[context].nil?
|
148
|
+
eNames = @qualifiedElementName[element].dup
|
149
|
+
cNames = @qualifiedElementName[context].dup
|
150
|
+
while eNames.first == cNames.first && eNames.size > 1
|
151
|
+
eNames.shift
|
152
|
+
cNames.shift
|
153
|
+
end
|
154
|
+
@relativeQualifiedElementName[[element, context]] = eNames
|
155
|
+
end
|
156
|
+
|
157
|
+
def calcQualifiedElementNames(elements, prefix=[], takenNames=[])
|
158
|
+
elements = [elements] unless elements.is_a?(Array)
|
159
|
+
elements.compact!
|
160
|
+
elements.each do |element|
|
161
|
+
qualifiedNamePath = prefix + [calcInternalElementName(element, takenNames)]
|
162
|
+
@qualifiedElementName[element] ||= []
|
163
|
+
@qualifiedElementName[element] << qualifiedNamePath
|
164
|
+
takenChildNames = []
|
165
|
+
eAllStructuralFeatures(element).each do |f|
|
166
|
+
if f.is_a?(RGen::ECore::EReference) && f.containment
|
167
|
+
childs = element.getGeneric(f.name)
|
168
|
+
calcQualifiedElementNames(childs, qualifiedNamePath, takenChildNames)
|
169
|
+
end
|
170
|
+
end
|
171
|
+
end
|
172
|
+
end
|
173
|
+
|
174
|
+
def unifyQualifiedElementNames
|
175
|
+
@qualifiedElementName.keys.each do |k|
|
176
|
+
@qualifiedElementName[k] = @qualifiedElementName[k].sort{|a,b| a.size <=> b.size}.first
|
177
|
+
end
|
178
|
+
end
|
179
|
+
|
180
|
+
def calcInternalElementName(element, takenNames)
|
181
|
+
return @internalElementName[element] if @internalElementName[element]
|
182
|
+
name = if element.respond_to?(:name) && element.name && !element.name.empty?
|
183
|
+
element.name
|
184
|
+
else
|
185
|
+
nextElementHelperName(element)
|
186
|
+
end
|
187
|
+
while takenNames.include?(name)
|
188
|
+
name = nextElementHelperName(element)
|
189
|
+
end
|
190
|
+
takenNames << name
|
191
|
+
@internalElementName[element] = name
|
192
|
+
end
|
193
|
+
|
194
|
+
def nextElementHelperName(element)
|
195
|
+
eClass = element.class.ecore
|
196
|
+
@nextElementNameId ||= {}
|
197
|
+
@nextElementNameId[eClass] ||= 1
|
198
|
+
result = "_#{eClass.name}#{@nextElementNameId[eClass]}"
|
199
|
+
@nextElementNameId[eClass] += 1
|
200
|
+
result
|
201
|
+
end
|
202
|
+
|
203
|
+
def eAllStructuralFeatures(element)
|
204
|
+
@eAllStructuralFeatures ||= {}
|
205
|
+
@eAllStructuralFeatures[element.class] ||= element.class.ecore.eAllStructuralFeatures
|
206
|
+
end
|
207
|
+
|
208
|
+
def eAllReferences(eClass)
|
209
|
+
@eAllReferences ||= {}
|
210
|
+
@eAllReferences[eClass] ||= eClass.eAllReferences
|
211
|
+
end
|
212
|
+
|
213
|
+
def containmentRefs(contextClass, eClass)
|
214
|
+
@containmentRefs ||= {}
|
215
|
+
@containmentRefs[[contextClass, eClass]] ||=
|
216
|
+
eAllReferences(contextClass).select do |r|
|
217
|
+
r.containment && (eClass.eAllSuperTypes << eClass).include?(r.eType)
|
218
|
+
end
|
219
|
+
end
|
220
|
+
|
221
|
+
end
|
222
|
+
|
223
|
+
end
|
224
|
+
|
225
|
+
end
|