puppet 3.6.2-x86-mingw32 → 3.7.0-x86-mingw32
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 +308 -150
- 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,26 @@
|
|
1
|
+
# Some handy extensions to the UML13 metamodel
|
2
|
+
#
|
3
|
+
module UML13
|
4
|
+
|
5
|
+
module AssociationEnd::ClassModule
|
6
|
+
def otherEnd
|
7
|
+
association.connection.find{|c| c != self}
|
8
|
+
end
|
9
|
+
end
|
10
|
+
|
11
|
+
module Classifier::ClassModule
|
12
|
+
def localCompositeEnd
|
13
|
+
associationEnd.select{|e| e.aggregation == :composite}
|
14
|
+
end
|
15
|
+
def remoteCompositeEnd
|
16
|
+
associationEnd.otherEnd.select{|e| e.aggregation == :composite}
|
17
|
+
end
|
18
|
+
def localNavigableEnd
|
19
|
+
associationEnd.select{|e| e.isNavigable}
|
20
|
+
end
|
21
|
+
def remoteNavigableEnd
|
22
|
+
associationEnd.otherEnd.select{|e| e.isNavigable}
|
23
|
+
end
|
24
|
+
end
|
25
|
+
|
26
|
+
end
|
@@ -0,0 +1,20 @@
|
|
1
|
+
require 'rgen/environment'
|
2
|
+
require 'rgen/template_language'
|
3
|
+
require 'rgen/ecore/ecore'
|
4
|
+
require 'rgen/ecore/ecore_ext'
|
5
|
+
require 'mmgen/mm_ext/ecore_mmgen_ext'
|
6
|
+
|
7
|
+
module MMGen
|
8
|
+
|
9
|
+
module MetamodelGenerator
|
10
|
+
|
11
|
+
def generateMetamodel(rootPackage, out_file)
|
12
|
+
tc = RGen::TemplateLanguage::DirectoryTemplateContainer.new(RGen::ECore, File.dirname(out_file))
|
13
|
+
tpl_path = File.dirname(__FILE__) + '/templates'
|
14
|
+
tc.load(tpl_path)
|
15
|
+
tc.expand('metamodel_generator::GenerateMetamodel', File.basename(out_file), :for => rootPackage)
|
16
|
+
end
|
17
|
+
|
18
|
+
end
|
19
|
+
|
20
|
+
end
|
@@ -0,0 +1,91 @@
|
|
1
|
+
require 'rgen/util/name_helper'
|
2
|
+
|
3
|
+
module RGen
|
4
|
+
|
5
|
+
module ECore
|
6
|
+
|
7
|
+
module EPackage::ClassModule
|
8
|
+
include RGen::Util::NameHelper
|
9
|
+
|
10
|
+
def moduleName
|
11
|
+
firstToUpper(name)
|
12
|
+
end
|
13
|
+
|
14
|
+
def qualifiedModuleName(rootPackage)
|
15
|
+
return moduleName unless eSuperPackage and self != rootPackage
|
16
|
+
eSuperPackage.qualifiedModuleName(rootPackage) + "::" + moduleName
|
17
|
+
end
|
18
|
+
|
19
|
+
def ancestorPackages
|
20
|
+
return [] unless eSuperPackage
|
21
|
+
[eSuperPackage] + eSuperPackage.ancestorPackages
|
22
|
+
end
|
23
|
+
|
24
|
+
def ownClasses
|
25
|
+
eClassifiers.select{|c| c.is_a?(EClass)}
|
26
|
+
end
|
27
|
+
|
28
|
+
def classesInGenerationOrdering
|
29
|
+
ownClasses + eSubpackages.collect{|s| s.classesInGenerationOrdering}.flatten
|
30
|
+
end
|
31
|
+
|
32
|
+
def needClassReorder?
|
33
|
+
classesInGenerationOrdering != inheritanceOrderClasses(classesInGenerationOrdering)
|
34
|
+
end
|
35
|
+
|
36
|
+
def allClassesSorted
|
37
|
+
inheritanceOrderClasses(classesInGenerationOrdering)
|
38
|
+
end
|
39
|
+
|
40
|
+
def inheritanceOrderClasses(cls)
|
41
|
+
sortArray = cls.dup
|
42
|
+
i1 = 0
|
43
|
+
while i1 < sortArray.size-1
|
44
|
+
again = false
|
45
|
+
for i2 in i1+1..sortArray.size-1
|
46
|
+
e2 = sortArray[i2]
|
47
|
+
if sortArray[i1].eSuperTypes.include?(e2)
|
48
|
+
sortArray.delete(e2)
|
49
|
+
sortArray.insert(i1,e2)
|
50
|
+
again = true
|
51
|
+
break
|
52
|
+
end
|
53
|
+
end
|
54
|
+
i1 += 1 unless again
|
55
|
+
end
|
56
|
+
sortArray
|
57
|
+
end
|
58
|
+
end
|
59
|
+
|
60
|
+
module EClassifier::ClassModule
|
61
|
+
include RGen::Util::NameHelper
|
62
|
+
def classifierName
|
63
|
+
firstToUpper(name)
|
64
|
+
end
|
65
|
+
def qualifiedClassifierName(rootPackage)
|
66
|
+
(ePackage ? ePackage.qualifiedModuleName(rootPackage) + "::" : "") + classifierName
|
67
|
+
end
|
68
|
+
def ancestorPackages
|
69
|
+
return [] unless ePackage
|
70
|
+
[ePackage] + ePackage.ancestorPackages
|
71
|
+
end
|
72
|
+
def qualifiedClassifierNameIfRequired(package)
|
73
|
+
if ePackage != package
|
74
|
+
commonSuper = (package.ancestorPackages & ancestorPackages).first
|
75
|
+
qualifiedClassifierName(commonSuper)
|
76
|
+
else
|
77
|
+
classifierName
|
78
|
+
end
|
79
|
+
end
|
80
|
+
end
|
81
|
+
|
82
|
+
module EAttribute::ClassModule
|
83
|
+
def RubyType
|
84
|
+
typeMap = {'float' => 'Float', 'int' => 'Integer'}
|
85
|
+
(self.getType && typeMap[self.getType.downcase]) || 'String'
|
86
|
+
end
|
87
|
+
end
|
88
|
+
|
89
|
+
end
|
90
|
+
|
91
|
+
end
|
@@ -0,0 +1,28 @@
|
|
1
|
+
$:.unshift File.join(File.dirname(__FILE__),"..")
|
2
|
+
|
3
|
+
require 'ea/xmi_ecore_instantiator'
|
4
|
+
require 'mmgen/metamodel_generator'
|
5
|
+
|
6
|
+
include MMGen::MetamodelGenerator
|
7
|
+
|
8
|
+
unless ARGV.length >= 2
|
9
|
+
puts "Usage: mmgen.rb <xmi_class_model_file> <root package> (<module>)*"
|
10
|
+
exit
|
11
|
+
else
|
12
|
+
file_name = ARGV.shift
|
13
|
+
root_package_name = ARGV.shift
|
14
|
+
modules = ARGV
|
15
|
+
out_file = file_name.gsub(/\.\w+$/,'.rb')
|
16
|
+
puts out_file
|
17
|
+
end
|
18
|
+
|
19
|
+
env = RGen::Environment.new
|
20
|
+
File.open(file_name) { |f|
|
21
|
+
puts "instantiating ..."
|
22
|
+
XMIECoreInstantiator.new.instantiateECoreModel(env, f.read)
|
23
|
+
}
|
24
|
+
|
25
|
+
rootPackage = env.find(:class => RGen::ECore::EPackage, :name => root_package_name).first
|
26
|
+
|
27
|
+
puts "generating ..."
|
28
|
+
generateMetamodel(rootPackage, out_file, modules)
|
@@ -0,0 +1,37 @@
|
|
1
|
+
<% define 'Annotations', :for => EPackage do %>
|
2
|
+
<% for a in eAnnotations %>
|
3
|
+
annotation <% expand 'AnnotationArgs', :for => a %>
|
4
|
+
<% end %>
|
5
|
+
<% end %>
|
6
|
+
|
7
|
+
<% define 'Annotations', :for => EClass do %>
|
8
|
+
<% for a in eAnnotations %>
|
9
|
+
annotation <% expand 'AnnotationArgs', :for => a %>
|
10
|
+
<% end %>
|
11
|
+
<% end %>
|
12
|
+
|
13
|
+
<% define 'Annotations', :for => EStructuralFeature do %>
|
14
|
+
<% oppositeAnnotations = (this.respond_to?(:eOpposite) && eOpposite && eOpposite.eAnnotations) || [] %>
|
15
|
+
<% if eAnnotations.size > 0 || oppositeAnnotations.size > 0 %>
|
16
|
+
do<%iinc%>
|
17
|
+
<% for a in eAnnotations %>
|
18
|
+
annotation <% expand 'AnnotationArgs', :for => a %>
|
19
|
+
<% end %>
|
20
|
+
<% for a in oppositeAnnotations %>
|
21
|
+
opposite_annotation <% expand 'AnnotationArgs', :for => a %>
|
22
|
+
<% end %><%idec%>
|
23
|
+
end<%nows%>
|
24
|
+
<% end %>
|
25
|
+
<% end %>
|
26
|
+
|
27
|
+
<% define 'AnnotationArgs', :for => EAnnotation do %>
|
28
|
+
<% if source.nil? %>
|
29
|
+
<% expand 'Details' %>
|
30
|
+
<% else %>
|
31
|
+
:source => "<%= source.to_s %>", :details => {<% expand 'Details' %>}<%nows%>
|
32
|
+
<% end %>
|
33
|
+
<% end %>
|
34
|
+
|
35
|
+
<% define 'Details', :for => EAnnotation do %>
|
36
|
+
<%= details.sort{|a,b| a.key<=>b.key}.collect{ |d| "\'" + d.key + "\' => \'"+ (d.value || "").gsub('\'','\\\'').to_s + "\'"}.join(', ') %><%nows%>
|
37
|
+
<% end %>
|
@@ -0,0 +1,172 @@
|
|
1
|
+
|
2
|
+
<% define 'GenerateMetamodel', :for => EPackage do |filename| %>
|
3
|
+
<% file filename do %>
|
4
|
+
require 'rgen/metamodel_builder'
|
5
|
+
<%nl%>
|
6
|
+
<% if needClassReorder? %>
|
7
|
+
<% expand 'GeneratePackagesOnly' %>
|
8
|
+
<% expand 'GenerateClassesReordered' %>
|
9
|
+
<% else %>
|
10
|
+
<% expand 'GeneratePackage' %>
|
11
|
+
<% end %>
|
12
|
+
<%nl%>
|
13
|
+
<% expand 'GenerateAssocs' %>
|
14
|
+
<% end %>
|
15
|
+
<% end %>
|
16
|
+
|
17
|
+
<% define 'GeneratePackage', :for => EPackage do %>
|
18
|
+
module <%= moduleName %><% iinc %>
|
19
|
+
extend RGen::MetamodelBuilder::ModuleExtension
|
20
|
+
include RGen::MetamodelBuilder::DataTypes
|
21
|
+
<% expand 'annotations::Annotations' %>
|
22
|
+
<%nl%>
|
23
|
+
<% expand 'EnumTypes' %>
|
24
|
+
<% for c in ownClasses %><%nl%>
|
25
|
+
<% expand 'ClassHeader', this, :for => c %><%iinc%>
|
26
|
+
<% if c.abstract %>abstract<% end %>
|
27
|
+
<% expand 'annotations::Annotations', :for => c %>
|
28
|
+
<% expand 'Attribute', this, :foreach => c.eAttributes %>
|
29
|
+
<%idec%>
|
30
|
+
end
|
31
|
+
<% end %><%nl%>
|
32
|
+
<% for p in eSubpackages %>
|
33
|
+
<%nl%><% expand 'GeneratePackage', :for => p %>
|
34
|
+
<% end %><%idec%>
|
35
|
+
end
|
36
|
+
<% end %>
|
37
|
+
|
38
|
+
<% define 'GenerateClassesReordered', :for => EPackage do %>
|
39
|
+
<% for c in allClassesSorted %><%nl%>
|
40
|
+
<% expand 'ClassHeaderFullyQualified', this, :for => c %><%iinc%>
|
41
|
+
<% if c.abstract %>abstract<% end %>
|
42
|
+
<% expand 'annotations::Annotations', :for => c %>
|
43
|
+
<% expand 'Attribute', this, :foreach => c.eAttributes %>
|
44
|
+
<%idec%>
|
45
|
+
end
|
46
|
+
<% end %><%nl%>
|
47
|
+
<% end %>
|
48
|
+
|
49
|
+
<% define 'GeneratePackagesOnly', :for => EPackage do %>
|
50
|
+
module <%= moduleName %><% iinc %>
|
51
|
+
extend RGen::MetamodelBuilder::ModuleExtension
|
52
|
+
include RGen::MetamodelBuilder::DataTypes
|
53
|
+
<% expand 'annotations::Annotations' %>
|
54
|
+
<%nl%>
|
55
|
+
<% expand 'EnumTypes' %>
|
56
|
+
<% for p in eSubpackages %>
|
57
|
+
<%nl%><% expand 'GeneratePackagesOnly', :for => p %>
|
58
|
+
<% end %><%idec%>
|
59
|
+
end
|
60
|
+
<% end %>
|
61
|
+
|
62
|
+
<% define 'Attribute', :for => EAttribute do |rootp| %>
|
63
|
+
<% if upperBound == 1%>has_attr<% else %>has_many_attr<% end %> '<%= name %>', <%nows%>
|
64
|
+
<% if eType.is_a?(EEnum) %><%nows%>
|
65
|
+
<%= eType.qualifiedClassifierName(rootp) %><%nows%>
|
66
|
+
<% else %><%nows%>
|
67
|
+
<%= eType && eType.instanceClass.to_s %><%nows%>
|
68
|
+
<% end %><%nows%>
|
69
|
+
<% for p in RGen::MetamodelBuilder::Intermediate::Attribute.properties %>
|
70
|
+
<% unless p == :name || (p == :upperBound && (upperBound == 1 || upperBound == -1)) ||
|
71
|
+
RGen::MetamodelBuilder::Intermediate::Attribute.default_value(p) == getGeneric(p) %>
|
72
|
+
, :<%=p%> => <%nows%>
|
73
|
+
<% if getGeneric(p).is_a?(String) %>
|
74
|
+
"<%= getGeneric(p) %>"<%nows%>
|
75
|
+
<% elsif getGeneric(p).is_a?(Symbol) %>
|
76
|
+
:<%= getGeneric(p) %><%nows%>
|
77
|
+
<% else %>
|
78
|
+
<%= getGeneric(p) %><%nows%>
|
79
|
+
<% end %>
|
80
|
+
<% end %>
|
81
|
+
<% end %>
|
82
|
+
<%ws%><% expand 'annotations::Annotations' %><%nl%>
|
83
|
+
<% end %>
|
84
|
+
|
85
|
+
<% define 'EnumTypes', :for => EPackage do %>
|
86
|
+
<% for enum in eClassifiers.select{|c| c.is_a?(EEnum)} %>
|
87
|
+
<%= enum.name %> = Enum.new(:name => '<%= enum.name %>', :literals =>[ <%nows%>
|
88
|
+
<%= enum.eLiterals.collect { |lit| ":"+(lit.name =~ /^\d|\W/ ? "'"+lit.name+"'" : lit.name) }.join(', ') %> ])
|
89
|
+
<% end %>
|
90
|
+
<% end %>
|
91
|
+
|
92
|
+
<% define 'GenerateAssocs', :for => EPackage do %>
|
93
|
+
<% refDone = {} %>
|
94
|
+
<% for ref in eAllClassifiers.select{|c| c.is_a?(EClass)}.eReferences %>
|
95
|
+
<% if !refDone[ref] && ref.eOpposite %>
|
96
|
+
<% ref = ref.eOpposite if ref.eOpposite.containment %>
|
97
|
+
<% refDone[ref] = refDone[ref.eOpposite] = true %>
|
98
|
+
<% if !ref.many && !ref.eOpposite.many %>
|
99
|
+
<% if ref.containment %>
|
100
|
+
<% expand 'Reference', "contains_one", this, :for => ref %>
|
101
|
+
<% else %>
|
102
|
+
<% expand 'Reference', "one_to_one", this, :for => ref %>
|
103
|
+
<% end %>
|
104
|
+
<% elsif !ref.many && ref.eOpposite.many %>
|
105
|
+
<% expand 'Reference', "many_to_one", this, :for => ref %>
|
106
|
+
<% elsif ref.many && !ref.eOpposite.many %>
|
107
|
+
<% if ref.containment %>
|
108
|
+
<% expand 'Reference', "contains_many", this, :for => ref %>
|
109
|
+
<% else %>
|
110
|
+
<% expand 'Reference', "one_to_many", this, :for => ref %>
|
111
|
+
<% end %>
|
112
|
+
<% elsif ref.many && ref.eOpposite.many %>
|
113
|
+
<% expand 'Reference', "many_to_many", this, :for => ref %>
|
114
|
+
<% end %>
|
115
|
+
<% expand 'annotations::Annotations', :for => ref %><%nl%>
|
116
|
+
<% elsif !refDone[ref] %>
|
117
|
+
<% refDone[ref] = true %>
|
118
|
+
<% if !ref.many %>
|
119
|
+
<% if ref.containment %>
|
120
|
+
<% expand 'Reference', "contains_one_uni", this, :for => ref %>
|
121
|
+
<% else %>
|
122
|
+
<% expand 'Reference', "has_one", this, :for => ref %>
|
123
|
+
<% end %>
|
124
|
+
<% elsif ref.many %>
|
125
|
+
<% if ref.containment %>
|
126
|
+
<% expand 'Reference', "contains_many_uni", this, :for => ref %>
|
127
|
+
<% else %>
|
128
|
+
<% expand 'Reference', "has_many", this, :for => ref %>
|
129
|
+
<% end %>
|
130
|
+
<% end %>
|
131
|
+
<% expand 'annotations::Annotations', :for => ref %><%nl%>
|
132
|
+
<% end %>
|
133
|
+
<% end %>
|
134
|
+
<% end %>
|
135
|
+
|
136
|
+
<% define 'Reference', :for => EReference do |cmd, rootpackage| %>
|
137
|
+
<%= eContainingClass.qualifiedClassifierName(rootpackage) %>.<%= cmd %> '<%= name %>', <%= eType && eType.qualifiedClassifierName(rootpackage) %><%nows%>
|
138
|
+
<% if eOpposite %><%nows%>
|
139
|
+
, '<%= eOpposite.name%>'<%nows%>
|
140
|
+
<% end %><%nows%>
|
141
|
+
<% pset = RGen::MetamodelBuilder::Intermediate::Reference.properties.reject{|p| p == :name || p == :upperBound || p == :containment} %>
|
142
|
+
<% for p in pset.reject{|p| RGen::MetamodelBuilder::Intermediate::Reference.default_value(p) == getGeneric(p)} %>
|
143
|
+
, :<%=p%> => <%=getGeneric(p)%><%nows%>
|
144
|
+
<% end %>
|
145
|
+
<% if eOpposite %>
|
146
|
+
<% for p in pset.reject{|p| RGen::MetamodelBuilder::Intermediate::Reference.default_value(p) == eOpposite.getGeneric(p)} %>
|
147
|
+
, :opposite_<%=p%> => <%=eOpposite.getGeneric(p)%><%nows%>
|
148
|
+
<% end %>
|
149
|
+
<% end %><%ws%>
|
150
|
+
<% end %>
|
151
|
+
|
152
|
+
<% define 'ClassHeader', :for => EClass do |rootp| %>
|
153
|
+
class <%= classifierName %> < <% nows %>
|
154
|
+
<% if eSuperTypes.size > 1 %><% nows %>
|
155
|
+
RGen::MetamodelBuilder::MMMultiple(<%= eSuperTypes.collect{|t| t.qualifiedClassifierNameIfRequired(rootp)}.join(', ') %>)
|
156
|
+
<% elsif eSuperTypes.size > 0 %><% nows %>
|
157
|
+
<%= eSuperTypes.first.qualifiedClassifierNameIfRequired(rootp) %>
|
158
|
+
<% else %><% nows %>
|
159
|
+
RGen::MetamodelBuilder::MMBase
|
160
|
+
<% end %>
|
161
|
+
<% end %>
|
162
|
+
|
163
|
+
<% define 'ClassHeaderFullyQualified', :for => EClass do |rootp| %>
|
164
|
+
class <%= qualifiedClassifierName(rootp) %> < <% nows %>
|
165
|
+
<% if eSuperTypes.size > 1 %><% nows %>
|
166
|
+
RGen::MetamodelBuilder::MMMultiple(<%= eSuperTypes.collect{|t| t.qualifiedClassifierName(rootp)}.join(', ') %>)
|
167
|
+
<% elsif eSuperTypes.size > 0 %><% nows %>
|
168
|
+
<%= eSuperTypes.first.qualifiedClassifierName(rootp) %>
|
169
|
+
<% else %><% nows %>
|
170
|
+
RGen::MetamodelBuilder::MMBase
|
171
|
+
<% end %>
|
172
|
+
<% end %>
|
@@ -0,0 +1,45 @@
|
|
1
|
+
# RGen Framework
|
2
|
+
# (c) Martin Thiede, 2006
|
3
|
+
|
4
|
+
require 'rgen/metamodel_builder'
|
5
|
+
|
6
|
+
class Array
|
7
|
+
|
8
|
+
def >>(method)
|
9
|
+
compact.inject([]) { |r,e| r | ( (o=e.send(method)).is_a?(Array) ? o : [o] ) }
|
10
|
+
end
|
11
|
+
|
12
|
+
def method_missing(m, *args)
|
13
|
+
|
14
|
+
# This extensions has the side effect that it allows to call any method on any
|
15
|
+
# empty array with an empty array as the result. This behavior is required for
|
16
|
+
# navigating models.
|
17
|
+
#
|
18
|
+
# This is a problem for Hash[] called with an (empty) array of tupels.
|
19
|
+
# It will call to_hash expecting a Hash as the result. When it gets an array instead,
|
20
|
+
# it fails with an exception. Make sure it gets a NoMethodException as without this
|
21
|
+
# extension and it will catch that and return an empty hash as expected.
|
22
|
+
#
|
23
|
+
# Similar problems exist for other Ruby built-in methods which are expected to fail.
|
24
|
+
#
|
25
|
+
return super unless (size == 0 &&
|
26
|
+
m != :to_hash && m != :to_str) ||
|
27
|
+
compact.any?{|e| e.is_a? RGen::MetamodelBuilder::MMBase}
|
28
|
+
# use an array to build the result to achiev similar ordering
|
29
|
+
result = []
|
30
|
+
inResult = {}
|
31
|
+
compact.each do |e|
|
32
|
+
if e.is_a? RGen::MetamodelBuilder::MMBase
|
33
|
+
((o=e.send(m)).is_a?(Array) ? o : [o] ).each do |v|
|
34
|
+
next if inResult[v.object_id]
|
35
|
+
inResult[v.object_id] = true
|
36
|
+
result << v
|
37
|
+
end
|
38
|
+
else
|
39
|
+
raise StandardError.new("Trying to call a method on an array element not a RGen MMBase")
|
40
|
+
end
|
41
|
+
end
|
42
|
+
result.compact
|
43
|
+
end
|
44
|
+
|
45
|
+
end
|
@@ -0,0 +1,218 @@
|
|
1
|
+
require 'rgen/metamodel_builder'
|
2
|
+
|
3
|
+
module RGen
|
4
|
+
extend RGen::MetamodelBuilder::ModuleExtension
|
5
|
+
|
6
|
+
# This is the ECore metamodel described using the RGen::MetamodelBuilder language.
|
7
|
+
#
|
8
|
+
# Known differences to the Java/EMF implementation are:
|
9
|
+
# * Attributes can not be "many"
|
10
|
+
#
|
11
|
+
module ECore
|
12
|
+
extend RGen::MetamodelBuilder::ModuleExtension
|
13
|
+
|
14
|
+
class EObject < RGen::MetamodelBuilder::MMBase
|
15
|
+
end
|
16
|
+
|
17
|
+
class EModelElement < RGen::MetamodelBuilder::MMBase
|
18
|
+
end
|
19
|
+
|
20
|
+
class EAnnotation < RGen::MetamodelBuilder::MMMultiple(EModelElement, EObject)
|
21
|
+
has_attr 'source', String
|
22
|
+
end
|
23
|
+
|
24
|
+
class ENamedElement < EModelElement
|
25
|
+
has_attr 'name', String
|
26
|
+
end
|
27
|
+
|
28
|
+
class ETypedElement < ENamedElement
|
29
|
+
has_attr 'lowerBound', Integer, :defaultValueLiteral => "0"
|
30
|
+
has_attr 'ordered', Boolean, :defaultValueLiteral => "true"
|
31
|
+
has_attr 'unique', Boolean, :defaultValueLiteral => "true"
|
32
|
+
has_attr 'upperBound', Integer, :defaultValueLiteral => "1"
|
33
|
+
has_attr 'many', Boolean, :derived=>true
|
34
|
+
has_attr 'required', Boolean, :derived=>true
|
35
|
+
module ClassModule
|
36
|
+
def many_derived
|
37
|
+
upperBound > 1 || upperBound == -1
|
38
|
+
end
|
39
|
+
def required_derived
|
40
|
+
lowerBound > 0
|
41
|
+
end
|
42
|
+
end
|
43
|
+
end
|
44
|
+
|
45
|
+
class EStructuralFeature < ETypedElement
|
46
|
+
has_attr 'changeable', Boolean, :defaultValueLiteral => "true"
|
47
|
+
has_attr 'defaultValue', Object, :derived=>true
|
48
|
+
has_attr 'defaultValueLiteral', String
|
49
|
+
has_attr 'derived', Boolean, :defaultValueLiteral => "false"
|
50
|
+
has_attr 'transient', Boolean, :defaultValueLiteral => "false"
|
51
|
+
has_attr 'unsettable', Boolean, :defaultValueLiteral => "false"
|
52
|
+
has_attr 'volatile', Boolean, :defaultValueLiteral => "false"
|
53
|
+
module ClassModule
|
54
|
+
def defaultValue_derived
|
55
|
+
return nil if defaultValueLiteral.nil?
|
56
|
+
case eType
|
57
|
+
when EInt, ELong
|
58
|
+
defaultValueLiteral.to_i
|
59
|
+
when EFloat
|
60
|
+
defaultValueLiteral.to_f
|
61
|
+
when EEnum
|
62
|
+
defaultValueLiteral.to_sym
|
63
|
+
when EBoolean
|
64
|
+
defaultValueLiteral == "true"
|
65
|
+
when EString
|
66
|
+
defaultValueLiteral
|
67
|
+
else
|
68
|
+
raise "Unhandled type"
|
69
|
+
end
|
70
|
+
end
|
71
|
+
end
|
72
|
+
end
|
73
|
+
|
74
|
+
class EAttribute < EStructuralFeature
|
75
|
+
has_attr 'iD', Boolean, :defaultValueLiteral => "false"
|
76
|
+
end
|
77
|
+
|
78
|
+
class EClassifier < ENamedElement
|
79
|
+
has_attr 'defaultValue', Object, :derived=>true
|
80
|
+
has_attr 'instanceClass', Object, :derived=>true
|
81
|
+
has_attr 'instanceClassName', String
|
82
|
+
module ClassModule
|
83
|
+
def instanceClass_derived
|
84
|
+
map = {"java.lang.string" => "String",
|
85
|
+
"boolean" => "RGen::MetamodelBuilder::DataTypes::Boolean",
|
86
|
+
"int" => "Integer",
|
87
|
+
"long" => "RGen::MetamodelBuilder::DataTypes::Long"}
|
88
|
+
icn = instanceClassName
|
89
|
+
icn = "NilClass" if icn.nil?
|
90
|
+
icn = map[icn.downcase] if map[icn.downcase]
|
91
|
+
eval(icn)
|
92
|
+
end
|
93
|
+
end
|
94
|
+
end
|
95
|
+
|
96
|
+
class EDataType < EClassifier
|
97
|
+
has_attr 'serializable', Boolean
|
98
|
+
end
|
99
|
+
|
100
|
+
class EGenericType < EDataType
|
101
|
+
has_one 'eClassifier', EDataType
|
102
|
+
end
|
103
|
+
|
104
|
+
class ETypeArgument < EModelElement
|
105
|
+
has_one 'eClassifier', EDataType
|
106
|
+
end
|
107
|
+
|
108
|
+
class EEnum < EDataType
|
109
|
+
end
|
110
|
+
|
111
|
+
class EEnumLiteral < ENamedElement
|
112
|
+
# instance may point to a "singleton object" (e.g. a Symbol) representing the literal
|
113
|
+
# has_attr 'instance', Object, :eType=>:EEnumerator, :transient=>true
|
114
|
+
has_attr 'literal', String
|
115
|
+
has_attr 'value', Integer
|
116
|
+
end
|
117
|
+
|
118
|
+
# TODO: check if required
|
119
|
+
class EFactory < EModelElement
|
120
|
+
end
|
121
|
+
|
122
|
+
class EOperation < ETypedElement
|
123
|
+
end
|
124
|
+
|
125
|
+
class EPackage < ENamedElement
|
126
|
+
has_attr 'nsPrefix', String
|
127
|
+
has_attr 'nsURI', String
|
128
|
+
end
|
129
|
+
|
130
|
+
class EParameter < ETypedElement
|
131
|
+
end
|
132
|
+
|
133
|
+
class EReference < EStructuralFeature
|
134
|
+
has_attr 'container', Boolean, :derived=>true
|
135
|
+
has_attr 'containment', Boolean, :defaultValueLiteral => "false"
|
136
|
+
has_attr 'resolveProxies', Boolean, :defaultValueLiteral => "true"
|
137
|
+
end
|
138
|
+
|
139
|
+
class EStringToStringMapEntry < RGen::MetamodelBuilder::MMBase
|
140
|
+
has_attr 'key', String
|
141
|
+
has_attr 'value', String
|
142
|
+
end
|
143
|
+
|
144
|
+
class EClass < EClassifier
|
145
|
+
has_attr 'abstract', Boolean
|
146
|
+
has_attr 'interface', Boolean
|
147
|
+
has_one 'eIDAttribute', ECore::EAttribute, :derived=>true, :resolveProxies=>false
|
148
|
+
|
149
|
+
has_many 'eAllAttributes', ECore::EAttribute, :derived=>true
|
150
|
+
has_many 'eAllContainments', ECore::EReference, :derived=>true
|
151
|
+
has_many 'eAllOperations', ECore::EOperation, :derived=>true
|
152
|
+
has_many 'eAllReferences', ECore::EReference, :derived=>true
|
153
|
+
has_many 'eAllStructuralFeatures', ECore::EStructuralFeature, :derived=>true
|
154
|
+
has_many 'eAllSuperTypes', ECore::EClass, :derived=>true
|
155
|
+
has_many 'eAttributes', ECore::EAttribute, :derived=>true
|
156
|
+
has_many 'eReferences', ECore::EReference, :derived=>true
|
157
|
+
|
158
|
+
module ClassModule
|
159
|
+
def eAllAttributes_derived
|
160
|
+
eAttributes + eSuperTypes.eAllAttributes
|
161
|
+
end
|
162
|
+
def eAllContainments_derived
|
163
|
+
eReferences.select{|r| r.containment} + eSuperTypes.eAllContainments
|
164
|
+
end
|
165
|
+
def eAllReferences_derived
|
166
|
+
eReferences + eSuperTypes.eAllReferences
|
167
|
+
end
|
168
|
+
def eAllStructuralFeatures_derived
|
169
|
+
eStructuralFeatures + eSuperTypes.eAllStructuralFeatures
|
170
|
+
end
|
171
|
+
def eAllSuperTypes_derived
|
172
|
+
eSuperTypes + eSuperTypes.eAllSuperTypes
|
173
|
+
end
|
174
|
+
def eAttributes_derived
|
175
|
+
eStructuralFeatures.select{|f| f.is_a?(EAttribute)}
|
176
|
+
end
|
177
|
+
def eReferences_derived
|
178
|
+
eStructuralFeatures.select{|f| f.is_a?(EReference)}
|
179
|
+
end
|
180
|
+
end
|
181
|
+
end
|
182
|
+
|
183
|
+
# predefined datatypes
|
184
|
+
|
185
|
+
EString = EDataType.new(:name => "EString", :instanceClassName => "String")
|
186
|
+
EInt = EDataType.new(:name => "EInt", :instanceClassName => "Integer")
|
187
|
+
ELong = EDataType.new(:name => "ELong", :instanceClassName => "Long")
|
188
|
+
EBoolean = EDataType.new(:name => "EBoolean", :instanceClassName => "Boolean")
|
189
|
+
EFloat = EDataType.new(:name => "EFloat", :instanceClassName => "Float")
|
190
|
+
ERubyObject = EDataType.new(:name => "ERubyObject", :instanceClassName => "Object")
|
191
|
+
EJavaObject = EDataType.new(:name => "EJavaObject")
|
192
|
+
ERubyClass = EDataType.new(:name => "ERubyClass", :instanceClassName => "Class")
|
193
|
+
EJavaClass = EDataType.new(:name => "EJavaClass")
|
194
|
+
|
195
|
+
end
|
196
|
+
|
197
|
+
ECore::EModelElement.contains_many 'eAnnotations', ECore::EAnnotation, 'eModelElement', :resolveProxies=>false
|
198
|
+
ECore::EAnnotation.contains_many_uni 'details', ECore::EStringToStringMapEntry, :resolveProxies=>false
|
199
|
+
ECore::EAnnotation.contains_many_uni 'contents', ECore::EObject, :resolveProxies=>false
|
200
|
+
ECore::EAnnotation.has_many 'references', ECore::EObject
|
201
|
+
ECore::EPackage.contains_many 'eClassifiers', ECore::EClassifier, 'ePackage'
|
202
|
+
ECore::EPackage.contains_many 'eSubpackages', ECore::EPackage, 'eSuperPackage'
|
203
|
+
ECore::ETypedElement.has_one 'eType', ECore::EClassifier
|
204
|
+
ECore::EClass.contains_many 'eOperations', ECore::EOperation, 'eContainingClass', :resolveProxies=>false
|
205
|
+
ECore::EClass.contains_many 'eStructuralFeatures', ECore::EStructuralFeature, 'eContainingClass', :resolveProxies=>false
|
206
|
+
ECore::EClass.has_many 'eSuperTypes', ECore::EClass
|
207
|
+
ECore::EEnum.contains_many 'eLiterals', ECore::EEnumLiteral, 'eEnum', :resolveProxies=>false
|
208
|
+
ECore::EFactory.one_to_one 'ePackage', ECore::EPackage, 'eFactoryInstance', :lowerBound=>1, :transient=>true, :resolveProxies=>false
|
209
|
+
ECore::EOperation.contains_many 'eParameters', ECore::EParameter, 'eOperation', :resolveProxies=>false
|
210
|
+
ECore::EOperation.has_many 'eExceptions', ECore::EClassifier
|
211
|
+
ECore::EReference.has_one 'eOpposite', ECore::EReference
|
212
|
+
|
213
|
+
ECore::EAttribute.has_one 'eAttributeType', ECore::EDataType, :lowerBound=>1, :derived=>true
|
214
|
+
ECore::EReference.has_one 'eReferenceType', ECore::EClass, :lowerBound=>1, :derived=>true
|
215
|
+
ECore::EParameter.contains_one 'eGenericType', ECore::EGenericType, 'eParameter'
|
216
|
+
ECore::EGenericType.contains_many 'eTypeArguments', ECore::ETypeArgument, 'eGenericType'
|
217
|
+
|
218
|
+
end
|