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
@@ -1,231 +0,0 @@
|
|
1
|
-
module Spec
|
2
|
-
module Mocks
|
3
|
-
|
4
|
-
class BaseExpectation
|
5
|
-
attr_reader :sym
|
6
|
-
|
7
|
-
def initialize(error_generator, expectation_ordering, expected_from, sym, method_block, expected_received_count=1, opts={})
|
8
|
-
@error_generator = error_generator
|
9
|
-
@error_generator.opts = opts
|
10
|
-
@expected_from = expected_from
|
11
|
-
@sym = sym
|
12
|
-
@method_block = method_block
|
13
|
-
@return_block = lambda {}
|
14
|
-
@received_count = 0
|
15
|
-
@expected_received_count = expected_received_count
|
16
|
-
@args_expectation = ArgumentExpectation.new([:any_args])
|
17
|
-
@consecutive = false
|
18
|
-
@exception_to_raise = nil
|
19
|
-
@symbol_to_throw = nil
|
20
|
-
@order_group = expectation_ordering
|
21
|
-
@at_least = nil
|
22
|
-
@at_most = nil
|
23
|
-
@args_to_yield = nil
|
24
|
-
end
|
25
|
-
|
26
|
-
def expected_args
|
27
|
-
@args_expectation.args
|
28
|
-
end
|
29
|
-
|
30
|
-
def and_return(*values, &return_block)
|
31
|
-
Kernel::raise AmbiguousReturnError unless @method_block.nil?
|
32
|
-
if values.size == 0
|
33
|
-
value = nil
|
34
|
-
elsif values.size == 1
|
35
|
-
value = values[0]
|
36
|
-
else
|
37
|
-
value = values
|
38
|
-
@consecutive = true
|
39
|
-
@expected_received_count = values.size if @expected_received_count != :any &&
|
40
|
-
@expected_received_count < values.size
|
41
|
-
end
|
42
|
-
@return_block = block_given? ? return_block : lambda { value }
|
43
|
-
end
|
44
|
-
|
45
|
-
def and_raise(exception=Exception)
|
46
|
-
@exception_to_raise = exception
|
47
|
-
end
|
48
|
-
|
49
|
-
def and_throw(symbol)
|
50
|
-
@symbol_to_throw = symbol
|
51
|
-
end
|
52
|
-
|
53
|
-
def and_yield(*args)
|
54
|
-
@args_to_yield = args
|
55
|
-
end
|
56
|
-
|
57
|
-
def matches(sym, args)
|
58
|
-
@sym == sym and @args_expectation.check_args(args)
|
59
|
-
end
|
60
|
-
|
61
|
-
def invoke(args, block)
|
62
|
-
@order_group.handle_order_constraint self
|
63
|
-
|
64
|
-
begin
|
65
|
-
if @exception_to_raise.class == Class
|
66
|
-
@exception_instance_to_raise = @exception_to_raise.new
|
67
|
-
else
|
68
|
-
@exception_instance_to_raise = @exception_to_raise
|
69
|
-
end
|
70
|
-
Kernel::raise @exception_to_raise unless @exception_to_raise.nil?
|
71
|
-
Kernel::throw @symbol_to_throw unless @symbol_to_throw.nil?
|
72
|
-
|
73
|
-
if !@method_block.nil?
|
74
|
-
return invoke_method_block(args)
|
75
|
-
elsif !@args_to_yield.nil?
|
76
|
-
return invoke_with_yield(block)
|
77
|
-
elsif @consecutive
|
78
|
-
return invoke_consecutive_return_block(args, block)
|
79
|
-
else
|
80
|
-
return invoke_return_block(args, block)
|
81
|
-
end
|
82
|
-
ensure
|
83
|
-
@received_count += 1
|
84
|
-
end
|
85
|
-
end
|
86
|
-
|
87
|
-
protected
|
88
|
-
|
89
|
-
def invoke_method_block(args)
|
90
|
-
begin
|
91
|
-
@method_block.call(*args)
|
92
|
-
rescue => detail
|
93
|
-
@error_generator.raise_block_failed_error @sym, detail.message
|
94
|
-
end
|
95
|
-
end
|
96
|
-
|
97
|
-
def invoke_with_yield(block)
|
98
|
-
if block.nil?
|
99
|
-
@error_generator.raise_missing_block_error @args_to_yield
|
100
|
-
end
|
101
|
-
if block.arity > -1 && @args_to_yield.length != block.arity
|
102
|
-
@error_generator.raise_wrong_arity_error @args_to_yield, block.arity
|
103
|
-
end
|
104
|
-
block.call(*@args_to_yield)
|
105
|
-
end
|
106
|
-
|
107
|
-
def invoke_consecutive_return_block(args, block)
|
108
|
-
args << block unless block.nil?
|
109
|
-
value = @return_block.call(*args)
|
110
|
-
|
111
|
-
index = [@received_count, value.size-1].min
|
112
|
-
value[index]
|
113
|
-
end
|
114
|
-
|
115
|
-
def invoke_return_block(args, block)
|
116
|
-
args << block unless block.nil?
|
117
|
-
value = @return_block.call(*args)
|
118
|
-
|
119
|
-
value
|
120
|
-
end
|
121
|
-
end
|
122
|
-
|
123
|
-
class MessageExpectation < BaseExpectation
|
124
|
-
|
125
|
-
def matches_name_but_not_args(sym, args)
|
126
|
-
@sym == sym and not @args_expectation.check_args(args)
|
127
|
-
end
|
128
|
-
|
129
|
-
def verify_messages_received
|
130
|
-
return if @expected_received_count == :any
|
131
|
-
return if (@at_least) && (@received_count >= @expected_received_count)
|
132
|
-
return if (@at_most) && (@received_count <= @expected_received_count)
|
133
|
-
return if @expected_received_count == @received_count
|
134
|
-
|
135
|
-
begin
|
136
|
-
@error_generator.raise_expectation_error(@sym, @expected_received_count, @received_count, *@args_expectation.args)
|
137
|
-
rescue => error
|
138
|
-
error.backtrace.insert(0, @expected_from)
|
139
|
-
Kernel::raise error
|
140
|
-
end
|
141
|
-
end
|
142
|
-
|
143
|
-
def with(*args, &block)
|
144
|
-
@method_block = block if block
|
145
|
-
@args_expectation = ArgumentExpectation.new(args)
|
146
|
-
self
|
147
|
-
end
|
148
|
-
|
149
|
-
def exactly(n)
|
150
|
-
set_expected_received_count :exactly, n
|
151
|
-
self
|
152
|
-
end
|
153
|
-
|
154
|
-
def at_least(n)
|
155
|
-
set_expected_received_count :at_least, n
|
156
|
-
self
|
157
|
-
end
|
158
|
-
|
159
|
-
def at_most(n)
|
160
|
-
set_expected_received_count :at_most, n
|
161
|
-
self
|
162
|
-
end
|
163
|
-
|
164
|
-
def times(&block)
|
165
|
-
@method_block = block if block
|
166
|
-
self
|
167
|
-
end
|
168
|
-
|
169
|
-
def any_number_of_times(&block)
|
170
|
-
@method_block = block if block
|
171
|
-
@expected_received_count = :any
|
172
|
-
self
|
173
|
-
end
|
174
|
-
|
175
|
-
def never
|
176
|
-
@expected_received_count = 0
|
177
|
-
self
|
178
|
-
end
|
179
|
-
|
180
|
-
def once(&block)
|
181
|
-
@method_block = block if block
|
182
|
-
@expected_received_count = 1
|
183
|
-
self
|
184
|
-
end
|
185
|
-
|
186
|
-
def twice(&block)
|
187
|
-
@method_block = block if block
|
188
|
-
@expected_received_count = 2
|
189
|
-
self
|
190
|
-
end
|
191
|
-
|
192
|
-
def ordered(&block)
|
193
|
-
@method_block = block if block
|
194
|
-
@order_group.register(self)
|
195
|
-
@ordered = true
|
196
|
-
self
|
197
|
-
end
|
198
|
-
|
199
|
-
def negative_expectation_for?(sym)
|
200
|
-
return false
|
201
|
-
end
|
202
|
-
|
203
|
-
protected
|
204
|
-
def set_expected_received_count(relativity, n)
|
205
|
-
@at_least = (relativity == :at_least)
|
206
|
-
@at_most = (relativity == :at_most)
|
207
|
-
@expected_received_count = 1 if n == :once
|
208
|
-
@expected_received_count = 2 if n == :twice
|
209
|
-
@expected_received_count = n if n.kind_of? Numeric
|
210
|
-
end
|
211
|
-
|
212
|
-
end
|
213
|
-
|
214
|
-
class NegativeMessageExpectation < MessageExpectation
|
215
|
-
def initialize(message, expectation_ordering, expected_from, sym, method_block)
|
216
|
-
super(message, expectation_ordering, expected_from, sym, method_block, 0)
|
217
|
-
end
|
218
|
-
|
219
|
-
def negative_expectation_for?(sym)
|
220
|
-
return @sym == sym
|
221
|
-
end
|
222
|
-
end
|
223
|
-
|
224
|
-
class MethodStub < BaseExpectation
|
225
|
-
def initialize(message, expectation_ordering, expected_from, sym, method_block)
|
226
|
-
super(message, expectation_ordering, expected_from, sym, method_block, 0)
|
227
|
-
@expected_received_count = :any
|
228
|
-
end
|
229
|
-
end
|
230
|
-
end
|
231
|
-
end
|
@@ -1,40 +0,0 @@
|
|
1
|
-
module Spec
|
2
|
-
module Mocks
|
3
|
-
module Methods
|
4
|
-
def should_receive(sym, opts={}, &block)
|
5
|
-
__mock_handler.add_message_expectation(opts[:expected_from] || caller(1)[0], sym, opts, &block)
|
6
|
-
end
|
7
|
-
|
8
|
-
def should_not_receive(sym, &block)
|
9
|
-
__mock_handler.add_negative_message_expectation(caller(1)[0], sym, &block)
|
10
|
-
end
|
11
|
-
|
12
|
-
def stub!(sym)
|
13
|
-
__mock_handler.add_stub(caller(1)[0], sym)
|
14
|
-
end
|
15
|
-
|
16
|
-
def received_message?(sym, *args, &block) #:nodoc:
|
17
|
-
__mock_handler.received_message?(sym, *args, &block)
|
18
|
-
end
|
19
|
-
|
20
|
-
def __verify #:nodoc:
|
21
|
-
__mock_handler.verify
|
22
|
-
end
|
23
|
-
|
24
|
-
def __reset_mock #:nodoc:
|
25
|
-
__mock_handler.reset
|
26
|
-
end
|
27
|
-
|
28
|
-
def method_missing(sym, *args, &block) #:nodoc:
|
29
|
-
__mock_handler.instance_eval {@messages_received << [sym, args, block]}
|
30
|
-
super(sym, *args, &block)
|
31
|
-
end
|
32
|
-
|
33
|
-
private
|
34
|
-
|
35
|
-
def __mock_handler
|
36
|
-
@mock_handler ||= MockHandler.new(self, @name, @options)
|
37
|
-
end
|
38
|
-
end
|
39
|
-
end
|
40
|
-
end
|
data/test/lib/spec/mocks/mock.rb
DELETED
@@ -1,26 +0,0 @@
|
|
1
|
-
module Spec
|
2
|
-
module Mocks
|
3
|
-
class Mock
|
4
|
-
include Methods
|
5
|
-
|
6
|
-
# Creates a new mock with a +name+ (that will be used in error messages only)
|
7
|
-
# == Options:
|
8
|
-
# * <tt>:null_object</tt> - if true, the mock object acts as a forgiving null object allowing any message to be sent to it.
|
9
|
-
def initialize(name, options={})
|
10
|
-
@name = name
|
11
|
-
@options = options
|
12
|
-
end
|
13
|
-
|
14
|
-
def method_missing(sym, *args, &block)
|
15
|
-
__mock_handler.instance_eval {@messages_received << [sym, args, block]}
|
16
|
-
begin
|
17
|
-
return self if __mock_handler.null_object?
|
18
|
-
super(sym, *args, &block)
|
19
|
-
rescue NoMethodError
|
20
|
-
__mock_handler.raise_unexpected_message_error sym, *args
|
21
|
-
end
|
22
|
-
end
|
23
|
-
|
24
|
-
end
|
25
|
-
end
|
26
|
-
end
|
@@ -1,166 +0,0 @@
|
|
1
|
-
module Spec
|
2
|
-
module Mocks
|
3
|
-
class MockHandler
|
4
|
-
DEFAULT_OPTIONS = {
|
5
|
-
:null_object => false,
|
6
|
-
:auto_verify => true
|
7
|
-
}
|
8
|
-
|
9
|
-
def initialize(target, name, options={})
|
10
|
-
@target = target
|
11
|
-
@name = name
|
12
|
-
@error_generator = ErrorGenerator.new target, name
|
13
|
-
@expectation_ordering = OrderGroup.new @error_generator
|
14
|
-
@expectations = []
|
15
|
-
@messages_received = []
|
16
|
-
@stubs = []
|
17
|
-
@proxied_methods = []
|
18
|
-
@options = options ? DEFAULT_OPTIONS.dup.merge(options) : DEFAULT_OPTIONS
|
19
|
-
end
|
20
|
-
|
21
|
-
def null_object?
|
22
|
-
@options[:null_object]
|
23
|
-
end
|
24
|
-
|
25
|
-
def add_message_expectation(expected_from, sym, opts={}, &block)
|
26
|
-
__add expected_from, sym, block
|
27
|
-
@expectations << MessageExpectation.new(@error_generator, @expectation_ordering, expected_from, sym, block_given? ? block : nil, 1, opts)
|
28
|
-
@expectations.last
|
29
|
-
end
|
30
|
-
|
31
|
-
def add_negative_message_expectation(expected_from, sym, &block)
|
32
|
-
__add expected_from, sym, block
|
33
|
-
@expectations << NegativeMessageExpectation.new(@error_generator, @expectation_ordering, expected_from, sym, block_given? ? block : nil)
|
34
|
-
@expectations.last
|
35
|
-
end
|
36
|
-
|
37
|
-
def add_stub(expected_from, sym)
|
38
|
-
__add expected_from, sym, nil
|
39
|
-
@stubs.unshift MethodStub.new(@error_generator, @expectation_ordering, expected_from, sym, nil)
|
40
|
-
@stubs.first
|
41
|
-
end
|
42
|
-
|
43
|
-
def verify #:nodoc:
|
44
|
-
begin
|
45
|
-
verify_expectations
|
46
|
-
ensure
|
47
|
-
reset
|
48
|
-
end
|
49
|
-
end
|
50
|
-
|
51
|
-
def reset
|
52
|
-
clear_expectations
|
53
|
-
clear_stubs
|
54
|
-
reset_proxied_methods
|
55
|
-
clear_proxied_methods
|
56
|
-
end
|
57
|
-
|
58
|
-
def received_message?(sym, *args, &block)
|
59
|
-
return true if @messages_received.find {|array| array == [sym, args, block]}
|
60
|
-
return false
|
61
|
-
end
|
62
|
-
|
63
|
-
def has_negative_expectation?(sym)
|
64
|
-
@expectations.detect {|expectation| expectation.negative_expectation_for?(sym)}
|
65
|
-
end
|
66
|
-
|
67
|
-
def message_received(sym, *args, &block)
|
68
|
-
if expectation = find_matching_expectation(sym, *args)
|
69
|
-
expectation.invoke(args, block)
|
70
|
-
elsif stub = find_matching_method_stub(sym)
|
71
|
-
stub.invoke([], block)
|
72
|
-
elsif expectation = find_almost_matching_expectation(sym, *args)
|
73
|
-
raise_unexpected_message_args_error(expectation, *args) unless has_negative_expectation?(sym) unless null_object?
|
74
|
-
else
|
75
|
-
@target.send :method_missing, sym, *args, &block
|
76
|
-
end
|
77
|
-
end
|
78
|
-
|
79
|
-
def raise_unexpected_message_args_error(expectation, *args)
|
80
|
-
@error_generator.raise_unexpected_message_args_error expectation, *args
|
81
|
-
end
|
82
|
-
|
83
|
-
def raise_unexpected_message_error(sym, *args)
|
84
|
-
@error_generator.raise_unexpected_message_error sym, *args
|
85
|
-
end
|
86
|
-
|
87
|
-
private
|
88
|
-
|
89
|
-
def __add(expected_from, sym, block)
|
90
|
-
# TODO - this is the only reference in the 'spec/mocks' to the Runner
|
91
|
-
current_spec = Runner::Specification.current
|
92
|
-
current_spec.after_teardown {verify} if current_spec && @options[:auto_verify]
|
93
|
-
define_expected_method(sym)
|
94
|
-
end
|
95
|
-
|
96
|
-
def define_expected_method(sym)
|
97
|
-
if target_responds_to?(sym) && !@proxied_methods.include?(sym)
|
98
|
-
@proxied_methods << sym
|
99
|
-
metaclass.__send__(:alias_method, munge(sym), sym)
|
100
|
-
end
|
101
|
-
|
102
|
-
metaclass_eval(<<-EOF, __FILE__, __LINE__)
|
103
|
-
def #{sym}(*args, &block)
|
104
|
-
__mock_handler.message_received :#{sym}, *args, &block
|
105
|
-
end
|
106
|
-
EOF
|
107
|
-
end
|
108
|
-
|
109
|
-
def target_responds_to?(sym)
|
110
|
-
return @target.send(munge(:respond_to?),sym) if @already_proxied_respond_to
|
111
|
-
return @already_proxied_respond_to = true if sym == :respond_to?
|
112
|
-
return @target.respond_to?(sym)
|
113
|
-
end
|
114
|
-
|
115
|
-
def munge(sym)
|
116
|
-
"proxied_by_rspec__#{sym.to_s}".to_sym
|
117
|
-
end
|
118
|
-
|
119
|
-
def clear_expectations
|
120
|
-
@expectations.clear
|
121
|
-
end
|
122
|
-
|
123
|
-
def clear_stubs
|
124
|
-
@stubs.clear
|
125
|
-
end
|
126
|
-
|
127
|
-
def clear_proxied_methods
|
128
|
-
@proxied_methods.clear
|
129
|
-
end
|
130
|
-
|
131
|
-
def metaclass_eval(str, filename, lineno)
|
132
|
-
metaclass.class_eval(str, filename, lineno)
|
133
|
-
end
|
134
|
-
|
135
|
-
def metaclass
|
136
|
-
(class << @target; self; end)
|
137
|
-
end
|
138
|
-
|
139
|
-
def verify_expectations
|
140
|
-
@expectations.each do |expectation|
|
141
|
-
expectation.verify_messages_received
|
142
|
-
end
|
143
|
-
end
|
144
|
-
|
145
|
-
def reset_proxied_methods
|
146
|
-
@proxied_methods.each do |sym|
|
147
|
-
metaclass.__send__(:alias_method, sym, munge(sym))
|
148
|
-
metaclass.__send__(:undef_method, munge(sym))
|
149
|
-
end
|
150
|
-
end
|
151
|
-
|
152
|
-
def find_matching_expectation(sym, *args)
|
153
|
-
@expectations.find {|expectation| expectation.matches(sym, args)}
|
154
|
-
end
|
155
|
-
|
156
|
-
def find_almost_matching_expectation(sym, *args)
|
157
|
-
@expectations.find {|expectation| expectation.matches_name_but_not_args(sym, args)}
|
158
|
-
end
|
159
|
-
|
160
|
-
def find_matching_method_stub(sym)
|
161
|
-
@stubs.find {|stub| stub.matches(sym, [])}
|
162
|
-
end
|
163
|
-
|
164
|
-
end
|
165
|
-
end
|
166
|
-
end
|