From 26dbb6af9ebf1d55b1543ff4db86f83f2a59307d Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Fri, 16 Aug 2013 22:42:46 -0300
Subject: Initial zsh completion

---
 lib/keyringer/completions/bash           | 119 -------------------------------
 lib/keyringer/completions/bash/keyringer | 119 +++++++++++++++++++++++++++++++
 lib/keyringer/completions/zsh/_keyringer |  30 ++++++++
 3 files changed, 149 insertions(+), 119 deletions(-)
 delete mode 100644 lib/keyringer/completions/bash
 create mode 100644 lib/keyringer/completions/bash/keyringer
 create mode 100644 lib/keyringer/completions/zsh/_keyringer

diff --git a/lib/keyringer/completions/bash b/lib/keyringer/completions/bash
deleted file mode 100644
index 4459b34..0000000
--- a/lib/keyringer/completions/bash
+++ /dev/null
@@ -1,119 +0,0 @@
-#!bash
-#
-# Keyringer bash completion
-#
-
-if [[ -n ${ZSH_VERSION-} ]]; then
-	autoload -U +X bashcompinit && bashcompinit
-fi
-
-# Completion for git subcommand
-_keyringer_git_complete() {
-  if [ -e "/etc/bash_completion.d/git" ]; then
-    (
-      source /etc/bash_completion.d/git
-      cd $path
-      COMP_WORDS=(git $*)
-      COMP_CWORD=$((${#COMP_WORDS[*]} - 1))
-
-      if [ "$COMP_CWORD" == "0" ]; then
-        COMP_CWORD=1
-      fi
-
-      _git
-
-      LAST=${COMP_WORDS[COMP_CWORD]}
-      REPLY=${COMPREPLY[@]}
-
-      if [ "$REPLY" == "$LAST" ]; then
-        return
-      fi
-
-      echo ${COMPREPLY[@]}
-    )
-  fi
-}
-
-_keyringer() {
-  # Standard stuff
-  local cur prev opts config
-  COMPREPLY=()
-  cur="${COMP_WORDS[COMP_CWORD]}"
-  prev="${COMP_WORDS[COMP_CWORD-1]}"
-  command="${COMP_WORDS[2]}"
-
-  # Initial options
-  config="$HOME/.keyringer"
-  keyrings="`ls $config | sed -e 's/config//'`"
-
-  # Process config
-  source $config/config
-  path="`eval echo '$'$instance`"
-
-  # Available instances
-  instances="`echo $keyrings | sed -e 's/ /|/'`"
-
-  # The current instance
-  instance="${COMP_WORDS[1]}"
-
-  # Command completions
-  if [ "${#COMP_WORDS[@]}" == "2" ]; then
-    opts="$keyrings"
-  elif [ "${#COMP_WORDS[@]}" == "3" ] && echo "${prev}" | grep -qe "[$instances]"; then
-    opts="`keyringer $instance commands`"
-  elif [ "${#COMP_WORDS[@]}" == "4" ]; then
-    case "${prev}" in
-      options|preferences)
-        opts="ls edit add"
-        ;;
-      recipients)
-        opts="ls edit"
-        ;;
-      ls|encrypt|encrypt-batch|decrypt|edit|append|append-batch|del|recrypt)
-        opts="$(bash -c "set -f && keyringer $instance ls -p -d ${cur}*" 2> /dev/null)"
-        ;;
-      genpair)
-        opts="gpg ssh ssl ssl-self"
-        ;;
-      git)
-        opts="$(_keyringer_git_complete ${cur})"
-        ;;
-      *)
-        ;;
-    esac
-  elif [ "${#COMP_WORDS[@]}" == "5" ]; then
-    case "${command}" in
-      recipients)
-        opts="$(cd $path/config/recipients && ls -p ${cur}* 2> /dev/null)"
-        ;;
-      genpair)
-        opts="$(bash -c "set -f && keyringer $instance ls -p -d ${cur}*" 2> /dev/null)"
-        ;;
-      git)
-        # TODO
-        opts="$(_keyringer_git_complete ${prev} ${cur})"
-        ;;
-      *)
-        ;;
-    esac
-  elif [ "${command}" == "git" ]; then
-    # TODO
-    opts="$(_keyringer_git_complete ${COMP_WORDS[@]:3})"
-  fi
-
-  # Avoid annoying bell and extra tab
-  if [ -z "$ZSH_VERSION" ]; then
-    bind 'set show-all-if-ambiguous on'
-  fi
-
-  # Return the available options
-  COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
-
-  if [ -z "$ZSH_VERSION" ]; then
-    [[ $COMPREPLY == */ ]] && compopt -o nospace
-  fi
-
-  return 0
-}
-
-complete -F _keyringer keyringer
diff --git a/lib/keyringer/completions/bash/keyringer b/lib/keyringer/completions/bash/keyringer
new file mode 100644
index 0000000..4459b34
--- /dev/null
+++ b/lib/keyringer/completions/bash/keyringer
@@ -0,0 +1,119 @@
+#!bash
+#
+# Keyringer bash completion
+#
+
+if [[ -n ${ZSH_VERSION-} ]]; then
+	autoload -U +X bashcompinit && bashcompinit
+fi
+
+# Completion for git subcommand
+_keyringer_git_complete() {
+  if [ -e "/etc/bash_completion.d/git" ]; then
+    (
+      source /etc/bash_completion.d/git
+      cd $path
+      COMP_WORDS=(git $*)
+      COMP_CWORD=$((${#COMP_WORDS[*]} - 1))
+
+      if [ "$COMP_CWORD" == "0" ]; then
+        COMP_CWORD=1
+      fi
+
+      _git
+
+      LAST=${COMP_WORDS[COMP_CWORD]}
+      REPLY=${COMPREPLY[@]}
+
+      if [ "$REPLY" == "$LAST" ]; then
+        return
+      fi
+
+      echo ${COMPREPLY[@]}
+    )
+  fi
+}
+
+_keyringer() {
+  # Standard stuff
+  local cur prev opts config
+  COMPREPLY=()
+  cur="${COMP_WORDS[COMP_CWORD]}"
+  prev="${COMP_WORDS[COMP_CWORD-1]}"
+  command="${COMP_WORDS[2]}"
+
+  # Initial options
+  config="$HOME/.keyringer"
+  keyrings="`ls $config | sed -e 's/config//'`"
+
+  # Process config
+  source $config/config
+  path="`eval echo '$'$instance`"
+
+  # Available instances
+  instances="`echo $keyrings | sed -e 's/ /|/'`"
+
+  # The current instance
+  instance="${COMP_WORDS[1]}"
+
+  # Command completions
+  if [ "${#COMP_WORDS[@]}" == "2" ]; then
+    opts="$keyrings"
+  elif [ "${#COMP_WORDS[@]}" == "3" ] && echo "${prev}" | grep -qe "[$instances]"; then
+    opts="`keyringer $instance commands`"
+  elif [ "${#COMP_WORDS[@]}" == "4" ]; then
+    case "${prev}" in
+      options|preferences)
+        opts="ls edit add"
+        ;;
+      recipients)
+        opts="ls edit"
+        ;;
+      ls|encrypt|encrypt-batch|decrypt|edit|append|append-batch|del|recrypt)
+        opts="$(bash -c "set -f && keyringer $instance ls -p -d ${cur}*" 2> /dev/null)"
+        ;;
+      genpair)
+        opts="gpg ssh ssl ssl-self"
+        ;;
+      git)
+        opts="$(_keyringer_git_complete ${cur})"
+        ;;
+      *)
+        ;;
+    esac
+  elif [ "${#COMP_WORDS[@]}" == "5" ]; then
+    case "${command}" in
+      recipients)
+        opts="$(cd $path/config/recipients && ls -p ${cur}* 2> /dev/null)"
+        ;;
+      genpair)
+        opts="$(bash -c "set -f && keyringer $instance ls -p -d ${cur}*" 2> /dev/null)"
+        ;;
+      git)
+        # TODO
+        opts="$(_keyringer_git_complete ${prev} ${cur})"
+        ;;
+      *)
+        ;;
+    esac
+  elif [ "${command}" == "git" ]; then
+    # TODO
+    opts="$(_keyringer_git_complete ${COMP_WORDS[@]:3})"
+  fi
+
+  # Avoid annoying bell and extra tab
+  if [ -z "$ZSH_VERSION" ]; then
+    bind 'set show-all-if-ambiguous on'
+  fi
+
+  # Return the available options
+  COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
+
+  if [ -z "$ZSH_VERSION" ]; then
+    [[ $COMPREPLY == */ ]] && compopt -o nospace
+  fi
+
+  return 0
+}
+
+complete -F _keyringer keyringer
diff --git a/lib/keyringer/completions/zsh/_keyringer b/lib/keyringer/completions/zsh/_keyringer
new file mode 100644
index 0000000..1f1c250
--- /dev/null
+++ b/lib/keyringer/completions/zsh/_keyringer
@@ -0,0 +1,30 @@
+#compdef keyringer
+
+_keyringer() {
+    local curcontext="$curcontext" state line
+    typeset -A opt_args
+
+    # Initial options
+    local config="$HOME/.keyringer"
+    local keyrings="`ls $config | sed -e 's/config//'`"
+
+    _arguments \
+      '1: :->keyring'\
+      '2: :->action'\
+      '*: :->options'
+
+    case $state in
+      keyring)
+        _arguments "1:Keyrings:($keyrings)"
+        ;;
+      action)
+        compadd "$@" `keyringer $words[2] commands`
+        ;;
+      *)
+        # TODO
+        true
+        ;;
+    esac 
+}
+
+_keyringer "$@"
-- 
cgit v1.2.3