puppet 3.3.2 → 3.4.0.rc1
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.
- data/CONTRIBUTING.md +22 -0
- data/Gemfile +11 -2
- data/README.md +13 -17
- data/README_DEVELOPER.md +1 -1
- data/Rakefile +1 -1
- data/examples/hiera/README.md +4 -4
- data/ext/debian/puppetmaster.init +1 -0
- data/ext/debian/rules +2 -5
- data/ext/nagios/check_puppet.rb +7 -7
- data/ext/osx/file_mapping.yaml +1 -1
- data/ext/osx/preflight.erb +34 -19
- data/ext/rack/{files/config.ru → config.ru} +0 -0
- data/ext/rack/{files/apache2.conf → example-passenger-vhost.conf} +6 -0
- data/ext/redhat/puppet.spec.erb +20 -2
- data/ext/systemd/{puppetagent.service → puppet.service} +0 -0
- data/lib/hiera_puppet.rb +2 -2
- data/lib/puppet/agent.rb +1 -6
- data/lib/puppet/application.rb +15 -2
- data/lib/puppet/application/agent.rb +2 -7
- data/lib/puppet/application/apply.rb +8 -13
- data/lib/puppet/application/cert.rb +47 -7
- data/lib/puppet/application/device.rb +1 -6
- data/lib/puppet/application/face_base.rb +1 -1
- data/lib/puppet/application/filebucket.rb +1 -1
- data/lib/puppet/application/inspect.rb +3 -12
- data/lib/puppet/application/master.rb +1 -6
- data/lib/puppet/application/queue.rb +1 -6
- data/lib/puppet/application/resource.rb +2 -6
- data/lib/puppet/coercion.rb +11 -0
- data/lib/puppet/configurer.rb +5 -3
- data/lib/puppet/configurer/downloader.rb +3 -1
- data/lib/puppet/configurer/plugin_handler.rb +10 -0
- data/lib/puppet/confine.rb +80 -0
- data/lib/puppet/{provider/confine → confine}/exists.rb +3 -3
- data/lib/puppet/{provider/confine → confine}/false.rb +2 -2
- data/lib/puppet/{provider/confine → confine}/feature.rb +2 -2
- data/lib/puppet/{provider/confine → confine}/true.rb +2 -2
- data/lib/puppet/{provider/confine → confine}/variable.rb +2 -2
- data/lib/puppet/{provider/confine_collection.rb → confine_collection.rb} +4 -4
- data/lib/puppet/{provider/confiner.rb → confiner.rb} +4 -4
- data/lib/puppet/daemon.rb +2 -6
- data/lib/puppet/data_binding.rb +2 -30
- data/lib/puppet/defaults.rb +283 -174
- data/lib/puppet/error.rb +1 -0
- data/lib/puppet/external/nagios.rb +0 -2
- data/lib/puppet/external/nagios/base.rb +4 -3
- data/lib/puppet/external/nagios/grammar.ry +173 -112
- data/lib/puppet/external/nagios/parser.rb +233 -184
- data/lib/puppet/face/file/store.rb +1 -1
- data/lib/puppet/face/module/generate.rb +5 -7
- data/lib/puppet/face/parser.rb +12 -2
- data/lib/puppet/face/plugin.rb +6 -0
- data/lib/puppet/feature/base.rb +16 -0
- data/lib/puppet/feature/external_facts.rb +5 -0
- data/lib/puppet/feature/libuser.rb +1 -1
- data/lib/puppet/feature/msgpack.rb +1 -0
- data/lib/puppet/feature/rails.rb +2 -2
- data/lib/puppet/file_bucket/dipper.rb +8 -6
- data/lib/puppet/file_bucket/file.rb +17 -1
- data/lib/puppet/file_serving/base.rb +21 -10
- data/lib/puppet/file_serving/configuration.rb +5 -7
- data/lib/puppet/file_serving/configuration/parser.rb +1 -1
- data/lib/puppet/file_serving/content.rb +1 -1
- data/lib/puppet/file_serving/fileset.rb +3 -3
- data/lib/puppet/file_serving/metadata.rb +22 -18
- data/lib/puppet/file_serving/mount/file.rb +1 -1
- data/lib/puppet/file_serving/mount/pluginfacts.rb +35 -0
- data/lib/puppet/file_system.rb +3 -0
- data/lib/puppet/file_system/file.rb +261 -0
- data/lib/puppet/file_system/file18.rb +5 -0
- data/lib/puppet/file_system/file19.rb +5 -0
- data/lib/puppet/file_system/file19windows.rb +113 -0
- data/lib/puppet/file_system/memory_file.rb +31 -0
- data/lib/puppet/file_system/tempfile.rb +20 -0
- data/lib/puppet/indirector/active_record.rb +1 -0
- data/lib/puppet/indirector/catalog/compiler.rb +28 -0
- data/lib/puppet/indirector/certificate_request/memory.rb +6 -0
- data/lib/puppet/indirector/data_binding/hiera.rb +46 -2
- data/lib/puppet/indirector/direct_file_server.rb +2 -2
- data/lib/puppet/indirector/facts/facter.rb +25 -0
- data/lib/puppet/indirector/file_bucket_file/file.rb +60 -74
- data/lib/puppet/indirector/indirection.rb +5 -1
- data/lib/puppet/indirector/json.rb +1 -1
- data/lib/puppet/indirector/key/ca.rb +4 -0
- data/lib/puppet/indirector/key/file.rb +7 -3
- data/lib/puppet/indirector/key/memory.rb +6 -0
- data/lib/puppet/indirector/node/write_only_yaml.rb +2 -2
- data/lib/puppet/indirector/request.rb +17 -11
- data/lib/puppet/indirector/resource/ral.rb +5 -0
- data/lib/puppet/indirector/resource/rest.rb +1 -0
- data/lib/puppet/indirector/resource/store_configs.rb +4 -0
- data/lib/puppet/indirector/rest.rb +2 -1
- data/lib/puppet/indirector/ssl_file.rb +7 -7
- data/lib/puppet/indirector/terminus.rb +4 -0
- data/lib/puppet/indirector/yaml.rb +3 -3
- data/lib/puppet/interface/documentation.rb +4 -11
- data/lib/puppet/module.rb +19 -6
- data/lib/puppet/module_tool/applications/builder.rb +1 -1
- data/lib/puppet/module_tool/applications/installer.rb +1 -1
- data/lib/puppet/module_tool/checksums.rb +1 -1
- data/lib/puppet/module_tool/dependency.rb +7 -3
- data/lib/puppet/module_tool/metadata.rb +6 -2
- data/lib/puppet/module_tool/tar.rb +2 -1
- data/lib/puppet/module_tool/tar/gnu.rb +6 -2
- data/lib/puppet/module_tool/tar/mini.rb +2 -0
- data/lib/puppet/module_tool/tar/solaris.rb +2 -5
- data/lib/puppet/network/authconfig.rb +0 -2
- data/lib/puppet/network/authentication.rb +1 -1
- data/lib/puppet/network/authstore.rb +6 -7
- data/lib/puppet/network/format.rb +2 -3
- data/lib/puppet/network/format_handler.rb +16 -11
- data/lib/puppet/network/format_support.rb +14 -0
- data/lib/puppet/network/formats.rb +26 -0
- data/lib/puppet/network/http/connection.rb +8 -41
- data/lib/puppet/network/http/handler.rb +28 -32
- data/lib/puppet/network/http/webrick.rb +15 -22
- data/lib/puppet/network/http_pool.rb +43 -9
- data/lib/puppet/network/rights.rb +0 -0
- data/lib/puppet/node.rb +24 -8
- data/lib/puppet/node/environment.rb +18 -20
- data/lib/puppet/node/facts.rb +23 -6
- data/lib/puppet/parameter.rb +15 -2
- data/lib/puppet/parameter/boolean.rb +5 -0
- data/lib/puppet/parameter/value_collection.rb +6 -4
- data/lib/puppet/parser/ast/resourceparam.rb +2 -1
- data/lib/puppet/parser/compiler.rb +25 -9
- data/lib/puppet/parser/files.rb +1 -1
- data/lib/puppet/parser/functions.rb +12 -21
- data/lib/puppet/parser/functions/collect.rb +6 -35
- data/lib/puppet/parser/functions/contain.rb +26 -0
- data/lib/puppet/parser/functions/create_resources.rb +5 -0
- data/lib/puppet/parser/functions/extlookup.rb +2 -2
- data/lib/puppet/parser/functions/file.rb +1 -1
- data/lib/puppet/parser/functions/{reject.rb → filter.rb} +13 -12
- data/lib/puppet/parser/functions/fqdn_rand.rb +13 -5
- data/lib/puppet/parser/functions/include.rb +18 -1
- data/lib/puppet/parser/functions/map.rb +44 -0
- data/lib/puppet/parser/functions/select.rb +6 -38
- data/lib/puppet/parser/lexer.rb +1 -1
- data/lib/puppet/parser/parser_support.rb +1 -1
- data/lib/puppet/parser/resource.rb +6 -45
- data/lib/puppet/parser/scope.rb +33 -2
- data/lib/puppet/parser/type_loader.rb +4 -60
- data/lib/puppet/pops/binder/bindings_loader.rb +1 -1
- data/lib/puppet/pops/binder/config/binder_config.rb +3 -3
- data/lib/puppet/pops/binder/hiera2/bindings_provider.rb +1 -1
- data/lib/puppet/pops/binder/scheme_handler/confdir_hiera_scheme.rb +1 -1
- data/lib/puppet/pops/binder/scheme_handler/module_hiera_scheme.rb +2 -2
- data/lib/puppet/pops/issues.rb +4 -0
- data/lib/puppet/pops/model/ast_transformer.rb +4 -1
- data/lib/puppet/pops/model/model_label_provider.rb +1 -1
- data/lib/puppet/pops/parser/egrammar.ra +5 -24
- data/lib/puppet/pops/parser/eparser.rb +859 -902
- data/lib/puppet/pops/parser/lexer.rb +48 -30
- data/lib/puppet/pops/parser/parser_support.rb +1 -1
- data/lib/puppet/pops/patterns.rb +4 -4
- data/lib/puppet/pops/utils.rb +1 -1
- data/lib/puppet/pops/validation/checker3_1.rb +25 -20
- data/lib/puppet/provider.rb +23 -6
- data/lib/puppet/provider/aixobject.rb +0 -0
- data/lib/puppet/provider/augeas/augeas.rb +21 -5
- data/lib/puppet/provider/confine.rb +5 -79
- data/lib/puppet/provider/cron/crontab.rb +0 -0
- data/lib/puppet/provider/exec.rb +9 -7
- data/lib/puppet/provider/exec/posix.rb +10 -1
- data/lib/puppet/provider/exec/windows.rb +1 -1
- data/lib/puppet/provider/file/posix.rb +1 -0
- data/lib/puppet/provider/file/windows.rb +16 -5
- data/lib/puppet/provider/group/aix.rb +0 -0
- data/lib/puppet/provider/group/windows_adsi.rb +33 -1
- data/lib/puppet/provider/macauthorization/macauthorization.rb +1 -1
- data/lib/puppet/provider/mailalias/aliases.rb +0 -0
- data/lib/puppet/provider/maillist/mailman.rb +0 -0
- data/lib/puppet/provider/mount/parsed.rb +0 -0
- data/lib/puppet/provider/nameservice/directoryservice.rb +3 -3
- data/lib/puppet/provider/package/appdmg.rb +1 -1
- data/lib/puppet/provider/package/apple.rb +1 -1
- data/lib/puppet/provider/package/apt.rb +1 -1
- data/lib/puppet/provider/package/aptitude.rb +0 -0
- data/lib/puppet/provider/package/blastwave.rb +1 -1
- data/lib/puppet/provider/package/dpkg.rb +1 -1
- data/lib/puppet/provider/package/fink.rb +1 -1
- data/lib/puppet/provider/package/freebsd.rb +0 -0
- data/lib/puppet/provider/package/gem.rb +0 -0
- data/lib/puppet/provider/package/macports.rb +0 -0
- data/lib/puppet/provider/package/msi.rb +4 -10
- data/lib/puppet/provider/package/nim.rb +8 -8
- data/lib/puppet/provider/package/openbsd.rb +1 -1
- data/lib/puppet/provider/package/opkg.rb +0 -0
- data/lib/puppet/provider/package/pacman.rb +2 -2
- data/lib/puppet/provider/package/pkgdmg.rb +1 -1
- data/lib/puppet/provider/package/pkgutil.rb +1 -1
- data/lib/puppet/provider/package/ports.rb +0 -0
- data/lib/puppet/provider/package/rpm.rb +39 -3
- data/lib/puppet/provider/package/sun.rb +3 -3
- data/lib/puppet/provider/package/sunfreeware.rb +0 -0
- data/lib/puppet/provider/package/windows.rb +12 -19
- data/lib/puppet/provider/package/windows/package.rb +1 -1
- data/lib/puppet/provider/package/yum.rb +2 -2
- data/lib/puppet/provider/parsedfile.rb +0 -0
- data/lib/puppet/provider/port/parsed.rb +0 -0
- data/lib/puppet/provider/service/base.rb +0 -0
- data/lib/puppet/provider/service/bsd.rb +3 -3
- data/lib/puppet/provider/service/daemontools.rb +8 -8
- data/lib/puppet/provider/service/debian.rb +0 -0
- data/lib/puppet/provider/service/freebsd.rb +3 -3
- data/lib/puppet/provider/service/init.rb +5 -4
- data/lib/puppet/provider/service/launchd.rb +35 -24
- data/lib/puppet/provider/service/openbsd.rb +23 -0
- data/lib/puppet/provider/service/redhat.rb +0 -0
- data/lib/puppet/provider/service/runit.rb +3 -3
- data/lib/puppet/provider/service/smf.rb +0 -0
- data/lib/puppet/provider/service/src.rb +0 -0
- data/lib/puppet/provider/service/systemd.rb +0 -0
- data/lib/puppet/provider/service/upstart.rb +3 -3
- data/lib/puppet/provider/ssh_authorized_key/parsed.rb +2 -2
- data/lib/puppet/provider/sshkey/parsed.rb +0 -0
- data/lib/puppet/provider/user/aix.rb +0 -0
- data/lib/puppet/provider/user/directoryservice.rb +1 -1
- data/lib/puppet/provider/user/useradd.rb +1 -1
- data/lib/puppet/provider/zone/solaris.rb +1 -1
- data/lib/puppet/rails/benchmark.rb +1 -1
- data/lib/puppet/reference/configuration.rb +1 -2
- data/lib/puppet/reference/indirection.rb +12 -14
- data/lib/puppet/relationship.rb +7 -4
- data/lib/puppet/reports.rb +2 -2
- data/lib/puppet/reports/rrdgraph.rb +1 -1
- data/lib/puppet/reports/store.rb +3 -3
- data/lib/puppet/reports/tagmail.rb +2 -2
- data/lib/puppet/resource.rb +66 -8
- data/lib/puppet/resource/catalog.rb +18 -25
- data/lib/puppet/resource/status.rb +10 -4
- data/lib/puppet/run.rb +6 -2
- data/lib/puppet/settings.rb +39 -119
- data/lib/puppet/settings/base_setting.rb +8 -9
- data/lib/puppet/settings/directory_setting.rb +8 -0
- data/lib/puppet/settings/file_setting.rb +35 -1
- data/lib/puppet/settings/priority_setting.rb +42 -0
- data/lib/puppet/ssl.rb +4 -0
- data/lib/puppet/ssl/certificate.rb +18 -0
- data/lib/puppet/ssl/certificate_authority.rb +101 -72
- data/lib/puppet/ssl/certificate_authority/autosign_command.rb +44 -0
- data/lib/puppet/ssl/certificate_authority/interface.rb +21 -17
- data/lib/puppet/ssl/certificate_factory.rb +38 -12
- data/lib/puppet/ssl/certificate_request.rb +201 -47
- data/lib/puppet/ssl/certificate_request_attributes.rb +34 -0
- data/lib/puppet/ssl/certificate_revocation_list.rb +2 -2
- data/lib/puppet/ssl/host.rb +21 -10
- data/lib/puppet/ssl/inventory.rb +6 -10
- data/lib/puppet/ssl/key.rb +1 -1
- data/lib/puppet/ssl/oids.rb +78 -0
- data/lib/puppet/ssl/validator.rb +41 -97
- data/lib/puppet/ssl/validator/default_validator.rb +153 -0
- data/lib/puppet/ssl/validator/no_validator.rb +17 -0
- data/lib/puppet/status.rb +4 -0
- data/lib/puppet/test/test_helper.rb +5 -0
- data/lib/puppet/transaction.rb +13 -0
- data/lib/puppet/transaction/event.rb +8 -3
- data/lib/puppet/transaction/report.rb +6 -2
- data/lib/puppet/transaction/resource_harness.rb +173 -115
- data/lib/puppet/type.rb +30 -13
- data/lib/puppet/type/augeas.rb +12 -46
- data/lib/puppet/type/component.rb +1 -7
- data/lib/puppet/type/cron.rb +0 -0
- data/lib/puppet/type/exec.rb +13 -1
- data/lib/puppet/type/file.rb +19 -10
- data/lib/puppet/type/file/checksum.rb +0 -0
- data/lib/puppet/type/file/content.rb +3 -0
- data/lib/puppet/type/file/ensure.rb +33 -15
- data/lib/puppet/type/file/group.rb +0 -0
- data/lib/puppet/type/file/mode.rb +6 -2
- data/lib/puppet/type/file/owner.rb +0 -0
- data/lib/puppet/type/file/source.rb +65 -14
- data/lib/puppet/type/file/target.rb +6 -6
- data/lib/puppet/type/file/type.rb +0 -0
- data/lib/puppet/type/filebucket.rb +0 -0
- data/lib/puppet/type/group.rb +18 -0
- data/lib/puppet/type/host.rb +0 -0
- data/lib/puppet/type/k5login.rb +4 -4
- data/lib/puppet/type/mailalias.rb +0 -0
- data/lib/puppet/type/maillist.rb +0 -0
- data/lib/puppet/type/mount.rb +15 -1
- data/lib/puppet/type/package.rb +7 -1
- data/lib/puppet/type/port.rb +0 -0
- data/lib/puppet/type/schedule.rb +9 -4
- data/lib/puppet/type/service.rb +1 -1
- data/lib/puppet/type/sshkey.rb +0 -0
- data/lib/puppet/type/tidy.rb +1 -1
- data/lib/puppet/type/user.rb +3 -0
- data/lib/puppet/type/yumrepo.rb +8 -6
- data/lib/puppet/type/zpool.rb +0 -0
- data/lib/puppet/util.rb +4 -31
- data/lib/puppet/util/adsi.rb +73 -17
- data/lib/puppet/util/autoload.rb +3 -3
- data/lib/puppet/util/backups.rb +4 -4
- data/lib/puppet/util/cacher.rb +7 -13
- data/lib/puppet/util/checksums.rb +2 -2
- data/lib/puppet/util/classgen.rb +3 -1
- data/lib/puppet/util/colors.rb +1 -0
- data/lib/puppet/util/command_line.rb +5 -0
- data/lib/puppet/util/docs.rb +33 -27
- data/lib/puppet/util/execution.rb +42 -18
- data/lib/puppet/util/filetype.rb +3 -3
- data/lib/puppet/util/instance_loader.rb +2 -2
- data/lib/puppet/util/instrumentation.rb +23 -42
- data/lib/puppet/util/instrumentation/data.rb +11 -4
- data/lib/puppet/util/instrumentation/indirection_probe.rb +11 -4
- data/lib/puppet/util/instrumentation/instrumentable.rb +7 -14
- data/lib/puppet/util/instrumentation/listener.rb +15 -8
- data/lib/puppet/util/instrumentation/listeners/log.rb +4 -10
- data/lib/puppet/util/instrumentation/listeners/performance.rb +8 -14
- data/lib/puppet/util/limits.rb +12 -0
- data/lib/puppet/util/lockfile.rb +2 -2
- data/lib/puppet/util/log.rb +14 -6
- data/lib/puppet/util/log/destinations.rb +23 -1
- data/lib/puppet/util/metric.rb +9 -3
- data/lib/puppet/util/monkey_patches.rb +7 -2
- data/lib/puppet/util/network_device/config.rb +1 -1
- data/lib/puppet/util/plugins.rb +1 -1
- data/lib/puppet/util/posix.rb +0 -0
- data/lib/puppet/util/profiler.rb +7 -2
- data/lib/puppet/util/provider_features.rb +2 -2
- data/lib/puppet/util/rdoc.rb +28 -30
- data/lib/puppet/util/rdoc/code_objects.rb +75 -25
- data/lib/puppet/util/rdoc/generators/puppet_generator.rb +1 -1
- data/lib/puppet/util/rdoc/parser.rb +12 -487
- data/lib/puppet/util/rdoc/parser/puppet_parser_core.rb +477 -0
- data/lib/puppet/util/rdoc/parser/puppet_parser_rdoc1.rb +19 -0
- data/lib/puppet/util/rdoc/parser/puppet_parser_rdoc2.rb +14 -0
- data/lib/puppet/util/reference.rb +1 -1
- data/lib/puppet/util/resource_template.rb +1 -1
- data/lib/puppet/util/selinux.rb +1 -1
- data/lib/puppet/util/storage.rb +2 -2
- data/lib/puppet/util/suidmanager.rb +1 -1
- data/lib/puppet/util/tag_set.rb +29 -0
- data/lib/puppet/util/tagging.rb +8 -24
- data/lib/puppet/util/watched_file.rb +1 -1
- data/lib/puppet/util/watcher.rb +1 -1
- data/lib/puppet/util/windows.rb +3 -0
- data/lib/puppet/util/windows/access_control_entry.rb +84 -0
- data/lib/puppet/util/windows/access_control_list.rb +106 -0
- data/lib/puppet/util/windows/file.rb +213 -0
- data/lib/puppet/util/windows/process.rb +199 -0
- data/lib/puppet/util/windows/root_certs.rb +52 -37
- data/lib/puppet/util/windows/security.rb +270 -245
- data/lib/puppet/util/windows/security_descriptor.rb +62 -0
- data/lib/puppet/util/windows/sid.rb +26 -4
- data/lib/puppet/version.rb +2 -2
- data/spec/fixtures/releases/jamtur01-apache/lib/puppet/provider/a2mod/debian.rb +1 -1
- data/spec/fixtures/unit/indirector/{hiera → data_binding/hiera}/global.yaml +0 -0
- data/spec/fixtures/unit/indirector/data_binding/hiera/invalid.yaml +1 -0
- data/spec/fixtures/unit/module/trailing-comma.json +24 -0
- data/spec/fixtures/unit/util/monkey_patches/x509.pem +32 -0
- data/spec/integration/application/apply_spec.rb +1 -1
- data/spec/integration/application/doc_spec.rb +1 -1
- data/spec/integration/configurer_spec.rb +4 -2
- data/spec/integration/data_binding.rb +100 -0
- data/spec/integration/indirector/catalog/compiler_spec.rb +16 -13
- data/spec/integration/indirector/direct_file_server_spec.rb +3 -5
- data/spec/integration/indirector/file_content/file_server_spec.rb +2 -2
- data/spec/integration/node/facts_spec.rb +1 -1
- data/spec/integration/node_spec.rb +1 -1
- data/spec/integration/parser/compiler_spec.rb +90 -0
- data/spec/integration/parser/parser_spec.rb +2 -2
- data/spec/integration/provider/cron/crontab_spec.rb +3 -5
- data/spec/integration/resource/catalog_spec.rb +1 -1
- data/spec/integration/ssl/autosign_spec.rb +90 -0
- data/spec/integration/ssl/certificate_authority_spec.rb +62 -69
- data/spec/integration/ssl/certificate_revocation_list_spec.rb +1 -1
- data/spec/integration/ssl/host_spec.rb +1 -1
- data/spec/integration/transaction_spec.rb +13 -13
- data/spec/integration/type/exec_spec.rb +2 -2
- data/spec/integration/type/file_spec.rb +287 -45
- data/spec/integration/type/tidy_spec.rb +3 -3
- data/spec/integration/util/rdoc/parser_spec.rb +236 -35
- data/spec/integration/util/settings_spec.rb +1 -1
- data/spec/integration/util/windows/process_spec.rb +22 -0
- data/spec/integration/util/windows/security_spec.rb +316 -106
- data/spec/lib/matchers/containment_matchers.rb +52 -0
- data/spec/lib/puppet_spec/compiler.rb +6 -0
- data/spec/lib/puppet_spec/files.rb +20 -21
- data/spec/shared_behaviours/documentation_on_faces.rb +3 -3
- data/spec/shared_behaviours/file_server_terminus.rb +2 -2
- data/spec/shared_contexts/platform.rb +1 -0
- data/spec/spec_helper.rb +13 -1
- data/spec/unit/agent_spec.rb +0 -12
- data/spec/unit/application/agent_spec.rb +4 -4
- data/spec/unit/application/apply_spec.rb +18 -2
- data/spec/unit/application/cert_spec.rb +8 -6
- data/spec/unit/application/device_spec.rb +1 -1
- data/spec/unit/application/filebucket_spec.rb +1 -1
- data/spec/unit/application/inspect_spec.rb +1 -1
- data/spec/unit/application_spec.rb +24 -0
- data/spec/unit/configurer/downloader_spec.rb +8 -7
- data/spec/unit/configurer/fact_handler_spec.rb +23 -0
- data/spec/unit/configurer/plugin_handler_spec.rb +7 -2
- data/spec/unit/configurer_spec.rb +15 -5
- data/spec/unit/{provider/confine → confine}/exists_spec.rb +12 -12
- data/spec/unit/{provider/confine → confine}/false_spec.rb +9 -9
- data/spec/unit/{provider/confine → confine}/feature_spec.rb +10 -10
- data/spec/unit/{provider/confine → confine}/true_spec.rb +7 -7
- data/spec/unit/{provider/confine → confine}/variable_spec.rb +16 -16
- data/spec/unit/{provider/confine_collection_spec.rb → confine_collection_spec.rb} +30 -30
- data/spec/unit/{provider/confine_spec.rb → confine_spec.rb} +11 -11
- data/spec/unit/{provider/confiner_spec.rb → confiner_spec.rb} +4 -4
- data/spec/unit/face/parser_spec.rb +54 -0
- data/spec/unit/file_bucket/dipper_spec.rb +2 -2
- data/spec/unit/file_serving/base_spec.rb +32 -9
- data/spec/unit/file_serving/configuration_spec.rb +7 -7
- data/spec/unit/file_serving/content_spec.rb +12 -7
- data/spec/unit/file_serving/fileset_spec.rb +57 -27
- data/spec/unit/file_serving/metadata_spec.rb +74 -12
- data/spec/unit/file_serving/mount/file_spec.rb +10 -10
- data/spec/unit/file_serving/mount/pluginfacts_spec.rb +73 -0
- data/spec/unit/file_system/file_spec.rb +486 -0
- data/spec/unit/file_system/tempfile_spec.rb +48 -0
- data/spec/unit/graph/relationship_graph_spec.rb +0 -6
- data/spec/unit/hiera_puppet_spec.rb +2 -2
- data/spec/unit/indirector/catalog/compiler_spec.rb +15 -19
- data/spec/unit/indirector/certificate_status/file_spec.rb +30 -40
- data/spec/unit/indirector/data_binding/hiera_spec.rb +95 -2
- data/spec/unit/indirector/direct_file_server_spec.rb +6 -6
- data/spec/unit/indirector/facts/facter_spec.rb +33 -0
- data/spec/unit/indirector/file_bucket_file/file_spec.rb +61 -52
- data/spec/unit/indirector/file_metadata/file_spec.rb +2 -2
- data/spec/unit/indirector/file_server_spec.rb +4 -4
- data/spec/unit/indirector/json_spec.rb +4 -4
- data/spec/unit/indirector/key/file_spec.rb +13 -14
- data/spec/unit/indirector/resource/ral_spec.rb +7 -0
- data/spec/unit/indirector/resource/store_configs_spec.rb +11 -0
- data/spec/unit/indirector/rest_spec.rb +7 -3
- data/spec/unit/indirector/ssl_file_spec.rb +14 -17
- data/spec/unit/indirector/yaml_spec.rb +4 -4
- data/spec/unit/module_spec.rb +43 -15
- data/spec/unit/module_tool/tar/gnu_spec.rb +2 -2
- data/spec/unit/module_tool/tar/solaris_spec.rb +2 -2
- data/spec/unit/module_tool/tar_spec.rb +45 -0
- data/spec/unit/network/authconfig_spec.rb +2 -1
- data/spec/unit/network/authentication_spec.rb +2 -2
- data/spec/unit/network/format_handler_spec.rb +2 -2
- data/spec/unit/network/formats_spec.rb +24 -0
- data/spec/unit/network/http/connection_spec.rb +76 -199
- data/spec/unit/network/http/handler_spec.rb +33 -34
- data/spec/unit/network/http_pool_spec.rb +8 -5
- data/spec/unit/node/environment_spec.rb +76 -90
- data/spec/unit/node/facts_spec.rb +20 -3
- data/spec/unit/node_spec.rb +43 -0
- data/spec/unit/parameter/boolean_spec.rb +22 -12
- data/spec/unit/parser/ast/resourceparam_spec.rb +51 -0
- data/spec/unit/parser/compiler_spec.rb +103 -35
- data/spec/unit/parser/eparser_adapter_spec.rb +12 -12
- data/spec/unit/parser/files_spec.rb +11 -11
- data/spec/unit/parser/functions/contain_spec.rb +185 -0
- data/spec/unit/parser/functions/create_resources_spec.rb +13 -5
- data/spec/unit/parser/functions/generate_spec.rb +1 -1
- data/spec/unit/parser/functions_spec.rb +2 -2
- data/spec/unit/parser/lexer_spec.rb +1 -1
- data/spec/unit/parser/methods/each_spec.rb +1 -1
- data/spec/unit/parser/methods/{select_spec.rb → filter_spec.rb} +11 -11
- data/spec/unit/parser/methods/map_spec.rb +95 -0
- data/spec/unit/parser/methods/reduce_spec.rb +12 -11
- data/spec/unit/parser/methods/shared.rb +5 -5
- data/spec/unit/parser/methods/slice_spec.rb +13 -13
- data/spec/unit/parser/parser_spec.rb +1 -1
- data/spec/unit/parser/resource/param_spec.rb +44 -0
- data/spec/unit/parser/resource_spec.rb +16 -15
- data/spec/unit/pops/model/ast_transformer_spec.rb +18 -4
- data/spec/unit/pops/parser/lexer_spec.rb +22 -5
- data/spec/unit/pops/parser/parse_calls_spec.rb +5 -5
- data/spec/unit/pops/transformer/transform_calls_spec.rb +6 -6
- data/spec/unit/pops/transformer/transform_containers_spec.rb +2 -2
- data/spec/unit/pops/validator/validator_spec.rb +31 -0
- data/spec/unit/provider/augeas/augeas_spec.rb +57 -2
- data/spec/unit/provider/exec/posix_spec.rb +8 -3
- data/spec/unit/provider/file/posix_spec.rb +2 -2
- data/spec/unit/provider/group/windows_adsi_spec.rb +70 -3
- data/spec/unit/provider/nameservice/directoryservice_spec.rb +3 -3
- data/spec/unit/provider/package/apt_spec.rb +1 -1
- data/spec/unit/provider/package/msi_spec.rb +15 -42
- data/spec/unit/provider/package/openbsd_spec.rb +3 -3
- data/spec/unit/provider/package/rpm_spec.rb +56 -13
- data/spec/unit/provider/package/windows_spec.rb +15 -19
- data/spec/unit/provider/service/base_spec.rb +1 -1
- data/spec/unit/provider/service/daemontools_spec.rb +18 -8
- data/spec/unit/provider/service/freebsd_spec.rb +3 -3
- data/spec/unit/provider/service/gentoo_spec.rb +5 -2
- data/spec/unit/provider/service/init_spec.rb +17 -17
- data/spec/unit/provider/service/launchd_spec.rb +76 -23
- data/spec/unit/provider/service/openbsd_spec.rb +125 -0
- data/spec/unit/provider/service/openwrt_spec.rb +1 -1
- data/spec/unit/provider/service/runit_spec.rb +12 -5
- data/spec/unit/provider/service/upstart_spec.rb +4 -4
- data/spec/unit/provider/ssh_authorized_key/parsed_spec.rb +5 -5
- data/spec/unit/provider/user/directoryservice_spec.rb +4 -4
- data/spec/unit/provider/zone/solaris_spec.rb +1 -1
- data/spec/unit/provider_spec.rb +2 -2
- data/spec/unit/reports/http_spec.rb +19 -34
- data/spec/unit/reports/store_spec.rb +2 -2
- data/spec/unit/resource/catalog_spec.rb +81 -11
- data/spec/unit/resource/status_spec.rb +11 -1
- data/spec/unit/resource/type_spec.rb +30 -1
- data/spec/unit/resource_spec.rb +40 -4
- data/spec/unit/settings/file_setting_spec.rb +2 -2
- data/spec/unit/settings/path_setting_spec.rb +2 -2
- data/spec/unit/settings/priority_setting_spec.rb +66 -0
- data/spec/unit/settings_spec.rb +16 -31
- data/spec/unit/ssl/certificate_authority/autosign_command_spec.rb +30 -0
- data/spec/unit/ssl/certificate_authority_spec.rb +129 -134
- data/spec/unit/ssl/certificate_factory_spec.rb +18 -0
- data/spec/unit/ssl/certificate_request_attributes_spec.rb +61 -0
- data/spec/unit/ssl/certificate_request_spec.rb +103 -0
- data/spec/unit/ssl/certificate_spec.rb +31 -18
- data/spec/unit/ssl/host_spec.rb +34 -8
- data/spec/unit/ssl/inventory_spec.rb +27 -62
- data/spec/unit/ssl/key_spec.rb +4 -4
- data/spec/unit/ssl/oids_spec.rb +48 -0
- data/spec/unit/ssl/validator_spec.rb +49 -6
- data/spec/unit/status_spec.rb +9 -0
- data/spec/unit/transaction/event_spec.rb +1 -9
- data/spec/unit/transaction/report_spec.rb +20 -1
- data/spec/unit/transaction/resource_harness_spec.rb +60 -210
- data/spec/unit/transaction_spec.rb +54 -8
- data/spec/unit/type/component_spec.rb +2 -2
- data/spec/unit/type/exec_spec.rb +14 -7
- data/spec/unit/type/file/content_spec.rb +13 -2
- data/spec/unit/type/file/ctime_spec.rb +1 -1
- data/spec/unit/type/file/mode_spec.rb +48 -2
- data/spec/unit/type/file/mtime_spec.rb +1 -1
- data/spec/unit/type/file/source_spec.rb +177 -7
- data/spec/unit/type/file_spec.rb +63 -71
- data/spec/unit/type/group_spec.rb +20 -0
- data/spec/unit/type/k5login_spec.rb +3 -3
- data/spec/unit/type/mount_spec.rb +53 -0
- data/spec/unit/type/nagios_spec.rb +216 -0
- data/spec/unit/type/package_spec.rb +7 -1
- data/spec/unit/type/schedule_spec.rb +6 -0
- data/spec/unit/type/service_spec.rb +3 -3
- data/spec/unit/type/tidy_spec.rb +14 -14
- data/spec/unit/type/user_spec.rb +9 -0
- data/spec/unit/type_spec.rb +86 -4
- data/spec/unit/util/adsi_spec.rb +120 -12
- data/spec/unit/util/autoload_spec.rb +14 -14
- data/spec/unit/util/backups_spec.rb +29 -21
- data/spec/unit/util/checksums_spec.rb +2 -1
- data/spec/unit/util/command_line_spec.rb +41 -0
- data/spec/unit/util/docs_spec.rb +91 -0
- data/spec/unit/util/execution_spec.rb +26 -2
- data/spec/unit/util/filetype_spec.rb +7 -7
- data/spec/unit/util/lockfile_spec.rb +2 -2
- data/spec/unit/util/log/destinations_spec.rb +32 -0
- data/spec/unit/util/monkey_patches_spec.rb +41 -0
- data/spec/unit/util/pidlock_spec.rb +6 -6
- data/spec/unit/util/rdoc/parser_spec.rb +15 -13
- data/spec/unit/util/rdoc_spec.rb +18 -24
- data/spec/unit/util/resource_template_spec.rb +3 -3
- data/spec/unit/util/selinux_spec.rb +4 -2
- data/spec/unit/util/storage_spec.rb +4 -4
- data/spec/unit/util/suidmanager_spec.rb +7 -0
- data/spec/unit/util/tag_set_spec.rb +46 -0
- data/spec/unit/util/tagging_spec.rb +82 -45
- data/spec/unit/util/watcher_spec.rb +4 -1
- data/spec/unit/util/windows/access_control_entry_spec.rb +67 -0
- data/spec/unit/util/windows/access_control_list_spec.rb +133 -0
- data/spec/unit/util/windows/root_certs_spec.rb +10 -8
- data/spec/unit/util/windows/security_descriptor_spec.rb +117 -0
- data/spec/unit/util/windows/sid_spec.rb +69 -0
- data/spec/unit/util_spec.rb +7 -7
- data/tasks/ci.rake +17 -36
- metadata +2811 -2746
- checksums.yaml +0 -7
- data/examples/mac_automount.pp +0 -16
- data/examples/mcx_dock_absent.pp +0 -4
- data/examples/mcx_dock_default.pp +0 -118
- data/examples/mcx_dock_full.pp +0 -125
- data/examples/mcx_dock_invalid.pp +0 -9
- data/examples/mcx_nogroup.pp +0 -118
- data/examples/mcx_notexists_absent.pp +0 -4
- data/ext/rack/README +0 -58
- data/ext/rack/manifest.pp +0 -59
- data/lib/puppet/external/lock.rb +0 -63
- data/lib/puppet/indirector/hiera.rb +0 -39
- data/lib/puppet/parser/functions/foreach.rb +0 -95
- data/spec/integration/network/server/webrick_spec.rb +0 -76
- data/spec/integration/parser/functions_spec.rb +0 -16
- data/spec/unit/indirector/hiera_spec.rb +0 -154
- data/spec/unit/parser/methods/collect_spec.rb +0 -153
- data/spec/unit/parser/methods/foreach_spec.rb +0 -91
- data/spec/unit/parser/methods/reject_spec.rb +0 -73
- data/spec/unit/resource/resource_type.json +0 -34
@@ -0,0 +1,477 @@
|
|
1
|
+
# Functionality common to both our RDoc version 1 and 2 parsers.
|
2
|
+
module RDoc::PuppetParserCore
|
3
|
+
|
4
|
+
SITE = "__site__"
|
5
|
+
|
6
|
+
def self.included(base)
|
7
|
+
base.class_eval do
|
8
|
+
attr_accessor :input_file_name, :top_level
|
9
|
+
|
10
|
+
# parser registration into RDoc
|
11
|
+
parse_files_matching(/\.(rb|pp)$/)
|
12
|
+
end
|
13
|
+
end
|
14
|
+
|
15
|
+
# called with the top level file
|
16
|
+
def initialize(top_level, file_name, body, options, stats)
|
17
|
+
@options = options
|
18
|
+
@stats = stats
|
19
|
+
@input_file_name = file_name
|
20
|
+
@top_level = top_level
|
21
|
+
@top_level.extend(RDoc::PuppetTopLevel)
|
22
|
+
@progress = $stderr unless options.quiet
|
23
|
+
end
|
24
|
+
|
25
|
+
# main entry point
|
26
|
+
def scan
|
27
|
+
environment = Puppet::Node::Environment.new
|
28
|
+
@known_resource_types = environment.known_resource_types
|
29
|
+
unless environment.known_resource_types.watching_file?(@input_file_name)
|
30
|
+
Puppet.info "rdoc: scanning #{@input_file_name}"
|
31
|
+
if @input_file_name =~ /\.pp$/
|
32
|
+
@parser = Puppet::Parser::Parser.new(environment)
|
33
|
+
@parser.file = @input_file_name
|
34
|
+
@parser.parse.instantiate('').each do |type|
|
35
|
+
@known_resource_types.add type
|
36
|
+
end
|
37
|
+
end
|
38
|
+
end
|
39
|
+
|
40
|
+
scan_top_level(@top_level)
|
41
|
+
@top_level
|
42
|
+
end
|
43
|
+
|
44
|
+
# Due to a bug in RDoc, we need to roll our own find_module_named
|
45
|
+
# The issue is that RDoc tries harder by asking the parent for a class/module
|
46
|
+
# of the name. But by doing so, it can mistakenly use a module of same name
|
47
|
+
# but from which we are not descendant.
|
48
|
+
def find_object_named(container, name)
|
49
|
+
return container if container.name == name
|
50
|
+
container.each_classmodule do |m|
|
51
|
+
return m if m.name == name
|
52
|
+
end
|
53
|
+
nil
|
54
|
+
end
|
55
|
+
|
56
|
+
# walk down the namespace and lookup/create container as needed
|
57
|
+
def get_class_or_module(container, name)
|
58
|
+
|
59
|
+
# class ::A -> A is in the top level
|
60
|
+
if name =~ /^::/
|
61
|
+
container = @top_level
|
62
|
+
end
|
63
|
+
|
64
|
+
names = name.split('::')
|
65
|
+
|
66
|
+
final_name = names.pop
|
67
|
+
names.each do |name|
|
68
|
+
prev_container = container
|
69
|
+
container = find_object_named(container, name)
|
70
|
+
container ||= prev_container.add_class(RDoc::PuppetClass, name, nil)
|
71
|
+
end
|
72
|
+
[container, final_name]
|
73
|
+
end
|
74
|
+
|
75
|
+
# split_module tries to find if +path+ belongs to the module path
|
76
|
+
# if it does, it returns the module name, otherwise if we are sure
|
77
|
+
# it is part of the global manifest path, "__site__" is returned.
|
78
|
+
# And finally if this path couldn't be mapped anywhere, nil is returned.
|
79
|
+
def split_module(path)
|
80
|
+
# find a module
|
81
|
+
fullpath = File.expand_path(path)
|
82
|
+
Puppet.debug "rdoc: testing #{fullpath}"
|
83
|
+
if fullpath =~ /(.*)\/([^\/]+)\/(?:manifests|plugins|lib)\/.+\.(pp|rb)$/
|
84
|
+
modpath = $1
|
85
|
+
name = $2
|
86
|
+
Puppet.debug "rdoc: module #{name} into #{modpath} ?"
|
87
|
+
Puppet::Node::Environment.new.modulepath.each do |mp|
|
88
|
+
if File.identical?(modpath,mp)
|
89
|
+
Puppet.debug "rdoc: found module #{name}"
|
90
|
+
return name
|
91
|
+
end
|
92
|
+
end
|
93
|
+
end
|
94
|
+
if fullpath =~ /\.(pp|rb)$/
|
95
|
+
# there can be paths we don't want to scan under modules
|
96
|
+
# imagine a ruby or manifest that would be distributed as part as a module
|
97
|
+
# but we don't want those to be hosted under <site>
|
98
|
+
Puppet::Node::Environment.new.modulepath.each do |mp|
|
99
|
+
# check that fullpath is a descendant of mp
|
100
|
+
dirname = fullpath
|
101
|
+
previous = dirname
|
102
|
+
while (dirname = File.dirname(previous)) != previous
|
103
|
+
previous = dirname
|
104
|
+
return nil if File.identical?(dirname,mp)
|
105
|
+
end
|
106
|
+
end
|
107
|
+
end
|
108
|
+
# we are under a global manifests
|
109
|
+
Puppet.debug "rdoc: global manifests"
|
110
|
+
SITE
|
111
|
+
end
|
112
|
+
|
113
|
+
# create documentation for the top level +container+
|
114
|
+
def scan_top_level(container)
|
115
|
+
# use the module README as documentation for the module
|
116
|
+
comment = ""
|
117
|
+
%w{README README.rdoc}.each do |rfile|
|
118
|
+
readme = File.join(File.dirname(File.dirname(@input_file_name)), rfile)
|
119
|
+
comment = File.open(readme,"r") { |f| f.read } if FileTest.readable?(readme)
|
120
|
+
end
|
121
|
+
look_for_directives_in(container, comment) unless comment.empty?
|
122
|
+
|
123
|
+
# infer module name from directory
|
124
|
+
name = split_module(@input_file_name)
|
125
|
+
if name.nil?
|
126
|
+
# skip .pp files that are not in manifests directories as we can't guarantee they're part
|
127
|
+
# of a module or the global configuration.
|
128
|
+
container.document_self = false
|
129
|
+
return
|
130
|
+
end
|
131
|
+
|
132
|
+
Puppet.debug "rdoc: scanning for #{name}"
|
133
|
+
|
134
|
+
container.module_name = name
|
135
|
+
container.global=true if name == SITE
|
136
|
+
|
137
|
+
container, name = get_class_or_module(container,name)
|
138
|
+
mod = container.add_module(RDoc::PuppetModule, name)
|
139
|
+
mod.record_location(@top_level)
|
140
|
+
mod.add_comment(comment, @input_file_name)
|
141
|
+
|
142
|
+
if @input_file_name =~ /\.pp$/
|
143
|
+
parse_elements(mod)
|
144
|
+
elsif @input_file_name =~ /\.rb$/
|
145
|
+
parse_plugins(mod)
|
146
|
+
end
|
147
|
+
end
|
148
|
+
|
149
|
+
# create documentation for include statements we can find in +code+
|
150
|
+
# and associate it with +container+
|
151
|
+
def scan_for_include_or_require(container, code)
|
152
|
+
code = [code] unless code.is_a?(Array)
|
153
|
+
code.each do |stmt|
|
154
|
+
scan_for_include_or_require(container,stmt.children) if stmt.is_a?(Puppet::Parser::AST::BlockExpression)
|
155
|
+
|
156
|
+
if stmt.is_a?(Puppet::Parser::AST::Function) and ['include','require'].include?(stmt.name)
|
157
|
+
stmt.arguments.each do |included|
|
158
|
+
Puppet.debug "found #{stmt.name}: #{included}"
|
159
|
+
container.send("add_#{stmt.name}", RDoc::Include.new(included.to_s, stmt.doc))
|
160
|
+
end
|
161
|
+
end
|
162
|
+
end
|
163
|
+
end
|
164
|
+
|
165
|
+
# create documentation for realize statements we can find in +code+
|
166
|
+
# and associate it with +container+
|
167
|
+
def scan_for_realize(container, code)
|
168
|
+
code = [code] unless code.is_a?(Array)
|
169
|
+
code.each do |stmt|
|
170
|
+
scan_for_realize(container,stmt.children) if stmt.is_a?(Puppet::Parser::AST::BlockExpression)
|
171
|
+
|
172
|
+
if stmt.is_a?(Puppet::Parser::AST::Function) and stmt.name == 'realize'
|
173
|
+
stmt.arguments.each do |realized|
|
174
|
+
Puppet.debug "found #{stmt.name}: #{realized}"
|
175
|
+
container.add_realize( RDoc::Include.new(realized.to_s, stmt.doc))
|
176
|
+
end
|
177
|
+
end
|
178
|
+
end
|
179
|
+
end
|
180
|
+
|
181
|
+
# create documentation for global variables assignements we can find in +code+
|
182
|
+
# and associate it with +container+
|
183
|
+
def scan_for_vardef(container, code)
|
184
|
+
code = [code] unless code.is_a?(Array)
|
185
|
+
code.each do |stmt|
|
186
|
+
scan_for_vardef(container,stmt.children) if stmt.is_a?(Puppet::Parser::AST::BlockExpression)
|
187
|
+
|
188
|
+
if stmt.is_a?(Puppet::Parser::AST::VarDef)
|
189
|
+
Puppet.debug "rdoc: found constant: #{stmt.name} = #{stmt.value}"
|
190
|
+
container.add_constant(RDoc::Constant.new(stmt.name.to_s, stmt.value.to_s, stmt.doc))
|
191
|
+
end
|
192
|
+
end
|
193
|
+
end
|
194
|
+
|
195
|
+
# create documentation for resources we can find in +code+
|
196
|
+
# and associate it with +container+
|
197
|
+
def scan_for_resource(container, code)
|
198
|
+
code = [code] unless code.is_a?(Array)
|
199
|
+
code.each do |stmt|
|
200
|
+
scan_for_resource(container,stmt.children) if stmt.is_a?(Puppet::Parser::AST::BlockExpression)
|
201
|
+
|
202
|
+
if stmt.is_a?(Puppet::Parser::AST::Resource) and !stmt.type.nil?
|
203
|
+
begin
|
204
|
+
type = stmt.type.split("::").collect { |s| s.capitalize }.join("::")
|
205
|
+
stmt.instances.each do |inst|
|
206
|
+
title = inst.title.is_a?(Puppet::Parser::AST::ASTArray) ? inst.title.to_s.gsub(/\[(.*)\]/,'\1') : inst.title.to_s
|
207
|
+
Puppet.debug "rdoc: found resource: #{type}[#{title}]"
|
208
|
+
|
209
|
+
param = []
|
210
|
+
inst.parameters.children.each do |p|
|
211
|
+
res = {}
|
212
|
+
res["name"] = p.param
|
213
|
+
res["value"] = "#{p.value.to_s}" unless p.value.nil?
|
214
|
+
|
215
|
+
param << res
|
216
|
+
end
|
217
|
+
|
218
|
+
container.add_resource(RDoc::PuppetResource.new(type, title, stmt.doc, param))
|
219
|
+
end
|
220
|
+
rescue => detail
|
221
|
+
raise Puppet::ParseError, "impossible to parse resource in #{stmt.file} at line #{stmt.line}: #{detail}"
|
222
|
+
end
|
223
|
+
end
|
224
|
+
end
|
225
|
+
end
|
226
|
+
|
227
|
+
# create documentation for a class named +name+
|
228
|
+
def document_class(name, klass, container)
|
229
|
+
Puppet.debug "rdoc: found new class #{name}"
|
230
|
+
container, name = get_class_or_module(container, name)
|
231
|
+
|
232
|
+
superclass = klass.parent
|
233
|
+
superclass = "" if superclass.nil? or superclass.empty?
|
234
|
+
|
235
|
+
comment = klass.doc
|
236
|
+
look_for_directives_in(container, comment) unless comment.empty?
|
237
|
+
cls = container.add_class(RDoc::PuppetClass, name, superclass)
|
238
|
+
# it is possible we already encountered this class, while parsing some namespaces
|
239
|
+
# from other classes of other files. But at that time we couldn't know this class superclass
|
240
|
+
# so, now we know it and force it.
|
241
|
+
cls.superclass = superclass
|
242
|
+
cls.record_location(@top_level)
|
243
|
+
|
244
|
+
# scan class code for include
|
245
|
+
code = klass.code.children if klass.code.is_a?(Puppet::Parser::AST::BlockExpression)
|
246
|
+
code ||= klass.code
|
247
|
+
unless code.nil?
|
248
|
+
scan_for_include_or_require(cls, code)
|
249
|
+
scan_for_realize(cls, code)
|
250
|
+
scan_for_resource(cls, code) if Puppet.settings[:document_all]
|
251
|
+
end
|
252
|
+
|
253
|
+
cls.add_comment(comment, klass.file)
|
254
|
+
rescue => detail
|
255
|
+
raise Puppet::ParseError, "impossible to parse class '#{name}' in #{klass.file} at line #{klass.line}: #{detail}"
|
256
|
+
end
|
257
|
+
|
258
|
+
# create documentation for a node
|
259
|
+
def document_node(name, node, container)
|
260
|
+
Puppet.debug "rdoc: found new node #{name}"
|
261
|
+
superclass = node.parent
|
262
|
+
superclass = "" if superclass.nil? or superclass.empty?
|
263
|
+
|
264
|
+
comment = node.doc
|
265
|
+
look_for_directives_in(container, comment) unless comment.empty?
|
266
|
+
n = container.add_node(name, superclass)
|
267
|
+
n.record_location(@top_level)
|
268
|
+
|
269
|
+
code = node.code.children if node.code.is_a?(Puppet::Parser::AST::BlockExpression)
|
270
|
+
code ||= node.code
|
271
|
+
unless code.nil?
|
272
|
+
scan_for_include_or_require(n, code)
|
273
|
+
scan_for_realize(n, code)
|
274
|
+
scan_for_vardef(n, code)
|
275
|
+
scan_for_resource(n, code) if Puppet.settings[:document_all]
|
276
|
+
end
|
277
|
+
|
278
|
+
n.add_comment(comment, node.file)
|
279
|
+
rescue => detail
|
280
|
+
raise Puppet::ParseError, "impossible to parse node '#{name}' in #{node.file} at line #{node.line}: #{detail}"
|
281
|
+
end
|
282
|
+
|
283
|
+
# create documentation for a define
|
284
|
+
def document_define(name, define, container)
|
285
|
+
Puppet.debug "rdoc: found new definition #{name}"
|
286
|
+
# find superclas if any
|
287
|
+
|
288
|
+
# find the parent
|
289
|
+
# split define name by :: to find the complete module hierarchy
|
290
|
+
container, name = get_class_or_module(container,name)
|
291
|
+
|
292
|
+
# build up declaration
|
293
|
+
declaration = ""
|
294
|
+
define.arguments.each do |arg,value|
|
295
|
+
declaration << "\$#{arg}"
|
296
|
+
unless value.nil?
|
297
|
+
declaration << " => "
|
298
|
+
case value
|
299
|
+
when Puppet::Parser::AST::Leaf
|
300
|
+
declaration << "'#{value.value}'"
|
301
|
+
when Puppet::Parser::AST::BlockExpression
|
302
|
+
declaration << "[#{value.children.collect { |v| "'#{v}'" }.join(", ")}]"
|
303
|
+
else
|
304
|
+
declaration << "#{value.to_s}"
|
305
|
+
end
|
306
|
+
end
|
307
|
+
declaration << ", "
|
308
|
+
end
|
309
|
+
declaration.chop!.chop! if declaration.size > 1
|
310
|
+
|
311
|
+
# register method into the container
|
312
|
+
meth = RDoc::AnyMethod.new(declaration, name)
|
313
|
+
meth.comment = define.doc
|
314
|
+
container.add_method(meth)
|
315
|
+
look_for_directives_in(container, meth.comment) unless meth.comment.empty?
|
316
|
+
meth.params = "( #{declaration} )"
|
317
|
+
meth.visibility = :public
|
318
|
+
meth.document_self = true
|
319
|
+
meth.singleton = false
|
320
|
+
rescue => detail
|
321
|
+
raise Puppet::ParseError, "impossible to parse definition '#{name}' in #{define.file} at line #{define.line}: #{detail}"
|
322
|
+
end
|
323
|
+
|
324
|
+
# Traverse the AST tree and produce code-objects node
|
325
|
+
# that contains the documentation
|
326
|
+
def parse_elements(container)
|
327
|
+
Puppet.debug "rdoc: scanning manifest"
|
328
|
+
|
329
|
+
@known_resource_types.hostclasses.values.sort { |a,b| a.name <=> b.name }.each do |klass|
|
330
|
+
name = klass.name
|
331
|
+
if klass.file == @input_file_name
|
332
|
+
unless name.empty?
|
333
|
+
document_class(name,klass,container)
|
334
|
+
else # on main class document vardefs
|
335
|
+
code = klass.code.children if klass.code.is_a?(Puppet::Parser::AST::BlockExpression)
|
336
|
+
code ||= klass.code
|
337
|
+
scan_for_vardef(container, code) unless code.nil?
|
338
|
+
end
|
339
|
+
end
|
340
|
+
end
|
341
|
+
|
342
|
+
@known_resource_types.definitions.each do |name, define|
|
343
|
+
if define.file == @input_file_name
|
344
|
+
document_define(name,define,container)
|
345
|
+
end
|
346
|
+
end
|
347
|
+
|
348
|
+
@known_resource_types.nodes.each do |name, node|
|
349
|
+
if node.file == @input_file_name
|
350
|
+
document_node(name.to_s,node,container)
|
351
|
+
end
|
352
|
+
end
|
353
|
+
end
|
354
|
+
|
355
|
+
# create documentation for plugins
|
356
|
+
def parse_plugins(container)
|
357
|
+
Puppet.debug "rdoc: scanning plugin or fact"
|
358
|
+
if @input_file_name =~ /\/facter\/[^\/]+\.rb$/
|
359
|
+
parse_fact(container)
|
360
|
+
else
|
361
|
+
parse_puppet_plugin(container)
|
362
|
+
end
|
363
|
+
end
|
364
|
+
|
365
|
+
# this is a poor man custom fact parser :-)
|
366
|
+
def parse_fact(container)
|
367
|
+
comments = ""
|
368
|
+
current_fact = nil
|
369
|
+
parsed_facts = []
|
370
|
+
File.open(@input_file_name) do |of|
|
371
|
+
of.each do |line|
|
372
|
+
# fetch comments
|
373
|
+
if line =~ /^[ \t]*# ?(.*)$/
|
374
|
+
comments += $1 + "\n"
|
375
|
+
elsif line =~ /^[ \t]*Facter.add\(['"](.*?)['"]\)/
|
376
|
+
current_fact = RDoc::Fact.new($1,{})
|
377
|
+
look_for_directives_in(container, comments) unless comments.empty?
|
378
|
+
current_fact.comment = comments
|
379
|
+
parsed_facts << current_fact
|
380
|
+
comments = ""
|
381
|
+
Puppet.debug "rdoc: found custom fact #{current_fact.name}"
|
382
|
+
elsif line =~ /^[ \t]*confine[ \t]*:(.*?)[ \t]*=>[ \t]*(.*)$/
|
383
|
+
current_fact.confine = { :type => $1, :value => $2 } unless current_fact.nil?
|
384
|
+
else # unknown line type
|
385
|
+
comments =""
|
386
|
+
end
|
387
|
+
end
|
388
|
+
end
|
389
|
+
parsed_facts.each do |f|
|
390
|
+
container.add_fact(f)
|
391
|
+
f.record_location(@top_level)
|
392
|
+
end
|
393
|
+
end
|
394
|
+
|
395
|
+
# this is a poor man puppet plugin parser :-)
|
396
|
+
# it doesn't extract doc nor desc :-(
|
397
|
+
def parse_puppet_plugin(container)
|
398
|
+
comments = ""
|
399
|
+
current_plugin = nil
|
400
|
+
|
401
|
+
File.open(@input_file_name) do |of|
|
402
|
+
of.each do |line|
|
403
|
+
# fetch comments
|
404
|
+
if line =~ /^[ \t]*# ?(.*)$/
|
405
|
+
comments += $1 + "\n"
|
406
|
+
elsif line =~ /^[ \t]*(?:Puppet::Parser::Functions::)?newfunction[ \t]*\([ \t]*:(.*?)[ \t]*,[ \t]*:type[ \t]*=>[ \t]*(:rvalue|:lvalue)/
|
407
|
+
current_plugin = RDoc::Plugin.new($1, "function")
|
408
|
+
look_for_directives_in(container, comments) unless comments.empty?
|
409
|
+
current_plugin.comment = comments
|
410
|
+
current_plugin.record_location(@top_level)
|
411
|
+
container.add_plugin(current_plugin)
|
412
|
+
comments = ""
|
413
|
+
Puppet.debug "rdoc: found new function plugins #{current_plugin.name}"
|
414
|
+
elsif line =~ /^[ \t]*Puppet::Type.newtype[ \t]*\([ \t]*:(.*?)\)/
|
415
|
+
current_plugin = RDoc::Plugin.new($1, "type")
|
416
|
+
look_for_directives_in(container, comments) unless comments.empty?
|
417
|
+
current_plugin.comment = comments
|
418
|
+
current_plugin.record_location(@top_level)
|
419
|
+
container.add_plugin(current_plugin)
|
420
|
+
comments = ""
|
421
|
+
Puppet.debug "rdoc: found new type plugins #{current_plugin.name}"
|
422
|
+
elsif line =~ /module Puppet::Parser::Functions/
|
423
|
+
# skip
|
424
|
+
else # unknown line type
|
425
|
+
comments =""
|
426
|
+
end
|
427
|
+
end
|
428
|
+
end
|
429
|
+
end
|
430
|
+
|
431
|
+
# New instance of the appropriate PreProcess for our RDoc version.
|
432
|
+
def create_rdoc_preprocess
|
433
|
+
raise(NotImplementedError, "This method must be overwritten for whichever version of RDoc this parser is working with")
|
434
|
+
end
|
435
|
+
|
436
|
+
# look_for_directives_in scans the current +comment+ for RDoc directives
|
437
|
+
def look_for_directives_in(context, comment)
|
438
|
+
preprocess = create_rdoc_preprocess
|
439
|
+
|
440
|
+
preprocess.handle(comment) do |directive, param|
|
441
|
+
case directive
|
442
|
+
when "stopdoc"
|
443
|
+
context.stop_doc
|
444
|
+
""
|
445
|
+
when "startdoc"
|
446
|
+
context.start_doc
|
447
|
+
context.force_documentation = true
|
448
|
+
""
|
449
|
+
when "enddoc"
|
450
|
+
#context.done_documenting = true
|
451
|
+
#""
|
452
|
+
throw :enddoc
|
453
|
+
when "main"
|
454
|
+
options = Options.instance
|
455
|
+
options.main_page = param
|
456
|
+
""
|
457
|
+
when "title"
|
458
|
+
options = Options.instance
|
459
|
+
options.title = param
|
460
|
+
""
|
461
|
+
when "section"
|
462
|
+
context.set_current_section(param, comment)
|
463
|
+
comment.replace("") # 1.8 doesn't support #clear
|
464
|
+
break
|
465
|
+
else
|
466
|
+
warn "Unrecognized directive '#{directive}'"
|
467
|
+
break
|
468
|
+
end
|
469
|
+
end
|
470
|
+
remove_private_comments(comment)
|
471
|
+
end
|
472
|
+
|
473
|
+
def remove_private_comments(comment)
|
474
|
+
comment.gsub!(/^#--.*?^#\+\+/m, '')
|
475
|
+
comment.sub!(/^#--.*/m, '')
|
476
|
+
end
|
477
|
+
end
|