Merge lp:~clint-fewbar/charm-tools/add-bash-completion into lp:~charmers/charm-tools/trunk

[Clint Byrum]

Adds bash completion for commands and for charm names in charm get

=== modified file 'Makefile'
--- Makefile	2012-05-14 22:54:56 +0000
+++ Makefile	2012-05-23 22:09:19 +0000
@@ -5,6 +5,7 @@
 mandir = $(DDIR)/share/man/man1
 datadir = $(DDIR)/share/charm-tools
 helperdir = $(DDIR)/share/charm-helper
+confdir = $(DDIR)/etc
 INSTALL = install
 
 all:
@@ -16,6 +17,8 @@
 	$(INSTALL) -t $(datadir) charm
 	$(INSTALL) -d $(bindir)
 	$(INSTALL) -d $(helperdir)
+	$(INSTALL) -d $(confdir)/bash_completion.d
+	$(INSTALL) misc/bash-completion $(confdir)/bash_completion.d/charm
 	ln -sf $(datadir)/charm $(bindir)
 	gzip $(mandir)/charm.1
 	cp -rf scripts templates $(datadir)

=== modified file 'charm'
--- charm	2012-05-23 19:59:06 +0000
+++ charm	2012-05-23 22:09:19 +0000
@@ -11,18 +11,24 @@
 {
   echo "usage: $1 [ --help|-h ] [ script_name ]" >&2
   echo script choices are: >&2
-  exec ls -1 $script_home|sed -e 's/^/    /' >&2
+  exec list_commands|sed -e 's/^/    /' >&2
   exit $2
 }
 
+list_commands()
+{
+    ls -1 $script_home
+}
+
 # If the options seem invalid, pass thru to underlying scripts
-if options=$(getopt -o h -l help -- "$@") ; then
+if options=$(getopt -o hl -l help,list -- "$@") ; then
     eval set -- "$options"
 
     while true
     do
         case "$1" in
         -h|--help)  usage $(basename $0) 0;;
+        -l|--list)  list_commands ; exit 0;;
         --) shift 1; break;;
         *)  break;;
         esac

=== added directory 'misc'
=== added file 'misc/bash-completion'
--- misc/bash-completion	1970-01-01 00:00:00 +0000
+++ misc/bash-completion	2012-05-23 22:09:19 +0000
@@ -0,0 +1,85 @@
+#!/bin/bash
+shopt -s progcomp
+
+_charm_official_charms() {
+    charm list | awk -Flp:charms/ '/^lp:charms/ { print $2 }'
+}
+
+_charm () {
+    local cur cmds cmdIdx cmd cmdOpts fixedWords i globalOpts
+    local curOpt optEnums
+    local IFS=$' \n'
+
+    COMPREPLY=()
+    cur=${COMP_WORDS[COMP_CWORD]}
+    cmds=`charm --list`
+    globalOpts=( -h )
+
+    # do ordinary expansion if we are anywhere after a -- argument
+    for ((i = 1; i < COMP_CWORD; ++i)); do
+        [[ ${COMP_WORDS[i]} == "--" ]] && return 0
+    done
+
+    # find the command; it's the first word not starting in -
+    cmd=
+    for ((cmdIdx = 1; cmdIdx < ${#COMP_WORDS[@]}; ++cmdIdx)); do
+        if [[ ${COMP_WORDS[cmdIdx]} != -* ]]; then
+            cmd=${COMP_WORDS[cmdIdx]}
+            break
+        fi
+    done
+
+    # complete command name if we are not already past the command
+    if [[ $COMP_CWORD -le cmdIdx ]]; then
+        COMPREPLY=( $( compgen -W "$cmds ${globalOpts[*]}" -- "$cur" ) )
+        return 0
+    fi
+
+    # find the option for which we want to complete a value
+    curOpt=
+    if [[ $cur != -* ]] && [[ $COMP_CWORD -gt 1 ]]; then
+        curOpt=${COMP_WORDS[COMP_CWORD - 1]}
+        if [[ "$curOpt" == = ]]; then
+            curOpt=${COMP_WORDS[COMP_CWORD - 2]}
+        elif [[ "$cur" == : ]]; then
+            cur=
+            curOpt="$curOpt:"
+        elif [[ "$curOpt" == : ]]; then
+            curOpt=${COMP_WORDS[COMP_CWORD - 2]}:
+        fi
+    fi
+
+    cmdOpts=( )
+            cmdOpts=(--help)
+    optEnums=( )
+    fixedWords=( )
+    case "$cmd" in
+        get)
+            for charm in $(_charm_official_charms) ; do
+               cmdOpts+=($charm)
+            done 
+            ;;
+        *)
+            ;;
+    esac
+
+    IFS=$'\n'
+    if [[ "$cur" == = ]] && [[ ${#optEnums[@]} -gt 0 ]]; then
+        # complete directly after "--option=", list all enum values
+        COMPREPLY=( "${optEnums[@]}" )
+        return 0
+    else
+        fixedWords=( "${cmdOpts[@]}"
+                     "${globalOpts[@]}"
+                     "${optEnums[@]}"
+                     "${fixedWords[@]}" )
+    fi
+
+    if [[ ${#fixedWords[@]} -gt 0 ]]; then
+        COMPREPLY=( $( compgen -W "${fixedWords[*]}" -- "$cur" ) )
+    fi
+
+    return 0
+}
+
+complete -F _charm -o default charm