jaseg/ponysay
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed -* list args, bash completion, zsh balloon completion

Browse source
This commit is contained in:
jaseg 2013-04-03 15:41:21 +02:00
parent cccea7324c
commit a41e8b36a1
3 changed files with 38 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

42
completion/bash-completion.sh
View file

@ -1,21 +1,35 @@
#!bash #!/usr/bin/env bash
#
# this is bash completion function file for ponysay.py.
# generated by genzshcomp(ver: 0.5.1)
#
_ponysay.py() _ponysay()
{ {
local cur local cur prev
local cmd cur=${COMP_WORDS[COMP_CWORD]}
prev=${COMP_WORDS[COMP_CWORD-1]}
cur=${COMP_WORDS[$COMP_CWORD]} declare -ga _ponysay_ponies _ponysay_balloons _ponythink_balloons
cmd=( ${COMP_WORDS[@]} ) [[ 0 < "${#_ponysay_ponies}" ]] || _ponysay_ponies=( $(ponysay -p list) )
[[ 0 < "${#_ponysay_balloons}" ]] || _ponysay_balloons=( $(ponysay -b list) )
[[ 0 < "${#_ponythink_balloons}" ]] || _ponythink_balloons=( $(ponythink -b list) )
if [[ "$cur" == -* ]]; then if [[ "$cur" = -* ]]
COMPREPLY=( $( compgen -W "-h --help --pony -p --quote -q --center -c --center-text -C --width -w --balloon -b" -- $cur ) ) then COMPREPLY=( $( compgen -W "-h --help --pony -p --quote -q --center -c --center-text -C --width -w --balloon -b" -- "$cur" ) )
return 0 return 0
fi
if [[ "$prev" =~ -[^-]*p$ || "$prev" = "--pony" ]]
then COMPREPLY=( $( compgen -W "${_ponysay_ponies[*]}" -- "$cur" ) )
return 0
fi
if [[ "$prev" =~ -[^-]*b$ || "$prev" = "--balloon" ]]
then
if [[ "$COMP_LINE" == ponythink* ]]
then COMPREPLY=( $( compgen -W "${_ponythink_balloons[*]}" -- "$cur" ) )
else COMPREPLY=( $( compgen -W "${_ponysay_balloons[*]}" -- "$cur" ) )
fi
return 0
fi fi
} }
complete -F _ponysay.py -o default ponysay.py complete -F _ponysay -o default ponysay
complete -F _ponysay -o default ponythink

7
completion/zsh-completion.sh
View file

@ -14,8 +14,11 @@ local -a _available_ponies
compadd "$@" -a _available_ponies compadd "$@" -a _available_ponies
} }
_ponysay_balloons(){ local -a _ponysay_balloons _ponythink_balloons
[[ "$words" == ponythink* ]] && compadd "$@" cowsay ascii || compadd "$@" cowsay ascii unicode round linux-vt (( $+functions[_ponysay_pony] )) || _ponysay_balloons(){
(( $#_ponysay_balloons )) || _ponysay_balloons=($(ponysay -b list))
(( $#_ponythink_balloons )) || _ponythink_balloons=($(ponythink -b list))
[[ "$words" == ponythink* ]] && compadd "$@" -a _ponythink_balloons || compadd "$@" -a _ponysay_balloons
} }
_arguments -s -w -S \ _arguments -s -w -S \

9
ponysay.py
View file

@ -94,12 +94,13 @@ if __name__ == '__main__':
parser.add_argument('-b', '--balloon', type=str, default='cowsay', help='Balloon style to use. Use "-b list" to list available styles.') parser.add_argument('-b', '--balloon', type=str, default='cowsay', help='Balloon style to use. Use "-b list" to list available styles.')
parser.add_argument('text', type=str, nargs='*', help='The text to be placed in the speech bubble') parser.add_argument('text', type=str, nargs='*', help='The text to be placed in the speech bubble')
args = parser.parse_args() args = parser.parse_args()
think = sys.argv[0].endswith('think')
if args.pony == "list": if args.pony == "list":
print('\n'.join(sorted(list_ponies(True)))) print('\n'.join(sorted(list_ponies() if not args.quote else list_ponies_with_quotes())))
sys.exit() sys.exit()
if args.balloon == 'list': if args.balloon == 'list':
print('\n'.join(balloonstyles.keys())) print('\n'.join([ s.replace('.think', '') for s in balloonstyles.keys() if s.endswith('.think') == think ]))
sys.exit() sys.exit()
pony = args.pony pony = args.pony
if pony == "random": if pony == "random":
@ -111,7 +112,7 @@ if __name__ == '__main__':
text = random_quote(pony) text = random_quote(pony)
balloonstyle = None balloonstyle = None
if sys.argv[0].endswith('think'): if think:
balloonstyle = balloonstyles[args.balloon+'.think'] balloonstyle = balloonstyles[args.balloon+'.think']
else: else:
balloonstyle = balloonstyles[args.balloon] balloonstyle = balloonstyles[args.balloon]