@@ -1,5 +1,6 @@ * added Middleware baseclass +* Task.parse now yields opts to block for modifications == 0.18.0 / 2009-06-14 tap/History @@ -137,12 +137,20 @@ module Tap # Parses the argv into an instance of self. By default parse # parses an argh then calls instantiate, but there is no requirement # that this occurs in subclasses. - def parse(argv=ARGV, app=Tap::App.instance) - parse!(argv.dup, app) + # + # ==== Block Overrides + # + # For convenience, parse will yield the internal ConfigParser to the + # block, if given. This functionality was added to Task so they are + # more flexible in executable files but it is not a part of the API + # requirements for parse/parse!. + # + def parse(argv=ARGV, app=Tap::App.instance, &block) # :yields: opts + parse!(argv.dup, app, &block) end # Same as parse, but removes arguments destructively. - def parse!(argv=ARGV, app=Tap::App.instance) + def parse!(argv=ARGV, app=Tap::App.instance) # :yields: opts opts = ConfigParser.new unless configurations.empty? @@ -176,6 +184,8 @@ module Tap opts.config.merge!(load_config(config_file)) end + yield(opts) if block_given? + # (note defaults are not added so they will not # conflict with string keys from a config file) argv = opts.parse!(argv, :add_defaults => false) tap/lib/tap/task.rb @@ -181,6 +181,21 @@ class TaskTest < Test::Unit::TestCase end end + def test_parse_yields_opts_to_block_if_given + instance = ParseClass.parse(['--new-flag']) do |opts| + opts.on "--new-flag" do + opts['new_flag_parsed'] = true + end + + opts.on "--another-new-flag" do + opts['another_new_flag_parsed'] = true + end + end + + assert_equal true, instance.config['new_flag_parsed'] + assert_equal nil, instance.config['another_new_flag_parsed'] + end + # # parse! test # tap/test/tap/task_test.rb 3cfb5db2f45cd952f1cf9f2850bceaceb1c0c3c6 Simon Chiang simon.a.chiang@gmail.com http://github.com/bahuvrihi/tap/commit/98ef83b314de62545aa09858f30ffc7847ffd314 98ef83b314de62545aa09858f30ffc7847ffd314 2009-06-17T20:19:06-07:00 2009-06-17T20:19:06-07:00 now Task.parse yields opts to block if given 58aab55d77e8244c14d737e4f92f4fc679b52bee Simon Chiang simon.a.chiang@gmail.com