puppet 0.18.4 → 0.22.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/CHANGELOG +288 -0
- data/README +2 -2
- data/Rakefile +78 -5
- data/bin/puppet +28 -36
- data/bin/puppetca +81 -38
- data/bin/puppetd +65 -62
- data/bin/puppetdoc +409 -140
- data/bin/puppetmasterd +59 -47
- data/bin/puppetrun +38 -23
- data/conf/freebsd/puppetd +26 -0
- data/conf/freebsd/puppetmasterd +26 -0
- data/conf/gentoo/conf.d/puppet +5 -0
- data/conf/gentoo/conf.d/puppetmaster +12 -0
- data/conf/gentoo/init.d/puppet +38 -0
- data/conf/gentoo/init.d/puppetmaster +50 -0
- data/conf/gentoo/puppet/fileserver.conf +12 -0
- data/conf/gentoo/puppet/puppetca.conf +29 -0
- data/conf/gentoo/puppet/puppetd.conf +29 -0
- data/conf/gentoo/puppet/puppetmasterd.conf +29 -0
- data/conf/redhat/client.init +10 -5
- data/conf/redhat/client.sysconfig +1 -1
- data/conf/redhat/fileserver.conf +2 -2
- data/conf/redhat/logrotate +1 -1
- data/conf/redhat/no-lockdir.patch +13 -0
- data/conf/redhat/puppet.spec +65 -8
- data/conf/redhat/puppetd.conf +0 -4
- data/conf/redhat/server.init +3 -6
- data/conf/solaris/pkginfo +1 -1
- data/conf/solaris/smf/svc-puppetd +2 -2
- data/conf/suse/client.init +142 -0
- data/conf/suse/puppet.spec +221 -0
- data/conf/suse/server.init +162 -0
- data/examples/code/mac_automount.pp +16 -0
- data/examples/root/bin/sleeper +3 -5
- data/examples/root/etc/init.d/sleeper +8 -2
- data/examples/root/etc/puppet/fileserver.conf +12 -2
- data/examples/root/etc/puppet/namespaceauth.conf +20 -0
- data/examples/root/etc/puppet/puppetd.conf +4 -0
- data/examples/root/etc/puppet/puppetmasterd.conf +6 -9
- data/examples/root/etc/puppet/tagmail.conf +1 -0
- data/ext/emacs/puppet-mode.el +46 -1
- data/ext/logcheck/puppet +15 -0
- data/ext/module_puppet +15 -23
- data/ext/vim/puppet.vim +4 -2
- data/install.rb +2 -1
- data/lib/puppet.rb +76 -207
- data/lib/puppet/configuration.rb +331 -0
- data/lib/puppet/daemon.rb +63 -246
- data/lib/puppet/dsl.rb +371 -0
- data/lib/puppet/element.rb +8 -26
- data/lib/puppet/error.rb +54 -0
- data/lib/puppet/event.rb +8 -243
- data/lib/puppet/{base64.rb → external/base64.rb} +0 -0
- data/lib/puppet/external/event-loop.rb +1 -0
- data/lib/puppet/{event-loop → external/event-loop}/better-definers.rb +0 -0
- data/lib/puppet/{event-loop → external/event-loop}/event-loop.rb +2 -2
- data/lib/puppet/{event-loop → external/event-loop}/signal-system.rb +1 -1
- data/lib/puppet/external/gratr.rb +33 -0
- data/lib/puppet/external/gratr/adjacency_graph.rb +257 -0
- data/lib/puppet/external/gratr/base.rb +34 -0
- data/lib/puppet/external/gratr/biconnected.rb +116 -0
- data/lib/puppet/external/gratr/chinese_postman.rb +123 -0
- data/lib/puppet/external/gratr/common.rb +73 -0
- data/lib/puppet/external/gratr/comparability.rb +92 -0
- data/lib/puppet/external/gratr/digraph.rb +116 -0
- data/lib/puppet/external/gratr/digraph_distance.rb +185 -0
- data/lib/puppet/external/gratr/dot.rb +90 -0
- data/lib/puppet/external/gratr/edge.rb +145 -0
- data/lib/puppet/external/gratr/graph.rb +303 -0
- data/lib/puppet/external/gratr/graph_api.rb +83 -0
- data/lib/puppet/external/gratr/import.rb +44 -0
- data/lib/puppet/external/gratr/labels.rb +90 -0
- data/lib/puppet/external/gratr/maximum_flow.rb +64 -0
- data/lib/puppet/external/gratr/rdot.rb +327 -0
- data/lib/puppet/external/gratr/search.rb +409 -0
- data/lib/puppet/external/gratr/strong_components.rb +127 -0
- data/lib/puppet/external/gratr/undirected_graph.rb +153 -0
- data/lib/puppet/{lock.rb → external/lock.rb} +1 -1
- data/lib/puppet/feature/base.rb +20 -0
- data/lib/puppet/feature/rails.rb +52 -0
- data/lib/puppet/metatype/attributes.rb +719 -0
- data/lib/puppet/metatype/closure.rb +111 -0
- data/lib/puppet/metatype/container.rb +94 -0
- data/lib/puppet/metatype/evaluation.rb +118 -0
- data/lib/puppet/metatype/instances.rb +261 -0
- data/lib/puppet/metatype/manager.rb +169 -0
- data/lib/puppet/metatype/metaparams.rb +409 -0
- data/lib/puppet/metatype/providers.rb +260 -0
- data/lib/puppet/metatype/relationships.rb +116 -0
- data/lib/puppet/metatype/schedules.rb +39 -0
- data/lib/puppet/metatype/tags.rb +39 -0
- data/lib/puppet/modules.rb +113 -0
- data/lib/puppet/network/authconfig.rb +168 -0
- data/lib/puppet/network/authorization.rb +84 -0
- data/lib/puppet/network/authstore.rb +293 -0
- data/lib/puppet/network/client.rb +187 -0
- data/lib/puppet/network/client/ca.rb +56 -0
- data/lib/puppet/network/client/dipper.rb +81 -0
- data/lib/puppet/network/client/file.rb +7 -0
- data/lib/puppet/network/client/logger.rb +6 -0
- data/lib/puppet/network/client/master.rb +644 -0
- data/lib/puppet/{client → network/client}/proxy.rb +3 -3
- data/lib/puppet/{client/reporter.rb → network/client/report.rb} +4 -7
- data/lib/puppet/{client/pelement.rb → network/client/resource.rb} +6 -19
- data/lib/puppet/network/client/runner.rb +13 -0
- data/lib/puppet/network/client/status.rb +5 -0
- data/lib/puppet/network/client_request.rb +32 -0
- data/lib/puppet/network/handler.rb +33 -0
- data/lib/puppet/{server → network/handler}/ca.rb +5 -6
- data/lib/puppet/network/handler/filebucket.rb +180 -0
- data/lib/puppet/{server → network/handler}/fileserver.rb +277 -219
- data/lib/puppet/{server → network/handler}/logger.rb +3 -5
- data/lib/puppet/{server → network/handler}/master.rb +42 -8
- data/lib/puppet/network/handler/report.rb +158 -0
- data/lib/puppet/network/handler/resource.rb +190 -0
- data/lib/puppet/{server → network/handler}/runner.rb +17 -18
- data/lib/puppet/network/handler/status.rb +13 -0
- data/lib/puppet/network/rights.rb +74 -0
- data/lib/puppet/network/server.rb +5 -0
- data/lib/puppet/network/server/mongrel.rb +138 -0
- data/lib/puppet/network/server/webrick.rb +153 -0
- data/lib/puppet/network/xmlrpc/client.rb +129 -0
- data/lib/puppet/network/xmlrpc/processor.rb +91 -0
- data/lib/puppet/network/xmlrpc/server.rb +20 -0
- data/lib/puppet/network/xmlrpc/webrick_servlet.rb +121 -0
- data/lib/puppet/parameter.rb +390 -346
- data/lib/puppet/parser/ast.rb +116 -147
- data/lib/puppet/parser/ast/astarray.rb +17 -33
- data/lib/puppet/parser/ast/branch.rb +2 -0
- data/lib/puppet/parser/ast/caseopt.rb +7 -12
- data/lib/puppet/parser/ast/casestatement.rb +23 -32
- data/lib/puppet/parser/ast/collection.rb +19 -80
- data/lib/puppet/parser/ast/collexpr.rb +81 -0
- data/lib/puppet/parser/ast/component.rb +160 -89
- data/lib/puppet/parser/ast/else.rb +30 -0
- data/lib/puppet/parser/ast/function.rb +9 -2
- data/lib/puppet/parser/ast/hostclass.rb +47 -131
- data/lib/puppet/parser/ast/ifstatement.rb +43 -0
- data/lib/puppet/parser/ast/leaf.rb +10 -21
- data/lib/puppet/parser/ast/node.rb +32 -79
- data/lib/puppet/parser/ast/resourcedef.rb +222 -0
- data/lib/puppet/parser/ast/{typedefaults.rb → resourcedefaults.rb} +10 -16
- data/lib/puppet/parser/ast/resourceoverride.rb +62 -0
- data/lib/puppet/parser/ast/{objectparam.rb → resourceparam.rb} +12 -6
- data/lib/puppet/parser/ast/resourceref.rb +44 -0
- data/lib/puppet/parser/ast/selector.rb +16 -8
- data/lib/puppet/parser/ast/tag.rb +3 -1
- data/lib/puppet/parser/ast/vardef.rb +8 -12
- data/lib/puppet/parser/collector.rb +181 -0
- data/lib/puppet/parser/functions.rb +191 -36
- data/lib/puppet/parser/interpreter.rb +802 -380
- data/lib/puppet/parser/lexer.rb +86 -19
- data/lib/puppet/parser/parser.rb +1123 -960
- data/lib/puppet/parser/resource.rb +353 -0
- data/lib/puppet/parser/resource/param.rb +57 -0
- data/lib/puppet/parser/resource/reference.rb +71 -0
- data/lib/puppet/parser/scope.rb +573 -1000
- data/lib/puppet/parser/templatewrapper.rb +54 -0
- data/lib/puppet/pgraph.rb +208 -0
- data/lib/puppet/propertychange.rb +143 -0
- data/lib/puppet/provider.rb +302 -0
- data/lib/puppet/provider/cron/crontab.rb +187 -0
- data/lib/puppet/provider/group/groupadd.rb +29 -0
- data/lib/puppet/provider/group/netinfo.rb +12 -0
- data/lib/puppet/provider/group/pw.rb +31 -0
- data/lib/puppet/provider/host/netinfo.rb +18 -0
- data/lib/puppet/provider/host/parsed.rb +73 -0
- data/lib/puppet/provider/mount.rb +57 -0
- data/lib/puppet/provider/mount/netinfo.rb +38 -0
- data/lib/puppet/provider/mount/parsed.rb +37 -0
- data/lib/puppet/provider/nameservice.rb +344 -0
- data/lib/puppet/provider/nameservice/netinfo.rb +210 -0
- data/lib/puppet/provider/nameservice/objectadd.rb +45 -0
- data/lib/puppet/provider/nameservice/pw.rb +22 -0
- data/lib/puppet/provider/package/apple.rb +53 -0
- data/lib/puppet/provider/package/apt.rb +119 -0
- data/lib/puppet/provider/package/aptitude.rb +30 -0
- data/lib/puppet/provider/package/aptrpm.rb +79 -0
- data/lib/puppet/provider/package/blastwave.rb +114 -0
- data/lib/puppet/provider/package/darwinport.rb +88 -0
- data/lib/puppet/provider/package/dpkg.rb +109 -0
- data/lib/puppet/provider/package/freebsd.rb +43 -0
- data/lib/puppet/provider/package/gem.rb +104 -0
- data/lib/puppet/provider/package/openbsd.rb +93 -0
- data/lib/puppet/provider/package/pkgdmg.rb +119 -0
- data/lib/puppet/provider/package/portage.rb +112 -0
- data/lib/puppet/provider/package/ports.rb +94 -0
- data/lib/puppet/provider/package/rpm.rb +125 -0
- data/lib/puppet/provider/package/rug.rb +53 -0
- data/lib/puppet/provider/package/sun.rb +168 -0
- data/lib/puppet/provider/package/sunfreeware.rb +9 -0
- data/lib/puppet/provider/package/up2date.rb +45 -0
- data/lib/puppet/provider/package/yum.rb +54 -0
- data/lib/puppet/provider/parsedfile.rb +342 -0
- data/lib/puppet/provider/port/parsed.rb +174 -0
- data/lib/puppet/provider/service/base.rb +136 -0
- data/lib/puppet/provider/service/debian.rb +32 -0
- data/lib/puppet/provider/service/gentoo.rb +49 -0
- data/lib/puppet/{type → provider}/service/init.rb +42 -40
- data/lib/puppet/provider/service/redhat.rb +59 -0
- data/lib/puppet/{type → provider}/service/smf.rb +24 -13
- data/lib/puppet/provider/sshkey/parsed.rb +36 -0
- data/lib/puppet/provider/user/netinfo.rb +106 -0
- data/lib/puppet/provider/user/pw.rb +41 -0
- data/lib/puppet/provider/user/useradd.rb +67 -0
- data/lib/puppet/provider/zone/solaris.rb +208 -0
- data/lib/puppet/rails.rb +102 -66
- data/lib/puppet/rails/database/001_add_indexes.rb +38 -0
- data/lib/puppet/rails/database/schema.rb +89 -0
- data/lib/puppet/rails/external/tagging/acts_as_taggable.rb +62 -0
- data/lib/puppet/rails/external/tagging/init.rb +5 -0
- data/lib/puppet/rails/external/tagging/tag.rb +50 -0
- data/lib/puppet/rails/external/tagging/tagging.rb +12 -0
- data/lib/puppet/rails/fact_name.rb +7 -0
- data/lib/puppet/rails/fact_value.rb +5 -0
- data/lib/puppet/rails/host.rb +95 -46
- data/lib/puppet/rails/param_name.rb +28 -0
- data/lib/puppet/rails/param_value.rb +5 -0
- data/lib/puppet/rails/puppet_class.rb +9 -0
- data/lib/puppet/rails/resource.rb +95 -0
- data/lib/puppet/rails/source_file.rb +5 -0
- data/lib/puppet/relationship.rb +63 -0
- data/lib/puppet/reports/log.rb +14 -0
- data/lib/puppet/reports/rrdgraph.rb +114 -10
- data/lib/puppet/reports/store.rb +64 -0
- data/lib/puppet/reports/tagmail.rb +144 -71
- data/lib/puppet/sslcertificates.rb +38 -5
- data/lib/puppet/sslcertificates/ca.rb +142 -37
- data/lib/puppet/sslcertificates/certificate.rb +3 -3
- data/lib/puppet/sslcertificates/inventory.rb +53 -0
- data/lib/puppet/sslcertificates/support.rb +128 -0
- data/lib/puppet/transaction.rb +568 -189
- data/lib/puppet/transaction/report.rb +14 -3
- data/lib/puppet/transportable.rb +18 -10
- data/lib/puppet/type.rb +279 -2299
- data/lib/puppet/type/component.rb +63 -63
- data/lib/puppet/type/cron.rb +294 -710
- data/lib/puppet/type/exec.rb +185 -129
- data/lib/puppet/type/group.rb +38 -89
- data/lib/puppet/type/host.rb +110 -0
- data/lib/puppet/type/mount.rb +189 -0
- data/lib/puppet/type/notify.rb +47 -0
- data/lib/puppet/type/package.rb +129 -257
- data/lib/puppet/type/parsedtype.rb +172 -297
- data/lib/puppet/type/pfile.rb +540 -319
- data/lib/puppet/type/pfile/checksum.rb +103 -76
- data/lib/puppet/type/pfile/content.rb +16 -10
- data/lib/puppet/type/pfile/ensure.rb +52 -34
- data/lib/puppet/type/pfile/group.rb +25 -18
- data/lib/puppet/type/pfile/mode.rb +7 -4
- data/lib/puppet/type/pfile/{uid.rb → owner.rb} +21 -17
- data/lib/puppet/type/pfile/source.rb +119 -124
- data/lib/puppet/type/pfile/target.rb +29 -45
- data/lib/puppet/type/pfile/type.rb +2 -2
- data/lib/puppet/type/pfilebucket.rb +18 -14
- data/lib/puppet/type/port.rb +121 -0
- data/lib/puppet/type/property.rb +530 -0
- data/lib/puppet/type/resources.rb +150 -0
- data/lib/puppet/type/schedule.rb +38 -22
- data/lib/puppet/type/service.rb +70 -326
- data/lib/puppet/type/sshkey.rb +76 -0
- data/lib/puppet/type/tidy.rb +197 -97
- data/lib/puppet/type/user.rb +107 -183
- data/lib/puppet/type/yumrepo.rb +53 -34
- data/lib/puppet/type/zone.rb +55 -208
- data/lib/puppet/util.rb +239 -201
- data/lib/puppet/util/autoload.rb +107 -0
- data/lib/puppet/util/classgen.rb +208 -0
- data/lib/puppet/{config.rb → util/config.rb} +102 -54
- data/lib/puppet/util/docs.rb +104 -0
- data/lib/puppet/util/errors.rb +55 -0
- data/lib/puppet/util/execution.rb +22 -0
- data/lib/puppet/util/feature.rb +76 -0
- data/lib/puppet/util/fileparsing.rb +380 -0
- data/lib/puppet/util/filetype.rb +300 -0
- data/lib/puppet/util/graph.rb +39 -0
- data/lib/puppet/util/inifile.rb +209 -0
- data/lib/puppet/util/loadedfile.rb +71 -0
- data/lib/puppet/util/log.rb +549 -0
- data/lib/puppet/util/logging.rb +20 -0
- data/lib/puppet/util/metaid.rb +22 -0
- data/lib/puppet/util/methodhelper.rb +37 -0
- data/lib/puppet/util/metric.rb +160 -0
- data/lib/puppet/util/package.rb +31 -0
- data/lib/puppet/util/pidlock.rb +68 -0
- data/lib/puppet/util/plist.rb +24 -0
- data/lib/puppet/util/plist/generator.rb +226 -0
- data/lib/puppet/util/plist/parser.rb +227 -0
- data/lib/puppet/util/posix.rb +87 -0
- data/lib/puppet/util/provider_features.rb +170 -0
- data/lib/puppet/util/rails/collection_merger.rb +42 -0
- data/lib/puppet/util/storage.rb +103 -0
- data/lib/puppet/util/subclass_loader.rb +83 -0
- data/lib/puppet/util/suidmanager.rb +86 -0
- data/lib/puppet/util/variables.rb +39 -0
- data/lib/puppet/util/warnings.rb +15 -0
- data/test/Rakefile +97 -0
- data/test/certmgr/ca.rb +81 -0
- data/test/certmgr/certmgr.rb +77 -50
- data/test/certmgr/inventory.rb +79 -0
- data/test/certmgr/support.rb +81 -0
- data/test/executables/filebucket.rb +49 -0
- data/test/executables/puppetbin.rb +28 -12
- data/test/executables/puppetca.rb +75 -54
- data/test/executables/puppetd.rb +10 -13
- data/test/executables/puppetmasterd.rb +12 -17
- data/test/executables/puppetmodule.rb +18 -17
- data/test/language/ast.rb +242 -798
- data/test/language/ast/casestatement.rb +104 -0
- data/test/language/ast/component.rb +133 -0
- data/test/language/ast/hostclass.rb +162 -0
- data/test/language/ast/selector.rb +62 -0
- data/test/language/ast/variable.rb +31 -0
- data/test/language/collector.rb +369 -0
- data/test/language/functions.rb +305 -18
- data/test/language/interpreter.rb +894 -125
- data/test/language/lexer.rb +98 -12
- data/test/language/node.rb +37 -53
- data/test/language/parser.rb +455 -148
- data/test/language/resource.rb +535 -0
- data/test/language/scope.rb +451 -561
- data/test/language/snippets.rb +101 -111
- data/test/language/transportable.rb +6 -8
- data/test/lib/mocha.rb +19 -0
- data/test/lib/mocha/any_instance_method.rb +35 -0
- data/test/lib/mocha/auto_verify.rb +113 -0
- data/test/lib/mocha/central.rb +35 -0
- data/test/lib/mocha/class_method.rb +62 -0
- data/test/lib/mocha/expectation.rb +295 -0
- data/test/lib/mocha/expectation_error.rb +6 -0
- data/test/lib/mocha/infinite_range.rb +27 -0
- data/test/lib/mocha/inspect.rb +37 -0
- data/test/lib/mocha/instance_method.rb +8 -0
- data/test/lib/mocha/metaclass.rb +7 -0
- data/test/lib/mocha/mock.rb +20 -0
- data/test/lib/mocha/mock_methods.rb +122 -0
- data/test/lib/mocha/object.rb +100 -0
- data/test/lib/mocha/pretty_parameters.rb +28 -0
- data/test/lib/mocha/setup_and_teardown.rb +23 -0
- data/test/lib/mocha/standalone.rb +30 -0
- data/test/lib/mocha/test_case_adapter.rb +49 -0
- data/test/lib/mocha_standalone.rb +2 -0
- data/test/lib/puppettest.rb +294 -0
- data/test/lib/puppettest/certificates.rb +61 -0
- data/test/lib/puppettest/exetest.rb +123 -0
- data/test/lib/puppettest/fakes.rb +194 -0
- data/test/lib/puppettest/fileparsing.rb +33 -0
- data/test/lib/puppettest/filetesting.rb +231 -0
- data/test/lib/puppettest/graph.rb +41 -0
- data/test/lib/puppettest/parsertesting.rb +392 -0
- data/test/lib/puppettest/railstesting.rb +56 -0
- data/test/lib/puppettest/reporttesting.rb +19 -0
- data/test/lib/puppettest/resourcetesting.rb +73 -0
- data/test/lib/puppettest/servertest.rb +72 -0
- data/test/lib/puppettest/support.rb +8 -0
- data/test/lib/puppettest/support/assertions.rb +101 -0
- data/test/lib/puppettest/support/helpers.rb +23 -0
- data/test/lib/puppettest/support/resources.rb +37 -0
- data/test/lib/puppettest/support/utils.rb +160 -0
- data/test/lib/puppettest/testcase.rb +48 -0
- data/test/lib/rake/puppet_test_loader.rb +17 -0
- data/test/lib/rake/puppet_testtask.rb +17 -0
- data/test/lib/spec.rb +8 -0
- data/test/lib/spec/callback.rb +11 -0
- data/test/lib/spec/callback/callback_container.rb +60 -0
- data/test/lib/spec/callback/extensions/module.rb +24 -0
- data/test/lib/spec/callback/extensions/object.rb +37 -0
- data/test/lib/spec/deprecated.rb +3 -0
- data/test/lib/spec/expectations.rb +59 -0
- data/test/lib/spec/expectations/differs/default.rb +62 -0
- data/test/lib/spec/expectations/errors.rb +6 -0
- data/test/lib/spec/expectations/extensions.rb +3 -0
- data/test/lib/spec/expectations/extensions/object.rb +109 -0
- data/test/lib/spec/expectations/extensions/proc.rb +57 -0
- data/test/lib/spec/expectations/extensions/string_and_symbol.rb +17 -0
- data/test/lib/spec/expectations/handler.rb +47 -0
- data/test/lib/spec/expectations/should.rb +5 -0
- data/test/lib/spec/expectations/should/base.rb +64 -0
- data/test/lib/spec/expectations/should/change.rb +69 -0
- data/test/lib/spec/expectations/should/have.rb +128 -0
- data/test/lib/spec/expectations/should/not.rb +74 -0
- data/test/lib/spec/expectations/should/should.rb +81 -0
- data/test/lib/spec/expectations/sugar.rb +47 -0
- data/test/lib/spec/matchers.rb +160 -0
- data/test/lib/spec/matchers/be.rb +161 -0
- data/test/lib/spec/matchers/be_close.rb +37 -0
- data/test/lib/spec/matchers/change.rb +120 -0
- data/test/lib/spec/matchers/eql.rb +43 -0
- data/test/lib/spec/matchers/equal.rb +43 -0
- data/test/lib/spec/matchers/has.rb +44 -0
- data/test/lib/spec/matchers/have.rb +140 -0
- data/test/lib/spec/matchers/include.rb +50 -0
- data/test/lib/spec/matchers/match.rb +41 -0
- data/test/lib/spec/matchers/raise_error.rb +100 -0
- data/test/lib/spec/matchers/respond_to.rb +35 -0
- data/test/lib/spec/matchers/satisfy.rb +47 -0
- data/test/lib/spec/matchers/throw_symbol.rb +75 -0
- data/test/lib/spec/mocks.rb +232 -0
- data/test/lib/spec/mocks/argument_expectation.rb +132 -0
- data/test/lib/spec/mocks/error_generator.rb +85 -0
- data/test/lib/spec/mocks/errors.rb +10 -0
- data/test/lib/spec/mocks/extensions/object.rb +3 -0
- data/test/lib/spec/mocks/message_expectation.rb +231 -0
- data/test/lib/spec/mocks/methods.rb +40 -0
- data/test/lib/spec/mocks/mock.rb +26 -0
- data/test/lib/spec/mocks/mock_handler.rb +166 -0
- data/test/lib/spec/mocks/order_group.rb +29 -0
- data/test/lib/spec/rake/spectask.rb +173 -0
- data/test/lib/spec/rake/verify_rcov.rb +47 -0
- data/test/lib/spec/runner.rb +132 -0
- data/test/lib/spec/runner/backtrace_tweaker.rb +55 -0
- data/test/lib/spec/runner/command_line.rb +34 -0
- data/test/lib/spec/runner/context.rb +154 -0
- data/test/lib/spec/runner/context_eval.rb +142 -0
- data/test/lib/spec/runner/context_runner.rb +55 -0
- data/test/lib/spec/runner/drb_command_line.rb +21 -0
- data/test/lib/spec/runner/execution_context.rb +17 -0
- data/test/lib/spec/runner/extensions/kernel.rb +17 -0
- data/test/lib/spec/runner/extensions/object.rb +32 -0
- data/test/lib/spec/runner/formatter.rb +5 -0
- data/test/lib/spec/runner/formatter/base_text_formatter.rb +118 -0
- data/test/lib/spec/runner/formatter/html_formatter.rb +219 -0
- data/test/lib/spec/runner/formatter/progress_bar_formatter.rb +27 -0
- data/test/lib/spec/runner/formatter/rdoc_formatter.rb +22 -0
- data/test/lib/spec/runner/formatter/specdoc_formatter.rb +23 -0
- data/test/lib/spec/runner/heckle_runner.rb +71 -0
- data/test/lib/spec/runner/heckle_runner_win.rb +10 -0
- data/test/lib/spec/runner/option_parser.rb +224 -0
- data/test/lib/spec/runner/reporter.rb +105 -0
- data/test/lib/spec/runner/spec_matcher.rb +25 -0
- data/test/lib/spec/runner/spec_parser.rb +41 -0
- data/test/lib/spec/runner/spec_should_raise_handler.rb +74 -0
- data/test/lib/spec/runner/specification.rb +114 -0
- data/test/lib/spec/translator.rb +87 -0
- data/test/lib/spec/version.rb +30 -0
- data/test/lib/stubba.rb +2 -0
- data/test/network/authconfig.rb +72 -0
- data/test/network/authorization.rb +138 -0
- data/test/network/authstore.rb +450 -0
- data/test/network/client/ca.rb +38 -0
- data/test/{client → network/client}/client.rb +107 -24
- data/test/network/client/dipper.rb +35 -0
- data/test/network/client/master.rb +627 -0
- data/test/{client/pelement.rb → network/client/resource.rb} +13 -29
- data/test/network/client_request.rb +39 -0
- data/test/network/daemon.rb +71 -0
- data/test/{server → network/handler}/bucket.rb +103 -27
- data/test/{server → network/handler}/ca.rb +14 -19
- data/test/{server → network/handler}/fileserver.rb +443 -68
- data/test/network/handler/handler.rb +64 -0
- data/test/{server → network/handler}/logger.rb +26 -26
- data/test/network/handler/master.rb +352 -0
- data/test/network/handler/report.rb +185 -0
- data/test/{server/pelement.rb → network/handler/resource.rb} +25 -38
- data/test/{server → network/handler}/runner.rb +17 -16
- data/test/network/rights.rb +38 -0
- data/test/network/server/webrick.rb +140 -0
- data/test/network/xmlrpc/client.rb +68 -0
- data/test/network/xmlrpc/processor.rb +80 -0
- data/test/network/xmlrpc/server.rb +28 -0
- data/test/network/xmlrpc/webrick_servlet.rb +26 -0
- data/test/other/dsl.rb +218 -0
- data/test/other/events.rb +22 -15
- data/test/other/overrides.rb +9 -14
- data/test/other/pgraph.rb +289 -0
- data/test/other/propertychange.rb +142 -0
- data/test/other/provider.rb +162 -0
- data/test/other/puppet.rb +63 -10
- data/test/other/relationship.rb +74 -0
- data/test/other/relationships.rb +199 -123
- data/test/other/report.rb +152 -23
- data/test/other/transactions.rb +824 -78
- data/test/puppet/conffiles.rb +16 -11
- data/test/puppet/defaults.rb +7 -10
- data/test/puppet/{error.rb → errortest.rb} +5 -8
- data/test/puppet/modules.rb +58 -0
- data/test/puppet/tc_suidmanager.rb +107 -0
- data/test/rails/host.rb +177 -0
- data/test/rails/rails.rb +27 -0
- data/test/rails/railsparameter.rb +62 -0
- data/test/rails/railsresource.rb +100 -0
- data/test/ral/manager/attributes.rb +296 -0
- data/test/ral/manager/manager.rb +55 -0
- data/test/ral/manager/provider.rb +54 -0
- data/test/ral/manager/type.rb +837 -0
- data/test/ral/providers/cron/crontab.rb +346 -0
- data/test/ral/providers/group.rb +252 -0
- data/test/ral/providers/host/netinfo.rb +58 -0
- data/test/ral/providers/host/parsed.rb +226 -0
- data/test/ral/providers/mount/netinfo.rb +80 -0
- data/test/ral/providers/mount/parsed.rb +223 -0
- data/test/ral/providers/nameservice.rb +33 -0
- data/test/ral/providers/package.rb +253 -0
- data/test/ral/providers/package/apt.rb +89 -0
- data/test/ral/providers/package/aptitude.rb +69 -0
- data/test/ral/providers/package/aptrpm.rb +89 -0
- data/test/ral/providers/package/dpkg.rb +64 -0
- data/test/ral/providers/parsedfile.rb +668 -0
- data/test/ral/providers/parsedport.rb +233 -0
- data/test/ral/providers/provider.rb +423 -0
- data/test/{types → ral/providers}/service.rb +20 -121
- data/test/ral/providers/service/base.rb +75 -0
- data/test/ral/providers/sshkey/parsed.rb +111 -0
- data/test/ral/providers/user.rb +567 -0
- data/test/ral/providers/user/useradd.rb +250 -0
- data/test/ral/types/basic.rb +90 -0
- data/test/ral/types/component.rb +113 -0
- data/test/ral/types/cron.rb +480 -0
- data/test/{types → ral/types}/exec.rb +278 -82
- data/test/ral/types/file.rb +1799 -0
- data/test/ral/types/file/target.rb +363 -0
- data/test/{types → ral/types}/filebucket.rb +15 -17
- data/test/{types → ral/types}/fileignoresource.rb +9 -15
- data/test/ral/types/filesources.rb +1046 -0
- data/test/ral/types/group.rb +169 -0
- data/test/ral/types/host.rb +155 -0
- data/test/ral/types/mount.rb +312 -0
- data/test/ral/types/package.rb +85 -0
- data/test/ral/types/parameter.rb +172 -0
- data/test/ral/types/port.rb +148 -0
- data/test/ral/types/property.rb +343 -0
- data/test/ral/types/resources.rb +221 -0
- data/test/{types → ral/types}/schedule.rb +34 -12
- data/test/ral/types/service.rb +37 -0
- data/test/{types → ral/types}/sshkey.rb +75 -65
- data/test/ral/types/tidy.rb +240 -0
- data/test/ral/types/user.rb +493 -0
- data/test/{types → ral/types}/yumrepo.rb +7 -11
- data/test/{types → ral/types}/zone.rb +45 -45
- data/test/tagging/tagging.rb +17 -26
- data/test/util/autoload.rb +130 -0
- data/test/util/classgen.rb +227 -0
- data/test/{other → util}/config.rb +373 -113
- data/test/util/execution.rb +34 -0
- data/test/util/features.rb +94 -0
- data/test/util/fileparsing.rb +677 -0
- data/test/{other → util}/filetype.rb +9 -12
- data/test/util/graph.rb +108 -0
- data/test/{other → util}/inifile.rb +24 -11
- data/test/util/loadedfile.rb +106 -0
- data/test/{other → util}/log.rb +96 -50
- data/test/{other → util}/metrics.rb +7 -17
- data/test/util/package.rb +27 -0
- data/test/util/pidlock.rb +126 -0
- data/test/util/posixtest.rb +173 -0
- data/test/util/storage.rb +123 -0
- data/test/util/subclass_loader.rb +100 -0
- data/test/util/utiltest.rb +368 -0
- metadata +449 -169
- data/examples/code/classing +0 -35
- data/examples/code/failers/badclassnoparam +0 -10
- data/examples/code/failers/badclassparam +0 -10
- data/examples/code/failers/badcompnoparam +0 -9
- data/examples/code/failers/badcompparam +0 -9
- data/examples/code/failers/badtypeparam +0 -3
- data/examples/code/failers/noobjectrvalue +0 -1
- data/examples/code/snippets/aliastest.pp +0 -16
- data/examples/code/snippets/argumentdefaults +0 -14
- data/examples/code/snippets/casestatement.pp +0 -58
- data/examples/code/snippets/classheirarchy.pp +0 -15
- data/examples/code/snippets/classincludes.pp +0 -17
- data/examples/code/snippets/classpathtest +0 -11
- data/examples/code/snippets/componentmetaparams.pp +0 -11
- data/examples/code/snippets/deepclassheirarchy.pp +0 -23
- data/examples/code/snippets/defineoverrides.pp +0 -17
- data/examples/code/snippets/dirchmod +0 -19
- data/examples/code/snippets/emptyclass.pp +0 -9
- data/examples/code/snippets/emptyexec.pp +0 -3
- data/examples/code/snippets/failmissingexecpath.pp +0 -13
- data/examples/code/snippets/falsevalues.pp +0 -3
- data/examples/code/snippets/filecreate +0 -11
- data/examples/code/snippets/implicititeration +0 -15
- data/examples/code/snippets/multipleinstances +0 -7
- data/examples/code/snippets/namevartest +0 -9
- data/examples/code/snippets/scopetest +0 -13
- data/examples/code/snippets/selectorvalues.pp +0 -42
- data/examples/code/snippets/simpledefaults +0 -5
- data/examples/code/snippets/simpleselector +0 -38
- data/examples/code/snippets/singleary.pp +0 -19
- data/examples/code/snippets/singlequote.pp +0 -11
- data/examples/code/snippets/singleselector.pp +0 -22
- data/examples/code/snippets/tag.pp +0 -9
- data/examples/code/snippets/tagged.pp +0 -35
- data/lib/puppet/client.rb +0 -177
- data/lib/puppet/client/ca.rb +0 -21
- data/lib/puppet/client/dipper.rb +0 -76
- data/lib/puppet/client/file.rb +0 -20
- data/lib/puppet/client/log.rb +0 -17
- data/lib/puppet/client/master.rb +0 -531
- data/lib/puppet/client/runner.rb +0 -17
- data/lib/puppet/client/status.rb +0 -7
- data/lib/puppet/event-loop.rb +0 -1
- data/lib/puppet/filetype.rb +0 -308
- data/lib/puppet/inifile.rb +0 -201
- data/lib/puppet/log.rb +0 -524
- data/lib/puppet/metric.rb +0 -132
- data/lib/puppet/networkclient.rb +0 -175
- data/lib/puppet/parsedfile.rb +0 -58
- data/lib/puppet/parser/ast/classdef.rb +0 -79
- data/lib/puppet/parser/ast/compdef.rb +0 -75
- data/lib/puppet/parser/ast/nodedef.rb +0 -73
- data/lib/puppet/parser/ast/objectdef.rb +0 -284
- data/lib/puppet/parser/ast/objectref.rb +0 -77
- data/lib/puppet/rails/database.rb +0 -40
- data/lib/puppet/rails/rails_object.rb +0 -42
- data/lib/puppet/rails/rails_parameter.rb +0 -5
- data/lib/puppet/server.rb +0 -196
- data/lib/puppet/server/authconfig.rb +0 -177
- data/lib/puppet/server/authstore.rb +0 -226
- data/lib/puppet/server/filebucket.rb +0 -155
- data/lib/puppet/server/pelement.rb +0 -188
- data/lib/puppet/server/report.rb +0 -184
- data/lib/puppet/server/rights.rb +0 -78
- data/lib/puppet/server/servlet.rb +0 -274
- data/lib/puppet/statechange.rb +0 -129
- data/lib/puppet/storage.rb +0 -98
- data/lib/puppet/type/nameservice.rb +0 -264
- data/lib/puppet/type/nameservice/netinfo.rb +0 -232
- data/lib/puppet/type/nameservice/objectadd.rb +0 -146
- data/lib/puppet/type/nameservice/posix.rb +0 -12
- data/lib/puppet/type/nameservice/pw.rb +0 -107
- data/lib/puppet/type/package/apple.rb +0 -41
- data/lib/puppet/type/package/apt.rb +0 -107
- data/lib/puppet/type/package/blastwave.rb +0 -136
- data/lib/puppet/type/package/darwinport.rb +0 -97
- data/lib/puppet/type/package/dpkg.rb +0 -113
- data/lib/puppet/type/package/freebsd.rb +0 -19
- data/lib/puppet/type/package/gem.rb +0 -119
- data/lib/puppet/type/package/openbsd.rb +0 -112
- data/lib/puppet/type/package/ports.rb +0 -103
- data/lib/puppet/type/package/rpm.rb +0 -121
- data/lib/puppet/type/package/sun.rb +0 -174
- data/lib/puppet/type/package/sunfreeware.rb +0 -7
- data/lib/puppet/type/package/yum.rb +0 -52
- data/lib/puppet/type/parsedtype/host.rb +0 -144
- data/lib/puppet/type/parsedtype/mount.rb +0 -271
- data/lib/puppet/type/parsedtype/port.rb +0 -261
- data/lib/puppet/type/parsedtype/sshkey.rb +0 -123
- data/lib/puppet/type/service/base.rb +0 -12
- data/lib/puppet/type/service/debian.rb +0 -46
- data/lib/puppet/type/service/redhat.rb +0 -38
- data/lib/puppet/type/state.rb +0 -393
- data/lib/puppet/type/symlink.rb +0 -186
- data/test/client/master.rb +0 -207
- data/test/language/rails.rb +0 -105
- data/test/other/parsedfile.rb +0 -58
- data/test/other/storage.rb +0 -100
- data/test/puppet/utiltest.rb +0 -299
- data/test/puppettest.rb +0 -1170
- data/test/server/authconfig.rb +0 -56
- data/test/server/authstore.rb +0 -218
- data/test/server/master.rb +0 -201
- data/test/server/report.rb +0 -93
- data/test/server/rights.rb +0 -41
- data/test/server/server.rb +0 -152
- data/test/test +0 -61
- data/test/types/basic.rb +0 -117
- data/test/types/component.rb +0 -298
- data/test/types/cron.rb +0 -718
- data/test/types/file.rb +0 -1314
- data/test/types/filesources.rb +0 -590
- data/test/types/group.rb +0 -323
- data/test/types/host.rb +0 -186
- data/test/types/mount.rb +0 -294
- data/test/types/package.rb +0 -538
- data/test/types/parameter.rb +0 -107
- data/test/types/port.rb +0 -201
- data/test/types/query.rb +0 -101
- data/test/types/state.rb +0 -92
- data/test/types/symlink.rb +0 -120
- data/test/types/tidy.rb +0 -102
- data/test/types/type.rb +0 -469
- data/test/types/user.rb +0 -563
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
module Spec
|
|
2
|
+
module Runner
|
|
3
|
+
module Formatter
|
|
4
|
+
class ProgressBarFormatter < BaseTextFormatter
|
|
5
|
+
def add_context(name, first)
|
|
6
|
+
@output.puts if first
|
|
7
|
+
STDOUT.flush
|
|
8
|
+
end
|
|
9
|
+
|
|
10
|
+
def spec_failed(name, counter, failure)
|
|
11
|
+
@output.print failure.expectation_not_met? ? red('F') : magenta('F')
|
|
12
|
+
STDOUT.flush
|
|
13
|
+
end
|
|
14
|
+
|
|
15
|
+
def spec_passed(name)
|
|
16
|
+
@output.print green('.')
|
|
17
|
+
STDOUT.flush
|
|
18
|
+
end
|
|
19
|
+
|
|
20
|
+
def start_dump
|
|
21
|
+
@output.puts
|
|
22
|
+
STDOUT.flush
|
|
23
|
+
end
|
|
24
|
+
end
|
|
25
|
+
end
|
|
26
|
+
end
|
|
27
|
+
end
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
module Spec
|
|
2
|
+
module Runner
|
|
3
|
+
module Formatter
|
|
4
|
+
class RdocFormatter < BaseTextFormatter
|
|
5
|
+
def add_context(name, first)
|
|
6
|
+
@output.print "# #{name}\n"
|
|
7
|
+
STDOUT.flush
|
|
8
|
+
end
|
|
9
|
+
|
|
10
|
+
def spec_passed(name)
|
|
11
|
+
@output.print "# * #{name}\n"
|
|
12
|
+
STDOUT.flush
|
|
13
|
+
end
|
|
14
|
+
|
|
15
|
+
def spec_failed(name, counter, failure)
|
|
16
|
+
@output.print "# * #{name} [#{counter} - FAILED]\n"
|
|
17
|
+
STDOUT.flush
|
|
18
|
+
end
|
|
19
|
+
end
|
|
20
|
+
end
|
|
21
|
+
end
|
|
22
|
+
end
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
module Spec
|
|
2
|
+
module Runner
|
|
3
|
+
module Formatter
|
|
4
|
+
class SpecdocFormatter < BaseTextFormatter
|
|
5
|
+
def add_context(name, first)
|
|
6
|
+
@output.puts
|
|
7
|
+
@output.puts name
|
|
8
|
+
STDOUT.flush
|
|
9
|
+
end
|
|
10
|
+
|
|
11
|
+
def spec_failed(name, counter, failure)
|
|
12
|
+
@output.puts failure.expectation_not_met? ? red("- #{name} (FAILED - #{counter})") : magenta("- #{name} (ERROR - #{counter})")
|
|
13
|
+
STDOUT.flush
|
|
14
|
+
end
|
|
15
|
+
|
|
16
|
+
def spec_passed(name)
|
|
17
|
+
@output.print green("- #{name}\n")
|
|
18
|
+
STDOUT.flush
|
|
19
|
+
end
|
|
20
|
+
end
|
|
21
|
+
end
|
|
22
|
+
end
|
|
23
|
+
end
|
|
@@ -0,0 +1,71 @@
|
|
|
1
|
+
begin
|
|
2
|
+
require 'rubygems'
|
|
3
|
+
require 'heckle'
|
|
4
|
+
rescue LoadError ; raise "You must gem install heckle to use --heckle" ; end
|
|
5
|
+
|
|
6
|
+
module Spec
|
|
7
|
+
module Runner
|
|
8
|
+
# Creates a new Heckler configured to heckle all methods in the classes
|
|
9
|
+
# whose name matches +filter+
|
|
10
|
+
class HeckleRunner
|
|
11
|
+
def initialize(filter, heckle_class=Heckler)
|
|
12
|
+
@filter = filter
|
|
13
|
+
@heckle_class = heckle_class
|
|
14
|
+
end
|
|
15
|
+
|
|
16
|
+
# Runs all the contexts held by +context_runner+ once for each of the
|
|
17
|
+
# methods in the matched classes.
|
|
18
|
+
def heckle_with(context_runner)
|
|
19
|
+
if @filter =~ /(.*)[#\.](.*)/
|
|
20
|
+
heckle_method($1, $2)
|
|
21
|
+
else
|
|
22
|
+
heckle_class_or_module(@filter)
|
|
23
|
+
end
|
|
24
|
+
end
|
|
25
|
+
|
|
26
|
+
def heckle_method(class_name, method_name)
|
|
27
|
+
verify_constant(class_name)
|
|
28
|
+
heckle = @heckle_class.new(class_name, method_name, context_runner)
|
|
29
|
+
heckle.validate
|
|
30
|
+
end
|
|
31
|
+
|
|
32
|
+
def heckle_class_or_module(class_or_module_name)
|
|
33
|
+
verify_constant(class_or_module_name)
|
|
34
|
+
pattern = /^#{class_or_module_name}/
|
|
35
|
+
classes = []
|
|
36
|
+
ObjectSpace.each_object(Class) do |klass|
|
|
37
|
+
classes << klass if klass.name =~ pattern
|
|
38
|
+
end
|
|
39
|
+
|
|
40
|
+
classes.each do |klass|
|
|
41
|
+
klass.instance_methods(false).each do |method_name|
|
|
42
|
+
heckle = @heckle_class.new(klass.name, method_name, context_runner)
|
|
43
|
+
heckle.validate
|
|
44
|
+
end
|
|
45
|
+
end
|
|
46
|
+
end
|
|
47
|
+
|
|
48
|
+
def verify_constant(name)
|
|
49
|
+
begin
|
|
50
|
+
# This is defined in Heckle
|
|
51
|
+
name.to_class
|
|
52
|
+
rescue
|
|
53
|
+
raise "Heckling failed - \"#{name}\" is not a known class or module"
|
|
54
|
+
end
|
|
55
|
+
end
|
|
56
|
+
end
|
|
57
|
+
|
|
58
|
+
#Supports Heckle 1.2 and prior (earlier versions used Heckle::Base)
|
|
59
|
+
class Heckler < (Heckle.const_defined?(:Base) ? Heckle::Base : Heckle)
|
|
60
|
+
def initialize(klass_name, method_name, context_runner)
|
|
61
|
+
super(klass_name, method_name)
|
|
62
|
+
@context_runner = context_runner
|
|
63
|
+
end
|
|
64
|
+
|
|
65
|
+
def tests_pass?
|
|
66
|
+
failure_count = @context_runner.run(false)
|
|
67
|
+
failure_count == 0
|
|
68
|
+
end
|
|
69
|
+
end
|
|
70
|
+
end
|
|
71
|
+
end
|
|
@@ -0,0 +1,224 @@
|
|
|
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
|
|
@@ -0,0 +1,105 @@
|
|
|
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
|