@@ -1 +1 @@ -Subproject commit 2089146b49b0881369bc512ffafd6d8956803fba +Subproject commit 479d78b1f93bc36164b5b9aff4a89d7b5f43b7b7 lazydoc @@ -43,7 +43,7 @@ Now from the command line: -------------------------------------------------------------------------------- Says goodnight with a configurable message. -------------------------------------------------------------------------------- - usage: rap goodnight OBJ + usage: tap run -- goodnight OBJ configurations: --message MESSAGE rap/README @@ -81,7 +81,7 @@ end sh_test "% rap task_with_doc --help" do |output| assert output =~ /RapTest::TaskWithDoc -- task summary/ assert output =~ /long description/ - assert output =~ /usage: rap rap_test\/task_with_doc/ + assert output =~ /rap_test\/task_with_doc/ end sh_test "% rap task_with_empty_desc --help" do |output| @@ -91,12 +91,12 @@ end sh_test "% rap task_without_doc --help" do |output| assert output =~ /RapTest::TaskWithoutDoc/ - assert output =~ /usage: rap rap_test\/task_without_doc/ + assert output =~ /rap_test\/task_without_doc/ end sh_test "% rap task_with_desc --help" do |output| assert output =~ /RapTest::TaskWithDesc -- desc/ - assert output =~ /usage: rap rap_test\/task_with_desc/ + assert output =~ /rap_test\/task_with_desc/ end end end @@ -142,11 +142,11 @@ end method_root.chdir(:tmp) do sh_test "% rap task_without_args --help" do |output| - assert output =~ /usage: rap rap_test\/task_without_args\s*$/ + assert output =~ /rap_test\/task_without_args\s*$/ end sh_test "% rap task_with_args --help" do |output| - assert output =~ /usage: rap rap_test\/task_with_args A B\s*$/ + assert output =~ /rap_test\/task_with_args A B\s*$/ end end end rap/test/cmd/rap_test.rb @@ -44,7 +44,7 @@ goodnight moon sh_test "% rap goodnight --help" do |output| assert output =~ /Goodnight -- your basic goodnight moon task/ assert output =~ /Says goodnight with a configurable message/ - assert output =~ /rap goodnight OBJ/ + assert output =~ /tap run -- goodnight OBJ/ assert output =~ /--message MESSAGE/ end end rap/test/doc/readme_test.rb @@ -37,7 +37,7 @@ Now from the command line: -------------------------------------------------------------------------------- Says goodnight with a configurable message. -------------------------------------------------------------------------------- - usage: rap goodnight OBJ + usage: tap run -- goodnight OBJ configurations: --message MESSAGE @@ -180,7 +180,7 @@ Now from the command line: -------------------------------------------------------------------------------- Says goodnight with a configurable message. -------------------------------------------------------------------------------- - usage: rap goodnight OBJECTS... + usage: tap run -- goodnight OBJECTS... configurations: --message MESSAGE a goodnight message tap-suite/doc/Tutorial @@ -43,7 +43,7 @@ Goodnight -- your basic goodnight moon task -------------------------------------------------------------------------------- Says goodnight with a configurable message. -------------------------------------------------------------------------------- -usage: rap goodnight OBJ +usage: tap run -- goodnight OBJ configurations: --message MESSAGE @@ -142,7 +142,7 @@ Goodnight -- a fancy goodnight moon task -------------------------------------------------------------------------------- Says goodnight with a configurable message. -------------------------------------------------------------------------------- -usage: rap goodnight OBJECTS... +usage: tap run -- goodnight OBJECTS... configurations: --message MESSAGE a goodnight message tap-suite/test/doc/tutorial_test.rb @@ -159,12 +159,7 @@ module Tap # add option to print help opts.on("--help", "Print this help") do - prg = case $0 - when /rap$/ then 'rap' - else 'tap run --' - end - - puts "#{help}usage: #{prg} #{to_s.underscore} #{args}" + puts "#{help}usage: tap run -- #{to_s.underscore} #{args}" puts puts opts exit @@ -185,18 +180,7 @@ module Tap # Instantiates an instance of self and returns an instance of self and # an array of arguments (implicitly to be enqued to the instance). def instantiate(argh={}, app=Tap::App.instance) - config = argh[:config] || {} - instance = new(config, app) - - if argh[:cache] - if app.cache.has_key?(self) && app.cache[self] != instance - raise "cache already has an instance for: #{self}" - end - - app.cache[self] = instance - end - - instance + new(argh[:config] || {}, app) end DEFAULT_HELP_TEMPLATE = %Q{<% desc = task_class::desc %> tap/lib/tap/task.rb 4eb534c88242cbc429a898784fd5706478099a0c Simon Chiang simon.a.chiang@gmail.com http://github.com/bahuvrihi/tap/commit/d9647441e17f3b12a484afb1e044dfc7cdbc3df9 d9647441e17f3b12a484afb1e044dfc7cdbc3df9 2009-06-14T11:14:55-07:00 2009-06-14T11:14:55-07:00 simplification of task help (no rap usage) d7e94019234d815f3966b5f7c49f2ae18ace5719 Simon Chiang simon.a.chiang@gmail.com