RubyGems - puppet - Versions diffs - 0.25.5 → 2.6.0 - Mend

puppet 0.25.5 → 2.6.0

Potentially problematic release.

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

Files changed (1474) hide show

data/CHANGELOG +667 -0
data/LICENSE +2 -2
data/README +5 -1
data/README.queueing +1 -1
data/README.rst +7 -4
data/Rakefile +6 -18
data/bin/filebucket +0 -94
data/bin/pi +2 -47
data/bin/puppet +2 -69
data/bin/puppetca +2 -100
data/bin/puppetd +2 -158
data/bin/puppetdoc +2 -63
data/bin/puppetmasterd +2 -64
data/bin/puppetqd +2 -51
data/bin/puppetrun +2 -127
data/bin/ralsh +2 -87
data/conf/epm.list +2 -2
data/conf/osx/PackageInfo.plist +1 -1
data/conf/redhat/client.init +11 -8
data/conf/redhat/puppet.conf +1 -1
data/conf/redhat/puppet.spec +1 -1
data/conf/redhat/rundir-perms.patch +13 -13
data/conf/redhat/server.init +11 -5
data/conf/solaris/pkginfo +2 -2
data/conf/solaris/smf/puppetd.xml +3 -3
data/conf/solaris/smf/puppetmasterd.xml +3 -3
data/conf/suse/client.init +3 -2
data/conf/suse/puppet.spec +22 -18
data/conf/suse/server.init +12 -11
data/examples/modules/sample-module/README.txt +3 -3
data/examples/modules/sample-module/lib/puppet/parser/functions/hostname_to_dn.rb +4 -4
data/ext/extlookup.rb +94 -96
data/ext/nagios/check_puppet.rb +94 -88
data/ext/nagios/naggen +3 -3
data/ext/puppet-test +27 -3
data/ext/puppetlisten/puppetlisten.rb +39 -39
data/ext/puppetlisten/puppetrun.rb +6 -6
data/ext/puppetstoredconfigclean.rb +49 -43
data/ext/pure_ruby_dsl/dsl_test.rb +7 -0
data/ext/regexp_nodes/regexp_nodes.rb +133 -133
data/ext/yaml_nodes.rb +99 -0
data/install.rb +109 -118
data/lib/puppet.rb +118 -131
data/lib/puppet/agent.rb +86 -119
data/lib/puppet/agent/locker.rb +28 -30
data/lib/puppet/application.rb +276 -184
data/lib/puppet/application/agent.rb +266 -0
data/lib/puppet/application/apply.rb +165 -0
data/lib/puppet/application/cert.rb +85 -0
data/lib/puppet/application/describe.rb +203 -0
data/lib/puppet/application/doc.rb +215 -0
data/lib/puppet/application/filebucket.rb +73 -73
data/lib/puppet/application/kick.rb +212 -0
data/lib/puppet/application/master.rb +156 -0
data/lib/puppet/application/queue.rb +91 -0
data/lib/puppet/application/resource.rb +118 -0
data/lib/puppet/configurer.rb +214 -197
data/lib/puppet/configurer/downloader.rb +63 -63
data/lib/puppet/configurer/fact_handler.rb +51 -51
data/lib/puppet/configurer/plugin_handler.rb +19 -19
data/lib/puppet/daemon.rb +100 -103
data/lib/puppet/defaults.rb +793 -796
data/lib/puppet/dsl.rb +5 -269
data/lib/puppet/dsl/resource_api.rb +120 -0
data/lib/puppet/dsl/resource_type_api.rb +40 -0
data/lib/puppet/error.rb +34 -36
data/lib/puppet/external/base64.rb +8 -8
data/lib/puppet/external/dot.rb +262 -262
data/lib/puppet/external/event-loop/better-definers.rb +297 -297
data/lib/puppet/external/event-loop/event-loop.rb +264 -272
data/lib/puppet/external/event-loop/signal-system.rb +161 -163
data/lib/puppet/external/lock.rb +41 -41
data/lib/puppet/external/nagios.rb +32 -32
data/lib/puppet/external/nagios/base.rb +453 -458
data/lib/puppet/external/nagios/parser.rb +264 -287
data/lib/puppet/external/pson/common.rb +8 -5
data/lib/puppet/external/pson/pure/generator.rb +26 -26
data/lib/puppet/external/pson/pure/parser.rb +43 -48
data/lib/puppet/feature/base.rb +21 -1
data/lib/puppet/feature/pson.rb +4 -4
data/lib/puppet/feature/rack.rb +14 -14
data/lib/puppet/feature/rails.rb +23 -25
data/lib/puppet/file_bucket.rb +4 -0
data/lib/puppet/file_bucket/dipper.rb +99 -0
data/lib/puppet/file_bucket/file.rb +136 -0
data/lib/puppet/file_bucket/file/indirection_hooks.rb +9 -0
data/lib/puppet/file_collection.rb +20 -20
data/lib/puppet/file_collection/lookup.rb +11 -11
data/lib/puppet/file_serving/base.rb +67 -71
data/lib/puppet/file_serving/configuration.rb +84 -86
data/lib/puppet/file_serving/configuration/parser.rb +103 -102
data/lib/puppet/file_serving/content.rb +34 -33
data/lib/puppet/file_serving/fileset.rb +131 -133
data/lib/puppet/file_serving/indirection_hooks.rb +17 -17
data/lib/puppet/file_serving/metadata.rb +98 -95
data/lib/puppet/file_serving/mount.rb +22 -22
data/lib/puppet/file_serving/mount/file.rb +101 -106
data/lib/puppet/file_serving/mount/modules.rb +15 -15
data/lib/puppet/file_serving/mount/plugins.rb +15 -16
data/lib/puppet/file_serving/terminus_helper.rb +13 -13
data/lib/puppet/indirector.rb +48 -49
data/lib/puppet/indirector/active_record.rb +19 -19
data/lib/puppet/indirector/catalog/active_record.rb +25 -25
data/lib/puppet/indirector/catalog/compiler.rb +134 -145
data/lib/puppet/indirector/catalog/rest.rb +1 -1
data/lib/puppet/indirector/catalog/yaml.rb +13 -13
data/lib/puppet/indirector/certificate/ca.rb +3 -3
data/lib/puppet/indirector/certificate/file.rb +3 -3
data/lib/puppet/indirector/certificate/rest.rb +8 -8
data/lib/puppet/indirector/certificate_request/ca.rb +7 -7
data/lib/puppet/indirector/certificate_request/file.rb +2 -2
data/lib/puppet/indirector/certificate_request/rest.rb +3 -3
data/lib/puppet/indirector/certificate_revocation_list/ca.rb +2 -2
data/lib/puppet/indirector/certificate_revocation_list/file.rb +2 -2
data/lib/puppet/indirector/certificate_revocation_list/rest.rb +3 -3
data/lib/puppet/indirector/couch.rb +76 -0
data/lib/puppet/indirector/direct_file_server.rb +11 -11
data/lib/puppet/indirector/envelope.rb +4 -4
data/lib/puppet/indirector/exec.rb +38 -42
data/lib/puppet/indirector/facts/active_record.rb +24 -24
data/lib/puppet/indirector/facts/couch.rb +31 -0
data/lib/puppet/indirector/facts/facter.rb +63 -61
data/lib/puppet/indirector/facts/memory.rb +4 -4
data/lib/puppet/indirector/facts/rest.rb +1 -1
data/lib/puppet/indirector/facts/yaml.rb +2 -2
data/lib/puppet/indirector/file.rb +67 -46
data/lib/puppet/indirector/file_bucket_file/file.rb +146 -0
data/lib/puppet/indirector/file_bucket_file/rest.rb +8 -0
data/lib/puppet/indirector/file_content/file.rb +1 -1
data/lib/puppet/indirector/file_content/file_server.rb +1 -1
data/lib/puppet/indirector/file_content/rest.rb +1 -1
data/lib/puppet/indirector/file_metadata/file.rb +11 -11
data/lib/puppet/indirector/file_metadata/file_server.rb +1 -1
data/lib/puppet/indirector/file_metadata/rest.rb +1 -1
data/lib/puppet/indirector/file_server.rb +44 -44
data/lib/puppet/indirector/indirection.rb +249 -260
data/lib/puppet/indirector/key/ca.rb +5 -5
data/lib/puppet/indirector/key/file.rb +29 -29
data/lib/puppet/indirector/ldap.rb +62 -64
data/lib/puppet/indirector/memory.rb +13 -13
data/lib/puppet/indirector/node/active_record.rb +6 -6
data/lib/puppet/indirector/node/exec.rb +40 -44
data/lib/puppet/indirector/node/ldap.rb +246 -212
data/lib/puppet/indirector/node/memory.rb +5 -5
data/lib/puppet/indirector/node/plain.rb +12 -12
data/lib/puppet/indirector/node/rest.rb +2 -2
data/lib/puppet/indirector/node/yaml.rb +2 -2
data/lib/puppet/indirector/plain.rb +4 -4
data/lib/puppet/indirector/queue.rb +49 -51
data/lib/puppet/indirector/report/processor.rb +34 -37
data/lib/puppet/indirector/report/rest.rb +3 -3
data/lib/puppet/indirector/request.rb +171 -157
data/lib/puppet/indirector/resource/ral.rb +48 -0
data/lib/puppet/indirector/resource/rest.rb +5 -0
data/lib/puppet/indirector/resource_type.rb +5 -0
data/lib/puppet/indirector/resource_type/parser.rb +27 -0
data/lib/puppet/indirector/resource_type/rest.rb +7 -0
data/lib/puppet/indirector/rest.rb +83 -79
data/lib/puppet/indirector/run/local.rb +8 -0
data/lib/puppet/indirector/run/rest.rb +6 -0
data/lib/puppet/indirector/ssl_file.rb +165 -165
data/lib/puppet/indirector/status.rb +3 -0
data/lib/puppet/indirector/status/local.rb +7 -0
data/lib/puppet/indirector/status/rest.rb +5 -0
data/lib/puppet/indirector/terminus.rb +129 -133
data/lib/puppet/indirector/yaml.rb +47 -49
data/lib/puppet/metatype/manager.rb +120 -114
data/lib/puppet/module.rb +182 -124
data/lib/puppet/network/authconfig.rb +146 -156
data/lib/puppet/network/authorization.rb +63 -70
data/lib/puppet/network/authstore.rb +226 -232
data/lib/puppet/network/client.rb +141 -152
data/lib/puppet/network/client/ca.rb +47 -49
data/lib/puppet/network/client/file.rb +3 -3
data/lib/puppet/network/client/proxy.rb +19 -19
data/lib/puppet/network/client/report.rb +17 -21
data/lib/puppet/network/client/runner.rb +5 -7
data/lib/puppet/network/client/status.rb +1 -1
data/lib/puppet/network/client_request.rb +20 -22
data/lib/puppet/network/format.rb +79 -81
data/lib/puppet/network/format_handler.rb +135 -130
data/lib/puppet/network/formats.rb +128 -154
data/lib/puppet/network/handler.rb +43 -46
data/lib/puppet/network/handler/ca.rb +129 -135
data/lib/puppet/network/handler/filebucket.rb +39 -170
data/lib/puppet/network/handler/fileserver.rb +624 -656
data/lib/puppet/network/handler/master.rb +62 -75
data/lib/puppet/network/handler/report.rb +60 -67
data/lib/puppet/network/handler/runner.rb +20 -20
data/lib/puppet/network/handler/status.rb +9 -9
data/lib/puppet/network/http.rb +12 -12
data/lib/puppet/network/http/api/v1.rb +49 -44
data/lib/puppet/network/http/compression.rb +111 -0
data/lib/puppet/network/http/handler.rb +183 -183
data/lib/puppet/network/http/mongrel.rb +46 -48
data/lib/puppet/network/http/mongrel/rest.rb +73 -66
data/lib/puppet/network/http/rack.rb +45 -45
data/lib/puppet/network/http/rack/httphandler.rb +7 -7
data/lib/puppet/network/http/rack/rest.rb +84 -61
data/lib/puppet/network/http/rack/xmlrpc.rb +49 -49
data/lib/puppet/network/http/webrick.rb +108 -112
data/lib/puppet/network/http/webrick/rest.rb +60 -57
data/lib/puppet/network/http_pool.rb +95 -83
data/lib/puppet/network/http_server/mongrel.rb +90 -90
data/lib/puppet/network/http_server/webrick.rb +139 -148
data/lib/puppet/network/rest_authconfig.rb +76 -71
data/lib/puppet/network/rest_authorization.rb +11 -13
data/lib/puppet/network/rights.rb +217 -226
data/lib/puppet/network/server.rb +147 -151
data/lib/puppet/network/xmlrpc/client.rb +197 -205
data/lib/puppet/network/xmlrpc/processor.rb +68 -72
data/lib/puppet/network/xmlrpc/server.rb +10 -10
data/lib/puppet/network/xmlrpc/webrick_servlet.rb +94 -100
data/lib/puppet/node.rb +99 -107
data/lib/puppet/node/environment.rb +109 -62
data/lib/puppet/node/facts.rb +48 -43
data/lib/puppet/parameter.rb +246 -498
data/lib/puppet/parameter/value.rb +63 -0
data/lib/puppet/parameter/value_collection.rb +143 -0
data/lib/puppet/parser.rb +4 -0
data/lib/puppet/parser/ast.rb +81 -67
data/lib/puppet/parser/ast/arithmetic_operator.rb +27 -29
data/lib/puppet/parser/ast/astarray.rb +50 -50
data/lib/puppet/parser/ast/asthash.rb +37 -0
data/lib/puppet/parser/ast/boolean_operator.rb +33 -35
data/lib/puppet/parser/ast/branch.rb +29 -31
data/lib/puppet/parser/ast/caseopt.rb +50 -56
data/lib/puppet/parser/ast/casestatement.rb +30 -30
data/lib/puppet/parser/ast/collection.rb +43 -37
data/lib/puppet/parser/ast/collexpr.rb +66 -69
data/lib/puppet/parser/ast/comparison_operator.rb +32 -35
data/lib/puppet/parser/ast/else.rb +13 -13
data/lib/puppet/parser/ast/function.rb +34 -43
data/lib/puppet/parser/ast/ifstatement.rb +23 -27
data/lib/puppet/parser/ast/in_operator.rb +24 -0
data/lib/puppet/parser/ast/leaf.rb +173 -156
data/lib/puppet/parser/ast/match_operator.rb +16 -19
data/lib/puppet/parser/ast/minus.rb +13 -13
data/lib/puppet/parser/ast/nop.rb +6 -6
data/lib/puppet/parser/ast/not.rb +9 -9
data/lib/puppet/parser/ast/relationship.rb +60 -0
data/lib/puppet/parser/ast/resource.rb +58 -57
data/lib/puppet/parser/ast/resource_defaults.rb +16 -16
data/lib/puppet/parser/ast/resource_override.rb +51 -51
data/lib/puppet/parser/ast/resource_reference.rb +17 -72
data/lib/puppet/parser/ast/resourceparam.rb +20 -17
data/lib/puppet/parser/ast/selector.rb +30 -34
data/lib/puppet/parser/ast/tag.rb +16 -16
data/lib/puppet/parser/ast/vardef.rb +20 -16
data/lib/puppet/parser/collector.rb +181 -189
data/lib/puppet/parser/compiler.rb +395 -364
data/lib/puppet/parser/files.rb +65 -69
data/lib/puppet/parser/functions.rb +85 -97
data/lib/puppet/parser/functions/defined.rb +23 -23
data/lib/puppet/parser/functions/fail.rb +2 -2
data/lib/puppet/parser/functions/file.rb +21 -19
data/lib/puppet/parser/functions/fqdn_rand.rb +7 -7
data/lib/puppet/parser/functions/generate.rb +24 -26
data/lib/puppet/parser/functions/include.rb +16 -18
data/lib/puppet/parser/functions/inline_template.rb +16 -17
data/lib/puppet/parser/functions/realize.rb +8 -8
data/lib/puppet/parser/functions/regsubst.rb +74 -59
data/lib/puppet/parser/functions/require.rb +35 -33
data/lib/puppet/parser/functions/search.rb +5 -5
data/lib/puppet/parser/functions/sha1.rb +3 -4
data/lib/puppet/parser/functions/shellquote.rb +31 -33
data/lib/puppet/parser/functions/split.rb +8 -8
data/lib/puppet/parser/functions/sprintf.rb +10 -9
data/lib/puppet/parser/functions/tag.rb +3 -3
data/lib/puppet/parser/functions/tagged.rb +13 -13
data/lib/puppet/parser/functions/template.rb +18 -19
data/lib/puppet/parser/functions/versioncmp.rb +17 -14
data/lib/puppet/parser/grammar.ra +485 -422
data/lib/puppet/parser/lexer.rb +500 -442
data/lib/puppet/parser/parser.rb +1438 -1084
data/lib/puppet/parser/parser_support.rb +227 -502
data/lib/puppet/parser/relationship.rb +43 -0
data/lib/puppet/parser/resource.rb +280 -375
data/lib/puppet/parser/resource/param.rb +18 -18
data/lib/puppet/parser/scope.rb +450 -447
data/lib/puppet/parser/templatewrapper.rb +92 -94
data/lib/puppet/parser/type_loader.rb +146 -0
data/lib/puppet/parser/yaml_trimmer.rb +6 -8
data/lib/puppet/property.rb +290 -453
data/lib/puppet/property/ensure.rb +92 -0
data/lib/puppet/property/keyvalue.rb +74 -82
data/lib/puppet/property/list.rb +71 -81
data/lib/puppet/property/ordered_list.rb +15 -15
data/lib/puppet/provider.rb +229 -241
data/lib/puppet/provider/augeas/augeas.rb +318 -320
data/lib/puppet/provider/computer/computer.rb +13 -13
data/lib/puppet/provider/confine.rb +63 -63
data/lib/puppet/provider/confine/exists.rb +14 -14
data/lib/puppet/provider/confine/false.rb +12 -12
data/lib/puppet/provider/confine/feature.rb +10 -10
data/lib/puppet/provider/confine/true.rb +13 -13
data/lib/puppet/provider/confine/variable.rb +51 -54
data/lib/puppet/provider/confine_collection.rb +38 -38
data/lib/puppet/provider/confiner.rb +10 -14
data/lib/puppet/provider/cron/crontab.rb +172 -173
data/lib/puppet/provider/file/posix.rb +99 -0
data/lib/puppet/provider/file/win32.rb +74 -0
data/lib/puppet/provider/group/directoryservice.rb +6 -6
data/lib/puppet/provider/group/groupadd.rb +18 -20
data/lib/puppet/provider/group/ldap.rb +40 -43
data/lib/puppet/provider/group/pw.rb +23 -23
data/lib/puppet/provider/host/parsed.rb +51 -50
data/lib/puppet/provider/ldap.rb +121 -123
data/lib/puppet/provider/macauthorization/macauthorization.rb +263 -272
data/lib/puppet/provider/mailalias/aliases.rb +34 -31
data/lib/puppet/provider/maillist/mailman.rb +87 -93
data/lib/puppet/provider/mcx/mcxcontent.rb +155 -151
data/lib/puppet/provider/mount.rb +36 -40
data/lib/puppet/provider/mount/parsed.rb +28 -26
data/lib/puppet/provider/naginator.rb +46 -48
data/lib/puppet/provider/nameservice.rb +215 -257
data/lib/puppet/provider/nameservice/directoryservice.rb +455 -471
data/lib/puppet/provider/nameservice/objectadd.rb +21 -21
data/lib/puppet/provider/nameservice/pw.rb +13 -13
data/lib/puppet/provider/package.rb +18 -20
data/lib/puppet/provider/package/aix.rb +128 -0
data/lib/puppet/provider/package/appdmg.rb +78 -82
data/lib/puppet/provider/package/apple.rb +39 -40
data/lib/puppet/provider/package/apt.rb +95 -104
data/lib/puppet/provider/package/aptitude.rb +19 -21
data/lib/puppet/provider/package/aptrpm.rb +70 -72
data/lib/puppet/provider/package/blastwave.rb +88 -94
data/lib/puppet/provider/package/darwinport.rb +67 -69
data/lib/puppet/provider/package/dpkg.rb +123 -97
data/lib/puppet/provider/package/fink.rb +66 -68
data/lib/puppet/provider/package/freebsd.rb +38 -40
data/lib/puppet/provider/package/gem.rb +98 -102
data/lib/puppet/provider/package/hpux.rb +37 -39
data/lib/puppet/provider/package/nim.rb +35 -0
data/lib/puppet/provider/package/openbsd.rb +100 -75
data/lib/puppet/provider/package/pkg.rb +108 -0
data/lib/puppet/provider/package/pkgdmg.rb +95 -87
data/lib/puppet/provider/package/portage.rb +101 -104
data/lib/puppet/provider/package/ports.rb +71 -73
data/lib/puppet/provider/package/portupgrade.rb +251 -0
data/lib/puppet/provider/package/rpm.rb +113 -115
data/lib/puppet/provider/package/rug.rb +46 -46
data/lib/puppet/provider/package/sun.rb +135 -151
data/lib/puppet/provider/package/sunfreeware.rb +5 -5
data/lib/puppet/provider/package/up2date.rb +31 -31
data/lib/puppet/provider/package/urpmi.rb +51 -51
data/lib/puppet/provider/package/yum.rb +90 -98
data/lib/puppet/provider/package/zypper.rb +52 -0
data/lib/puppet/provider/parsedfile.rb +306 -329
data/lib/puppet/provider/port/parsed.rb +5 -5
data/lib/puppet/provider/selboolean/getsetsebool.rb +34 -34
data/lib/puppet/provider/selmodule/semodule.rb +103 -111
data/lib/puppet/provider/service/base.rb +134 -139
data/lib/puppet/provider/service/bsd.rb +48 -0
data/lib/puppet/provider/service/daemontools.rb +158 -162
data/lib/puppet/provider/service/debian.rb +36 -36
data/lib/puppet/provider/service/freebsd.rb +118 -38
data/lib/puppet/provider/service/gentoo.rb +33 -39
data/lib/puppet/provider/service/init.rb +125 -125
data/lib/puppet/provider/service/launchd.rb +234 -254
data/lib/puppet/provider/service/redhat.rb +58 -58
data/lib/puppet/provider/service/runit.rb +74 -74
data/lib/puppet/provider/service/smf.rb +81 -85
data/lib/puppet/provider/service/src.rb +87 -0
data/lib/puppet/provider/ssh_authorized_key/parsed.rb +73 -81
data/lib/puppet/provider/sshkey/parsed.rb +24 -21
data/lib/puppet/provider/user/directoryservice.rb +71 -71
data/lib/puppet/provider/user/hpux.rb +20 -20
data/lib/puppet/provider/user/ldap.rb +106 -110
data/lib/puppet/provider/user/pw.rb +33 -37
data/lib/puppet/provider/user/user_role_add.rb +168 -183
data/lib/puppet/provider/user/useradd.rb +50 -51
data/lib/puppet/provider/zfs/solaris.rb +35 -35
data/lib/puppet/provider/zone/solaris.rb +206 -205
data/lib/puppet/provider/zpool/solaris.rb +95 -97
data/lib/puppet/rails.rb +115 -122
data/lib/puppet/rails/benchmark.rb +43 -49
data/lib/puppet/rails/database/001_add_created_at_to_all_tables.rb +8 -12
data/lib/puppet/rails/database/002_remove_duplicated_index_on_all_tables.rb +8 -12
data/lib/puppet/rails/database/003_add_environment_to_host.rb +6 -10
data/lib/puppet/rails/database/schema.rb +100 -97
data/lib/puppet/rails/fact_name.rb +1 -1
data/lib/puppet/rails/fact_value.rb +5 -5
data/lib/puppet/rails/host.rb +252 -249
data/lib/puppet/rails/param_name.rb +15 -15
data/lib/puppet/rails/param_value.rb +55 -55
data/lib/puppet/rails/puppet_tag.rb +4 -4
data/lib/puppet/rails/resource.rb +189 -203
data/lib/puppet/rails/resource_tag.rb +19 -19
data/lib/puppet/rails/source_file.rb +5 -5
data/lib/puppet/reference/configuration.rb +53 -56
data/lib/puppet/reference/function.rb +1 -1
data/lib/puppet/reference/indirection.rb +13 -13
data/lib/puppet/reference/metaparameter.rb +40 -40
data/lib/puppet/reference/network.rb +16 -16
data/lib/puppet/reference/providers.rb +97 -98
data/lib/puppet/reference/report.rb +1 -1
data/lib/puppet/reference/type.rb +67 -70
data/lib/puppet/relationship.rb +65 -67
data/lib/puppet/reports.rb +32 -34
data/lib/puppet/reports/http.rb +22 -0
data/lib/puppet/reports/log.rb +7 -6
data/lib/puppet/reports/rrdgraph.rb +105 -114
data/lib/puppet/reports/store.rb +53 -56
data/lib/puppet/reports/tagmail.rb +149 -157
data/lib/puppet/resource.rb +428 -194
data/lib/puppet/resource/catalog.rb +496 -512
data/lib/puppet/resource/status.rb +58 -0
data/lib/puppet/resource/type.rb +311 -0
data/lib/puppet/resource/type_collection.rb +217 -0
data/lib/puppet/resource/type_collection_helper.rb +7 -0
data/lib/puppet/run.rb +77 -0
data/lib/puppet/simple_graph.rb +381 -413
data/lib/puppet/ssl.rb +2 -1
data/lib/puppet/ssl/base.rb +60 -43
data/lib/puppet/ssl/certificate.rb +21 -21
data/lib/puppet/ssl/certificate_authority.rb +215 -229
data/lib/puppet/ssl/certificate_authority/interface.rb +84 -68
data/lib/puppet/ssl/certificate_factory.rb +119 -119
data/lib/puppet/ssl/certificate_request.rb +52 -45
data/lib/puppet/ssl/certificate_revocation_list.rb +78 -78
data/lib/puppet/ssl/host.rb +230 -228
data/lib/puppet/ssl/inventory.rb +33 -33
data/lib/puppet/ssl/key.rb +37 -37
data/lib/puppet/sslcertificates.rb +124 -123
data/lib/puppet/sslcertificates/ca.rb +327 -344
data/lib/puppet/sslcertificates/certificate.rb +197 -224
data/lib/puppet/sslcertificates/inventory.rb +27 -29
data/lib/puppet/sslcertificates/support.rb +113 -119
data/lib/puppet/status.rb +28 -0
data/lib/puppet/transaction.rb +349 -696
data/lib/puppet/transaction/change.rb +80 -85
data/lib/puppet/transaction/event.rb +54 -14
data/lib/puppet/transaction/event_manager.rb +99 -0
data/lib/puppet/transaction/report.rb +121 -59
data/lib/puppet/transaction/resource_harness.rb +150 -0
data/lib/puppet/transportable.rb +215 -226
data/lib/puppet/type.rb +1644 -1849
data/lib/puppet/type/augeas.rb +153 -134
data/lib/puppet/type/component.rb +63 -65
data/lib/puppet/type/computer.rb +44 -44
data/lib/puppet/type/cron.rb +364 -384
data/lib/puppet/type/exec.rb +583 -521
data/lib/puppet/type/file.rb +786 -823
data/lib/puppet/type/file/checksum.rb +23 -240
data/lib/puppet/type/file/content.rb +193 -129
data/lib/puppet/type/file/ensure.rb +149 -153
data/lib/puppet/type/file/group.rb +94 -104
data/lib/puppet/type/file/mode.rb +109 -122
data/lib/puppet/type/file/owner.rb +39 -131
data/lib/puppet/type/file/selcontext.rb +69 -73
data/lib/puppet/type/file/source.rb +165 -153
data/lib/puppet/type/file/target.rb +56 -60
data/lib/puppet/type/file/type.rb +18 -18
data/lib/puppet/type/filebucket.rb +91 -92
data/lib/puppet/type/group.rb +77 -82
data/lib/puppet/type/host.rb +85 -85
data/lib/puppet/type/k5login.rb +65 -65
data/lib/puppet/type/macauthorization.rb +141 -143
data/lib/puppet/type/mailalias.rb +37 -37
data/lib/puppet/type/maillist.rb +51 -51
data/lib/puppet/type/mcx.rb +62 -62
data/lib/puppet/type/mount.rb +199 -193
data/lib/puppet/type/notify.rb +33 -33
data/lib/puppet/type/package.rb +301 -298
data/lib/puppet/type/port.rb +4 -4
data/lib/puppet/type/resources.rb +107 -123
data/lib/puppet/type/schedule.rb +317 -326
data/lib/puppet/type/selboolean.rb +19 -19
data/lib/puppet/type/selmodule.rb +34 -34
data/lib/puppet/type/service.rb +152 -152
data/lib/puppet/type/ssh_authorized_key.rb +74 -78
data/lib/puppet/type/sshkey.rb +52 -56
data/lib/puppet/type/stage.rb +18 -0
data/lib/puppet/type/tidy.rb +289 -300
data/lib/puppet/type/user.rb +300 -312
data/lib/puppet/type/yumrepo.rb +300 -335
data/lib/puppet/type/zfs.rb +36 -36
data/lib/puppet/type/zone.rb +376 -347
data/lib/puppet/type/zpool.rb +71 -77
data/lib/puppet/util.rb +383 -387
data/lib/puppet/util/autoload.rb +125 -143
data/lib/puppet/util/autoload/file_cache.rb +78 -101
data/lib/puppet/util/backups.rb +66 -66
data/lib/puppet/util/cacher.rb +112 -120
data/lib/puppet/util/checksums.rb +119 -84
data/lib/puppet/util/classgen.rb +157 -167
data/lib/puppet/util/command_line.rb +95 -0
data/lib/puppet/util/command_line/filebucket +97 -0
data/lib/puppet/util/command_line/pi +48 -0
data/lib/puppet/util/command_line/puppet +69 -0
data/lib/puppet/util/command_line/puppetca +110 -0
data/lib/puppet/util/command_line/puppetd +186 -0
data/lib/puppet/util/command_line/puppetdoc +67 -0
data/lib/puppet/util/command_line/puppetmasterd +65 -0
data/lib/puppet/util/command_line/puppetqd +53 -0
data/lib/puppet/util/command_line/puppetrun +128 -0
data/lib/puppet/util/command_line/ralsh +89 -0
data/lib/puppet/util/constant_inflector.rb +7 -7
data/lib/puppet/util/diff.rb +59 -56
data/lib/puppet/util/docs.rb +97 -99
data/lib/puppet/util/errors.rb +53 -44
data/lib/puppet/util/execution.rb +15 -15
data/lib/puppet/util/feature.rb +62 -72
data/lib/puppet/util/file_locking.rb +33 -33
data/lib/puppet/util/fileparsing.rb +292 -318
data/lib/puppet/util/filetype.rb +246 -263
data/lib/puppet/util/graph.rb +16 -18
data/lib/puppet/util/inifile.rb +170 -184
data/lib/puppet/util/inline_docs.rb +26 -0
data/lib/puppet/util/instance_loader.rb +58 -58
data/lib/puppet/util/ldap/connection.rb +57 -59
data/lib/puppet/util/ldap/generator.rb +31 -31
data/lib/puppet/util/ldap/manager.rb +233 -235
data/lib/puppet/util/loadedfile.rb +49 -51
data/lib/puppet/util/log.rb +210 -494
data/lib/puppet/util/log/destination.rb +49 -0
data/lib/puppet/util/log/destinations.rb +217 -0
data/lib/puppet/util/log_paths.rb +15 -17
data/lib/puppet/util/logging.rb +34 -13
data/lib/puppet/util/metaid.rb +15 -15
data/lib/puppet/util/methodhelper.rb +24 -26
data/lib/puppet/util/metric.rb +123 -125
data/lib/puppet/util/monkey_patches.rb +21 -20
data/lib/puppet/util/nagios_maker.rb +41 -41
data/lib/puppet/util/package.rb +24 -26
data/lib/puppet/util/pidlock.rb +49 -49
data/lib/puppet/util/posix.rb +115 -115
data/lib/puppet/util/provider_features.rb +147 -155
data/lib/puppet/util/pson.rb +5 -5
data/lib/puppet/util/queue.rb +55 -55
data/lib/puppet/util/queue/stomp.rb +27 -27
data/lib/puppet/util/rails/cache_accumulator.rb +49 -49
data/lib/puppet/util/rails/collection_merger.rb +13 -13
data/lib/puppet/util/rails/reference_serializer.rb +26 -26
data/lib/puppet/util/rdoc.rb +77 -74
data/lib/puppet/util/rdoc/code_objects.rb +235 -217
data/lib/puppet/util/rdoc/generators/puppet_generator.rb +732 -676
data/lib/puppet/util/rdoc/generators/template/puppet/puppet.rb +38 -12
data/lib/puppet/util/rdoc/parser.rb +418 -392
data/lib/puppet/util/reference.rb +168 -174
data/lib/puppet/util/resource_template.rb +17 -17
data/lib/puppet/util/run_mode.rb +81 -0
data/lib/puppet/util/selinux.rb +184 -200
data/lib/puppet/util/settings.rb +886 -919
data/lib/puppet/util/settings/boolean_setting.rb +20 -23
data/lib/puppet/util/settings/file_setting.rb +98 -99
data/lib/puppet/util/settings/setting.rb +71 -87
data/lib/puppet/util/storage.rb +73 -84
data/lib/puppet/util/subclass_loader.rb +59 -66
data/lib/puppet/util/suidmanager.rb +87 -84
data/lib/puppet/util/tagging.rb +37 -39
data/lib/puppet/util/user_attr.rb +14 -14
data/lib/puppet/util/warnings.rb +20 -20
data/lib/puppet/util/zaml.rb +242 -241
data/man/man5/puppet.conf.5 +148 -76
data/man/man8/filebucket.8 +6 -6
data/man/man8/pi.8 +5 -5
data/man/man8/puppet.8 +2 -73
data/man/man8/puppetca.8 +47 -32
data/man/man8/puppetd.8 +118 -76
data/man/man8/puppetdoc.8 +16 -12
data/man/man8/puppetmasterd.8 +4 -4
data/man/man8/puppetqd.8 +4 -4
data/man/man8/puppetrun.8 +23 -22
data/man/man8/ralsh.8 +16 -17
data/spec/fixtures/yaml/test.local.yaml +16 -0
data/spec/integration/application/apply_spec.rb +33 -0
data/spec/integration/configurer_spec.rb +35 -0
data/spec/integration/defaults_spec.rb +258 -0
data/spec/integration/file_serving/content_spec.rb +20 -0
data/spec/integration/file_serving/fileset_spec.rb +14 -0
data/spec/integration/file_serving/metadata_spec.rb +21 -0
data/spec/integration/file_serving/terminus_helper_spec.rb +22 -0
data/spec/integration/indirector/bucket_file/rest_spec.rb +68 -0
data/spec/integration/indirector/catalog/compiler_spec.rb +68 -0
data/spec/integration/indirector/catalog/queue_spec.rb +61 -0
data/spec/integration/indirector/certificate/rest_spec.rb +68 -0
data/spec/integration/indirector/certificate_request/rest_spec.rb +88 -0
data/spec/integration/indirector/certificate_revocation_list/rest_spec.rb +76 -0
data/spec/integration/indirector/direct_file_server_spec.rb +73 -0
data/spec/integration/indirector/file_content/file_server_spec.rb +94 -0
data/spec/integration/indirector/file_metadata/file_server_spec.rb +18 -0
data/spec/integration/indirector/node/ldap_spec.rb +15 -0
data/spec/integration/indirector/report/rest_spec.rb +96 -0
data/spec/integration/indirector/rest_spec.rb +524 -0
data/spec/integration/network/client_spec.rb +19 -0
data/spec/integration/network/formats_spec.rb +110 -0
data/spec/integration/network/handler_spec.rb +25 -0
data/spec/integration/network/server/mongrel_spec.rb +66 -0
data/spec/integration/network/server/webrick_spec.rb +85 -0
data/spec/integration/node/environment_spec.rb +58 -0
data/spec/integration/node/facts_spec.rb +47 -0
data/spec/integration/node_spec.rb +93 -0
data/spec/integration/parser/collector_spec.rb +38 -0
data/spec/integration/parser/compiler_spec.rb +29 -0
data/spec/integration/parser/functions/require_spec.rb +44 -0
data/spec/integration/parser/parser_spec.rb +113 -0
data/spec/integration/provider/mailalias/aliases_spec.rb +25 -0
data/spec/integration/provider/package_spec.rb +26 -0
data/spec/integration/provider/service/init_spec.rb +32 -0
data/spec/integration/reference/providers_spec.rb +17 -0
data/spec/integration/reports_spec.rb +18 -0
data/spec/integration/resource/catalog_spec.rb +61 -0
data/spec/integration/resource/type_collection_spec.rb +96 -0
data/spec/integration/ssl/certificate_authority_spec.rb +135 -0
data/spec/integration/ssl/certificate_request_spec.rb +61 -0
data/spec/integration/ssl/certificate_revocation_list_spec.rb +42 -0
data/spec/integration/ssl/host_spec.rb +90 -0
data/spec/integration/transaction/report_spec.rb +29 -0
data/spec/integration/transaction_spec.rb +284 -0
data/spec/integration/type/file_spec.rb +506 -0
data/spec/integration/type/package_spec.rb +25 -0
data/spec/integration/type/tidy_spec.rb +32 -0
data/spec/integration/type_spec.rb +22 -0
data/spec/integration/util/autoload_spec.rb +114 -0
data/spec/integration/util/feature_spec.rb +54 -0
data/spec/integration/util/file_locking_spec.rb +37 -0
data/spec/integration/util/rdoc/parser_spec.rb +59 -0
data/spec/integration/util/settings_spec.rb +30 -0
data/spec/lib/puppet_spec/files.rb +16 -6
data/spec/monkey_patches/add_confine_and_runnable_to_rspec_dsl.rb +27 -27
data/spec/monkey_patches/alias_should_to_must.rb +4 -4
data/spec/shared_behaviours/file_server_terminus.rb +28 -28
data/spec/shared_behaviours/file_serving.rb +53 -53
data/spec/shared_behaviours/memory_terminus.rb +22 -22
data/spec/spec.opts +1 -0
data/spec/spec_helper.rb +61 -18
data/spec/spec_specs/runnable_spec.rb +95 -0
data/spec/unit/agent/locker_spec.rb +100 -0
data/spec/unit/agent_spec.rb +281 -0
data/spec/unit/application/agent_spec.rb +588 -0
data/spec/unit/application/apply_spec.rb +387 -0
data/spec/unit/application/cert_spec.rb +194 -0
data/spec/unit/application/describe_spec.rb +84 -0
data/spec/unit/application/doc_spec.rb +368 -0
data/spec/unit/application/filebucket_spec.rb +223 -0
data/spec/unit/application/kick_spec.rb +313 -0
data/spec/unit/application/master_spec.rb +453 -0
data/spec/unit/application/queue_spec.rb +186 -0
data/spec/unit/application/resource_spec.rb +233 -0
data/spec/unit/application_spec.rb +531 -0
data/spec/unit/configurer/downloader_spec.rb +188 -0
data/spec/unit/configurer/fact_handler_spec.rb +164 -0
data/spec/unit/configurer/plugin_handler_spec.rb +112 -0
data/spec/unit/configurer_spec.rb +494 -0
data/spec/unit/daemon_spec.rb +306 -0
data/spec/unit/dsl/resource_api_spec.rb +181 -0
data/spec/unit/dsl/resource_type_api_spec.rb +46 -0
data/spec/unit/file_bucket/dipper_spec.rb +122 -0
data/spec/unit/file_bucket/file_spec.rb +230 -0
data/spec/unit/file_collection/lookup_spec.rb +46 -0
data/spec/unit/file_collection_spec.rb +53 -0
data/spec/unit/file_serving/base_spec.rb +132 -0
data/spec/unit/file_serving/configuration/parser_spec.rb +181 -0
data/spec/unit/file_serving/configuration_spec.rb +249 -0
data/spec/unit/file_serving/content_spec.rb +118 -0
data/spec/unit/file_serving/fileset_spec.rb +347 -0
data/spec/unit/file_serving/indirection_hooks_spec.rb +63 -0
data/spec/unit/file_serving/metadata_spec.rb +286 -0
data/spec/unit/file_serving/mount/file_spec.rb +196 -0
data/spec/unit/file_serving/mount/modules_spec.rb +63 -0
data/spec/unit/file_serving/mount/plugins_spec.rb +61 -0
data/spec/unit/file_serving/mount_spec.rb +32 -0
data/spec/unit/file_serving/terminus_helper_spec.rb +98 -0
data/spec/unit/indirector/active_record_spec.rb +76 -0
data/spec/unit/indirector/catalog/active_record_spec.rb +141 -0
data/spec/unit/indirector/catalog/compiler_spec.rb +275 -0
data/spec/unit/indirector/catalog/queue_spec.rb +20 -0
data/spec/unit/indirector/catalog/rest_spec.rb +11 -0
data/spec/unit/indirector/catalog/yaml_spec.rb +25 -0
data/spec/unit/indirector/certificate/ca_spec.rb +28 -0
data/spec/unit/indirector/certificate/file_spec.rb +28 -0
data/spec/unit/indirector/certificate/rest_spec.rb +58 -0
data/spec/unit/indirector/certificate_request/ca_spec.rb +19 -0
data/spec/unit/indirector/certificate_request/file_spec.rb +19 -0
data/spec/unit/indirector/certificate_request/rest_spec.rb +23 -0
data/spec/unit/indirector/certificate_revocation_list/ca_spec.rb +21 -0
data/spec/unit/indirector/certificate_revocation_list/file_spec.rb +20 -0
data/spec/unit/indirector/certificate_revocation_list/rest_spec.rb +23 -0
data/spec/unit/indirector/code_spec.rb +33 -0
data/spec/unit/indirector/direct_file_server_spec.rb +84 -0
data/spec/unit/indirector/envelope_spec.rb +47 -0
data/spec/unit/indirector/exec_spec.rb +56 -0
data/spec/unit/indirector/facts/active_record_spec.rb +104 -0
data/spec/unit/indirector/facts/couch_spec.rb +98 -0
data/spec/unit/indirector/facts/facter_spec.rb +143 -0
data/spec/unit/indirector/facts/rest_spec.rb +11 -0
data/spec/unit/indirector/facts/yaml_spec.rb +26 -0
data/spec/unit/indirector/file_bucket_file/file_spec.rb +290 -0
data/spec/unit/indirector/file_bucket_file/rest_spec.rb +11 -0
data/spec/unit/indirector/file_content/file_server_spec.rb +18 -0
data/spec/unit/indirector/file_content/file_spec.rb +18 -0
data/spec/unit/indirector/file_content/rest_spec.rb +11 -0
data/spec/unit/indirector/file_metadata/file_server_spec.rb +18 -0
data/spec/unit/indirector/file_metadata/file_spec.rb +52 -0
data/spec/unit/indirector/file_metadata/rest_spec.rb +9 -0
data/spec/unit/indirector/file_server_spec.rb +267 -0
data/spec/unit/indirector/file_spec.rb +181 -0
data/spec/unit/indirector/indirection_spec.rb +795 -0
data/spec/unit/indirector/key/ca_spec.rb +28 -0
data/spec/unit/indirector/key/file_spec.rb +104 -0
data/spec/unit/indirector/ldap_spec.rb +143 -0
data/spec/unit/indirector/memory_spec.rb +29 -0
data/spec/unit/indirector/node/active_record_spec.rb +41 -0
data/spec/unit/indirector/node/exec_spec.rb +70 -0
data/spec/unit/indirector/node/ldap_spec.rb +456 -0
data/spec/unit/indirector/node/memory_spec.rb +19 -0
data/spec/unit/indirector/node/plain_spec.rb +19 -0
data/spec/unit/indirector/node/rest_spec.rb +13 -0
data/spec/unit/indirector/node/yaml_spec.rb +25 -0
data/spec/unit/indirector/plain_spec.rb +29 -0
data/spec/unit/indirector/queue_spec.rb +123 -0
data/spec/unit/indirector/report/processor_spec.rb +81 -0
data/spec/unit/indirector/report/rest_spec.rb +28 -0
data/spec/unit/indirector/request_spec.rb +304 -0
data/spec/unit/indirector/resource/ral_spec.rb +129 -0
data/spec/unit/indirector/resource/rest_spec.rb +11 -0
data/spec/unit/indirector/resource_type/parser_spec.rb +75 -0
data/spec/unit/indirector/resource_type/rest_spec.rb +15 -0
data/spec/unit/indirector/rest_spec.rb +455 -0
data/spec/unit/indirector/run/local_spec.rb +20 -0
data/spec/unit/indirector/run/rest_spec.rb +11 -0
data/spec/unit/indirector/ssl_file_spec.rb +281 -0
data/spec/unit/indirector/status/rest_spec.rb +11 -0
data/spec/unit/indirector/terminus_spec.rb +245 -0
data/spec/unit/indirector/yaml_spec.rb +146 -0
data/spec/unit/indirector_spec.rb +157 -0
data/spec/unit/module_spec.rb +547 -0
data/spec/unit/network/authconfig_spec.rb +292 -0
data/spec/unit/network/authstore_spec.rb +370 -0
data/spec/unit/network/client_spec.rb +45 -0
data/spec/unit/network/format_handler_spec.rb +336 -0
data/spec/unit/network/format_spec.rb +198 -0
data/spec/unit/network/formats_spec.rb +337 -0
data/spec/unit/network/handler/fileserver_spec.rb +172 -0
data/spec/unit/network/http/api/v1_spec.rb +122 -0
data/spec/unit/network/http/compression_spec.rb +199 -0
data/spec/unit/network/http/handler_spec.rb +455 -0
data/spec/unit/network/http/mongrel/rest_spec.rb +249 -0
data/spec/unit/network/http/mongrel/{xmlrpc.rb → xmlrpc_spec.rb} +0 -0
data/spec/unit/network/http/mongrel_spec.rb +131 -0
data/spec/unit/network/http/rack/rest_spec.rb +249 -0
data/spec/unit/network/http/rack/xmlrpc_spec.rb +157 -0
data/spec/unit/network/http/rack_spec.rb +102 -0
data/spec/unit/network/http/webrick/rest_spec.rb +180 -0
data/spec/unit/network/http/webrick/{xmlrpc.rb → xmlrpc_spec.rb} +0 -0
data/spec/unit/network/http/webrick_spec.rb +339 -0
data/spec/unit/network/http_pool_spec.rb +206 -0
data/spec/unit/network/http_spec.rb +35 -0
data/spec/unit/network/rest_authconfig_spec.rb +148 -0
data/spec/unit/network/rest_authorization_spec.rb +43 -0
data/spec/unit/network/rights_spec.rb +519 -0
data/spec/unit/network/server_spec.rb +534 -0
data/spec/unit/network/xmlrpc/client_spec.rb +171 -0
data/spec/unit/node/environment_spec.rb +248 -0
data/spec/unit/node/facts_spec.rb +102 -0
data/spec/unit/node_spec.rb +210 -0
data/spec/unit/other/selinux_spec.rb +94 -0
data/spec/unit/other/transbucket_spec.rb +188 -0
data/spec/unit/other/transobject_spec.rb +112 -0
data/spec/unit/parameter/value_collection_spec.rb +167 -0
data/spec/unit/parameter/value_spec.rb +88 -0
data/spec/unit/parameter_spec.rb +172 -0
data/spec/unit/parser/ast/arithmetic_operator_spec.rb +73 -0
data/spec/unit/parser/ast/astarray_spec.rb +72 -0
data/spec/unit/parser/ast/asthash_spec.rb +98 -0
data/spec/unit/parser/ast/boolean_operator_spec.rb +53 -0
data/spec/unit/parser/ast/casestatement_spec.rb +161 -0
data/spec/unit/parser/ast/collection_spec.rb +63 -0
data/spec/unit/parser/ast/collexpr_spec.rb +115 -0
data/spec/unit/parser/ast/comparison_operator_spec.rb +116 -0
data/spec/unit/parser/ast/function_spec.rb +83 -0
data/spec/unit/parser/ast/ifstatement_spec.rb +76 -0
data/spec/unit/parser/ast/in_operator_spec.rb +60 -0
data/spec/unit/parser/ast/leaf_spec.rb +362 -0
data/spec/unit/parser/ast/match_operator_spec.rb +50 -0
data/spec/unit/parser/ast/minus_spec.rb +36 -0
data/spec/unit/parser/ast/nop_spec.rb +20 -0
data/spec/unit/parser/ast/not_spec.rb +30 -0
data/spec/unit/parser/ast/relationship_spec.rb +88 -0
data/spec/unit/parser/ast/resource_defaults_spec.rb +22 -0
data/spec/unit/parser/ast/resource_override_spec.rb +51 -0
data/spec/unit/parser/ast/resource_reference_spec.rb +46 -0
data/spec/unit/parser/ast/resource_spec.rb +120 -0
data/spec/unit/parser/ast/selector_spec.rb +139 -0
data/spec/unit/parser/ast/vardef_spec.rb +60 -0
data/spec/unit/parser/ast_spec.rb +111 -0
data/spec/unit/parser/collector_spec.rb +559 -0
data/spec/unit/parser/compiler_spec.rb +754 -0
data/spec/unit/parser/files_spec.rb +201 -0
data/spec/unit/parser/functions/defined_spec.rb +50 -0
data/spec/unit/parser/functions/fqdn_rand_spec.rb +62 -0
data/spec/unit/parser/functions/generate_spec.rb +41 -0
data/spec/unit/parser/functions/inline_template_spec.rb +59 -0
data/spec/unit/parser/functions/realize_spec.rb +51 -0
data/spec/unit/parser/functions/regsubst_spec.rb +192 -0
data/spec/unit/parser/functions/require_spec.rb +74 -0
data/spec/unit/parser/functions/shellquote_spec.rb +81 -0
data/spec/unit/parser/functions/split_spec.rb +49 -0
data/spec/unit/parser/functions/sprintf_spec.rb +41 -0
data/spec/unit/parser/functions/tag_spec.rb +24 -0
data/spec/unit/parser/functions/template_spec.rb +62 -0
data/spec/unit/parser/functions/versioncmp_spec.rb +29 -0
data/spec/unit/parser/functions_spec.rb +102 -0
data/spec/unit/parser/lexer_spec.rb +646 -0
data/spec/unit/parser/parser_spec.rb +412 -0
data/spec/unit/parser/relationship_spec.rb +70 -0
data/spec/unit/parser/resource_spec.rb +564 -0
data/spec/unit/parser/scope_spec.rb +629 -0
data/spec/unit/parser/templatewrapper_spec.rb +144 -0
data/spec/unit/parser/type_loader_spec.rb +201 -0
data/spec/unit/property/ensure_spec.rb +13 -0
data/spec/unit/property/keyvalue_spec.rb +168 -0
data/spec/unit/property/list_spec.rb +166 -0
data/spec/unit/property/ordered_list_spec.rb +64 -0
data/spec/unit/property_spec.rb +410 -0
data/spec/unit/provider/augeas/augeas_spec.rb +413 -0
data/spec/unit/provider/confine/exists_spec.rb +81 -0
data/spec/unit/provider/confine/false_spec.rb +53 -0
data/spec/unit/provider/confine/feature_spec.rb +60 -0
data/spec/unit/provider/confine/true_spec.rb +53 -0
data/spec/unit/provider/confine/variable_spec.rb +107 -0
data/spec/unit/provider/confine_collection_spec.rb +134 -0
data/spec/unit/provider/confine_spec.rb +78 -0
data/spec/unit/provider/confiner_spec.rb +63 -0
data/spec/unit/provider/group/groupadd_spec.rb +31 -0
data/spec/unit/provider/group/ldap_spec.rb +105 -0
data/spec/unit/provider/ldap_spec.rb +248 -0
data/spec/unit/provider/macauthorization_spec.rb +147 -0
data/spec/unit/provider/mcx/mcxcontent_spec.rb +175 -0
data/spec/unit/provider/mount/parsed_spec.rb +193 -0
data/spec/unit/provider/mount_spec.rb +130 -0
data/spec/unit/provider/naginator_spec.rb +58 -0
data/spec/unit/provider/package/aix_spec.rb +66 -0
data/spec/unit/provider/package/apt_spec.rb +145 -0
data/spec/unit/provider/package/dpkg_spec.rb +225 -0
data/spec/unit/provider/package/gem_spec.rb +87 -0
data/spec/unit/provider/package/hpux_spec.rb +52 -0
data/spec/unit/provider/package/nim_spec.rb +42 -0
data/spec/unit/provider/package/pkg_spec.rb +63 -0
data/spec/unit/provider/package/pkgdmg_spec.rb +84 -0
data/spec/unit/provider/package/zypper_spec.rb +81 -0
data/spec/unit/provider/parsedfile_spec.rb +95 -0
data/spec/unit/provider/selboolean_spec.rb +37 -0
data/spec/unit/provider/selmodule_spec.rb +66 -0
data/spec/unit/provider/service/daemontools_spec.rb +166 -0
data/spec/unit/provider/service/debian_spec.rb +89 -0
data/spec/unit/provider/service/init_spec.rb +168 -0
data/spec/unit/provider/service/launchd_spec.rb +200 -0
data/spec/unit/provider/service/redhat_spec.rb +121 -0
data/spec/unit/provider/service/runit_spec.rb +140 -0
data/spec/unit/provider/service/src_spec.rb +97 -0
data/spec/unit/provider/ssh_authorized_key/parsed_spec.rb +228 -0
data/spec/unit/provider/sshkey/parsed_spec.rb +38 -0
data/spec/unit/provider/user/hpux_spec.rb +25 -0
data/spec/unit/provider/user/ldap_spec.rb +279 -0
data/spec/unit/provider/user/user_role_add_spec.rb +249 -0
data/spec/unit/provider/user/useradd_spec.rb +115 -0
data/spec/unit/provider/zfs/solaris_spec.rb +99 -0
data/spec/unit/provider/zone/solaris_spec.rb +55 -0
data/spec/unit/provider/zpool/solaris_spec.rb +179 -0
data/spec/unit/provider_spec.rb +31 -0
data/spec/unit/puppet_spec.rb +12 -0
data/spec/unit/rails/host_spec.rb +163 -0
data/spec/unit/rails/param_value_spec.rb +49 -0
data/spec/unit/rails/resource_spec.rb +123 -0
data/spec/unit/rails_spec.rb +258 -0
data/spec/unit/relationship_spec.rb +236 -0
data/spec/unit/reports/http_spec.rb +56 -0
data/spec/unit/reports/tagmail_spec.rb +94 -0
data/spec/unit/reports_spec.rb +61 -0
data/spec/unit/resource/catalog_spec.rb +1078 -0
data/spec/unit/resource/status_spec.rb +103 -0
data/spec/unit/resource/type_collection_helper_spec.rb +25 -0
data/spec/unit/resource/type_collection_spec.rb +432 -0
data/spec/unit/resource/type_spec.rb +722 -0
data/spec/unit/resource_spec.rb +818 -0
data/spec/unit/run_spec.rb +137 -0
data/spec/unit/simple_graph_spec.rb +544 -0
data/spec/unit/ssl/base_spec.rb +43 -0
data/spec/unit/ssl/certificate_authority/interface_spec.rb +333 -0
data/spec/unit/ssl/certificate_authority_spec.rb +772 -0
data/spec/unit/ssl/certificate_factory_spec.rb +107 -0
data/spec/unit/ssl/certificate_request_spec.rb +220 -0
data/spec/unit/ssl/certificate_revocation_list_spec.rb +168 -0
data/spec/unit/ssl/certificate_spec.rb +124 -0
data/spec/unit/ssl/host_spec.rb +707 -0
data/spec/unit/ssl/inventory_spec.rb +180 -0
data/spec/unit/ssl/key_spec.rb +198 -0
data/spec/unit/status_spec.rb +31 -0
data/spec/unit/transaction/change_spec.rb +193 -0
data/spec/unit/transaction/event_manager_spec.rb +260 -0
data/spec/unit/transaction/event_spec.rb +108 -0
data/spec/unit/transaction/report_spec.rb +234 -0
data/spec/unit/transaction/resource_harness_spec.rb +401 -0
data/spec/unit/transaction_spec.rb +452 -0
data/spec/unit/transportable_spec.rb +0 -0
data/spec/unit/type/augeas_spec.rb +122 -0
data/spec/unit/type/component_spec.rb +63 -0
data/spec/unit/type/computer_spec.rb +81 -0
data/spec/unit/type/cron_spec.rb +33 -0
data/spec/unit/type/exec_spec.rb +162 -0
data/spec/unit/type/file/checksum_spec.rb +73 -0
data/spec/unit/type/file/content_spec.rb +460 -0
data/spec/unit/type/file/ensure_spec.rb +84 -0
data/spec/unit/type/file/group_spec.rb +123 -0
data/spec/unit/type/file/owner_spec.rb +150 -0
data/spec/unit/type/file/selinux_spec.rb +83 -0
data/spec/unit/type/file/source_spec.rb +272 -0
data/spec/unit/type/file_spec.rb +1070 -0
data/spec/unit/type/filebucket_spec.rb +74 -0
data/spec/unit/type/group_spec.rb +57 -0
data/spec/unit/type/macauthorization_spec.rb +111 -0
data/spec/unit/type/maillist_spec.rb +42 -0
data/spec/unit/type/mcx_spec.rb +100 -0
data/spec/unit/type/mount_spec.rb +261 -0
data/spec/unit/type/nagios_spec.rb +63 -0
data/spec/unit/type/noop_metaparam_spec.rb +37 -0
data/spec/unit/type/package_spec.rb +240 -0
data/spec/unit/type/resources_spec.rb +102 -0
data/spec/unit/type/schedule_spec.rb +333 -0
data/spec/unit/type/selboolean_spec.rb +45 -0
data/spec/unit/type/selmodule_spec.rb +18 -0
data/spec/unit/type/service_spec.rb +222 -0
data/spec/unit/type/ssh_authorized_key_spec.rb +152 -0
data/spec/unit/type/stage_spec.rb +9 -0
data/spec/unit/type/tidy_spec.rb +424 -0
data/spec/unit/type/user_spec.rb +281 -0
data/spec/unit/type/zfs_spec.rb +45 -0
data/spec/unit/type/zone_spec.rb +60 -0
data/spec/unit/type/zpool_spec.rb +110 -0
data/spec/unit/type_spec.rb +566 -0
data/spec/unit/util/autoload/file_cache_spec.rb +159 -0
data/spec/unit/util/autoload_spec.rb +120 -0
data/spec/unit/util/backups_spec.rb +159 -0
data/spec/unit/util/cache_accumulator_spec.rb +75 -0
data/spec/unit/util/cacher_spec.rb +185 -0
data/spec/unit/util/checksums_spec.rb +153 -0
data/spec/unit/util/command_line_spec.rb +108 -0
data/spec/unit/util/constant_inflector_spec.rb +70 -0
data/spec/unit/util/errors_spec.rb +38 -0
data/spec/unit/util/feature_spec.rb +72 -0
data/spec/unit/util/file_locking_spec.rb +156 -0
data/spec/unit/util/filetype_spec.rb +100 -0
data/spec/unit/util/inline_docs_spec.rb +32 -0
data/spec/unit/util/json_spec.rb +21 -0
data/spec/unit/util/ldap/connection_spec.rb +169 -0
data/spec/unit/util/ldap/generator_spec.rb +54 -0
data/spec/unit/util/ldap/manager_spec.rb +654 -0
data/spec/unit/util/loadedfile_spec.rb +65 -0
data/spec/unit/util/log/destinations_spec.rb +24 -0
data/spec/unit/util/log_spec.rb +215 -0
data/spec/unit/util/logging_spec.rb +95 -0
data/spec/unit/util/metric_spec.rb +95 -0
data/spec/unit/util/monkey_patches_spec.rb +7 -0
data/spec/unit/util/nagios_maker_spec.rb +126 -0
data/spec/unit/util/package_spec.rb +21 -0
data/spec/unit/util/posix_spec.rb +256 -0
data/spec/unit/util/queue/stomp_spec.rb +140 -0
data/spec/unit/util/queue_spec.rb +96 -0
data/spec/unit/util/rdoc/parser_spec.rb +540 -0
data/spec/unit/util/rdoc_spec.rb +165 -0
data/spec/unit/util/reference_serializer_spec.rb +52 -0
data/spec/unit/util/resource_template_spec.rb +58 -0
data/spec/unit/util/run_mode_spec.rb +51 -0
data/spec/unit/util/selinux_spec.rb +278 -0
data/spec/unit/util/settings/file_setting_spec.rb +256 -0
data/spec/unit/util/settings_spec.rb +1099 -0
data/spec/unit/util/storage_spec.rb +235 -0
data/spec/unit/util/tagging_spec.rb +102 -0
data/spec/unit/util/user_attr_spec.rb +47 -0
data/spec/unit/util/warnings_spec.rb +39 -0
data/spec/unit/util/zaml_spec.rb +38 -0
data/tasks/rake/git_workflow.rake +1 -1
data/tasks/rake/sign.rake +2 -2
data/test/certmgr/ca.rb +61 -61
data/test/certmgr/certmgr.rb +292 -283
data/test/certmgr/inventory.rb +44 -42
data/test/certmgr/support.rb +78 -77
data/test/data/providers/ssh_authorized_key/parsed/authorized_keys +1 -1
data/test/data/snippets/hash.pp +33 -0
data/test/language/ast.rb +68 -117
data/test/language/ast/variable.rb +14 -15
data/test/language/functions.rb +404 -463
data/test/language/parser.rb +670 -1135
data/test/language/scope.rb +198 -402
data/test/language/snippets.rb +439 -447
data/test/language/transportable.rb +67 -66
data/test/lib/puppettest.rb +260 -268
data/test/lib/puppettest/certificates.rb +51 -53
data/test/lib/puppettest/exetest.rb +107 -111
data/test/lib/puppettest/fakes.rb +153 -158
data/test/lib/puppettest/fileparsing.rb +17 -17
data/test/lib/puppettest/filetesting.rb +204 -213
data/test/lib/puppettest/parsertesting.rb +382 -365
data/test/lib/puppettest/railstesting.rb +49 -50
data/test/lib/puppettest/reporttesting.rb +10 -10
data/test/lib/puppettest/resourcetesting.rb +45 -36
data/test/lib/puppettest/runnable_test.rb +36 -28
data/test/lib/puppettest/servertest.rb +54 -51
data/test/lib/puppettest/support/assertions.rb +48 -55
data/test/lib/puppettest/support/helpers.rb +12 -16
data/test/lib/puppettest/support/resources.rb +23 -25
data/test/lib/puppettest/support/utils.rb +138 -148
data/test/lib/puppettest/testcase.rb +15 -17
data/test/lib/rake/puppet_test_loader.rb +1 -3
data/test/lib/rake/puppet_testtask.rb +10 -10
data/test/network/authconfig.rb +48 -50
data/test/network/authorization.rb +114 -113
data/test/network/authstore.rb +454 -406
data/test/network/client/ca.rb +46 -48
data/test/network/client/dipper.rb +22 -22
data/test/network/client_request.rb +20 -20
data/test/network/handler/ca.rb +251 -252
data/test/network/handler/fileserver.rb +1071 -1001
data/test/network/handler/master.rb +58 -58
data/test/network/handler/report.rb +64 -64
data/test/network/handler/runner.rb +8 -8
data/test/network/rights.rb +22 -19
data/test/network/server/mongrel_test.rb +87 -87
data/test/network/server/webrick.rb +99 -87
data/test/network/xmlrpc/client.rb +30 -30
data/test/network/xmlrpc/processor.rb +52 -53
data/test/network/xmlrpc/server.rb +10 -11
data/test/network/xmlrpc/webrick_servlet.rb +21 -18
data/test/other/provider.rb +69 -84
data/test/other/puppet.rb +61 -76
data/test/other/relationships.rb +73 -65
data/test/other/report.rb +88 -187
data/test/other/transactions.rb +363 -885
data/test/puppet/defaults.rb +51 -54
data/test/puppet/errortest.rb +8 -8
data/test/puppet/tc_suidmanager.rb +106 -103
data/test/rails/rails.rb +8 -9
data/test/rails/railsparameter.rb +60 -54
data/test/ral/manager/attributes.rb +262 -260
data/test/ral/manager/instances.rb +77 -78
data/test/ral/manager/manager.rb +36 -36
data/test/ral/manager/provider.rb +56 -79
data/test/ral/manager/type.rb +308 -449
data/test/ral/providers/cron/crontab.rb +561 -545
data/test/ral/providers/group.rb +203 -212
data/test/ral/providers/host/parsed.rb +189 -180
data/test/ral/providers/mailalias/aliases.rb +40 -40
data/test/ral/providers/nameservice.rb +21 -21
data/test/ral/providers/package.rb +207 -214
data/test/ral/providers/package/aptitude.rb +75 -63
data/test/ral/providers/package/aptrpm.rb +84 -72
data/test/ral/providers/parsedfile.rb +510 -509
data/test/ral/providers/port/parsed.rb +5 -5
data/test/ral/providers/provider.rb +421 -421
data/test/ral/providers/service/base.rb +59 -53
data/test/ral/providers/sshkey/parsed.rb +86 -83
data/test/ral/providers/user.rb +471 -451
data/test/ral/providers/user/useradd.rb +168 -177
data/test/ral/type/cron.rb +406 -393
data/test/ral/type/exec.rb +721 -641
data/test/ral/type/file.rb +827 -896
data/test/ral/type/file/target.rb +295 -251
data/test/ral/type/fileignoresource.rb +232 -205
data/test/ral/type/filesources.rb +446 -485
data/test/ral/type/host.rb +124 -153
data/test/ral/type/mailalias.rb +28 -31
data/test/ral/type/port.rb +7 -7
data/test/ral/type/resources.rb +88 -93
data/test/ral/type/service.rb +19 -19
data/test/ral/type/sshkey.rb +120 -160
data/test/ral/type/user.rb +132 -414
data/test/ral/type/yumrepo.rb +95 -92
data/test/ral/type/zone.rb +316 -287
data/test/test +1 -1
data/test/util/classgen.rb +182 -167
data/test/util/execution.rb +18 -18
data/test/util/fileparsing.rb +580 -540
data/test/util/inifile.rb +117 -106
data/test/util/instance_loader.rb +29 -29
data/test/util/log.rb +202 -198
data/test/util/metrics.rb +51 -51
data/test/util/package.rb +11 -12
data/test/util/pidlock.rb +115 -115
data/test/util/settings.rb +613 -557
data/test/util/storage.rb +71 -88
data/test/util/subclass_loader.rb +69 -72
data/test/util/utiltest.rb +204 -203
metadata +493 -395
data/lib/puppet/agent/runner.rb +0 -65
data/lib/puppet/application/pi.rb +0 -214
data/lib/puppet/application/puppet.rb +0 -181
data/lib/puppet/application/puppetca.rb +0 -71
data/lib/puppet/application/puppetd.rb +0 -250
data/lib/puppet/application/puppetdoc.rb +0 -224
data/lib/puppet/application/puppetmasterd.rb +0 -168
data/lib/puppet/application/puppetqd.rb +0 -96
data/lib/puppet/application/puppetrun.rb +0 -210
data/lib/puppet/application/ralsh.rb +0 -152
data/lib/puppet/checksum.rb +0 -57
data/lib/puppet/indirector/checksum/file.rb +0 -33
data/lib/puppet/indirector/runner/rest.rb +0 -7
data/lib/puppet/network/client/dipper.rb +0 -85
data/lib/puppet/network/client/resource.rb +0 -38
data/lib/puppet/network/handler/resource.rb +0 -190
data/lib/puppet/parser/ast/definition.rb +0 -207
data/lib/puppet/parser/ast/hostclass.rb +0 -95
data/lib/puppet/parser/ast/node.rb +0 -42
data/lib/puppet/parser/interpreter.rb +0 -84
data/lib/puppet/parser/loaded_code.rb +0 -119
data/lib/puppet/parser/resource/reference.rb +0 -99
data/lib/puppet/resource/reference.rb +0 -90
data/lib/puppet/util/config_store.rb +0 -61
data/spec/integration/application/puppet.rb +0 -33
data/spec/integration/bin/puppetmasterd.rb +0 -122
data/spec/integration/checksum.rb +0 -48
data/spec/integration/configurer.rb +0 -18
data/spec/integration/defaults.rb +0 -230
data/spec/integration/file_serving/content.rb +0 -20
data/spec/integration/file_serving/fileset.rb +0 -14
data/spec/integration/file_serving/metadata.rb +0 -21
data/spec/integration/file_serving/terminus_helper.rb +0 -22
data/spec/integration/indirector/catalog/compiler.rb +0 -67
data/spec/integration/indirector/catalog/queue.rb +0 -61
data/spec/integration/indirector/certificate/rest.rb +0 -70
data/spec/integration/indirector/certificate_request/rest.rb +0 -88
data/spec/integration/indirector/certificate_revocation_list/rest.rb +0 -76
data/spec/integration/indirector/direct_file_server.rb +0 -73
data/spec/integration/indirector/file_content/file_server.rb +0 -94
data/spec/integration/indirector/file_metadata/file_server.rb +0 -18
data/spec/integration/indirector/node/ldap.rb +0 -15
data/spec/integration/indirector/report/rest.rb +0 -94
data/spec/integration/indirector/rest.rb +0 -523
data/spec/integration/network/client.rb +0 -19
data/spec/integration/network/formats.rb +0 -110
data/spec/integration/network/handler.rb +0 -25
data/spec/integration/network/server/mongrel.rb +0 -66
data/spec/integration/network/server/webrick.rb +0 -86
data/spec/integration/node.rb +0 -93
data/spec/integration/node/environment.rb +0 -58
data/spec/integration/node/facts.rb +0 -47
data/spec/integration/parser/compiler.rb +0 -29
data/spec/integration/parser/functions/require.rb +0 -86
data/spec/integration/provider/mailalias/aliases.rb +0 -25
data/spec/integration/provider/package.rb +0 -26
data/spec/integration/provider/service/init.rb +0 -32
data/spec/integration/reference/providers.rb +0 -17
data/spec/integration/reports.rb +0 -18
data/spec/integration/resource/catalog.rb +0 -61
data/spec/integration/ssl/certificate_authority.rb +0 -135
data/spec/integration/ssl/certificate_request.rb +0 -61
data/spec/integration/ssl/certificate_revocation_list.rb +0 -42
data/spec/integration/ssl/host.rb +0 -90
data/spec/integration/transaction.rb +0 -66
data/spec/integration/transaction/report.rb +0 -29
data/spec/integration/type.rb +0 -22
data/spec/integration/type/file.rb +0 -477
data/spec/integration/type/package.rb +0 -25
data/spec/integration/type/tidy.rb +0 -27
data/spec/integration/util/autoload.rb +0 -114
data/spec/integration/util/feature.rb +0 -54
data/spec/integration/util/file_locking.rb +0 -37
data/spec/integration/util/settings.rb +0 -27
data/spec/unit/agent.rb +0 -259
data/spec/unit/agent/locker.rb +0 -100
data/spec/unit/agent/runner.rb +0 -118
data/spec/unit/application.rb +0 -420
data/spec/unit/application/filebucket.rb +0 -220
data/spec/unit/application/pi.rb +0 -84
data/spec/unit/application/puppet.rb +0 -399
data/spec/unit/application/puppetca.rb +0 -142
data/spec/unit/application/puppetd.rb +0 -502
data/spec/unit/application/puppetdoc.rb +0 -360
data/spec/unit/application/puppetmasterd.rb +0 -457
data/spec/unit/application/puppetqd.rb +0 -186
data/spec/unit/application/puppetrun.rb +0 -289
data/spec/unit/application/ralsh.rb +0 -254
data/spec/unit/configurer.rb +0 -339
data/spec/unit/configurer/downloader.rb +0 -188
data/spec/unit/configurer/fact_handler.rb +0 -164
data/spec/unit/configurer/plugin_handler.rb +0 -112
data/spec/unit/daemon.rb +0 -287
data/spec/unit/file_collection.rb +0 -53
data/spec/unit/file_collection/lookup.rb +0 -46
data/spec/unit/file_serving/base.rb +0 -132
data/spec/unit/file_serving/configuration.rb +0 -249
data/spec/unit/file_serving/configuration/parser.rb +0 -181
data/spec/unit/file_serving/content.rb +0 -110
data/spec/unit/file_serving/fileset.rb +0 -347
data/spec/unit/file_serving/indirection_hooks.rb +0 -63
data/spec/unit/file_serving/metadata.rb +0 -286
data/spec/unit/file_serving/mount.rb +0 -32
data/spec/unit/file_serving/mount/file.rb +0 -196
data/spec/unit/file_serving/mount/modules.rb +0 -63
data/spec/unit/file_serving/mount/plugins.rb +0 -61
data/spec/unit/file_serving/terminus_helper.rb +0 -98
data/spec/unit/indirector.rb +0 -157
data/spec/unit/indirector/active_record.rb +0 -76
data/spec/unit/indirector/catalog/active_record.rb +0 -141
data/spec/unit/indirector/catalog/compiler.rb +0 -261
data/spec/unit/indirector/catalog/queue.rb +0 -20
data/spec/unit/indirector/catalog/rest.rb +0 -11
data/spec/unit/indirector/catalog/yaml.rb +0 -25
data/spec/unit/indirector/certificate/ca.rb +0 -28
data/spec/unit/indirector/certificate/file.rb +0 -28
data/spec/unit/indirector/certificate/rest.rb +0 -57
data/spec/unit/indirector/certificate_request/ca.rb +0 -19
data/spec/unit/indirector/certificate_request/file.rb +0 -19
data/spec/unit/indirector/certificate_request/rest.rb +0 -23
data/spec/unit/indirector/certificate_revocation_list/ca.rb +0 -21
data/spec/unit/indirector/certificate_revocation_list/file.rb +0 -20
data/spec/unit/indirector/certificate_revocation_list/rest.rb +0 -23
data/spec/unit/indirector/checksum/file.rb +0 -139
data/spec/unit/indirector/code.rb +0 -33
data/spec/unit/indirector/direct_file_server.rb +0 -84
data/spec/unit/indirector/envelope.rb +0 -47
data/spec/unit/indirector/exec.rb +0 -56
data/spec/unit/indirector/facts/active_record.rb +0 -104
data/spec/unit/indirector/facts/facter.rb +0 -142
data/spec/unit/indirector/facts/rest.rb +0 -11
data/spec/unit/indirector/facts/yaml.rb +0 -26
data/spec/unit/indirector/file.rb +0 -161
data/spec/unit/indirector/file_content/file.rb +0 -18
data/spec/unit/indirector/file_content/file_server.rb +0 -18
data/spec/unit/indirector/file_content/rest.rb +0 -11
data/spec/unit/indirector/file_metadata/file.rb +0 -52
data/spec/unit/indirector/file_metadata/file_server.rb +0 -18
data/spec/unit/indirector/file_metadata/rest.rb +0 -9
data/spec/unit/indirector/file_server.rb +0 -267
data/spec/unit/indirector/indirection.rb +0 -795
data/spec/unit/indirector/key/ca.rb +0 -28
data/spec/unit/indirector/key/file.rb +0 -104
data/spec/unit/indirector/ldap.rb +0 -143
data/spec/unit/indirector/memory.rb +0 -29
data/spec/unit/indirector/node/active_record.rb +0 -34
data/spec/unit/indirector/node/exec.rb +0 -69
data/spec/unit/indirector/node/ldap.rb +0 -458
data/spec/unit/indirector/node/memory.rb +0 -19
data/spec/unit/indirector/node/plain.rb +0 -19
data/spec/unit/indirector/node/rest.rb +0 -13
data/spec/unit/indirector/node/yaml.rb +0 -25
data/spec/unit/indirector/plain.rb +0 -29
data/spec/unit/indirector/queue.rb +0 -123
data/spec/unit/indirector/report/processor.rb +0 -81
data/spec/unit/indirector/report/rest.rb +0 -28
data/spec/unit/indirector/request.rb +0 -308
data/spec/unit/indirector/rest.rb +0 -403
data/spec/unit/indirector/runner/rest.rb +0 -11
data/spec/unit/indirector/ssl_file.rb +0 -280
data/spec/unit/indirector/terminus.rb +0 -245
data/spec/unit/indirector/yaml.rb +0 -145
data/spec/unit/module.rb +0 -247
data/spec/unit/network/authconfig.rb +0 -292
data/spec/unit/network/authstore.rb +0 -370
data/spec/unit/network/client.rb +0 -45
data/spec/unit/network/client/dipper.rb +0 -16
data/spec/unit/network/format.rb +0 -191
data/spec/unit/network/format_handler.rb +0 -327
data/spec/unit/network/formats.rb +0 -365
data/spec/unit/network/handler/fileserver.rb +0 -176
data/spec/unit/network/http.rb +0 -35
data/spec/unit/network/http/api/v1.rb +0 -122
data/spec/unit/network/http/handler.rb +0 -458
data/spec/unit/network/http/mongrel.rb +0 -131
data/spec/unit/network/http/mongrel/rest.rb +0 -232
data/spec/unit/network/http/rack.rb +0 -102
data/spec/unit/network/http/rack/rest.rb +0 -199
data/spec/unit/network/http/rack/xmlrpc.rb +0 -157
data/spec/unit/network/http/webrick.rb +0 -339
data/spec/unit/network/http/webrick/rest.rb +0 -157
data/spec/unit/network/http_pool.rb +0 -206
data/spec/unit/network/rest_authconfig.rb +0 -146
data/spec/unit/network/rest_authorization.rb +0 -43
data/spec/unit/network/rights.rb +0 -519
data/spec/unit/network/server.rb +0 -534
data/spec/unit/network/xmlrpc/client.rb +0 -171
data/spec/unit/node.rb +0 -200
data/spec/unit/node/environment.rb +0 -187
data/spec/unit/node/facts.rb +0 -97
data/spec/unit/other/checksum.rb +0 -92
data/spec/unit/other/selinux.rb +0 -85
data/spec/unit/other/transbucket.rb +0 -188
data/spec/unit/other/transobject.rb +0 -112
data/spec/unit/parameter.rb +0 -405
data/spec/unit/parser/ast.rb +0 -41
data/spec/unit/parser/ast/arithmetic_operator.rb +0 -73
data/spec/unit/parser/ast/astarray.rb +0 -72
data/spec/unit/parser/ast/boolean_operator.rb +0 -53
data/spec/unit/parser/ast/casestatement.rb +0 -135
data/spec/unit/parser/ast/collection.rb +0 -63
data/spec/unit/parser/ast/collexpr.rb +0 -115
data/spec/unit/parser/ast/comparison_operator.rb +0 -92
data/spec/unit/parser/ast/definition.rb +0 -213
data/spec/unit/parser/ast/function.rb +0 -83
data/spec/unit/parser/ast/hostclass.rb +0 -148
data/spec/unit/parser/ast/ifstatement.rb +0 -76
data/spec/unit/parser/ast/leaf.rb +0 -298
data/spec/unit/parser/ast/match_operator.rb +0 -50
data/spec/unit/parser/ast/minus.rb +0 -36
data/spec/unit/parser/ast/node.rb +0 -145
data/spec/unit/parser/ast/nop.rb +0 -20
data/spec/unit/parser/ast/not.rb +0 -30
data/spec/unit/parser/ast/resource.rb +0 -103
data/spec/unit/parser/ast/resource_override.rb +0 -51
data/spec/unit/parser/ast/resource_reference.rb +0 -69
data/spec/unit/parser/ast/selector.rb +0 -155
data/spec/unit/parser/ast/vardef.rb +0 -47
data/spec/unit/parser/collector.rb +0 -556
data/spec/unit/parser/compiler.rb +0 -604
data/spec/unit/parser/files.rb +0 -190
data/spec/unit/parser/functions.rb +0 -83
data/spec/unit/parser/functions/fqdn_rand.rb +0 -62
data/spec/unit/parser/functions/generate.rb +0 -41
data/spec/unit/parser/functions/inline_template.rb +0 -59
data/spec/unit/parser/functions/realize.rb +0 -51
data/spec/unit/parser/functions/regsubst.rb +0 -168
data/spec/unit/parser/functions/require.rb +0 -69
data/spec/unit/parser/functions/shellquote.rb +0 -92
data/spec/unit/parser/functions/split.rb +0 -51
data/spec/unit/parser/functions/sprintf.rb +0 -42
data/spec/unit/parser/functions/template.rb +0 -62
data/spec/unit/parser/functions/versioncmp.rb +0 -29
data/spec/unit/parser/interpreter.rb +0 -147
data/spec/unit/parser/lexer.rb +0 -731
data/spec/unit/parser/loaded_code.rb +0 -215
data/spec/unit/parser/parser.rb +0 -423
data/spec/unit/parser/resource.rb +0 -529
data/spec/unit/parser/resource/reference.rb +0 -111
data/spec/unit/parser/scope.rb +0 -387
data/spec/unit/parser/templatewrapper.rb +0 -134
data/spec/unit/property.rb +0 -305
data/spec/unit/property/keyvalue.rb +0 -168
data/spec/unit/property/list.rb +0 -166
data/spec/unit/property/ordered_list.rb +0 -64
data/spec/unit/provider.rb +0 -31
data/spec/unit/provider/augeas/augeas.rb +0 -413
data/spec/unit/provider/confine.rb +0 -78
data/spec/unit/provider/confine/exists.rb +0 -81
data/spec/unit/provider/confine/false.rb +0 -53
data/spec/unit/provider/confine/feature.rb +0 -60
data/spec/unit/provider/confine/true.rb +0 -53
data/spec/unit/provider/confine/variable.rb +0 -107
data/spec/unit/provider/confine_collection.rb +0 -134
data/spec/unit/provider/confiner.rb +0 -63
data/spec/unit/provider/group/groupadd.rb +0 -31
data/spec/unit/provider/group/ldap.rb +0 -105
data/spec/unit/provider/ldap.rb +0 -248
data/spec/unit/provider/macauthorization.rb +0 -147
data/spec/unit/provider/mcx/mcxcontent.rb +0 -175
data/spec/unit/provider/mount.rb +0 -130
data/spec/unit/provider/mount/parsed.rb +0 -194
data/spec/unit/provider/naginator.rb +0 -58
data/spec/unit/provider/package/apt.rb +0 -138
data/spec/unit/provider/package/dpkg.rb +0 -170
data/spec/unit/provider/package/gem.rb +0 -87
data/spec/unit/provider/package/hpux.rb +0 -52
data/spec/unit/provider/package/pkgdmg.rb +0 -73
data/spec/unit/provider/parsedfile.rb +0 -95
data/spec/unit/provider/selboolean.rb +0 -37
data/spec/unit/provider/selmodule.rb +0 -66
data/spec/unit/provider/service/daemontools.rb +0 -166
data/spec/unit/provider/service/debian.rb +0 -89
data/spec/unit/provider/service/init.rb +0 -121
data/spec/unit/provider/service/launchd.rb +0 -200
data/spec/unit/provider/service/redhat.rb +0 -96
data/spec/unit/provider/service/runit.rb +0 -140
data/spec/unit/provider/ssh_authorized_key/parsed.rb +0 -206
data/spec/unit/provider/sshkey/parsed.rb +0 -38
data/spec/unit/provider/user/hpux.rb +0 -25
data/spec/unit/provider/user/ldap.rb +0 -279
data/spec/unit/provider/user/user_role_add.rb +0 -249
data/spec/unit/provider/user/useradd.rb +0 -115
data/spec/unit/provider/zfs/solaris.rb +0 -99
data/spec/unit/provider/zone/solaris.rb +0 -42
data/spec/unit/provider/zpool/solaris.rb +0 -179
data/spec/unit/rails.rb +0 -133
data/spec/unit/rails/host.rb +0 -163
data/spec/unit/rails/param_value.rb +0 -49
data/spec/unit/rails/resource.rb +0 -107
data/spec/unit/relationship.rb +0 -236
data/spec/unit/reports.rb +0 -61
data/spec/unit/resource.rb +0 -495
data/spec/unit/resource/catalog.rb +0 -1053
data/spec/unit/resource/reference.rb +0 -111
data/spec/unit/simple_graph.rb +0 -551
data/spec/unit/ssl/certificate.rb +0 -124
data/spec/unit/ssl/certificate_authority.rb +0 -741
data/spec/unit/ssl/certificate_authority/interface.rb +0 -269
data/spec/unit/ssl/certificate_factory.rb +0 -107
data/spec/unit/ssl/certificate_request.rb +0 -193
data/spec/unit/ssl/certificate_revocation_list.rb +0 -168
data/spec/unit/ssl/host.rb +0 -704
data/spec/unit/ssl/inventory.rb +0 -180
data/spec/unit/ssl/key.rb +0 -198
data/spec/unit/transaction.rb +0 -146
data/spec/unit/transaction/change.rb +0 -187
data/spec/unit/transaction/event.rb +0 -25
data/spec/unit/transaction/report.rb +0 -40
data/spec/unit/type.rb +0 -426
data/spec/unit/type/augeas.rb +0 -106
data/spec/unit/type/component.rb +0 -63
data/spec/unit/type/computer.rb +0 -78
data/spec/unit/type/cron.rb +0 -33
data/spec/unit/type/exec.rb +0 -116
data/spec/unit/type/file.rb +0 -810
data/spec/unit/type/file/checksum.rb +0 -28
data/spec/unit/type/file/content.rb +0 -297
data/spec/unit/type/file/ensure.rb +0 -84
data/spec/unit/type/file/group.rb +0 -123
data/spec/unit/type/file/owner.rb +0 -143
data/spec/unit/type/file/selinux.rb +0 -84
data/spec/unit/type/file/source.rb +0 -264
data/spec/unit/type/filebucket.rb +0 -74
data/spec/unit/type/group.rb +0 -39
data/spec/unit/type/macauthorization.rb +0 -111
data/spec/unit/type/maillist.rb +0 -42
data/spec/unit/type/mcx.rb +0 -100
data/spec/unit/type/mount.rb +0 -211
data/spec/unit/type/nagios.rb +0 -63
data/spec/unit/type/noop_metaparam.rb +0 -37
data/spec/unit/type/package.rb +0 -236
data/spec/unit/type/resources.rb +0 -89
data/spec/unit/type/schedule.rb +0 -333
data/spec/unit/type/selboolean.rb +0 -45
data/spec/unit/type/selmodule.rb +0 -18
data/spec/unit/type/service.rb +0 -230
data/spec/unit/type/ssh_authorized_key.rb +0 -140
data/spec/unit/type/tidy.rb +0 -422
data/spec/unit/type/user.rb +0 -285
data/spec/unit/type/zfs.rb +0 -45
data/spec/unit/type/zone.rb +0 -20
data/spec/unit/type/zpool.rb +0 -110
data/spec/unit/util/autoload.rb +0 -133
data/spec/unit/util/autoload/file_cache.rb +0 -183
data/spec/unit/util/backups.rb +0 -159
data/spec/unit/util/cache_accumulator.rb +0 -69
data/spec/unit/util/cacher.rb +0 -185
data/spec/unit/util/checksums.rb +0 -113
data/spec/unit/util/constant_inflector.rb +0 -70
data/spec/unit/util/feature.rb +0 -72
data/spec/unit/util/file_locking.rb +0 -115
data/spec/unit/util/filetype.rb +0 -100
data/spec/unit/util/json.rb +0 -21
data/spec/unit/util/ldap/connection.rb +0 -169
data/spec/unit/util/ldap/generator.rb +0 -54
data/spec/unit/util/ldap/manager.rb +0 -654
data/spec/unit/util/loadedfile.rb +0 -65
data/spec/unit/util/log.rb +0 -202
data/spec/unit/util/metric.rb +0 -95
data/spec/unit/util/monkey_patches.rb +0 -103
data/spec/unit/util/nagios_maker.rb +0 -126
data/spec/unit/util/package.rb +0 -21
data/spec/unit/util/posix.rb +0 -256
data/spec/unit/util/queue.rb +0 -96
data/spec/unit/util/queue/stomp.rb +0 -140
data/spec/unit/util/reference_serializer.rb +0 -52
data/spec/unit/util/resource_template.rb +0 -58
data/spec/unit/util/selinux.rb +0 -280
data/spec/unit/util/settings.rb +0 -1058
data/spec/unit/util/settings/file_setting.rb +0 -248
data/spec/unit/util/storage.rb +0 -248
data/spec/unit/util/tagging.rb +0 -102
data/spec/unit/util/user_attr.rb +0 -47
data/spec/unit/util/warnings.rb +0 -39
data/spec/unit/util/zaml.rb +0 -38
data/test/language/ast/casestatement.rb +0 -103
data/test/language/ast/resource.rb +0 -58
data/test/language/ast/resource_reference.rb +0 -77
data/test/language/ast/selector.rb +0 -61
data/test/language/resource.rb +0 -172
data/test/lib/puppettest/support/collection.rb +0 -29
data/test/network/client/resource.rb +0 -52
data/test/network/handler/bucket.rb +0 -313
data/test/network/handler/resource.rb +0 -250
data/test/other/dsl.rb +0 -215
data/test/other/events.rb +0 -124
data/test/ral/type/group.rb +0 -170

data/lib/puppet/reports/rrdgraph.rb CHANGED

@@ -1,138 +1,129 @@
 Puppet::Reports.register_report(:rrdgraph) do
-    desc "Graph all available data about hosts using the RRD library.  You
-        must have the Ruby RRDtool library installed to use this report, which
-        you can get from `the RubyRRDTool RubyForge page`_.  This package may also
-        be available as ``ruby-rrd`` or ``rrdtool-ruby`` in your distribution's package
-        management system.  The library and/or package will both require the binary
-        ``rrdtool`` package from your distribution to be installed.
-        .. _the RubyRRDTool RubyForge page: http://rubyforge.org/projects/rubyrrdtool/
-        This report will create, manage, and graph RRD database files for each
-        of the metrics generated during transactions, and it will create a
-        few simple html files to display the reporting host's graphs.  At this
-        point, it will not create a common index file to display links to
-        all hosts.
-        All RRD files and graphs get created in the ``rrddir`` directory.  If
-        you want to serve these publicly, you should be able to just alias that
-        directory in a web server.
-        If you really know what you're doing, you can tune the ``rrdinterval``,
-        which defaults to the ``runinterval``."
-    def hostdir
-        unless defined? @hostdir
-            @hostdir = File.join(Puppet[:rrddir], self.host)
+  desc "Graph all available data about hosts using the RRD library.  You
+    must have the Ruby RRDtool library installed to use this report, which
+    you can get from `the RubyRRDTool RubyForge page`_.  This package may also
+    be available as ``ruby-rrd`` or ``rrdtool-ruby`` in your distribution's package
+    management system.  The library and/or package will both require the binary
+    ``rrdtool`` package from your distribution to be installed.
+    .. _the RubyRRDTool RubyForge page: http://rubyforge.org/projects/rubyrrdtool/
+    This report will create, manage, and graph RRD database files for each
+    of the metrics generated during transactions, and it will create a
+    few simple html files to display the reporting host's graphs.  At this
+    point, it will not create a common index file to display links to
+    all hosts.
+    All RRD files and graphs get created in the ``rrddir`` directory.  If
+    you want to serve these publicly, you should be able to just alias that
+    directory in a web server.
+    If you really know what you're doing, you can tune the ``rrdinterval``,
+    which defaults to the ``runinterval``."
+  def hostdir
+    @hostdir ||= File.join(Puppet[:rrddir], self.host)
+  end
+  def htmlfile(type, graphs, field)
+    file = File.join(hostdir, "#{type}.html")
+    File.open(file, "w") do |of|
+      of.puts "<html><head><title>#{type.capitalize} graphs for #{host}</title></head><body>"
+      graphs.each do |graph|
+        if field == :first
+          name = graph.sub(/-\w+.png/, '').capitalize
+        else
+          name = graph.sub(/\w+-/, '').sub(".png", '').capitalize
         end
-        @hostdir
+        of.puts "<img src=#{graph}><br>"
+      end
+      of.puts "</body></html>"
     end
-    def htmlfile(type, graphs, field)
-        file = File.join(hostdir, "%s.html" % type)
-        File.open(file, "w") do |of|
-            of.puts "<html><head><title>%s graphs for %s</title></head><body>" %
-                [type.capitalize, host]
-            graphs.each do |graph|
-                if field == :first
-                    name = graph.sub(/-\w+.png/, '').capitalize
-                else
-                    name = graph.sub(/\w+-/, '').sub(".png", '').capitalize
-                end
-                of.puts "<img src=%s><br>" % graph
-            end
-            of.puts "</body></html>"
-        end
-        return file
-    end
+    file
+  end
-    def mkhtml
-        images = Dir.entries(hostdir).find_all { |d| d =~ /\.png/ }
+  def mkhtml
+    images = Dir.entries(hostdir).find_all { |d| d =~ /\.png/ }
-        periodorder = %w{daily weekly monthly yearly}
+    periodorder = %w{daily weekly monthly yearly}
-        periods = {}
-        types = {}
-        images.each do |n|
-            type, period = n.sub(".png", '').split("-")
-            periods[period] ||= []
-            types[type] ||= []
-            periods[period] << n
-            types[type] << n
-        end
+    periods = {}
+    types = {}
+    images.each do |n|
+      type, period = n.sub(".png", '').split("-")
+      periods[period] ||= []
+      types[type] ||= []
+      periods[period] << n
+      types[type] << n
+    end
-        files = []
-        # Make the period html files
-        periodorder.each do |period|
-            unless ary = periods[period]
-                raise Puppet::Error, "Could not find graphs for %s" % period
-            end
-            files << htmlfile(period, ary, :first)
-        end
+    files = []
+    # Make the period html files
+    periodorder.each do |period|
+      unless ary = periods[period]
+        raise Puppet::Error, "Could not find graphs for #{period}"
+      end
+      files << htmlfile(period, ary, :first)
+    end
-        # make the type html files
-        types.sort { |a,b| a[0] <=> b[0] }.each do |type, ary|
-            newary = []
-            periodorder.each do |period|
-                if graph = ary.find { |g| g.include?("-%s.png" % period) }
-                    newary << graph
-                else
-                    raise "Could not find %s-%s graph" % [type, period]
-                end
-            end
-            files << htmlfile(type, newary, :second)
+    # make the type html files
+    types.sort { |a,b| a[0] <=> b[0] }.each do |type, ary|
+      newary = []
+      periodorder.each do |period|
+        if graph = ary.find { |g| g.include?("-#{period}.png") }
+          newary << graph
+        else
+          raise "Could not find #{type}-#{period} graph"
         end
+      end
-        File.open(File.join(hostdir, "index.html"), "w") do |of|
-            of.puts "<html><head><title>Report graphs for %s</title></head><body>" %
-                host
-            files.each do |file|
-                of.puts "<a href='%s'>%s</a><br/>" %
-                    [File.basename(file),
-                     File.basename(file).sub(".html",'').capitalize]
-            end
-            of.puts "</body></html>"
-        end
+      files << htmlfile(type, newary, :second)
     end
-    def process(time = nil)
-        time ||= Time.now.to_i
+    File.open(File.join(hostdir, "index.html"), "w") do |of|
+      of.puts "<html><head><title>Report graphs for #{host}</title></head><body>"
+      files.each do |file|
+        of.puts "<a href='#{File.basename(file)}'>#{File.basename(file).sub(".html",'').capitalize}</a><br/>"
+      end
+      of.puts "</body></html>"
+    end
+  end
-        unless File.directory?(hostdir) and FileTest.writable?(hostdir)
-            # Some hackishness to create the dir with all of the right modes and ownership
-            config = Puppet::Util::Settings.new
-            config.setdefaults(:reports, :hostdir => {:default => hostdir, :owner => 'service', :mode => 0755, :group => 'service', :desc => "eh"})
+  def process(time = nil)
+    time ||= Time.now.to_i
-            # This creates the dir.
-            config.use(:reports)
-        end
+    unless File.directory?(hostdir) and FileTest.writable?(hostdir)
+      # Some hackishness to create the dir with all of the right modes and ownership
+      config = Puppet::Util::Settings.new
+      config.setdefaults(:reports, :hostdir => {:default => hostdir, :owner => 'service', :mode => 0755, :group => 'service', :desc => "eh"})
-        self.metrics.each do |name, metric|
-            metric.basedir = hostdir
+      # This creates the dir.
+      config.use(:reports)
+    end
-            if name == "time"
-                timeclean(metric)
-            end
+    self.metrics.each do |name, metric|
+      metric.basedir = hostdir
-            metric.store(time)
+      if name == "time"
+        timeclean(metric)
+      end
-            metric.graph
-        end
+      metric.store(time)
-        unless FileTest.exists?(File.join(hostdir, "index.html"))
-            mkhtml()
-        end
+      metric.graph
     end
-    # Unfortunately, RRD does not deal well with changing lists of values,
-    # so we have to pick a list of values and stick with it.  In this case,
-    # that means we record the total time, the config time, and that's about
-    # it.  We should probably send each type's time as a separate metric.
-    def timeclean(metric)
-        metric.values = metric.values.find_all { |name, label, value| [:total, :config_retrieval].include?(name) }
-    end
+    mkhtml unless FileTest.exists?(File.join(hostdir, "index.html"))
+  end
+  # Unfortunately, RRD does not deal well with changing lists of values,
+  # so we have to pick a list of values and stick with it.  In this case,
+  # that means we record the total time, the config time, and that's about
+  # it.  We should probably send each type's time as a separate metric.
+  def timeclean(metric)
+    metric.values = metric.values.find_all { |name, label, value| [:total, :config_retrieval].include?(name) }
+  end
 end

data/lib/puppet/reports/store.rb CHANGED

@@ -1,63 +1,60 @@
 require 'puppet'
 Puppet::Reports.register_report(:store) do
-    Puppet.settings.use(:reporting)
-    desc "Store the yaml report on disk.  Each host sends its report as a YAML dump
-        and this just stores the file on disk, in the ``reportdir`` directory.
-        These files collect quickly -- one every half hour -- so it is a good idea
-        to perform some maintenance on them if you use this report (it's the only
-        default report)."
-    def mkclientdir(client, dir)
-        config = Puppet::Util::Settings.new
-        config.setdefaults("reportclient-#{client}".to_sym,
-            "client-#{client}-dir" => { :default => dir,
-                :mode => 0750,
-                :desc => "Client dir for %s" % client,
-                :owner => 'service',
-                :group => 'service'
-            }
-        )
-        config.use("reportclient-#{client}".to_sym)
+  desc "Store the yaml report on disk.  Each host sends its report as a YAML dump
+    and this just stores the file on disk, in the ``reportdir`` directory.
+    These files collect quickly -- one every half hour -- so it is a good idea
+    to perform some maintenance on them if you use this report (it's the only
+    default report)."
+  def mkclientdir(client, dir)
+    config = Puppet::Util::Settings.new
+          config.setdefaults(
+        "reportclient-#{client}".to_sym,
+      "client-#{client}-dir" => { :default => dir,
+        :mode => 0750,
+        :desc => "Client dir for #{client}",
+        :owner => 'service',
+        :group => 'service'
+      },
+      :noop => [false, "Used by settings internally."]
+    )
+    config.use("reportclient-#{client}".to_sym)
+  end
+  def process
+    # We don't want any tracking back in the fs.  Unlikely, but there
+    # you go.
+    client = self.host.gsub("..",".")
+    dir = File.join(Puppet[:reportdir], client)
+    mkclientdir(client, dir) unless FileTest.exists?(dir)
+    # Now store the report.
+    now = Time.now.gmtime
+    name = %w{year month day hour min}.collect do |method|
+      # Make sure we're at least two digits everywhere
+      "%02d" % now.send(method).to_s
+    end.join("") + ".yaml"
+    file = File.join(dir, name)
+    begin
+      File.open(file, "w", 0640) do |f|
+        f.print to_yaml
+      end
+    rescue => detail
+      puts detail.backtrace if Puppet[:trace]
+      Puppet.warning "Could not write report for #{client} at #{file}: #{detail}"
     end
-    def process
-        # We don't want any tracking back in the fs.  Unlikely, but there
-        # you go.
-        client = self.host.gsub("..",".")
-        dir = File.join(Puppet[:reportdir], client)
-        unless FileTest.exists?(dir)
-            mkclientdir(client, dir)
-        end
-        # Now store the report.
-        now = Time.now.gmtime
-        name = %w{year month day hour min}.collect do |method|
-            # Make sure we're at least two digits everywhere
-            "%02d" % now.send(method).to_s
-        end.join("") + ".yaml"
-        file = File.join(dir, name)
-        begin
-            File.open(file, "w", 0640) do |f|
-                f.print to_yaml
-            end
-        rescue => detail
-            if Puppet[:trace]
-                puts detail.backtrace
-            end
-            Puppet.warning "Could not write report for %s at %s: %s" %
-                [client, file, detail]
-        end
-        # Only testing cares about the return value
-        return file
-    end
+    # Only testing cares about the return value
+    file
+  end
 end

data/lib/puppet/reports/tagmail.rb CHANGED

@@ -5,173 +5,165 @@ require 'net/smtp'
 require 'time'
 Puppet::Reports.register_report(:tagmail) do
-    desc "This report sends specific log messages to specific email addresses
-        based on the tags in the log messages.  See the
-        `UsingTags tag documentation`:trac: for more information
-        on tags.
-        To use this report, you must create a ``tagmail.conf`` (in the location
-        specified by ``tagmap``).  This is a simple file that maps tags to
-        email addresses:  Any log messages in the report that match the specified
-        tags will be sent to the specified email addresses.
-        Tags must be comma-separated, and they can be negated so that messages
-        only match when they do not have that tag.  The tags are separated from
-        the email addresses by a colon, and the email addresses should also
-        be comma-separated.
-        Lastly, there is an ``all`` tag that will always match all log messages.
-        Here is an example tagmail.conf::
-            all: me@domain.com
-            webserver, !mailserver: httpadmins@domain.com
-        This will send all messages to ``me@domain.com``, and all messages from
-        webservers that are not also from mailservers to ``httpadmins@domain.com``.
-        If you are using anti-spam controls, such as grey-listing, on your mail
-        server you should whitelist the sending email (controlled by ``reportform``
-        configuration option) to ensure your email is not discarded as spam.
-        "
-    # Find all matching messages.
-    def match(taglists)
-        reports = []
-        taglists.each do |emails, pos, neg|
-            # First find all of the messages matched by our positive tags
-            messages = nil
-            if pos.include?("all")
-                messages = self.logs
-            else
-                # Find all of the messages that are tagged with any of our
-                # tags.
-                messages = self.logs.find_all do |log|
-                    pos.detect { |tag| log.tagged?(tag) }
-                end
-            end
-            # Now go through and remove any messages that match our negative tags
-            messages = messages.reject do |log|
-                if neg.detect do |tag| log.tagged?(tag) end
-                    true
-                end
-            end
-            if messages.empty?
-                Puppet.info "No messages to report to %s" % emails.join(",")
-                next
-            else
-                reports << [emails, messages.collect { |m| m.to_report }.join("\n")]
-            end
+  desc "This report sends specific log messages to specific email addresses
+    based on the tags in the log messages.  See the
+    `UsingTags tag documentation`:trac: for more information
+    on tags.
+    To use this report, you must create a ``tagmail.conf`` (in the location
+    specified by ``tagmap``).  This is a simple file that maps tags to
+    email addresses:  Any log messages in the report that match the specified
+    tags will be sent to the specified email addresses.
+    Tags must be comma-separated, and they can be negated so that messages
+    only match when they do not have that tag.  The tags are separated from
+    the email addresses by a colon, and the email addresses should also
+    be comma-separated.
+    Lastly, there is an ``all`` tag that will always match all log messages.
+    Here is an example tagmail.conf::
+      all: me@domain.com
+      webserver, !mailserver: httpadmins@domain.com
+    This will send all messages to ``me@domain.com``, and all messages from
+    webservers that are not also from mailservers to ``httpadmins@domain.com``.
+    If you are using anti-spam controls, such as grey-listing, on your mail
+    server you should whitelist the sending email (controlled by ``reportform`` configuration option) to ensure your email is not discarded as spam.
+    "
+  # Find all matching messages.
+  def match(taglists)
+    matching_logs = []
+    taglists.each do |emails, pos, neg|
+      # First find all of the messages matched by our positive tags
+      messages = nil
+      if pos.include?("all")
+        messages = self.logs
+      else
+        # Find all of the messages that are tagged with any of our
+        # tags.
+        messages = self.logs.find_all do |log|
+          pos.detect { |tag| log.tagged?(tag) }
         end
-        return reports
+      end
+      # Now go through and remove any messages that match our negative tags
+      messages = messages.reject do |log|
+        true if neg.detect do |tag| log.tagged?(tag) end
+      end
+      if messages.empty?
+        Puppet.info "No messages to report to #{emails.join(",")}"
+        next
+      else
+        matching_logs << [emails, messages.collect { |m| m.to_report }.join("\n")]
+      end
     end
-    # Load the config file
-    def parse(text)
-        taglists = []
-        text.split("\n").each do |line|
-            taglist = emails = nil
-            case line.chomp
-            when /^\s*#/; next
-            when /^\s*$/; next
-            when /^\s*(.+)\s*:\s*(.+)\s*$/
-                taglist = $1
-                emails = $2.sub(/#.*$/,'')
-            else
-                raise ArgumentError, "Invalid tagmail config file"
-            end
-            pos = []
-            neg = []
-            taglist.sub(/\s+$/,'').split(/\s*,\s*/).each do |tag|
-                unless tag =~ /^!?[-\w]+$/
-                    raise ArgumentError, "Invalid tag %s" % tag.inspect
-                end
-                case tag
-                when /^\w+/; pos << tag
-                when /^!\w+/; neg << tag.sub("!", '')
-                else
-                    raise Puppet::Error, "Invalid tag '%s'" % tag
-                end
-            end
-            # Now split the emails
-            emails = emails.sub(/\s+$/,'').split(/\s*,\s*/)
-            taglists << [emails, pos, neg]
+    matching_logs
+  end
+  # Load the config file
+  def parse(text)
+    taglists = []
+    text.split("\n").each do |line|
+      taglist = emails = nil
+      case line.chomp
+      when /^\s*#/; next
+      when /^\s*$/; next
+      when /^\s*(.+)\s*:\s*(.+)\s*$/
+        taglist = $1
+        emails = $2.sub(/#.*$/,'')
+      else
+        raise ArgumentError, "Invalid tagmail config file"
+      end
+      pos = []
+      neg = []
+      taglist.sub(/\s+$/,'').split(/\s*,\s*/).each do |tag|
+        unless tag =~ /^!?[-\w]+$/
+          raise ArgumentError, "Invalid tag #{tag.inspect}"
         end
-        return taglists
-    end
-    # Process the report.  This just calls the other associated messages.
-    def process
-        unless FileTest.exists?(Puppet[:tagmap])
-            Puppet.notice "Cannot send tagmail report; no tagmap file %s" %
-                Puppet[:tagmap]
-            return
+        case tag
+        when /^\w+/; pos << tag
+        when /^!\w+/; neg << tag.sub("!", '')
+        else
+          raise Puppet::Error, "Invalid tag '#{tag}'"
         end
+      end
-        taglists = parse(File.read(Puppet[:tagmap]))
-        # Now find any appropriately tagged messages.
-        reports = match(taglists)
-        send(reports)
+      # Now split the emails
+      emails = emails.sub(/\s+$/,'').split(/\s*,\s*/)
+      taglists << [emails, pos, neg]
+    end
+    taglists
+  end
+  # Process the report.  This just calls the other associated messages.
+  def process
+    unless FileTest.exists?(Puppet[:tagmap])
+      Puppet.notice "Cannot send tagmail report; no tagmap file #{Puppet[:tagmap]}"
+      return
     end
-    # Send the email reports.
-    def send(reports)
-        pid = fork do
-            if Puppet[:smtpserver] != "none"
-                begin
-                    Net::SMTP.start(Puppet[:smtpserver]) do |smtp|
-                        reports.each do |emails, messages|
-                            smtp.open_message_stream(Puppet[:reportfrom], *emails) do |p|
-                              p.puts "From: #{Puppet[:reportfrom]}"
-                              p.puts "Subject: Puppet Report for %s" % self.host
-                              p.puts "To: " + emails.join(", ")
-                              p.puts "Date: " + Time.now.rfc2822
-                              p.puts
-                              p.puts messages
-                            end
-                        end
-                    end
-                rescue => detail
-                    if Puppet[:debug]
-                        puts detail.backtrace
-                    end
-                    raise Puppet::Error,
-                        "Could not send report emails through smtp: %s" % detail
-                end
-            elsif Puppet[:sendmail] != ""
-                begin
-                    reports.each do |emails, messages|
-                        # We need to open a separate process for every set of email addresses
-                        IO.popen(Puppet[:sendmail] + " " + emails.join(" "), "w") do |p|
-                            p.puts "From: #{Puppet[:reportfrom]}"
-                            p.puts "Subject: Puppet Report for %s" % self.host
-                            p.puts "To: " + emails.join(", ")
-                            p.puts messages
-                        end
-                    end
-                rescue => detail
-                    if Puppet[:debug]
-                        puts detail.backtrace
-                    end
-                    raise Puppet::Error,
-                        "Could not send report emails via sendmail: %s" % detail
-                end
-            else
-                raise Puppet::Error, "SMTP server is unset and could not find sendmail"
+    taglists = parse(File.read(Puppet[:tagmap]))
+    # Now find any appropriately tagged messages.
+    reports = match(taglists)
+    send(reports)
+  end
+  # Send the email reports.
+  def send(reports)
+    pid = fork do
+      if Puppet[:smtpserver] != "none"
+        begin
+          Net::SMTP.start(Puppet[:smtpserver]) do |smtp|
+            reports.each do |emails, messages|
+              smtp.open_message_stream(Puppet[:reportfrom], *emails) do |p|
+                p.puts "From: #{Puppet[:reportfrom]}"
+                p.puts "Subject: Puppet Report for #{self.host}"
+                p.puts "To: " + emails.join(", ")
+                p.puts "Date: #{Time.now.rfc2822}"
+                p.puts
+                p.puts messages
+              end
             end
+          end
+        rescue => detail
+          puts detail.backtrace if Puppet[:debug]
+          raise Puppet::Error,
+            "Could not send report emails through smtp: #{detail}"
         end
-        # Don't bother waiting for the pid to return.
-        Process.detach(pid)
+      elsif Puppet[:sendmail] != ""
+        begin
+          reports.each do |emails, messages|
+            # We need to open a separate process for every set of email addresses
+            IO.popen(Puppet[:sendmail] + " " + emails.join(" "), "w") do |p|
+              p.puts "From: #{Puppet[:reportfrom]}"
+              p.puts "Subject: Puppet Report for #{self.host}"
+              p.puts "To: " + emails.join(", ")
+              p.puts messages
+            end
+          end
+        rescue => detail
+          puts detail.backtrace if Puppet[:debug]
+          raise Puppet::Error,
+            "Could not send report emails via sendmail: #{detail}"
+        end
+      else
+        raise Puppet::Error, "SMTP server is unset and could not find sendmail"
+      end
     end
+    # Don't bother waiting for the pid to return.
+    Process.detach(pid)
+  end
 end