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,224 +0,0 @@
|
|
1
|
-
require 'ostruct'
|
2
|
-
require 'optparse'
|
3
|
-
require 'spec/runner/spec_parser'
|
4
|
-
require 'spec/runner/formatter'
|
5
|
-
require 'spec/runner/backtrace_tweaker'
|
6
|
-
require 'spec/runner/reporter'
|
7
|
-
require 'spec/runner/context_runner'
|
8
|
-
|
9
|
-
module Spec
|
10
|
-
module Runner
|
11
|
-
class OptionParser
|
12
|
-
def initialize
|
13
|
-
@spec_parser = SpecParser.new
|
14
|
-
@file_factory = File
|
15
|
-
end
|
16
|
-
|
17
|
-
def create_context_runner(args, err, out, warn_if_no_files)
|
18
|
-
options = parse(args, err, out, warn_if_no_files)
|
19
|
-
# Some exit points in parse (--generate-options, --drb) don't return the options,
|
20
|
-
# but hand over control. In that case we don't want to continue.
|
21
|
-
return nil unless options.is_a?(OpenStruct)
|
22
|
-
|
23
|
-
formatter = options.formatter_type.new(options.out, options.dry_run, options.colour)
|
24
|
-
options.reporter = Reporter.new(formatter, options.backtrace_tweaker)
|
25
|
-
|
26
|
-
# this doesn't really belong here.
|
27
|
-
# it should, but the way things are coupled, it doesn't
|
28
|
-
if options.differ_class
|
29
|
-
Spec::Expectations.differ = options.differ_class.new(options.diff_format, options.context_lines, options.colour)
|
30
|
-
end
|
31
|
-
|
32
|
-
unless options.generate
|
33
|
-
ContextRunner.new(options)
|
34
|
-
end
|
35
|
-
end
|
36
|
-
|
37
|
-
def parse(args, err, out, warn_if_no_files)
|
38
|
-
options_file = nil
|
39
|
-
args_copy = args.dup
|
40
|
-
options = OpenStruct.new
|
41
|
-
options.out = (out == STDOUT ? Kernel : out)
|
42
|
-
options.formatter_type = Formatter::ProgressBarFormatter
|
43
|
-
options.backtrace_tweaker = QuietBacktraceTweaker.new
|
44
|
-
options.spec_name = nil
|
45
|
-
|
46
|
-
opts = ::OptionParser.new do |opts|
|
47
|
-
opts.banner = "Usage: spec [options] (FILE|DIRECTORY|GLOB)+"
|
48
|
-
opts.separator ""
|
49
|
-
|
50
|
-
opts.on("-D", "--diff [FORMAT]", "Show diff of objects that are expected to be equal when they are not",
|
51
|
-
"Builtin formats: unified|u|context|c",
|
52
|
-
"You can also specify a custom differ class",
|
53
|
-
"(in which case you should also specify --require)") do |format|
|
54
|
-
|
55
|
-
# TODO make context_lines settable
|
56
|
-
options.context_lines = 3
|
57
|
-
|
58
|
-
case format
|
59
|
-
when 'context', 'c'
|
60
|
-
options.diff_format = :context
|
61
|
-
when 'unified', 'u', '', nil
|
62
|
-
options.diff_format = :unified
|
63
|
-
end
|
64
|
-
|
65
|
-
if [:context,:unified].include? options.diff_format
|
66
|
-
require 'spec/expectations/differs/default'
|
67
|
-
options.differ_class = Spec::Expectations::Differs::Default
|
68
|
-
else
|
69
|
-
begin
|
70
|
-
options.diff_format = :custom
|
71
|
-
options.differ_class = eval(format)
|
72
|
-
rescue NameError
|
73
|
-
err.puts "Couldn't find differ class #{format}"
|
74
|
-
err.puts "Make sure the --require option is specified *before* --diff"
|
75
|
-
exit if out == $stdout
|
76
|
-
end
|
77
|
-
end
|
78
|
-
|
79
|
-
end
|
80
|
-
|
81
|
-
opts.on("-c", "--colour", "--color", "Show coloured (red/green) output") do
|
82
|
-
options.colour = true
|
83
|
-
end
|
84
|
-
|
85
|
-
opts.on("-s", "--spec SPECIFICATION_NAME", "Execute context or specification with matching name") do |spec_name|
|
86
|
-
options.spec_name = spec_name
|
87
|
-
end
|
88
|
-
|
89
|
-
opts.on("-l", "--line LINE_NUMBER", Integer, "Execute context or specification at given line") do |line_number|
|
90
|
-
options.line_number = line_number.to_i
|
91
|
-
end
|
92
|
-
|
93
|
-
opts.on("-f", "--format FORMAT", "Builtin formats: specdoc|s|rdoc|r|html|h",
|
94
|
-
"You can also specify a custom formatter class",
|
95
|
-
"(in which case you should also specify --require)") do |format|
|
96
|
-
case format
|
97
|
-
when 'specdoc', 's'
|
98
|
-
options.formatter_type = Formatter::SpecdocFormatter
|
99
|
-
when 'html', 'h'
|
100
|
-
options.formatter_type = Formatter::HtmlFormatter
|
101
|
-
when 'rdoc', 'r'
|
102
|
-
options.formatter_type = Formatter::RdocFormatter
|
103
|
-
options.dry_run = true
|
104
|
-
else
|
105
|
-
begin
|
106
|
-
options.formatter_type = eval(format)
|
107
|
-
rescue NameError
|
108
|
-
err.puts "Couldn't find formatter class #{format}"
|
109
|
-
err.puts "Make sure the --require option is specified *before* --format"
|
110
|
-
exit if out == $stdout
|
111
|
-
end
|
112
|
-
end
|
113
|
-
end
|
114
|
-
|
115
|
-
opts.on("-r", "--require FILE", "Require FILE before running specs",
|
116
|
-
"Useful for loading custom formatters or other extensions",
|
117
|
-
"If this option is used it must come before the others") do |req|
|
118
|
-
req.split(",").each{|file| require file}
|
119
|
-
end
|
120
|
-
|
121
|
-
opts.on("-b", "--backtrace", "Output full backtrace") do
|
122
|
-
options.backtrace_tweaker = NoisyBacktraceTweaker.new
|
123
|
-
end
|
124
|
-
|
125
|
-
opts.on("-H", "--heckle CODE", "If all specs pass, this will run your specs many times, mutating",
|
126
|
-
"the specced code a little each time. The intent is that specs",
|
127
|
-
"*should* fail, and RSpec will tell you if they don't.",
|
128
|
-
"CODE should be either Some::Module, Some::Class or Some::Fabulous#method}") do |heckle|
|
129
|
-
heckle_runner = PLATFORM == 'i386-mswin32' ? 'spec/runner/heckle_runner_win' : 'spec/runner/heckle_runner'
|
130
|
-
require heckle_runner
|
131
|
-
options.heckle_runner = HeckleRunner.new(heckle)
|
132
|
-
end
|
133
|
-
|
134
|
-
opts.on("-d", "--dry-run", "Don't execute specs") do
|
135
|
-
options.dry_run = true
|
136
|
-
end
|
137
|
-
|
138
|
-
opts.on("-o", "--out OUTPUT_FILE", "Path to output file (defaults to STDOUT)") do |out_file|
|
139
|
-
options.out = File.new(out_file, 'w')
|
140
|
-
end
|
141
|
-
|
142
|
-
opts.on("-O", "--options PATH", "Read options from a file") do |options_file|
|
143
|
-
# Remove the --options option and the argument before writing to file
|
144
|
-
index = args_copy.index("-O") || args_copy.index("--options")
|
145
|
-
args_copy.delete_at(index)
|
146
|
-
args_copy.delete_at(index)
|
147
|
-
|
148
|
-
new_args = args_copy + IO.readlines(options_file).each {|s| s.chomp!}
|
149
|
-
return CommandLine.run(new_args, err, out, true, warn_if_no_files)
|
150
|
-
end
|
151
|
-
|
152
|
-
opts.on("-G", "--generate-options PATH", "Generate an options file for --options") do |options_file|
|
153
|
-
# Remove the --generate-options option and the argument before writing to file
|
154
|
-
index = args_copy.index("-G") || args_copy.index("--generate-options")
|
155
|
-
args_copy.delete_at(index)
|
156
|
-
args_copy.delete_at(index)
|
157
|
-
|
158
|
-
File.open(options_file, 'w') do |io|
|
159
|
-
io.puts args_copy.join("\n")
|
160
|
-
end
|
161
|
-
out.puts "\nOptions written to #{options_file}. You can now use these options with:"
|
162
|
-
out.puts "spec --options #{options_file}"
|
163
|
-
options.generate = true
|
164
|
-
end
|
165
|
-
|
166
|
-
opts.on("-X", "--drb", "Run specs via DRb. (For example against script/rails_spec_server)") do |options_file|
|
167
|
-
# Remove the --options option and the argument before writing to file
|
168
|
-
index = args_copy.index("-X") || args_copy.index("--drb")
|
169
|
-
args_copy.delete_at(index)
|
170
|
-
|
171
|
-
return DrbCommandLine.run(args_copy, err, out, true, warn_if_no_files)
|
172
|
-
end
|
173
|
-
|
174
|
-
opts.on("-v", "--version", "Show version") do
|
175
|
-
out.puts ::Spec::VERSION::DESCRIPTION
|
176
|
-
exit if out == $stdout
|
177
|
-
end
|
178
|
-
|
179
|
-
opts.on_tail("-h", "--help", "You're looking at it") do
|
180
|
-
out.puts opts
|
181
|
-
exit if out == $stdout
|
182
|
-
end
|
183
|
-
|
184
|
-
end
|
185
|
-
opts.parse!(args)
|
186
|
-
|
187
|
-
if args.empty? && warn_if_no_files
|
188
|
-
err.puts "No files specified."
|
189
|
-
err.puts opts
|
190
|
-
exit(6) if err == $stderr
|
191
|
-
end
|
192
|
-
|
193
|
-
if options.line_number
|
194
|
-
set_spec_from_line_number(options, args, err)
|
195
|
-
end
|
196
|
-
|
197
|
-
options
|
198
|
-
end
|
199
|
-
|
200
|
-
def set_spec_from_line_number(options, args, err)
|
201
|
-
unless options.spec_name
|
202
|
-
if args.length == 1
|
203
|
-
if @file_factory.file?(args[0])
|
204
|
-
source = @file_factory.open(args[0])
|
205
|
-
options.spec_name = @spec_parser.spec_name_for(source, options.line_number)
|
206
|
-
elsif @file_factory.directory?(args[0])
|
207
|
-
err.puts "You must specify one file, not a directory when using the --line option"
|
208
|
-
exit(1) if err == $stderr
|
209
|
-
else
|
210
|
-
err.puts "#{args[0]} does not exist"
|
211
|
-
exit(2) if err == $stderr
|
212
|
-
end
|
213
|
-
else
|
214
|
-
err.puts "Only one file can be specified when using the --line option: #{args.inspect}"
|
215
|
-
exit(3) if err == $stderr
|
216
|
-
end
|
217
|
-
else
|
218
|
-
err.puts "You cannot use both --line and --spec"
|
219
|
-
exit(4) if err == $stderr
|
220
|
-
end
|
221
|
-
end
|
222
|
-
end
|
223
|
-
end
|
224
|
-
end
|
@@ -1,105 +0,0 @@
|
|
1
|
-
module Spec
|
2
|
-
module Runner
|
3
|
-
class Reporter
|
4
|
-
|
5
|
-
def initialize(formatter, backtrace_tweaker)
|
6
|
-
@formatter = formatter
|
7
|
-
@backtrace_tweaker = backtrace_tweaker
|
8
|
-
clear!
|
9
|
-
end
|
10
|
-
|
11
|
-
def add_context(name)
|
12
|
-
#TODO - @context_names.empty? tells the formatter whether this is the first context or not - that's a little slippery
|
13
|
-
@formatter.add_context(name, @context_names.empty?)
|
14
|
-
@context_names << name
|
15
|
-
end
|
16
|
-
|
17
|
-
def spec_started(name)
|
18
|
-
@spec_names << name
|
19
|
-
@formatter.spec_started(name)
|
20
|
-
end
|
21
|
-
|
22
|
-
def spec_finished(name, error=nil, failure_location=nil)
|
23
|
-
if error.nil?
|
24
|
-
spec_passed(name)
|
25
|
-
else
|
26
|
-
@backtrace_tweaker.tweak_backtrace(error, failure_location)
|
27
|
-
spec_failed(name, Failure.new(@context_names.last, name, error))
|
28
|
-
end
|
29
|
-
end
|
30
|
-
|
31
|
-
def start(number_of_specs)
|
32
|
-
clear!
|
33
|
-
@start_time = Time.new
|
34
|
-
@formatter.start(number_of_specs)
|
35
|
-
end
|
36
|
-
|
37
|
-
def end
|
38
|
-
@end_time = Time.new
|
39
|
-
end
|
40
|
-
|
41
|
-
# Dumps the summary and returns the total number of failures
|
42
|
-
def dump
|
43
|
-
@formatter.start_dump
|
44
|
-
dump_failures
|
45
|
-
@formatter.dump_summary(duration, @spec_names.length, @failures.length)
|
46
|
-
@failures.length
|
47
|
-
end
|
48
|
-
|
49
|
-
private
|
50
|
-
|
51
|
-
def clear!
|
52
|
-
@context_names = []
|
53
|
-
@failures = []
|
54
|
-
@spec_names = []
|
55
|
-
@start_time = nil
|
56
|
-
@end_time = nil
|
57
|
-
end
|
58
|
-
|
59
|
-
def dump_failures
|
60
|
-
return if @failures.empty?
|
61
|
-
@failures.inject(1) do |index, failure|
|
62
|
-
@formatter.dump_failure(index, failure)
|
63
|
-
index + 1
|
64
|
-
end
|
65
|
-
end
|
66
|
-
|
67
|
-
def duration
|
68
|
-
return @end_time - @start_time unless (@end_time.nil? or @start_time.nil?)
|
69
|
-
return "0.0"
|
70
|
-
end
|
71
|
-
|
72
|
-
def spec_passed(name)
|
73
|
-
@formatter.spec_passed(name)
|
74
|
-
end
|
75
|
-
|
76
|
-
def spec_failed(name, failure)
|
77
|
-
@failures << failure
|
78
|
-
@formatter.spec_failed(name, @failures.length, failure)
|
79
|
-
end
|
80
|
-
|
81
|
-
class Failure
|
82
|
-
attr_reader :exception
|
83
|
-
|
84
|
-
def initialize(context_name, spec_name, exception)
|
85
|
-
@context_name = context_name
|
86
|
-
@spec_name = spec_name
|
87
|
-
@exception = exception
|
88
|
-
end
|
89
|
-
|
90
|
-
def header
|
91
|
-
if expectation_not_met?
|
92
|
-
"'#{@context_name} #{@spec_name}' FAILED"
|
93
|
-
else
|
94
|
-
"#{@exception.class.name} in '#{@context_name} #{@spec_name}'"
|
95
|
-
end
|
96
|
-
end
|
97
|
-
|
98
|
-
def expectation_not_met?
|
99
|
-
@exception.is_a?(Spec::Expectations::ExpectationNotMetError)
|
100
|
-
end
|
101
|
-
|
102
|
-
end
|
103
|
-
end
|
104
|
-
end
|
105
|
-
end
|
@@ -1,25 +0,0 @@
|
|
1
|
-
module Spec
|
2
|
-
module Runner
|
3
|
-
class SpecMatcher
|
4
|
-
|
5
|
-
attr_writer :spec_desc
|
6
|
-
def initialize(context_desc, spec_desc=nil)
|
7
|
-
@context_desc = context_desc
|
8
|
-
@spec_desc = spec_desc
|
9
|
-
end
|
10
|
-
|
11
|
-
def matches?(desc)
|
12
|
-
desc =~ /(^#{context_regexp} #{spec_regexp}$|^#{context_regexp}$|^#{spec_regexp}$)/
|
13
|
-
end
|
14
|
-
|
15
|
-
private
|
16
|
-
def context_regexp
|
17
|
-
Regexp.escape(@context_desc)
|
18
|
-
end
|
19
|
-
|
20
|
-
def spec_regexp
|
21
|
-
Regexp.escape(@spec_desc)
|
22
|
-
end
|
23
|
-
end
|
24
|
-
end
|
25
|
-
end
|
@@ -1,41 +0,0 @@
|
|
1
|
-
module Spec
|
2
|
-
module Runner
|
3
|
-
# Parses a spec file and finds the nearest spec for a given line number.
|
4
|
-
class SpecParser
|
5
|
-
def spec_name_for(io, line_number)
|
6
|
-
source = io.read
|
7
|
-
context = context_at_line(source, line_number)
|
8
|
-
spec = spec_at_line(source, line_number)
|
9
|
-
if context && spec
|
10
|
-
"#{context} #{spec}"
|
11
|
-
elsif context
|
12
|
-
context
|
13
|
-
else
|
14
|
-
nil
|
15
|
-
end
|
16
|
-
end
|
17
|
-
|
18
|
-
protected
|
19
|
-
|
20
|
-
def context_at_line(source, line_number)
|
21
|
-
find_above(source, line_number, /^\s*context\s+['|"](.*)['|"]/)
|
22
|
-
end
|
23
|
-
|
24
|
-
def spec_at_line(source, line_number)
|
25
|
-
find_above(source, line_number, /^\s*specify\s+['|"](.*)['|"]/)
|
26
|
-
end
|
27
|
-
|
28
|
-
def find_above(source, line_number, pattern)
|
29
|
-
lines_above_reversed(source, line_number).each do |line|
|
30
|
-
return $1 if line =~ pattern
|
31
|
-
end
|
32
|
-
nil
|
33
|
-
end
|
34
|
-
|
35
|
-
def lines_above_reversed(source, line_number)
|
36
|
-
lines = source.split("\n")
|
37
|
-
lines[0...line_number].reverse
|
38
|
-
end
|
39
|
-
end
|
40
|
-
end
|
41
|
-
end
|
@@ -1,74 +0,0 @@
|
|
1
|
-
module Spec
|
2
|
-
module Runner
|
3
|
-
class SpecShouldRaiseHandler
|
4
|
-
def initialize(file_and_line_number, opts)
|
5
|
-
@file_and_line_number = file_and_line_number
|
6
|
-
@options = opts
|
7
|
-
@expected_error_class = determine_error_class(opts)
|
8
|
-
@expected_error_message = determine_error_message(opts)
|
9
|
-
end
|
10
|
-
|
11
|
-
def determine_error_class(opts)
|
12
|
-
if candidate = opts[:should_raise]
|
13
|
-
if candidate.is_a?(Class)
|
14
|
-
return candidate
|
15
|
-
elsif candidate.is_a?(Array)
|
16
|
-
return candidate[0]
|
17
|
-
else
|
18
|
-
return Exception
|
19
|
-
end
|
20
|
-
end
|
21
|
-
end
|
22
|
-
|
23
|
-
def determine_error_message(opts)
|
24
|
-
if candidate = opts[:should_raise]
|
25
|
-
if candidate.is_a?(Array)
|
26
|
-
return candidate[1]
|
27
|
-
end
|
28
|
-
end
|
29
|
-
return nil
|
30
|
-
end
|
31
|
-
|
32
|
-
def build_message(exception=nil)
|
33
|
-
if @expected_error_message.nil?
|
34
|
-
message = "specify block expected #{@expected_error_class.to_s}"
|
35
|
-
else
|
36
|
-
message = "specify block expected #{@expected_error_class.new(@expected_error_message.to_s).inspect}"
|
37
|
-
end
|
38
|
-
message << " but raised #{exception.inspect}" if exception
|
39
|
-
message << " but nothing was raised" unless exception
|
40
|
-
message << "\n"
|
41
|
-
message << @file_and_line_number
|
42
|
-
end
|
43
|
-
|
44
|
-
def error_matches?(error)
|
45
|
-
return false unless error.kind_of?(@expected_error_class)
|
46
|
-
unless @expected_error_message.nil?
|
47
|
-
if @expected_error_message.is_a?(Regexp)
|
48
|
-
return false unless error.message =~ @expected_error_message
|
49
|
-
else
|
50
|
-
return false unless error.message == @expected_error_message
|
51
|
-
end
|
52
|
-
end
|
53
|
-
return true
|
54
|
-
end
|
55
|
-
|
56
|
-
def handle(errors)
|
57
|
-
if @expected_error_class
|
58
|
-
if errors.empty?
|
59
|
-
errors << Spec::Expectations::ExpectationNotMetError.new(build_message)
|
60
|
-
else
|
61
|
-
error_to_remove = errors.detect do |error|
|
62
|
-
error_matches?(error)
|
63
|
-
end
|
64
|
-
if error_to_remove.nil?
|
65
|
-
errors.insert(0,Spec::Expectations::ExpectationNotMetError.new(build_message(errors[0])))
|
66
|
-
else
|
67
|
-
errors.delete(error_to_remove)
|
68
|
-
end
|
69
|
-
end
|
70
|
-
end
|
71
|
-
end
|
72
|
-
end
|
73
|
-
end
|
74
|
-
end
|