diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Completion/Unix/Command/_rake | 22 |
2 files changed, 18 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog index 486e2b6ba..b777afdeb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2005-07-12 Doug Kearns <djkea2@gus.gscit.monash.edu.au> + + * 21446 (modified): Completion/Unix/Command/_rake: generate targets for + rakefiles in parent directories and those specified with -f; include + directories specified with -I in the search path used to generate + library matches + 2005-07-12 Clint Adams <clint@zsh.org> * 21447: Completion/Unix/Command/_rubber: completion for diff --git a/Completion/Unix/Command/_rake b/Completion/Unix/Command/_rake index badbabb43..2bd927f92 100644 --- a/Completion/Unix/Command/_rake +++ b/Completion/Unix/Command/_rake @@ -5,32 +5,32 @@ local curcontext="$curcontext" state line ret=1 typeset -A opt_args -_arguments -C \ +_arguments -C -S \ '(--dry-run -n)'{--dry-run,-n}'[do a dry run without executing actions]' \ '(- *)'{--help,-H}'[display help information]' \ - '(--libdir -I)'{--libdir,-I}'[include specified directory in the search path for required modules]:library directory:_files -/' \ + \*{--libdir,-I}'[include specified directory in the search path for required modules]:library directory:_files -/' \ '(--nosearch -N)'{--nosearch,-N}'[do not search parent directories for the Rakefile]' \ - '(--prereqs -P)'{--prereqs,-P}'[display the tasks and prerequisites, then exit]' \ - '(--quiet -q --silent -s)'{--quiet,-q}'[do not log messages to standard output]' \ + '(- *)'{--prereqs,-P}'[display the tasks and prerequisites, then exit]' \ + '(--quiet -q --silent -s --verbose -v)'{--quiet,-q}'[do not log messages to standard output]' \ '(--rakefile -f)'{--rakefile,-f}'[use specified file as the rakefile]:rake file:_files' \ - '(--require -r)'{--require,-r}'[require specified module before executing rakefile]' \ - '(--silent -s --quiet -q)'{--silent,-s}"[like --quiet, but also suppresses the 'in directory' announcement]" \ - '(--tasks -T)'{--tasks,-T}'[display the tasks and dependencies, then exit]' \ + \*{--require,-r}'[require specified module before executing rakefile]:library:->library' \ + '(--quiet -q --silent -s --verbose -v)'{--silent,-s}"[like --quiet, but also suppresses the 'in directory' announcement]" \ + '(- *)'{--tasks,-T}'[display the tasks and dependencies, then exit]' \ '(--trace -t)'{--trace,-t}'[turn on invoke/execute tracing, enable full backtrace]' \ - '(--usage -h)'{--usage,-h}'[display usage information]' \ - '(--verbose -v)'{--verbose,-v}'[log message to standard output (default)]' \ + '(- *)'{--usage,-h}'[display usage information]' \ + '(--quiet -q --silent -s --verbose -v)'{--verbose,-v}'[log message to standard output (default)]' \ '(- *)'{--version,-V}'[display version information]' \ '*:target:->target' && ret=0 case "$state" in library) local -a dirs - dirs=( $(_call_program directories ruby -e 'puts\ $:' 2>/dev/null) ) + dirs=( $(_call_program directories ruby -e 'puts\ \$:' 2>/dev/null) ${(s.:.)opt_args[-I]} ) _wanted libraries expl library _path_files -W dirs && ret=0 ;; target) local -a targets - targets=( ${${(f)"$(_call_program targets $words[1] -sT 2>/dev/null)"}/(#b)rake ([^ ]##) ##\# (*)/$match[1]:${match[2]:l}} ) + targets=( ${${(f)"$(_call_program targets $words[1] -sT $opt_args[(I)(-N|--nosearch)] ${(kv)opt_args[(I)(-f|--rakefile)]} 2>/dev/null)"}/(#b)rake ([^ ]##) ##\# (*)/$match[1]:${match[2]:l}} ) if (( ! ${targets[(I)rake aborted!]} )) then _describe -t targets 'rake target' targets && ret=0 else |