puppet 4.3.2-x86-mingw32 → 4.4.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/COMMITTERS.md +2 -2
- data/CONTRIBUTING.md +6 -6
- data/LICENSE +1 -1
- data/README.md +8 -9
- data/conf/auth.conf +2 -2
- data/ext/README.environment +1 -1
- data/ext/debian/README.source +1 -1
- data/ext/debian/control +1 -1
- data/ext/debian/copyright +4 -4
- data/ext/debian/puppetmaster.README.debian +11 -9
- data/ext/emacs/puppet-mode.el +1 -1
- data/ext/envpuppet +2 -2
- data/ext/ips/puppetagent.xml +1 -1
- data/ext/ips/puppetmaster.xml +1 -1
- data/ext/project_data.yaml +8 -0
- data/ext/puppet-test +3 -3
- data/ext/rack/example-passenger-vhost.conf +1 -1
- data/ext/redhat/puppet.spec.erb +2 -2
- data/ext/regexp_nodes/regexp_nodes.rb +1 -1
- data/ext/solaris/pkginfo +1 -1
- data/ext/solaris/smf/puppet.xml +1 -1
- data/ext/suse/puppet.spec +2 -2
- data/ext/upload_facts.rb +1 -1
- data/ext/windows/puppet_interactive.bat +6 -0
- data/ext/windows/puppet_shell.bat +9 -0
- data/ext/windows/run_puppet_interactive.bat +9 -0
- data/ext/yaml_nodes.rb +1 -1
- data/install.rb +30 -20
- data/lib/puppet/agent.rb +1 -1
- data/lib/puppet/application/agent.rb +4 -2
- data/lib/puppet/application/apply.rb +7 -4
- data/lib/puppet/application/cert.rb +1 -1
- data/lib/puppet/application/device.rb +1 -1
- data/lib/puppet/application/filebucket.rb +1 -1
- data/lib/puppet/application/inspect.rb +1 -1
- data/lib/puppet/application/lookup.rb +4 -4
- data/lib/puppet/application/master.rb +2 -2
- data/lib/puppet/application/resource.rb +1 -1
- data/lib/puppet/configurer.rb +100 -22
- data/lib/puppet/data_providers/hiera_config.rb +28 -3
- data/lib/puppet/data_providers/hiera_interpolate.rb +30 -15
- data/lib/puppet/data_providers/hiera_support.rb +1 -1
- data/lib/puppet/data_providers/json_data_provider_factory.rb +2 -2
- data/lib/puppet/data_providers/yaml_data_provider_factory.rb +2 -2
- data/lib/puppet/defaults.rb +65 -19
- data/lib/puppet/environments.rb +3 -1
- data/lib/puppet/face/config.rb +1 -1
- data/lib/puppet/face/epp.rb +1 -1
- data/lib/puppet/face/help/man.erb +1 -1
- data/lib/puppet/face/module/install.rb +6 -6
- data/lib/puppet/face/parser.rb +12 -9
- data/lib/puppet/face/status.rb +2 -1
- data/lib/puppet/feature/cfpropertylist.rb +3 -0
- data/lib/puppet/feature/telnet.rb +9 -0
- data/lib/puppet/file_serving/http_metadata.rb +46 -0
- data/lib/puppet/file_serving/metadata.rb +18 -2
- data/lib/puppet/file_serving/terminus_selector.rb +2 -0
- data/lib/puppet/file_system.rb +2 -2
- data/lib/puppet/file_system/file_impl.rb +2 -2
- data/lib/puppet/file_system/memory_impl.rb +1 -1
- data/lib/puppet/file_system/uniquefile.rb +1 -1
- data/lib/puppet/forge.rb +1 -1
- data/lib/puppet/forge/repository.rb +1 -31
- data/lib/puppet/functions.rb +45 -6
- data/lib/puppet/functions/assert_type.rb +9 -9
- data/lib/puppet/functions/each.rb +5 -13
- data/lib/puppet/functions/filter.rb +5 -14
- data/lib/puppet/functions/map.rb +6 -14
- data/lib/puppet/functions/reduce.rb +5 -13
- data/lib/puppet/functions/reverse_each.rb +82 -0
- data/lib/puppet/functions/scanf.rb +15 -18
- data/lib/puppet/functions/slice.rb +22 -36
- data/lib/puppet/functions/split.rb +2 -2
- data/lib/puppet/functions/step.rb +88 -0
- data/lib/puppet/functions/type.rb +70 -0
- data/lib/puppet/graph/rb_tree_map.rb +1 -1
- data/lib/puppet/indirector/catalog/compiler.rb +188 -5
- data/lib/puppet/indirector/file_content/http.rb +15 -0
- data/lib/puppet/indirector/file_metadata/http.rb +27 -0
- data/lib/puppet/indirector/generic_http.rb +16 -0
- data/lib/puppet/indirector/node/exec.rb +1 -1
- data/lib/puppet/indirector/node/ldap.rb +1 -1
- data/lib/puppet/indirector/rest.rb +2 -1
- data/lib/puppet/info_service/class_information_service.rb +13 -12
- data/lib/puppet/loaders.rb +1 -0
- data/lib/puppet/module.rb +3 -0
- data/lib/puppet/module_tool/skeleton/templates/generator/Gemfile +9 -2
- data/lib/puppet/module_tool/skeleton/templates/generator/spec/classes/init_spec.rb.erb +1 -1
- data/lib/puppet/module_tool/skeleton/templates/generator/tests/init.pp.erb +2 -2
- data/lib/puppet/module_tool/tar/mini.rb +3 -3
- data/lib/puppet/network/http/pool.rb +9 -0
- data/lib/puppet/node.rb +1 -1
- data/lib/puppet/node/environment.rb +11 -2
- data/lib/puppet/parser/ast/pops_bridge.rb +19 -22
- data/lib/puppet/parser/compiler.rb +3 -3
- data/lib/puppet/parser/environment_compiler.rb +0 -1
- data/lib/puppet/parser/functions.rb +28 -16
- data/lib/puppet/parser/functions/fqdn_rand.rb +1 -1
- data/lib/puppet/parser/functions/inline_template.rb +1 -1
- data/lib/puppet/parser/functions/map.rb +1 -1
- data/lib/puppet/parser/functions/scanf.rb +15 -26
- data/lib/puppet/parser/functions/slice.rb +17 -24
- data/lib/puppet/parser/functions/split.rb +1 -1
- data/lib/puppet/parser/resource.rb +19 -17
- data/lib/puppet/parser/scope.rb +176 -5
- data/lib/puppet/plugins/data_providers/data_provider.rb +54 -13
- data/lib/puppet/pops.rb +0 -8
- data/lib/puppet/pops/adaptable.rb +4 -1
- data/lib/puppet/pops/adapters.rb +38 -13
- data/lib/puppet/pops/binder/binder.rb +21 -17
- data/lib/puppet/pops/binder/binder_issues.rb +8 -6
- data/lib/puppet/pops/binder/bindings_checker.rb +12 -8
- data/lib/puppet/pops/binder/bindings_composer.rb +16 -12
- data/lib/puppet/pops/binder/bindings_factory.rb +108 -104
- data/lib/puppet/pops/binder/bindings_model.rb +49 -47
- data/lib/puppet/pops/binder/config/diagnostic_producer.rb +10 -6
- data/lib/puppet/pops/binder/injector.rb +53 -48
- data/lib/puppet/pops/binder/key_factory.rb +10 -6
- data/lib/puppet/pops/binder/producers.rb +67 -62
- data/lib/puppet/pops/evaluator/access_operator.rb +95 -93
- data/lib/puppet/pops/evaluator/closure.rb +84 -68
- data/lib/puppet/pops/evaluator/collector_transformer.rb +18 -14
- data/lib/puppet/pops/evaluator/collectors/exported_collector.rb +0 -1
- data/lib/puppet/pops/evaluator/compare_operator.rb +13 -9
- data/lib/puppet/pops/evaluator/epp_evaluator.rb +9 -8
- data/lib/puppet/pops/evaluator/evaluator_impl.rb +78 -76
- data/lib/puppet/pops/evaluator/json_strict_literal_evaluator.rb +85 -0
- data/lib/puppet/pops/evaluator/relationship_operator.rb +13 -11
- data/lib/puppet/pops/evaluator/runtime3_converter.rb +5 -0
- data/lib/puppet/pops/evaluator/runtime3_support.rb +41 -45
- data/lib/puppet/pops/issue_reporter.rb +6 -4
- data/lib/puppet/pops/issues.rb +34 -11
- data/lib/puppet/pops/loader/base_loader.rb +1 -1
- data/lib/puppet/pops/loader/loader.rb +1 -1
- data/lib/puppet/pops/loader/loader_paths.rb +15 -0
- data/lib/puppet/pops/loader/module_loaders.rb +17 -13
- data/lib/puppet/pops/loader/puppet_function_instantiator.rb +16 -12
- data/lib/puppet/pops/loader/ruby_function_instantiator.rb +16 -3
- data/lib/puppet/pops/loader/type_definition_instantiator.rb +55 -0
- data/lib/puppet/pops/loaders.rb +51 -9
- data/lib/puppet/pops/lookup.rb +14 -12
- data/lib/puppet/pops/merge_strategy.rb +16 -19
- data/lib/puppet/pops/model/factory.rb +26 -2
- data/lib/puppet/pops/model/model.rb +8 -8
- data/lib/puppet/pops/model/model_label_provider.rb +13 -7
- data/lib/puppet/pops/model/model_meta.rb +17 -0
- data/lib/puppet/pops/model/model_tree_dumper.rb +8 -0
- data/lib/puppet/pops/parser/egrammar.ra +38 -14
- data/lib/puppet/pops/parser/eparser.rb +1353 -1276
- data/lib/puppet/pops/parser/epp_support.rb +11 -7
- data/lib/puppet/pops/parser/evaluating_parser.rb +14 -10
- data/lib/puppet/pops/parser/heredoc_support.rb +15 -11
- data/lib/puppet/pops/parser/lexer2.rb +26 -19
- data/lib/puppet/pops/parser/lexer_support.rb +85 -7
- data/lib/puppet/pops/parser/locator.rb +21 -0
- data/lib/puppet/pops/parser/parser_support.rb +19 -16
- data/lib/puppet/pops/parser/slurp_support.rb +11 -7
- data/lib/puppet/pops/types/class_loader.rb +23 -19
- data/lib/puppet/pops/types/enumeration.rb +9 -26
- data/lib/puppet/pops/types/iterable.rb +308 -0
- data/lib/puppet/pops/types/recursion_guard.rb +82 -0
- data/lib/puppet/pops/types/type_acceptor.rb +25 -0
- data/lib/puppet/pops/types/type_asserter.rb +10 -9
- data/lib/puppet/pops/types/type_calculator.rb +138 -381
- data/lib/puppet/pops/types/type_factory.rb +91 -57
- data/lib/puppet/pops/types/type_formatter.rb +334 -0
- data/lib/puppet/pops/types/type_mismatch_describer.rb +226 -59
- data/lib/puppet/pops/types/type_parser.rb +159 -112
- data/lib/puppet/pops/types/types.rb +2057 -1247
- data/lib/puppet/pops/utils.rb +11 -10
- data/lib/puppet/pops/validation.rb +11 -9
- data/lib/puppet/pops/validation/checker4_0.rb +83 -55
- data/lib/puppet/pops/validation/validator_factory_4_0.rb +8 -4
- data/lib/puppet/provider/aixobject.rb +1 -1
- data/lib/puppet/provider/augeas/augeas.rb +1 -1
- data/lib/puppet/provider/cron/crontab.rb +1 -1
- data/lib/puppet/provider/exec/windows.rb +1 -1
- data/lib/puppet/provider/macauthorization/macauthorization.rb +10 -9
- data/lib/puppet/provider/nameservice/directoryservice.rb +35 -50
- data/lib/puppet/provider/package/appdmg.rb +3 -2
- data/lib/puppet/provider/package/dnf.rb +1 -1
- data/lib/puppet/provider/package/pip.rb +5 -8
- data/lib/puppet/provider/package/pip3.rb +1 -1
- data/lib/puppet/provider/package/pkg.rb +1 -1
- data/lib/puppet/provider/package/pkgdmg.rb +3 -2
- data/lib/puppet/provider/package/pkgng.rb +13 -4
- data/lib/puppet/provider/package/windows.rb +1 -1
- data/lib/puppet/provider/package/yum.rb +1 -1
- data/lib/puppet/provider/package/zypper.rb +19 -0
- data/lib/puppet/provider/service/debian.rb +2 -2
- data/lib/puppet/provider/service/launchd.rb +6 -18
- data/lib/puppet/provider/service/systemd.rb +9 -2
- data/lib/puppet/provider/sshkey/parsed.rb +1 -1
- data/lib/puppet/provider/user/aix.rb +1 -1
- data/lib/puppet/provider/user/directoryservice.rb +33 -58
- data/lib/puppet/provider/zfs/zfs.rb +1 -1
- data/lib/puppet/provider/zpool/zpool.rb +1 -1
- data/lib/puppet/reference/configuration.rb +1 -1
- data/lib/puppet/reference/providers.rb +1 -1
- data/lib/puppet/resource.rb +15 -12
- data/lib/puppet/resource/capability_finder.rb +20 -13
- data/lib/puppet/resource/catalog.rb +60 -3
- data/lib/puppet/resource/status.rb +11 -2
- data/lib/puppet/resource/type.rb +28 -38
- data/lib/puppet/settings.rb +1 -1
- data/lib/puppet/settings/config_file.rb +1 -1
- data/lib/puppet/settings/environment_conf.rb +13 -5
- data/lib/puppet/ssl/certificate_factory.rb +3 -3
- data/lib/puppet/ssl/certificate_request.rb +4 -4
- data/lib/puppet/ssl/certificate_signer.rb +1 -1
- data/lib/puppet/ssl/validator/default_validator.rb +1 -1
- data/lib/puppet/test/test_helper.rb +16 -4
- data/lib/puppet/transaction.rb +15 -2
- data/lib/puppet/transaction/additional_resource_generator.rb +6 -2
- data/lib/puppet/transaction/report.rb +31 -1
- data/lib/puppet/transaction/resource_harness.rb +0 -25
- data/lib/puppet/type.rb +11 -11
- data/lib/puppet/type/augeas.rb +1 -1
- data/lib/puppet/type/cron.rb +12 -12
- data/lib/puppet/type/file.rb +91 -39
- data/lib/puppet/type/file/checksum_value.rb +53 -0
- data/lib/puppet/type/file/content.rb +26 -111
- data/lib/puppet/type/file/data_sync.rb +84 -0
- data/lib/puppet/type/file/ensure.rb +17 -14
- data/lib/puppet/type/file/selcontext.rb +1 -1
- data/lib/puppet/type/file/source.rb +103 -18
- data/lib/puppet/type/filebucket.rb +1 -1
- data/lib/puppet/type/interface.rb +8 -3
- data/lib/puppet/type/macauthorization.rb +1 -1
- data/lib/puppet/type/package.rb +6 -0
- data/lib/puppet/type/schedule.rb +1 -1
- data/lib/puppet/type/stage.rb +1 -1
- data/lib/puppet/type/user.rb +19 -17
- data/lib/puppet/type/yumrepo.rb +20 -0
- data/lib/puppet/util.rb +109 -22
- data/lib/puppet/util/autoload.rb +16 -11
- data/lib/puppet/util/checksums.rb +74 -31
- data/lib/puppet/util/execution.rb +1 -1
- data/lib/puppet/util/http_proxy.rb +72 -0
- data/lib/puppet/util/log.rb +2 -0
- data/lib/puppet/util/logging.rb +43 -1
- data/lib/puppet/util/monkey_patches.rb +2 -2
- data/lib/puppet/util/multi_match.rb +51 -0
- data/lib/puppet/util/network_device/cisco/device.rb +10 -2
- data/lib/puppet/util/network_device/cisco/interface.rb +21 -8
- data/lib/puppet/util/network_device/transport/ssh.rb +7 -3
- data/lib/puppet/util/network_device/transport/telnet.rb +39 -36
- data/lib/puppet/util/plist.rb +130 -0
- data/lib/puppet/util/resource_template.rb +1 -1
- data/lib/puppet/util/run_mode.rb +2 -2
- data/lib/puppet/util/skip_tags.rb +9 -0
- data/lib/puppet/util/windows/access_control_entry.rb +1 -1
- data/lib/puppet/util/windows/access_control_list.rb +3 -3
- data/lib/puppet/util/windows/adsi.rb +4 -4
- data/lib/puppet/util/windows/api_types.rb +24 -18
- data/lib/puppet/util/windows/com.rb +3 -3
- data/lib/puppet/util/windows/error.rb +1 -1
- data/lib/puppet/util/windows/file.rb +8 -8
- data/lib/puppet/util/windows/principal.rb +23 -14
- data/lib/puppet/util/windows/process.rb +78 -11
- data/lib/puppet/util/windows/registry.rb +1 -1
- data/lib/puppet/util/windows/root_certs.rb +5 -5
- data/lib/puppet/util/windows/security.rb +33 -35
- data/lib/puppet/util/windows/security_descriptor.rb +1 -1
- data/lib/puppet/util/windows/sid.rb +42 -4
- data/lib/puppet/util/windows/taskscheduler.rb +15 -15
- data/lib/puppet/util/windows/user.rb +10 -10
- data/lib/puppet/vendor/deep_merge/deep_merge.gemspec +1 -1
- data/lib/puppet/vendor/pathspec/LICENSE +2 -2
- data/lib/puppet/vendor/pathspec/README.md +1 -1
- data/lib/puppet/vendor/rgen/README.rdoc +1 -1
- data/lib/puppet/vendor/semantic/lib/semantic/dependency/module_release.rb +14 -0
- data/lib/puppet/version.rb +1 -1
- data/lib/semver.rb +17 -1
- data/man/man5/puppet.conf.5 +12 -12
- data/man/man8/extlookup2hiera.8 +1 -1
- data/man/man8/puppet-agent.8 +2 -2
- data/man/man8/puppet-apply.8 +2 -2
- data/man/man8/puppet-ca.8 +2 -2
- data/man/man8/puppet-catalog.8 +2 -2
- data/man/man8/puppet-cert.8 +2 -2
- data/man/man8/puppet-certificate.8 +2 -2
- data/man/man8/puppet-certificate_request.8 +2 -2
- data/man/man8/puppet-certificate_revocation_list.8 +2 -2
- data/man/man8/puppet-config.8 +3 -3
- data/man/man8/puppet-describe.8 +1 -1
- data/man/man8/puppet-device.8 +1 -1
- data/man/man8/puppet-doc.8 +1 -1
- data/man/man8/puppet-epp.8 +2 -2
- data/man/man8/puppet-facts.8 +2 -2
- data/man/man8/puppet-file.8 +2 -2
- data/man/man8/puppet-filebucket.8 +2 -2
- data/man/man8/puppet-help.8 +2 -2
- data/man/man8/puppet-inspect.8 +2 -2
- data/man/man8/puppet-key.8 +2 -2
- data/man/man8/puppet-man.8 +2 -2
- data/man/man8/puppet-master.8 +2 -2
- data/man/man8/puppet-module.8 +9 -9
- data/man/man8/puppet-node.8 +2 -2
- data/man/man8/puppet-parser.8 +2 -2
- data/man/man8/puppet-plugin.8 +2 -2
- data/man/man8/puppet-report.8 +2 -2
- data/man/man8/puppet-resource.8 +2 -2
- data/man/man8/puppet-resource_type.8 +2 -2
- data/man/man8/puppet-status.8 +3 -3
- data/man/man8/puppet.8 +1 -1
- data/spec/fixtures/module.tar.gz +0 -0
- data/spec/fixtures/unit/functions/lookup/environments/production/modules/bad_data/lib/puppet/functions/bad_data/data.rb +1 -0
- data/spec/fixtures/unit/functions/lookup/environments/production/modules/bad_data/manifests/init.pp +0 -1
- data/spec/fixtures/unit/functions/lookup/environments/production/modules/empty_json/data/empty.json +0 -0
- data/spec/fixtures/unit/functions/lookup/environments/production/modules/empty_json/hiera.yaml +5 -0
- data/spec/fixtures/unit/functions/lookup/environments/production/modules/empty_json/manifests/init.pp +2 -0
- data/spec/fixtures/unit/functions/lookup/environments/production/modules/empty_json/metadata.json +9 -0
- data/spec/fixtures/unit/functions/lookup/environments/production/modules/empty_yaml/data/empty.yaml +1 -0
- data/spec/fixtures/unit/functions/lookup/environments/production/modules/empty_yaml/hiera.yaml +5 -0
- data/spec/fixtures/unit/functions/lookup/environments/production/modules/empty_yaml/manifests/init.pp +2 -0
- data/spec/fixtures/unit/functions/lookup/environments/production/modules/empty_yaml/metadata.json +9 -0
- data/spec/fixtures/unit/functions/lookup/environments/production/modules/hieraprovider/data/first.json +2 -1
- data/spec/fixtures/unit/module/trailing-comma.json +1 -1
- data/spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/usee/manifests/init.pp +3 -1
- data/spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/usee/types/zero.pp +1 -0
- data/spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/user/types/withuseeone.pp +1 -0
- data/spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/user/types/withuseezero.pp +1 -0
- data/spec/fixtures/unit/provider/package/yum/yum-check-update-broken-notices.txt +187 -0
- data/spec/fixtures/unit/provider/sshkey/parsed/sample_with_blank_lines +8 -0
- data/spec/fixtures/vcr/cassettes/Puppet_Type_File/when_sourcing/from_http/using_md5/should_fetch_if_not_on_the_local_disk.yml +205 -0
- data/spec/fixtures/vcr/cassettes/Puppet_Type_File/when_sourcing/from_http/using_md5/should_not_update_if_content_on_disk_is_up-to-date.yml +213 -0
- data/spec/fixtures/vcr/cassettes/Puppet_Type_File/when_sourcing/from_http/using_md5/should_update_if_content_differs_on_disk.yml +213 -0
- data/spec/fixtures/vcr/cassettes/Puppet_Type_File/when_sourcing/from_http/using_mtime/should_fetch_if_mtime_is_older_on_disk.yml +205 -0
- data/spec/fixtures/vcr/cassettes/Puppet_Type_File/when_sourcing/from_http/using_mtime/should_fetch_if_no_header_specified.yml +197 -0
- data/spec/fixtures/vcr/cassettes/Puppet_Type_File/when_sourcing/from_http/using_mtime/should_fetch_if_not_on_the_local_disk.yml +205 -0
- data/spec/fixtures/vcr/cassettes/Puppet_Type_File/when_sourcing/from_http/using_mtime/should_not_update_if_mtime_is_newer_on_disk.yml +205 -0
- data/spec/integration/defaults_spec.rb +14 -2
- data/spec/integration/file_system/uniquefile_spec.rb +29 -0
- data/spec/integration/module_tool/tar/mini_spec.rb +28 -0
- data/spec/integration/node/environment_spec.rb +13 -0
- data/spec/integration/parser/dynamic_scoping_spec.rb +67 -0
- data/spec/integration/parser/parameter_defaults_spec.rb +336 -0
- data/spec/integration/parser/undef_param_spec.rb +8 -0
- data/spec/integration/provider/yumrepo_spec.rb +1 -1
- data/spec/integration/test/test_helper_spec.rb +28 -0
- data/spec/integration/transaction/report_spec.rb +16 -0
- data/spec/integration/transaction_spec.rb +11 -0
- data/spec/integration/type/file_spec.rb +194 -4
- data/spec/integration/type/package_spec.rb +5 -1
- data/spec/integration/type/tidy_spec.rb +21 -9
- data/spec/integration/util/execution_spec.rb +22 -0
- data/spec/integration/util/windows/principal_spec.rb +90 -4
- data/spec/integration/util/windows/process_spec.rb +31 -0
- data/spec/integration/util/windows/security_spec.rb +6 -6
- data/spec/integration/util/windows/user_spec.rb +1 -1
- data/spec/integration/util_spec.rb +49 -27
- data/spec/lib/puppet_spec/compiler.rb +17 -0
- data/spec/lib/puppet_spec/files.rb +2 -2
- data/spec/lib/puppet_spec/pops.rb +13 -0
- data/spec/shared_behaviours/iterative_functions.rb +1 -1
- data/spec/shared_contexts/types_setup.rb +96 -0
- data/spec/unit/agent_spec.rb +1 -0
- data/spec/unit/application/agent_spec.rb +10 -0
- data/spec/unit/application/apply_spec.rb +9 -0
- data/spec/unit/configurer/downloader_spec.rb +5 -5
- data/spec/unit/configurer_spec.rb +271 -39
- data/spec/unit/data_providers/hiera_interpolation_spec.rb +57 -0
- data/spec/unit/defaults_spec.rb +15 -0
- data/spec/unit/environments_spec.rb +24 -4
- data/spec/unit/face/parser_spec.rb +43 -2
- data/spec/unit/file_serving/http_metadata_spec.rb +85 -0
- data/spec/unit/file_serving/metadata_spec.rb +50 -0
- data/spec/unit/file_serving/terminus_selector_spec.rb +12 -2
- data/spec/unit/file_system_spec.rb +26 -0
- data/spec/unit/functions/assert_type_spec.rb +36 -2
- data/spec/unit/functions/defined_spec.rb +2 -2
- data/spec/unit/functions/epp_spec.rb +11 -3
- data/spec/unit/functions/lookup_spec.rb +58 -13
- data/spec/unit/functions/regsubst_spec.rb +1 -1
- data/spec/unit/functions/reverse_each_spec.rb +108 -0
- data/spec/unit/functions/step_spec.rb +113 -0
- data/spec/unit/functions/type_spec.rb +35 -0
- data/spec/unit/functions4_spec.rb +61 -5
- data/spec/unit/indirector/catalog/compiler_spec.rb +705 -4
- data/spec/unit/indirector/file_bucket_file/file_spec.rb +1 -1
- data/spec/unit/indirector/indirection_spec.rb +1 -1
- data/spec/unit/info_service_spec.rb +94 -32
- data/spec/unit/module_spec.rb +14 -0
- data/spec/unit/module_tool/applications/builder_spec.rb +4 -4
- data/spec/unit/network/authstore_spec.rb +1 -1
- data/spec/unit/network/http/connection_spec.rb +1 -0
- data/spec/unit/network/http/pool_spec.rb +30 -0
- data/spec/unit/node_spec.rb +1 -1
- data/spec/unit/parser/compiler_spec.rb +16 -0
- data/spec/unit/parser/scope_spec.rb +28 -11
- data/spec/unit/pops/evaluator/access_ops_spec.rb +3 -3
- data/spec/unit/pops/evaluator/comparison_ops_spec.rb +3 -0
- data/spec/unit/pops/evaluator/evaluating_parser_spec.rb +7 -1
- data/spec/unit/pops/evaluator/evaluator_rspec_helper.rb +4 -4
- data/spec/unit/pops/evaluator/json_strict_literal_evaluator_spec.rb +63 -0
- data/spec/unit/pops/evaluator/runtime3_converter_spec.rb +6 -0
- data/spec/unit/pops/loaders/dependency_loader_spec.rb +53 -0
- data/spec/unit/pops/loaders/loaders_spec.rb +44 -1
- data/spec/unit/pops/parser/lexer2_spec.rb +112 -3
- data/spec/unit/pops/parser/parse_calls_spec.rb +8 -0
- data/spec/unit/pops/parser/parser_spec.rb +10 -0
- data/spec/unit/pops/parser/source_pos_adapter_spec.rb +26 -0
- data/spec/unit/pops/types/iterable_spec.rb +262 -0
- data/spec/unit/pops/types/recursion_guard_spec.rb +91 -0
- data/spec/unit/pops/types/type_acceptor_spec.rb +105 -0
- data/spec/unit/pops/types/type_asserter_spec.rb +43 -0
- data/spec/unit/pops/types/type_calculator_spec.rb +275 -373
- data/spec/unit/pops/types/type_formatter_spec.rb +280 -0
- data/spec/unit/pops/types/type_mismatch_describer_spec.rb +152 -0
- data/spec/unit/pops/types/type_parser_spec.rb +58 -13
- data/spec/unit/pops/types/types_spec.rb +241 -0
- data/spec/unit/pops/validator/validator_spec.rb +100 -43
- data/spec/unit/provider/cron/parsed_spec.rb +1 -0
- data/spec/unit/provider/macauthorization_spec.rb +5 -2
- data/spec/unit/provider/nameservice/directoryservice_spec.rb +14 -19
- data/spec/unit/provider/package/appdmg_spec.rb +3 -3
- data/spec/unit/provider/package/dnf_spec.rb +16 -0
- data/spec/unit/provider/package/pip3_spec.rb +60 -42
- data/spec/unit/provider/package/pip_spec.rb +47 -34
- data/spec/unit/provider/package/pkgdmg_spec.rb +18 -9
- data/spec/unit/provider/package/pkgng_spec.rb +4 -2
- data/spec/unit/provider/package/yum_spec.rb +11 -0
- data/spec/unit/provider/package/zypper_spec.rb +14 -0
- data/spec/unit/provider/service/launchd_spec.rb +17 -35
- data/spec/unit/provider/service/systemd_spec.rb +7 -0
- data/spec/unit/provider/sshkey/parsed_spec.rb +20 -19
- data/spec/unit/provider/user/directoryservice_spec.rb +40 -59
- data/spec/unit/resource/capability_finder_spec.rb +28 -15
- data/spec/unit/resource/catalog_spec.rb +33 -1
- data/spec/unit/resource/type_spec.rb +149 -7
- data/spec/unit/resource_spec.rb +96 -57
- data/spec/unit/settings/environment_conf_spec.rb +18 -1
- data/spec/unit/ssl/certificate_revocation_list_spec.rb +3 -3
- data/spec/unit/transaction/report_spec.rb +27 -0
- data/spec/unit/transaction/resource_harness_spec.rb +0 -47
- data/spec/unit/transaction_spec.rb +5 -0
- data/spec/unit/type/file/checksum_spec.rb +6 -0
- data/spec/unit/type/file/checksum_value_spec.rb +286 -0
- data/spec/unit/type/file/content_spec.rb +12 -193
- data/spec/unit/type/file/source_spec.rb +211 -119
- data/spec/unit/type/file_spec.rb +133 -34
- data/spec/unit/type/interface_spec.rb +32 -0
- data/spec/unit/type/macauthorization_spec.rb +4 -1
- data/spec/unit/type/yumrepo_spec.rb +2 -2
- data/spec/unit/util/filetype_spec.rb +1 -1
- data/spec/unit/util/http_proxy_spec.rb +2 -2
- data/spec/unit/util/log/destinations_spec.rb +0 -2
- data/spec/unit/util/logging_spec.rb +69 -0
- data/spec/unit/util/multi_match_spec.rb +39 -0
- data/spec/unit/util/network_device/cisco/device_spec.rb +253 -216
- data/spec/unit/util/network_device/transport/telnet_spec.rb +60 -58
- data/spec/unit/util/plist_spec.rb +110 -0
- data/spec/unit/util/resource_template_spec.rb +2 -2
- data/spec/unit/util/run_mode_spec.rb +27 -3
- data/spec/unit/util/windows/adsi_spec.rb +4 -4
- data/spec/unit/util/windows/api_types_spec.rb +42 -0
- data/spec/unit/util/windows/security_descriptor_spec.rb +3 -3
- data/spec/unit/util/windows/sid_spec.rb +1 -1
- data/spec/unit/util_spec.rb +123 -13
- data/tasks/cfpropertylist.rake +15 -0
- metadata +114 -26
- data/lib/puppet/vendor/load_plist.rb +0 -1
- data/lib/puppet/vendor/plist/CHANGELOG +0 -82
- data/lib/puppet/vendor/plist/MIT-LICENSE +0 -21
- data/lib/puppet/vendor/plist/PUPPET_README.md +0 -6
- data/lib/puppet/vendor/plist/README +0 -36
- data/lib/puppet/vendor/plist/Rakefile +0 -144
- data/lib/puppet/vendor/plist/docs/USAGE +0 -104
- data/lib/puppet/vendor/plist/docs/jamis-template.rb +0 -591
- data/lib/puppet/vendor/plist/lib/plist.rb +0 -22
- data/lib/puppet/vendor/plist/lib/plist/generator.rb +0 -224
- data/lib/puppet/vendor/plist/lib/plist/parser.rb +0 -225
- data/lib/puppet/vendor/plist/test/assets/AlbumData.xml +0 -203
- data/lib/puppet/vendor/plist/test/assets/Cookies.plist +0 -104
- data/lib/puppet/vendor/plist/test/assets/commented.plist +0 -9
- data/lib/puppet/vendor/plist/test/assets/example_data.bin +0 -0
- data/lib/puppet/vendor/plist/test/assets/example_data.jpg +0 -0
- data/lib/puppet/vendor/plist/test/assets/example_data.plist +0 -259
- data/lib/puppet/vendor/plist/test/assets/test_data_elements.plist +0 -24
- data/lib/puppet/vendor/plist/test/assets/test_empty_key.plist +0 -13
- data/lib/puppet/vendor/plist/test/test_data_elements.rb +0 -115
- data/lib/puppet/vendor/plist/test/test_generator.rb +0 -59
- data/lib/puppet/vendor/plist/test/test_generator_basic_types.rb +0 -58
- data/lib/puppet/vendor/plist/test/test_generator_collections.rb +0 -82
- data/lib/puppet/vendor/plist/test/test_parser.rb +0 -90
@@ -1,22 +0,0 @@
|
|
1
|
-
#--
|
2
|
-
##############################################################
|
3
|
-
# Copyright 2006, Ben Bleything <ben@bleything.net> and #
|
4
|
-
# Patrick May <patrick@hexane.org> #
|
5
|
-
# #
|
6
|
-
# Distributed under the MIT license. #
|
7
|
-
##############################################################
|
8
|
-
#++
|
9
|
-
# = Plist
|
10
|
-
#
|
11
|
-
# This is the main file for plist. Everything interesting happens in Plist and Plist::Emit.
|
12
|
-
|
13
|
-
require 'base64'
|
14
|
-
require 'cgi'
|
15
|
-
require 'stringio'
|
16
|
-
|
17
|
-
require 'plist/generator'
|
18
|
-
require 'plist/parser'
|
19
|
-
|
20
|
-
module Plist
|
21
|
-
VERSION = '3.0.0'
|
22
|
-
end
|
@@ -1,224 +0,0 @@
|
|
1
|
-
#--###########################################################
|
2
|
-
# Copyright 2006, Ben Bleything <ben@bleything.net> and #
|
3
|
-
# Patrick May <patrick@hexane.org> #
|
4
|
-
# #
|
5
|
-
# Distributed under the MIT license. #
|
6
|
-
##############################################################
|
7
|
-
#++
|
8
|
-
# See Plist::Emit.
|
9
|
-
module Plist
|
10
|
-
# === Create a plist
|
11
|
-
# You can dump an object to a plist in one of two ways:
|
12
|
-
#
|
13
|
-
# * <tt>Plist::Emit.dump(obj)</tt>
|
14
|
-
# * <tt>obj.to_plist</tt>
|
15
|
-
# * This requires that you mixin the <tt>Plist::Emit</tt> module, which is already done for +Array+ and +Hash+.
|
16
|
-
#
|
17
|
-
# The following Ruby classes are converted into native plist types:
|
18
|
-
# Array, Bignum, Date, DateTime, Fixnum, Float, Hash, Integer, String, Symbol, Time, true, false
|
19
|
-
# * +Array+ and +Hash+ are both recursive; their elements will be converted into plist nodes inside the <array> and <dict> containers (respectively).
|
20
|
-
# * +IO+ (and its descendants) and +StringIO+ objects are read from and their contents placed in a <data> element.
|
21
|
-
# * User classes may implement +to_plist_node+ to dictate how they should be serialized; otherwise the object will be passed to <tt>Marshal.dump</tt> and the result placed in a <data> element.
|
22
|
-
#
|
23
|
-
# For detailed usage instructions, refer to USAGE[link:files/docs/USAGE.html] and the methods documented below.
|
24
|
-
module Emit
|
25
|
-
# Helper method for injecting into classes. Calls <tt>Plist::Emit.dump</tt> with +self+.
|
26
|
-
def to_plist(envelope = true)
|
27
|
-
return Plist::Emit.dump(self, envelope)
|
28
|
-
end
|
29
|
-
|
30
|
-
# Helper method for injecting into classes. Calls <tt>Plist::Emit.save_plist</tt> with +self+.
|
31
|
-
def save_plist(filename)
|
32
|
-
Plist::Emit.save_plist(self, filename)
|
33
|
-
end
|
34
|
-
|
35
|
-
# The following Ruby classes are converted into native plist types:
|
36
|
-
# Array, Bignum, Date, DateTime, Fixnum, Float, Hash, Integer, String, Symbol, Time
|
37
|
-
#
|
38
|
-
# Write us (via RubyForge) if you think another class can be coerced safely into one of the expected plist classes.
|
39
|
-
#
|
40
|
-
# +IO+ and +StringIO+ objects are encoded and placed in <data> elements; other objects are <tt>Marshal.dump</tt>'ed unless they implement +to_plist_node+.
|
41
|
-
#
|
42
|
-
# The +envelope+ parameters dictates whether or not the resultant plist fragment is wrapped in the normal XML/plist header and footer. Set it to false if you only want the fragment.
|
43
|
-
def self.dump(obj, envelope = true)
|
44
|
-
output = plist_node(obj)
|
45
|
-
|
46
|
-
output = wrap(output) if envelope
|
47
|
-
|
48
|
-
return output
|
49
|
-
end
|
50
|
-
|
51
|
-
# Writes the serialized object's plist to the specified filename.
|
52
|
-
def self.save_plist(obj, filename)
|
53
|
-
File.open(filename, 'wb') do |f|
|
54
|
-
f.write(Plist::Emit.dump(obj))
|
55
|
-
end
|
56
|
-
end
|
57
|
-
|
58
|
-
private
|
59
|
-
def self.plist_node(element)
|
60
|
-
output = ''
|
61
|
-
|
62
|
-
if element.respond_to? :to_plist_node
|
63
|
-
output << element.to_plist_node
|
64
|
-
else
|
65
|
-
case element
|
66
|
-
when Array
|
67
|
-
if element.empty?
|
68
|
-
output << "<array/>\n"
|
69
|
-
else
|
70
|
-
output << tag('array') {
|
71
|
-
element.collect {|e| plist_node(e)}
|
72
|
-
}
|
73
|
-
end
|
74
|
-
when Hash
|
75
|
-
if element.empty?
|
76
|
-
output << "<dict/>\n"
|
77
|
-
else
|
78
|
-
inner_tags = []
|
79
|
-
|
80
|
-
element.keys.sort.each do |k|
|
81
|
-
v = element[k]
|
82
|
-
inner_tags << tag('key', CGI::escapeHTML(k.to_s))
|
83
|
-
inner_tags << plist_node(v)
|
84
|
-
end
|
85
|
-
|
86
|
-
output << tag('dict') {
|
87
|
-
inner_tags
|
88
|
-
}
|
89
|
-
end
|
90
|
-
when true, false
|
91
|
-
output << "<#{element}/>\n"
|
92
|
-
when Time
|
93
|
-
output << tag('date', element.utc.strftime('%Y-%m-%dT%H:%M:%SZ'))
|
94
|
-
when Date # also catches DateTime
|
95
|
-
output << tag('date', element.strftime('%Y-%m-%dT%H:%M:%SZ'))
|
96
|
-
when String, Symbol, Fixnum, Bignum, Integer, Float
|
97
|
-
output << tag(element_type(element), CGI::escapeHTML(element.to_s))
|
98
|
-
when IO, StringIO
|
99
|
-
element.rewind
|
100
|
-
contents = element.read
|
101
|
-
# note that apple plists are wrapped at a different length then
|
102
|
-
# what ruby's base64 wraps by default.
|
103
|
-
# I used #encode64 instead of #b64encode (which allows a length arg)
|
104
|
-
# because b64encode is b0rked and ignores the length arg.
|
105
|
-
data = "\n"
|
106
|
-
Base64::encode64(contents).gsub(/\s+/, '').scan(/.{1,68}/o) { data << $& << "\n" }
|
107
|
-
output << tag('data', data)
|
108
|
-
else
|
109
|
-
output << comment( 'The <data> element below contains a Ruby object which has been serialized with Marshal.dump.' )
|
110
|
-
data = "\n"
|
111
|
-
Base64::encode64(Marshal.dump(element)).gsub(/\s+/, '').scan(/.{1,68}/o) { data << $& << "\n" }
|
112
|
-
output << tag('data', data )
|
113
|
-
end
|
114
|
-
end
|
115
|
-
|
116
|
-
return output
|
117
|
-
end
|
118
|
-
|
119
|
-
def self.comment(content)
|
120
|
-
return "<!-- #{content} -->\n"
|
121
|
-
end
|
122
|
-
|
123
|
-
def self.tag(type, contents = '', &block)
|
124
|
-
out = nil
|
125
|
-
|
126
|
-
if block_given?
|
127
|
-
out = IndentedString.new
|
128
|
-
out << "<#{type}>"
|
129
|
-
out.raise_indent
|
130
|
-
|
131
|
-
out << block.call
|
132
|
-
|
133
|
-
out.lower_indent
|
134
|
-
out << "</#{type}>"
|
135
|
-
else
|
136
|
-
out = "<#{type}>#{contents.to_s}</#{type}>\n"
|
137
|
-
end
|
138
|
-
|
139
|
-
return out.to_s
|
140
|
-
end
|
141
|
-
|
142
|
-
def self.wrap(contents)
|
143
|
-
output = ''
|
144
|
-
|
145
|
-
output << '<?xml version="1.0" encoding="UTF-8"?>' + "\n"
|
146
|
-
output << '<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">' + "\n"
|
147
|
-
output << '<plist version="1.0">' + "\n"
|
148
|
-
|
149
|
-
output << contents
|
150
|
-
|
151
|
-
output << '</plist>' + "\n"
|
152
|
-
|
153
|
-
return output
|
154
|
-
end
|
155
|
-
|
156
|
-
def self.element_type(item)
|
157
|
-
return case item
|
158
|
-
when String, Symbol; 'string'
|
159
|
-
when Fixnum, Bignum, Integer; 'integer'
|
160
|
-
when Float; 'real'
|
161
|
-
else
|
162
|
-
raise "Don't know about this data type... something must be wrong!"
|
163
|
-
end
|
164
|
-
end
|
165
|
-
private
|
166
|
-
class IndentedString #:nodoc:
|
167
|
-
attr_accessor :indent_string
|
168
|
-
|
169
|
-
@@indent_level = 0
|
170
|
-
|
171
|
-
def initialize(str = "\t")
|
172
|
-
@indent_string = str
|
173
|
-
@contents = ''
|
174
|
-
end
|
175
|
-
|
176
|
-
def to_s
|
177
|
-
return @contents
|
178
|
-
end
|
179
|
-
|
180
|
-
def raise_indent
|
181
|
-
@@indent_level += 1
|
182
|
-
end
|
183
|
-
|
184
|
-
def lower_indent
|
185
|
-
@@indent_level -= 1 if @@indent_level > 0
|
186
|
-
end
|
187
|
-
|
188
|
-
def <<(val)
|
189
|
-
if val.is_a? Array
|
190
|
-
val.each do |f|
|
191
|
-
self << f
|
192
|
-
end
|
193
|
-
else
|
194
|
-
# if it's already indented, don't bother indenting further
|
195
|
-
unless val =~ /\A#{@indent_string}/
|
196
|
-
indent = @indent_string * @@indent_level
|
197
|
-
|
198
|
-
@contents << val.gsub(/^/, indent)
|
199
|
-
else
|
200
|
-
@contents << val
|
201
|
-
end
|
202
|
-
|
203
|
-
# it already has a newline, don't add another
|
204
|
-
@contents << "\n" unless val =~ /\n$/
|
205
|
-
end
|
206
|
-
end
|
207
|
-
end
|
208
|
-
end
|
209
|
-
end
|
210
|
-
|
211
|
-
# we need to add this so sorting hash keys works properly
|
212
|
-
class Symbol #:nodoc:
|
213
|
-
def <=> (other)
|
214
|
-
self.to_s <=> other.to_s
|
215
|
-
end
|
216
|
-
end
|
217
|
-
|
218
|
-
class Array #:nodoc:
|
219
|
-
include Plist::Emit
|
220
|
-
end
|
221
|
-
|
222
|
-
class Hash #:nodoc:
|
223
|
-
include Plist::Emit
|
224
|
-
end
|
@@ -1,225 +0,0 @@
|
|
1
|
-
#--###########################################################
|
2
|
-
# Copyright 2006, Ben Bleything <ben@bleything.net> and #
|
3
|
-
# Patrick May <patrick@hexane.org> #
|
4
|
-
# #
|
5
|
-
# Distributed under the MIT license. #
|
6
|
-
##############################################################
|
7
|
-
#++
|
8
|
-
# Plist parses Mac OS X xml property list files into ruby data structures.
|
9
|
-
#
|
10
|
-
# === Load a plist file
|
11
|
-
# This is the main point of the library:
|
12
|
-
#
|
13
|
-
# r = Plist::parse_xml( filename_or_xml )
|
14
|
-
module Plist
|
15
|
-
# Note that I don't use these two elements much:
|
16
|
-
#
|
17
|
-
# + Date elements are returned as DateTime objects.
|
18
|
-
# + Data elements are implemented as Tempfiles
|
19
|
-
#
|
20
|
-
# Plist::parse_xml will blow up if it encounters a data element.
|
21
|
-
# If you encounter such an error, or if you have a Date element which
|
22
|
-
# can't be parsed into a Time object, please send your plist file to
|
23
|
-
# plist@hexane.org so that I can implement the proper support.
|
24
|
-
def Plist::parse_xml( filename_or_xml )
|
25
|
-
listener = Listener.new
|
26
|
-
#parser = REXML::Parsers::StreamParser.new(File.new(filename), listener)
|
27
|
-
parser = StreamParser.new(filename_or_xml, listener)
|
28
|
-
parser.parse
|
29
|
-
listener.result
|
30
|
-
end
|
31
|
-
|
32
|
-
class Listener
|
33
|
-
#include REXML::StreamListener
|
34
|
-
|
35
|
-
attr_accessor :result, :open
|
36
|
-
|
37
|
-
def initialize
|
38
|
-
@result = nil
|
39
|
-
@open = Array.new
|
40
|
-
end
|
41
|
-
|
42
|
-
|
43
|
-
def tag_start(name, attributes)
|
44
|
-
@open.push PTag::mappings[name].new
|
45
|
-
end
|
46
|
-
|
47
|
-
def text( contents )
|
48
|
-
@open.last.text = contents if @open.last
|
49
|
-
end
|
50
|
-
|
51
|
-
def tag_end(name)
|
52
|
-
last = @open.pop
|
53
|
-
if @open.empty?
|
54
|
-
@result = last.to_ruby
|
55
|
-
else
|
56
|
-
@open.last.children.push last
|
57
|
-
end
|
58
|
-
end
|
59
|
-
end
|
60
|
-
|
61
|
-
class StreamParser
|
62
|
-
def initialize( filename_or_xml, listener )
|
63
|
-
@filename_or_xml = filename_or_xml
|
64
|
-
@listener = listener
|
65
|
-
end
|
66
|
-
|
67
|
-
TEXT = /([^<]+)/
|
68
|
-
XMLDECL_PATTERN = /<\?xml\s+(.*?)\?>*/um
|
69
|
-
DOCTYPE_PATTERN = /\s*<!DOCTYPE\s+(.*?)(\[|>)/um
|
70
|
-
COMMENT_START = /\A<!--/u
|
71
|
-
COMMENT_END = /.*?-->/um
|
72
|
-
|
73
|
-
|
74
|
-
def parse
|
75
|
-
plist_tags = PTag::mappings.keys.join('|')
|
76
|
-
start_tag = /<(#{plist_tags})([^>]*)>/i
|
77
|
-
end_tag = /<\/(#{plist_tags})[^>]*>/i
|
78
|
-
|
79
|
-
require 'strscan'
|
80
|
-
|
81
|
-
contents = (
|
82
|
-
if (File.exists? @filename_or_xml)
|
83
|
-
File.open(@filename_or_xml) {|f| f.read}
|
84
|
-
else
|
85
|
-
@filename_or_xml
|
86
|
-
end
|
87
|
-
)
|
88
|
-
|
89
|
-
@scanner = StringScanner.new( contents )
|
90
|
-
until @scanner.eos?
|
91
|
-
if @scanner.scan(COMMENT_START)
|
92
|
-
@scanner.scan(COMMENT_END)
|
93
|
-
elsif @scanner.scan(XMLDECL_PATTERN)
|
94
|
-
elsif @scanner.scan(DOCTYPE_PATTERN)
|
95
|
-
elsif @scanner.scan(start_tag)
|
96
|
-
@listener.tag_start(@scanner[1], nil)
|
97
|
-
if (@scanner[2] =~ /\/$/)
|
98
|
-
@listener.tag_end(@scanner[1])
|
99
|
-
end
|
100
|
-
elsif @scanner.scan(TEXT)
|
101
|
-
@listener.text(@scanner[1])
|
102
|
-
elsif @scanner.scan(end_tag)
|
103
|
-
@listener.tag_end(@scanner[1])
|
104
|
-
else
|
105
|
-
raise "Unimplemented element"
|
106
|
-
end
|
107
|
-
end
|
108
|
-
end
|
109
|
-
end
|
110
|
-
|
111
|
-
class PTag
|
112
|
-
@@mappings = { }
|
113
|
-
def PTag::mappings
|
114
|
-
@@mappings
|
115
|
-
end
|
116
|
-
|
117
|
-
def PTag::inherited( sub_class )
|
118
|
-
key = sub_class.to_s.downcase
|
119
|
-
key.gsub!(/^plist::/, '' )
|
120
|
-
key.gsub!(/^p/, '') unless key == "plist"
|
121
|
-
|
122
|
-
@@mappings[key] = sub_class
|
123
|
-
end
|
124
|
-
|
125
|
-
attr_accessor :text, :children
|
126
|
-
def initialize
|
127
|
-
@children = Array.new
|
128
|
-
end
|
129
|
-
|
130
|
-
def to_ruby
|
131
|
-
raise "Unimplemented: " + self.class.to_s + "#to_ruby on #{self.inspect}"
|
132
|
-
end
|
133
|
-
end
|
134
|
-
|
135
|
-
class PList < PTag
|
136
|
-
def to_ruby
|
137
|
-
children.first.to_ruby if children.first
|
138
|
-
end
|
139
|
-
end
|
140
|
-
|
141
|
-
class PDict < PTag
|
142
|
-
def to_ruby
|
143
|
-
dict = Hash.new
|
144
|
-
key = nil
|
145
|
-
|
146
|
-
children.each do |c|
|
147
|
-
if key.nil?
|
148
|
-
key = c.to_ruby
|
149
|
-
else
|
150
|
-
dict[key] = c.to_ruby
|
151
|
-
key = nil
|
152
|
-
end
|
153
|
-
end
|
154
|
-
|
155
|
-
dict
|
156
|
-
end
|
157
|
-
end
|
158
|
-
|
159
|
-
class PKey < PTag
|
160
|
-
def to_ruby
|
161
|
-
CGI::unescapeHTML(text || '')
|
162
|
-
end
|
163
|
-
end
|
164
|
-
|
165
|
-
class PString < PTag
|
166
|
-
def to_ruby
|
167
|
-
CGI::unescapeHTML(text || '')
|
168
|
-
end
|
169
|
-
end
|
170
|
-
|
171
|
-
class PArray < PTag
|
172
|
-
def to_ruby
|
173
|
-
children.collect do |c|
|
174
|
-
c.to_ruby
|
175
|
-
end
|
176
|
-
end
|
177
|
-
end
|
178
|
-
|
179
|
-
class PInteger < PTag
|
180
|
-
def to_ruby
|
181
|
-
text.to_i
|
182
|
-
end
|
183
|
-
end
|
184
|
-
|
185
|
-
class PTrue < PTag
|
186
|
-
def to_ruby
|
187
|
-
true
|
188
|
-
end
|
189
|
-
end
|
190
|
-
|
191
|
-
class PFalse < PTag
|
192
|
-
def to_ruby
|
193
|
-
false
|
194
|
-
end
|
195
|
-
end
|
196
|
-
|
197
|
-
class PReal < PTag
|
198
|
-
def to_ruby
|
199
|
-
text.to_f
|
200
|
-
end
|
201
|
-
end
|
202
|
-
|
203
|
-
require 'date'
|
204
|
-
class PDate < PTag
|
205
|
-
def to_ruby
|
206
|
-
DateTime.parse(text)
|
207
|
-
end
|
208
|
-
end
|
209
|
-
|
210
|
-
require 'base64'
|
211
|
-
class PData < PTag
|
212
|
-
def to_ruby
|
213
|
-
data = Base64.decode64(text.gsub(/\s+/, ''))
|
214
|
-
|
215
|
-
begin
|
216
|
-
return Marshal.load(data)
|
217
|
-
rescue Exception => e
|
218
|
-
io = StringIO.new
|
219
|
-
io.write data
|
220
|
-
io.rewind
|
221
|
-
return io
|
222
|
-
end
|
223
|
-
end
|
224
|
-
end
|
225
|
-
end
|