From 0fafa9479d8e7c56c25020f29bca54114d7e564f Mon Sep 17 00:00:00 2001
From: Chet Henry
Date: Tue, 8 Dec 2015 19:05:35 -0700
Subject: Adding Extensive Bas Tab Completion

Tab completion will now use the calling script to generate suggestions.
Because of this those suggestions will work with the alias scheme
described in the README file.

These completion functions will also suggest the commands hcl allows.

When the alias command is in use it will complete the project ids and
task ids with descriptions.

The other commands that use aliases will complete them as before however
they used the calling script to get the list of aliases.  That way the
any bash alises using env's will be called and preserve the
configuration.  This will allow the user to only add one line to their
bashrc/profile w/e and not a line for each  bash alias the user may
need.
---
 README.markdown      | 14 ++++-------
 bin/_hcl_completions | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 72 insertions(+), 9 deletions(-)
 create mode 100755 bin/_hcl_completions

diff --git a/README.markdown b/README.markdown
index 6e24544..e08535e 100644
--- a/README.markdown
+++ b/README.markdown
@@ -124,15 +124,12 @@ The above starts and immediately stops a one-hour timer with the given note.
 
 ## ADVANCED USAGE
 
-### Bash Auto-completion of Task Aliases
+### Bash Tab Completions
 
-You can enable auto-completion of task aliases by adding this to your shell
-configuration (note the backticks inside the double quotes):
+You can enable auto-completion of commands, project ids, task ids and task aliases by adding this to your shell
+configuration:
 
-    complete -W "`cat ~/.hcl/aliases`" hcl
-
-Warning: You will need to have run `hcl` at least once to create the aliases
-file. Without it, this command will fail with an error.
+    source _hcl_completions
 
 ### Configuration Profiles
 
@@ -143,10 +140,9 @@ once, specify an alternate configuration directory in the environment as
 once.
 
 Here is a shell alias `myhcl` with a separate configuration from the
-main `hcl` command, and another command to configure alias completion:
+main `hcl` command, tab completion will work with the alias automatically:
 
     alias myhcl="env HCL_DIR=~/.myhcl hcl"
-    complete -W "`cat ~/.myhcl/aliases`" myhcl
 
 Adding something like the above to your bashrc will enable a new command,
 `myhcl`. When using `myhcl` you can use different credentials and aliases,
diff --git a/bin/_hcl_completions b/bin/_hcl_completions
new file mode 100755
index 0000000..16f551c
--- /dev/null
+++ b/bin/_hcl_completions
@@ -0,0 +1,67 @@
+#!/bin/bash
+
+_hcl_getProjects()
+{
+    $1 tasks | perl -ne 's/ - (?!.* -).*//g; print;' | sed -e 's/\s[0-9]\+\s/ /g' | sed -e 's/\s/ /g' | sort | uniq
+}
+
+_hcl_getTasks()
+{
+    $1 tasks | grep "^$2" | sed -e 's/\s/ /g' | sort | uniq | cut -d" " -f 2-
+}
+
+_hcl()
+{
+    local count=${#COMP_WORDS[@]}
+    local script=${COMP_WORDS[0]}
+    local cur=${COMP_WORDS[COMP_CWORD]}
+    case $count in
+        2)
+            COMPREPLY=( $(compgen -W "start resume log stop note show tasks alias unalias aliases cancel nvm oops config status" -- $cur) )
+            ;;
+        3)
+            local namespace=${COMP_WORDS[1]}
+            
+            case $namespace in
+                'alias')
+                    COMPREPLY=( $(compgen -W "" -- $cur) )
+                ;;
+                'start'|'resume'|'log')
+                    COMPREPLY=( $(compgen -W "$($script aliases | sed -e 's/,//g')" -- $cur) )
+                ;;
+            esac
+            ;;
+        4)
+            local namespace=${COMP_WORDS[1]}
+            local task=${COMP_WORDS[2]}
+            case $namespace in
+                'alias')
+                    local IFS_OLD="$IFS";
+                    local IFS=$'\n';
+                    COMPREPLY=( $(compgen -W "$(_hcl_getProjects $script)" -- $cur) )
+                    local IFS=$IFS_OLD;
+                    if [[ ${#COMPREPLY[*]} -eq 1 ]]; then #Only one completion
+                        COMPREPLY=$(echo $COMPREPLY | sed -e 's/\s.*$//g')
+                    fi
+                ;;
+            esac
+            ;;
+        5)
+            local namespace=${COMP_WORDS[1]}
+            local task=${COMP_WORDS[2]}
+            local projectid=${COMP_WORDS[3]}
+            case $namespace in
+                'alias')
+                    local IFS_OLD="$IFS";
+                    local IFS=$'\n';
+                    COMPREPLY=( $(compgen -W "$(_hcl_getTasks $script $projectid)" -- $cur) )
+                    local IFS=$IFS_OLD;
+                    if [[ ${#COMPREPLY[*]} -eq 1 ]]; then #Only one completion
+                        COMPREPLY=$(echo $COMPREPLY | sed -e 's/\s.*$//g')
+                    fi
+                ;;
+            esac
+            ;;
+    esac 
+}
+complete -F _hcl hcl
-- 
cgit v1.2.3


From 49edbaddac7f78ffba96bf7d79bd1a15006c05fc Mon Sep 17 00:00:00 2001
From: Chet Henry
Date: Tue, 8 Dec 2015 23:01:16 -0700
Subject: Simple bash completion inclusion in gem

---
 README.markdown | 2 +-
 hcl.gemspec     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.markdown b/README.markdown
index e08535e..52fb0ad 100644
--- a/README.markdown
+++ b/README.markdown
@@ -129,7 +129,7 @@ The above starts and immediately stops a one-hour timer with the given note.
 You can enable auto-completion of commands, project ids, task ids and task aliases by adding this to your shell
 configuration:
 
-    source _hcl_completions
+    source $(ruby -e "print File.dirname(Gem.bin_path('hcl', 'hcl'))")/_hcl_completions
 
 ### Configuration Profiles
 
diff --git a/hcl.gemspec b/hcl.gemspec
index de91fe9..076f0ca 100644
--- a/hcl.gemspec
+++ b/hcl.gemspec
@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.email = "zack@zackhobson.com"
   s.description = "HCl is a command-line client for manipulating Harvest time sheets."
   s.executables = ["hcl"]
-  s.files = %w[LICENSE Rakefile Gemfile bin/hcl man/hcl.1] + Dir['*.markdown'] +
+  s.files = %w[LICENSE Rakefile Gemfile bin/hcl bin/_hcl_completions man/hcl.1] + Dir['*.markdown'] +
     Dir['lib/**/*.rb'] + Dir['test/**/*.rb']
   s.homepage = "https://zenhob.github.io/hcl/"
   s.licenses = ["MIT"]
-- 
cgit v1.2.3


From 60b6dc45b667873ca050588241f3f6b4beff5ca1 Mon Sep 17 00:00:00 2001
From: Chet Henry
Date: Wed, 9 Dec 2015 09:19:46 -0700
Subject: Fix missing tab completion on alias

---
 README.markdown | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.markdown b/README.markdown
index 52fb0ad..32fb6ed 100644
--- a/README.markdown
+++ b/README.markdown
@@ -140,9 +140,10 @@ once, specify an alternate configuration directory in the environment as
 once.
 
 Here is a shell alias `myhcl` with a separate configuration from the
-main `hcl` command, tab completion will work with the alias automatically:
+main `hcl` command, and another command to configure alias completion:
 
     alias myhcl="env HCL_DIR=~/.myhcl hcl"
+    complete -F _hcl myhcl
 
 Adding something like the above to your bashrc will enable a new command,
 `myhcl`. When using `myhcl` you can use different credentials and aliases,
-- 
cgit v1.2.3