RubyGems - puppet - Versions diffs - 0.24.9 → 0.25.0 - Mend

puppet 0.24.9 → 0.25.0

Potentially problematic release.

This version of puppet might be problematic. Click here for more details.

Files changed (910) hide show

data/CHANGELOG +18680 -1241
data/CHANGELOG.old +1705 -0
data/LICENSE +2 -2
data/README +1 -1
data/README.queueing +126 -0
data/README.rst +4 -4
data/Rakefile +62 -216
data/bin/filebucket +6 -117
data/bin/pi +50 -0
data/bin/puppet +7 -188
data/bin/puppetdoc +7 -198
data/bin/ralsh +4 -191
data/conf/auth.conf +94 -0
data/conf/gentoo/init.d/puppetmaster +30 -30
data/conf/osx/PackageInfo.plist +30 -30
data/conf/osx/createpackage.sh +23 -18
data/conf/osx/preflight +8 -0
data/conf/puppet-queue.conf +10 -0
data/conf/redhat/client.init +52 -41
data/conf/redhat/logrotate +1 -0
data/conf/redhat/puppet.spec +74 -36
data/conf/redhat/rundir-perms.patch +28 -0
data/conf/redhat/server.init +48 -43
data/conf/redhat/server.sysconfig +4 -4
data/conf/solaris/smf/puppetd.xml +53 -53
data/conf/solaris/smf/puppetmasterd.xml +53 -53
data/conf/solaris/smf/svc-puppetd +4 -4
data/conf/solaris/smf/svc-puppetmasterd +3 -3
data/conf/suse/client.init +4 -4
data/conf/suse/puppet.spec +14 -14
data/conf/suse/server.init +17 -17
data/examples/etc/init.d/sleeper +8 -8
data/examples/mac_dscl.pp +2 -2
data/examples/mac_dscl_revert.pp +1 -1
data/examples/mcx_dock_default.pp +108 -108
data/examples/mcx_dock_full.pp +108 -108
data/examples/mcx_nogroup.pp +108 -108
data/examples/modules/sample-module/lib/puppet/parser/functions/hostname_to_dn.rb +5 -5
data/examples/modules/sample-module/manifests/init.pp +2 -2
data/examples/relationships +1 -1
data/ext/autotest/config +6 -6
data/ext/bin/sleeper +12 -12
data/ext/dbfix.sql +21 -21
data/ext/emacs/puppet-mode.el +42 -41
data/ext/extlookup.rb +183 -0
data/ext/ldap/puppet.schema +2 -1
data/ext/logcheck/puppet +1 -1
data/ext/module_puppet +7 -7
data/ext/nagios/check_puppet.rb +83 -83
data/ext/nagios/naggen +302 -0
data/ext/puppet-test +61 -18
data/ext/puppetlisten/puppetlisten.rb +76 -0
data/ext/puppetlisten/puppetrun.rb +39 -0
data/ext/puppetstoredconfigclean.rb +29 -29
data/ext/rack/README +73 -0
data/ext/rack/files/apache2.conf +38 -0
data/ext/rack/files/config.ru +18 -0
data/ext/rack/manifest.pp +59 -0
data/ext/vim/syntax/puppet.vim +54 -35
data/install.rb +37 -26
data/lib/puppet.rb +15 -227
data/lib/puppet/agent.rb +134 -0
data/lib/puppet/agent/locker.rb +42 -0
data/lib/puppet/agent/runner.rb +65 -0
data/lib/puppet/application.rb +313 -0
data/lib/puppet/application/filebucket.rb +87 -0
data/lib/puppet/application/pi.rb +214 -0
data/lib/puppet/application/puppet.rb +177 -0
data/lib/puppet/application/puppetca.rb +71 -0
data/lib/puppet/application/puppetd.rb +256 -0
data/lib/puppet/application/puppetdoc.rb +222 -0
data/lib/puppet/application/puppetmasterd.rb +168 -0
data/lib/puppet/application/puppetqd.rb +96 -0
data/lib/puppet/application/puppetrun.rb +219 -0
data/lib/puppet/application/ralsh.rb +168 -0
data/lib/puppet/configurer.rb +177 -0
data/lib/puppet/configurer/downloader.rb +79 -0
data/lib/puppet/configurer/fact_handler.rb +68 -0
data/lib/puppet/configurer/plugin_handler.rb +26 -0
data/lib/puppet/daemon.rb +78 -28
data/lib/puppet/defaults.rb +239 -166
data/lib/puppet/dsl.rb +7 -7
data/lib/puppet/external/dot.rb +271 -271
data/lib/puppet/external/event-loop/better-definers.rb +298 -298
data/lib/puppet/external/event-loop/event-loop.rb +274 -274
data/lib/puppet/external/event-loop/signal-system.rb +163 -163
data/lib/puppet/external/lock.rb +1 -1
data/lib/puppet/external/nagios.rb +20 -20
data/lib/puppet/external/nagios/base.rb +3 -3
data/lib/puppet/external/nagios/grammar.ry +185 -0
data/lib/puppet/external/nagios/makefile +9 -0
data/lib/puppet/external/nagios/parser.rb +1 -1
data/lib/puppet/feature/json.rb +2 -0
data/lib/puppet/feature/rack.rb +24 -0
data/lib/puppet/feature/rails.rb +23 -33
data/lib/puppet/feature/rubygems.rb +6 -0
data/lib/puppet/feature/stomp.rb +6 -0
data/lib/puppet/file_serving/{file_base.rb → base.rb} +10 -9
data/lib/puppet/file_serving/configuration.rb +61 -61
data/lib/puppet/file_serving/configuration/parser.rb +24 -29
data/lib/puppet/file_serving/content.rb +26 -11
data/lib/puppet/file_serving/fileset.rb +54 -19
data/lib/puppet/file_serving/indirection_hooks.rb +12 -24
data/lib/puppet/file_serving/metadata.rb +8 -8
data/lib/puppet/file_serving/mount.rb +9 -151
data/lib/puppet/file_serving/mount/file.rb +126 -0
data/lib/puppet/file_serving/mount/modules.rb +25 -0
data/lib/puppet/file_serving/mount/plugins.rb +27 -0
data/lib/puppet/file_serving/terminus_helper.rb +9 -4
data/lib/puppet/indirector.rb +6 -4
data/lib/puppet/indirector/active_record.rb +28 -0
data/lib/puppet/indirector/catalog/active_record.rb +36 -0
data/lib/puppet/indirector/catalog/compiler.rb +50 -24
data/lib/puppet/indirector/catalog/queue.rb +5 -0
data/lib/puppet/indirector/catalog/rest.rb +6 -0
data/lib/puppet/indirector/catalog/yaml.rb +2 -4
data/lib/puppet/indirector/certificate/ca.rb +9 -0
data/lib/puppet/indirector/certificate/file.rb +9 -0
data/lib/puppet/indirector/certificate/rest.rb +9 -0
data/lib/puppet/indirector/certificate_request/ca.rb +14 -0
data/lib/puppet/indirector/certificate_request/file.rb +8 -0
data/lib/puppet/indirector/certificate_request/rest.rb +9 -0
data/lib/puppet/indirector/certificate_revocation_list/ca.rb +8 -0
data/lib/puppet/indirector/certificate_revocation_list/file.rb +8 -0
data/lib/puppet/indirector/certificate_revocation_list/rest.rb +9 -0
data/lib/puppet/indirector/direct_file_server.rb +4 -8
data/lib/puppet/indirector/exec.rb +2 -6
data/lib/puppet/indirector/facts/active_record.rb +36 -0
data/lib/puppet/indirector/facts/facter.rb +30 -22
data/lib/puppet/indirector/facts/rest.rb +6 -0
data/lib/puppet/indirector/file.rb +1 -0
data/lib/puppet/indirector/file_content/rest.rb +0 -1
data/lib/puppet/indirector/file_metadata/file.rb +2 -2
data/lib/puppet/indirector/file_metadata/rest.rb +0 -1
data/lib/puppet/indirector/file_server.rb +31 -18
data/lib/puppet/indirector/indirection.rb +46 -33
data/lib/puppet/indirector/key/ca.rb +12 -0
data/lib/puppet/indirector/key/file.rb +42 -0
data/lib/puppet/indirector/node/active_record.rb +13 -0
data/lib/puppet/indirector/node/ldap.rb +1 -1
data/lib/puppet/indirector/queue.rb +83 -0
data/lib/puppet/indirector/report/processor.rb +1 -1
data/lib/puppet/indirector/report/rest.rb +7 -0
data/lib/puppet/indirector/request.rb +158 -15
data/lib/puppet/indirector/rest.rb +74 -36
data/lib/puppet/indirector/runner/rest.rb +7 -0
data/lib/puppet/indirector/ssl_file.rb +174 -0
data/lib/puppet/indirector/terminus.rb +4 -4
data/lib/puppet/indirector/yaml.rb +1 -1
data/lib/puppet/metatype/manager.rb +3 -3
data/lib/puppet/module.rb +99 -124
data/lib/puppet/network/authconfig.rb +57 -42
data/lib/puppet/network/authstore.rb +58 -10
data/lib/puppet/network/client.rb +0 -2
data/lib/puppet/network/client/ca.rb +1 -1
data/lib/puppet/network/client/dipper.rb +7 -2
data/lib/puppet/network/format.rb +123 -0
data/lib/puppet/network/format_handler.rb +156 -0
data/lib/puppet/network/formats.rb +123 -0
data/lib/puppet/network/handler/filebucket.rb +1 -1
data/lib/puppet/network/handler/fileserver.rb +43 -35
data/lib/puppet/network/handler/master.rb +4 -4
data/lib/puppet/network/handler/report.rb +1 -1
data/lib/puppet/network/handler/resource.rb +16 -20
data/lib/puppet/network/handler/runner.rb +9 -42
data/lib/puppet/network/http.rb +4 -4
data/lib/puppet/network/http/api.rb +4 -0
data/lib/puppet/network/http/api/v1.rb +65 -0
data/lib/puppet/network/http/handler.rb +163 -56
data/lib/puppet/network/http/mongrel.rb +19 -15
data/lib/puppet/network/http/mongrel/rest.rb +35 -17
data/lib/puppet/network/http/rack.rb +62 -0
data/lib/puppet/network/http/rack/httphandler.rb +34 -0
data/lib/puppet/network/http/rack/rest.rb +79 -0
data/lib/puppet/network/http/rack/xmlrpc.rb +65 -0
data/lib/puppet/network/http/webrick.rb +89 -16
data/lib/puppet/network/http/webrick/rest.rb +24 -11
data/lib/puppet/network/http_pool.rb +28 -29
data/lib/puppet/network/http_server/mongrel.rb +8 -10
data/lib/puppet/network/http_server/webrick.rb +1 -3
data/lib/puppet/network/rest_authconfig.rb +89 -0
data/lib/puppet/network/rest_authorization.rb +25 -0
data/lib/puppet/network/rights.rb +230 -27
data/lib/puppet/network/server.rb +133 -31
data/lib/puppet/network/xmlrpc/client.rb +5 -5
data/lib/puppet/network/xmlrpc/webrick_servlet.rb +6 -6
data/lib/puppet/node.rb +28 -21
data/lib/puppet/node/environment.rb +48 -0
data/lib/puppet/node/facts.rb +21 -0
data/lib/puppet/parameter.rb +291 -219
data/lib/puppet/parser/ast.rb +1 -0
data/lib/puppet/parser/ast/astarray.rb +5 -1
data/lib/puppet/parser/ast/boolean_operator.rb +3 -3
data/lib/puppet/parser/ast/caseopt.rb +10 -0
data/lib/puppet/parser/ast/casestatement.rb +12 -27
data/lib/puppet/parser/ast/collection.rb +31 -0
data/lib/puppet/parser/ast/collexpr.rb +18 -11
data/lib/puppet/parser/ast/comparison_operator.rb +1 -1
data/lib/puppet/parser/ast/definition.rb +6 -2
data/lib/puppet/parser/ast/function.rb +7 -2
data/lib/puppet/parser/ast/ifstatement.rb +11 -6
data/lib/puppet/parser/ast/leaf.rb +106 -3
data/lib/puppet/parser/ast/match_operator.rb +31 -0
data/lib/puppet/parser/ast/node.rb +10 -6
data/lib/puppet/parser/ast/resource_defaults.rb +2 -2
data/lib/puppet/parser/ast/resource_override.rb +1 -1
data/lib/puppet/parser/ast/resource_reference.rb +11 -3
data/lib/puppet/parser/ast/selector.rb +14 -32
data/lib/puppet/parser/ast/vardef.rb +1 -1
data/lib/puppet/parser/collector.rb +67 -15
data/lib/puppet/parser/compiler.rb +21 -53
data/lib/puppet/parser/files.rb +92 -0
data/lib/puppet/parser/functions.rb +3 -3
data/lib/puppet/parser/functions/defined.rb +3 -3
data/lib/puppet/parser/functions/fqdn_rand.rb +3 -3
data/lib/puppet/parser/functions/inline_template.rb +4 -4
data/lib/puppet/parser/functions/regsubst.rb +37 -35
data/lib/puppet/parser/functions/require.rb +34 -0
data/lib/puppet/parser/functions/shellquote.rb +41 -0
data/lib/puppet/parser/functions/split.rb +29 -0
data/lib/puppet/parser/functions/sprintf.rb +6 -6
data/lib/puppet/parser/functions/template.rb +4 -4
data/lib/puppet/parser/functions/versioncmp.rb +22 -1
data/lib/puppet/parser/grammar.ra +812 -0
data/lib/puppet/parser/interpreter.rb +4 -4
data/lib/puppet/parser/lexer.rb +44 -15
data/lib/puppet/parser/loaded_code.rb +115 -0
data/lib/puppet/parser/makefile +8 -0
data/lib/puppet/parser/parser.rb +1080 -928
data/lib/puppet/parser/parser_support.rb +118 -96
data/lib/puppet/parser/resource.rb +56 -126
data/lib/puppet/parser/resource/param.rb +2 -76
data/lib/puppet/parser/resource/reference.rb +15 -8
data/lib/puppet/parser/scope.rb +68 -35
data/lib/puppet/parser/templatewrapper.rb +8 -8
data/lib/puppet/parser/yaml_trimmer.rb +11 -0
data/lib/puppet/property.rb +69 -124
data/lib/puppet/property/list.rb +3 -3
data/lib/puppet/provider.rb +5 -5
data/lib/puppet/provider/augeas/augeas.rb +119 -118
data/lib/puppet/provider/computer/computer.rb +3 -3
data/lib/puppet/provider/confine/variable.rb +1 -1
data/lib/puppet/provider/cron/crontab.rb +8 -7
data/lib/puppet/provider/group/directoryservice.rb +2 -2
data/lib/puppet/provider/group/groupadd.rb +1 -1
data/lib/puppet/provider/group/ldap.rb +3 -3
data/lib/puppet/provider/group/pw.rb +1 -1
data/lib/puppet/provider/host/parsed.rb +3 -3
data/lib/puppet/provider/ldap.rb +1 -3
data/lib/puppet/provider/macauthorization/macauthorization.rb +62 -55
data/lib/puppet/provider/mailalias/aliases.rb +9 -1
data/lib/puppet/provider/maillist/mailman.rb +8 -4
data/lib/puppet/provider/mcx/mcxcontent.rb +11 -11
data/lib/puppet/provider/mount/parsed.rb +2 -2
data/lib/puppet/provider/nameservice.rb +6 -6
data/lib/puppet/provider/nameservice/directoryservice.rb +83 -87
data/lib/puppet/provider/package/appdmg.rb +10 -9
data/lib/puppet/provider/package/apple.rb +1 -3
data/lib/puppet/provider/package/apt.rb +5 -5
data/lib/puppet/provider/package/aptitude.rb +1 -1
data/lib/puppet/provider/package/aptrpm.rb +1 -1
data/lib/puppet/provider/package/darwinport.rb +1 -1
data/lib/puppet/provider/package/dpkg.rb +2 -2
data/lib/puppet/provider/package/fink.rb +6 -6
data/lib/puppet/provider/package/freebsd.rb +1 -1
data/lib/puppet/provider/package/gem.rb +2 -2
data/lib/puppet/provider/package/hpux.rb +5 -5
data/lib/puppet/provider/package/pkgdmg.rb +30 -22
data/lib/puppet/provider/package/portage.rb +1 -1
data/lib/puppet/provider/package/ports.rb +1 -1
data/lib/puppet/provider/package/rpm.rb +5 -5
data/lib/puppet/provider/package/rug.rb +1 -1
data/lib/puppet/provider/package/sun.rb +7 -7
data/lib/puppet/provider/package/up2date.rb +1 -1
data/lib/puppet/provider/package/yum.rb +2 -2
data/lib/puppet/provider/package/yumhelper.py +2 -2
data/lib/puppet/provider/port/parsed.rb +1 -1
data/lib/puppet/provider/selmodule/semodule.rb +3 -3
data/lib/puppet/provider/service/base.rb +21 -12
data/lib/puppet/provider/service/daemontools.rb +86 -49
data/lib/puppet/provider/service/debian.rb +20 -12
data/lib/puppet/provider/service/freebsd.rb +5 -5
data/lib/puppet/provider/service/gentoo.rb +2 -2
data/lib/puppet/provider/service/init.rb +21 -33
data/lib/puppet/provider/service/launchd.rb +120 -48
data/lib/puppet/provider/service/redhat.rb +12 -21
data/lib/puppet/provider/service/runit.rb +19 -9
data/lib/puppet/provider/service/smf.rb +49 -34
data/lib/puppet/provider/ssh_authorized_key/parsed.rb +34 -0
data/lib/puppet/provider/sshkey/parsed.rb +2 -2
data/lib/puppet/provider/user/directoryservice.rb +12 -29
data/lib/puppet/provider/user/hpux.rb +3 -3
data/lib/puppet/provider/user/ldap.rb +2 -2
data/lib/puppet/provider/zfs/solaris.rb +1 -1
data/lib/puppet/provider/zone/solaris.rb +4 -4
data/lib/puppet/provider/zpool/solaris.rb +3 -3
data/lib/puppet/rails.rb +9 -9
data/lib/puppet/rails/benchmark.rb +69 -0
data/lib/puppet/rails/database/001_add_created_at_to_all_tables.rb +5 -5
data/lib/puppet/rails/database/002_remove_duplicated_index_on_all_tables.rb +2 -2
data/lib/puppet/rails/database/003_add_environment_to_host.rb +1 -1
data/lib/puppet/rails/database/schema.rb +8 -8
data/lib/puppet/rails/fact_value.rb +1 -1
data/lib/puppet/rails/host.rb +211 -93
data/lib/puppet/rails/param_name.rb +5 -1
data/lib/puppet/rails/param_value.rb +29 -2
data/lib/puppet/rails/puppet_tag.rb +5 -0
data/lib/puppet/rails/resource.rb +120 -20
data/lib/puppet/rails/resource_tag.rb +1 -1
data/lib/puppet/rails/source_file.rb +1 -1
data/lib/puppet/reference/configuration.rb +14 -14
data/lib/puppet/reference/function.rb +1 -1
data/lib/puppet/reference/metaparameter.rb +48 -0
data/lib/puppet/reference/providers.rb +6 -6
data/lib/puppet/reference/type.rb +1 -37
data/lib/puppet/relationship.rb +57 -30
data/lib/puppet/reports/rrdgraph.rb +4 -4
data/lib/puppet/reports/store.rb +3 -3
data/lib/puppet/reports/tagmail.rb +15 -15
data/lib/puppet/resource.rb +265 -0
data/lib/puppet/{node → resource}/catalog.rb +188 -112
data/lib/puppet/{resource_reference.rb → resource/reference.rb} +46 -24
data/lib/puppet/simple_graph.rb +165 -27
data/lib/puppet/ssl.rb +7 -0
data/lib/puppet/ssl/base.rb +62 -0
data/lib/puppet/ssl/certificate.rb +34 -0
data/lib/puppet/ssl/certificate_authority.rb +298 -0
data/lib/puppet/ssl/certificate_authority/interface.rb +118 -0
data/lib/puppet/ssl/certificate_factory.rb +145 -0
data/lib/puppet/ssl/certificate_request.rb +51 -0
data/lib/puppet/ssl/certificate_revocation_list.rb +86 -0
data/lib/puppet/ssl/host.rb +271 -0
data/lib/puppet/ssl/inventory.rb +52 -0
data/lib/puppet/ssl/key.rb +56 -0
data/lib/puppet/sslcertificates.rb +6 -6
data/lib/puppet/sslcertificates/ca.rb +15 -15
data/lib/puppet/sslcertificates/certificate.rb +4 -4
data/lib/puppet/sslcertificates/inventory.rb +3 -3
data/lib/puppet/transaction.rb +113 -139
data/lib/puppet/transaction/change.rb +6 -6
data/lib/puppet/transaction/event.rb +1 -1
data/lib/puppet/transaction/report.rb +7 -1
data/lib/puppet/transportable.rb +28 -28
data/lib/puppet/type.rb +263 -688
data/lib/puppet/type/augeas.rb +3 -2
data/lib/puppet/type/component.rb +28 -95
data/lib/puppet/type/computer.rb +10 -10
data/lib/puppet/type/cron.rb +19 -14
data/lib/puppet/type/exec.rb +21 -20
data/lib/puppet/type/file.rb +306 -633
data/lib/puppet/type/file/checksum.rb +10 -11
data/lib/puppet/type/file/content.rb +83 -22
data/lib/puppet/type/file/ensure.rb +15 -9
data/lib/puppet/type/file/group.rb +7 -1
data/lib/puppet/type/file/mode.rb +1 -1
data/lib/puppet/type/file/owner.rb +9 -3
data/lib/puppet/type/file/selcontext.rb +4 -4
data/lib/puppet/type/file/source.rb +78 -179
data/lib/puppet/type/file/target.rb +3 -3
data/lib/puppet/type/file/type.rb +2 -2
data/lib/puppet/type/filebucket.rb +33 -54
data/lib/puppet/type/group.rb +8 -8
data/lib/puppet/type/host.rb +7 -7
data/lib/puppet/type/k5login.rb +2 -2
data/lib/puppet/type/macauthorization.rb +77 -52
data/lib/puppet/type/mailalias.rb +2 -2
data/lib/puppet/type/maillist.rb +2 -2
data/lib/puppet/type/mcx.rb +3 -3
data/lib/puppet/type/mount.rb +16 -11
data/lib/puppet/type/notify.rb +4 -4
data/lib/puppet/type/package.rb +6 -28
data/lib/puppet/type/port.rb +1 -1
data/lib/puppet/type/resources.rb +19 -19
data/lib/puppet/type/schedule.rb +18 -20
data/lib/puppet/type/selmodule.rb +1 -1
data/lib/puppet/type/service.rb +11 -7
data/lib/puppet/type/ssh_authorized_key.rb +26 -9
data/lib/puppet/type/sshkey.rb +2 -2
data/lib/puppet/type/tidy.rb +285 -289
data/lib/puppet/type/user.rb +9 -7
data/lib/puppet/type/yumrepo.rb +17 -16
data/lib/puppet/type/zone.rb +8 -7
data/lib/puppet/util.rb +11 -36
data/lib/puppet/util/autoload.rb +31 -19
data/lib/puppet/util/autoload/file_cache.rb +115 -0
data/lib/puppet/util/backups.rb +86 -0
data/lib/puppet/util/cacher.rb +135 -0
data/lib/puppet/util/checksums.rb +11 -1
data/lib/puppet/util/classgen.rb +1 -1
data/lib/puppet/util/config_store.rb +2 -2
data/lib/puppet/util/constant_inflector.rb +1 -1
data/lib/puppet/util/diff.rb +2 -2
data/lib/puppet/util/docs.rb +9 -3
data/lib/puppet/util/execution.rb +1 -1
data/lib/puppet/util/feature.rb +27 -20
data/lib/puppet/util/fileparsing.rb +3 -3
data/lib/puppet/util/filetype.rb +8 -6
data/lib/puppet/util/graph.rb +5 -5
data/lib/puppet/util/inifile.rb +5 -5
data/lib/puppet/util/json.rb +13 -0
data/lib/puppet/util/ldap/connection.rb +2 -2
data/lib/puppet/util/log.rb +48 -31
data/lib/puppet/util/metric.rb +4 -4
data/lib/puppet/util/monkey_patches.rb +43 -0
data/lib/puppet/util/nagios_maker.rb +1 -1
data/lib/puppet/util/package.rb +4 -4
data/lib/puppet/util/pidlock.rb +59 -59
data/lib/puppet/util/posix.rb +13 -52
data/lib/puppet/util/provider_features.rb +3 -3
data/lib/puppet/util/queue.rb +96 -0
data/lib/puppet/util/queue/stomp.rb +47 -0
data/lib/puppet/util/rails/cache_accumulator.rb +65 -0
data/lib/puppet/util/rails/collection_merger.rb +0 -39
data/lib/puppet/util/rails/reference_serializer.rb +17 -3
data/lib/puppet/util/rdoc.rb +1 -0
data/lib/puppet/util/rdoc/code_objects.rb +5 -1
data/lib/puppet/util/rdoc/generators/puppet_generator.rb +5 -5
data/lib/puppet/util/rdoc/generators/template/puppet/puppet.rb +13 -13
data/lib/puppet/util/rdoc/parser.rb +28 -32
data/lib/puppet/util/reference.rb +29 -8
data/lib/puppet/util/resource_template.rb +1 -1
data/lib/puppet/util/selinux.rb +12 -6
data/lib/puppet/util/settings.rb +203 -578
data/lib/puppet/util/settings/boolean_setting.rb +33 -0
data/lib/puppet/util/settings/file_setting.rb +119 -0
data/lib/puppet/util/settings/setting.rb +110 -0
data/lib/puppet/util/subclass_loader.rb +1 -1
data/lib/puppet/util/suidmanager.rb +2 -2
data/lib/puppet/util/tagging.rb +1 -1
data/lib/puppet/util/warnings.rb +17 -9
data/man/man8/filebucket.8 +2 -2
data/man/man8/pi.8 +2 -2
data/man/man8/puppet.8 +3 -4
data/man/man8/puppet.conf.8 +63 -63
data/man/man8/puppetca.8 +2 -2
data/man/man8/puppetd.8 +2 -2
data/man/man8/puppetdoc.8 +2 -2
data/man/man8/puppetmasterd.8 +2 -2
data/man/man8/puppetrun.8 +2 -2
data/man/man8/ralsh.8 +3 -3
data/sbin/puppetca +102 -0
data/sbin/puppetd +159 -0
data/sbin/puppetmasterd +66 -0
data/sbin/puppetqd +53 -0
data/sbin/puppetrun +130 -0
data/spec/Rakefile +2 -2
data/spec/integration/application/puppet.rb +33 -0
data/spec/integration/bin/puppetmasterd.rb +110 -0
data/spec/integration/configurer.rb +18 -0
data/spec/integration/defaults.rb +158 -7
data/spec/integration/file_serving/content.rb +2 -0
data/spec/integration/file_serving/fileset.rb +14 -0
data/spec/integration/file_serving/metadata.rb +2 -0
data/spec/integration/file_serving/terminus_helper.rb +22 -0
data/spec/integration/indirector/catalog/compiler.rb +67 -0
data/spec/integration/indirector/catalog/queue.rb +61 -0
data/spec/integration/indirector/certificate/rest.rb +69 -0
data/spec/integration/indirector/certificate_request/rest.rb +89 -0
data/spec/integration/indirector/certificate_revocation_list/rest.rb +77 -0
data/spec/integration/indirector/direct_file_server.rb +16 -23
data/spec/integration/indirector/file_content/file_server.rb +75 -0
data/spec/integration/indirector/report/rest.rb +95 -0
data/spec/integration/indirector/rest.rb +207 -147
data/spec/integration/network/client.rb +19 -0
data/spec/integration/network/formats.rb +110 -0
data/spec/integration/network/handler.rb +25 -0
data/spec/integration/network/server/mongrel.rb +26 -8
data/spec/integration/network/server/webrick.rb +49 -11
data/spec/integration/node/environment.rb +58 -0
data/spec/integration/node/facts.rb +4 -2
data/spec/integration/parser/compiler.rb +29 -0
data/spec/integration/parser/functions/require.rb +67 -0
data/spec/integration/provider/mailalias/aliases.rb +25 -0
data/spec/integration/{node → resource}/catalog.rb +17 -10
data/spec/integration/ssl/certificate_authority.rb +135 -0
data/spec/integration/ssl/certificate_request.rb +59 -0
data/spec/integration/ssl/certificate_revocation_list.rb +42 -0
data/spec/integration/ssl/host.rb +90 -0
data/spec/integration/transaction.rb +66 -0
data/spec/integration/transaction/report.rb +2 -5
data/spec/integration/type.rb +22 -0
data/spec/integration/type/file.rb +458 -0
data/spec/integration/type/package.rb +1 -1
data/spec/integration/type/tidy.rb +27 -0
data/spec/integration/util/autoload.rb +114 -0
data/spec/integration/util/feature.rb +54 -0
data/spec/integration/util/file_locking.rb +2 -1
data/spec/integration/util/settings.rb +27 -0
data/spec/lib/puppet_spec/files.rb +9 -0
data/spec/monkey_patches/add_confine_and_runnable_to_rspec_dsl.rb +1 -0
data/spec/monkey_patches/alias_should_to_must.rb +1 -0
data/spec/shared_behaviours/file_server_terminus.rb +14 -11
data/spec/shared_behaviours/file_serving.rb +13 -17
data/spec/spec_helper.rb +22 -5
data/spec/unit/agent.rb +259 -0
data/spec/unit/agent/locker.rb +100 -0
data/spec/unit/agent/runner.rb +118 -0
data/spec/unit/application.rb +420 -0
data/spec/unit/application/filebucket.rb +220 -0
data/spec/unit/application/pi.rb +84 -0
data/spec/unit/application/puppet.rb +404 -0
data/spec/unit/application/puppetca.rb +142 -0
data/spec/unit/application/puppetd.rb +502 -0
data/spec/unit/application/puppetdoc.rb +345 -0
data/spec/unit/application/puppetmasterd.rb +456 -0
data/spec/unit/application/puppetqd.rb +186 -0
data/spec/unit/application/puppetrun.rb +279 -0
data/spec/unit/application/ralsh.rb +237 -0
data/spec/unit/configurer.rb +232 -0
data/spec/unit/configurer/downloader.rb +188 -0
data/spec/unit/configurer/fact_handler.rb +150 -0
data/spec/unit/configurer/plugin_handler.rb +112 -0
data/spec/unit/daemon.rb +287 -0
data/spec/unit/file_serving/{file_base.rb → base.rb} +39 -31
data/spec/unit/file_serving/configuration.rb +104 -93
data/spec/unit/file_serving/configuration/parser.rb +64 -18
data/spec/unit/file_serving/content.rb +65 -26
data/spec/unit/file_serving/fileset.rb +116 -14
data/spec/unit/file_serving/indirection_hooks.rb +34 -95
data/spec/unit/file_serving/metadata.rb +27 -40
data/spec/unit/file_serving/mount.rb +7 -118
data/spec/unit/file_serving/mount/file.rb +188 -0
data/spec/unit/file_serving/mount/modules.rb +63 -0
data/spec/unit/file_serving/mount/plugins.rb +61 -0
data/spec/unit/file_serving/terminus_helper.rb +39 -27
data/spec/unit/indirector.rb +6 -1
data/spec/unit/indirector/active_record.rb +76 -0
data/spec/unit/indirector/catalog/active_record.rb +122 -0
data/spec/unit/indirector/catalog/compiler.rb +222 -118
data/spec/unit/indirector/catalog/queue.rb +20 -0
data/spec/unit/indirector/catalog/rest.rb +11 -0
data/spec/unit/indirector/catalog/yaml.rb +6 -6
data/spec/unit/indirector/certificate/ca.rb +28 -0
data/spec/unit/indirector/certificate/file.rb +28 -0
data/spec/unit/indirector/certificate/rest.rb +23 -0
data/spec/unit/indirector/certificate_request/ca.rb +19 -0
data/spec/unit/indirector/certificate_request/file.rb +19 -0
data/spec/unit/indirector/certificate_request/rest.rb +23 -0
data/spec/unit/indirector/certificate_revocation_list/ca.rb +21 -0
data/spec/unit/indirector/certificate_revocation_list/file.rb +20 -0
data/spec/unit/indirector/certificate_revocation_list/rest.rb +23 -0
data/spec/unit/indirector/direct_file_server.rb +3 -8
data/spec/unit/indirector/exec.rb +6 -1
data/spec/unit/indirector/facts/active_record.rb +104 -0
data/spec/unit/indirector/facts/facter.rb +53 -12
data/spec/unit/indirector/facts/rest.rb +11 -0
data/spec/unit/indirector/file.rb +8 -1
data/spec/unit/indirector/file_metadata/file.rb +5 -5
data/spec/unit/indirector/file_server.rb +181 -98
data/spec/unit/indirector/indirection.rb +102 -38
data/spec/unit/indirector/key/ca.rb +28 -0
data/spec/unit/indirector/key/file.rb +104 -0
data/spec/unit/indirector/node/active_record.rb +34 -0
data/spec/unit/indirector/node/ldap.rb +1 -1
data/spec/unit/indirector/node/rest.rb +2 -2
data/spec/unit/indirector/queue.rb +123 -0
data/spec/unit/indirector/report/rest.rb +28 -0
data/spec/unit/indirector/request.rb +221 -0
data/spec/unit/indirector/rest.rb +343 -334
data/spec/unit/indirector/runner/rest.rb +11 -0
data/spec/unit/indirector/ssl_file.rb +280 -0
data/spec/unit/module.rb +180 -180
data/spec/unit/network/authconfig.rb +292 -0
data/spec/unit/network/authstore.rb +94 -0
data/spec/unit/network/client.rb +2 -2
data/spec/unit/network/client/dipper.rb +16 -0
data/spec/unit/network/format.rb +191 -0
data/spec/unit/network/format_handler.rb +306 -0
data/spec/unit/network/formats.rb +249 -0
data/spec/unit/network/handler/fileserver.rb +2 -5
data/spec/unit/network/http.rb +3 -3
data/spec/unit/network/http/api/v1.rb +122 -0
data/spec/unit/network/http/handler.rb +448 -0
data/spec/unit/network/http/mongrel.rb +46 -32
data/spec/unit/network/http/mongrel/rest.rb +174 -319
data/spec/unit/network/http/rack.rb +102 -0
data/spec/unit/network/http/rack/rest.rb +199 -0
data/spec/unit/network/http/rack/xmlrpc.rb +157 -0
data/spec/unit/network/http/webrick.rb +249 -37
data/spec/unit/network/http/webrick/rest.rb +113 -279
data/spec/unit/network/http_pool.rb +86 -110
data/spec/unit/network/rest_authconfig.rb +146 -0
data/spec/unit/network/rest_authorization.rb +43 -0
data/spec/unit/network/rights.rb +519 -0
data/spec/unit/network/server.rb +475 -257
data/spec/unit/node.rb +43 -10
data/spec/unit/node/environment.rb +143 -9
data/spec/unit/node/facts.rb +77 -24
data/spec/unit/other/selinux.rb +85 -0
data/spec/unit/other/transbucket.rb +29 -13
data/spec/unit/other/transobject.rb +35 -15
data/spec/unit/parameter.rb +378 -5
data/spec/unit/parser/ast.rb +1 -1
data/spec/unit/parser/ast/arithmetic_operator.rb +17 -17
data/spec/unit/parser/ast/astarray.rb +16 -10
data/spec/unit/parser/ast/boolean_operator.rb +2 -2
data/spec/unit/parser/ast/casestatement.rb +143 -0
data/spec/unit/parser/ast/collection.rb +63 -0
data/spec/unit/parser/ast/collexpr.rb +31 -8
data/spec/unit/parser/ast/comparison_operator.rb +9 -9
data/spec/unit/parser/ast/definition.rb +18 -0
data/spec/unit/parser/ast/function.rb +6 -0
data/spec/unit/parser/ast/ifstatement.rb +75 -0
data/spec/unit/parser/ast/leaf.rb +261 -0
data/spec/unit/parser/ast/match_operator.rb +50 -0
data/spec/unit/parser/ast/minus.rb +1 -1
data/spec/unit/parser/ast/node.rb +20 -0
data/spec/unit/parser/ast/not.rb +1 -1
data/spec/unit/parser/ast/resource_override.rb +5 -5
data/spec/unit/parser/ast/resource_reference.rb +11 -5
data/spec/unit/parser/ast/selector.rb +156 -0
data/spec/unit/parser/ast/vardef.rb +11 -11
data/spec/unit/parser/collector.rb +167 -48
data/spec/unit/parser/compiler.rb +128 -104
data/spec/unit/parser/files.rb +190 -0
data/spec/unit/parser/functions/inline_template.rb +0 -0
data/spec/unit/parser/functions/regsubst.rb +42 -42
data/spec/unit/parser/functions/require.rb +36 -0
data/spec/unit/parser/functions/shellquote.rb +92 -0
data/spec/unit/parser/functions/split.rb +51 -0
data/spec/unit/parser/functions/sprintf.rb +11 -11
data/spec/unit/parser/functions/template.rb +0 -0
data/spec/unit/parser/functions/versioncmp.rb +2 -2
data/spec/unit/parser/interpreter.rb +16 -7
data/spec/unit/parser/lexer.rb +72 -12
data/spec/unit/parser/loaded_code.rb +198 -0
data/spec/unit/parser/parser.rb +215 -28
data/spec/unit/parser/resource.rb +131 -22
data/spec/unit/parser/scope.rb +207 -12
data/spec/unit/parser/templatewrapper.rb +8 -3
data/spec/unit/property.rb +270 -16
data/spec/unit/property/list.rb +12 -6
data/spec/unit/provider.rb +31 -0
data/spec/unit/provider/augeas/augeas.rb +61 -33
data/spec/unit/provider/macauthorization.rb +29 -29
data/spec/unit/provider/mcx/mcxcontent.rb +4 -4
data/spec/unit/provider/mount/parsed.rb +5 -8
data/spec/unit/provider/naginator.rb +0 -0
data/spec/unit/provider/package/apt.rb +6 -6
data/spec/unit/provider/package/pkgdmg.rb +73 -0
data/spec/unit/provider/selboolean.rb +1 -1
data/spec/unit/provider/selmodule.rb +2 -2
data/spec/unit/provider/service/daemontools.rb +40 -15
data/spec/unit/provider/service/debian.rb +89 -0
data/spec/unit/provider/service/init.rb +106 -0
data/spec/unit/provider/service/launchd.rb +71 -13
data/spec/unit/provider/service/redhat.rb +94 -0
data/spec/unit/provider/service/runit.rb +14 -2
data/spec/unit/provider/ssh_authorized_key/parsed.rb +66 -2
data/spec/unit/provider/user/ldap.rb +1 -1
data/spec/unit/provider/user/user_role_add.rb +1 -1
data/spec/unit/provider/zfs/solaris.rb +18 -6
data/spec/unit/provider/zone/solaris.rb +1 -1
data/spec/unit/rails.rb +16 -22
data/spec/unit/rails/host.rb +163 -0
data/spec/unit/rails/param_value.rb +49 -0
data/spec/unit/rails/resource.rb +87 -0
data/spec/unit/relationship.rb +141 -29
data/spec/unit/resource.rb +504 -0
data/spec/unit/resource/catalog.rb +1061 -0
data/spec/unit/resource/reference.rb +111 -0
data/spec/unit/simple_graph.rb +448 -191
data/spec/unit/ssl/certificate.rb +124 -0
data/spec/unit/ssl/certificate_authority.rb +741 -0
data/spec/unit/ssl/certificate_authority/interface.rb +269 -0
data/spec/unit/ssl/certificate_factory.rb +107 -0
data/spec/unit/ssl/certificate_request.rb +193 -0
data/spec/unit/ssl/certificate_revocation_list.rb +180 -0
data/spec/unit/ssl/host.rb +704 -0
data/spec/unit/ssl/inventory.rb +180 -0
data/spec/unit/ssl/key.rb +198 -0
data/spec/unit/transaction.rb +65 -2
data/spec/unit/transaction/change.rb +1 -1
data/spec/unit/transaction/report.rb +1 -1
data/spec/unit/type.rb +361 -8
data/spec/unit/type/augeas.rb +30 -37
data/spec/unit/type/component.rb +63 -0
data/spec/unit/type/computer.rb +17 -21
data/spec/unit/type/exec.rb +27 -2
data/spec/unit/type/file.rb +704 -83
data/spec/unit/type/file/content.rb +253 -15
data/spec/unit/type/file/ensure.rb +65 -2
data/spec/unit/type/file/group.rb +5 -0
data/spec/unit/type/file/owner.rb +5 -0
data/spec/unit/type/file/selinux.rb +12 -16
data/spec/unit/type/file/source.rb +264 -0
data/spec/unit/type/filebucket.rb +74 -0
data/spec/unit/type/group.rb +1 -5
data/spec/unit/type/macauthorization.rb +59 -26
data/spec/unit/type/mcx.rb +8 -16
data/spec/unit/type/mount.rb +8 -16
data/spec/unit/type/noop_metaparam.rb +0 -2
data/spec/unit/type/package.rb +13 -23
data/spec/unit/type/resources.rb +4 -7
data/spec/unit/type/schedule.rb +1 -7
data/spec/unit/type/selboolean.rb +4 -6
data/spec/unit/type/service.rb +23 -33
data/spec/unit/type/ssh_authorized_key.rb +25 -14
data/spec/unit/type/tidy.rb +329 -21
data/spec/unit/type/user.rb +18 -10
data/spec/unit/type/zfs.rb +6 -6
data/spec/unit/util/autoload.rb +94 -3
data/spec/unit/util/autoload/file_cache.rb +183 -0
data/spec/unit/util/backups.rb +159 -0
data/spec/unit/util/cache_accumulator.rb +69 -0
data/spec/unit/util/cacher.rb +185 -0
data/spec/unit/util/checksums.rb +9 -1
data/spec/unit/util/feature.rb +72 -0
data/spec/unit/util/filetype.rb +1 -11
data/spec/unit/util/json.rb +21 -0
data/spec/unit/util/log.rb +45 -0
data/spec/unit/util/package.rb +2 -2
data/spec/unit/util/queue.rb +88 -0
data/spec/unit/util/queue/stomp.rb +140 -0
data/spec/unit/util/reference_serializer.rb +52 -0
data/spec/unit/util/selinux.rb +5 -3
data/spec/unit/util/settings.rb +413 -264
data/spec/unit/util/settings/file_setting.rb +223 -0
data/spec/unit/util/storage.rb +11 -11
data/spec/unit/util/warnings.rb +21 -17
data/test/Rakefile +6 -5
data/test/certmgr/ca.rb +5 -5
data/test/certmgr/certmgr.rb +4 -4
data/test/data/providers/cron/crontab.allthree +2 -2
data/test/data/providers/cron/crontab.envNcomment +1 -1
data/test/data/providers/cron/crontab.envNname +1 -1
data/test/data/providers/cron/crontab.multirecords +1 -1
data/test/data/providers/cron/crontab_collections.yaml +14 -14
data/test/data/providers/cron/crontab_multiple_with_env.yaml +6 -6
data/test/data/providers/cron/crontab_sample_records.yaml +102 -102
data/test/data/providers/mailalias/aliases/test1 +28 -0
data/test/data/providers/package/testpackages.yaml +6 -6
data/test/data/reports/1.yaml +17 -17
data/test/data/reports/tagmail_passers.conf +2 -2
data/test/data/snippets/append.pp +5 -5
data/test/data/snippets/casestatement.pp +9 -2
data/test/data/snippets/classincludes.pp +1 -1
data/test/data/snippets/collection_override.pp +8 -0
data/test/data/snippets/fqparents.pp +2 -2
data/test/data/snippets/ifexpression.pp +12 -0
data/test/data/snippets/multilinecomments.pp +5 -1
data/test/data/snippets/selectorvalues.pp +7 -0
data/test/data/types/hosts/1 +1 -1
data/test/data/types/hosts/2 +3 -3
data/test/data/types/hosts/solaris +2 -2
data/test/data/types/mount/freebsd.fstab +7 -7
data/test/data/types/mount/solaris.fstab +10 -10
data/test/data/types/port/1 +472 -472
data/test/data/types/port/darwin +4347 -4347
data/test/language/ast.rb +3 -2
data/test/language/ast/casestatement.rb +12 -12
data/test/language/ast/resource.rb +4 -4
data/test/language/ast/resource_reference.rb +5 -5
data/test/language/ast/selector.rb +11 -11
data/test/language/ast/variable.rb +4 -4
data/test/language/functions.rb +16 -16
data/test/language/parser.rb +89 -111
data/test/language/resource.rb +3 -88
data/test/language/scope.rb +14 -55
data/test/language/snippets.rb +31 -31
data/test/lib/puppettest.rb +12 -12
data/test/lib/puppettest/certificates.rb +2 -2
data/test/lib/puppettest/exetest.rb +0 -1
data/test/lib/puppettest/fakes.rb +1 -1
data/test/lib/puppettest/parsertesting.rb +9 -4
data/test/lib/puppettest/railstesting.rb +3 -3
data/test/lib/puppettest/servertest.rb +1 -1
data/test/lib/puppettest/support/assertions.rb +2 -2
data/test/lib/puppettest/support/collection.rb +1 -1
data/test/lib/puppettest/support/resources.rb +7 -7
data/test/lib/puppettest/support/utils.rb +10 -16
data/test/lib/puppettest/testcase.rb +2 -1
data/test/network/authconfig.rb +1 -1
data/test/network/authorization.rb +1 -1
data/test/network/authstore.rb +57 -14
data/test/network/client/ca.rb +1 -0
data/test/network/client/resource.rb +12 -50
data/test/network/client_request.rb +1 -1
data/test/network/handler/bucket.rb +2 -2
data/test/network/handler/fileserver.rb +17 -21
data/test/network/handler/master.rb +5 -5
data/test/network/handler/report.rb +3 -3
data/test/network/handler/resource.rb +29 -75
data/test/network/handler/runner.rb +8 -58
data/test/network/rights.rb +1 -1
data/test/network/server/mongrel_test.rb +15 -1
data/test/network/server/webrick.rb +0 -36
data/test/network/xmlrpc/webrick_servlet.rb +5 -5
data/test/other/dsl.rb +3 -3
data/test/other/events.rb +15 -15
data/test/other/puppet.rb +2 -32
data/test/other/relationships.rb +21 -148
data/test/other/report.rb +20 -23
data/test/other/transactions.rb +110 -298
data/test/puppet/defaults.rb +1 -1
data/test/puppet/tc_suidmanager.rb +1 -1
data/test/rails/railsparameter.rb +4 -4
data/test/ral/manager/attributes.rb +12 -68
data/test/ral/manager/instances.rb +3 -19
data/test/ral/manager/manager.rb +7 -7
data/test/ral/manager/provider.rb +7 -7
data/test/ral/manager/type.rb +54 -349
data/test/ral/providers/cron/crontab.rb +14 -14
data/test/ral/providers/group.rb +5 -6
data/test/ral/providers/host/parsed.rb +3 -3
data/test/ral/providers/mailalias/aliases.rb +4 -4
data/test/ral/providers/package.rb +3 -3
data/test/ral/providers/package/aptitude.rb +55 -55
data/test/ral/providers/package/aptrpm.rb +7 -7
data/test/ral/providers/parsedfile.rb +10 -14
data/test/ral/providers/port/parsed.rb +6 -6
data/test/ral/providers/provider.rb +10 -10
data/test/ral/providers/service/base.rb +32 -32
data/test/ral/providers/sshkey/parsed.rb +14 -14
data/test/ral/providers/user.rb +16 -17
data/test/ral/providers/user/useradd.rb +19 -22
data/test/ral/type/cron.rb +21 -28
data/test/ral/type/exec.rb +57 -60
data/test/ral/type/file.rb +88 -862
data/test/ral/type/file/target.rb +21 -70
data/test/ral/type/fileignoresource.rb +37 -44
data/test/ral/type/filesources.rb +43 -473
data/test/ral/type/group.rb +6 -7
data/test/ral/type/host.rb +14 -30
data/test/ral/type/mailalias.rb +3 -3
data/test/ral/type/port.rb +5 -5
data/test/ral/type/resources.rb +37 -37
data/test/ral/type/service.rb +3 -3
data/test/ral/type/sshkey.rb +34 -39
data/test/ral/type/user.rb +15 -14
data/test/ral/type/yumrepo.rb +18 -17
data/test/ral/type/zone.rb +4 -6
data/test/test +9 -9
data/test/util/fileparsing.rb +10 -10
data/test/util/inifile.rb +6 -6
data/test/util/instance_loader.rb +1 -1
data/test/util/log.rb +2 -2
data/test/util/metrics.rb +1 -6
data/test/util/package.rb +1 -1
data/test/util/pidlock.rb +116 -116
data/test/util/settings.rb +40 -429
data/test/util/storage.rb +5 -5
data/test/util/subclass_loader.rb +0 -7
data/test/util/utiltest.rb +10 -29
metadata +1369 -941
data/bin/puppetca +0 -363
data/bin/puppetd +0 -439
data/bin/puppetmasterd +0 -289
data/bin/puppetrun +0 -369
data/conf/redhat/lsb-config.patch +0 -51
data/conf/redhat/no-chuser-0.15.1.patch +0 -38
data/conf/redhat/no-lockdir.patch +0 -13
data/examples/mac_netinfo.pp +0 -5
data/ext/passenger/README +0 -63
data/ext/passenger/apache2.conf +0 -29
data/ext/passenger/config.ru +0 -40
data/lib/puppet/config_stores/rest.rb +0 -60
data/lib/puppet/executables/client/certhandler.rb +0 -82
data/lib/puppet/indirector/file_content/modules.rb +0 -11
data/lib/puppet/indirector/file_metadata/modules.rb +0 -17
data/lib/puppet/indirector/module_files.rb +0 -82
data/lib/puppet/indirector/ssl_rsa.rb +0 -5
data/lib/puppet/indirector/ssl_rsa/file.rb +0 -33
data/lib/puppet/network/client/master.rb +0 -524
data/lib/puppet/network/http_server/rack.rb +0 -148
data/lib/puppet/pgraph.rb +0 -121
data/lib/puppet/provider/group/netinfo.rb +0 -15
data/lib/puppet/provider/host/netinfo.rb +0 -19
data/lib/puppet/provider/mount/netinfo.rb +0 -37
data/lib/puppet/provider/nameservice/netinfo.rb +0 -224
data/lib/puppet/provider/user/netinfo.rb +0 -111
data/lib/puppet/util/fact_store.rb +0 -59
data/lib/puppet/util/uri_helper.rb +0 -22
data/spec/integration/file_serving/configuration.rb +0 -43
data/spec/integration/indirector/module_files.rb +0 -57
data/spec/unit/executables/client/certhandler.rb +0 -135
data/spec/unit/indirector/file_content/modules.rb +0 -18
data/spec/unit/indirector/file_metadata/modules.rb +0 -42
data/spec/unit/indirector/module_files.rb +0 -259
data/spec/unit/indirector/ssl_rsa/file.rb +0 -121
data/spec/unit/network/client/master.rb +0 -442
data/spec/unit/node/catalog.rb +0 -865
data/spec/unit/other/pgraph.rb +0 -210
data/spec/unit/resource_reference.rb +0 -73
data/spec/unit/util/uri_helper.rb +0 -41
data/test/data/snippets/ifexpression.rb +0 -6
data/test/executables/filebucket.rb +0 -51
data/test/executables/puppetbin.rb +0 -104
data/test/executables/puppetca.rb +0 -115
data/test/executables/puppetd.rb +0 -55
data/test/executables/puppetmasterd.rb +0 -147
data/test/network/client/client.rb +0 -195
data/test/network/client/master.rb +0 -490
data/test/network/daemon.rb +0 -70
data/test/network/handler/handler.rb +0 -63
data/test/other/overrides.rb +0 -107
data/test/puppet/conffiles.rb +0 -107
data/test/rails/ast.rb +0 -73
data/test/rails/configuration.rb +0 -71
data/test/rails/host.rb +0 -154
data/test/rails/railsresource.rb +0 -251
data/test/ral/providers/host/netinfo.rb +0 -56
data/test/ral/providers/mount/netinfo.rb +0 -79
data/test/ral/type/basic.rb +0 -85
data/test/ral/type/filebucket.rb +0 -157
data/test/ral/type/parameter.rb +0 -174
data/test/ral/type/property.rb +0 -388
data/test/ral/type/tidy.rb +0 -291
data/test/util/autoload.rb +0 -145
data/test/util/features.rb +0 -95

data/lib/puppet/util/rdoc/generators/template/puppet/puppet.rb CHANGED

@@ -239,11 +239,11 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; }
 #####################################################################
-### H E A D E R   T E M P L A T E
+### H E A D E R   T E M P L A T E
 #####################################################################
 XHTML_PREAMBLE = %{<?xml version="1.0" encoding="%charset%"?>
-<!DOCTYPE html
+<!DOCTYPE html
      PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 }
@@ -271,7 +271,7 @@ HEADER = XHTML_PREAMBLE + %{
       return false;
     elemStyle = elem.style;
     if ( elemStyle.display != "block" ) {
       elemStyle.display = "block"
     } else {
@@ -280,10 +280,10 @@ HEADER = XHTML_PREAMBLE + %{
     return true;
   }
   // Make codeblocks hidden by default
   document.writeln( "<style type=\\"text/css\\">div.method-source-code { display: none }</style>" )
   // ]]>
   </script>
@@ -516,7 +516,7 @@ IF:sectitle
 IF:seccomment
       <div class="section-comment">
         %seccomment%
-      </div>
+      </div>
 ENDIF:seccomment
 ENDIF:sectitle
 END:sections
@@ -608,7 +608,7 @@ IF:sectitle
 IF:seccomment
       <div class="section-comment">
         %seccomment%
-      </div>
+      </div>
 ENDIF:seccomment
 ENDIF:sectitle
@@ -720,7 +720,7 @@ END:attributes
       </div>
     </div>
 ENDIF:attributes
     <!-- if method_list -->
@@ -755,7 +755,7 @@ IF:sourcecode
           </a>
 ENDIF:sourcecode
         </div>
         <div class="method-description">
 IF:m_desc
           %m_desc%
@@ -797,7 +797,7 @@ START:params
 END:params
 ENDIF:params
         </div>
         <div class="method-description">
 IF:m_desc
           %m_desc%
@@ -935,7 +935,7 @@ METHOD_INDEX = FILE_INDEX
 COMBO_INDEX = XHTML_PREAMBLE + %{
 <!--
-    %classes_title% &amp; %defines_title%
+    %classes_title% &amp; %defines_title%
   -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
@@ -950,7 +950,7 @@ COMBO_INDEX = XHTML_PREAMBLE + %{
       parent.docwin.location.href = url;
   }
   //--></SCRIPT>
 </head>
 <body>
 <div id="index">
@@ -1019,7 +1019,7 @@ ENDIF:plugins
 }
 INDEX = %{<?xml version="1.0" encoding="%charset%"?>
-<!DOCTYPE html
+<!DOCTYPE html
      PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">

data/lib/puppet/util/rdoc/parser.rb CHANGED

@@ -41,6 +41,18 @@ class Parser
     private
+    # Due to a bug in RDoc, we need to roll our own find_module_named
+    # The issue is that RDoc tries harder by asking the parent for a class/module
+    # of the name. But by doing so, it can mistakenly use a module of same name
+    # but from which we are not descendant.
+    def find_object_named(container, name)
+        return container if container.name == name
+        container.each_classmodule do |m|
+            return m if m.name == name
+        end
+        nil
+    end
     # walk down the namespace and lookup/create container as needed
     def get_class_or_module(container, name)
@@ -54,9 +66,9 @@ class Parser
         final_name = names.pop
         names.each do |name|
             prev_container = container
-            container = container.find_module_named(name)
+            container = find_object_named(container, name)
             unless container
-                container = prev_container.add_module(PuppetClass, name)
+                container = prev_container.add_class(PuppetClass, name, nil)
             end
         end
         return [container, final_name]
@@ -155,8 +167,8 @@ class Parser
             scan_for_vardef(container,stmt.children) if stmt.is_a?(Puppet::Parser::AST::ASTArray)
             if stmt.is_a?(Puppet::Parser::AST::VarDef)
-                Puppet.debug "rdoc: found constant: %s = %s" % [stmt.name.to_s, value_to_s(stmt.value)]
-                container.add_constant(Constant.new(stmt.name.to_s, value_to_s(stmt.value), stmt.doc))
+                Puppet.debug "rdoc: found constant: %s = %s" % [stmt.name.to_s, stmt.value.to_s]
+                container.add_constant(Constant.new(stmt.name.to_s, stmt.value.to_s, stmt.doc))
             end
         end
     end
@@ -169,20 +181,15 @@ class Parser
             if stmt.is_a?(Puppet::Parser::AST::Resource) and !stmt.type.nil?
                 type = stmt.type.split("::").collect { |s| s.capitalize }.join("::")
-                title = value_to_s(stmt.title)
+                title = stmt.title.is_a?(Puppet::Parser::AST::ASTArray) ? stmt.title.to_s.gsub(/\[(.*)\]/,'\1') : stmt.title.to_s
                 Puppet.debug "rdoc: found resource: %s[%s]" % [type,title]
                 param = []
                 stmt.params.children.each do |p|
                     res = {}
                     res["name"] = p.param
-                    if !p.value.nil?
-                        if !p.value.is_a?(Puppet::Parser::AST::ASTArray)
-                            res["value"] = "'#{p.value}'"
-                        else
-                            res["value"] = "[%s]" % p.value.children.collect { |v| "'#{v}'" }.join(", ")
-                        end
-                    end
+                    res["value"] = "#{p.value.to_s}" unless p.value.nil?
                     param << res
                 end
@@ -203,6 +210,10 @@ class Parser
         comment = klass.doc
         look_for_directives_in(container, comment) unless comment.empty?
         cls = container.add_class(PuppetClass, name, superclass)
+        # it is possible we already encountered this class, while parsing some namespaces
+        # from other classes of other files. But at that time we couldn't know this class superclass
+        # so, now we know it and force it.
+        cls.superclass = superclass
         cls.record_location(@top_level)
         # scan class code for include
@@ -248,8 +259,6 @@ class Parser
         # split define name by :: to find the complete module hierarchy
         container, name = get_class_or_module(container,name)
-        return if container.find_local_symbol(name)
         # build up declaration
         declaration = ""
         define.arguments.each do |arg,value|
@@ -281,7 +290,8 @@ class Parser
     # that contains the documentation
     def parse_elements(container)
         Puppet.debug "rdoc: scanning manifest"
-        @ast[:classes].each do |name, klass|
+        @ast.hostclasses.values.sort { |a,b| a.classname <=> b.classname }.each do |klass|
+            name = klass.classname
             if klass.file == @input_file_name
                 unless name.empty?
                     document_class(name,klass,container)
@@ -293,15 +303,15 @@ class Parser
             end
         end
-        @ast[:definitions].each do |name, define|
+        @ast.definitions.each do |name, define|
             if define.file == @input_file_name
                 document_define(name,define,container)
             end
         end
-        @ast[:nodes].each do |name, node|
+        @ast.nodes.each do |name, node|
             if node.file == @input_file_name
-                document_node(name,node,container)
+                document_node(name.to_s,node,container)
             end
         end
     end
@@ -419,19 +429,5 @@ class Parser
         comment.gsub!(/^#--.*?^#\+\+/m, '')
         comment.sub!(/^#--.*/m, '')
     end
-    # convert an AST value to a string
-    def value_to_s(value)
-        value = value.children if value.is_a?(Puppet::Parser::AST::ASTArray)
-        if value.is_a?(Array)
-            "['#{value.join(", ")}']"
-        elsif [:true, true, "true"].include?(value)
-            "true"
-        elsif [:false, false, "false"].include?(value)
-            "false"
-        else
-            value.to_s
-        end
-    end
 end
 end

data/lib/puppet/util/reference.rb CHANGED

@@ -14,7 +14,7 @@ class Puppet::Util::Reference
     end
     def self.modes
-        %w{pdf trac text}
+        %w{pdf trac text markdown}
     end
     def self.newreference(name, options = {}, &block)
@@ -36,7 +36,7 @@ class Puppet::Util::Reference
     def self.pdf(text)
         puts "creating pdf"
-        Puppet::Util.secure_open("/tmp/puppetdoc.txt", "w") do |f|
+        File.open("/tmp/puppetdoc.txt", "w") do |f|
             f.puts text
         end
         rst2latex = %x{which rst2latex}
@@ -48,7 +48,6 @@ class Puppet::Util::Reference
         end
         rst2latex.chomp!
         cmd = %{#{rst2latex} /tmp/puppetdoc.txt > /tmp/puppetdoc.tex}
-        Puppet::Util.secure_open('/tmp/puppetdoc.tex','w') {}
         output = %x{#{cmd}}
         unless $? == 0
             $stderr.puts "rst2latex failed"
@@ -58,14 +57,36 @@ class Puppet::Util::Reference
         $stderr.puts output
         # Now convert to pdf
-        puts "handling pdf"
         Dir.chdir("/tmp") do
             %x{texi2pdf puppetdoc.tex >/dev/null 2>/dev/null}
         end
-        #if FileTest.exists?("/tmp/puppetdoc.pdf")
-        #    FileUtils.mv("/tmp/puppetdoc.pdf", "/export/apache/docroots/reductivelabs.com/htdocs/downloads/puppet/reference.pdf")
-        #end
+    end
+    def self.markdown(name, text)
+        puts "Creating markdown for #{name} reference."
+        dir = "/tmp/" + Puppet::PUPPETVERSION
+        FileUtils.mkdir(dir) unless File.directory?(dir)
+        File.open(dir + "/" + "#{name}.rst", "w") do |f|
+            f.puts text
+        end
+        pandoc = %x{which pandoc}
+        if $? != 0 or pandoc =~ /no /
+            pandoc = %x{which pandoc}
+        end
+        if $? != 0 or pandoc =~ /no /
+            raise "Could not find pandoc"
+        end
+        pandoc.chomp!
+        cmd = %{#{pandoc} -s -r rst -w markdown #{dir}/#{name}.rst -o #{dir}/#{name}.mdwn}
+        output = %x{#{cmd}}
+        unless $? == 0
+            $stderr.puts "Pandoc failed to create #{name} reference."
+            $stderr.puts output
+            exit(1)
+        end
+        File.unlink(dir + "/" + "#{name}.rst")
     end
     def self.references
@@ -169,7 +190,7 @@ class Puppet::Util::Reference
     end
     def trac
-        Puppet::Util.secure_open("/tmp/puppetdoc.txt", "w") do |f|
+        File.open("/tmp/puppetdoc.txt", "w") do |f|
             f.puts self.to_trac
         end

data/lib/puppet/util/resource_template.rb CHANGED

@@ -18,7 +18,7 @@ require 'erb'
 #   def generate
 #       template = Puppet::Util::ResourceTemplate.new("/path/to/template", self)
 #
-#       return Puppet::Type.type(:file).create :path => "/my/file",
+#       return Puppet::Type.type(:file).new :path => "/my/file",
 #           :content => template.evaluate
 #   end
 #

data/lib/puppet/util/selinux.rb CHANGED

@@ -122,7 +122,7 @@ module Puppet::Util::SELinux
         else
             context = value
         end
         retval = Selinux.lsetfilecon(file, context)
         if retval == 0
             return true
@@ -152,9 +152,15 @@ module Puppet::Util::SELinux
     # Internal helper function to read and parse /proc/mounts
     def read_mounts
+        mounts = ""
         begin
-            mountfh = File.open("/proc/mounts", NONBLOCK)
-            mounts = mountfh.read
+            mountfh = File.open("/proc/mounts")
+            # We use read_nonblock() in a loop rather than read() to work-around
+            # a linux kernel bug.  See ticket #1963 for details.
+            while true
+                mounts += mountfh.read_nonblock(1024)
+            end
+        rescue EOFError
             mountfh.close
         rescue
             return nil
@@ -179,12 +185,12 @@ module Puppet::Util::SELinux
         unless mnts = read_mounts()
             return nil
         end
         # For a given file:
-        # Check if the filename is in the data structure;
+        # Check if the filename is in the data structure;
         #   return the fstype if it is.
         # Just in case: return something if you're down to "/" or ""
-        # Remove the last slash and everything after it,
+        # Remove the last slash and everything after it,
         #   and repeat with that as the file for the next loop through.
         ary = file.split('/')
         while not ary.empty? do

data/lib/puppet/util/settings.rb CHANGED

@@ -3,11 +3,18 @@ require 'sync'
 require 'puppet/transportable'
 require 'getoptlong'
+require 'puppet/external/event-loop'
+require 'puppet/util/cacher'
+require 'puppet/util/loadedfile'
 # The class for handling configuration files.
 class Puppet::Util::Settings
     include Enumerable
-    include Puppet::Util
+    include Puppet::Util::Cacher
+    require 'puppet/util/settings/setting'
+    require 'puppet/util/settings/file_setting'
+    require 'puppet/util/settings/boolean_setting'
     attr_accessor :file
     attr_reader :timer
@@ -19,62 +26,35 @@ class Puppet::Util::Settings
     # Set a config value.  This doesn't set the defaults, it sets the value itself.
     def []=(param, value)
-        param = symbolize(param)
-        unless element = @config[param]
-            raise ArgumentError,
-                "Attempt to assign a value to unknown configuration parameter %s" % param.inspect
-        end
-        if element.respond_to?(:munge)
-            value = element.munge(value)
-        end
-        if element.respond_to?(:handle)
-            element.handle(value)
-        end
-        # Reset the name, so it's looked up again.
-        if param == :name
-            @name = nil
-        end
-        @sync.synchronize do # yay, thread-safe
-            @values[:memory][param] = value
-            @cache.clear
-        end
-        return value
+        set_value(param, value, :memory)
     end
     # Generate the list of valid arguments, in a format that GetoptLong can
     # understand, and add them to the passed option list.
     def addargs(options)
-        # Hackish, but acceptable.  Copy the current ARGV for restarting.
-        Puppet.args = ARGV.dup
         # Add all of the config parameters as valid options.
-        self.each { |name, element|
-            element.getopt_args.each { |args| options << args }
+        self.each { |name, setting|
+            setting.getopt_args.each { |args| options << args }
         }
         return options
     end
-    def apply
-        trans = self.to_transportable
-        begin
-            config = trans.to_catalog
-            config.store_state = false
-            config.apply
-            config.clear
-        rescue => detail
-            if Puppet[:trace]
-                puts detail.backtrace
-            end
-            Puppet.err "Could not configure myself: %s" % detail
-        end
+    # Generate the list of valid arguments, in a format that OptionParser can
+    # understand, and add them to the passed option list.
+    def optparse_addargs(options)
+        # Add all of the config parameters as valid options.
+        self.each { |name, setting|
+            options << setting.optparse_args
+        }
+        return options
     end
     # Is our parameter a boolean parameter?
     def boolean?(param)
-        param = symbolize(param)
-        if @config.include?(param) and @config[param].kind_of? CBoolean
+        param = param.to_sym
+        if @config.include?(param) and @config[param].kind_of? BooleanSetting
             return true
         else
             return false
@@ -126,7 +106,7 @@ class Puppet::Util::Settings
     # Return a value's description.
     def description(name)
-        if obj = @config[symbolize(name)]
+        if obj = @config[name.to_sym]
             obj.desc
         else
             nil
@@ -152,8 +132,8 @@ class Puppet::Util::Settings
     end
     # Return an object by name.
-    def element(param)
-        param = symbolize(param)
+    def setting(param)
+        param = param.to_sym
         @config[param]
     end
@@ -169,17 +149,12 @@ class Puppet::Util::Settings
             bool = false
         end
         str = str.intern
-        if self.valid?(str)
-            @sync.synchronize do
-                if self.boolean?(str)
-                    @values[:cli][str] = bool
-                else
-                    @values[:cli][str] = value
-                end
-            end
-        else
-            raise ArgumentError, "Invalid argument %s" % opt
+        if value == "" or value.nil?
+            value = bool
         end
+        set_value(str, value, :cli)
     end
     def include?(name)
@@ -197,7 +172,7 @@ class Puppet::Util::Settings
     def initialize
         @config = {}
         @shortnames = {}
         @created = []
         @searchpath = nil
@@ -222,8 +197,8 @@ class Puppet::Util::Settings
     # They probably deserve their own class, but I don't want to do that until I can refactor environments
     # its a little better than where they were
-    # Prints the contents of a config file with the available config elements, or it
-    # prints a single value of a config element.
+    # Prints the contents of a config file with the available config settings, or it
+    # prints a single value of a config setting.
     def print_config_options
         env = value(:environment)
         val = value(:configprint)
@@ -277,7 +252,7 @@ class Puppet::Util::Settings
     # Return a given object's file metadata.
     def metadata(param)
-        if obj = @config[symbolize(param)] and obj.is_a?(CFile)
+        if obj = @config[param.to_sym] and obj.is_a?(FileSetting)
             return [:owner, :group, :mode].inject({}) do |meta, p|
                 if v = obj.send(p)
                     meta[p] = v
@@ -335,7 +310,18 @@ class Puppet::Util::Settings
     # Parse the configuration file.  Just provides
     # thread safety.
-    def parse(file)
+    def parse
+        raise "No :config setting defined; cannot parse unknown config file" unless self[:config]
+        # Create a timer so that this file will get checked automatically
+        # and reparsed if necessary.
+        set_filetimeout_timer()
+        # Retrieve the value now, so that we don't lose it in the 'clear' call.
+        file = self[:config]
+        return unless FileTest.exist?(file)
         # We have to clear outside of the sync, because it's
         # also using synchronize().
         clear(true)
@@ -350,7 +336,7 @@ class Puppet::Util::Settings
         parse_file(file).each do |area, values|
             @values[area] = values
         end
         # Determine our environment, if we have one.
         if @config[:environment]
             env = self.value(:environment).to_sym
@@ -383,128 +369,43 @@ class Puppet::Util::Settings
         end
     end
-    private :unsafe_parse
-    # Parse the configuration file.  As of May 2007, this is a backward-compatibility method and
-    # will be deprecated soon.
-    def old_parse(file)
-        text = nil
-        if file.is_a? Puppet::Util::LoadedFile
-            @file = file
-        else
-            @file = Puppet::Util::LoadedFile.new(file)
-        end
-        # Don't create a timer for the old style parsing.
-        # settimer()
-        begin
-            text = File.read(@file.file)
-        rescue Errno::ENOENT
-            raise Puppet::Error, "No such file %s" % file
-        rescue Errno::EACCES
-            raise Puppet::Error, "Permission denied to file %s" % file
-        end
-        @sync.synchronize do
-            @values = Hash.new { |names, name|
-                names[name] = {}
-            }
-        end
-        # Get rid of the values set by the file, keeping cli values.
-        self.clear(true)
-        section = "puppet"
-        metas = %w{owner group mode}
-        values = Hash.new { |hash, key| hash[key] = {} }
-        @sync.synchronize do
-            text.split(/\n/).each { |line|
-                case line
-                when /^\[(\w+)\]$/: section = $1 # Section names
-                when /^\s*#/: next # Skip comments
-                when /^\s*$/: next # Skip blanks
-                when /^\s*(\w+)\s*=\s*(.+)$/: # settings
-                    var = $1.intern
-                    if var == :mode
-                        value = $2
-                    else
-                        value = munge_value($2)
-                    end
-                    # Only warn if we don't know what this config var is.  This
-                    # prevents exceptions later on.
-                    unless @config.include?(var) or metas.include?(var.to_s)
-                        Puppet.warning "Discarded unknown configuration parameter %s" % var.inspect
-                        next # Skip this line.
-                    end
-                    # Mmm, "special" attributes
-                    if metas.include?(var.to_s)
-                        unless values.include?(section)
-                            values[section] = {}
-                        end
-                        values[section][var.to_s] = value
-                        # If the parameter is valid, then set it.
-                        if section == Puppet[:name] and @config.include?(var)
-                            #@config[var].value = value
-                            @values[:main][var] = value
-                        end
-                        next
-                    end
-                    # Don't override set parameters, since the file is parsed
-                    # after cli arguments are handled.
-                    unless @config.include?(var) and @config[var].setbycli
-                        Puppet.debug "%s: Setting %s to '%s'" % [section, var, value]
-                        @values[:main][var] = value
-                    end
-                    @config[var].section = symbolize(section)
-                    metas.each { |meta|
-                        if values[section][meta]
-                            if @config[var].respond_to?(meta + "=")
-                                @config[var].send(meta + "=", values[section][meta])
-                            end
-                        end
-                    }
-                else
-                    raise Puppet::Error, "Could not match line %s" % line
-                end
-            }
-        end
-    end
-    # Create a new config option.
-    def newelement(hash)
+    # Create a new setting.  The value is passed in because it's used to determine
+    # what kind of setting we're creating, but the value itself might be either
+    # a default or a value, so we can't actually assign it.
+    def newsetting(hash)
         klass = nil
         if hash[:section]
-            hash[:section] = symbolize(hash[:section])
+            hash[:section] = hash[:section].to_sym
         end
-        case hash[:default]
-        when true, false, "true", "false":
-            klass = CBoolean
-        when /^\$\w+\//, /^\//:
-            klass = CFile
-        when String, Integer, Float: # nothing
-            klass = CElement
+        if type = hash[:type]
+            unless klass = {:setting => Setting, :file => FileSetting, :boolean => BooleanSetting}[type]
+                raise ArgumentError, "Invalid setting type '%s'" % type
+            end
+            hash.delete(:type)
         else
-            raise Puppet::Error, "Invalid value '%s' for %s" % [value.inspect, hash[:name]]
+            case hash[:default]
+            when true, false, "true", "false"
+                klass = BooleanSetting
+            when /^\$\w+\//, /^\//
+                klass = FileSetting
+            when String, Integer, Float # nothing
+                klass = Setting
+            else
+                raise Puppet::Error, "Invalid value '%s' for %s" % [value.inspect, hash[:name]]
+            end
         end
         hash[:settings] = self
-        element = klass.new(hash)
+        setting = klass.new(hash)
-        return element
+        return setting
     end
-    # This has to be private, because it doesn't add the elements to @config
-    private :newelement
+    # This has to be private, because it doesn't add the settings to @config
+    private :newsetting
     # Iterate across all of the objects in a given section.
     def persection(section)
-        section = symbolize(section)
+        section = section.to_sym
         self.each { |name, obj|
             if obj.section == section
                 yield obj
@@ -512,12 +413,20 @@ class Puppet::Util::Settings
         }
     end
+    # Cache this in an easily clearable way, since we were
+    # having trouble cleaning it up after tests.
+    cached_attr(:file) do
+        if path = self[:config] and FileTest.exist?(path)
+            Puppet::Util::LoadedFile.new(path)
+        end
+    end
     # Reparse our config file, if necessary.
     def reparse
-        if defined? @file and @file.changed?
-            Puppet.notice "Reparsing %s" % @file.file
+        if file and file.changed?
+            Puppet.notice "Reparsing %s" % file.file
             @sync.synchronize do
-                parse(@file)
+                parse
             end
             reuse()
         end
@@ -526,10 +435,9 @@ class Puppet::Util::Settings
     def reuse
         return unless defined? @used
         @sync.synchronize do # yay, thread-safe
-            @used.each do |section|
-                @used.delete(section)
-                self.use(section)
-            end
+            new = @used
+            @used = []
+            self.use(*new)
         end
     end
@@ -557,45 +465,55 @@ class Puppet::Util::Settings
         return sectionlist, sections
     end
-    # Convert a single section into transportable objects.
-    def section_to_transportable(section, done = nil)
-        done ||= Hash.new { |hash, key| hash[key] = {} }
-        objects = []
-        persection(section) do |obj|
-            if @config[:mkusers] and value(:mkusers)
-                objects += add_user_resources(section, obj, done)
-            end
+    def service_user_available?
+        return @service_user_available if defined?(@service_user_available)
-            value = obj.value
+        return @service_user_available = false unless user_name = self[:user]
-            # Only files are convertable to transportable resources.
-            next unless obj.respond_to? :to_transportable and transobjects = obj.to_transportable
+        user = Puppet::Type.type(:user).new :name => self[:user], :check => :ensure
-            transobjects = [transobjects] unless transobjects.is_a? Array
-            transobjects.each do |trans|
-                # transportable could return nil
-                next unless trans
-                unless done[:file].include? trans.name
-                    @created << trans.name
-                    objects << trans
-                    done[:file][trans.name] = trans
-                end
-            end
+        return @service_user_available = user.exists?
+    end
+    def set_value(param, value, type)
+        param = param.to_sym
+        unless setting = @config[param]
+            raise ArgumentError,
+                "Attempt to assign a value to unknown configuration parameter %s" % param.inspect
+        end
+        if setting.respond_to?(:munge)
+            value = setting.munge(value)
         end
+        if setting.respond_to?(:handle)
+            setting.handle(value)
+        end
+        # Reset the name, so it's looked up again.
+        if param == :name
+            @name = nil
+        end
+        @sync.synchronize do # yay, thread-safe
+            @values[type][param] = value
+            @cache.clear
-        bucket = Puppet::TransBucket.new
-        bucket.type = "Settings"
-        bucket.name = section
-        bucket.push(*objects)
-        bucket.keyword = "class"
+            clearused
-        return bucket
+            # Clear the list of environments, because they cache, at least, the module path.
+            # We *could* preferentially just clear them if the modulepath is changed,
+            # but we don't really know if, say, the vardir is changed and the modulepath
+            # is defined relative to it. We need the defined? stuff because of loading
+            # order issues.
+            Puppet::Node::Environment.clear if defined?(Puppet::Node) and defined?(Puppet::Node::Environment)
+        end
+        return value
     end
+    private :set_value
     # Set a bunch of defaults in a given section.  The sections are actually pretty
     # pointless, but they help break things up a bit, anyway.
     def setdefaults(section, defs)
-        section = symbolize(section)
+        section = section.to_sym
         call = []
         defs.each { |name, hash|
             if hash.is_a? Array
@@ -606,13 +524,13 @@ class Puppet::Util::Settings
                 hash = {}
                 [:default, :desc].zip(tmp).each { |p,v| hash[p] = v }
             end
-            name = symbolize(name)
+            name = name.to_sym
             hash[:name] = name
             hash[:section] = section
             if @config.include?(name)
                 raise ArgumentError, "Parameter %s is already defined" % name
             end
-            tryconfig = newelement(hash)
+            tryconfig = newsetting(hash)
             if short = tryconfig.short
                 if other = @shortnames[short]
                     raise ArgumentError, "Parameter %s is already using short name '%s'" % [other.name, short]
@@ -631,25 +549,33 @@ class Puppet::Util::Settings
     end
     # Create a timer to check whether the file should be reparsed.
-    def settimer
-        if Puppet[:filetimeout] > 0
-            @timer = Puppet.newtimer(
-                :interval => Puppet[:filetimeout],
-                :tolerance => 1,
-                :start? => true
-            ) do
-                self.reparse()
-            end
-        end
+    def set_filetimeout_timer
+        return unless timeout = self[:filetimeout] and timeout = Integer(timeout) and timeout > 0
+        timer = EventLoop::Timer.new(:interval => timeout, :tolerance => 1, :start? => true) { self.reparse() }
     end
-    # Convert our list of objects into a component that can be applied.
-    def to_configuration
-        transport = self.to_transportable
-        return transport.to_catalog
+    # Convert the settings we manage into a catalog full of resources that model those settings.
+    # We currently have to go through Trans{Object,Bucket} instances,
+    # because this hasn't been ported yet.
+    def to_catalog(*sections)
+        sections = nil if sections.empty?
+        catalog = Puppet::Resource::Catalog.new("Settings")
+        @config.values.find_all { |value| value.is_a?(FileSetting) }.each do |file|
+            next unless (sections.nil? or sections.include?(file.section))
+            next unless resource = file.to_resource
+            next if catalog.resource(resource.ref)
+            catalog.add_resource(resource)
+        end
+        add_user_resources(catalog, sections)
+        catalog
     end
-    # Convert our list of config elements into a configuration file.
+    # Convert our list of config settings into a configuration file.
     def to_config
         str = %{The configuration file for #{Puppet[:name]}.  Note that this file
 is likely to have unused configuration parameters in it; any parameter that's
@@ -677,62 +603,29 @@ Generated on #{Time.now}.
         return str
     end
-    # Convert our configuration into a list of transportable objects.
-    def to_transportable(*sections)
-        done = Hash.new { |hash, key|
-            hash[key] = {}
-        }
-        topbucket = Puppet::TransBucket.new
-        if defined? @file.file and @file.file
-            topbucket.name = @file.file
-        else
-            topbucket.name = "top"
-        end
-        topbucket.type = "Settings"
-        topbucket.top = true
-        # Now iterate over each section
-        if sections.empty?
-            eachsection do |section|
-                sections << section
-            end
-        end
-        sections.each do |section|
-            obj = section_to_transportable(section, done)
-            topbucket.push obj
-        end
-        topbucket
-    end
     # Convert to a parseable manifest
     def to_manifest
-        transport = self.to_transportable
-        manifest = transport.to_manifest + "\n"
-        eachsection { |section|
-            manifest += "include #{section}\n"
-        }
-        return manifest
+        catalog = to_catalog
+        # The resource list is a list of references, not actual instances.
+        catalog.resources.collect do |ref|
+            catalog.resource(ref).to_manifest
+        end.join("\n\n")
     end
     # Create the necessary objects to use a section.  This is idempotent;
     # you can 'use' a section as many times as you want.
     def use(*sections)
+        sections = sections.collect { |s| s.to_sym }
         @sync.synchronize do # yay, thread-safe
-            sections = sections.reject { |s| @used.include?(s.to_sym) }
+            sections = sections.reject { |s| @used.include?(s) }
             return if sections.empty?
-            bucket = to_transportable(*sections)
             begin
-                catalog = bucket.to_catalog
+                catalog = to_catalog(*sections).to_ral
             rescue => detail
                 puts detail.backtrace if Puppet[:trace]
-                Puppet.err "Could not create resources for managing Puppet's files and directories: %s" % detail
+                Puppet.err "Could not create resources for managing Puppet's files and directories in sections %s: %s" % [sections.inspect, detail]
                 # We need some way to get rid of any resources created during the catalog creation
                 # but not cleaned up.
@@ -745,11 +638,9 @@ Generated on #{Time.now}.
                     if transaction.any_failed?
                         report = transaction.report
                         failures = report.logs.find_all { |log| log.level == :err }
-                        raise "Got %s failure(s) while initializing: %s" % [failures.length, failures.collect { |l| l.to_s }.join("; ")]
+                        raise "Got %s failure(s) while initializing: %s" % [failures.length, failures.collect { |l| l.to_s }.join("; ")]
                     end
                 end
-            ensure
-                catalog.clear
             end
             sections.each { |s| @used << s }
@@ -758,21 +649,21 @@ Generated on #{Time.now}.
     end
     def valid?(param)
-        param = symbolize(param)
+        param = param.to_sym
         @config.has_key?(param)
     end
     # Find the correct value using our search path.  Optionally accept an environment
     # in which to search before the other configuration sections.
     def value(param, environment = nil)
-        param = symbolize(param)
-        environment = symbolize(environment) if environment
+        param = param.to_sym
+        environment = environment.to_sym if environment
         # Short circuit to nil for undefined parameters.
         return nil unless @config.include?(param)
         # Yay, recursion.
-        self.reparse() unless param == :filetimeout
+        #self.reparse() unless [:config, :filetimeout].include?(param)
         # Check the cache first.  It needs to be a per-environment
         # cache so that we don't spread values from one env
@@ -794,7 +685,7 @@ Generated on #{Time.now}.
             end
             throw :foundval, nil
         end
         # If we didn't get a value, use the default
         val = @config[param].default if val.nil?
@@ -850,20 +741,26 @@ Generated on #{Time.now}.
         end
         sync.synchronize(Sync::EX) do
-            File.open(file, "r+", 0600) do |rf|
+            File.open(file, ::File::CREAT|::File::RDWR, 0600) do |rf|
                 rf.lock_exclusive do
                     if File.exist?(tmpfile)
                         raise Puppet::Error, ".tmp file already exists for %s; Aborting locked write. Check the .tmp file and delete if appropriate" %
                             [file]
                     end
-                    writesub(default, tmpfile, *args, &bloc)
+                    # If there's a failure, remove our tmpfile
+                    begin
+                        writesub(default, tmpfile, *args, &bloc)
+                    rescue
+                        File.unlink(tmpfile) if FileTest.exist?(tmpfile)
+                        raise
+                    end
                     begin
                         File.rename(tmpfile, file)
                     rescue => detail
-                        Puppet.err "Could not rename %s to %s: %s" %
-                            [file, tmpfile, detail]
+                        Puppet.err "Could not rename %s to %s: %s" % [file, tmpfile, detail]
+                        File.unlink(tmpfile) if FileTest.exist?(tmpfile)
                     end
                 end
             end
@@ -878,53 +775,33 @@ Generated on #{Time.now}.
             raise ArgumentError, "Unknown default %s" % default
         end
-        unless obj.is_a? CFile
+        unless obj.is_a? FileSetting
             raise ArgumentError, "Default %s is not a file" % default
         end
         return obj
     end
     # Create the transportable objects for users and groups.
-    def add_user_resources(section, obj, done)
-        resources = []
-        [:owner, :group].each do |attr|
-            type = nil
-            if attr == :owner
-                type = :user
-            else
-                type = attr
-            end
-            # If a user and/or group is set, then make sure we're
-            # managing that object
-            if obj.respond_to? attr and name = obj.send(attr)
-                # Skip root or wheel
-                next if %w{root wheel}.include?(name.to_s)
-                # Skip owners and groups we've already done, but tag
-                # them with our section if necessary
-                if done[type].include?(name)
-                    tags = done[type][name].tags
-                    unless tags.include?(section)
-                        done[type][name].tags = tags << section
-                    end
-                else
-                    newobj = Puppet::TransObject.new(name, type.to_s)
-                    newobj.tags = ["puppet", "configuration", section]
-                    newobj[:ensure] = :present
-                    if type == :user
-                        newobj[:comment] ||= "%s user" % name
-                    end
-                    # Set the group appropriately for the user
-                    if type == :user
-                        newobj[:gid] = Puppet[:group]
-                    end
-                    done[type][name] = newobj
-                    resources << newobj
+    def add_user_resources(catalog, sections)
+        return unless Puppet.features.root?
+        return unless self[:mkusers]
+        @config.each do |name, setting|
+            next unless setting.respond_to?(:owner)
+            next unless sections.nil? or sections.include?(setting.section)
+            if user = setting.owner and user != "root" and catalog.resource(:user, user).nil?
+                resource = Puppet::Resource.new(:user, user, :ensure => :present)
+                if self[:group]
+                    resource[:gid] = self[:group]
                 end
+                catalog.add_resource resource
+            end
+            if group = setting.group and ! %w{root wheel}.include?(group) and catalog.resource(:group, group).nil?
+                catalog.add_resource Puppet::Resource.new(:group, group, :ensure => :present)
             end
         end
-        resources
     end
     # Yield each search source in turn.
@@ -936,7 +813,7 @@ Generated on #{Time.now}.
         end
     end
-    # Return all elements that have associated hooks; this is so
+    # Return all settings that have associated hooks; this is so
     # we can call them after parsing the configuration file.
     def settings_with_hooks
         @config.values.find_all { |setting| setting.respond_to?(:handle) }
@@ -966,17 +843,17 @@ Generated on #{Time.now}.
         end
         result[:value] = value.sub(/\s*$/, '')
         return result
-        return nil
     end
     # Convert arguments into booleans, integers, or whatever.
     def munge_value(value)
         # Handle different data types correctly
         return case value
-            when /^false$/i: false
-            when /^true$/i: true
-            when /^\d+$/i: Integer(value)
+            when /^false$/i; false
+            when /^true$/i; true
+            when /^\d+$/i; Integer(value)
+            when true; true
+            when false; false
             else
                 value.gsub(/^["']|["']$/,'').sub(/\s+$/, '')
         end
@@ -989,10 +866,6 @@ Generated on #{Time.now}.
     def parse_file(file)
         text = read_file(file)
-        # Create a timer so that this file will get checked automatically
-        # and reparsed if necessary.
-        settimer()
         result = Hash.new { |names, name|
             names[name] = {}
         }
@@ -1005,13 +878,13 @@ Generated on #{Time.now}.
         text.split(/\n/).each { |line|
             count += 1
             case line
-            when /^\s*\[(\w+)\]$/:
+            when /^\s*\[(\w+)\]$/
                 section = $1.intern # Section names
                 # Add a meta section
                 result[section][:_meta] ||= {}
-            when /^\s*#/: next # Skip comments
-            when /^\s*$/: next # Skip blanks
-            when /^\s*(\w+)\s*=\s*(.*)$/: # settings
+            when /^\s*#/; next # Skip comments
+            when /^\s*$/; next # Skip blanks
+            when /^\s*(\w+)\s*=\s*(.*)$/ # settings
                 var = $1.intern
                 # We don't want to munge modes, because they're specified in octal, so we'll
@@ -1048,14 +921,8 @@ Generated on #{Time.now}.
     # Read the file in.
     def read_file(file)
-        if file.is_a? Puppet::Util::LoadedFile
-            @file = file
-        else
-            @file = Puppet::Util::LoadedFile.new(file)
-        end
         begin
-            return File.read(@file.file)
+            return File.read(file)
         rescue Errno::ENOENT
             raise ArgumentError, "No such file %s" % file
         rescue Errno::EACCES
@@ -1071,246 +938,4 @@ Generated on #{Time.now}.
             end
         end
     end
-    # The base element type.
-    class CElement
-        attr_accessor :name, :section, :default, :setbycli, :call_on_define
-        attr_reader :desc, :short
-        def desc=(value)
-            @desc = value.gsub(/^\s*/, '')
-        end
-        # get the arguments in getopt format
-        def getopt_args
-            if short
-                [["--#{name}", "-#{short}", GetoptLong::REQUIRED_ARGUMENT]]
-            else
-                [["--#{name}", GetoptLong::REQUIRED_ARGUMENT]]
-            end
-        end
-        def hook=(block)
-            meta_def :handle, &block
-        end
-        # Create the new element.  Pretty much just sets the name.
-        def initialize(args = {})
-            @settings = args.delete(:settings)
-            raise ArgumentError.new("You must refer to a settings object") if @settings.nil? or !@settings.is_a?(Puppet::Util::Settings)
-            args.each do |param, value|
-                method = param.to_s + "="
-                unless self.respond_to? method
-                    raise ArgumentError, "%s does not accept %s" % [self.class, param]
-                end
-                self.send(method, value)
-            end
-            unless self.desc
-                raise ArgumentError, "You must provide a description for the %s config option" % self.name
-            end
-        end
-        def iscreated
-            @iscreated = true
-        end
-        def iscreated?
-            if defined? @iscreated
-                return @iscreated
-            else
-                return false
-            end
-        end
-        def set?
-            if defined? @value and ! @value.nil?
-                return true
-            else
-                return false
-            end
-        end
-        # short name for the celement
-        def short=(value)
-            if value.to_s.length != 1
-                raise ArgumentError, "Short names can only be one character."
-            end
-            @short = value.to_s
-        end
-        # Convert the object to a config statement.
-        def to_config
-            str = @desc.gsub(/^/, "# ") + "\n"
-            # Add in a statement about the default.
-            if defined? @default and @default
-                str += "# The default value is '%s'.\n" % @default
-            end
-            # If the value has not been overridden, then print it out commented
-            # and unconverted, so it's clear that that's the default and how it
-            # works.
-            value = @settings.value(self.name)
-            if value != @default
-                line = "%s = %s" % [@name, value]
-            else
-                line = "# %s = %s" % [@name, @default]
-            end
-            str += line + "\n"
-            str.gsub(/^/, "    ")
-        end
-        # Retrieves the value, or if it's not set, retrieves the default.
-        def value
-            @settings.value(self.name)
-        end
-    end
-    # A file.
-    class CFile < CElement
-        attr_writer :owner, :group
-        attr_accessor :mode, :create
-        def group
-            if defined? @group
-                return @settings.convert(@group)
-            else
-                return nil
-            end
-        end
-        def owner
-            if defined? @owner
-                return @settings.convert(@owner)
-            else
-                return nil
-            end
-        end
-        # Set the type appropriately.  Yep, a hack.  This supports either naming
-        # the variable 'dir', or adding a slash at the end.
-        def munge(value)
-            # If it's not a fully qualified path...
-            if value.is_a?(String) and value !~ /^\$/ and value !~ /^\// and value != 'false'
-                # Make it one
-                value = File.join(Dir.getwd, value)
-            end
-            if value.to_s =~ /\/$/
-                @type = :directory
-                return value.sub(/\/$/, '')
-            end
-            return value
-        end
-        # Return the appropriate type.
-        def type
-            value = @settings.value(self.name)
-            if @name.to_s =~ /dir/
-                return :directory
-            elsif value.to_s =~ /\/$/
-                return :directory
-            elsif value.is_a? String
-                return :file
-            else
-                return nil
-            end
-        end
-        # Convert the object to a TransObject instance.
-        def to_transportable
-            type = self.type
-            return nil unless type
-            path = self.value
-            return nil unless path.is_a?(String)
-            return nil if path =~ /^\/dev/
-            return nil if Puppet::Type.type(:file)[path] # skip files that are in our global resource list.
-            objects = []
-            # Skip plain files that don't exist, since we won't be managing them anyway.
-            return nil unless self.name.to_s =~ /dir$/ or File.exist?(path) or self.create
-            obj = Puppet::TransObject.new(path, "file")
-            # Only create directories, or files that are specifically marked to
-            # create.
-            if type == :directory or self.create
-                obj[:ensure] = type
-            end
-            [:mode].each { |var|
-                if value = self.send(var)
-                    # Don't bother converting the mode, since the file type
-                    # can handle it any old way.
-                    obj[var] = value
-                end
-            }
-            # Only chown or chgrp when root
-            if Puppet.features.root?
-                [:group, :owner].each { |var|
-                    if value = self.send(var)
-                        obj[var] = value
-                    end
-                }
-            end
-            # And set the loglevel to debug for everything
-            obj[:loglevel] = "debug"
-            # We're not actually modifying any files here, and if we allow a
-            # filebucket to get used here we get into an infinite recursion
-            # trying to set the filebucket up.
-            obj[:backup] = false
-            if self.section
-                obj.tags += ["puppet", "configuration", self.section, self.name]
-            end
-            objects << obj
-            objects
-        end
-        # Make sure any provided variables look up to something.
-        def validate(value)
-            return true unless value.is_a? String
-            value.scan(/\$(\w+)/) { |name|
-                name = $1
-                unless @settings.include?(name)
-                    raise ArgumentError,
-                        "Settings parameter '%s' is undefined" %
-                        name
-                end
-            }
-        end
-    end
-    # A simple boolean.
-    class CBoolean < CElement
-        # get the arguments in getopt format
-        def getopt_args
-            if short
-                [["--#{name}", "-#{short}", GetoptLong::NO_ARGUMENT],
-                 ["--no-#{name}", GetoptLong::NO_ARGUMENT]]
-            else
-                [["--#{name}", GetoptLong::NO_ARGUMENT],
-                 ["--no-#{name}", GetoptLong::NO_ARGUMENT]]
-            end
-        end
-        def munge(value)
-            case value
-            when true, "true": return true
-            when false, "false": return false
-            else
-                raise ArgumentError, "Invalid value '%s' for %s" %
-                    [value.inspect, @name]
-            end
-        end
-    end
 end