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/lib/spec/mocks.rb
DELETED
@@ -1,232 +0,0 @@
|
|
1
|
-
require 'spec/mocks/methods'
|
2
|
-
require 'spec/mocks/mock_handler'
|
3
|
-
require 'spec/mocks/mock'
|
4
|
-
require 'spec/mocks/argument_expectation'
|
5
|
-
require 'spec/mocks/message_expectation'
|
6
|
-
require 'spec/mocks/order_group'
|
7
|
-
require 'spec/mocks/errors'
|
8
|
-
require 'spec/mocks/error_generator'
|
9
|
-
require 'spec/mocks/extensions/object'
|
10
|
-
|
11
|
-
module Spec
|
12
|
-
# == Mocks and Stubs
|
13
|
-
#
|
14
|
-
# RSpec will create Mock Objects and Stubs for you at runtime, or attach stub/mock behaviour
|
15
|
-
# to any of your real objects (Partial Mock/Stub). Because the underlying implementation
|
16
|
-
# for mocks and stubs is the same, you can intermingle mock and stub
|
17
|
-
# behaviour in either dynamically generated mocks or your pre-existing classes.
|
18
|
-
# There is a semantic difference in how they are created, however,
|
19
|
-
# which can help clarify the role it is playing within a given spec.
|
20
|
-
#
|
21
|
-
# == Mock Objects
|
22
|
-
#
|
23
|
-
# Mocks are objects that allow you to set and verify expectations that they will
|
24
|
-
# receive specific messages during run time. They are very useful for specifying how the subject of
|
25
|
-
# the spec interacts with its collaborators. This approach is widely known as "interaction
|
26
|
-
# testing".
|
27
|
-
#
|
28
|
-
# Mocks are also very powerful as a design tool. As you are
|
29
|
-
# driving the implementation of a given class, Mocks provide an anonymous
|
30
|
-
# collaborator that can change in behaviour as quickly as you can write an expectation in your
|
31
|
-
# spec. This flexibility allows you to design the interface of a collaborator that often
|
32
|
-
# does not yet exist. As the shape of the class being specified becomes more clear, so do the
|
33
|
-
# requirements for its collaborators - often leading to the discovery of new types that are
|
34
|
-
# needed in your system.
|
35
|
-
#
|
36
|
-
# Read Endo-Testing[http://www.mockobjects.com/files/endotesting.pdf] for a much
|
37
|
-
# more in depth description of this process.
|
38
|
-
#
|
39
|
-
# == Stubs
|
40
|
-
#
|
41
|
-
# Stubs are objects that allow you to set "stub" responses to
|
42
|
-
# messages. As Martin Fowler points out on his site,
|
43
|
-
# mocks_arent_stubs[http://www.martinfowler.com/articles/mocksArentStubs.html].
|
44
|
-
# Paraphrasing Fowler's paraphrasing
|
45
|
-
# of Gerard Meszaros: Stubs provide canned responses to messages they might receive in a test, while
|
46
|
-
# mocks allow you to specify and, subsquently, verify that certain messages should be received during
|
47
|
-
# the execution of a test.
|
48
|
-
#
|
49
|
-
# == Partial Mocks/Stubs
|
50
|
-
#
|
51
|
-
# RSpec also supports partial mocking/stubbing, allowing you to add stub/mock behaviour
|
52
|
-
# to instances of your existing classes. This is generally
|
53
|
-
# something to be avoided, because changes to the class can have ripple effects on
|
54
|
-
# seemingly unrelated specs. When specs fail due to these ripple effects, the fact
|
55
|
-
# that some methods are being mocked can make it difficult to understand why a
|
56
|
-
# failure is occurring.
|
57
|
-
#
|
58
|
-
# That said, partials do allow you to expect and
|
59
|
-
# verify interactions with class methods such as +#find+ and +#create+
|
60
|
-
# on Ruby on Rails model classes.
|
61
|
-
#
|
62
|
-
# == Further Reading
|
63
|
-
#
|
64
|
-
# There are many different viewpoints about the meaning of mocks and stubs. If you are interested
|
65
|
-
# in learning more, here is some recommended reading:
|
66
|
-
#
|
67
|
-
# * Mock Objects: http://www.mockobjects.com/
|
68
|
-
# * Endo-Testing: http://www.mockobjects.com/files/endotesting.pdf
|
69
|
-
# * Mock Roles, Not Objects: http://www.mockobjects.com/files/mockrolesnotobjects.pdf
|
70
|
-
# * Test Double Patterns: http://xunitpatterns.com/Test%20Double%20Patterns.html
|
71
|
-
# * Mocks aren't stubs: http://www.martinfowler.com/articles/mocksArentStubs.html
|
72
|
-
#
|
73
|
-
# == Creating a Mock
|
74
|
-
#
|
75
|
-
# You can create a mock in any specification (or setup) using:
|
76
|
-
#
|
77
|
-
# mock(name, options={})
|
78
|
-
#
|
79
|
-
# The optional +options+ argument is a +Hash+. Currently the only supported
|
80
|
-
# option is +:null_object+. Setting this to true instructs the mock to ignore
|
81
|
-
# any messages it hasn’t been told to expect – and quietly return itself. For example:
|
82
|
-
#
|
83
|
-
# mock("person", :null_object => true)
|
84
|
-
#
|
85
|
-
# == Creating a Stub
|
86
|
-
#
|
87
|
-
# You can create a stub in any specification (or setup) using:
|
88
|
-
#
|
89
|
-
# stub(name, stub_methods_and_values_hash)
|
90
|
-
#
|
91
|
-
# For example, if you wanted to create an object that always returns
|
92
|
-
# "More?!?!?!" to "please_sir_may_i_have_some_more" you would do this:
|
93
|
-
#
|
94
|
-
# stub("Mr Sykes", :please_sir_may_i_have_some_more => "More?!?!?!")
|
95
|
-
#
|
96
|
-
# == Creating a Partial Mock
|
97
|
-
#
|
98
|
-
# You don't really "create" a partial mock, you simply add method stubs and/or
|
99
|
-
# mock expectations to existing classes and objects:
|
100
|
-
#
|
101
|
-
# Factory.should_receive(:find).with(id).and_return(value)
|
102
|
-
# obj.stub!(:to_i).and_return(3)
|
103
|
-
# etc ...
|
104
|
-
#
|
105
|
-
# == Expecting Messages
|
106
|
-
#
|
107
|
-
# my_mock.should_receive(:sym)
|
108
|
-
# my_mock.should_not_receive(:sym)
|
109
|
-
#
|
110
|
-
# == Expecting Arguments
|
111
|
-
#
|
112
|
-
# my_mock.should_receive(:sym).with(*args)
|
113
|
-
# my_mock.should_not_receive(:sym).with(*args)
|
114
|
-
#
|
115
|
-
# == Argument Constraints using Expression Matchers
|
116
|
-
#
|
117
|
-
# Arguments that are passed to #with are compared with actual arguments received
|
118
|
-
# using == by default. In cases in which you want to specify things about the arguments
|
119
|
-
# rather than the arguments themselves, you can use any of the Expression Matchers.
|
120
|
-
# They don't all make syntactic sense (they were primarily designed for use with
|
121
|
-
# Spec::Expectations), but you are free to create your own custom Spec::Matchers.
|
122
|
-
#
|
123
|
-
# Spec::Mocks does provide one additional Matcher method named #ducktype.
|
124
|
-
#
|
125
|
-
# In addition, Spec::Mocks adds some keyword Symbols that you can use to
|
126
|
-
# specify certain kinds of arguments:
|
127
|
-
#
|
128
|
-
# my_mock.should_receive(:sym).with(:no_args)
|
129
|
-
# my_mock.should_receive(:sym).with(:any_args)
|
130
|
-
# my_mock.should_receive(:sym).with(1, :numeric, "b") #2nd argument can any type of Numeric
|
131
|
-
# my_mock.should_receive(:sym).with(1, :boolean, "b") #2nd argument can true or false
|
132
|
-
# my_mock.should_receive(:sym).with(1, :string, "b") #2nd argument can be any String
|
133
|
-
# my_mock.should_receive(:sym).with(1, /abc/, "b") #2nd argument can be any String matching the submitted Regexp
|
134
|
-
# my_mock.should_receive(:sym).with(1, :anything, "b") #2nd argument can be anything at all
|
135
|
-
# my_mock.should_receive(:sym).with(1, ducktype(:abs, :div), "b")
|
136
|
-
# #2nd argument can be object that responds to #abs and #div
|
137
|
-
#
|
138
|
-
# == Receive Counts
|
139
|
-
#
|
140
|
-
# my_mock.should_receive(:sym).once
|
141
|
-
# my_mock.should_receive(:sym).twice
|
142
|
-
# my_mock.should_receive(:sym).exactly(n).times
|
143
|
-
# my_mock.should_receive(:sym).at_least(:once)
|
144
|
-
# my_mock.should_receive(:sym).at_least(:twice)
|
145
|
-
# my_mock.should_receive(:sym).at_least(n).times
|
146
|
-
# my_mock.should_receive(:sym).at_most(:once)
|
147
|
-
# my_mock.should_receive(:sym).at_most(:twice)
|
148
|
-
# my_mock.should_receive(:sym).at_most(n).times
|
149
|
-
# my_mock.should_receive(:sym).any_number_of_times
|
150
|
-
#
|
151
|
-
# == Ordering
|
152
|
-
#
|
153
|
-
# my_mock.should_receive(:sym).ordered
|
154
|
-
# my_mock.should_receive(:other_sym).ordered
|
155
|
-
# #This will fail if the messages are received out of order
|
156
|
-
#
|
157
|
-
# == Setting Reponses
|
158
|
-
#
|
159
|
-
# Whether you are setting a mock expectation or a simple stub, you can tell the
|
160
|
-
# object precisely how to respond:
|
161
|
-
#
|
162
|
-
# my_mock.should_receive(:sym).and_return(value)
|
163
|
-
# my_mock.should_receive(:sym).exactly(3).times.and_return(value1, value2, value3)
|
164
|
-
# # returns value1 the first time, value2 the second, etc
|
165
|
-
# my_mock.should_receive(:sym).and_return { ... } #returns value returned by the block
|
166
|
-
# my_mock.should_receive(:sym).and_raise(error)
|
167
|
-
# #error can be an instantiated object or a class
|
168
|
-
# #if it is a class, it must be instantiable with no args
|
169
|
-
# my_mock.should_receive(:sym).and_throw(:sym)
|
170
|
-
# my_mock.should_receive(:sym).and_yield([array,of,values,to,yield])
|
171
|
-
#
|
172
|
-
# Any of these responses can be applied to a stub as well, but stubs do
|
173
|
-
# not support any qualifiers about the message received (i.e. you can't specify arguments
|
174
|
-
# or receive counts):
|
175
|
-
#
|
176
|
-
# my_mock.stub!(:sym).and_return(value)
|
177
|
-
# my_mock.stub!(:sym).and_return(value1, value2, value3)
|
178
|
-
# my_mock.stub!(:sym).and_raise(error)
|
179
|
-
# my_mock.stub!(:sym).and_throw(:sym)
|
180
|
-
# my_mock.stub!(:sym).and_yield([array,of,values,to,yield])
|
181
|
-
#
|
182
|
-
# == Arbitrary Handling
|
183
|
-
#
|
184
|
-
# Once in a while you'll find that the available expectations don't solve the
|
185
|
-
# particular problem you are trying to solve. Imagine that you expect the message
|
186
|
-
# to come with an Array argument that has a specific length, but you don't care
|
187
|
-
# what is in it. You could do this:
|
188
|
-
#
|
189
|
-
# my_mock.should_receive(:sym) do |arg|
|
190
|
-
# arg.should be_an_istance_of(Array)
|
191
|
-
# arg.length.should == 7
|
192
|
-
# end
|
193
|
-
#
|
194
|
-
# Note that this would fail if the number of arguments received was different from
|
195
|
-
# the number of block arguments (in this case 1).
|
196
|
-
#
|
197
|
-
# == Combining Expectation Details
|
198
|
-
#
|
199
|
-
# Combining the message name with specific arguments, receive counts and responses
|
200
|
-
# you can get quite a bit of detail in your expectations:
|
201
|
-
#
|
202
|
-
# my_mock.should_receive(:<<).with("illegal value").once.and_raise(ArgumentError)
|
203
|
-
module Mocks
|
204
|
-
# Shortcut for creating an instance of Spec::Mocks::Mock.
|
205
|
-
def mock(name, options={})
|
206
|
-
Spec::Mocks::Mock.new(name, options)
|
207
|
-
end
|
208
|
-
|
209
|
-
# Shortcut for creating an instance of Spec::Mocks::Mock with
|
210
|
-
# predefined method stubs.
|
211
|
-
#
|
212
|
-
# == Examples
|
213
|
-
#
|
214
|
-
# stub_thing = stub("thing", :a => "A")
|
215
|
-
# stub_thing.a == "A" => true
|
216
|
-
#
|
217
|
-
# stub_person = stub("thing", :name => "Joe", :email => "joe@domain.com")
|
218
|
-
# stub_person.name => "Joe"
|
219
|
-
# stub_person.email => "joe@domain.com"
|
220
|
-
def stub(name, stubs={})
|
221
|
-
object_stub = mock(name)
|
222
|
-
stubs.each { |key, value| object_stub.stub!(key).and_return(value) }
|
223
|
-
object_stub
|
224
|
-
end
|
225
|
-
|
226
|
-
# Shortcut for creating an instance of Spec::Mocks::DuckTypeArgConstraint
|
227
|
-
def duck_type(*args)
|
228
|
-
return Spec::Mocks::DuckTypeArgConstraint.new(*args)
|
229
|
-
end
|
230
|
-
|
231
|
-
end
|
232
|
-
end
|
@@ -1,132 +0,0 @@
|
|
1
|
-
module Spec
|
2
|
-
module Mocks
|
3
|
-
|
4
|
-
class MatcherConstraint
|
5
|
-
def initialize(matcher)
|
6
|
-
@matcher = matcher
|
7
|
-
end
|
8
|
-
|
9
|
-
def matches?(value)
|
10
|
-
@matcher.matches?(value)
|
11
|
-
end
|
12
|
-
end
|
13
|
-
|
14
|
-
class LiteralArgConstraint
|
15
|
-
def initialize(literal)
|
16
|
-
@literal_value = literal
|
17
|
-
end
|
18
|
-
|
19
|
-
def matches?(value)
|
20
|
-
@literal_value == value
|
21
|
-
end
|
22
|
-
end
|
23
|
-
|
24
|
-
class RegexpArgConstraint
|
25
|
-
def initialize(regexp)
|
26
|
-
@regexp = regexp
|
27
|
-
end
|
28
|
-
|
29
|
-
def matches?(value)
|
30
|
-
return value =~ @regexp unless value.is_a?(Regexp)
|
31
|
-
value == @regexp
|
32
|
-
end
|
33
|
-
end
|
34
|
-
|
35
|
-
class AnyArgConstraint
|
36
|
-
def initialize(ignore)
|
37
|
-
end
|
38
|
-
|
39
|
-
def matches?(value)
|
40
|
-
true
|
41
|
-
end
|
42
|
-
end
|
43
|
-
|
44
|
-
class NumericArgConstraint
|
45
|
-
def initialize(ignore)
|
46
|
-
end
|
47
|
-
|
48
|
-
def matches?(value)
|
49
|
-
value.is_a?(Numeric)
|
50
|
-
end
|
51
|
-
end
|
52
|
-
|
53
|
-
class BooleanArgConstraint
|
54
|
-
def initialize(ignore)
|
55
|
-
end
|
56
|
-
|
57
|
-
def matches?(value)
|
58
|
-
return true if value.is_a?(TrueClass)
|
59
|
-
return true if value.is_a?(FalseClass)
|
60
|
-
false
|
61
|
-
end
|
62
|
-
end
|
63
|
-
|
64
|
-
class StringArgConstraint
|
65
|
-
def initialize(ignore)
|
66
|
-
end
|
67
|
-
|
68
|
-
def matches?(value)
|
69
|
-
value.is_a?(String)
|
70
|
-
end
|
71
|
-
end
|
72
|
-
|
73
|
-
class DuckTypeArgConstraint
|
74
|
-
def initialize(*methods_to_respond_do)
|
75
|
-
@methods_to_respond_do = methods_to_respond_do
|
76
|
-
end
|
77
|
-
|
78
|
-
def matches?(value)
|
79
|
-
@methods_to_respond_do.all? { |sym| value.respond_to?(sym) }
|
80
|
-
end
|
81
|
-
end
|
82
|
-
|
83
|
-
class ArgumentExpectation
|
84
|
-
attr_reader :args
|
85
|
-
@@constraint_classes = Hash.new { |hash, key| LiteralArgConstraint}
|
86
|
-
@@constraint_classes[:anything] = AnyArgConstraint
|
87
|
-
@@constraint_classes[:numeric] = NumericArgConstraint
|
88
|
-
@@constraint_classes[:boolean] = BooleanArgConstraint
|
89
|
-
@@constraint_classes[:string] = StringArgConstraint
|
90
|
-
|
91
|
-
def initialize(args)
|
92
|
-
@args = args
|
93
|
-
if [:any_args] == args then @expected_params = nil
|
94
|
-
elsif [:no_args] == args then @expected_params = []
|
95
|
-
else @expected_params = process_arg_constraints(args)
|
96
|
-
end
|
97
|
-
end
|
98
|
-
|
99
|
-
def process_arg_constraints(constraints)
|
100
|
-
constraints.collect do |constraint|
|
101
|
-
convert_constraint(constraint)
|
102
|
-
end
|
103
|
-
end
|
104
|
-
|
105
|
-
def convert_constraint(constraint)
|
106
|
-
return @@constraint_classes[constraint].new(constraint) if constraint.is_a?(Symbol)
|
107
|
-
return constraint if constraint.is_a?(DuckTypeArgConstraint)
|
108
|
-
return MatcherConstraint.new(constraint) if is_matcher?(constraint)
|
109
|
-
return RegexpArgConstraint.new(constraint) if constraint.is_a?(Regexp)
|
110
|
-
return LiteralArgConstraint.new(constraint)
|
111
|
-
end
|
112
|
-
|
113
|
-
def is_matcher?(obj)
|
114
|
-
return obj.respond_to?(:matches?) && obj.respond_to?(:description)
|
115
|
-
end
|
116
|
-
|
117
|
-
def check_args(args)
|
118
|
-
return true if @expected_params.nil?
|
119
|
-
return true if @expected_params == args
|
120
|
-
return constraints_match?(args)
|
121
|
-
end
|
122
|
-
|
123
|
-
def constraints_match?(args)
|
124
|
-
return false if args.length != @expected_params.length
|
125
|
-
@expected_params.each_index { |i| return false unless @expected_params[i].matches?(args[i]) }
|
126
|
-
return true
|
127
|
-
end
|
128
|
-
|
129
|
-
end
|
130
|
-
|
131
|
-
end
|
132
|
-
end
|
@@ -1,85 +0,0 @@
|
|
1
|
-
module Spec
|
2
|
-
module Mocks
|
3
|
-
class ErrorGenerator
|
4
|
-
attr_writer :opts
|
5
|
-
|
6
|
-
def initialize(target, name)
|
7
|
-
@target = target
|
8
|
-
@name = name
|
9
|
-
end
|
10
|
-
|
11
|
-
def opts
|
12
|
-
@opts ||= {}
|
13
|
-
end
|
14
|
-
|
15
|
-
def raise_unexpected_message_error(sym, *args)
|
16
|
-
__raise "#{intro} received unexpected message :#{sym}#{arg_message(*args)}"
|
17
|
-
end
|
18
|
-
|
19
|
-
def raise_unexpected_message_args_error(expectation, *args)
|
20
|
-
#this is either :no_args or an Array
|
21
|
-
expected_args = (expectation.expected_args == :no_args ? "(no args)" : format_args(*expectation.expected_args))
|
22
|
-
actual_args = args.empty? ? "(no args)" : format_args(*args)
|
23
|
-
__raise "#{intro} expected #{expectation.sym.inspect} with #{expected_args} but received it with #{actual_args}"
|
24
|
-
end
|
25
|
-
|
26
|
-
def raise_expectation_error(sym, expected_received_count, actual_received_count, *args)
|
27
|
-
__raise "#{intro} expected :#{sym}#{arg_message(*args)} #{count_message(expected_received_count)}, but received it #{count_message(actual_received_count)}"
|
28
|
-
end
|
29
|
-
|
30
|
-
def raise_out_of_order_error(sym)
|
31
|
-
__raise "#{intro} received :#{sym} out of order"
|
32
|
-
end
|
33
|
-
|
34
|
-
def raise_block_failed_error(sym, detail)
|
35
|
-
__raise "#{intro} received :#{sym} but passed block failed with: #{detail}"
|
36
|
-
end
|
37
|
-
|
38
|
-
def raise_missing_block_error(args_to_yield)
|
39
|
-
__raise "#{intro} asked to yield |#{arg_list(*args_to_yield)}| but no block was passed"
|
40
|
-
end
|
41
|
-
|
42
|
-
def raise_wrong_arity_error(args_to_yield, arity)
|
43
|
-
__raise "#{intro} yielded |#{arg_list(*args_to_yield)}| to block with arity of #{arity}"
|
44
|
-
end
|
45
|
-
|
46
|
-
private
|
47
|
-
def intro
|
48
|
-
@name ? "Mock '#{@name}'" : @target.to_s
|
49
|
-
end
|
50
|
-
|
51
|
-
def __raise(message)
|
52
|
-
message = opts[:message] unless opts[:message].nil?
|
53
|
-
Kernel::raise(Spec::Mocks::MockExpectationError, message)
|
54
|
-
end
|
55
|
-
|
56
|
-
def arg_message(*args)
|
57
|
-
" with " + format_args(*args)
|
58
|
-
end
|
59
|
-
|
60
|
-
def format_args(*args)
|
61
|
-
return "(no args)" if args.empty? || args == [:no_args]
|
62
|
-
return "(any args)" if args == [:any_args]
|
63
|
-
"(" + arg_list(*args) + ")"
|
64
|
-
end
|
65
|
-
|
66
|
-
def arg_list(*args)
|
67
|
-
args.collect do |arg|
|
68
|
-
arg.respond_to?(:description) ? arg.description : arg.inspect
|
69
|
-
end.join(", ")
|
70
|
-
end
|
71
|
-
|
72
|
-
def count_message(count)
|
73
|
-
return "at least #{pretty_print(count.abs)}" if count < 0
|
74
|
-
return pretty_print(count)
|
75
|
-
end
|
76
|
-
|
77
|
-
def pretty_print(count)
|
78
|
-
return "once" if count == 1
|
79
|
-
return "twice" if count == 2
|
80
|
-
return "#{count} times"
|
81
|
-
end
|
82
|
-
|
83
|
-
end
|
84
|
-
end
|
85
|
-
end
|