merged in blessed/master

lib/key-bindings.zsh

@@ -46,8 +46,8 @@ bindkey ' ' magic-space                               # [Space] - do history exp
 bindkey '^[[1;5C' forward-word                        # [Ctrl-RightArrow] - move forward one word
 bindkey '^[[1;5D' backward-word                       # [Ctrl-LeftArrow] - move backward one word
 
-if [[ "${terminfo[kdch1]}" != "" ]]; then
-  bindkey "${terminfo[kdch1]}" reverse-menu-complete  # [Shift-Tab] - move through the completion menu backwards
+if [[ "${terminfo[kcbt]}" != "" ]]; then
+  bindkey "${terminfo[kcbt]}" reverse-menu-complete   # [Shift-Tab] - move through the completion menu backwards
 fi
 
 bindkey '^?' backward-delete-char                     # [Backspace] - delete backward

lib/termsupport.zsh

@@ -26,8 +26,11 @@ function omz_termsupport_precmd {
 function omz_termsupport_preexec {
   emulate -L zsh
   setopt extended_glob
-  local CMD=${1[(wr)^(*=*|sudo|ssh|rake|-*)]} #cmd name only, or if this is sudo or ssh, the next cmd
+
+  # cmd name only, or if this is sudo or ssh, the next cmd
+  local CMD=${1[(wr)^(*=*|sudo|ssh|rake|-*)]:gs/%/%%}
   local LINE="${2:gs/%/%%}"
+
   title '$CMD' '%100>...>$LINE%<<'
 }
 

plugins/brew-cask/brew-cask.plugin.zsh

@@ -0,0 +1,84 @@
+# Autocompletion for homebrew-cask.
+#
+# This script intercepts calls to the brew plugin and adds autocompletion
+# for the cask subcommand.
+#
+# Author: https://github.com/pstadler
+
+compdef _brew-cask brew
+
+_brew-cask()
+{
+  local curcontext="$curcontext" state line
+  typeset -A opt_args
+
+  _arguments -C \
+    ':command:->command' \
+    ':subcmd:->subcmd' \
+    '*::options:->options'
+
+  case $state in
+    (command)
+      __call_original_brew
+      cask_commands=(
+        'cask:manage casks'
+      )
+      _describe -t commands 'brew cask command' cask_commands ;;
+
+    (subcmd)
+      case "$line[1]" in
+        cask)
+          if (( CURRENT == 3 )); then
+            local -a subcommands
+            subcommands=(
+              "alfred:used to modify Alfred's scope to include the Caskroom"
+              'audit:verifies installability of casks'
+              'checklinks:checks for bad cask links'
+              'cleanup:cleans up cached downloads'
+              'create:creates a cask of the given name and opens it in an editor'
+              'doctor:checks for configuration issues'
+              'edit:edits the cask of the given name'
+              'fetch:downloads Cask resources to local cache'
+              'home:opens the homepage of the cask of the given name'
+              'info:displays information about the cask of the given name'
+              'install:installs the cask of the given name'
+              'list:with no args, lists installed casks; given installed casks, lists installed files'
+              'search:searches all known casks'
+              'uninstall:uninstalls the cask of the given name'
+              "update:a synonym for 'brew update'"
+            )
+            _describe -t commands "brew cask subcommand" subcommands
+          fi ;;
+
+        *)
+          __call_original_brew ;;
+      esac ;;
+
+    (options)
+      local -a casks installed_casks
+      local expl
+      case "$line[2]" in
+        list|uninstall)
+          __brew_installed_casks
+          _wanted installed_casks expl 'installed casks' compadd -a installed_casks ;;
+        audit|edit|home|info|install)
+          __brew_all_casks
+          _wanted casks expl 'all casks' compadd -a casks ;;
+      esac ;;
+  esac
+}
+
+__brew_all_casks() {
+  casks=(`brew cask search`)
+}
+
+__brew_installed_casks() {
+  installed_casks=(`brew cask list`)
+}
+
+__call_original_brew()
+{
+  local ret=1
+  _call_function ret _brew
+  compdef _brew-cask brew
+}

plugins/bundler/bundler.plugin.zsh

@@ -6,7 +6,7 @@ alias bu="bundle update"
 
 # The following is based on https://github.com/gma/bundler-exec
 
-bundled_commands=(annotate berks cap capify cucumber foodcritic foreman guard irb jekyll kitchen knife mailcatcher middleman nanoc puma rackup rainbows rake rspec ruby shotgun spec spin spork strainer tailor taps thin thor unicorn unicorn_rails)
+bundled_commands=(annotate berks cap capify cucumber foodcritic foreman guard irb jekyll kitchen knife middleman nanoc puma rackup rainbows rake rspec ruby shotgun spec spin spork strainer tailor taps thin thor unicorn unicorn_rails)
 
 # Remove $UNBUNDLED_COMMANDS from the bundled_commands list
 for cmd in $UNBUNDLED_COMMANDS; do

plugins/debian/debian.plugin.zsh

@@ -21,8 +21,8 @@ fi
 # Aliases ###################################################################
 # These are for more obscure uses of apt-get and aptitude that aren't covered
 # below.
-alias ag='apt-get'
-alias ap='aptitude'
+alias age='apt-get'
+alias api='aptitude'
 
 # Some self-explanatory aliases
 alias acs="apt-cache search"

plugins/docker/_docker

@@ -2,7 +2,8 @@
 
 # Docker autocompletion for oh-my-zsh
 # Requires: Docker installed
-# Author : Azaan (@aeonazaan)
+# Author: Azaan (@aeonazaan)
+# Updates: Bob Maerten (@bobmaerten) for Docker v0.9+
 
 
 # ----- Helper functions
@@ -24,21 +25,30 @@ __docker_images() {
 # Seperate function for each command, makes extension easier later
 # ---------------------------
 __attach() {
+    _arguments \
+        '--no-stdin[Do not attach stdin]' \
+        '--sig-proxy[Proxify all received signal to the process (even in non-tty mode)]'
     __docker_containers
 }
 
 __build() {
     _arguments \
-        '-q=false[Suppress verbose build output]' \
-        '-t="[fuck to be applied to the resulting image in case of success]' \
+        '--no-cache[Do not use cache when building the image]' \
+        '(-q,--quiet)'{-q,--quiet}'[Suppress the verbose output generated by the containers]' \
+        '--rm[Remove intermediate containers after a successful build]' \
+        '(-t,--tag=)'{-t,--tag=}'[Repository name (and optionally a tag) to be applied to the resulting image in case of success]' \
         '*:files:_files'
 }
 
 __commit() {
     _arguments \
-        '-author="[Author]' \
-        '-m="[Commit message]' \
-        '-run="[Config automatically applied when the image is run.\n]'
+        '(-a,--author=)'{-a,--author=}'[Author (eg. "John Hannibal Smith <hannibal@a-team.com>"]' \
+        '(-m,--message=)'{-m,--message=}'[Commit message]' \
+        '--run=[Config automatically applied when the image is run.]'
+    __docker_containers
+}
+
+__cp() {
     __docker_containers
 }
 
@@ -46,21 +56,29 @@ __diff() {
     __docker_containers
 }
 
+__events() {
+    _arguments \
+        '--since=[Show previously created events and then stream.]'
+}
+
 __export() {
    __docker_containers
 }
 
-
 __history() {
+    _arguments \
+        '--no-trunc=[Don''t truncate output]' \
+        '(-q,--quiet)'{-q,--quiet}'[Only show numeric IDs]'
     __docker_images
 }
 
 __images() {
     _arguments \
-        '-a[show all images]' \
-        '-notrunc[dont truncate output]' \
-        '-q[only show numeric IDs]' \
-        '-viz[output graph in graphviz format]'
+        '(-a,--all)'{-a,--all}'[Show all images (by default filter out the intermediate images used to build)]' \
+        '--no-trunc[Don''t truncate output]' \
+        '(-q,--quiet=)'{-q,--quiet=}'[Only show numeric IDs]' \
+        '(-t,--tree=)'{-t,--tree=}'[Output graph in tree format]' \
+        '(-v,--viz=)'{-v,--viz=}'[Output graph in graphviz format]'
     __docker_images
 }
 
@@ -86,14 +104,20 @@ __kill() {
     __docker_containers
 }
 
+__load() {
+    _arguments '*:files:_files'
+}
+
 __login() {
     _arguments \
-        '-e="[email]' \
-        '-p="[password]' \
-        '-u="[username]' \
+        '(-e,--email=)'{-e,-email=}'[Email]' \
+        '(-p,--password=)'{-p,-password=}'[Password]' \
+        '(-u,--username=)'{-u,-username=}'[Username]'
 }
 
 __logs() {
+    _arguments \
+        '(-f,--follow)'{-f,-follow}'[Follow log output]'
     __docker_containers
 }
 
@@ -107,77 +131,107 @@ __top() {
 
 __ps() {
     _arguments \
-        '-a[Show all containers. Only running containers are shown by default.]' \
-        '-beforeId="[Show only container created before Id, include non-running ones.]' \
-        '-l[Show only the latest created container, include non-running ones.]' \
-        '-n=[Show n last created containers, include non-running ones.]' \
-        '-notrunc[Dont truncate output]' \
-        '-q[Only display numeric IDs]' \
-        '-s[Display sizes]' \
-        '-sinceId="[Show only containers created since Id, include non-running ones.]'
+        '(-a,--all)'{-a,--all}'[Show all containers. Only running containers are shown by default.]' \
+        '--before-id=[Show only container created before Id, include non-running ones.]' \
+        '(-l,--latest)'{-l,--latest}'[Show only the latest created container, include non-running ones.]' \
+        '-n=[Show n last created containers, include non-running ones. default=-1.]' \
+        '--no-trunc[Don''t truncate output]' \
+        '(-q,--quiet)'{-q,--quiet}'[Only display numeric IDs]' \
+        '(-s,--size)'{-s,--size}'[Display sizes]' \
+        '--since-id=[Show only containers created since Id, include non-running ones.]'
 }
 
 __pull() {
-    _arguments '-t="[Download tagged image in repository]'
+    _arguments \
+        '(-t,--tag=)'{-t,--tag=}'[Download tagged image in repository]'
 }
 
 __push() {
-
+    # no arguments
 }
 
 __restart() {
-    _arguments '-t=[number of seconds to try to stop before killing]'
+    _arguments \
+        '(-t,--time=)'{-t,--time=}'[Number of seconds to try to stop for before killing the container. Once killed it will then be restarted. Default=10]'
     __docker_containers
 }
 
 __rm() {
-    _arguments '-v[Remove the volumes associated to the container]'
+    _arguments \
+        '(-f,--force=)'{-f,--force=}'[Force removal of running container]' \
+        '(-l,--link=)'{-l,--link=}'[Remove the specified link and not the underlying container]' \
+        '(-v,--volumes=)'{-v,--volumes=}'[Remove the volumes associated to the container]'
     __docker_containers
 }
 
 __rmi() {
+    _arguments \
+        '(-f,--force=)'{-f,--force=}'[Force]' \
     __docker_images
 }
 
 __run() {
     _arguments \
-        '-a=[Attach to stdin, stdout or stderr.]' \
-        '-c=[CPU shares (relative weight)]' \
-        '-d[Detached mode: leave the container running in the background]' \
-        '-dns=[Set custom dns servers]' \
-        '-e=[Set environment variables]' \
-        '-entrypoint="[Overwrite the default entrypoint of the image]' \
-        '-h="[Container host name]' \
-        '-i[Keep stdin open even if not attached]' \
-        '-m=[Memory limit (in bytes)]' \
-        '-p=[Expose a containers port to the host (use docker port to see the actual mapping)]' \
-        '-t[Allocate a pseudo-tty]' \
-        '-u="[Username or UID]' \
-        '-v=[Bind mount a volume (e.g. from the host: -v /host:/container, from docker: -v /container)]' \
-        '-volumes-from="[Mount volumes from the specified container]'
+        '(-P,--publish-all=)'{-P,--publish-all=}'[Publish all exposed ports to the host interfaces]' \
+        '(-a,--attach=)'{-a,--attach=}'[Attach to stdin, stdout or stderr.]' \
+        '(-c,--cpu-shares=)'{-c,--cpu-shares=}': CPU shares (relative weight)]' \
+        '--cidfile=[Write the container ID to the file]' \
+        '(-d,--detach=)'{-d,--detach=}'[Detached mode: Run container in the background, print new container id]' \
+        '--dns=[Set custom dns servers]' \
+        '(-e,--env=)'{-e,--env=}'[Set environment variables]' \
+        '--entrypoint=[Overwrite the default entrypoint of the image]' \
+        '--expose=[Expose a port from the container without publishing it to your host]' \
+        '(-h,--hostname=)'{-h,--hostname=}'[Container host name]' \
+        '(-i,--interactive=)'{-i,--interactive=}'[Keep stdin open even if not attached]' \
+        '--link=[Add link to another container (name:alias)]' \
+        '--lxc-conf=[Add custom lxc options -lxc-conf="lxc.cgroup.cpuset.cpus = 0,1"]' \
+        '(-m,--memory=)'{-m,--memory=}'[Memory limit (format: <number><optional unit>, where unit = b, k, m or g)]' \
+        '(-n,--networking=)'{-n,--networking=}'[Enable networking for this container]' \
+        '--name=[Assign a name to the container]' \
+        '(-p,--publish=)'{-p,--publish=}'[Publish a container''s port to the host (format: ip:hostPort:containerPort | ip::containerPort | hostPort:containerPort) (use "docker port" to see the actual mapping)]' \
+        '--privileged=[Give extended privileges to this container]' \
+        '--rm=[Automatically remove the container when it exits (incompatible with -d)]' \
+        '--sig-proxy=[Proxify all received signal to the process (even in non-tty mode)]' \
+        '(-t,--tty=)'{-t,--tty=}'[Allocate a pseudo-tty]' \
+        '(-u,--user=)'{-u,--user=}'[Username or UID]' \
+        '(-v,--volume=)'{-v,--volume=}'[Bind mount a volume (e.g. from the host: -v /host:/container, from docker: -v /container)]' \
+        '--volumes-from=[Mount volumes from the specified container(s)]' \
+        '(-w,--workdir=)'{-w,--workdir=}'[Working directory inside the container]'
     __docker_images
 }
 
 __search() {
-    _arguments '-notrunc[Dont truncate output]'
+    _arguments \
+        '--no-trunc=[Don''t truncate output]' \
+        '-s,--stars=)'{-s,--stars=}'[Only displays with at least xxx stars]' \
+        '-t,--trusted=)'{-t,--trusted=}'[Only show trusted builds]'
+}
+
+__save() {
+    __docker_images
 }
 
 __start() {
+    _arguments \
+        '(-a,--attach=)'{-a,--attach=}'[Attach container''s stdout/stderr and forward all signals to the process]' \
+        '(-i,--interactive=)'{-i, --interactive=}'[Attach container''s stdin]'
     __docker_containers
 }
 
 __stop() {
-    _arguments '-t=[number of seconds to try to stop before killing]'
+    _arguments \
+        '(-t,--time=)'{-t,--time=}'[Number of seconds to wait for the container to stop before killing it.]'
     __docker_containers
 }
 
 __tag() {
-    _arguments '-f[Force]'
+    _arguments \
+        '(-f,--force=)'{-f,--force=}'[Force]'
     __docker_images
 }
 
 __version() {
-
+    # no arguments
 }
 
 __wait() {
@@ -192,7 +246,9 @@ _1st_arguments=(
     "attach":"Attach to a running container"
     "build":"Build a container from a Dockerfile"
     "commit":"Create a new image from a container's changes"
+    "cp":"Copy files/folders from the containers filesystem to the host path"
     "diff":"Inspect changes on a container's filesystem"
+    "events":"Get real time events from the server"
     "export":"Stream the contents of a container as a tar archive"
     "history":"Show the history of an image"
     "images":"List images"
@@ -201,10 +257,10 @@ _1st_arguments=(
     "insert":"Insert a file in an image"
     "inspect":"Return low-level information on a container"
     "kill":"Kill a running container"
+    "load":"Load an image from a tar archive"
     "login":"Register or Login to the docker registry server"
     "logs":"Fetch the logs of a container"
     "port":"Lookup the public-facing port which is NAT-ed to PRIVATE_PORT"
-    "top":"Lookup the running processes of a container"
     "ps":"List containers"
     "pull":"Pull an image or a repository from the docker registry server"
     "push":"Push an image or a repository to the docker registry server"
@@ -212,10 +268,12 @@ _1st_arguments=(
     "rm":"Remove one or more containers"
     "rmi":"Remove one or more images"
     "run":"Run a command in a new container"
+    "save":"Save an image to a tar archive"
     "search":"Search for an image in the docker index"
     "start":"Start a stopped container"
     "stop":"Stop a running container"
     "tag":"Tag an image into a repository"
+    "top":"Lookup the running processes of a container"
     "version":"Show the docker version information"
     "wait":"Block until a container stops, then print its exit code"
 )
@@ -230,13 +288,17 @@ fi
 local -a _command_args
 case "$words[1]" in
     attach)
-       __docker_containers ;;
+       __attach ;;
     build)
         __build ;;
     commit)
         __commit ;;
+    cp)
+        __cp ;;
     diff)
         __diff ;;
+    events)
+        __events ;;
     export)
         __export ;;
     history)
@@ -253,14 +315,14 @@ case "$words[1]" in
         __inspect ;;
     kill)
         __kill ;;
+    load)
+        __load ;;
     login)
         __login ;;
     logs)
         __logs ;;
     port)
         __port ;;
-    top)
-        __top ;;
     ps)
         __ps ;;
     pull)
@@ -275,6 +337,8 @@ case "$words[1]" in
         __rmi ;;
     run)
         __run ;;
+    save)
+        __save ;;
     search)
         __search ;;
     start)
@@ -283,6 +347,8 @@ case "$words[1]" in
         __stop ;;
     tag)
         __tag ;;
+    top)
+        __top ;;
     version)
         __version ;;
     wait)

plugins/emacs/emacsclient.sh

@@ -3,7 +3,7 @@
 # get list of available X windows.
 x=`emacsclient --alternate-editor '' --eval '(x-display-list)' 2>/dev/null`
 
-if [ -z "$x" ] ;then
+if [ -z "$x" ] || [ "$x" = "nil" ] ;then
     # Create one if there is no X window yet.
     emacsclient --alternate-editor "" --create-frame "$@"
 else

plugins/jsontools/README.md

@@ -0,0 +1,42 @@
+# jsontools
+
+Handy command line tools for dealing with json data.
+
+## Tools
+
+- **pp_json** - pretty prints json
+- **is_json** - returns true if valid json; false otherwise
+- **urlencode_json** - returns a url encoded string for the given json 
+- **urldecode_json** - returns decoded json for the given url encoded string
+
+## Usage
+Usage is simple...just take your json data and pipe it into the appropriate jsontool.
+```sh
+<json data> | <jsontools tool>
+```
+## Examples
+
+##### pp_json
+
+```sh
+# curl json data and pretty print the results
+curl https://coderwall.com/bobwilliams.json | pp_json
+```
+
+##### is_json
+```sh
+# pretty print the contents of an existing json file
+less data.json | is_json
+```
+
+##### urlencode_json
+```sh
+# json data directly from the command line
+echo '{"b":2, "a":1}' | urlencode_json
+```
+
+##### urldecode_json
+```sh
+# url encoded string to decode
+echo '%7B%22b%22:2,%20%22a%22:1%7D%0A' | urldecode_json
+```

plugins/jsontools/jsontools.plugin.zsh

@@ -2,15 +2,38 @@
 # Adds command line aliases useful for dealing with JSON
 
 if [[ $(whence $JSONTOOLS_METHOD) = "" ]]; then
-    JSONTOOLS_METHOD=""
+	JSONTOOLS_METHOD=""
 fi
 
 if [[ $(whence node) != "" && ( "x$JSONTOOLS_METHOD" = "x"  || "x$JSONTOOLS_METHOD" = "xnode" ) ]]; then
-    alias pp_json='node -e "console.log(JSON.stringify(process.argv[1]), null, 4)"'
+	alias pp_json='xargs -0 node -e "console.log(JSON.stringify(JSON.parse(process.argv[1]), null, 4));"'
+	alias is_json='xargs -0 node -e "try {json = JSON.parse(process.argv[1]);} catch (e) { console.log(false); json = null; } if(json) { console.log(true); }"'
+	alias urlencode_json='xargs -0 node -e "console.log(encodeURIComponent(process.argv[1]))"'
+	alias urldecode_json='xargs -0 node -e "console.log(decodeURIComponent(process.argv[1]))"'
 elif [[ $(whence python) != "" && ( "x$JSONTOOLS_METHOD" = "x" || "x$JSONTOOLS_METHOD" = "xpython" ) ]]; then
 	alias pp_json='python -mjson.tool'
+	alias is_json='python -c "
+import json, sys;
+try: 
+	json.loads(sys.stdin.read())
+except ValueError, e: 
+	print False
+else:
+	print True
+sys.exit(0)"'
+	alias urlencode_json='python -c "
+import urllib, json, sys;
+print urllib.quote_plus(sys.stdin.read())
+sys.exit(0)"'
+	alias urldecode_json='python -c "
+import urllib, json, sys;
+print urllib.unquote_plus(sys.stdin.read())
+sys.exit(0)"'
 elif [[ $(whence ruby) != "" && ( "x$JSONTOOLS_METHOD" = "x" || "x$JSONTOOLS_METHOD" = "xruby" ) ]]; then
 	alias pp_json='ruby -e "require \"json\"; require \"yaml\"; puts JSON.parse(STDIN.read).to_yaml"'
+	alias is_json='ruby -e "require \"json\"; begin; JSON.parse(STDIN.read); puts true; rescue Exception => e; puts false; end"'
+	alias urlencode_json='ruby -e "require \"uri\"; puts URI.escape(STDIN.read)"'
+	alias urldecode_json='ruby -e "require \"uri\"; puts URI.unescape(STDIN.read)"'
 fi
 
 unset JSONTOOLS_METHOD

plugins/pow/pow.plugin.zsh

@@ -21,8 +21,8 @@
 
 rack_root(){
   setopt chaselinks
-  local orgdir=$(pwd)
-  local basedir=$(pwd)
+  local orgdir="$(pwd)"
+  local basedir="$(pwd)"
 
   while [[ $basedir != '/' ]]; do
     test -e "$basedir/config.ru" && break
@@ -30,7 +30,7 @@ rack_root(){
     basedir="$(pwd)"
   done
 
-  builtin cd $orgdir 2>/dev/null
+  builtin cd "$orgdir" 2>/dev/null
   [[ ${basedir} == "/" ]] && return 1
   echo $basedir
 }
@@ -56,19 +56,19 @@ kapow(){
 compctl -W ~/.pow -/ kapow
 
 powit(){
-  local basedir=$(pwd)
+  local basedir="$(pwd)"
   local vhost=$1
   [ ! -n "$vhost" ] && vhost=$(rack_root_detect)
   if [ ! -h ~/.pow/$vhost ]
   then
     echo "pow: Symlinking your app with pow. ${vhost}"
-    [ ! -d ~/.pow/${vhost} ] && ln -s $basedir ~/.pow/$vhost
+    [ ! -d ~/.pow/${vhost} ] && ln -s "$basedir" ~/.pow/$vhost
     return 1
   fi
 }
 
 powed(){
-  local basedir=$(rack_root)
+  local basedir="$(rack_root)"
   find ~/.pow/ -type l -lname "*$basedir*" -exec basename {}'.dev' \;
 }
 
@@ -82,4 +82,4 @@ repow(){
 }
 
 # View the standard out (puts) from any pow app
-alias kaput="tail -f ~/Library/Logs/Pow/apps/*"
+alias kaput="tail -f ~/Library/Logs/Pow/apps/*"

plugins/rake-fast/README.md

@@ -0,0 +1,23 @@
+# rake-fast
+
+Fast rake autocompletion plugin.
+
+This script caches the output for later usage and significantly speeds it up. It generates a .rake_tasks cache file in parallel to the Rakefile. It also checks the file modification dates to see if it needs to regenerate the cache file.
+
+This is entirely based on [this pull request by Ullrich Schäfer](https://github.com/robb/.dotfiles/pull/10/), which is inspired by [this Ruby on Rails trick from 2006](http://weblog.rubyonrails.org/2006/3/9/fast-rake-task-completion-for-zsh/).
+
+Think about that. 2006.
+
+## Installation
+
+Just add the plugin to your `.zshrc`:
+
+```bash
+plugins=(foo bar rake-fast)
+```
+
+You might consider adding `.rake_tasks` to your [global .gitignore](https://help.github.com/articles/ignoring-files#global-gitignore)
+
+## Usage
+
+`rake`, then press tab

plugins/rake-fast/rake-fast.plugin.zsh

@@ -1,20 +1,3 @@
-# rake-fast
-# Fast rake autocompletion plugin for oh-my-zsh
-
-# This script caches the output for later usage and significantly speeds it up.
-# It generates a .rake_tasks file in parallel to the Rakefile.
-
-# You'll want to add `.rake_tasks` to your global .git_ignore file:
-# https://help.github.com/articles/ignoring-files#global-gitignore
-
-# You can force .rake_tasks to refresh with:
-# $ rake_refresh
-
-# This is entirely based on Ullrich Schäfer's work
-# (https://github.com/robb/.dotfiles/pull/10/),
-# which is inspired by this Ruby on Rails trick from 2006:
-# http://weblog.rubyonrails.org/2006/3/9/fast-rake-task-completion-for-zsh/
-
 _rake_refresh () {
   if [ -f .rake_tasks ]; then
     rm .rake_tasks
@@ -27,8 +10,13 @@ _rake_refresh () {
 _rake_does_task_list_need_generating () {
   if [ ! -f .rake_tasks ]; then return 0;
   else
-    accurate=$(stat -f%m .rake_tasks)
-    changed=$(stat -f%m Rakefile)
+    if [[ $(uname -s) == 'Darwin' ]]; then
+      accurate=$(stat -f%m .rake_tasks)
+      changed=$(stat -f%m Rakefile)
+    else
+      accurate=$(stat -c%Y .rake_tasks)
+      changed=$(stat -c%Y Rakefile)
+    fi
     return $(expr $accurate '>=' $changed)
   fi
 }

templates/zshrc.zsh-template

@@ -11,34 +11,34 @@ ZSH_THEME="mh"
 # alias zshconfig="mate ~/.zshrc"
 # alias ohmyzsh="mate ~/.oh-my-zsh"
 
-# Set this to use case-sensitive completion
+# Uncomment the following line to use case-sensitive completion.
 # CASE_SENSITIVE="true"
 
 # Comment this out to disable weekly auto-update checks
 DISABLE_AUTO_UPDATE="true"
 
-# Uncomment to change how often to auto-update? (in days)
+# Uncomment the following line to change how often to auto-update (in days).
 # export UPDATE_ZSH_DAYS=13
 
-# Uncomment following line if you want to disable colors in ls
+# Uncomment the following line to disable colors in ls.
 # DISABLE_LS_COLORS="true"
 
-# Uncomment following line if you want to disable autosetting terminal title.
+# Uncomment the following line to disable auto-setting terminal title.
 # DISABLE_AUTO_TITLE="true"
 
 # Uncomment following line if you want to disable command autocorrection
 DISABLE_CORRECTION="true"
 
-# Uncomment following line if you want red dots to be displayed while waiting for completion
+# Uncomment the following line to display red dots whilst waiting for completion.
 # COMPLETION_WAITING_DOTS="true"
 
-# Uncomment following line if you want to disable marking untracked files under
-# VCS as dirty. This makes repository status check for large repositories much,
-# much faster.
+# Uncomment the following line if you want to disable marking untracked files
+# under VCS as dirty. This makes repository status check for large repositories
+# much, much faster.
 # DISABLE_UNTRACKED_FILES_DIRTY="true"
 
-# Uncomment following line if you want to the command execution time stamp shown 
-# in the history command output.
+# Uncomment the following line if you want to change the command execution time
+# stamp shown in the history command output.
 # The optional three formats: "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd"
 # HIST_STAMPS="mm/dd/yyyy"
 
@@ -60,7 +60,7 @@ export PATH=$HOME/bin:/usr/local/bin:$PATH
 # You may need to manually set your language environment
 # export LANG=en_US.UTF-8
 
-# # Preferred editor for local and remote sessions
+# Preferred editor for local and remote sessions
 # if [[ -n $SSH_CONNECTION ]]; then
 #   export EDITOR='vim'
 # else

themes/agnoster.zsh-theme

@@ -69,7 +69,9 @@ prompt_context() {
 
 # Git: branch/detached head, dirty status
 prompt_git() {
-  local ref dirty
+  local ref dirty mode repo_path
+  repo_path=$(git rev-parse --git-dir 2>/dev/null)
+
   if $(git rev-parse --is-inside-work-tree >/dev/null 2>&1); then
     dirty=$(parse_git_dirty)
     ref=$(git symbolic-ref HEAD 2> /dev/null) || ref="➦ $(git show-ref --head -s --abbrev |head -n1 2> /dev/null)"
@@ -79,6 +81,14 @@ prompt_git() {
       prompt_segment green black
     fi
 
+    if [[ -e "${repo_path}/BISECT_LOG" ]]; then
+      mode=" <B>"
+    elif [[ -e "${repo_path}/MERGE_HEAD" ]]; then
+      mode=" >M<"
+    elif [[ -e "${repo_path}/rebase" || -e "${repo_path}/rebase-apply" || -e "${repo_path}/rebase-merge" || -e "${repo_path}/../.dotest" ]]; then
+      mode=" >R>"
+    fi
+
     setopt promptsubst
     autoload -Uz vcs_info
 
@@ -90,7 +100,7 @@ prompt_git() {
     zstyle ':vcs_info:*' formats ' %u%c'
     zstyle ':vcs_info:*' actionformats ' %u%c'
     vcs_info
-    echo -n "${ref/refs\/heads\// }${vcs_info_msg_0_%% }"
+    echo -n "${ref/refs\/heads\// }${vcs_info_msg_0_%% }${mode}"
   fi
 }