puppet 0.18.4 → 0.22.4
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of puppet might be problematic. Click here for more details.
- data/CHANGELOG +288 -0
- data/README +2 -2
- data/Rakefile +78 -5
- data/bin/puppet +28 -36
- data/bin/puppetca +81 -38
- data/bin/puppetd +65 -62
- data/bin/puppetdoc +409 -140
- data/bin/puppetmasterd +59 -47
- data/bin/puppetrun +38 -23
- data/conf/freebsd/puppetd +26 -0
- data/conf/freebsd/puppetmasterd +26 -0
- data/conf/gentoo/conf.d/puppet +5 -0
- data/conf/gentoo/conf.d/puppetmaster +12 -0
- data/conf/gentoo/init.d/puppet +38 -0
- data/conf/gentoo/init.d/puppetmaster +50 -0
- data/conf/gentoo/puppet/fileserver.conf +12 -0
- data/conf/gentoo/puppet/puppetca.conf +29 -0
- data/conf/gentoo/puppet/puppetd.conf +29 -0
- data/conf/gentoo/puppet/puppetmasterd.conf +29 -0
- data/conf/redhat/client.init +10 -5
- data/conf/redhat/client.sysconfig +1 -1
- data/conf/redhat/fileserver.conf +2 -2
- data/conf/redhat/logrotate +1 -1
- data/conf/redhat/no-lockdir.patch +13 -0
- data/conf/redhat/puppet.spec +65 -8
- data/conf/redhat/puppetd.conf +0 -4
- data/conf/redhat/server.init +3 -6
- data/conf/solaris/pkginfo +1 -1
- data/conf/solaris/smf/svc-puppetd +2 -2
- data/conf/suse/client.init +142 -0
- data/conf/suse/puppet.spec +221 -0
- data/conf/suse/server.init +162 -0
- data/examples/code/mac_automount.pp +16 -0
- data/examples/root/bin/sleeper +3 -5
- data/examples/root/etc/init.d/sleeper +8 -2
- data/examples/root/etc/puppet/fileserver.conf +12 -2
- data/examples/root/etc/puppet/namespaceauth.conf +20 -0
- data/examples/root/etc/puppet/puppetd.conf +4 -0
- data/examples/root/etc/puppet/puppetmasterd.conf +6 -9
- data/examples/root/etc/puppet/tagmail.conf +1 -0
- data/ext/emacs/puppet-mode.el +46 -1
- data/ext/logcheck/puppet +15 -0
- data/ext/module_puppet +15 -23
- data/ext/vim/puppet.vim +4 -2
- data/install.rb +2 -1
- data/lib/puppet.rb +76 -207
- data/lib/puppet/configuration.rb +331 -0
- data/lib/puppet/daemon.rb +63 -246
- data/lib/puppet/dsl.rb +371 -0
- data/lib/puppet/element.rb +8 -26
- data/lib/puppet/error.rb +54 -0
- data/lib/puppet/event.rb +8 -243
- data/lib/puppet/{base64.rb → external/base64.rb} +0 -0
- data/lib/puppet/external/event-loop.rb +1 -0
- data/lib/puppet/{event-loop → external/event-loop}/better-definers.rb +0 -0
- data/lib/puppet/{event-loop → external/event-loop}/event-loop.rb +2 -2
- data/lib/puppet/{event-loop → external/event-loop}/signal-system.rb +1 -1
- data/lib/puppet/external/gratr.rb +33 -0
- data/lib/puppet/external/gratr/adjacency_graph.rb +257 -0
- data/lib/puppet/external/gratr/base.rb +34 -0
- data/lib/puppet/external/gratr/biconnected.rb +116 -0
- data/lib/puppet/external/gratr/chinese_postman.rb +123 -0
- data/lib/puppet/external/gratr/common.rb +73 -0
- data/lib/puppet/external/gratr/comparability.rb +92 -0
- data/lib/puppet/external/gratr/digraph.rb +116 -0
- data/lib/puppet/external/gratr/digraph_distance.rb +185 -0
- data/lib/puppet/external/gratr/dot.rb +90 -0
- data/lib/puppet/external/gratr/edge.rb +145 -0
- data/lib/puppet/external/gratr/graph.rb +303 -0
- data/lib/puppet/external/gratr/graph_api.rb +83 -0
- data/lib/puppet/external/gratr/import.rb +44 -0
- data/lib/puppet/external/gratr/labels.rb +90 -0
- data/lib/puppet/external/gratr/maximum_flow.rb +64 -0
- data/lib/puppet/external/gratr/rdot.rb +327 -0
- data/lib/puppet/external/gratr/search.rb +409 -0
- data/lib/puppet/external/gratr/strong_components.rb +127 -0
- data/lib/puppet/external/gratr/undirected_graph.rb +153 -0
- data/lib/puppet/{lock.rb → external/lock.rb} +1 -1
- data/lib/puppet/feature/base.rb +20 -0
- data/lib/puppet/feature/rails.rb +52 -0
- data/lib/puppet/metatype/attributes.rb +719 -0
- data/lib/puppet/metatype/closure.rb +111 -0
- data/lib/puppet/metatype/container.rb +94 -0
- data/lib/puppet/metatype/evaluation.rb +118 -0
- data/lib/puppet/metatype/instances.rb +261 -0
- data/lib/puppet/metatype/manager.rb +169 -0
- data/lib/puppet/metatype/metaparams.rb +409 -0
- data/lib/puppet/metatype/providers.rb +260 -0
- data/lib/puppet/metatype/relationships.rb +116 -0
- data/lib/puppet/metatype/schedules.rb +39 -0
- data/lib/puppet/metatype/tags.rb +39 -0
- data/lib/puppet/modules.rb +113 -0
- data/lib/puppet/network/authconfig.rb +168 -0
- data/lib/puppet/network/authorization.rb +84 -0
- data/lib/puppet/network/authstore.rb +293 -0
- data/lib/puppet/network/client.rb +187 -0
- data/lib/puppet/network/client/ca.rb +56 -0
- data/lib/puppet/network/client/dipper.rb +81 -0
- data/lib/puppet/network/client/file.rb +7 -0
- data/lib/puppet/network/client/logger.rb +6 -0
- data/lib/puppet/network/client/master.rb +644 -0
- data/lib/puppet/{client → network/client}/proxy.rb +3 -3
- data/lib/puppet/{client/reporter.rb → network/client/report.rb} +4 -7
- data/lib/puppet/{client/pelement.rb → network/client/resource.rb} +6 -19
- data/lib/puppet/network/client/runner.rb +13 -0
- data/lib/puppet/network/client/status.rb +5 -0
- data/lib/puppet/network/client_request.rb +32 -0
- data/lib/puppet/network/handler.rb +33 -0
- data/lib/puppet/{server → network/handler}/ca.rb +5 -6
- data/lib/puppet/network/handler/filebucket.rb +180 -0
- data/lib/puppet/{server → network/handler}/fileserver.rb +277 -219
- data/lib/puppet/{server → network/handler}/logger.rb +3 -5
- data/lib/puppet/{server → network/handler}/master.rb +42 -8
- data/lib/puppet/network/handler/report.rb +158 -0
- data/lib/puppet/network/handler/resource.rb +190 -0
- data/lib/puppet/{server → network/handler}/runner.rb +17 -18
- data/lib/puppet/network/handler/status.rb +13 -0
- data/lib/puppet/network/rights.rb +74 -0
- data/lib/puppet/network/server.rb +5 -0
- data/lib/puppet/network/server/mongrel.rb +138 -0
- data/lib/puppet/network/server/webrick.rb +153 -0
- data/lib/puppet/network/xmlrpc/client.rb +129 -0
- data/lib/puppet/network/xmlrpc/processor.rb +91 -0
- data/lib/puppet/network/xmlrpc/server.rb +20 -0
- data/lib/puppet/network/xmlrpc/webrick_servlet.rb +121 -0
- data/lib/puppet/parameter.rb +390 -346
- data/lib/puppet/parser/ast.rb +116 -147
- data/lib/puppet/parser/ast/astarray.rb +17 -33
- data/lib/puppet/parser/ast/branch.rb +2 -0
- data/lib/puppet/parser/ast/caseopt.rb +7 -12
- data/lib/puppet/parser/ast/casestatement.rb +23 -32
- data/lib/puppet/parser/ast/collection.rb +19 -80
- data/lib/puppet/parser/ast/collexpr.rb +81 -0
- data/lib/puppet/parser/ast/component.rb +160 -89
- data/lib/puppet/parser/ast/else.rb +30 -0
- data/lib/puppet/parser/ast/function.rb +9 -2
- data/lib/puppet/parser/ast/hostclass.rb +47 -131
- data/lib/puppet/parser/ast/ifstatement.rb +43 -0
- data/lib/puppet/parser/ast/leaf.rb +10 -21
- data/lib/puppet/parser/ast/node.rb +32 -79
- data/lib/puppet/parser/ast/resourcedef.rb +222 -0
- data/lib/puppet/parser/ast/{typedefaults.rb → resourcedefaults.rb} +10 -16
- data/lib/puppet/parser/ast/resourceoverride.rb +62 -0
- data/lib/puppet/parser/ast/{objectparam.rb → resourceparam.rb} +12 -6
- data/lib/puppet/parser/ast/resourceref.rb +44 -0
- data/lib/puppet/parser/ast/selector.rb +16 -8
- data/lib/puppet/parser/ast/tag.rb +3 -1
- data/lib/puppet/parser/ast/vardef.rb +8 -12
- data/lib/puppet/parser/collector.rb +181 -0
- data/lib/puppet/parser/functions.rb +191 -36
- data/lib/puppet/parser/interpreter.rb +802 -380
- data/lib/puppet/parser/lexer.rb +86 -19
- data/lib/puppet/parser/parser.rb +1123 -960
- data/lib/puppet/parser/resource.rb +353 -0
- data/lib/puppet/parser/resource/param.rb +57 -0
- data/lib/puppet/parser/resource/reference.rb +71 -0
- data/lib/puppet/parser/scope.rb +573 -1000
- data/lib/puppet/parser/templatewrapper.rb +54 -0
- data/lib/puppet/pgraph.rb +208 -0
- data/lib/puppet/propertychange.rb +143 -0
- data/lib/puppet/provider.rb +302 -0
- data/lib/puppet/provider/cron/crontab.rb +187 -0
- data/lib/puppet/provider/group/groupadd.rb +29 -0
- data/lib/puppet/provider/group/netinfo.rb +12 -0
- data/lib/puppet/provider/group/pw.rb +31 -0
- data/lib/puppet/provider/host/netinfo.rb +18 -0
- data/lib/puppet/provider/host/parsed.rb +73 -0
- data/lib/puppet/provider/mount.rb +57 -0
- data/lib/puppet/provider/mount/netinfo.rb +38 -0
- data/lib/puppet/provider/mount/parsed.rb +37 -0
- data/lib/puppet/provider/nameservice.rb +344 -0
- data/lib/puppet/provider/nameservice/netinfo.rb +210 -0
- data/lib/puppet/provider/nameservice/objectadd.rb +45 -0
- data/lib/puppet/provider/nameservice/pw.rb +22 -0
- data/lib/puppet/provider/package/apple.rb +53 -0
- data/lib/puppet/provider/package/apt.rb +119 -0
- data/lib/puppet/provider/package/aptitude.rb +30 -0
- data/lib/puppet/provider/package/aptrpm.rb +79 -0
- data/lib/puppet/provider/package/blastwave.rb +114 -0
- data/lib/puppet/provider/package/darwinport.rb +88 -0
- data/lib/puppet/provider/package/dpkg.rb +109 -0
- data/lib/puppet/provider/package/freebsd.rb +43 -0
- data/lib/puppet/provider/package/gem.rb +104 -0
- data/lib/puppet/provider/package/openbsd.rb +93 -0
- data/lib/puppet/provider/package/pkgdmg.rb +119 -0
- data/lib/puppet/provider/package/portage.rb +112 -0
- data/lib/puppet/provider/package/ports.rb +94 -0
- data/lib/puppet/provider/package/rpm.rb +125 -0
- data/lib/puppet/provider/package/rug.rb +53 -0
- data/lib/puppet/provider/package/sun.rb +168 -0
- data/lib/puppet/provider/package/sunfreeware.rb +9 -0
- data/lib/puppet/provider/package/up2date.rb +45 -0
- data/lib/puppet/provider/package/yum.rb +54 -0
- data/lib/puppet/provider/parsedfile.rb +342 -0
- data/lib/puppet/provider/port/parsed.rb +174 -0
- data/lib/puppet/provider/service/base.rb +136 -0
- data/lib/puppet/provider/service/debian.rb +32 -0
- data/lib/puppet/provider/service/gentoo.rb +49 -0
- data/lib/puppet/{type → provider}/service/init.rb +42 -40
- data/lib/puppet/provider/service/redhat.rb +59 -0
- data/lib/puppet/{type → provider}/service/smf.rb +24 -13
- data/lib/puppet/provider/sshkey/parsed.rb +36 -0
- data/lib/puppet/provider/user/netinfo.rb +106 -0
- data/lib/puppet/provider/user/pw.rb +41 -0
- data/lib/puppet/provider/user/useradd.rb +67 -0
- data/lib/puppet/provider/zone/solaris.rb +208 -0
- data/lib/puppet/rails.rb +102 -66
- data/lib/puppet/rails/database/001_add_indexes.rb +38 -0
- data/lib/puppet/rails/database/schema.rb +89 -0
- data/lib/puppet/rails/external/tagging/acts_as_taggable.rb +62 -0
- data/lib/puppet/rails/external/tagging/init.rb +5 -0
- data/lib/puppet/rails/external/tagging/tag.rb +50 -0
- data/lib/puppet/rails/external/tagging/tagging.rb +12 -0
- data/lib/puppet/rails/fact_name.rb +7 -0
- data/lib/puppet/rails/fact_value.rb +5 -0
- data/lib/puppet/rails/host.rb +95 -46
- data/lib/puppet/rails/param_name.rb +28 -0
- data/lib/puppet/rails/param_value.rb +5 -0
- data/lib/puppet/rails/puppet_class.rb +9 -0
- data/lib/puppet/rails/resource.rb +95 -0
- data/lib/puppet/rails/source_file.rb +5 -0
- data/lib/puppet/relationship.rb +63 -0
- data/lib/puppet/reports/log.rb +14 -0
- data/lib/puppet/reports/rrdgraph.rb +114 -10
- data/lib/puppet/reports/store.rb +64 -0
- data/lib/puppet/reports/tagmail.rb +144 -71
- data/lib/puppet/sslcertificates.rb +38 -5
- data/lib/puppet/sslcertificates/ca.rb +142 -37
- data/lib/puppet/sslcertificates/certificate.rb +3 -3
- data/lib/puppet/sslcertificates/inventory.rb +53 -0
- data/lib/puppet/sslcertificates/support.rb +128 -0
- data/lib/puppet/transaction.rb +568 -189
- data/lib/puppet/transaction/report.rb +14 -3
- data/lib/puppet/transportable.rb +18 -10
- data/lib/puppet/type.rb +279 -2299
- data/lib/puppet/type/component.rb +63 -63
- data/lib/puppet/type/cron.rb +294 -710
- data/lib/puppet/type/exec.rb +185 -129
- data/lib/puppet/type/group.rb +38 -89
- data/lib/puppet/type/host.rb +110 -0
- data/lib/puppet/type/mount.rb +189 -0
- data/lib/puppet/type/notify.rb +47 -0
- data/lib/puppet/type/package.rb +129 -257
- data/lib/puppet/type/parsedtype.rb +172 -297
- data/lib/puppet/type/pfile.rb +540 -319
- data/lib/puppet/type/pfile/checksum.rb +103 -76
- data/lib/puppet/type/pfile/content.rb +16 -10
- data/lib/puppet/type/pfile/ensure.rb +52 -34
- data/lib/puppet/type/pfile/group.rb +25 -18
- data/lib/puppet/type/pfile/mode.rb +7 -4
- data/lib/puppet/type/pfile/{uid.rb → owner.rb} +21 -17
- data/lib/puppet/type/pfile/source.rb +119 -124
- data/lib/puppet/type/pfile/target.rb +29 -45
- data/lib/puppet/type/pfile/type.rb +2 -2
- data/lib/puppet/type/pfilebucket.rb +18 -14
- data/lib/puppet/type/port.rb +121 -0
- data/lib/puppet/type/property.rb +530 -0
- data/lib/puppet/type/resources.rb +150 -0
- data/lib/puppet/type/schedule.rb +38 -22
- data/lib/puppet/type/service.rb +70 -326
- data/lib/puppet/type/sshkey.rb +76 -0
- data/lib/puppet/type/tidy.rb +197 -97
- data/lib/puppet/type/user.rb +107 -183
- data/lib/puppet/type/yumrepo.rb +53 -34
- data/lib/puppet/type/zone.rb +55 -208
- data/lib/puppet/util.rb +239 -201
- data/lib/puppet/util/autoload.rb +107 -0
- data/lib/puppet/util/classgen.rb +208 -0
- data/lib/puppet/{config.rb → util/config.rb} +102 -54
- data/lib/puppet/util/docs.rb +104 -0
- data/lib/puppet/util/errors.rb +55 -0
- data/lib/puppet/util/execution.rb +22 -0
- data/lib/puppet/util/feature.rb +76 -0
- data/lib/puppet/util/fileparsing.rb +380 -0
- data/lib/puppet/util/filetype.rb +300 -0
- data/lib/puppet/util/graph.rb +39 -0
- data/lib/puppet/util/inifile.rb +209 -0
- data/lib/puppet/util/loadedfile.rb +71 -0
- data/lib/puppet/util/log.rb +549 -0
- data/lib/puppet/util/logging.rb +20 -0
- data/lib/puppet/util/metaid.rb +22 -0
- data/lib/puppet/util/methodhelper.rb +37 -0
- data/lib/puppet/util/metric.rb +160 -0
- data/lib/puppet/util/package.rb +31 -0
- data/lib/puppet/util/pidlock.rb +68 -0
- data/lib/puppet/util/plist.rb +24 -0
- data/lib/puppet/util/plist/generator.rb +226 -0
- data/lib/puppet/util/plist/parser.rb +227 -0
- data/lib/puppet/util/posix.rb +87 -0
- data/lib/puppet/util/provider_features.rb +170 -0
- data/lib/puppet/util/rails/collection_merger.rb +42 -0
- data/lib/puppet/util/storage.rb +103 -0
- data/lib/puppet/util/subclass_loader.rb +83 -0
- data/lib/puppet/util/suidmanager.rb +86 -0
- data/lib/puppet/util/variables.rb +39 -0
- data/lib/puppet/util/warnings.rb +15 -0
- data/test/Rakefile +97 -0
- data/test/certmgr/ca.rb +81 -0
- data/test/certmgr/certmgr.rb +77 -50
- data/test/certmgr/inventory.rb +79 -0
- data/test/certmgr/support.rb +81 -0
- data/test/executables/filebucket.rb +49 -0
- data/test/executables/puppetbin.rb +28 -12
- data/test/executables/puppetca.rb +75 -54
- data/test/executables/puppetd.rb +10 -13
- data/test/executables/puppetmasterd.rb +12 -17
- data/test/executables/puppetmodule.rb +18 -17
- data/test/language/ast.rb +242 -798
- data/test/language/ast/casestatement.rb +104 -0
- data/test/language/ast/component.rb +133 -0
- data/test/language/ast/hostclass.rb +162 -0
- data/test/language/ast/selector.rb +62 -0
- data/test/language/ast/variable.rb +31 -0
- data/test/language/collector.rb +369 -0
- data/test/language/functions.rb +305 -18
- data/test/language/interpreter.rb +894 -125
- data/test/language/lexer.rb +98 -12
- data/test/language/node.rb +37 -53
- data/test/language/parser.rb +455 -148
- data/test/language/resource.rb +535 -0
- data/test/language/scope.rb +451 -561
- data/test/language/snippets.rb +101 -111
- data/test/language/transportable.rb +6 -8
- data/test/lib/mocha.rb +19 -0
- data/test/lib/mocha/any_instance_method.rb +35 -0
- data/test/lib/mocha/auto_verify.rb +113 -0
- data/test/lib/mocha/central.rb +35 -0
- data/test/lib/mocha/class_method.rb +62 -0
- data/test/lib/mocha/expectation.rb +295 -0
- data/test/lib/mocha/expectation_error.rb +6 -0
- data/test/lib/mocha/infinite_range.rb +27 -0
- data/test/lib/mocha/inspect.rb +37 -0
- data/test/lib/mocha/instance_method.rb +8 -0
- data/test/lib/mocha/metaclass.rb +7 -0
- data/test/lib/mocha/mock.rb +20 -0
- data/test/lib/mocha/mock_methods.rb +122 -0
- data/test/lib/mocha/object.rb +100 -0
- data/test/lib/mocha/pretty_parameters.rb +28 -0
- data/test/lib/mocha/setup_and_teardown.rb +23 -0
- data/test/lib/mocha/standalone.rb +30 -0
- data/test/lib/mocha/test_case_adapter.rb +49 -0
- data/test/lib/mocha_standalone.rb +2 -0
- data/test/lib/puppettest.rb +294 -0
- data/test/lib/puppettest/certificates.rb +61 -0
- data/test/lib/puppettest/exetest.rb +123 -0
- data/test/lib/puppettest/fakes.rb +194 -0
- data/test/lib/puppettest/fileparsing.rb +33 -0
- data/test/lib/puppettest/filetesting.rb +231 -0
- data/test/lib/puppettest/graph.rb +41 -0
- data/test/lib/puppettest/parsertesting.rb +392 -0
- data/test/lib/puppettest/railstesting.rb +56 -0
- data/test/lib/puppettest/reporttesting.rb +19 -0
- data/test/lib/puppettest/resourcetesting.rb +73 -0
- data/test/lib/puppettest/servertest.rb +72 -0
- data/test/lib/puppettest/support.rb +8 -0
- data/test/lib/puppettest/support/assertions.rb +101 -0
- data/test/lib/puppettest/support/helpers.rb +23 -0
- data/test/lib/puppettest/support/resources.rb +37 -0
- data/test/lib/puppettest/support/utils.rb +160 -0
- data/test/lib/puppettest/testcase.rb +48 -0
- data/test/lib/rake/puppet_test_loader.rb +17 -0
- data/test/lib/rake/puppet_testtask.rb +17 -0
- data/test/lib/spec.rb +8 -0
- data/test/lib/spec/callback.rb +11 -0
- data/test/lib/spec/callback/callback_container.rb +60 -0
- data/test/lib/spec/callback/extensions/module.rb +24 -0
- data/test/lib/spec/callback/extensions/object.rb +37 -0
- data/test/lib/spec/deprecated.rb +3 -0
- data/test/lib/spec/expectations.rb +59 -0
- data/test/lib/spec/expectations/differs/default.rb +62 -0
- data/test/lib/spec/expectations/errors.rb +6 -0
- data/test/lib/spec/expectations/extensions.rb +3 -0
- data/test/lib/spec/expectations/extensions/object.rb +109 -0
- data/test/lib/spec/expectations/extensions/proc.rb +57 -0
- data/test/lib/spec/expectations/extensions/string_and_symbol.rb +17 -0
- data/test/lib/spec/expectations/handler.rb +47 -0
- data/test/lib/spec/expectations/should.rb +5 -0
- data/test/lib/spec/expectations/should/base.rb +64 -0
- data/test/lib/spec/expectations/should/change.rb +69 -0
- data/test/lib/spec/expectations/should/have.rb +128 -0
- data/test/lib/spec/expectations/should/not.rb +74 -0
- data/test/lib/spec/expectations/should/should.rb +81 -0
- data/test/lib/spec/expectations/sugar.rb +47 -0
- data/test/lib/spec/matchers.rb +160 -0
- data/test/lib/spec/matchers/be.rb +161 -0
- data/test/lib/spec/matchers/be_close.rb +37 -0
- data/test/lib/spec/matchers/change.rb +120 -0
- data/test/lib/spec/matchers/eql.rb +43 -0
- data/test/lib/spec/matchers/equal.rb +43 -0
- data/test/lib/spec/matchers/has.rb +44 -0
- data/test/lib/spec/matchers/have.rb +140 -0
- data/test/lib/spec/matchers/include.rb +50 -0
- data/test/lib/spec/matchers/match.rb +41 -0
- data/test/lib/spec/matchers/raise_error.rb +100 -0
- data/test/lib/spec/matchers/respond_to.rb +35 -0
- data/test/lib/spec/matchers/satisfy.rb +47 -0
- data/test/lib/spec/matchers/throw_symbol.rb +75 -0
- data/test/lib/spec/mocks.rb +232 -0
- data/test/lib/spec/mocks/argument_expectation.rb +132 -0
- data/test/lib/spec/mocks/error_generator.rb +85 -0
- data/test/lib/spec/mocks/errors.rb +10 -0
- data/test/lib/spec/mocks/extensions/object.rb +3 -0
- data/test/lib/spec/mocks/message_expectation.rb +231 -0
- data/test/lib/spec/mocks/methods.rb +40 -0
- data/test/lib/spec/mocks/mock.rb +26 -0
- data/test/lib/spec/mocks/mock_handler.rb +166 -0
- data/test/lib/spec/mocks/order_group.rb +29 -0
- data/test/lib/spec/rake/spectask.rb +173 -0
- data/test/lib/spec/rake/verify_rcov.rb +47 -0
- data/test/lib/spec/runner.rb +132 -0
- data/test/lib/spec/runner/backtrace_tweaker.rb +55 -0
- data/test/lib/spec/runner/command_line.rb +34 -0
- data/test/lib/spec/runner/context.rb +154 -0
- data/test/lib/spec/runner/context_eval.rb +142 -0
- data/test/lib/spec/runner/context_runner.rb +55 -0
- data/test/lib/spec/runner/drb_command_line.rb +21 -0
- data/test/lib/spec/runner/execution_context.rb +17 -0
- data/test/lib/spec/runner/extensions/kernel.rb +17 -0
- data/test/lib/spec/runner/extensions/object.rb +32 -0
- data/test/lib/spec/runner/formatter.rb +5 -0
- data/test/lib/spec/runner/formatter/base_text_formatter.rb +118 -0
- data/test/lib/spec/runner/formatter/html_formatter.rb +219 -0
- data/test/lib/spec/runner/formatter/progress_bar_formatter.rb +27 -0
- data/test/lib/spec/runner/formatter/rdoc_formatter.rb +22 -0
- data/test/lib/spec/runner/formatter/specdoc_formatter.rb +23 -0
- data/test/lib/spec/runner/heckle_runner.rb +71 -0
- data/test/lib/spec/runner/heckle_runner_win.rb +10 -0
- data/test/lib/spec/runner/option_parser.rb +224 -0
- data/test/lib/spec/runner/reporter.rb +105 -0
- data/test/lib/spec/runner/spec_matcher.rb +25 -0
- data/test/lib/spec/runner/spec_parser.rb +41 -0
- data/test/lib/spec/runner/spec_should_raise_handler.rb +74 -0
- data/test/lib/spec/runner/specification.rb +114 -0
- data/test/lib/spec/translator.rb +87 -0
- data/test/lib/spec/version.rb +30 -0
- data/test/lib/stubba.rb +2 -0
- data/test/network/authconfig.rb +72 -0
- data/test/network/authorization.rb +138 -0
- data/test/network/authstore.rb +450 -0
- data/test/network/client/ca.rb +38 -0
- data/test/{client → network/client}/client.rb +107 -24
- data/test/network/client/dipper.rb +35 -0
- data/test/network/client/master.rb +627 -0
- data/test/{client/pelement.rb → network/client/resource.rb} +13 -29
- data/test/network/client_request.rb +39 -0
- data/test/network/daemon.rb +71 -0
- data/test/{server → network/handler}/bucket.rb +103 -27
- data/test/{server → network/handler}/ca.rb +14 -19
- data/test/{server → network/handler}/fileserver.rb +443 -68
- data/test/network/handler/handler.rb +64 -0
- data/test/{server → network/handler}/logger.rb +26 -26
- data/test/network/handler/master.rb +352 -0
- data/test/network/handler/report.rb +185 -0
- data/test/{server/pelement.rb → network/handler/resource.rb} +25 -38
- data/test/{server → network/handler}/runner.rb +17 -16
- data/test/network/rights.rb +38 -0
- data/test/network/server/webrick.rb +140 -0
- data/test/network/xmlrpc/client.rb +68 -0
- data/test/network/xmlrpc/processor.rb +80 -0
- data/test/network/xmlrpc/server.rb +28 -0
- data/test/network/xmlrpc/webrick_servlet.rb +26 -0
- data/test/other/dsl.rb +218 -0
- data/test/other/events.rb +22 -15
- data/test/other/overrides.rb +9 -14
- data/test/other/pgraph.rb +289 -0
- data/test/other/propertychange.rb +142 -0
- data/test/other/provider.rb +162 -0
- data/test/other/puppet.rb +63 -10
- data/test/other/relationship.rb +74 -0
- data/test/other/relationships.rb +199 -123
- data/test/other/report.rb +152 -23
- data/test/other/transactions.rb +824 -78
- data/test/puppet/conffiles.rb +16 -11
- data/test/puppet/defaults.rb +7 -10
- data/test/puppet/{error.rb → errortest.rb} +5 -8
- data/test/puppet/modules.rb +58 -0
- data/test/puppet/tc_suidmanager.rb +107 -0
- data/test/rails/host.rb +177 -0
- data/test/rails/rails.rb +27 -0
- data/test/rails/railsparameter.rb +62 -0
- data/test/rails/railsresource.rb +100 -0
- data/test/ral/manager/attributes.rb +296 -0
- data/test/ral/manager/manager.rb +55 -0
- data/test/ral/manager/provider.rb +54 -0
- data/test/ral/manager/type.rb +837 -0
- data/test/ral/providers/cron/crontab.rb +346 -0
- data/test/ral/providers/group.rb +252 -0
- data/test/ral/providers/host/netinfo.rb +58 -0
- data/test/ral/providers/host/parsed.rb +226 -0
- data/test/ral/providers/mount/netinfo.rb +80 -0
- data/test/ral/providers/mount/parsed.rb +223 -0
- data/test/ral/providers/nameservice.rb +33 -0
- data/test/ral/providers/package.rb +253 -0
- data/test/ral/providers/package/apt.rb +89 -0
- data/test/ral/providers/package/aptitude.rb +69 -0
- data/test/ral/providers/package/aptrpm.rb +89 -0
- data/test/ral/providers/package/dpkg.rb +64 -0
- data/test/ral/providers/parsedfile.rb +668 -0
- data/test/ral/providers/parsedport.rb +233 -0
- data/test/ral/providers/provider.rb +423 -0
- data/test/{types → ral/providers}/service.rb +20 -121
- data/test/ral/providers/service/base.rb +75 -0
- data/test/ral/providers/sshkey/parsed.rb +111 -0
- data/test/ral/providers/user.rb +567 -0
- data/test/ral/providers/user/useradd.rb +250 -0
- data/test/ral/types/basic.rb +90 -0
- data/test/ral/types/component.rb +113 -0
- data/test/ral/types/cron.rb +480 -0
- data/test/{types → ral/types}/exec.rb +278 -82
- data/test/ral/types/file.rb +1799 -0
- data/test/ral/types/file/target.rb +363 -0
- data/test/{types → ral/types}/filebucket.rb +15 -17
- data/test/{types → ral/types}/fileignoresource.rb +9 -15
- data/test/ral/types/filesources.rb +1046 -0
- data/test/ral/types/group.rb +169 -0
- data/test/ral/types/host.rb +155 -0
- data/test/ral/types/mount.rb +312 -0
- data/test/ral/types/package.rb +85 -0
- data/test/ral/types/parameter.rb +172 -0
- data/test/ral/types/port.rb +148 -0
- data/test/ral/types/property.rb +343 -0
- data/test/ral/types/resources.rb +221 -0
- data/test/{types → ral/types}/schedule.rb +34 -12
- data/test/ral/types/service.rb +37 -0
- data/test/{types → ral/types}/sshkey.rb +75 -65
- data/test/ral/types/tidy.rb +240 -0
- data/test/ral/types/user.rb +493 -0
- data/test/{types → ral/types}/yumrepo.rb +7 -11
- data/test/{types → ral/types}/zone.rb +45 -45
- data/test/tagging/tagging.rb +17 -26
- data/test/util/autoload.rb +130 -0
- data/test/util/classgen.rb +227 -0
- data/test/{other → util}/config.rb +373 -113
- data/test/util/execution.rb +34 -0
- data/test/util/features.rb +94 -0
- data/test/util/fileparsing.rb +677 -0
- data/test/{other → util}/filetype.rb +9 -12
- data/test/util/graph.rb +108 -0
- data/test/{other → util}/inifile.rb +24 -11
- data/test/util/loadedfile.rb +106 -0
- data/test/{other → util}/log.rb +96 -50
- data/test/{other → util}/metrics.rb +7 -17
- data/test/util/package.rb +27 -0
- data/test/util/pidlock.rb +126 -0
- data/test/util/posixtest.rb +173 -0
- data/test/util/storage.rb +123 -0
- data/test/util/subclass_loader.rb +100 -0
- data/test/util/utiltest.rb +368 -0
- metadata +449 -169
- data/examples/code/classing +0 -35
- data/examples/code/failers/badclassnoparam +0 -10
- data/examples/code/failers/badclassparam +0 -10
- data/examples/code/failers/badcompnoparam +0 -9
- data/examples/code/failers/badcompparam +0 -9
- data/examples/code/failers/badtypeparam +0 -3
- data/examples/code/failers/noobjectrvalue +0 -1
- data/examples/code/snippets/aliastest.pp +0 -16
- data/examples/code/snippets/argumentdefaults +0 -14
- data/examples/code/snippets/casestatement.pp +0 -58
- data/examples/code/snippets/classheirarchy.pp +0 -15
- data/examples/code/snippets/classincludes.pp +0 -17
- data/examples/code/snippets/classpathtest +0 -11
- data/examples/code/snippets/componentmetaparams.pp +0 -11
- data/examples/code/snippets/deepclassheirarchy.pp +0 -23
- data/examples/code/snippets/defineoverrides.pp +0 -17
- data/examples/code/snippets/dirchmod +0 -19
- data/examples/code/snippets/emptyclass.pp +0 -9
- data/examples/code/snippets/emptyexec.pp +0 -3
- data/examples/code/snippets/failmissingexecpath.pp +0 -13
- data/examples/code/snippets/falsevalues.pp +0 -3
- data/examples/code/snippets/filecreate +0 -11
- data/examples/code/snippets/implicititeration +0 -15
- data/examples/code/snippets/multipleinstances +0 -7
- data/examples/code/snippets/namevartest +0 -9
- data/examples/code/snippets/scopetest +0 -13
- data/examples/code/snippets/selectorvalues.pp +0 -42
- data/examples/code/snippets/simpledefaults +0 -5
- data/examples/code/snippets/simpleselector +0 -38
- data/examples/code/snippets/singleary.pp +0 -19
- data/examples/code/snippets/singlequote.pp +0 -11
- data/examples/code/snippets/singleselector.pp +0 -22
- data/examples/code/snippets/tag.pp +0 -9
- data/examples/code/snippets/tagged.pp +0 -35
- data/lib/puppet/client.rb +0 -177
- data/lib/puppet/client/ca.rb +0 -21
- data/lib/puppet/client/dipper.rb +0 -76
- data/lib/puppet/client/file.rb +0 -20
- data/lib/puppet/client/log.rb +0 -17
- data/lib/puppet/client/master.rb +0 -531
- data/lib/puppet/client/runner.rb +0 -17
- data/lib/puppet/client/status.rb +0 -7
- data/lib/puppet/event-loop.rb +0 -1
- data/lib/puppet/filetype.rb +0 -308
- data/lib/puppet/inifile.rb +0 -201
- data/lib/puppet/log.rb +0 -524
- data/lib/puppet/metric.rb +0 -132
- data/lib/puppet/networkclient.rb +0 -175
- data/lib/puppet/parsedfile.rb +0 -58
- data/lib/puppet/parser/ast/classdef.rb +0 -79
- data/lib/puppet/parser/ast/compdef.rb +0 -75
- data/lib/puppet/parser/ast/nodedef.rb +0 -73
- data/lib/puppet/parser/ast/objectdef.rb +0 -284
- data/lib/puppet/parser/ast/objectref.rb +0 -77
- data/lib/puppet/rails/database.rb +0 -40
- data/lib/puppet/rails/rails_object.rb +0 -42
- data/lib/puppet/rails/rails_parameter.rb +0 -5
- data/lib/puppet/server.rb +0 -196
- data/lib/puppet/server/authconfig.rb +0 -177
- data/lib/puppet/server/authstore.rb +0 -226
- data/lib/puppet/server/filebucket.rb +0 -155
- data/lib/puppet/server/pelement.rb +0 -188
- data/lib/puppet/server/report.rb +0 -184
- data/lib/puppet/server/rights.rb +0 -78
- data/lib/puppet/server/servlet.rb +0 -274
- data/lib/puppet/statechange.rb +0 -129
- data/lib/puppet/storage.rb +0 -98
- data/lib/puppet/type/nameservice.rb +0 -264
- data/lib/puppet/type/nameservice/netinfo.rb +0 -232
- data/lib/puppet/type/nameservice/objectadd.rb +0 -146
- data/lib/puppet/type/nameservice/posix.rb +0 -12
- data/lib/puppet/type/nameservice/pw.rb +0 -107
- data/lib/puppet/type/package/apple.rb +0 -41
- data/lib/puppet/type/package/apt.rb +0 -107
- data/lib/puppet/type/package/blastwave.rb +0 -136
- data/lib/puppet/type/package/darwinport.rb +0 -97
- data/lib/puppet/type/package/dpkg.rb +0 -113
- data/lib/puppet/type/package/freebsd.rb +0 -19
- data/lib/puppet/type/package/gem.rb +0 -119
- data/lib/puppet/type/package/openbsd.rb +0 -112
- data/lib/puppet/type/package/ports.rb +0 -103
- data/lib/puppet/type/package/rpm.rb +0 -121
- data/lib/puppet/type/package/sun.rb +0 -174
- data/lib/puppet/type/package/sunfreeware.rb +0 -7
- data/lib/puppet/type/package/yum.rb +0 -52
- data/lib/puppet/type/parsedtype/host.rb +0 -144
- data/lib/puppet/type/parsedtype/mount.rb +0 -271
- data/lib/puppet/type/parsedtype/port.rb +0 -261
- data/lib/puppet/type/parsedtype/sshkey.rb +0 -123
- data/lib/puppet/type/service/base.rb +0 -12
- data/lib/puppet/type/service/debian.rb +0 -46
- data/lib/puppet/type/service/redhat.rb +0 -38
- data/lib/puppet/type/state.rb +0 -393
- data/lib/puppet/type/symlink.rb +0 -186
- data/test/client/master.rb +0 -207
- data/test/language/rails.rb +0 -105
- data/test/other/parsedfile.rb +0 -58
- data/test/other/storage.rb +0 -100
- data/test/puppet/utiltest.rb +0 -299
- data/test/puppettest.rb +0 -1170
- data/test/server/authconfig.rb +0 -56
- data/test/server/authstore.rb +0 -218
- data/test/server/master.rb +0 -201
- data/test/server/report.rb +0 -93
- data/test/server/rights.rb +0 -41
- data/test/server/server.rb +0 -152
- data/test/test +0 -61
- data/test/types/basic.rb +0 -117
- data/test/types/component.rb +0 -298
- data/test/types/cron.rb +0 -718
- data/test/types/file.rb +0 -1314
- data/test/types/filesources.rb +0 -590
- data/test/types/group.rb +0 -323
- data/test/types/host.rb +0 -186
- data/test/types/mount.rb +0 -294
- data/test/types/package.rb +0 -538
- data/test/types/parameter.rb +0 -107
- data/test/types/port.rb +0 -201
- data/test/types/query.rb +0 -101
- data/test/types/state.rb +0 -92
- data/test/types/symlink.rb +0 -120
- data/test/types/tidy.rb +0 -102
- data/test/types/type.rb +0 -469
- data/test/types/user.rb +0 -563
@@ -0,0 +1,71 @@
|
|
1
|
+
# A simple class that tells us when a file has changed and thus whether we
|
2
|
+
# should reload it
|
3
|
+
|
4
|
+
require 'puppet'
|
5
|
+
|
6
|
+
module Puppet
|
7
|
+
class NoSuchFile < Puppet::Error; end
|
8
|
+
class Util::LoadedFile
|
9
|
+
attr_reader :file, :statted
|
10
|
+
|
11
|
+
# Provide a hook for setting the timestamp during testing, so we don't
|
12
|
+
# have to depend on the granularity of the filesystem.
|
13
|
+
attr_writer :tstamp
|
14
|
+
|
15
|
+
Puppet.config.setdefaults(:puppet,
|
16
|
+
:filetimeout => [ 15,
|
17
|
+
"The minimum time to wait between checking for updates in
|
18
|
+
configuration files."
|
19
|
+
]
|
20
|
+
)
|
21
|
+
|
22
|
+
# Determine whether the file has changed and thus whether it should
|
23
|
+
# be reparsed.
|
24
|
+
def changed?
|
25
|
+
tmp = stamp()
|
26
|
+
|
27
|
+
# We use a different internal variable than the stamp method
|
28
|
+
# because it doesn't keep historical state and we do -- that is,
|
29
|
+
# we will always be comparing two timestamps, whereas
|
30
|
+
# stamp() just always wants the latest one.
|
31
|
+
if tmp == @tstamp
|
32
|
+
return false
|
33
|
+
else
|
34
|
+
@tstamp = tmp
|
35
|
+
return @tstamp
|
36
|
+
end
|
37
|
+
end
|
38
|
+
|
39
|
+
# Create the file. Must be passed the file path.
|
40
|
+
def initialize(file)
|
41
|
+
@file = file
|
42
|
+
unless FileTest.exists?(@file)
|
43
|
+
raise Puppet::NoSuchFile,
|
44
|
+
"Can not use a non-existent file for parsing"
|
45
|
+
end
|
46
|
+
@statted = 0
|
47
|
+
@stamp = nil
|
48
|
+
@tstamp = stamp()
|
49
|
+
end
|
50
|
+
|
51
|
+
# Retrieve the filestamp, but only refresh it if we're beyond our
|
52
|
+
# filetimeout
|
53
|
+
def stamp
|
54
|
+
if @stamp.nil? or (Time.now.to_i - @statted >= Puppet[:filetimeout])
|
55
|
+
@statted = Time.now.to_i
|
56
|
+
begin
|
57
|
+
@stamp = File.stat(@file).ctime
|
58
|
+
rescue Errno::ENOENT
|
59
|
+
@stamp = Time.now
|
60
|
+
end
|
61
|
+
end
|
62
|
+
return @stamp
|
63
|
+
end
|
64
|
+
|
65
|
+
def to_s
|
66
|
+
@file
|
67
|
+
end
|
68
|
+
end
|
69
|
+
end
|
70
|
+
|
71
|
+
# $Id: loadedfile.rb 2178 2007-02-07 23:56:59Z luke $
|
@@ -0,0 +1,549 @@
|
|
1
|
+
require 'syslog'
|
2
|
+
|
3
|
+
# Pass feedback to the user. Log levels are modeled after syslog's, and it is
|
4
|
+
# expected that that will be the most common log destination. Supports
|
5
|
+
# multiple destinations, one of which is a remote server.
|
6
|
+
class Puppet::Util::Log
|
7
|
+
include Puppet::Util
|
8
|
+
|
9
|
+
@levels = [:debug,:info,:notice,:warning,:err,:alert,:emerg,:crit]
|
10
|
+
@loglevel = 2
|
11
|
+
|
12
|
+
@desttypes = {}
|
13
|
+
|
14
|
+
# A type of log destination.
|
15
|
+
class Destination
|
16
|
+
class << self
|
17
|
+
attr_accessor :name
|
18
|
+
end
|
19
|
+
|
20
|
+
def self.initvars
|
21
|
+
@matches = []
|
22
|
+
end
|
23
|
+
|
24
|
+
# Mark the things we're supposed to match.
|
25
|
+
def self.match(obj)
|
26
|
+
@matches ||= []
|
27
|
+
@matches << obj
|
28
|
+
end
|
29
|
+
|
30
|
+
# See whether we match a given thing.
|
31
|
+
def self.match?(obj)
|
32
|
+
# Convert single-word strings into symbols like :console and :syslog
|
33
|
+
if obj.is_a? String and obj =~ /^\w+$/
|
34
|
+
obj = obj.downcase.intern
|
35
|
+
end
|
36
|
+
|
37
|
+
@matches.each do |thing|
|
38
|
+
# Search for direct matches or class matches
|
39
|
+
return true if thing === obj or thing == obj.class.to_s
|
40
|
+
end
|
41
|
+
return false
|
42
|
+
end
|
43
|
+
|
44
|
+
def name
|
45
|
+
if defined? @name
|
46
|
+
return @name
|
47
|
+
else
|
48
|
+
return self.class.name
|
49
|
+
end
|
50
|
+
end
|
51
|
+
|
52
|
+
# Set how to handle a message.
|
53
|
+
def self.sethandler(&block)
|
54
|
+
define_method(:handle, &block)
|
55
|
+
end
|
56
|
+
|
57
|
+
# Mark how to initialize our object.
|
58
|
+
def self.setinit(&block)
|
59
|
+
define_method(:initialize, &block)
|
60
|
+
end
|
61
|
+
end
|
62
|
+
|
63
|
+
# Create a new destination type.
|
64
|
+
def self.newdesttype(name, options = {}, &block)
|
65
|
+
dest = genclass(name, :parent => Destination, :prefix => "Dest",
|
66
|
+
:block => block,
|
67
|
+
:hash => @desttypes,
|
68
|
+
:attributes => options
|
69
|
+
)
|
70
|
+
dest.match(dest.name)
|
71
|
+
|
72
|
+
return dest
|
73
|
+
end
|
74
|
+
|
75
|
+
@destinations = {}
|
76
|
+
|
77
|
+
class << self
|
78
|
+
include Puppet::Util
|
79
|
+
include Puppet::Util::ClassGen
|
80
|
+
end
|
81
|
+
|
82
|
+
# Reset all logs to basics. Basically just closes all files and undefs
|
83
|
+
# all of the other objects.
|
84
|
+
def Log.close(dest = nil)
|
85
|
+
if dest
|
86
|
+
if @destinations.include?(dest)
|
87
|
+
if @destinations.respond_to?(:close)
|
88
|
+
@destinations[dest].close
|
89
|
+
end
|
90
|
+
@destinations.delete(dest)
|
91
|
+
end
|
92
|
+
else
|
93
|
+
@destinations.each { |name, dest|
|
94
|
+
if dest.respond_to?(:flush)
|
95
|
+
dest.flush
|
96
|
+
end
|
97
|
+
if dest.respond_to?(:close)
|
98
|
+
dest.close
|
99
|
+
end
|
100
|
+
}
|
101
|
+
@destinations = {}
|
102
|
+
end
|
103
|
+
end
|
104
|
+
|
105
|
+
# Flush any log destinations that support such operations.
|
106
|
+
def Log.flush
|
107
|
+
@destinations.each { |type, dest|
|
108
|
+
if dest.respond_to?(:flush)
|
109
|
+
dest.flush
|
110
|
+
end
|
111
|
+
}
|
112
|
+
end
|
113
|
+
|
114
|
+
# Create a new log message. The primary role of this method is to
|
115
|
+
# avoid creating log messages below the loglevel.
|
116
|
+
def Log.create(hash)
|
117
|
+
unless hash.include?(:level)
|
118
|
+
raise Puppet::DevError, "Logs require a level"
|
119
|
+
end
|
120
|
+
unless @levels.index(hash[:level])
|
121
|
+
raise Puppet::DevError, "Invalid log level %s" % hash[:level]
|
122
|
+
end
|
123
|
+
if @levels.index(hash[:level]) >= @loglevel
|
124
|
+
return Puppet::Util::Log.new(hash)
|
125
|
+
else
|
126
|
+
return nil
|
127
|
+
end
|
128
|
+
end
|
129
|
+
|
130
|
+
def Log.destinations
|
131
|
+
return @destinations.keys
|
132
|
+
end
|
133
|
+
|
134
|
+
# Yield each valid level in turn
|
135
|
+
def Log.eachlevel
|
136
|
+
@levels.each { |level| yield level }
|
137
|
+
end
|
138
|
+
|
139
|
+
# Return the current log level.
|
140
|
+
def Log.level
|
141
|
+
return @levels[@loglevel]
|
142
|
+
end
|
143
|
+
|
144
|
+
# Set the current log level.
|
145
|
+
def Log.level=(level)
|
146
|
+
unless level.is_a?(Symbol)
|
147
|
+
level = level.intern
|
148
|
+
end
|
149
|
+
|
150
|
+
unless @levels.include?(level)
|
151
|
+
raise Puppet::DevError, "Invalid loglevel %s" % level
|
152
|
+
end
|
153
|
+
|
154
|
+
@loglevel = @levels.index(level)
|
155
|
+
end
|
156
|
+
|
157
|
+
def Log.levels
|
158
|
+
@levels.dup
|
159
|
+
end
|
160
|
+
|
161
|
+
newdesttype :syslog do
|
162
|
+
def close
|
163
|
+
Syslog.close
|
164
|
+
end
|
165
|
+
|
166
|
+
def initialize
|
167
|
+
if Syslog.opened?
|
168
|
+
Syslog.close
|
169
|
+
end
|
170
|
+
name = Puppet[:name]
|
171
|
+
name = "puppet-#{name}" unless name =~ /puppet/
|
172
|
+
|
173
|
+
options = Syslog::LOG_PID | Syslog::LOG_NDELAY
|
174
|
+
|
175
|
+
# XXX This should really be configurable.
|
176
|
+
str = Puppet[:syslogfacility]
|
177
|
+
begin
|
178
|
+
facility = Syslog.const_get("LOG_#{str.upcase}")
|
179
|
+
rescue NameError
|
180
|
+
raise Puppet::Error, "Invalid syslog facility %s" % str
|
181
|
+
end
|
182
|
+
|
183
|
+
@syslog = Syslog.open(name, options, facility)
|
184
|
+
end
|
185
|
+
|
186
|
+
def handle(msg)
|
187
|
+
# XXX Syslog currently has a bug that makes it so you
|
188
|
+
# cannot log a message with a '%' in it. So, we get rid
|
189
|
+
# of them.
|
190
|
+
if msg.source == "Puppet"
|
191
|
+
@syslog.send(msg.level, msg.to_s.gsub("%", '%%'))
|
192
|
+
else
|
193
|
+
@syslog.send(msg.level, "(%s) %s" %
|
194
|
+
[msg.source.to_s.gsub("%", ""),
|
195
|
+
msg.to_s.gsub("%", '%%')
|
196
|
+
]
|
197
|
+
)
|
198
|
+
end
|
199
|
+
end
|
200
|
+
end
|
201
|
+
|
202
|
+
newdesttype :file do
|
203
|
+
match(/^\//)
|
204
|
+
|
205
|
+
def close
|
206
|
+
if defined? @file
|
207
|
+
@file.close
|
208
|
+
@file = nil
|
209
|
+
end
|
210
|
+
end
|
211
|
+
|
212
|
+
def flush
|
213
|
+
if defined? @file
|
214
|
+
@file.flush
|
215
|
+
end
|
216
|
+
end
|
217
|
+
|
218
|
+
def initialize(path)
|
219
|
+
@name = path
|
220
|
+
# first make sure the directory exists
|
221
|
+
# We can't just use 'Config.use' here, because they've
|
222
|
+
# specified a "special" destination.
|
223
|
+
unless FileTest.exist?(File.dirname(path))
|
224
|
+
Puppet.recmkdir(File.dirname(path))
|
225
|
+
Puppet.info "Creating log directory %s" % File.dirname(path)
|
226
|
+
end
|
227
|
+
|
228
|
+
# create the log file, if it doesn't already exist
|
229
|
+
file = File.open(path, File::WRONLY|File::CREAT|File::APPEND)
|
230
|
+
|
231
|
+
@file = file
|
232
|
+
|
233
|
+
@autoflush = Puppet[:autoflush]
|
234
|
+
end
|
235
|
+
|
236
|
+
def handle(msg)
|
237
|
+
@file.puts("%s %s (%s): %s" %
|
238
|
+
[msg.time, msg.source, msg.level, msg.to_s])
|
239
|
+
|
240
|
+
@file.flush if @autoflush
|
241
|
+
end
|
242
|
+
end
|
243
|
+
|
244
|
+
newdesttype :console do
|
245
|
+
|
246
|
+
|
247
|
+
PINK = {:console => "[0;31m", :html => "FFA0A0"}
|
248
|
+
GREEN = {:console => "[0;32m", :html => "00CD00"}
|
249
|
+
YELLOW = {:console => "[0;33m", :html => "FFFF60"}
|
250
|
+
SLATE = {:console => "[0;34m", :html => "80A0FF"}
|
251
|
+
ORANGE = {:console => "[0;35m", :html => "FFA500"}
|
252
|
+
BLUE = {:console => "[0;36m", :html => "40FFFF"}
|
253
|
+
RESET = {:console => "[0m", :html => ""}
|
254
|
+
|
255
|
+
@@colormap = {
|
256
|
+
:debug => SLATE,
|
257
|
+
:info => GREEN,
|
258
|
+
:notice => PINK,
|
259
|
+
:warning => ORANGE,
|
260
|
+
:err => YELLOW,
|
261
|
+
:alert => BLUE,
|
262
|
+
:emerg => RESET,
|
263
|
+
:crit => RESET
|
264
|
+
}
|
265
|
+
|
266
|
+
def colorize(level, str)
|
267
|
+
case Puppet[:color]
|
268
|
+
when false: str
|
269
|
+
when true, :ansi, "ansi": console_color(level, str)
|
270
|
+
when :html, "html": html_color(level, str)
|
271
|
+
end
|
272
|
+
end
|
273
|
+
|
274
|
+
def console_color(level, str)
|
275
|
+
@@colormap[level][:console] + str + RESET[:console]
|
276
|
+
end
|
277
|
+
|
278
|
+
def html_color(level, str)
|
279
|
+
%{<span style="color: %s">%s</span>} % [@@colormap[level][:html], str]
|
280
|
+
end
|
281
|
+
|
282
|
+
def initialize
|
283
|
+
# Flush output immediately.
|
284
|
+
$stdout.sync = true
|
285
|
+
end
|
286
|
+
|
287
|
+
def handle(msg)
|
288
|
+
if msg.source == "Puppet"
|
289
|
+
puts colorize(msg.level, "%s: %s" % [msg.level, msg.to_s])
|
290
|
+
else
|
291
|
+
puts colorize(msg.level, "%s: %s: %s" % [msg.level, msg.source, msg.to_s])
|
292
|
+
end
|
293
|
+
end
|
294
|
+
end
|
295
|
+
|
296
|
+
newdesttype :host do
|
297
|
+
def initialize(host)
|
298
|
+
Puppet.info "Treating %s as a hostname" % host
|
299
|
+
args = {}
|
300
|
+
if host =~ /:(\d+)/
|
301
|
+
args[:Port] = $1
|
302
|
+
args[:Server] = host.sub(/:\d+/, '')
|
303
|
+
else
|
304
|
+
args[:Server] = host
|
305
|
+
end
|
306
|
+
|
307
|
+
@name = host
|
308
|
+
|
309
|
+
@driver = Puppet::Network::Client::LogClient.new(args)
|
310
|
+
end
|
311
|
+
|
312
|
+
def handle(msg)
|
313
|
+
unless msg.is_a?(String) or msg.remote
|
314
|
+
unless defined? @hostname
|
315
|
+
@hostname = Facter["hostname"].value
|
316
|
+
end
|
317
|
+
unless defined? @domain
|
318
|
+
@domain = Facter["domain"].value
|
319
|
+
if @domain
|
320
|
+
@hostname += "." + @domain
|
321
|
+
end
|
322
|
+
end
|
323
|
+
if msg.source =~ /^\//
|
324
|
+
msg.source = @hostname + ":" + msg.source
|
325
|
+
elsif msg.source == "Puppet"
|
326
|
+
msg.source = @hostname + " " + msg.source
|
327
|
+
else
|
328
|
+
msg.source = @hostname + " " + msg.source
|
329
|
+
end
|
330
|
+
begin
|
331
|
+
#puts "would have sent %s" % msg
|
332
|
+
#puts "would have sent %s" %
|
333
|
+
# CGI.escape(YAML.dump(msg))
|
334
|
+
begin
|
335
|
+
tmp = CGI.escape(YAML.dump(msg))
|
336
|
+
rescue => detail
|
337
|
+
puts "Could not dump: %s" % detail.to_s
|
338
|
+
return
|
339
|
+
end
|
340
|
+
# Add the hostname to the source
|
341
|
+
@driver.addlog(tmp)
|
342
|
+
rescue => detail
|
343
|
+
if Puppet[:trace]
|
344
|
+
puts detail.backtrace
|
345
|
+
end
|
346
|
+
Puppet.err detail
|
347
|
+
Puppet::Util::Log.close(self)
|
348
|
+
end
|
349
|
+
end
|
350
|
+
end
|
351
|
+
end
|
352
|
+
|
353
|
+
# Log to a transaction report.
|
354
|
+
newdesttype :report do
|
355
|
+
match "Puppet::Transaction::Report"
|
356
|
+
|
357
|
+
def initialize(report)
|
358
|
+
@report = report
|
359
|
+
end
|
360
|
+
|
361
|
+
def handle(msg)
|
362
|
+
# Only add messages from objects, since anything else is
|
363
|
+
# probably unrelated to this run.
|
364
|
+
if msg.objectsource?
|
365
|
+
@report.newlog(msg)
|
366
|
+
end
|
367
|
+
end
|
368
|
+
end
|
369
|
+
|
370
|
+
# Log to an array, just for testing.
|
371
|
+
newdesttype :array do
|
372
|
+
match "Array"
|
373
|
+
|
374
|
+
def initialize(array)
|
375
|
+
@array = array
|
376
|
+
end
|
377
|
+
|
378
|
+
def handle(msg)
|
379
|
+
@array << msg
|
380
|
+
end
|
381
|
+
end
|
382
|
+
|
383
|
+
# Create a new log destination.
|
384
|
+
def Log.newdestination(dest)
|
385
|
+
# Each destination can only occur once.
|
386
|
+
if @destinations.find { |name, obj| obj.name == dest }
|
387
|
+
return
|
388
|
+
end
|
389
|
+
|
390
|
+
name, type = @desttypes.find do |name, klass|
|
391
|
+
klass.match?(dest)
|
392
|
+
end
|
393
|
+
|
394
|
+
unless type
|
395
|
+
raise Puppet::DevError, "Unknown destination type %s" % dest
|
396
|
+
end
|
397
|
+
|
398
|
+
begin
|
399
|
+
if type.instance_method(:initialize).arity == 1
|
400
|
+
@destinations[dest] = type.new(dest)
|
401
|
+
else
|
402
|
+
@destinations[dest] = type.new()
|
403
|
+
end
|
404
|
+
rescue => detail
|
405
|
+
if Puppet[:debug]
|
406
|
+
puts detail.backtrace
|
407
|
+
end
|
408
|
+
|
409
|
+
# If this was our only destination, then add the console back in.
|
410
|
+
if @destinations.empty? and (dest != :console and dest != "console")
|
411
|
+
newdestination(:console)
|
412
|
+
end
|
413
|
+
end
|
414
|
+
end
|
415
|
+
|
416
|
+
# Route the actual message. FIXME There are lots of things this method
|
417
|
+
# should do, like caching, storing messages when there are not yet
|
418
|
+
# destinations, a bit more. It's worth noting that there's a potential
|
419
|
+
# for a loop here, if the machine somehow gets the destination set as
|
420
|
+
# itself.
|
421
|
+
def Log.newmessage(msg)
|
422
|
+
if @levels.index(msg.level) < @loglevel
|
423
|
+
return
|
424
|
+
end
|
425
|
+
|
426
|
+
@destinations.each do |name, dest|
|
427
|
+
threadlock(dest) do
|
428
|
+
dest.handle(msg)
|
429
|
+
end
|
430
|
+
end
|
431
|
+
end
|
432
|
+
|
433
|
+
def Log.sendlevel?(level)
|
434
|
+
@levels.index(level) >= @loglevel
|
435
|
+
end
|
436
|
+
|
437
|
+
# Reopen all of our logs.
|
438
|
+
def Log.reopen
|
439
|
+
Puppet.notice "Reopening log files"
|
440
|
+
types = @destinations.keys
|
441
|
+
@destinations.each { |type, dest|
|
442
|
+
if dest.respond_to?(:close)
|
443
|
+
dest.close
|
444
|
+
end
|
445
|
+
}
|
446
|
+
@destinations.clear
|
447
|
+
# We need to make sure we always end up with some kind of destination
|
448
|
+
begin
|
449
|
+
types.each { |type|
|
450
|
+
Log.newdestination(type)
|
451
|
+
}
|
452
|
+
rescue => detail
|
453
|
+
if @destinations.empty?
|
454
|
+
Log.newdestination(:syslog)
|
455
|
+
Puppet.err detail.to_s
|
456
|
+
end
|
457
|
+
end
|
458
|
+
end
|
459
|
+
|
460
|
+
# Is the passed level a valid log level?
|
461
|
+
def self.validlevel?(level)
|
462
|
+
@levels.include?(level)
|
463
|
+
end
|
464
|
+
|
465
|
+
attr_accessor :level, :message, :time, :tags, :remote
|
466
|
+
attr_reader :source
|
467
|
+
|
468
|
+
def initialize(args)
|
469
|
+
unless args.include?(:level) && args.include?(:message)
|
470
|
+
raise Puppet::DevError, "Puppet::Util::Log called incorrectly"
|
471
|
+
end
|
472
|
+
|
473
|
+
if args[:level].class == String
|
474
|
+
@level = args[:level].intern
|
475
|
+
elsif args[:level].class == Symbol
|
476
|
+
@level = args[:level]
|
477
|
+
else
|
478
|
+
raise Puppet::DevError,
|
479
|
+
"Level is not a string or symbol: #{args[:level].class}"
|
480
|
+
end
|
481
|
+
|
482
|
+
# Just return unless we're actually at a level we should send
|
483
|
+
#return unless self.class.sendlevel?(@level)
|
484
|
+
|
485
|
+
@message = args[:message].to_s
|
486
|
+
@time = Time.now
|
487
|
+
# this should include the host name, and probly lots of other
|
488
|
+
# stuff, at some point
|
489
|
+
unless self.class.validlevel?(level)
|
490
|
+
raise Puppet::DevError, "Invalid message level #{level}"
|
491
|
+
end
|
492
|
+
|
493
|
+
if args.include?(:tags)
|
494
|
+
@tags = args[:tags]
|
495
|
+
end
|
496
|
+
|
497
|
+
if args.include?(:source)
|
498
|
+
self.source = args[:source]
|
499
|
+
else
|
500
|
+
@source = "Puppet"
|
501
|
+
end
|
502
|
+
|
503
|
+
Log.newmessage(self)
|
504
|
+
end
|
505
|
+
|
506
|
+
# Was the source of this log an object?
|
507
|
+
def objectsource?
|
508
|
+
if defined? @objectsource and @objectsource
|
509
|
+
@objectsource
|
510
|
+
else
|
511
|
+
false
|
512
|
+
end
|
513
|
+
end
|
514
|
+
|
515
|
+
# If they pass a source in to us, we make sure it is a string, and
|
516
|
+
# we retrieve any tags we can.
|
517
|
+
def source=(source)
|
518
|
+
# We can't store the actual source, we just store the path.
|
519
|
+
# We can't just check for whether it responds to :path, because
|
520
|
+
# plenty of providers respond to that in their normal function.
|
521
|
+
if source.is_a?(Puppet::Element) and source.respond_to?(:path)
|
522
|
+
@objectsource = true
|
523
|
+
@source = source.path
|
524
|
+
else
|
525
|
+
@objectsource = false
|
526
|
+
@source = source.to_s
|
527
|
+
end
|
528
|
+
unless defined? @tags and @tags
|
529
|
+
if source.respond_to?(:tags)
|
530
|
+
@tags = source.tags
|
531
|
+
end
|
532
|
+
end
|
533
|
+
end
|
534
|
+
|
535
|
+
def tagged?(tag)
|
536
|
+
@tags.detect { |t| t.to_s == tag.to_s }
|
537
|
+
end
|
538
|
+
|
539
|
+
def to_report
|
540
|
+
"%s %s (%s): %s" % [self.time, self.source, self.level, self.to_s]
|
541
|
+
end
|
542
|
+
|
543
|
+
def to_s
|
544
|
+
return @message
|
545
|
+
end
|
546
|
+
end
|
547
|
+
Puppet::Log = Puppet::Util::Log
|
548
|
+
|
549
|
+
# $Id: log.rb 2340 2007-03-21 20:39:36Z luke $
|