puppet 0.23.2 → 0.24.0
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 +112 -1
- data/README +1 -1
- data/Rakefile +1 -2
- data/bin/filebucket +2 -3
- data/bin/puppet +55 -39
- data/bin/puppetca +20 -11
- data/bin/puppetd +30 -31
- data/bin/puppetdoc +27 -28
- data/bin/puppetmasterd +24 -42
- data/bin/puppetrun +3 -4
- data/bin/ralsh +5 -7
- data/conf/redhat/puppet.spec +4 -1
- data/conf/solaris/smf/svc-puppetd +1 -1
- data/conf/solaris/smf/svc-puppetmasterd +1 -1
- data/examples/code/allatonce +1 -1
- data/examples/code/assignments +1 -1
- data/examples/code/components +1 -1
- data/examples/code/file.bl +1 -1
- data/examples/code/filedefaults +1 -1
- data/examples/code/fileparsing +1 -1
- data/examples/code/filerecursion +1 -1
- data/examples/code/functions +1 -1
- data/examples/code/groups +1 -1
- data/examples/code/head +1 -1
- data/examples/code/importing +1 -1
- data/examples/code/modules/sample-module.pp +10 -0
- data/examples/code/modules/sample-module/README.txt +17 -0
- data/examples/code/modules/sample-module/lib/puppet/parser/functions/hostname_to_dn.rb +36 -0
- data/examples/code/modules/sample-module/manifests/init.pp +12 -0
- data/examples/code/modules/sample-module/templates/sample.erb +5 -0
- data/examples/code/nodes +1 -1
- data/examples/code/one +1 -1
- data/examples/code/relationships +1 -1
- data/examples/code/selectors +1 -1
- data/examples/code/simpletests +1 -1
- data/examples/root/etc/init.d/sleeper +1 -1
- data/examples/root/etc/puppet/fileserver.conf +1 -1
- data/ext/ldap/puppet.schema +1 -1
- data/ext/module_puppet +30 -21
- data/ext/puppet-test +3 -3
- data/ext/vim/filetype.vim +1 -1
- data/install.rb +1 -2
- data/lib/puppet.rb +20 -19
- data/lib/puppet/checksum.rb +57 -0
- data/lib/puppet/config_stores/rest.rb +1 -1
- data/lib/puppet/daemon.rb +0 -1
- data/lib/puppet/{configuration.rb → defaults.rb} +56 -23
- data/lib/puppet/dsl.rb +22 -116
- data/lib/puppet/error.rb +0 -9
- data/lib/puppet/event.rb +0 -1
- data/lib/puppet/external/gratr/rdot.rb +0 -1
- data/lib/puppet/external/lock.rb +0 -1
- data/lib/puppet/feature/base.rb +3 -2
- data/lib/puppet/feature/rails.rb +0 -1
- data/lib/puppet/file_serving.rb +7 -0
- data/lib/puppet/file_serving/configuration.rb +129 -0
- data/lib/puppet/file_serving/configuration/parser.rb +124 -0
- data/lib/puppet/file_serving/content.rb +34 -0
- data/lib/puppet/file_serving/file_base.rb +63 -0
- data/lib/puppet/file_serving/fileset.rb +138 -0
- data/lib/puppet/file_serving/indirection_hooks.rb +44 -0
- data/lib/puppet/file_serving/metadata.rb +69 -0
- data/lib/puppet/file_serving/mount.rb +186 -0
- data/lib/puppet/file_serving/terminus_helper.rb +19 -0
- data/lib/puppet/indirector.rb +68 -0
- data/lib/puppet/indirector/catalog/compiler.rb +173 -0
- data/lib/puppet/indirector/catalog/yaml.rb +24 -0
- data/lib/puppet/indirector/checksum/file.rb +33 -0
- data/lib/puppet/indirector/code.rb +6 -0
- data/lib/puppet/indirector/direct_file_server.rb +27 -0
- data/lib/puppet/indirector/exec.rb +57 -0
- data/lib/puppet/indirector/facts/facter.rb +65 -0
- data/lib/puppet/indirector/facts/memory.rb +9 -0
- data/lib/puppet/indirector/facts/yaml.rb +7 -0
- data/lib/puppet/indirector/file.rb +54 -0
- data/lib/puppet/indirector/file_content.rb +5 -0
- data/lib/puppet/indirector/file_content/file.rb +11 -0
- data/lib/puppet/indirector/file_content/file_server.rb +11 -0
- data/lib/puppet/indirector/file_content/modules.rb +11 -0
- data/lib/puppet/indirector/file_content/rest.rb +12 -0
- data/lib/puppet/indirector/file_metadata.rb +5 -0
- data/lib/puppet/indirector/file_metadata/file.rb +26 -0
- data/lib/puppet/indirector/file_metadata/file_server.rb +11 -0
- data/lib/puppet/indirector/file_metadata/modules.rb +17 -0
- data/lib/puppet/indirector/file_metadata/rest.rb +12 -0
- data/lib/puppet/indirector/file_server.rb +56 -0
- data/lib/puppet/indirector/indirection.rb +237 -0
- data/lib/puppet/indirector/ldap.rb +90 -0
- data/lib/puppet/indirector/memory.rb +21 -0
- data/lib/puppet/indirector/module_files.rb +82 -0
- data/lib/puppet/indirector/node/exec.rb +52 -0
- data/lib/puppet/indirector/node/ldap.rb +120 -0
- data/lib/puppet/indirector/node/memory.rb +10 -0
- data/lib/puppet/indirector/node/plain.rb +19 -0
- data/lib/puppet/indirector/node/rest.rb +7 -0
- data/lib/puppet/indirector/node/yaml.rb +7 -0
- data/lib/puppet/indirector/plain.rb +9 -0
- data/lib/puppet/indirector/report/processor.rb +50 -0
- data/lib/puppet/indirector/rest.rb +8 -0
- data/lib/puppet/indirector/ssl_rsa.rb +5 -0
- data/lib/puppet/indirector/ssl_rsa/file.rb +33 -0
- data/lib/puppet/indirector/terminus.rb +178 -0
- data/lib/puppet/indirector/yaml.rb +57 -0
- data/lib/puppet/metatype/attributes.rb +3 -3
- data/lib/puppet/metatype/closure.rb +0 -66
- data/lib/puppet/metatype/container.rb +0 -9
- data/lib/puppet/metatype/evaluation.rb +10 -2
- data/lib/puppet/metatype/instances.rb +16 -30
- data/lib/puppet/metatype/manager.rb +1 -2
- data/lib/puppet/metatype/metaparams.rb +27 -21
- data/lib/puppet/metatype/providers.rb +3 -2
- data/lib/puppet/metatype/relationships.rb +1 -2
- data/lib/puppet/metatype/schedules.rb +0 -1
- data/lib/puppet/metatype/tags.rb +0 -1
- data/lib/puppet/module.rb +60 -32
- data/lib/puppet/network/authconfig.rb +0 -1
- data/lib/puppet/network/authorization.rb +0 -1
- data/lib/puppet/network/authstore.rb +0 -1
- data/lib/puppet/network/client.rb +13 -4
- data/lib/puppet/network/client/ca.rb +4 -5
- data/lib/puppet/network/client/dipper.rb +0 -1
- data/lib/puppet/network/client/file.rb +0 -1
- data/lib/puppet/network/client/master.rb +127 -235
- data/lib/puppet/network/client/proxy.rb +0 -1
- data/lib/puppet/network/client/report.rb +0 -1
- data/lib/puppet/network/client/resource.rb +0 -1
- data/lib/puppet/network/client/runner.rb +0 -1
- data/lib/puppet/network/client/status.rb +0 -1
- data/lib/puppet/network/client_request.rb +0 -1
- data/lib/puppet/network/handler.rb +5 -2
- data/lib/puppet/network/handler/ca.rb +1 -2
- data/lib/puppet/network/handler/configuration.rb +184 -0
- data/lib/puppet/network/handler/filebucket.rb +1 -2
- data/lib/puppet/network/handler/fileserver.rb +279 -107
- data/lib/puppet/network/handler/master.rb +57 -152
- data/lib/puppet/network/handler/report.rb +6 -65
- data/lib/puppet/network/handler/resource.rb +5 -13
- data/lib/puppet/network/handler/runner.rb +3 -4
- data/lib/puppet/network/handler/status.rb +0 -1
- data/lib/puppet/network/http.rb +13 -0
- data/lib/puppet/network/http/handler.rb +109 -0
- data/lib/puppet/network/http/mongrel.rb +54 -0
- data/lib/puppet/network/http/mongrel/rest.rb +37 -0
- data/lib/puppet/network/http/mongrel/xmlrpc.rb +4 -0
- data/lib/puppet/network/http/webrick.rb +51 -0
- data/lib/puppet/network/http/webrick/rest.rb +41 -0
- data/lib/puppet/network/http/webrick/xmlrpc.rb +4 -0
- data/lib/puppet/network/http_server.rb +3 -0
- data/lib/puppet/network/{server → http_server}/mongrel.rb +11 -5
- data/lib/puppet/network/{server → http_server}/webrick.rb +9 -5
- data/lib/puppet/network/rest_controller.rb +2 -0
- data/lib/puppet/network/rights.rb +0 -1
- data/lib/puppet/network/server.rb +63 -3
- data/lib/puppet/network/xmlrpc/client.rb +90 -23
- data/lib/puppet/network/xmlrpc/processor.rb +0 -1
- data/lib/puppet/network/xmlrpc/server.rb +0 -1
- data/lib/puppet/network/xmlrpc/webrick_servlet.rb +0 -1
- data/lib/puppet/node.rb +165 -0
- data/lib/puppet/node/catalog.rb +480 -0
- data/lib/puppet/node/environment.rb +46 -0
- data/lib/puppet/node/facts.rb +36 -0
- data/lib/puppet/parameter.rb +34 -28
- data/lib/puppet/parser/ast.rb +0 -1
- data/lib/puppet/parser/ast/astarray.rb +30 -53
- data/lib/puppet/parser/ast/branch.rb +0 -10
- data/lib/puppet/parser/ast/caseopt.rb +0 -11
- data/lib/puppet/parser/ast/casestatement.rb +0 -12
- data/lib/puppet/parser/ast/collection.rb +1 -3
- data/lib/puppet/parser/ast/collexpr.rb +0 -2
- data/lib/puppet/parser/ast/{component.rb → definition.rb} +58 -72
- data/lib/puppet/parser/ast/else.rb +0 -10
- data/lib/puppet/parser/ast/function.rb +0 -2
- data/lib/puppet/parser/ast/hostclass.rb +21 -19
- data/lib/puppet/parser/ast/ifstatement.rb +0 -13
- data/lib/puppet/parser/ast/leaf.rb +0 -8
- data/lib/puppet/parser/ast/node.rb +13 -10
- data/lib/puppet/parser/ast/resource.rb +75 -0
- data/lib/puppet/parser/ast/{resourcedefaults.rb → resource_defaults.rb} +4 -20
- data/lib/puppet/parser/ast/{resourceoverride.rb → resource_override.rb} +3 -5
- data/lib/puppet/parser/ast/resource_reference.rb +66 -0
- data/lib/puppet/parser/ast/resourceparam.rb +0 -14
- data/lib/puppet/parser/ast/selector.rb +0 -10
- data/lib/puppet/parser/ast/tag.rb +0 -2
- data/lib/puppet/parser/ast/vardef.rb +0 -14
- data/lib/puppet/parser/collector.rb +83 -101
- data/lib/puppet/parser/compile.rb +509 -0
- data/lib/puppet/parser/functions.rb +10 -10
- data/lib/puppet/parser/interpreter.rb +44 -662
- data/lib/puppet/parser/lexer.rb +1 -3
- data/lib/puppet/parser/parser.rb +674 -701
- data/lib/puppet/parser/parser_support.rb +33 -24
- data/lib/puppet/parser/resource.rb +219 -162
- data/lib/puppet/parser/resource/param.rb +1 -2
- data/lib/puppet/parser/resource/reference.rb +24 -16
- data/lib/puppet/parser/scope.rb +48 -459
- data/lib/puppet/parser/templatewrapper.rb +4 -5
- data/lib/puppet/pgraph.rb +10 -13
- data/lib/puppet/property.rb +25 -41
- data/lib/puppet/propertychange.rb +0 -2
- data/lib/puppet/provider.rb +15 -11
- data/lib/puppet/provider/cron/crontab.rb +6 -7
- data/lib/puppet/provider/group/groupadd.rb +0 -1
- data/lib/puppet/provider/group/netinfo.rb +0 -1
- data/lib/puppet/provider/group/pw.rb +0 -1
- data/lib/puppet/provider/host/netinfo.rb +0 -1
- data/lib/puppet/provider/host/parsed.rb +0 -1
- data/lib/puppet/provider/interface/redhat.rb +90 -91
- data/lib/puppet/provider/interface/sunos.rb +98 -81
- data/lib/puppet/provider/mailalias/aliases.rb +0 -1
- data/lib/puppet/provider/maillist/mailman.rb +2 -3
- data/lib/puppet/provider/mount.rb +10 -9
- data/lib/puppet/provider/mount/netinfo.rb +0 -1
- data/lib/puppet/provider/mount/parsed.rb +0 -1
- data/lib/puppet/provider/nameservice.rb +0 -1
- data/lib/puppet/provider/nameservice/netinfo.rb +0 -1
- data/lib/puppet/provider/nameservice/objectadd.rb +0 -1
- data/lib/puppet/provider/nameservice/pw.rb +0 -1
- data/lib/puppet/provider/package.rb +0 -2
- data/lib/puppet/provider/package/appdmg.rb +0 -1
- data/lib/puppet/provider/package/apple.rb +0 -1
- data/lib/puppet/provider/package/apt.rb +0 -1
- data/lib/puppet/provider/package/aptitude.rb +0 -1
- data/lib/puppet/provider/package/aptrpm.rb +0 -1
- data/lib/puppet/provider/package/blastwave.rb +0 -1
- data/lib/puppet/provider/package/darwinport.rb +0 -1
- data/lib/puppet/provider/package/dpkg.rb +9 -1
- data/lib/puppet/provider/package/fink.rb +0 -1
- data/lib/puppet/provider/package/freebsd.rb +0 -1
- data/lib/puppet/provider/package/gem.rb +0 -1
- data/lib/puppet/provider/package/openbsd.rb +1 -2
- data/lib/puppet/provider/package/pkgdmg.rb +14 -15
- data/lib/puppet/provider/package/portage.rb +6 -7
- data/lib/puppet/provider/package/ports.rb +1 -4
- data/lib/puppet/provider/package/rpm.rb +31 -45
- data/lib/puppet/provider/package/sun.rb +0 -3
- data/lib/puppet/provider/package/sunfreeware.rb +0 -1
- data/lib/puppet/provider/package/up2date.rb +0 -1
- data/lib/puppet/provider/package/urpmi.rb +0 -1
- data/lib/puppet/provider/package/yum.rb +45 -14
- data/lib/puppet/provider/package/yumhelper.py +37 -0
- data/lib/puppet/provider/parsedfile.rb +2 -3
- data/lib/puppet/provider/port/parsed.rb +0 -1
- data/lib/puppet/provider/service/base.rb +4 -1
- data/lib/puppet/provider/service/debian.rb +5 -2
- data/lib/puppet/provider/service/freebsd.rb +51 -0
- data/lib/puppet/provider/service/init.rb +16 -40
- data/lib/puppet/provider/service/redhat.rb +1 -6
- data/lib/puppet/provider/service/smf.rb +0 -1
- data/lib/puppet/provider/sshkey/parsed.rb +0 -1
- data/lib/puppet/provider/user/netinfo.rb +0 -1
- data/lib/puppet/provider/user/pw.rb +0 -1
- data/lib/puppet/provider/user/useradd.rb +0 -1
- data/lib/puppet/provider/zone/solaris.rb +0 -1
- data/lib/puppet/rails.rb +35 -30
- data/lib/puppet/rails/database/schema.rb +0 -1
- data/lib/puppet/rails/host.rb +6 -15
- data/lib/puppet/rails/param_name.rb +1 -2
- data/lib/puppet/rails/param_value.rb +0 -1
- data/lib/puppet/rails/puppet_class.rb +0 -1
- data/lib/puppet/rails/resource.rb +3 -5
- data/lib/puppet/reference/configuration.rb +12 -6
- data/lib/puppet/reference/indirection.rb +34 -0
- data/lib/puppet/reference/node_source.rb +9 -0
- data/lib/puppet/relationship.rb +10 -8
- data/lib/puppet/reports.rb +51 -0
- data/lib/puppet/reports/log.rb +2 -3
- data/lib/puppet/reports/rrdgraph.rb +2 -5
- data/lib/puppet/reports/store.rb +6 -7
- data/lib/puppet/reports/tagmail.rb +2 -3
- data/lib/puppet/resource_reference.rb +79 -0
- data/lib/puppet/simple_graph.rb +251 -0
- data/lib/puppet/sslcertificates.rb +19 -15
- data/lib/puppet/sslcertificates/ca.rb +56 -15
- data/lib/puppet/sslcertificates/certificate.rb +0 -1
- data/lib/puppet/sslcertificates/inventory.rb +2 -6
- data/lib/puppet/sslcertificates/monkey_patch.rb +6 -0
- data/lib/puppet/sslcertificates/support.rb +4 -5
- data/lib/puppet/transaction.rb +93 -96
- data/lib/puppet/transaction/report.rb +5 -1
- data/lib/puppet/transportable.rb +79 -125
- data/lib/puppet/type.rb +44 -10
- data/lib/puppet/type/component.rb +25 -110
- data/lib/puppet/type/cron.rb +1 -2
- data/lib/puppet/type/exec.rb +19 -13
- data/lib/puppet/type/group.rb +0 -1
- data/lib/puppet/type/host.rb +0 -1
- data/lib/puppet/type/interface.rb +6 -3
- data/lib/puppet/type/k5login.rb +87 -0
- data/lib/puppet/type/mailalias.rb +0 -1
- data/lib/puppet/type/maillist.rb +0 -1
- data/lib/puppet/type/mount.rb +7 -13
- data/lib/puppet/type/notify.rb +0 -1
- data/lib/puppet/type/package.rb +7 -63
- data/lib/puppet/type/pfile.rb +25 -32
- data/lib/puppet/type/pfile/checksum.rb +0 -1
- data/lib/puppet/type/pfile/content.rb +18 -3
- data/lib/puppet/type/pfile/ensure.rb +5 -6
- data/lib/puppet/type/pfile/group.rb +4 -1
- data/lib/puppet/type/pfile/mode.rb +0 -1
- data/lib/puppet/type/pfile/owner.rb +6 -9
- data/lib/puppet/type/pfile/source.rb +28 -11
- data/lib/puppet/type/pfile/target.rb +2 -1
- data/lib/puppet/type/pfile/type.rb +0 -1
- data/lib/puppet/type/pfilebucket.rb +0 -1
- data/lib/puppet/type/port.rb +0 -1
- data/lib/puppet/type/resources.rb +0 -1
- data/lib/puppet/type/schedule.rb +17 -15
- data/lib/puppet/type/service.rb +23 -159
- data/lib/puppet/type/sshkey.rb +0 -1
- data/lib/puppet/type/tidy.rb +15 -7
- data/lib/puppet/type/user.rb +0 -1
- data/lib/puppet/type/zone.rb +0 -1
- data/lib/puppet/util.rb +1 -2
- data/lib/puppet/util/autoload.rb +21 -23
- data/lib/puppet/util/checksums.rb +37 -0
- data/lib/puppet/util/classgen.rb +0 -1
- data/lib/puppet/util/diff.rb +71 -0
- data/lib/puppet/util/docs.rb +8 -2
- data/lib/puppet/util/errors.rb +0 -1
- data/lib/puppet/util/execution.rb +0 -1
- data/lib/puppet/util/fact_store.rb +0 -1
- data/lib/puppet/util/feature.rb +31 -22
- data/lib/puppet/util/fileparsing.rb +3 -2
- data/lib/puppet/util/filetype.rb +30 -12
- data/lib/puppet/util/graph.rb +0 -1
- data/lib/puppet/util/inifile.rb +0 -1
- data/lib/puppet/util/instance_loader.rb +11 -4
- data/lib/puppet/util/loadedfile.rb +0 -1
- data/lib/puppet/util/log.rb +0 -1
- data/lib/puppet/util/log_paths.rb +0 -1
- data/lib/puppet/util/logging.rb +0 -1
- data/lib/puppet/util/metaid.rb +0 -1
- data/lib/puppet/util/methodhelper.rb +0 -2
- data/lib/puppet/util/metric.rb +1 -2
- data/lib/puppet/util/plist.rb +0 -1
- data/lib/puppet/util/plist/generator.rb +0 -1
- data/lib/puppet/util/plist/parser.rb +0 -1
- data/lib/puppet/util/posix.rb +7 -1
- data/lib/puppet/util/provider_features.rb +11 -12
- data/lib/puppet/util/rails/collection_merger.rb +0 -1
- data/lib/puppet/util/reference.rb +2 -3
- data/lib/puppet/util/{config.rb → settings.rb} +424 -300
- data/lib/puppet/util/storage.rb +1 -3
- data/lib/puppet/util/subclass_loader.rb +0 -1
- data/lib/puppet/util/suidmanager.rb +25 -42
- data/lib/puppet/util/uri_helper.rb +22 -0
- data/lib/puppet/util/variables.rb +0 -1
- data/lib/puppet/util/warnings.rb +0 -1
- data/test/Rakefile +1 -1
- data/test/certmgr/ca.rb +8 -2
- data/test/certmgr/certmgr.rb +14 -6
- data/test/certmgr/inventory.rb +18 -30
- data/test/certmgr/support.rb +3 -2
- data/test/executables/filebucket.rb +1 -2
- data/test/executables/puppetbin.rb +1 -2
- data/test/executables/puppetca.rb +7 -2
- data/test/executables/puppetd.rb +23 -29
- data/test/executables/puppetmasterd.rb +1 -2
- data/test/executables/puppetmodule.rb +1 -2
- data/test/language/ast.rb +24 -29
- data/test/language/ast/casestatement.rb +1 -2
- data/test/language/ast/definition.rb +166 -0
- data/test/language/ast/hostclass.rb +50 -29
- data/test/language/ast/resource.rb +59 -0
- data/test/language/ast/{resourceref.rb → resource_reference.rb} +30 -20
- data/test/language/ast/selector.rb +1 -2
- data/test/language/ast/variable.rb +1 -2
- data/test/language/compile.rb +569 -0
- data/test/language/functions.rb +57 -76
- data/test/language/lexer.rb +20 -3
- data/test/language/parser.rb +45 -33
- data/test/language/resource.rb +275 -308
- data/test/language/scope.rb +135 -410
- data/test/language/snippets.rb +19 -41
- data/test/language/transportable.rb +8 -29
- data/test/lib/mocha/auto_verify.rb +6 -6
- data/test/lib/mocha/deprecation.rb +22 -0
- data/test/lib/mocha/exception_raiser.rb +17 -0
- data/test/lib/mocha/expectation.rb +167 -84
- data/test/lib/mocha/infinite_range.rb +4 -6
- data/test/lib/mocha/inspect.rb +3 -1
- data/test/lib/mocha/is_a.rb +9 -0
- data/test/lib/mocha/missing_expectation.rb +27 -0
- data/test/lib/mocha/mock.rb +192 -5
- data/test/lib/mocha/multiple_yields.rb +20 -0
- data/test/lib/mocha/no_yields.rb +11 -0
- data/test/lib/mocha/object.rb +11 -1
- data/test/lib/mocha/parameter_matchers.rb +9 -0
- data/test/lib/mocha/parameter_matchers/all_of.rb +39 -0
- data/test/lib/mocha/parameter_matchers/any_of.rb +44 -0
- data/test/lib/mocha/parameter_matchers/anything.rb +30 -0
- data/test/lib/mocha/parameter_matchers/has_entry.rb +39 -0
- data/test/lib/mocha/parameter_matchers/has_key.rb +39 -0
- data/test/lib/mocha/parameter_matchers/has_value.rb +39 -0
- data/test/lib/mocha/parameter_matchers/includes.rb +37 -0
- data/test/lib/mocha/return_values.rb +31 -0
- data/test/lib/mocha/single_return_value.rb +24 -0
- data/test/lib/mocha/single_yield.rb +18 -0
- data/test/lib/mocha/standalone.rb +2 -0
- data/test/lib/mocha/stub.rb +18 -0
- data/test/lib/mocha/test_case_adapter.rb +3 -3
- data/test/lib/mocha/yield_parameters.rb +31 -0
- data/test/lib/puppettest.rb +38 -20
- data/test/lib/puppettest/certificates.rb +0 -1
- data/test/lib/puppettest/exetest.rb +0 -1
- data/test/lib/puppettest/fakes.rb +0 -1
- data/test/lib/puppettest/fileparsing.rb +8 -15
- data/test/lib/puppettest/filetesting.rb +0 -1
- data/test/lib/puppettest/parsertesting.rb +37 -23
- data/test/lib/puppettest/railstesting.rb +3 -6
- data/test/lib/puppettest/reporttesting.rb +0 -1
- data/test/lib/puppettest/resourcetesting.rb +6 -34
- data/test/lib/puppettest/runnable_test.rb +30 -0
- data/test/lib/puppettest/servertest.rb +2 -3
- data/test/lib/puppettest/support/assertions.rb +13 -41
- data/test/lib/puppettest/support/collection.rb +0 -1
- data/test/lib/puppettest/support/helpers.rb +0 -1
- data/test/lib/puppettest/support/resources.rb +17 -17
- data/test/lib/puppettest/support/utils.rb +45 -27
- data/test/lib/puppettest/testcase.rb +2 -21
- data/test/lib/rake/puppet_test_loader.rb +0 -1
- data/test/lib/rake/puppet_testtask.rb +0 -1
- data/test/network/authconfig.rb +1 -2
- data/test/network/authorization.rb +1 -2
- data/test/network/authstore.rb +1 -2
- data/test/network/client/ca.rb +12 -7
- data/test/network/client/client.rb +17 -22
- data/test/network/client/dipper.rb +1 -2
- data/test/network/client/master.rb +70 -184
- data/test/network/client/resource.rb +9 -2
- data/test/network/client_request.rb +1 -2
- data/test/network/daemon.rb +1 -2
- data/test/network/handler/bucket.rb +2 -31
- data/test/network/handler/ca.rb +9 -3
- data/test/network/handler/configuration.rb +160 -0
- data/test/network/handler/fileserver.rb +24 -5
- data/test/network/handler/handler.rb +1 -2
- data/test/network/handler/master.rb +38 -243
- data/test/network/handler/report.rb +2 -104
- data/test/network/handler/resource.rb +5 -3
- data/test/network/handler/runner.rb +22 -60
- data/test/network/rights.rb +1 -2
- data/test/network/server/mongrel_test.rb +2 -3
- data/test/network/server/webrick.rb +17 -11
- data/test/network/xmlrpc/client.rb +27 -12
- data/test/network/xmlrpc/processor.rb +3 -4
- data/test/network/xmlrpc/server.rb +1 -2
- data/test/network/xmlrpc/webrick_servlet.rb +8 -2
- data/test/other/dsl.rb +2 -4
- data/test/other/events.rb +14 -56
- data/test/other/overrides.rb +3 -6
- data/test/other/propertychange.rb +1 -2
- data/test/other/provider.rb +1 -2
- data/test/other/puppet.rb +1 -2
- data/test/other/relationships.rb +15 -17
- data/test/other/report.rb +14 -20
- data/test/other/transactions.rb +109 -192
- data/test/puppet/conffiles.rb +3 -5
- data/test/puppet/defaults.rb +1 -28
- data/test/puppet/errortest.rb +1 -2
- data/test/puppet/tc_suidmanager.rb +77 -63
- data/test/rails/ast.rb +4 -4
- data/test/rails/configuration.rb +71 -0
- data/test/rails/host.rb +19 -30
- data/test/rails/rails.rb +1 -2
- data/test/rails/railsparameter.rb +3 -4
- data/test/rails/railsresource.rb +6 -5
- data/test/ral/manager/attributes.rb +1 -2
- data/test/ral/manager/instances.rb +3 -3
- data/test/ral/manager/manager.rb +1 -2
- data/test/ral/manager/provider.rb +1 -2
- data/test/ral/manager/type.rb +89 -93
- data/test/ral/providers/cron/crontab.rb +9 -11
- data/test/ral/providers/group.rb +1 -2
- data/test/ral/providers/host/netinfo.rb +1 -2
- data/test/ral/providers/host/parsed.rb +1 -2
- data/test/ral/providers/mailalias/aliases.rb +1 -2
- data/test/ral/providers/mount/netinfo.rb +1 -2
- data/test/ral/providers/nameservice.rb +1 -2
- data/test/ral/providers/package.rb +5 -4
- data/test/ral/providers/package/apt.rb +0 -1
- data/test/ral/providers/package/aptrpm.rb +0 -1
- data/test/ral/providers/parsedfile.rb +1 -2
- data/test/ral/providers/port/parsed.rb +1 -2
- data/test/ral/providers/provider.rb +10 -5
- data/test/ral/providers/service/base.rb +1 -2
- data/test/ral/providers/service/debian.rb +58 -0
- data/test/ral/providers/sshkey/parsed.rb +1 -2
- data/test/ral/providers/user.rb +3 -2
- data/test/ral/providers/user/useradd.rb +0 -1
- data/test/ral/types/basic.rb +4 -9
- data/test/ral/types/cron.rb +6 -12
- data/test/ral/types/exec.rb +6 -7
- data/test/ral/types/file.rb +35 -14
- data/test/ral/types/file/target.rb +6 -5
- data/test/ral/types/filebucket.rb +3 -2
- data/test/ral/types/fileignoresource.rb +10 -42
- data/test/ral/types/filesources.rb +21 -60
- data/test/ral/types/group.rb +3 -3
- data/test/ral/types/host.rb +6 -3
- data/test/ral/types/mailalias.rb +1 -2
- data/test/ral/types/parameter.rb +5 -3
- data/test/ral/types/port.rb +1 -2
- data/test/ral/types/property.rb +3 -3
- data/test/ral/types/resources.rb +1 -2
- data/test/ral/types/service.rb +5 -3
- data/test/ral/types/sshkey.rb +5 -3
- data/test/ral/types/tidy.rb +63 -3
- data/test/ral/types/user.rb +10 -11
- data/test/ral/types/yumrepo.rb +1 -1
- data/test/ral/types/zone.rb +1 -2
- data/test/util/autoload.rb +23 -27
- data/test/util/classgen.rb +1 -2
- data/test/util/execution.rb +1 -2
- data/test/util/features.rb +1 -3
- data/test/util/fileparsing.rb +11 -3
- data/test/util/filetype.rb +1 -2
- data/test/util/inifile.rb +1 -1
- data/test/util/instance_loader.rb +5 -6
- data/test/util/loadedfile.rb +1 -2
- data/test/util/log.rb +1 -2
- data/test/util/metrics.rb +1 -2
- data/test/util/package.rb +1 -2
- data/test/util/posixtest.rb +1 -2
- data/test/util/{config.rb → settings.rb} +123 -265
- data/test/util/storage.rb +1 -2
- data/test/util/subclass_loader.rb +1 -2
- data/test/util/utiltest.rb +1 -111
- metadata +130 -112
- data/ext/tools/passwd2puppet +0 -45
- data/lib/puppet/fact_stores/yaml.rb +0 -42
- data/lib/puppet/network/handler/facts.rb +0 -70
- data/lib/puppet/parser/ast/resourcedef.rb +0 -222
- data/lib/puppet/parser/ast/resourceref.rb +0 -58
- data/test/language/ast/component.rb +0 -142
- data/test/language/collector.rb +0 -179
- data/test/language/interpreter.rb +0 -804
- data/test/language/node.rb +0 -126
- data/test/lib/mocha/mock_methods.rb +0 -122
- data/test/lib/puppettest/graph.rb +0 -41
- data/test/lib/spec.rb +0 -8
- data/test/lib/spec/callback.rb +0 -11
- data/test/lib/spec/callback/callback_container.rb +0 -60
- data/test/lib/spec/callback/extensions/module.rb +0 -24
- data/test/lib/spec/callback/extensions/object.rb +0 -37
- data/test/lib/spec/deprecated.rb +0 -3
- data/test/lib/spec/expectations.rb +0 -59
- data/test/lib/spec/expectations/differs/default.rb +0 -62
- data/test/lib/spec/expectations/errors.rb +0 -6
- data/test/lib/spec/expectations/extensions.rb +0 -3
- data/test/lib/spec/expectations/extensions/object.rb +0 -109
- data/test/lib/spec/expectations/extensions/proc.rb +0 -57
- data/test/lib/spec/expectations/extensions/string_and_symbol.rb +0 -17
- data/test/lib/spec/expectations/handler.rb +0 -47
- data/test/lib/spec/expectations/should.rb +0 -5
- data/test/lib/spec/expectations/should/base.rb +0 -64
- data/test/lib/spec/expectations/should/change.rb +0 -69
- data/test/lib/spec/expectations/should/have.rb +0 -128
- data/test/lib/spec/expectations/should/not.rb +0 -74
- data/test/lib/spec/expectations/should/should.rb +0 -81
- data/test/lib/spec/expectations/sugar.rb +0 -47
- data/test/lib/spec/matchers.rb +0 -160
- data/test/lib/spec/matchers/be.rb +0 -161
- data/test/lib/spec/matchers/be_close.rb +0 -37
- data/test/lib/spec/matchers/change.rb +0 -120
- data/test/lib/spec/matchers/eql.rb +0 -43
- data/test/lib/spec/matchers/equal.rb +0 -43
- data/test/lib/spec/matchers/has.rb +0 -44
- data/test/lib/spec/matchers/have.rb +0 -140
- data/test/lib/spec/matchers/include.rb +0 -50
- data/test/lib/spec/matchers/match.rb +0 -41
- data/test/lib/spec/matchers/raise_error.rb +0 -100
- data/test/lib/spec/matchers/respond_to.rb +0 -35
- data/test/lib/spec/matchers/satisfy.rb +0 -47
- data/test/lib/spec/matchers/throw_symbol.rb +0 -75
- data/test/lib/spec/mocks.rb +0 -232
- data/test/lib/spec/mocks/argument_expectation.rb +0 -132
- data/test/lib/spec/mocks/error_generator.rb +0 -85
- data/test/lib/spec/mocks/errors.rb +0 -10
- data/test/lib/spec/mocks/extensions/object.rb +0 -3
- data/test/lib/spec/mocks/message_expectation.rb +0 -231
- data/test/lib/spec/mocks/methods.rb +0 -40
- data/test/lib/spec/mocks/mock.rb +0 -26
- data/test/lib/spec/mocks/mock_handler.rb +0 -166
- data/test/lib/spec/mocks/order_group.rb +0 -29
- data/test/lib/spec/rake/spectask.rb +0 -173
- data/test/lib/spec/rake/verify_rcov.rb +0 -47
- data/test/lib/spec/runner.rb +0 -132
- data/test/lib/spec/runner/backtrace_tweaker.rb +0 -55
- data/test/lib/spec/runner/command_line.rb +0 -34
- data/test/lib/spec/runner/context.rb +0 -154
- data/test/lib/spec/runner/context_eval.rb +0 -142
- data/test/lib/spec/runner/context_runner.rb +0 -55
- data/test/lib/spec/runner/drb_command_line.rb +0 -21
- data/test/lib/spec/runner/execution_context.rb +0 -17
- data/test/lib/spec/runner/extensions/kernel.rb +0 -17
- data/test/lib/spec/runner/extensions/object.rb +0 -32
- data/test/lib/spec/runner/formatter.rb +0 -5
- data/test/lib/spec/runner/formatter/base_text_formatter.rb +0 -118
- data/test/lib/spec/runner/formatter/html_formatter.rb +0 -219
- data/test/lib/spec/runner/formatter/progress_bar_formatter.rb +0 -27
- data/test/lib/spec/runner/formatter/rdoc_formatter.rb +0 -22
- data/test/lib/spec/runner/formatter/specdoc_formatter.rb +0 -23
- data/test/lib/spec/runner/heckle_runner.rb +0 -71
- data/test/lib/spec/runner/heckle_runner_win.rb +0 -10
- data/test/lib/spec/runner/option_parser.rb +0 -224
- data/test/lib/spec/runner/reporter.rb +0 -105
- data/test/lib/spec/runner/spec_matcher.rb +0 -25
- data/test/lib/spec/runner/spec_parser.rb +0 -41
- data/test/lib/spec/runner/spec_should_raise_handler.rb +0 -74
- data/test/lib/spec/runner/specification.rb +0 -114
- data/test/lib/spec/translator.rb +0 -87
- data/test/lib/spec/version.rb +0 -30
- data/test/network/handler/facts.rb +0 -112
- data/test/other/pgraph.rb +0 -290
- data/test/other/relationship.rb +0 -74
- data/test/puppet/modules.rb +0 -59
- data/test/rails/collection.rb +0 -247
- data/test/rails/interpreter.rb +0 -91
- data/test/ral/providers/mount/parsed.rb +0 -251
- data/test/ral/providers/service.rb +0 -235
- data/test/ral/types/component.rb +0 -113
- data/test/ral/types/interface.rb +0 -40
- data/test/ral/types/mount.rb +0 -362
- data/test/ral/types/package.rb +0 -154
- data/test/ral/types/schedule.rb +0 -357
- data/test/tagging/tagging.rb +0 -170
- data/test/util/fact_store.rb +0 -67
- data/test/util/graph.rb +0 -108
data/test/other/relationship.rb
DELETED
@@ -1,74 +0,0 @@
|
|
1
|
-
#!/usr/bin/env ruby
|
2
|
-
#
|
3
|
-
# Created by Luke A. Kanies on 2006-11-24.
|
4
|
-
# Copyright (c) 2006. All rights reserved.
|
5
|
-
|
6
|
-
$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
|
7
|
-
|
8
|
-
require 'puppettest'
|
9
|
-
require 'puppet/relationship'
|
10
|
-
|
11
|
-
class TestRelationship < Test::Unit::TestCase
|
12
|
-
include PuppetTest
|
13
|
-
|
14
|
-
def test_initialize
|
15
|
-
rel = Puppet::Relationship
|
16
|
-
|
17
|
-
[["source", "target", "label"],
|
18
|
-
["source", "target", {:event => :nothing}]
|
19
|
-
].each do |ary|
|
20
|
-
# Make sure the label is required
|
21
|
-
assert_raise(Puppet::DevError) do
|
22
|
-
rel.new(*ary)
|
23
|
-
end
|
24
|
-
end
|
25
|
-
end
|
26
|
-
|
27
|
-
def test_attributes
|
28
|
-
rel = Puppet::Relationship
|
29
|
-
|
30
|
-
i = nil
|
31
|
-
assert_nothing_raised do
|
32
|
-
i = rel.new "source", "target", :event => :yay, :callback => :boo
|
33
|
-
end
|
34
|
-
|
35
|
-
assert_equal(:yay, i.event, "event was not retrieved")
|
36
|
-
assert_equal(:boo, i.callback, "callback was not retrieved")
|
37
|
-
|
38
|
-
# Now try it with nil values
|
39
|
-
assert_nothing_raised("failed to create with no event or callback") {
|
40
|
-
i = rel.new "source", "target"
|
41
|
-
}
|
42
|
-
|
43
|
-
assert_nil(i.event, "event was not nil")
|
44
|
-
assert_nil(i.callback, "callback was not nil")
|
45
|
-
end
|
46
|
-
|
47
|
-
def test_match
|
48
|
-
edge = Puppet::Relationship.new(:a, :b)
|
49
|
-
|
50
|
-
assert(! edge.match?(:NONE), "nil event matched :NONE")
|
51
|
-
assert(! edge.match?(:ALL_EVENT), "nil event matched :ALL_EVENTS")
|
52
|
-
assert(! edge.match?(:random), "nil event matched random")
|
53
|
-
|
54
|
-
# Now set the edge to none
|
55
|
-
edge.label = {:event => :NONE}
|
56
|
-
assert(! edge.match?(:NONE), ":NONE event matched :NONE")
|
57
|
-
assert(! edge.match?(:ALL_EVENT), ":NONE event matched :ALL_EVENTS")
|
58
|
-
assert(! edge.match?(:random), ":NONE event matched random")
|
59
|
-
|
60
|
-
# Now set it to :ALL
|
61
|
-
edge.label = {:event => :ALL_EVENTS}
|
62
|
-
assert(! edge.match?(:NONE), ":ALL_EVENTS event matched :NONE")
|
63
|
-
assert(edge.match?(:ALL_EVENTS), ":ALL_EVENTS did not match :ALL_EVENTS")
|
64
|
-
assert(edge.match?(:random), ":ALL_EVENTS did not match random")
|
65
|
-
|
66
|
-
# And finally, :random
|
67
|
-
edge.label = {:event => :random}
|
68
|
-
assert(! edge.match?(:NONE), ":random event matched :NONE")
|
69
|
-
assert(! edge.match?(:ALL_EVENTS), ":random matched :ALL_EVENTS")
|
70
|
-
assert(edge.match?(:random), ":random did not match random")
|
71
|
-
end
|
72
|
-
end
|
73
|
-
|
74
|
-
# $Id: relationship.rb 1983 2006-12-29 04:15:36Z luke $
|
data/test/puppet/modules.rb
DELETED
@@ -1,59 +0,0 @@
|
|
1
|
-
#!/usr/bin/env ruby
|
2
|
-
|
3
|
-
$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
|
4
|
-
|
5
|
-
require 'puppettest'
|
6
|
-
|
7
|
-
class TestModules < Test::Unit::TestCase
|
8
|
-
include PuppetTest
|
9
|
-
|
10
|
-
def setup
|
11
|
-
super
|
12
|
-
@varmods = File::join(Puppet[:vardir], "modules")
|
13
|
-
FileUtils::mkdir_p(@varmods)
|
14
|
-
end
|
15
|
-
|
16
|
-
def test_modulepath
|
17
|
-
Puppet[:modulepath] = "$vardir/modules:/no/such/path/anywhere:.::"
|
18
|
-
assert_equal([ @varmods ], Puppet::Module.modulepath)
|
19
|
-
end
|
20
|
-
|
21
|
-
def test_find
|
22
|
-
assert_nil(Puppet::Module::find("/tmp"))
|
23
|
-
|
24
|
-
file = "testmod/something"
|
25
|
-
assert_nil(Puppet::Module::find(file))
|
26
|
-
|
27
|
-
path = File::join(@varmods, "testmod")
|
28
|
-
FileUtils::mkdir_p(path)
|
29
|
-
|
30
|
-
mod = Puppet::Module::find("testmod")
|
31
|
-
assert_not_nil(mod)
|
32
|
-
assert_equal("testmod", mod.name)
|
33
|
-
assert_equal(path, mod.path)
|
34
|
-
|
35
|
-
mod = Puppet::Module::find(file)
|
36
|
-
assert_not_nil(mod)
|
37
|
-
assert_equal("testmod", mod.name)
|
38
|
-
assert_equal(path, mod.path)
|
39
|
-
end
|
40
|
-
|
41
|
-
def test_find_template
|
42
|
-
templ = "testmod/templ.erb"
|
43
|
-
assert_equal(File::join(Puppet[:templatedir], templ),
|
44
|
-
Puppet::Module::find_template(templ))
|
45
|
-
|
46
|
-
templ_path = File::join(@varmods, "testmod",
|
47
|
-
Puppet::Module::TEMPLATES, "templ.erb")
|
48
|
-
FileUtils::mkdir_p(File::dirname(templ_path))
|
49
|
-
File::open(templ_path, "w") { |f| f.puts "Howdy" }
|
50
|
-
|
51
|
-
assert_equal(templ_path, Puppet::Module::find_template(templ))
|
52
|
-
|
53
|
-
mod = Puppet::Module::find(templ)
|
54
|
-
assert_not_nil(mod)
|
55
|
-
assert_equal(templ_path, mod.template(templ))
|
56
|
-
end
|
57
|
-
end
|
58
|
-
|
59
|
-
# $Id: modules.rb 2655 2007-07-06 22:22:10Z luke $
|
data/test/rails/collection.rb
DELETED
@@ -1,247 +0,0 @@
|
|
1
|
-
#!/usr/bin/env ruby
|
2
|
-
|
3
|
-
$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
|
4
|
-
|
5
|
-
require 'puppet'
|
6
|
-
require 'puppet/rails'
|
7
|
-
require 'puppettest'
|
8
|
-
require 'puppettest/railstesting'
|
9
|
-
require 'puppettest/resourcetesting'
|
10
|
-
|
11
|
-
|
12
|
-
# A separate class for testing rails integration
|
13
|
-
class TestRailsCollection < PuppetTest::TestCase
|
14
|
-
confine "Missing rails support" => Puppet.features.rails?
|
15
|
-
include PuppetTest
|
16
|
-
include PuppetTest::ParserTesting
|
17
|
-
include PuppetTest::ResourceTesting
|
18
|
-
include PuppetTest::RailsTesting
|
19
|
-
Parser = Puppet::Parser
|
20
|
-
AST = Parser::AST
|
21
|
-
|
22
|
-
def setup
|
23
|
-
super
|
24
|
-
Puppet[:trace] = false
|
25
|
-
@interp, @scope, @source = mkclassframing
|
26
|
-
end
|
27
|
-
|
28
|
-
def test_collect_exported
|
29
|
-
railsinit
|
30
|
-
|
31
|
-
# Set a hostname
|
32
|
-
@scope.host = Facter.value(:hostname)
|
33
|
-
|
34
|
-
# make an exported resource
|
35
|
-
exported = mkresource(:type => "file", :title => "/tmp/exported",
|
36
|
-
:exported => true, :params => {:owner => "root"})
|
37
|
-
@scope.setresource exported
|
38
|
-
|
39
|
-
assert(exported.exported?, "Object was not marked exported")
|
40
|
-
assert(exported.virtual?, "Object was not marked virtual")
|
41
|
-
|
42
|
-
# And a non-exported
|
43
|
-
real = mkresource(:type => "file", :title => "/tmp/real",
|
44
|
-
:params => {:owner => "root"})
|
45
|
-
@scope.setresource real
|
46
|
-
|
47
|
-
# Now make a collector
|
48
|
-
coll = nil
|
49
|
-
assert_nothing_raised do
|
50
|
-
coll = Puppet::Parser::Collector.new(@scope, "file", nil, nil, :exported)
|
51
|
-
end
|
52
|
-
|
53
|
-
# Set it in our scope
|
54
|
-
@scope.newcollection(coll)
|
55
|
-
|
56
|
-
# Make sure it's in the collections
|
57
|
-
assert_equal([coll], @scope.collections)
|
58
|
-
|
59
|
-
# And try to collect the virtual resources.
|
60
|
-
ret = nil
|
61
|
-
assert_nothing_raised do
|
62
|
-
ret = coll.collect_exported
|
63
|
-
end
|
64
|
-
|
65
|
-
assert_equal([exported], ret)
|
66
|
-
|
67
|
-
# Now make sure evaluate does the right thing.
|
68
|
-
assert_nothing_raised do
|
69
|
-
ret = coll.evaluate
|
70
|
-
end
|
71
|
-
|
72
|
-
# Make sure that the collection does not find the resource on the
|
73
|
-
# next run.
|
74
|
-
ret = nil
|
75
|
-
assert_nothing_raised do
|
76
|
-
ret = coll.collect_exported
|
77
|
-
end
|
78
|
-
|
79
|
-
assert(ret.empty?, "Exported resource was collected on the second run")
|
80
|
-
|
81
|
-
|
82
|
-
# And make sure our exported object is no longer exported
|
83
|
-
assert(! exported.virtual?, "Virtual object did not get realized")
|
84
|
-
|
85
|
-
# But it should still be marked exported.
|
86
|
-
assert(exported.exported?, "Resource got un-exported")
|
87
|
-
|
88
|
-
# Now make a new collector of a different type and make sure it
|
89
|
-
# finds nothing.
|
90
|
-
assert_nothing_raised do
|
91
|
-
coll = Puppet::Parser::Collector.new(@scope, "exec", nil, nil, :exported)
|
92
|
-
end
|
93
|
-
|
94
|
-
# Remark this as virtual
|
95
|
-
exported.virtual = true
|
96
|
-
|
97
|
-
assert_nothing_raised do
|
98
|
-
ret = coll.evaluate
|
99
|
-
end
|
100
|
-
|
101
|
-
assert(! ret, "got resources back")
|
102
|
-
|
103
|
-
# Now create a whole new scope and make sure we can actually retrieve
|
104
|
-
# the resource from the database, not just from the scope.
|
105
|
-
# First create a host object and store our resource in it.
|
106
|
-
|
107
|
-
# Now collect our facts
|
108
|
-
facts = {}
|
109
|
-
Facter.each do |fact, value| facts[fact] = value end
|
110
|
-
|
111
|
-
# Now try storing our crap
|
112
|
-
# Remark this as exported
|
113
|
-
exported.exported = true
|
114
|
-
host = Puppet::Rails::Host.store(
|
115
|
-
:resources => [exported],
|
116
|
-
:facts => facts,
|
117
|
-
:name => facts["hostname"]
|
118
|
-
)
|
119
|
-
assert(host, "did not get rails host")
|
120
|
-
host.save
|
121
|
-
|
122
|
-
# And make sure it's in there
|
123
|
-
newres = host.resources.find_by_restype_and_title_and_exported("file", "/tmp/exported", true)
|
124
|
-
assert(newres, "Did not find resource in db")
|
125
|
-
interp, scope, source = mkclassframing
|
126
|
-
scope.host = "two"
|
127
|
-
|
128
|
-
# Now make a collector
|
129
|
-
coll = nil
|
130
|
-
assert_nothing_raised do
|
131
|
-
coll = Puppet::Parser::Collector.new(scope, "file", nil, nil, :exported)
|
132
|
-
end
|
133
|
-
|
134
|
-
# Set it in our scope
|
135
|
-
scope.newcollection(coll)
|
136
|
-
|
137
|
-
# Make sure it's in the collections
|
138
|
-
assert_equal([coll], scope.collections)
|
139
|
-
|
140
|
-
# And try to collect the virtual resources.
|
141
|
-
ret = nil
|
142
|
-
assert_nothing_raised do
|
143
|
-
ret = coll.collect_exported
|
144
|
-
end
|
145
|
-
|
146
|
-
assert_equal(["/tmp/exported"], ret.collect { |f| f.title })
|
147
|
-
|
148
|
-
# Make sure we can evaluate the same collection multiple times and
|
149
|
-
# that later collections do nothing
|
150
|
-
assert_nothing_raised("Collection found same resource twice") do
|
151
|
-
ret = coll.evaluate
|
152
|
-
end
|
153
|
-
end
|
154
|
-
|
155
|
-
def test_collection_conflicts
|
156
|
-
railsinit
|
157
|
-
|
158
|
-
# First make a railshost we can conflict with
|
159
|
-
host = Puppet::Rails::Host.new(:name => "myhost")
|
160
|
-
|
161
|
-
host.resources.build(:title => "/tmp/conflicttest", :restype => "file",
|
162
|
-
:exported => true)
|
163
|
-
|
164
|
-
host.save
|
165
|
-
|
166
|
-
# Now make a normal resource
|
167
|
-
normal = mkresource(:type => "file", :title => "/tmp/conflicttest",
|
168
|
-
:params => {:owner => "root"})
|
169
|
-
@scope.setresource normal
|
170
|
-
@scope.host = "otherhost"
|
171
|
-
|
172
|
-
# Now make a collector
|
173
|
-
coll = nil
|
174
|
-
assert_nothing_raised do
|
175
|
-
coll = Puppet::Parser::Collector.new(@scope, "file", nil, nil, :exported)
|
176
|
-
end
|
177
|
-
|
178
|
-
# And try to collect the virtual resources.
|
179
|
-
assert_raise(Puppet::ParseError) do
|
180
|
-
ret = coll.collect_exported
|
181
|
-
end
|
182
|
-
end
|
183
|
-
|
184
|
-
# Make sure we do not collect resources from the host we're on
|
185
|
-
def test_no_resources_from_me
|
186
|
-
railsinit
|
187
|
-
|
188
|
-
# Make our configuration
|
189
|
-
host = Puppet::Rails::Host.new(:name => "myhost")
|
190
|
-
|
191
|
-
host.resources.build(:title => "/tmp/hosttest", :restype => "file",
|
192
|
-
:exported => true)
|
193
|
-
|
194
|
-
host.save
|
195
|
-
|
196
|
-
@scope.host = "myhost"
|
197
|
-
|
198
|
-
# Now make a collector
|
199
|
-
coll = nil
|
200
|
-
assert_nothing_raised do
|
201
|
-
coll = Puppet::Parser::Collector.new(@scope, "file", nil, nil, :exported)
|
202
|
-
end
|
203
|
-
|
204
|
-
# And make sure we get nada back
|
205
|
-
ret = nil
|
206
|
-
assert_nothing_raised do
|
207
|
-
ret = coll.collect_exported
|
208
|
-
end
|
209
|
-
|
210
|
-
assert(ret.empty?, "Found exports from our own host")
|
211
|
-
end
|
212
|
-
|
213
|
-
# #731 -- we're collecting all resources, not just exported resources.
|
214
|
-
def test_only_collecting_exported_resources
|
215
|
-
railsinit
|
216
|
-
|
217
|
-
# Make our configuration
|
218
|
-
host = Puppet::Rails::Host.new(:name => "myhost")
|
219
|
-
|
220
|
-
host.resources.build(:title => "/tmp/exporttest1", :restype => "file",
|
221
|
-
:exported => true)
|
222
|
-
host.resources.build(:title => "/tmp/exporttest2", :restype => "file",
|
223
|
-
:exported => false)
|
224
|
-
|
225
|
-
host.save
|
226
|
-
|
227
|
-
@scope.host = "otherhost"
|
228
|
-
|
229
|
-
# Now make a collector
|
230
|
-
coll = nil
|
231
|
-
assert_nothing_raised do
|
232
|
-
coll = Puppet::Parser::Collector.new(@scope, "file", nil, nil, :exported)
|
233
|
-
end
|
234
|
-
|
235
|
-
# And make sure we get nada back
|
236
|
-
ret = nil
|
237
|
-
assert_nothing_raised do
|
238
|
-
ret = coll.collect_exported
|
239
|
-
end
|
240
|
-
|
241
|
-
names = ret.collect { |res| res.title }
|
242
|
-
|
243
|
-
assert_equal(%w{/tmp/exporttest1}, names, "Collected incorrect resource list")
|
244
|
-
end
|
245
|
-
end
|
246
|
-
|
247
|
-
# $Id: collection.rb 2746 2007-08-05 17:57:31Z luke $
|
data/test/rails/interpreter.rb
DELETED
@@ -1,91 +0,0 @@
|
|
1
|
-
#!/usr/bin/env ruby
|
2
|
-
|
3
|
-
$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
|
4
|
-
|
5
|
-
require 'puppettest'
|
6
|
-
require 'puppet/parser/interpreter'
|
7
|
-
require 'puppet/parser/parser'
|
8
|
-
require 'puppet/network/client'
|
9
|
-
require 'puppet/rails'
|
10
|
-
require 'puppettest/resourcetesting'
|
11
|
-
require 'puppettest/parsertesting'
|
12
|
-
require 'puppettest/servertest'
|
13
|
-
require 'puppettest/railstesting'
|
14
|
-
|
15
|
-
|
16
|
-
class InterpreterRailsTests < PuppetTest::TestCase
|
17
|
-
include PuppetTest
|
18
|
-
include PuppetTest::ServerTest
|
19
|
-
include PuppetTest::ParserTesting
|
20
|
-
include PuppetTest::ResourceTesting
|
21
|
-
include PuppetTest::RailsTesting
|
22
|
-
AST = Puppet::Parser::AST
|
23
|
-
NodeDef = Puppet::Parser::Interpreter::NodeDef
|
24
|
-
confine "No rails support" => Puppet.features.rails?
|
25
|
-
|
26
|
-
# We need to make sure finished objects are stored in the db.
|
27
|
-
def test_finish_before_store
|
28
|
-
railsinit
|
29
|
-
interp = mkinterp
|
30
|
-
|
31
|
-
node = interp.newnode ["myhost"], :code => AST::ASTArray.new(:children => [
|
32
|
-
resourcedef("file", "/tmp/yay", :group => "root"),
|
33
|
-
defaultobj("file", :owner => "root")
|
34
|
-
])
|
35
|
-
|
36
|
-
interp.newclass "myclass", :code => AST::ASTArray.new(:children => [
|
37
|
-
])
|
38
|
-
|
39
|
-
interp.newclass "sub", :parent => "myclass",
|
40
|
-
:code => AST::ASTArray.new(:children => [
|
41
|
-
resourceoverride("file", "/tmp/yay", :owner => "root")
|
42
|
-
]
|
43
|
-
)
|
44
|
-
|
45
|
-
# Now do the rails crap
|
46
|
-
Puppet[:storeconfigs] = true
|
47
|
-
|
48
|
-
interp.evaluate("myhost", {})
|
49
|
-
|
50
|
-
# And then retrieve the object from rails
|
51
|
-
#res = Puppet::Rails::Resource.find_by_restype_and_title("file", "/tmp/yay", :include => {:param_values => :param_names})
|
52
|
-
res = Puppet::Rails::Resource.find_by_restype_and_title("file", "/tmp/yay")
|
53
|
-
|
54
|
-
assert(res, "Did not get resource from rails")
|
55
|
-
|
56
|
-
params = res.parameters
|
57
|
-
|
58
|
-
assert_equal(["root"], params["owner"], "Did not get correct value for owner param")
|
59
|
-
end
|
60
|
-
|
61
|
-
def test_hoststorage
|
62
|
-
assert_nothing_raised {
|
63
|
-
Puppet[:storeconfigs] = true
|
64
|
-
}
|
65
|
-
|
66
|
-
file = tempfile()
|
67
|
-
File.open(file, "w") { |f|
|
68
|
-
f.puts "file { \"/etc\": owner => root }"
|
69
|
-
}
|
70
|
-
|
71
|
-
interp = nil
|
72
|
-
assert_nothing_raised {
|
73
|
-
interp = Puppet::Parser::Interpreter.new(
|
74
|
-
:Manifest => file,
|
75
|
-
:UseNodes => false,
|
76
|
-
:ForkSave => false
|
77
|
-
)
|
78
|
-
}
|
79
|
-
|
80
|
-
facts = {}
|
81
|
-
Facter.each { |fact, val| facts[fact] = val }
|
82
|
-
|
83
|
-
objects = nil
|
84
|
-
assert_nothing_raised {
|
85
|
-
objects = interp.run(facts["hostname"], facts)
|
86
|
-
}
|
87
|
-
|
88
|
-
obj = Puppet::Rails::Host.find_by_name(facts["hostname"])
|
89
|
-
assert(obj, "Could not find host object")
|
90
|
-
end
|
91
|
-
end
|