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,128 +0,0 @@
|
|
1
|
-
module Spec
|
2
|
-
module Expectations
|
3
|
-
module Should
|
4
|
-
class Have
|
5
|
-
def initialize(target, relativity=:exactly, expected=nil)
|
6
|
-
@target = target
|
7
|
-
init_collection_handler(target, relativity, expected)
|
8
|
-
init_item_handler(target)
|
9
|
-
end
|
10
|
-
|
11
|
-
def init_collection_handler(target, relativity, expected)
|
12
|
-
@collection_handler = CollectionHandler.new(target, relativity, expected)
|
13
|
-
end
|
14
|
-
|
15
|
-
def init_item_handler(target)
|
16
|
-
@item_handler = PositiveItemHandler.new(target)
|
17
|
-
end
|
18
|
-
|
19
|
-
def method_missing(sym, *args)
|
20
|
-
if @collection_handler.wants_to_handle(sym)
|
21
|
-
@collection_handler.handle_message(sym, *args)
|
22
|
-
elsif @item_handler.wants_to_handle(sym)
|
23
|
-
@item_handler.handle_message(sym, *args)
|
24
|
-
else
|
25
|
-
Spec::Expectations.fail_with("target does not respond to #has_#{sym}?")
|
26
|
-
end
|
27
|
-
end
|
28
|
-
end
|
29
|
-
|
30
|
-
class NotHave < Have
|
31
|
-
def init_item_handler(target)
|
32
|
-
@item_handler = NegativeItemHandler.new(target)
|
33
|
-
end
|
34
|
-
end
|
35
|
-
|
36
|
-
class CollectionHandler
|
37
|
-
def initialize(target, relativity=:exactly, expected=nil)
|
38
|
-
@target = target
|
39
|
-
@expected = expected == :no ? 0 : expected
|
40
|
-
@at_least = (relativity == :at_least)
|
41
|
-
@at_most = (relativity == :at_most)
|
42
|
-
end
|
43
|
-
|
44
|
-
def at_least(expected_number=nil)
|
45
|
-
@at_least = true
|
46
|
-
@at_most = false
|
47
|
-
@expected = expected_number == :no ? 0 : expected_number
|
48
|
-
self
|
49
|
-
end
|
50
|
-
|
51
|
-
def at_most(expected_number=nil)
|
52
|
-
@at_least = false
|
53
|
-
@at_most = true
|
54
|
-
@expected = expected_number == :no ? 0 : expected_number
|
55
|
-
self
|
56
|
-
end
|
57
|
-
|
58
|
-
def method_missing(sym, *args)
|
59
|
-
if @target.respond_to?(sym)
|
60
|
-
handle_message(sym, *args)
|
61
|
-
end
|
62
|
-
end
|
63
|
-
|
64
|
-
def wants_to_handle(sym)
|
65
|
-
respond_to?(sym) || @target.respond_to?(sym)
|
66
|
-
end
|
67
|
-
|
68
|
-
def handle_message(sym, *args)
|
69
|
-
return at_least(args[0]) if sym == :at_least
|
70
|
-
return at_most(args[0]) if sym == :at_most
|
71
|
-
Spec::Expectations.fail_with(build_message(sym, args)) unless as_specified?(sym, args)
|
72
|
-
end
|
73
|
-
|
74
|
-
def build_message(sym, args)
|
75
|
-
message = "expected"
|
76
|
-
message += " at least" if @at_least
|
77
|
-
message += " at most" if @at_most
|
78
|
-
message += " #{@expected} #{sym}, got #{actual_size_of(collection(sym, args))}"
|
79
|
-
end
|
80
|
-
|
81
|
-
def as_specified?(sym, args)
|
82
|
-
return actual_size_of(collection(sym, args)) >= @expected if @at_least
|
83
|
-
return actual_size_of(collection(sym, args)) <= @expected if @at_most
|
84
|
-
return actual_size_of(collection(sym, args)) == @expected
|
85
|
-
end
|
86
|
-
|
87
|
-
def collection(sym, args)
|
88
|
-
@target.send(sym, *args)
|
89
|
-
end
|
90
|
-
|
91
|
-
def actual_size_of(collection)
|
92
|
-
return collection.length if collection.respond_to? :length
|
93
|
-
return collection.size if collection.respond_to? :size
|
94
|
-
end
|
95
|
-
end
|
96
|
-
|
97
|
-
class ItemHandler
|
98
|
-
def wants_to_handle(sym)
|
99
|
-
@target.respond_to?("has_#{sym}?")
|
100
|
-
end
|
101
|
-
|
102
|
-
def initialize(target)
|
103
|
-
@target = target
|
104
|
-
end
|
105
|
-
|
106
|
-
def fail_with(message)
|
107
|
-
Spec::Expectations.fail_with(message)
|
108
|
-
end
|
109
|
-
end
|
110
|
-
|
111
|
-
class PositiveItemHandler < ItemHandler
|
112
|
-
def handle_message(sym, *args)
|
113
|
-
fail_with(
|
114
|
-
"expected #has_#{sym}?(#{args.collect{|arg| arg.inspect}.join(', ')}) to return true, got false"
|
115
|
-
) unless @target.send("has_#{sym}?", *args)
|
116
|
-
end
|
117
|
-
end
|
118
|
-
|
119
|
-
class NegativeItemHandler < ItemHandler
|
120
|
-
def handle_message(sym, *args)
|
121
|
-
fail_with(
|
122
|
-
"expected #has_#{sym}?(#{args.collect{|arg| arg.inspect}.join(', ')}) to return false, got true"
|
123
|
-
) if @target.send("has_#{sym}?", *args)
|
124
|
-
end
|
125
|
-
end
|
126
|
-
end
|
127
|
-
end
|
128
|
-
end
|
@@ -1,74 +0,0 @@
|
|
1
|
-
module Spec
|
2
|
-
module Expectations
|
3
|
-
module Should
|
4
|
-
|
5
|
-
class Not < Base #:nodoc:
|
6
|
-
def initialize(target)
|
7
|
-
@target = target
|
8
|
-
@be_seen = false
|
9
|
-
end
|
10
|
-
|
11
|
-
deprecated do
|
12
|
-
#Gone for 0.9
|
13
|
-
def be(expected = :___no_arg)
|
14
|
-
@be_seen = true
|
15
|
-
return self if (expected == :___no_arg)
|
16
|
-
fail_with_message(default_message("should not be", expected)) if (@target.equal?(expected))
|
17
|
-
end
|
18
|
-
|
19
|
-
#Gone for 0.9
|
20
|
-
def have(expected_number=nil)
|
21
|
-
NotHave.new(@target, :exactly, expected_number)
|
22
|
-
end
|
23
|
-
|
24
|
-
#Gone for 0.9
|
25
|
-
def change(receiver, message)
|
26
|
-
NotChange.new(@target, receiver, message)
|
27
|
-
end
|
28
|
-
|
29
|
-
#Gone for 0.9
|
30
|
-
def raise(exception=Exception, message=nil)
|
31
|
-
begin
|
32
|
-
@target.call
|
33
|
-
rescue exception => e
|
34
|
-
return unless message.nil? || e.message == message || (message.is_a?(Regexp) && e.message =~ message)
|
35
|
-
if e.kind_of?(exception)
|
36
|
-
failure_message = "expected no "
|
37
|
-
failure_message << exception.to_s
|
38
|
-
unless message.nil?
|
39
|
-
failure_message << " with "
|
40
|
-
failure_message << "message matching " if message.is_a?(Regexp)
|
41
|
-
failure_message << message.inspect
|
42
|
-
end
|
43
|
-
failure_message << ", got " << e.inspect
|
44
|
-
fail_with_message(failure_message)
|
45
|
-
end
|
46
|
-
rescue
|
47
|
-
true
|
48
|
-
end
|
49
|
-
end
|
50
|
-
|
51
|
-
#Gone for 0.9
|
52
|
-
def throw(symbol=:___this_is_a_symbol_that_will_likely_never_occur___)
|
53
|
-
begin
|
54
|
-
catch symbol do
|
55
|
-
@target.call
|
56
|
-
return true
|
57
|
-
end
|
58
|
-
fail_with_message("expected #{symbol.inspect} not to be thrown, but it was")
|
59
|
-
rescue NameError
|
60
|
-
true
|
61
|
-
end
|
62
|
-
end
|
63
|
-
|
64
|
-
def __delegate_method_missing_to_target original_sym, actual_sym, *args
|
65
|
-
::Spec::Matchers.generated_description = "should not #{original_sym} #{args[0].inspect}"
|
66
|
-
return unless @target.__send__(actual_sym, *args)
|
67
|
-
fail_with_message(default_message("not #{original_sym}", args[0]))
|
68
|
-
end
|
69
|
-
end
|
70
|
-
end
|
71
|
-
|
72
|
-
end
|
73
|
-
end
|
74
|
-
end
|
@@ -1,81 +0,0 @@
|
|
1
|
-
module Spec
|
2
|
-
module Expectations
|
3
|
-
module Should # :nodoc:
|
4
|
-
|
5
|
-
class Should < Base
|
6
|
-
|
7
|
-
def initialize(target, expectation=nil)
|
8
|
-
@target = target
|
9
|
-
@be_seen = false
|
10
|
-
end
|
11
|
-
|
12
|
-
deprecated do
|
13
|
-
#Gone for 0.9
|
14
|
-
def not
|
15
|
-
Not.new(@target)
|
16
|
-
end
|
17
|
-
|
18
|
-
#Gone for 0.9
|
19
|
-
def be(expected = :___no_arg)
|
20
|
-
@be_seen = true
|
21
|
-
return self if (expected == :___no_arg)
|
22
|
-
if Symbol === expected
|
23
|
-
fail_with_message(default_message("should be", expected)) unless (@target.equal?(expected))
|
24
|
-
else
|
25
|
-
fail_with_message("expected #{expected}, got #{@target} (using .equal?)") unless (@target.equal?(expected))
|
26
|
-
end
|
27
|
-
end
|
28
|
-
|
29
|
-
#Gone for 0.9
|
30
|
-
def have(expected_number=nil)
|
31
|
-
Have.new(@target, :exactly, expected_number)
|
32
|
-
end
|
33
|
-
|
34
|
-
#Gone for 0.9
|
35
|
-
def change(receiver=nil, message=nil, &block)
|
36
|
-
Change.new(@target, receiver, message, &block)
|
37
|
-
end
|
38
|
-
|
39
|
-
#Gone for 0.9
|
40
|
-
def raise(exception=Exception, message=nil)
|
41
|
-
begin
|
42
|
-
@target.call
|
43
|
-
rescue exception => e
|
44
|
-
unless message.nil?
|
45
|
-
if message.is_a?(Regexp)
|
46
|
-
e.message.should =~ message
|
47
|
-
else
|
48
|
-
e.message.should == message
|
49
|
-
end
|
50
|
-
end
|
51
|
-
return
|
52
|
-
rescue => e
|
53
|
-
fail_with_message("expected #{exception}#{message.nil? ? "" : " with #{message.inspect}"}, got #{e.inspect}")
|
54
|
-
end
|
55
|
-
fail_with_message("expected #{exception}#{message.nil? ? "" : " with #{message.inspect}"} but nothing was raised")
|
56
|
-
end
|
57
|
-
|
58
|
-
#Gone for 0.9
|
59
|
-
def throw(symbol)
|
60
|
-
begin
|
61
|
-
catch symbol do
|
62
|
-
@target.call
|
63
|
-
fail_with_message("expected #{symbol.inspect} to be thrown, but nothing was thrown")
|
64
|
-
end
|
65
|
-
rescue NameError => e
|
66
|
-
fail_with_message("expected #{symbol.inspect} to be thrown, got #{e.inspect}")
|
67
|
-
end
|
68
|
-
end
|
69
|
-
end
|
70
|
-
|
71
|
-
private
|
72
|
-
def __delegate_method_missing_to_target(original_sym, actual_sym, *args)
|
73
|
-
::Spec::Matchers.generated_description = "should #{original_sym} #{args[0].inspect}"
|
74
|
-
return if @target.send(actual_sym, *args)
|
75
|
-
fail_with_message(default_message(original_sym, args[0]), args[0], @target)
|
76
|
-
end
|
77
|
-
end
|
78
|
-
|
79
|
-
end
|
80
|
-
end
|
81
|
-
end
|
@@ -1,47 +0,0 @@
|
|
1
|
-
deprecated do
|
2
|
-
module Spec
|
3
|
-
module Expectations
|
4
|
-
# This module adds syntactic sugar that allows usage of should_* instead of should.*
|
5
|
-
module UnderscoreSugar
|
6
|
-
def handle_underscores_for_rspec! # :nodoc:
|
7
|
-
original_method_missing = instance_method(:method_missing)
|
8
|
-
class_eval do
|
9
|
-
def method_missing(sym, *args, &block)
|
10
|
-
_method_missing(sym, args, block)
|
11
|
-
end
|
12
|
-
|
13
|
-
define_method :_method_missing do |sym, args, block|
|
14
|
-
return original_method_missing.bind(self).call(sym, *args, &block) unless sym.to_s =~ /^should_/
|
15
|
-
if sym.to_s =~ /^should_not_/
|
16
|
-
if __matcher.respond_to?(__strip_should_not(sym))
|
17
|
-
return should_not(__matcher.__send__(__strip_should_not(sym), *args, &block))
|
18
|
-
else
|
19
|
-
return Spec::Expectations::Should::Not.new(self).__send__(__strip_should_not(sym), *args, &block) if sym.to_s =~ /^should_not_/
|
20
|
-
end
|
21
|
-
else
|
22
|
-
if __matcher.respond_to?(__strip_should(sym))
|
23
|
-
return should(__matcher.__send__(__strip_should(sym), *args, &block))
|
24
|
-
else
|
25
|
-
return Spec::Expectations::Should::Should.new(self).__send__(__strip_should(sym), *args, &block)
|
26
|
-
end
|
27
|
-
end
|
28
|
-
end
|
29
|
-
|
30
|
-
def __strip_should(sym) # :nodoc
|
31
|
-
sym.to_s[7..-1]
|
32
|
-
end
|
33
|
-
|
34
|
-
def __strip_should_not(sym) # :nodoc
|
35
|
-
sym.to_s[11..-1]
|
36
|
-
end
|
37
|
-
|
38
|
-
def __matcher
|
39
|
-
@matcher ||= Spec::Matchers::Matcher.new
|
40
|
-
end
|
41
|
-
end
|
42
|
-
end
|
43
|
-
end
|
44
|
-
end
|
45
|
-
end
|
46
|
-
|
47
|
-
end
|
data/test/lib/spec/matchers.rb
DELETED
@@ -1,160 +0,0 @@
|
|
1
|
-
require 'spec/deprecated'
|
2
|
-
require 'spec/callback'
|
3
|
-
require 'spec/matchers/be'
|
4
|
-
require 'spec/matchers/be_close'
|
5
|
-
require 'spec/matchers/change'
|
6
|
-
require 'spec/matchers/eql'
|
7
|
-
require 'spec/matchers/equal'
|
8
|
-
require 'spec/matchers/has'
|
9
|
-
require 'spec/matchers/have'
|
10
|
-
require 'spec/matchers/include'
|
11
|
-
require 'spec/matchers/match'
|
12
|
-
require 'spec/matchers/raise_error'
|
13
|
-
require 'spec/matchers/respond_to'
|
14
|
-
require 'spec/matchers/satisfy'
|
15
|
-
require 'spec/matchers/throw_symbol'
|
16
|
-
|
17
|
-
module Spec
|
18
|
-
|
19
|
-
# RSpec ships with a number of useful Expression Matchers. An Expression Matcher
|
20
|
-
# is any object that responds to the following methods:
|
21
|
-
#
|
22
|
-
# matches?(actual)
|
23
|
-
# failure_message
|
24
|
-
# negative_failure_message #optional
|
25
|
-
# description #optional
|
26
|
-
#
|
27
|
-
# See Spec::Expectations to learn how to use these as Expectation Matchers.
|
28
|
-
# See Spec::Mocks to learn how to use them as Mock Argument Constraints.
|
29
|
-
#
|
30
|
-
# == Predicates
|
31
|
-
#
|
32
|
-
# In addition to those Expression Matchers that are defined explicitly, RSpec will
|
33
|
-
# create custom Matchers on the fly for any arbitrary predicate, giving your specs
|
34
|
-
# a much more natural language feel.
|
35
|
-
#
|
36
|
-
# A Ruby predicate is a method that ends with a "?" and returns true or false.
|
37
|
-
# Common examples are +empty?+, +nil?+, and +instance_of?+.
|
38
|
-
#
|
39
|
-
# All you need to do is write +should be_+ followed by the predicate without
|
40
|
-
# the question mark, and RSpec will figure it out from there. For example:
|
41
|
-
#
|
42
|
-
# [].should be_empty => [].empty? #passes
|
43
|
-
# [].should_not be_empty => [].empty? #fails
|
44
|
-
#
|
45
|
-
# In addtion to prefixing the predicate matchers with "be_", you can also use "be_a_"
|
46
|
-
# and "be_an_", making your specs read much more naturally:
|
47
|
-
#
|
48
|
-
# "a string".should be_an_instance_of(String) =>"a string".instance_of?(String) #passes
|
49
|
-
#
|
50
|
-
# 3.should be_a_kind_of(Fixnum) => 3.kind_of?(Numeric) #passes
|
51
|
-
# 3.should be_a_kind_of(Numeric) => 3.kind_of?(Numeric) #passes
|
52
|
-
# 3.should be_an_instance_of(Fixnum) => 3.instance_of?(Fixnum) #passes
|
53
|
-
# 3.should_not be_instance_of(Numeric) => 3.instance_of?(Numeric) #fails
|
54
|
-
#
|
55
|
-
# RSpec will also create custom matchers for predicates like +has_key?+. To
|
56
|
-
# use this feature, just state that the object should have_key(:key) and RSpec will
|
57
|
-
# call has_key?(:key) on the target. For example:
|
58
|
-
#
|
59
|
-
# {:a => "A"}.should have_key(:a) => {:a => "A"}.has_key?(:a) #passes
|
60
|
-
# {:a => "A"}.should have_key(:b) => {:a => "A"}.has_key?(:b) #fails
|
61
|
-
#
|
62
|
-
# You can use this feature to invoke any predicate that begins with "has_", whether it is
|
63
|
-
# part of the Ruby libraries (like +Hash#has_key?+) or a method you wrote on your own class.
|
64
|
-
#
|
65
|
-
# == Custom Expression Matchers
|
66
|
-
#
|
67
|
-
# When you find that none of the stock Expression Matchers provide a natural
|
68
|
-
# feeling expectation, you can very easily write your own.
|
69
|
-
#
|
70
|
-
# For example, imagine that you are writing a game in which players can
|
71
|
-
# be in various zones on a virtual board. To specify that bob should
|
72
|
-
# be in zone 4, you could say:
|
73
|
-
#
|
74
|
-
# bob.current_zone.should eql(Zone.new("4"))
|
75
|
-
#
|
76
|
-
# But you might find it more expressive to say:
|
77
|
-
#
|
78
|
-
# bob.should be_in_zone("4")
|
79
|
-
#
|
80
|
-
# and/or
|
81
|
-
#
|
82
|
-
# bob.should_not be_in_zone("3")
|
83
|
-
#
|
84
|
-
# To do this, you would need to write a class like this:
|
85
|
-
#
|
86
|
-
# class BeInZone
|
87
|
-
# def initialize(expected)
|
88
|
-
# @expected = expected
|
89
|
-
# end
|
90
|
-
# def matches?(actual)
|
91
|
-
# @actual = actual
|
92
|
-
# bob.current_zone.eql?(Zone.new(@expected))
|
93
|
-
# end
|
94
|
-
# def failure_message
|
95
|
-
# "expected #{@actual.inspect} to be in Zone #{@expected}"
|
96
|
-
# end
|
97
|
-
# def negative_failure_message
|
98
|
-
# "expected #{@actual.inspect} not to be in Zone #{@expected}"
|
99
|
-
# end
|
100
|
-
# end
|
101
|
-
#
|
102
|
-
# ... and a method like this:
|
103
|
-
#
|
104
|
-
# def be_in_zone(expected)
|
105
|
-
# BeInZone.new(expected)
|
106
|
-
# end
|
107
|
-
#
|
108
|
-
# And then expose the method to your specs. This is normally done
|
109
|
-
# by including the method and the class in a module, which is then
|
110
|
-
# included in your spec:
|
111
|
-
#
|
112
|
-
# module CustomGameMatchers
|
113
|
-
# class BeInZone
|
114
|
-
# ...
|
115
|
-
# end
|
116
|
-
#
|
117
|
-
# def be_in_zone(expected)
|
118
|
-
# ...
|
119
|
-
# end
|
120
|
-
# end
|
121
|
-
#
|
122
|
-
# context "Player behaviour" do
|
123
|
-
# include CustomGameMatchers
|
124
|
-
# ...
|
125
|
-
# end
|
126
|
-
module Matchers
|
127
|
-
|
128
|
-
class << self
|
129
|
-
callback_events :description_generated
|
130
|
-
def generated_description=(name)
|
131
|
-
notify_callbacks(:description_generated, name)
|
132
|
-
end
|
133
|
-
end
|
134
|
-
|
135
|
-
def method_missing(sym, *args, &block) # :nodoc:
|
136
|
-
return Matchers::Be.new(sym, *args) if sym.starts_with?("be_")
|
137
|
-
return Matchers::Has.new(sym, *args) if sym.starts_with?("have_")
|
138
|
-
super
|
139
|
-
end
|
140
|
-
|
141
|
-
deprecated do
|
142
|
-
# This supports sugar delegating to Matchers
|
143
|
-
class Matcher #:nodoc:
|
144
|
-
include Matchers
|
145
|
-
|
146
|
-
def respond_to?(sym)
|
147
|
-
if sym.to_s[0..2] == "be_"
|
148
|
-
return true
|
149
|
-
else
|
150
|
-
super
|
151
|
-
end
|
152
|
-
end
|
153
|
-
end
|
154
|
-
end
|
155
|
-
|
156
|
-
class MatcherError < StandardError
|
157
|
-
end
|
158
|
-
|
159
|
-
end
|
160
|
-
end
|