Merge pull request #83 from eshapard/master

Author: pimterry

README.md

@@ -43,9 +43,9 @@ curl https://raw.githubusercontent.com/pimterry/notes/latest-release/notes > /us
 
 #### Installing auto completion
 
-`notes` includes auto completion, to let you tab-complete commands and your note names. This requires Bash > 4.0 and [bash-completion](https://github.com/scop/bash-completion) or Zsh to be installed - it's probably available from your friendly local package manager.
+`notes` includes auto completion, to let you tab-complete commands and your note names. This requires Bash > 4.0 and [bash-completion](https://github.com/scop/bash-completion), Zsh, or Fish-shell to be installed - it's probably available from your friendly local package manager.
 
-To enable completion for notes, copy the completion script into your bash or zsh completion directory, and it should be automatically loaded. The bash completion directory is `/usr/share/bash-completion/completions/` on a typical Debian install, or `/usr/local/etc/bash_completion.d/` on OSX with `bash-completion` from homebrew. The zsh completion directory is `/usr/share/zsh/functions/Completion/` in Linux. You may be able to find your own bash completion directory by running the following command:
+To enable completion for notes, copy the completion script into your bash, zsh, or fish completion directory, and it should be automatically loaded. The bash completion directory is `/usr/share/bash-completion/completions/` on a typical Debian install, or `/usr/local/etc/bash_completion.d/` on OSX with `bash-completion` from homebrew. The zsh completion directory is `/usr/share/zsh/functions/Completion/` in Linux. The fish completion directory is `~/.config/fish/completions` or `/etc/fish/completions`. You may be able to find your own bash completion directory by running the following command:
 
     pkg-config --variable=completionsdir bash-completion
 
@@ -69,6 +69,11 @@ On other Unix distros:
 ```bash
 curl -L https://raw.githubusercontent.com/pimterry/notes/latest-release/_notes > /usr/share/zsh/site-functions/_notes
 ```
+**Fish**
+
+```fish
+curl -L https://raw.githubusercontent.com/pimterry/notes/latest-release/notes.fish > ~/.config/fish/completions/notes.fish
+```
 
 You'll need to open a new shell for this to take effect.
 

notes.fish

@@ -0,0 +1,28 @@
+# Notes completion file for fish shell <https://github.com/pimterry/notes>
+# Place in ~/.config/fish/completions/
+
+# Set some useful local variables
+## lists of commands used by notes
+set -l notes_list_commands o open mv rm cat
+set -l notes_friendly_commands new open find ls rm cat mv grep
+set -l notes_commands n new ls find f grep g search s open o mv rm cat
+set -l notes_dir_commands n new grep ls
+
+# NOTES_DIRECTORY
+## use NOTES_DIRECTORY variable if set else...
+if not set -q NOTES_DIRECTORY
+    ## if config file exists, read it
+    if test -e $HOME/.config/notes/config
+        set NOTES_DIRECTORY (string split = (grep "NOTES_DIRECTORY" $HOME/.config/notes/config))[2]
+    end
+end
+## in case of failure, use default notes dir
+if not set -q NOTES_DIRECTORY[1]
+    set NOTES_DIRECTORY "$HOME/notes"
+end
+
+# FILE COMPLETIONS
+complete -c notes -f
+complete -c notes -n "not __fish_seen_subcommand_from $notes_commands" -a "$notes_friendly_commands"
+complete -c notes -n "__fish_seen_subcommand_from $notes_list_commands" -a "(notes find|grep -v '~\$'|sed 's/[.]md\$//')"
+complete -c notes -n "__fish_seen_subcommand_from $notes_dir_commands" -a "(find $NOTES_DIRECTORY -type d -printf '%P/\n')"