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
@@ -113,6 +113,28 @@ describe Puppet::ModuleTool::Applications::Uninstaller do
|
|
113
113
|
end
|
114
114
|
end
|
115
115
|
|
116
|
+
context 'with --ignore-changes' do
|
117
|
+
def options
|
118
|
+
super.merge(:ignore_changes => true)
|
119
|
+
end
|
120
|
+
|
121
|
+
context 'with local changes' do
|
122
|
+
before do
|
123
|
+
mark_changed(File.join(primary_dir, 'stdlib'))
|
124
|
+
end
|
125
|
+
|
126
|
+
it 'overwrites the installed module with the greatest version matching that range' do
|
127
|
+
subject.should include :result => :success
|
128
|
+
end
|
129
|
+
end
|
130
|
+
|
131
|
+
context 'without local changes' do
|
132
|
+
it 'overwrites the installed module with the greatest version matching that range' do
|
133
|
+
subject.should include :result => :success
|
134
|
+
end
|
135
|
+
end
|
136
|
+
end
|
137
|
+
|
116
138
|
context "when using the --force flag" do
|
117
139
|
|
118
140
|
def options
|
@@ -2,6 +2,7 @@ require 'spec_helper'
|
|
2
2
|
require 'json'
|
3
3
|
|
4
4
|
require 'puppet/module_tool/applications'
|
5
|
+
require 'puppet/file_system'
|
5
6
|
require 'puppet_spec/modules'
|
6
7
|
|
7
8
|
describe Puppet::ModuleTool::Applications::Unpacker do
|
@@ -31,4 +32,43 @@ describe Puppet::ModuleTool::Applications::Unpacker do
|
|
31
32
|
Puppet::ModuleTool::Applications::Unpacker.run(filename, :target_dir => target)
|
32
33
|
File.should be_directory(File.join(target, 'mytarball'))
|
33
34
|
end
|
35
|
+
|
36
|
+
it "should warn about symlinks", :if => Puppet.features.manages_symlinks? do
|
37
|
+
untar = mock('Tar')
|
38
|
+
untar.expects(:unpack).with(filename, anything()) do |src, dest, _|
|
39
|
+
FileUtils.mkdir(File.join(dest, 'extractedmodule'))
|
40
|
+
File.open(File.join(dest, 'extractedmodule', 'metadata.json'), 'w+') do |file|
|
41
|
+
file.puts JSON.generate('name' => module_name, 'version' => '1.0.0')
|
42
|
+
end
|
43
|
+
FileUtils.touch(File.join(dest, 'extractedmodule/tempfile'))
|
44
|
+
Puppet::FileSystem.symlink(File.join(dest, 'extractedmodule/tempfile'), File.join(dest, 'extractedmodule/tempfile2'))
|
45
|
+
true
|
46
|
+
end
|
47
|
+
|
48
|
+
Puppet::ModuleTool::Tar.expects(:instance).returns(untar)
|
49
|
+
Puppet.expects(:warning).with(regexp_matches(/symlinks/i))
|
50
|
+
|
51
|
+
Puppet::ModuleTool::Applications::Unpacker.run(filename, :target_dir => target)
|
52
|
+
File.should be_directory(File.join(target, 'mytarball'))
|
53
|
+
end
|
54
|
+
|
55
|
+
it "should warn about symlinks in subdirectories", :if => Puppet.features.manages_symlinks? do
|
56
|
+
untar = mock('Tar')
|
57
|
+
untar.expects(:unpack).with(filename, anything()) do |src, dest, _|
|
58
|
+
FileUtils.mkdir(File.join(dest, 'extractedmodule'))
|
59
|
+
File.open(File.join(dest, 'extractedmodule', 'metadata.json'), 'w+') do |file|
|
60
|
+
file.puts JSON.generate('name' => module_name, 'version' => '1.0.0')
|
61
|
+
end
|
62
|
+
FileUtils.mkdir(File.join(dest, 'extractedmodule/manifests'))
|
63
|
+
FileUtils.touch(File.join(dest, 'extractedmodule/manifests/tempfile'))
|
64
|
+
Puppet::FileSystem.symlink(File.join(dest, 'extractedmodule/manifests/tempfile'), File.join(dest, 'extractedmodule/manifests/tempfile2'))
|
65
|
+
true
|
66
|
+
end
|
67
|
+
|
68
|
+
Puppet::ModuleTool::Tar.expects(:instance).returns(untar)
|
69
|
+
Puppet.expects(:warning).with(regexp_matches(/symlinks/i))
|
70
|
+
|
71
|
+
Puppet::ModuleTool::Applications::Unpacker.run(filename, :target_dir => target)
|
72
|
+
File.should be_directory(File.join(target, 'mytarball'))
|
73
|
+
end
|
34
74
|
end
|
@@ -52,6 +52,16 @@ describe Puppet::ModuleTool::Applications::Upgrader do
|
|
52
52
|
end
|
53
53
|
|
54
54
|
context 'for an installed module' do
|
55
|
+
context 'with only one version' do
|
56
|
+
before { preinstall('puppetlabs-oneversion', '0.0.1') }
|
57
|
+
let(:module) { 'puppetlabs-oneversion' }
|
58
|
+
|
59
|
+
it 'declines to upgrade' do
|
60
|
+
subject.should include :result => :noop
|
61
|
+
subject[:error][:multiline].should =~ /already the latest version/
|
62
|
+
end
|
63
|
+
end
|
64
|
+
|
55
65
|
context 'without dependencies' do
|
56
66
|
before { preinstall('pmtacceptance-stdlib', '1.0.0') }
|
57
67
|
|
@@ -90,6 +100,7 @@ describe Puppet::ModuleTool::Applications::Upgrader do
|
|
90
100
|
context 'without options' do
|
91
101
|
it 'declines to upgrade' do
|
92
102
|
subject.should include :result => :noop
|
103
|
+
subject[:error][:multiline].should =~ /already the latest version/
|
93
104
|
end
|
94
105
|
end
|
95
106
|
|
@@ -165,6 +176,17 @@ describe Puppet::ModuleTool::Applications::Upgrader do
|
|
165
176
|
subject.should include :result => :failure
|
166
177
|
subject[:error].should include :oneline => "Could not upgrade '#{self.module}'; module has had changes made locally"
|
167
178
|
end
|
179
|
+
|
180
|
+
context 'with --ignore-changes' do
|
181
|
+
def options
|
182
|
+
super.merge(:ignore_changes => true)
|
183
|
+
end
|
184
|
+
|
185
|
+
it 'overwrites the installed module with the greatest version matching that range' do
|
186
|
+
subject.should include :result => :success
|
187
|
+
graph_should_include 'pmtacceptance-stdlib', v('1.0.0') => v('4.1.0')
|
188
|
+
end
|
189
|
+
end
|
168
190
|
end
|
169
191
|
|
170
192
|
context 'with dependencies' do
|
@@ -0,0 +1,49 @@
|
|
1
|
+
require 'spec_helper'
|
2
|
+
require 'puppet/module_tool/installed_modules'
|
3
|
+
require 'puppet_spec/modules'
|
4
|
+
|
5
|
+
describe Puppet::ModuleTool::InstalledModules do
|
6
|
+
include PuppetSpec::Files
|
7
|
+
|
8
|
+
around do |example|
|
9
|
+
dir = tmpdir("deep_path")
|
10
|
+
|
11
|
+
FileUtils.mkdir_p(@modpath = File.join(dir, "modpath"))
|
12
|
+
|
13
|
+
@env = Puppet::Node::Environment.create(:env, [@modpath])
|
14
|
+
Puppet.override(:current_environment => @env) do
|
15
|
+
example.run
|
16
|
+
end
|
17
|
+
end
|
18
|
+
|
19
|
+
it 'works when given a semantic version' do
|
20
|
+
mod = PuppetSpec::Modules.create('goodsemver', @modpath, :metadata => {:version => '1.2.3'})
|
21
|
+
installed = described_class.new(@env)
|
22
|
+
expect(installed.modules["puppetlabs-#{mod.name}"].version).to eq(Semantic::Version.parse('1.2.3'))
|
23
|
+
end
|
24
|
+
|
25
|
+
it 'defaults when not given a semantic version' do
|
26
|
+
mod = PuppetSpec::Modules.create('badsemver', @modpath, :metadata => {:version => 'banana'})
|
27
|
+
Puppet.expects(:warning).with(regexp_matches(/Semantic Version/))
|
28
|
+
installed = described_class.new(@env)
|
29
|
+
expect(installed.modules["puppetlabs-#{mod.name}"].version).to eq(Semantic::Version.parse('0.0.0'))
|
30
|
+
end
|
31
|
+
|
32
|
+
it 'defaults when not given a full semantic version' do
|
33
|
+
mod = PuppetSpec::Modules.create('badsemver', @modpath, :metadata => {:version => '1.2'})
|
34
|
+
Puppet.expects(:warning).with(regexp_matches(/Semantic Version/))
|
35
|
+
installed = described_class.new(@env)
|
36
|
+
expect(installed.modules["puppetlabs-#{mod.name}"].version).to eq(Semantic::Version.parse('0.0.0'))
|
37
|
+
end
|
38
|
+
|
39
|
+
it 'still works if there is an invalid version in one of the modules' do
|
40
|
+
mod1 = PuppetSpec::Modules.create('badsemver', @modpath, :metadata => {:version => 'banana'})
|
41
|
+
mod2 = PuppetSpec::Modules.create('goodsemver', @modpath, :metadata => {:version => '1.2.3'})
|
42
|
+
mod3 = PuppetSpec::Modules.create('notquitesemver', @modpath, :metadata => {:version => '1.2'})
|
43
|
+
Puppet.expects(:warning).with(regexp_matches(/Semantic Version/)).twice
|
44
|
+
installed = described_class.new(@env)
|
45
|
+
expect(installed.modules["puppetlabs-#{mod1.name}"].version).to eq(Semantic::Version.parse('0.0.0'))
|
46
|
+
expect(installed.modules["puppetlabs-#{mod2.name}"].version).to eq(Semantic::Version.parse('1.2.3'))
|
47
|
+
expect(installed.modules["puppetlabs-#{mod3.name}"].version).to eq(Semantic::Version.parse('0.0.0'))
|
48
|
+
end
|
49
|
+
end
|
@@ -5,6 +5,19 @@ describe Puppet::ModuleTool::Metadata do
|
|
5
5
|
let(:data) { {} }
|
6
6
|
let(:metadata) { Puppet::ModuleTool::Metadata.new }
|
7
7
|
|
8
|
+
describe 'property lookups' do
|
9
|
+
subject { metadata }
|
10
|
+
|
11
|
+
%w[ name version author summary license source project_page issues_url
|
12
|
+
dependencies dashed_name release_name description ].each do |prop|
|
13
|
+
describe "##{prop}" do
|
14
|
+
it "responds to the property" do
|
15
|
+
subject.send(prop)
|
16
|
+
end
|
17
|
+
end
|
18
|
+
end
|
19
|
+
end
|
20
|
+
|
8
21
|
describe "#update" do
|
9
22
|
subject { metadata.update(data) }
|
10
23
|
|
@@ -156,6 +169,61 @@ describe Puppet::ModuleTool::Metadata do
|
|
156
169
|
|
157
170
|
end
|
158
171
|
|
172
|
+
context "with a valid dependency" do
|
173
|
+
let(:data) { {'dependencies' => [{'name' => 'puppetlabs-goodmodule'}] }}
|
174
|
+
|
175
|
+
it "adds the dependency" do
|
176
|
+
subject.dependencies.size.should == 1
|
177
|
+
end
|
178
|
+
end
|
179
|
+
|
180
|
+
context "with a invalid dependency name" do
|
181
|
+
let(:data) { {'dependencies' => [{'name' => 'puppetlabsbadmodule'}] }}
|
182
|
+
|
183
|
+
it "raises an exception" do
|
184
|
+
expect { subject }.to raise_error(ArgumentError)
|
185
|
+
end
|
186
|
+
end
|
187
|
+
|
188
|
+
context "with a valid dependency version range" do
|
189
|
+
let(:data) { {'dependencies' => [{'name' => 'puppetlabs-badmodule', 'version_requirement' => '>= 2.0.0'}] }}
|
190
|
+
|
191
|
+
it "adds the dependency" do
|
192
|
+
subject.dependencies.size.should == 1
|
193
|
+
end
|
194
|
+
end
|
195
|
+
|
196
|
+
context "with a invalid version range" do
|
197
|
+
let(:data) { {'dependencies' => [{'name' => 'puppetlabsbadmodule', 'version_requirement' => '>= banana'}] }}
|
198
|
+
|
199
|
+
it "raises an exception" do
|
200
|
+
expect { subject }.to raise_error(ArgumentError)
|
201
|
+
end
|
202
|
+
end
|
203
|
+
|
204
|
+
context "with duplicate dependencies" do
|
205
|
+
let(:data) { {'dependencies' => [{'name' => 'puppetlabs-dupmodule', 'version_requirement' => '1.0.0'},
|
206
|
+
{'name' => 'puppetlabs-dupmodule', 'version_requirement' => '0.0.1'}] }
|
207
|
+
}
|
208
|
+
|
209
|
+
it "raises an exception" do
|
210
|
+
expect { subject }.to raise_error(ArgumentError)
|
211
|
+
end
|
212
|
+
end
|
213
|
+
|
214
|
+
context "adding a duplicate dependency" do
|
215
|
+
let(:data) { {'dependencies' => [{'name' => 'puppetlabs-origmodule', 'version_requirement' => '1.0.0'}] }}
|
216
|
+
|
217
|
+
it "with a different version raises an exception" do
|
218
|
+
metadata.add_dependency('puppetlabs-origmodule', '>= 0.0.1')
|
219
|
+
expect { subject }.to raise_error(ArgumentError)
|
220
|
+
end
|
221
|
+
|
222
|
+
it "with the same version does not add another dependency" do
|
223
|
+
metadata.add_dependency('puppetlabs-origmodule', '1.0.0')
|
224
|
+
subject.dependencies.size.should == 1
|
225
|
+
end
|
226
|
+
end
|
159
227
|
end
|
160
228
|
|
161
229
|
describe '#dashed_name' do
|
@@ -202,8 +270,8 @@ describe Puppet::ModuleTool::Metadata do
|
|
202
270
|
describe "#to_hash" do
|
203
271
|
subject { metadata.to_hash }
|
204
272
|
|
205
|
-
|
206
|
-
subject.sort.should == %w[ name version author summary license source issues_url project_page dependencies ].sort
|
273
|
+
it "contains the default set of keys" do
|
274
|
+
subject.keys.sort.should == %w[ name version author summary license source issues_url project_page dependencies ].sort
|
207
275
|
end
|
208
276
|
|
209
277
|
describe "['license']" do
|
@@ -213,8 +281,8 @@ describe Puppet::ModuleTool::Metadata do
|
|
213
281
|
end
|
214
282
|
|
215
283
|
describe "['dependencies']" do
|
216
|
-
it "defaults to an empty
|
217
|
-
subject['dependencies'].should ==
|
284
|
+
it "defaults to an empty set" do
|
285
|
+
subject['dependencies'].should == Set.new
|
218
286
|
end
|
219
287
|
end
|
220
288
|
|
@@ -54,6 +54,7 @@ describe Puppet::ModuleTool::Tar::Mini, :if => (Puppet.features.minitar? and Pup
|
|
54
54
|
reader = mock('GzipReader')
|
55
55
|
|
56
56
|
Zlib::GzipReader.expects(:open).with(sourcefile).yields(reader)
|
57
|
-
|
57
|
+
minitar.expects(:find_valid_files).with(reader).returns([name])
|
58
|
+
Archive::Tar::Minitar.expects(:unpack).with(reader, destdir, [name]).yields(type, name, nil)
|
58
59
|
end
|
59
60
|
end
|
@@ -81,6 +81,10 @@ describe Puppet::Network::Authentication do
|
|
81
81
|
cert.stubs(:unmunged_name).returns('foo')
|
82
82
|
end
|
83
83
|
|
84
|
+
after(:all) do
|
85
|
+
reload_module
|
86
|
+
end
|
87
|
+
|
84
88
|
it "should log a warning if a certificate's expiration is near" do
|
85
89
|
logger.expects(:warning)
|
86
90
|
subject.warn_if_near_expiration(cert)
|
@@ -23,20 +23,41 @@ describe Puppet::Network::HTTP::API::V2::Environments do
|
|
23
23
|
"production" => {
|
24
24
|
"settings" => {
|
25
25
|
"modulepath" => [File.expand_path("/first"), File.expand_path("/second")],
|
26
|
-
"manifest" => File.expand_path("/manifests")
|
26
|
+
"manifest" => File.expand_path("/manifests"),
|
27
|
+
"environment_timeout" => 0,
|
28
|
+
"config_version" => ""
|
27
29
|
}
|
28
30
|
}
|
29
31
|
}
|
30
32
|
})
|
31
33
|
end
|
32
34
|
|
33
|
-
it "the response conforms to the environments schema" do
|
35
|
+
it "the response conforms to the environments schema for unlimited timeout" do
|
36
|
+
conf_stub = stub 'conf_stub'
|
37
|
+
conf_stub.expects(:environment_timeout).returns(1.0 / 0.0)
|
34
38
|
environment = Puppet::Node::Environment.create(:production, [])
|
35
|
-
|
39
|
+
env_loader = Puppet::Environments::Static.new(environment)
|
40
|
+
env_loader.expects(:get_conf).with(:production).returns(conf_stub)
|
41
|
+
handler = Puppet::Network::HTTP::API::V2::Environments.new(env_loader)
|
36
42
|
response = Puppet::Network::HTTP::MemoryResponse.new
|
37
43
|
|
38
44
|
handler.call(Puppet::Network::HTTP::Request.from_hash(:headers => { 'accept' => 'application/json' }), response)
|
39
45
|
|
40
46
|
expect(response.body).to validate_against('api/schemas/environments.json')
|
41
47
|
end
|
48
|
+
|
49
|
+
it "the response conforms to the environments schema for integer timeout" do
|
50
|
+
conf_stub = stub 'conf_stub'
|
51
|
+
conf_stub.expects(:environment_timeout).returns(1)
|
52
|
+
environment = Puppet::Node::Environment.create(:production, [])
|
53
|
+
env_loader = Puppet::Environments::Static.new(environment)
|
54
|
+
env_loader.expects(:get_conf).with(:production).returns(conf_stub)
|
55
|
+
handler = Puppet::Network::HTTP::API::V2::Environments.new(env_loader)
|
56
|
+
response = Puppet::Network::HTTP::MemoryResponse.new
|
57
|
+
|
58
|
+
handler.call(Puppet::Network::HTTP::Request.from_hash(:headers => { 'accept' => 'application/json' }), response)
|
59
|
+
|
60
|
+
expect(response.body).to validate_against('api/schemas/environments.json')
|
61
|
+
end
|
62
|
+
|
42
63
|
end
|
@@ -11,50 +11,30 @@ describe Puppet::Network::HTTP::Connection do
|
|
11
11
|
let (:httpok) { Net::HTTPOK.new('1.1', 200, '') }
|
12
12
|
|
13
13
|
context "when providing HTTP connections" do
|
14
|
-
after do
|
15
|
-
Puppet::Network::HTTP::Connection.instance_variable_set("@ssl_host", nil)
|
16
|
-
end
|
17
|
-
|
18
14
|
context "when initializing http instances" do
|
19
|
-
before :each do
|
20
|
-
# All of the cert stuff is tested elsewhere
|
21
|
-
Puppet::Network::HTTP::Connection.stubs(:cert_setup)
|
22
|
-
end
|
23
|
-
|
24
15
|
it "should return an http instance created with the passed host and port" do
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
16
|
+
conn = Puppet::Network::HTTP::Connection.new(host, port, :verify => Puppet::SSL::Validator.no_validator)
|
17
|
+
|
18
|
+
expect(conn.address).to eq(host)
|
19
|
+
expect(conn.port).to eq(port)
|
29
20
|
end
|
30
21
|
|
31
22
|
it "should enable ssl on the http instance by default" do
|
32
|
-
|
33
|
-
http.should be_use_ssl
|
34
|
-
end
|
23
|
+
conn = Puppet::Network::HTTP::Connection.new(host, port, :verify => Puppet::SSL::Validator.no_validator)
|
35
24
|
|
36
|
-
|
37
|
-
Puppet::Network::HTTP::Connection.new(host, port, :use_ssl => false, :verify => Puppet::SSL::Validator.no_validator).send(:connection).should_not be_use_ssl
|
38
|
-
Puppet::Network::HTTP::Connection.new(host, port, :use_ssl => true, :verify => Puppet::SSL::Validator.no_validator).send(:connection).should be_use_ssl
|
25
|
+
expect(conn).to be_use_ssl
|
39
26
|
end
|
40
27
|
|
41
|
-
|
42
|
-
|
43
|
-
before :each do
|
44
|
-
Puppet[:http_proxy_host] = "myhost"
|
45
|
-
Puppet[:http_proxy_port] = 432
|
46
|
-
Puppet[:configtimeout] = 120
|
47
|
-
end
|
28
|
+
it "can disable ssl using an option" do
|
29
|
+
conn = Puppet::Network::HTTP::Connection.new(host, port, :use_ssl => false, :verify => Puppet::SSL::Validator.no_validator)
|
48
30
|
|
49
|
-
|
50
|
-
its(:read_timeout) { should == Puppet[:configtimeout] }
|
51
|
-
its(:proxy_address) { should == Puppet[:http_proxy_host] }
|
52
|
-
its(:proxy_port) { should == Puppet[:http_proxy_port] }
|
31
|
+
expect(conn).to_not be_use_ssl
|
53
32
|
end
|
54
33
|
|
55
|
-
it "
|
56
|
-
Puppet
|
57
|
-
|
34
|
+
it "can enable ssl using an option" do
|
35
|
+
conn = Puppet::Network::HTTP::Connection.new(host, port, :use_ssl => true, :verify => Puppet::SSL::Validator.no_validator)
|
36
|
+
|
37
|
+
expect(conn).to be_use_ssl
|
58
38
|
end
|
59
39
|
|
60
40
|
it "should raise Puppet::Error when invalid options are specified" do
|
@@ -96,7 +76,44 @@ describe Puppet::Network::HTTP::Connection do
|
|
96
76
|
end
|
97
77
|
end
|
98
78
|
|
99
|
-
|
79
|
+
class ConstantErrorValidator
|
80
|
+
def initialize(args)
|
81
|
+
@fails_with = args[:fails_with]
|
82
|
+
@error_string = args[:error_string] || ""
|
83
|
+
@peer_certs = args[:peer_certs] || []
|
84
|
+
end
|
85
|
+
|
86
|
+
def setup_connection(connection)
|
87
|
+
connection.stubs(:start).raises(OpenSSL::SSL::SSLError.new(@fails_with))
|
88
|
+
end
|
89
|
+
|
90
|
+
def peer_certs
|
91
|
+
@peer_certs
|
92
|
+
end
|
93
|
+
|
94
|
+
def verify_errors
|
95
|
+
[@error_string]
|
96
|
+
end
|
97
|
+
end
|
98
|
+
|
99
|
+
class NoProblemsValidator
|
100
|
+
def initialize(cert)
|
101
|
+
@cert = cert
|
102
|
+
end
|
103
|
+
|
104
|
+
def setup_connection(connection)
|
105
|
+
end
|
106
|
+
|
107
|
+
def peer_certs
|
108
|
+
[@cert]
|
109
|
+
end
|
110
|
+
|
111
|
+
def verify_errors
|
112
|
+
[]
|
113
|
+
end
|
114
|
+
end
|
115
|
+
|
116
|
+
shared_examples_for 'ssl verifier' do
|
100
117
|
include PuppetSpec::Files
|
101
118
|
|
102
119
|
let (:host) { "my_server" }
|
@@ -117,11 +134,11 @@ describe Puppet::Network::HTTP::Connection do
|
|
117
134
|
Puppet[:confdir] = tmpdir('conf')
|
118
135
|
|
119
136
|
connection = Puppet::Network::HTTP::Connection.new(
|
120
|
-
|
121
|
-
|
122
|
-
|
123
|
-
|
124
|
-
|
137
|
+
host, port,
|
138
|
+
:verify => ConstantErrorValidator.new(
|
139
|
+
:fails_with => 'hostname was not match with server certificate',
|
140
|
+
:peer_certs => [Puppet::SSL::CertificateAuthority.new.generate(
|
141
|
+
'not_my_server', :dns_alt_names => 'foo,bar,baz')]))
|
125
142
|
|
126
143
|
expect do
|
127
144
|
connection.get('request')
|
@@ -150,86 +167,104 @@ describe Puppet::Network::HTTP::Connection do
|
|
150
167
|
host, port,
|
151
168
|
:verify => NoProblemsValidator.new(cert))
|
152
169
|
|
170
|
+
Net::HTTP.any_instance.stubs(:start)
|
153
171
|
Net::HTTP.any_instance.stubs(:request).returns(httpok)
|
154
172
|
|
155
173
|
connection.expects(:warn_if_near_expiration).with(cert)
|
156
174
|
|
157
175
|
connection.get('request')
|
158
176
|
end
|
177
|
+
end
|
159
178
|
|
160
|
-
|
161
|
-
|
162
|
-
|
163
|
-
|
164
|
-
@peer_certs = args[:peer_certs] || []
|
165
|
-
end
|
179
|
+
context "when using single use HTTPS connections" do
|
180
|
+
it_behaves_like 'ssl verifier' do
|
181
|
+
end
|
182
|
+
end
|
166
183
|
|
167
|
-
|
168
|
-
|
169
|
-
|
170
|
-
|
184
|
+
context "when using persistent HTTPS connections" do
|
185
|
+
around :each do |example|
|
186
|
+
pool = Puppet::Network::HTTP::Pool.new
|
187
|
+
Puppet.override(:http_pool => pool) do
|
188
|
+
example.run
|
171
189
|
end
|
190
|
+
pool.close
|
191
|
+
end
|
172
192
|
|
173
|
-
|
174
|
-
|
175
|
-
|
193
|
+
it_behaves_like 'ssl verifier' do
|
194
|
+
end
|
195
|
+
end
|
176
196
|
|
177
|
-
|
178
|
-
|
179
|
-
|
197
|
+
context "when response is a redirect" do
|
198
|
+
let (:site) { Puppet::Network::HTTP::Site.new('http', 'my_server', 8140) }
|
199
|
+
let (:other_site) { Puppet::Network::HTTP::Site.new('http', 'redirected', 9292) }
|
200
|
+
let (:other_path) { "other-path" }
|
201
|
+
let (:verify) { Puppet::SSL::Validator.no_validator }
|
202
|
+
let (:subject) { Puppet::Network::HTTP::Connection.new(site.host, site.port, :use_ssl => false, :verify => verify) }
|
203
|
+
let (:httpredirection) do
|
204
|
+
response = Net::HTTPFound.new('1.1', 302, 'Moved Temporarily')
|
205
|
+
response['location'] = "#{other_site.addr}/#{other_path}"
|
206
|
+
response.stubs(:read_body).returns("This resource has moved")
|
207
|
+
response
|
180
208
|
end
|
181
209
|
|
182
|
-
|
183
|
-
|
184
|
-
|
185
|
-
|
210
|
+
def create_connection(site, options)
|
211
|
+
options[:use_ssl] = site.use_ssl?
|
212
|
+
Puppet::Network::HTTP::Connection.new(site.host, site.port, options)
|
213
|
+
end
|
186
214
|
|
187
|
-
|
188
|
-
|
215
|
+
it "should redirect to the final resource location" do
|
216
|
+
http = stub('http')
|
217
|
+
http.stubs(:request).returns(httpredirection).then.returns(httpok)
|
189
218
|
|
190
|
-
|
191
|
-
|
192
|
-
|
219
|
+
seq = sequence('redirection')
|
220
|
+
pool = Puppet.lookup(:http_pool)
|
221
|
+
pool.expects(:with_connection).with(site, anything).yields(http).in_sequence(seq)
|
222
|
+
pool.expects(:with_connection).with(other_site, anything).yields(http).in_sequence(seq)
|
193
223
|
|
194
|
-
|
195
|
-
|
196
|
-
end
|
224
|
+
conn = create_connection(site, :verify => verify)
|
225
|
+
conn.get('/foo')
|
197
226
|
end
|
198
|
-
end
|
199
227
|
|
200
|
-
|
201
|
-
|
202
|
-
|
203
|
-
let (:other_path) { "other-path" }
|
204
|
-
let (:subject) { Puppet::Network::HTTP::Connection.new("my_server", 8140, :use_ssl => false, :verify => Puppet::SSL::Validator.no_validator) }
|
205
|
-
let (:httpredirection) { Net::HTTPFound.new('1.1', 302, 'Moved Temporarily') }
|
228
|
+
def expects_redirection(conn, &block)
|
229
|
+
http = stub('http')
|
230
|
+
http.stubs(:request).returns(httpredirection)
|
206
231
|
|
207
|
-
|
208
|
-
|
209
|
-
|
232
|
+
pool = Puppet.lookup(:http_pool)
|
233
|
+
pool.expects(:with_connection).with(site, anything).yields(http)
|
234
|
+
pool
|
235
|
+
end
|
210
236
|
|
211
|
-
|
212
|
-
|
237
|
+
def expects_limit_exceeded(conn)
|
238
|
+
expect {
|
239
|
+
conn.get('/')
|
240
|
+
}.to raise_error(Puppet::Network::HTTP::RedirectionLimitExceededException)
|
241
|
+
end
|
213
242
|
|
214
|
-
|
215
|
-
|
243
|
+
it "should not redirect when the limit is 0" do
|
244
|
+
conn = create_connection(site, :verify => verify, :redirect_limit => 0)
|
245
|
+
|
246
|
+
pool = expects_redirection(conn)
|
247
|
+
pool.expects(:with_connection).with(other_site, anything).never
|
248
|
+
|
249
|
+
expects_limit_exceeded(conn)
|
216
250
|
end
|
217
251
|
|
218
|
-
it "should redirect
|
219
|
-
|
220
|
-
|
252
|
+
it "should redirect only once" do
|
253
|
+
conn = create_connection(site, :verify => verify, :redirect_limit => 1)
|
254
|
+
|
255
|
+
pool = expects_redirection(conn)
|
256
|
+
pool.expects(:with_connection).with(other_site, anything).once
|
221
257
|
|
222
|
-
|
223
|
-
subject.port.should == other_port
|
224
|
-
subject.address.should == other_host
|
258
|
+
expects_limit_exceeded(conn)
|
225
259
|
end
|
226
260
|
|
227
|
-
it "should raise an
|
228
|
-
|
261
|
+
it "should raise an exception when the redirect limit is exceeded" do
|
262
|
+
conn = create_connection(site, :verify => verify, :redirect_limit => 3)
|
229
263
|
|
230
|
-
|
231
|
-
|
232
|
-
|
264
|
+
pool = expects_redirection(conn)
|
265
|
+
pool.expects(:with_connection).with(other_site, anything).times(3)
|
266
|
+
|
267
|
+
expects_limit_exceeded(conn)
|
233
268
|
end
|
234
269
|
end
|
235
270
|
|