move gitignore template function to modules/git

Currently, node-info shows nothing if $version is different than 'none'.

CONTRIBUTING.md

@@ -39,4 +39,3 @@ improve its performance, do not hesitate to fork and send pull requests.
 [3]: http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
 [4]: https://help.github.com/articles/using-pull-requests
 [5]: http://daringfireball.net/projects/markdown/syntax#img
-

README.md

@@ -8,8 +8,8 @@ and prompt themes.
 Installation
 ------------
 
-Prezto will work with any recent release of Zsh, but the minimum recommended
-version is 4.3.11.
+Prezto will work with any recent release of Zsh, but the minimum required
+version is 4.3.17.
 
   1. Launch Zsh:
 
@@ -114,4 +114,3 @@ SOFTWARE.
 [6]: http://gitref.org
 [7]: http://www.bash2zsh.com/zsh_refcard/refcard.pdf
 [8]: http://grml.org/zsh/zsh-lovers.html
-

init.zsh

@@ -10,7 +10,7 @@
 #
 
 # Check for the minimum supported version.
-min_zsh_version='4.3.11'
+min_zsh_version='4.3.17'
 if ! autoload -Uz is-at-least || ! is-at-least "$min_zsh_version"; then
   print "prezto: old shell detected, minimum required: $min_zsh_version" >&2
   return 1
@@ -111,4 +111,3 @@ unset zfunction{s,}
 zstyle -a ':prezto:load' pmodule 'pmodules'
 pmodload "$pmodules[@]"
 unset pmodules
-

modules/README.md

@@ -102,10 +102,10 @@ Node.js
 
 Provides utility functions for Node.js and loads npm completion.
 
-Ocaml
+OCaml
 -----
 
-Initializes Ocaml package management.
+Initializes OCaml package management.
 
 OSX
 ---
@@ -192,4 +192,3 @@ Yum
 ---
 
 Defines yum aliases.
-

modules/archive/README.md

@@ -38,4 +38,3 @@ Authors
   - [Sorin Ionescu](https://github.com/sorin-ionescu)
 
 [1]: https://github.com/sorin-ionescu/prezto/issues
-

modules/archive/functions/_lsarchive

@@ -11,4 +11,3 @@
 _arguments \
   '(-v --verbose)'{-v,--remove}'[verbose archive listing]' \
   "*::archive file:_files -g '(#i)*.(tar|tgz|tbz|tbz2|txz|tlz|gz|bz2|xz|lzma|Z|zip|rar|7z)(-.)'" && return 0
-

modules/archive/functions/_unarchive

@@ -11,4 +11,3 @@
 _arguments \
   '(-r --remove)'{-r,--remove}'[remove archive]' \
   "*::archive file:_files -g '(#i)*.(tar|tgz|tbz|tbz2|txz|tlz|gz|bz2|xz|lzma|Z|zip|rar|7z|deb)(-.)'" && return 0
-

modules/archive/functions/lsarchive

@@ -30,7 +30,7 @@ while (( $# > 0 )); do
     continue
   fi
 
-  case "$1" in
+  case "$1:l" in
     (*.tar.gz|*.tgz) tar t${verbose:+v}vzf "$1" ;;
     (*.tar.bz2|*.tbz|*.tbz2) tar t${verbose:+v}jf "$1" ;;
     (*.tar.xz|*.txz) tar --xz --help &> /dev/null \
@@ -46,11 +46,10 @@ while (( $# > 0 )); do
       || rar ${${verbose:+v}:-l} "$1" ;;
     (*.7z) 7za l "$1" ;;
     (*)
-			print "$0: cannot list: $1" >&2
+      print "$0: cannot list: $1" >&2
       success=1
     ;;
   esac
 
   shift
 done
-

modules/archive/functions/unarchive

@@ -37,7 +37,7 @@ while (( $# > 0 )); do
   success=0
   file_name="${1:t}"
   extract_dir="${file_name:r}"
-  case "$1" in
+  case "$1:l" in
     (*.tar.gz|*.tgz) tar xvzf "$1" ;;
     (*.tar.bz2|*.tbz|*.tbz2) tar xvjf "$1" ;;
     (*.tar.xz|*.txz) tar --xz --help &> /dev/null \
@@ -54,8 +54,8 @@ while (( $# > 0 )); do
     (*.Z) uncompress "$1" ;;
     (*.zip) unzip "$1" -d $extract_dir ;;
     (*.rar) unrar &> /dev/null \
-      && unrar e -ad "$1" \
-      || rar e -ad "$1" ;;
+      && unrar x -ad "$1" \
+      || rar x -ad "$1" ;;
     (*.7z) 7za x "$1" ;;
     (*.deb)
       mkdir -p "$extract_dir/control"
@@ -76,4 +76,3 @@ while (( $# > 0 )); do
   (( $success == 0 )) && (( $remove_archive == 0 )) && rm "$1"
   shift
 done
-

modules/command-not-found/README.md

@@ -13,4 +13,3 @@ Authors
 
 [1]: https://code.launchpad.net/command-not-found
 [2]: https://github.com/sorin-ionescu/prezto/issues
-

modules/command-not-found/init.zsh

@@ -15,4 +15,3 @@ elif [[ -s '/usr/share/doc/pkgfile/command-not-found.zsh' ]]; then
 else
   return 1
 fi
-

modules/completion/README.md

@@ -21,4 +21,3 @@ Authors
 
 [1]: https://github.com/zsh-users/zsh-completions
 [2]: https://github.com/sorin-ionescu/prezto/issues
-

modules/completion/init.zsh

@@ -99,13 +99,14 @@ zstyle -e ':completion:*:hosts' hosts 'reply=(
 )'
 
 # Don't complete uninteresting users...
-zstyle ':completion:*:*:*:users' ignored-patterns nobody nobody4 noaccess '_*' \
-  $([[ "$OSTYPE" = SunOS ]] && uid_min=100 || uid_min=500
-    IFS=:
-    while read -r user pass uid remainder; do
-      [[ "$user" != (\#*|root) ]] && ((uid < uid_min)) && echo $user
-    done </etc/passwd
-  )
+zstyle ':completion:*:*:*:users' ignored-patterns \
+  adm amanda apache avahi beaglidx bin cacti canna clamav daemon \
+  dbus distcache dovecot fax ftp games gdm gkrellmd gopher \
+  hacluster haldaemon halt hsqldb ident junkbust ldap lp mail \
+  mailman mailnull mldonkey mysql nagios \
+  named netdump news nfsnobody nobody nscd ntp nut nx openvpn \
+  operator pcap postfix postgres privoxy pulse pvm quagga radvd \
+  rpc rpcuser rpm shutdown squid sshd sync uucp vcsa xfs '_*'
 
 # ... unless we really want to.
 zstyle '*' single-ignored show
@@ -115,7 +116,7 @@ zstyle ':completion:*:(rm|kill|diff):*' ignore-line other
 zstyle ':completion:*:rm:*' file-patterns '*:all-files'
 
 # Kill
-zstyle ':completion:*:*:*:*:processes' command 'ps -u $USER -o pid,user,comm -w'
+zstyle ':completion:*:*:*:*:processes' command 'ps -u $USER -o pid,user,command -w'
 zstyle ':completion:*:*:kill:*:processes' list-colors '=(#b) #([0-9]#) ([0-9a-z-]#)*=01;36=0=01'
 zstyle ':completion:*:*:kill:*' menu yes select
 zstyle ':completion:*:*:kill:*' force-list always
@@ -145,4 +146,3 @@ zstyle ':completion:*:ssh:*' group-order users hosts-domain hosts-host users hos
 zstyle ':completion:*:(ssh|scp|rsync):*:hosts-host' ignored-patterns '*(.|:)*' loopback ip6-loopback localhost ip6-localhost broadcasthost
 zstyle ':completion:*:(ssh|scp|rsync):*:hosts-domain' ignored-patterns '<->.<->.<->.<->' '^[-[:alnum:]]##(.[-[:alnum:]]##)##' '*@*'
 zstyle ':completion:*:(ssh|scp|rsync):*:hosts-ipaddr' ignored-patterns '^(<->.<->.<->.<->|(|::)([[:xdigit:].]##:(#c,2))##(|%*))' '127.0.0.<->' '255.255.255.255' '::1' 'fe80::*'
-

modules/directory/README.md

@@ -33,4 +33,3 @@ Authors
   - [Sorin Ionescu](https://github.com/sorin-ionescu)
 
 [1]: https://github.com/sorin-ionescu/prezto/issues
-

modules/directory/init.zsh

@@ -28,4 +28,3 @@ unsetopt CLOBBER            # Do not overwrite existing files with > and >>.
 
 alias d='dirs -v'
 for index ({1..9}) alias "$index"="cd +${index}"; unset index
-

modules/dpkg/README.md

@@ -39,4 +39,3 @@ Authors
 
 [1]: http://wiki.debian.org/Teams/Dpkg
 [2]: https://github.com/sorin-ionescu/prezto/issues
-

modules/dpkg/functions/deb-clone

@@ -23,4 +23,3 @@ rm "$clone_script"
 print '#!/bin/sh\n' > "$clone_script"
 print "aptitude install ${package_list}\n" >> "$clone_script"
 chmod +x "$clone_script"
-

modules/dpkg/functions/deb-history

@@ -34,4 +34,3 @@ Commands:
 EOF
   ;;
 esac
-

modules/dpkg/functions/deb-kbuild

@@ -12,4 +12,3 @@ MAKEFLAGS='' time fakeroot make-kpkg \
   --revision "$(date +"%Y%m%d")" \
   kernel_image \
   kernel_headers
-

modules/dpkg/init.zsh

@@ -55,4 +55,3 @@ alias deb-build='time dpkg-buildpackage -rfakeroot -us -uc'
 
 # Removes all kernel images and headers, except for the ones in use.
 alias deb-kclean='sudo aptitude remove -P "?and(~i~nlinux-(ima|hea) ?not(~n`uname -r`))"'
-

modules/editor/README.md

@@ -49,8 +49,7 @@ To indicate when the editor is completing, add the following to your
     zstyle ':prezto:module:editor:info:completing' format '...'
 
 Then add `$editor_info[context]`, where context is *keymap*, *insert*, or
-*overwrite*, to `$PROMPT` or `$RPROMPT` and call `editor-info` in the
-`prompt_name_preexec` hook function.
+*overwrite*, to `$PROMPT` or `$RPROMPT`.
 
 Authors
 -------
@@ -60,4 +59,3 @@ Authors
   - [Sorin Ionescu](https://github.com/sorin-ionescu)
 
 [1]: https://github.com/sorin-ionescu/oh-my-zsh/issues
-

modules/editor/init.zsh

@@ -28,40 +28,42 @@ WORDCHARS='*?_-.[]~&;!#$%^(){}<>'
 zmodload zsh/terminfo
 typeset -gA key_info
 key_info=(
-  'Control'   '\C-'
-  'Escape'    '\e'
-  'Meta'      '\M-'
-  'Backspace' "^?"
-  'Delete'    "^[[3~"
-  'F1'        "$terminfo[kf1]"
-  'F2'        "$terminfo[kf2]"
-  'F3'        "$terminfo[kf3]"
-  'F4'        "$terminfo[kf4]"
-  'F5'        "$terminfo[kf5]"
-  'F6'        "$terminfo[kf6]"
-  'F7'        "$terminfo[kf7]"
-  'F8'        "$terminfo[kf8]"
-  'F9'        "$terminfo[kf9]"
-  'F10'       "$terminfo[kf10]"
-  'F11'       "$terminfo[kf11]"
-  'F12'       "$terminfo[kf12]"
-  'Insert'    "$terminfo[kich1]"
-  'Home'      "$terminfo[khome]"
-  'PageUp'    "$terminfo[kpp]"
-  'End'       "$terminfo[kend]"
-  'PageDown'  "$terminfo[knp]"
-  'Up'        "$terminfo[kcuu1]"
-  'Left'      "$terminfo[kcub1]"
-  'Down'      "$terminfo[kcud1]"
-  'Right'     "$terminfo[kcuf1]"
-  'BackTab'   "$terminfo[kcbt]"
+  'Control'      '\C-'
+  'ControlLeft'  '\e[1;5D \e[5D \e\e[D \eOd'
+  'ControlRight' '\e[1;5C \e[5C \e\e[C \eOc'
+  'Escape'       '\e'
+  'Meta'         '\M-'
+  'Backspace'    "^?"
+  'Delete'       "^[[3~"
+  'F1'           "$terminfo[kf1]"
+  'F2'           "$terminfo[kf2]"
+  'F3'           "$terminfo[kf3]"
+  'F4'           "$terminfo[kf4]"
+  'F5'           "$terminfo[kf5]"
+  'F6'           "$terminfo[kf6]"
+  'F7'           "$terminfo[kf7]"
+  'F8'           "$terminfo[kf8]"
+  'F9'           "$terminfo[kf9]"
+  'F10'          "$terminfo[kf10]"
+  'F11'          "$terminfo[kf11]"
+  'F12'          "$terminfo[kf12]"
+  'Insert'       "$terminfo[kich1]"
+  'Home'         "$terminfo[khome]"
+  'PageUp'       "$terminfo[kpp]"
+  'End'          "$terminfo[kend]"
+  'PageDown'     "$terminfo[knp]"
+  'Up'           "$terminfo[kcuu1]"
+  'Left'         "$terminfo[kcub1]"
+  'Down'         "$terminfo[kcud1]"
+  'Right'        "$terminfo[kcuf1]"
+  'BackTab'      "$terminfo[kcbt]"
 )
 
 # Set empty $key_info values to an invalid UTF-8 sequence to induce silent
 # bindkey failure.
 for key in "${(k)key_info[@]}"; do
   if [[ -z "$key_info[$key]" ]]; then
-    key_info["$key"]='<27>'
+    key_info[$key]='<27>'
   fi
 done
 
@@ -206,10 +208,10 @@ bindkey -d
 # Emacs Key Bindings
 #
 
-for key ("$key_info[Escape]"{B,b}) bindkey -M emacs "$key" emacs-backward-word
-for key ("$key_info[Escape]"{F,f}) bindkey -M emacs "$key" emacs-forward-word
-bindkey -M emacs "$key_info[Escape]$key_info[Left]" emacs-backward-word
-bindkey -M emacs "$key_info[Escape]$key_info[Right]" emacs-forward-word
+for key in "$key_info[Escape]"{B,b} "${(s: :)key_info[ControlLeft]}"
+  bindkey -M emacs "$key" emacs-backward-word
+for key in "$key_info[Escape]"{F,f} "${(s: :)key_info[ControlRight]}"
+  bindkey -M emacs "$key" emacs-forward-word
 
 # Kill to the beginning of the line.
 for key in "$key_info[Escape]"{K,k}
@@ -325,4 +327,3 @@ else
 fi
 
 unset key{,map,bindings}
-

modules/environment/README.md

@@ -23,4 +23,3 @@ Authors
   - [Sorin Ionescu](https://github.com/sorin-ionescu)
 
 [1]: https://github.com/sorin-ionescu/prezto/issues
-

modules/environment/init.zsh

@@ -55,4 +55,3 @@ if zstyle -t ':prezto:environment:termcap' color; then
   export LESS_TERMCAP_ue=$'\E[0m'          # Ends underline.
   export LESS_TERMCAP_us=$'\E[01;32m'      # Begins underline.
 fi
-

modules/fasd/README.md

@@ -36,4 +36,3 @@ Authors
 [3]: https://github.com/rupa/z
 [4]: https://github.com/rupa/v
 [5]: https://github.com/sorin-ionescu/prezto/issues
-

modules/fasd/init.zsh

@@ -51,4 +51,3 @@ function fasd_cd {
 
 # Changes the current working directory interactively.
 alias j='fasd_cd -i'
-

modules/git/README.md

@@ -237,6 +237,7 @@ Functions
   - `git-stash-recover` recovers given dropped stashed states.
   - `git-submodule-move` moves a submodule.
   - `git-submodule-remove` removes a submodule.
+  - `git-ignore-template` get gitignore template from [gitignore.io][9]
 
 Theming
 -------
@@ -332,4 +333,4 @@ Authors
 [6]: https://github.com/sorin-ionescu/prezto/issues
 [7]: https://github.com/sorin-ionescu/prezto/issues/219
 [8]: http://www.kernel.org/pub/software/scm/git/docs/git-log.html
-
+[9]: https://gitignore.io/

modules/git/alias.zsh

@@ -100,12 +100,12 @@ alias gix='git rm -r --cached'
 alias giX='git rm -rf --cached'
 
 # Log (l)
-alias gl='git log --topo-order --pretty=format:${_git_log_medium_format}'
-alias gls='git log --topo-order --stat --pretty=format:${_git_log_medium_format}'
-alias gld='git log --topo-order --stat --patch --full-diff --pretty=format:${_git_log_medium_format}'
-alias glo='git log --topo-order --pretty=format:${_git_log_oneline_format}'
-alias glg='git log --topo-order --all --graph --pretty=format:${_git_log_oneline_format}'
-alias glb='git log --topo-order --pretty=format:${_git_log_brief_format}'
+alias gl='git log --topo-order --pretty=format:"${_git_log_medium_format}"'
+alias gls='git log --topo-order --stat --pretty=format:"${_git_log_medium_format}"'
+alias gld='git log --topo-order --stat --patch --full-diff --pretty=format:"${_git_log_medium_format}"'
+alias glo='git log --topo-order --pretty=format:"${_git_log_oneline_format}"'
+alias glg='git log --topo-order --all --graph --pretty=format:"${_git_log_oneline_format}"'
+alias glb='git log --topo-order --pretty=format:"${_git_log_brief_format}"'
 alias glc='git shortlog --summary --numbered'
 
 # Merge (m)
@@ -180,3 +180,5 @@ alias gwC='git clean -f'
 alias gwx='git rm -r'
 alias gwX='git rm -rf'
 
+# Ignore list (ig)
+alias gig='git-ignore-template'

modules/git/functions/_git-hub-browse

@@ -45,4 +45,3 @@ case "$state" in
 esac
 
 return $ret
-

modules/git/functions/_git-hub-shorten-url

@@ -9,4 +9,3 @@
 #
 
 _arguments '1:url:' && return 0
-

modules/git/functions/_git-ignore-template

@@ -0,0 +1,26 @@
+#compdef _gitignireio git-ignore-template
+#autoload
+
+#
+# Completes git-ignore-template
+#
+# Authors:
+#   Haojia Che <haojia.che@gmail.com>
+#
+
+typeset -A opt_args
+
+_arguments -C \
+    '1::ignore:->ignores' \
+&& ret=0
+
+list=(`git-ignore-template`)
+
+case "$state" in
+    (ignores)
+        languages=(`echo  $list| tr "," "\n"`)
+        _describe 'templates' languages && ret=0
+    ;;
+esac;
+
+return 1;

modules/git/functions/_git-info

@@ -16,4 +16,3 @@ _arguments "1:toggle:((
   on\:'enable in-prompt information for the current repository'
   off\:'disable in-prompt information for the current repository'
 ))" && return 0
-

modules/git/functions/_git-submodule-move

@@ -38,4 +38,3 @@ case "$state" in
 esac
 
 return $ret
-

modules/git/functions/_git-submodule-remove

@@ -24,4 +24,3 @@ done < <(
 )
 
 _describe -t submodule 'submodules' submodules && return 0
-

modules/git/functions/git-branch-current

@@ -18,4 +18,3 @@ if [[ -n "$ref" ]]; then
 else
   return 1
 fi
-

modules/git/functions/git-commit-lost

@@ -18,4 +18,3 @@ git fsck 2> /dev/null \
       --no-walk \
       --stdin \
       --pretty=format:${_git_log_oneline_format}
-

modules/git/functions/git-dir

@@ -14,4 +14,3 @@ else
   print "$0: not a repository: $PWD" >&2
   return 1
 fi
-

modules/git/functions/git-hub-browse

@@ -56,4 +56,3 @@ else
   print "$0: not a Git repository or remote not set" >&2
   return 1
 fi
-

modules/git/functions/git-hub-shorten-url

@@ -20,4 +20,3 @@ if (( $+commands[curl] )); then
 else
   print "$0: command not found: curl" >&2
 fi
-

modules/git/functions/git-ignore-template

@@ -0,0 +1,20 @@
+#
+# Get  ignore template from https://gitignore.io.
+#
+# Authors:
+#   Haojia Che <haojia.che@gmail.com>
+#
+#  Use `git-ignore-template` or `git-ignore-template list` to get the list
+#  Uset `git-ignore-template <template name>` to get the template 
+#
+#   Example:
+#   `git-ignore-template java` to get a  gitignore template for java.
+#
+
+function git-ignore-template() {
+    if [ $@ ]; then
+        curl -L -s https://www.gitignore.io/api/$@;
+    else
+        curl -L -s https://www.gitignore.io/api/list;
+    fi
+}

modules/git/functions/git-info

@@ -348,13 +348,13 @@ function git-info {
     # Format added.
     if (( added > 0 )); then
       zstyle -s ':prezto:module:git:info:added' format 'added_format'
-      zformat -f added_formatted "$added_format" "a:$added_format"
+      zformat -f added_formatted "$added_format" "a:$added"
     fi
 
     # Format deleted.
     if (( deleted > 0 )); then
       zstyle -s ':prezto:module:git:info:deleted' format 'deleted_format'
-      zformat -f deleted_formatted "$deleted_format" "d:$deleted_format"
+      zformat -f deleted_formatted "$deleted_format" "d:$deleted"
     fi
 
     # Format modified.
@@ -421,4 +421,3 @@ function git-info {
 }
 
 git-info "$@"
-

modules/git/functions/git-root

@@ -14,4 +14,3 @@ else
   print "$0: not a repository work tree: $PWD" >&2
   return 1
 fi
-

modules/git/functions/git-stash-clear-interactive

@@ -20,4 +20,3 @@ if [[ -f "$(git-dir)/refs/stash" ]]; then
     fi
   fi
 fi
-

modules/git/functions/git-stash-dropped

@@ -20,4 +20,3 @@ git fsck --unreachable 2> /dev/null \
       --merges \
       --no-walk \
       --stdin
-

modules/git/functions/git-stash-recover

@@ -16,4 +16,3 @@ for commit in "$@"; do
   git update-ref \
     -m "$(git log -1 --pretty="format:%s" "$commit")" refs/stash "$commit"
 done
-

modules/git/functions/git-submodule-move

@@ -30,4 +30,3 @@ git-submodule-remove "$src"
 git submodule add "$url" "$dst"
 
 return 0
-

modules/git/functions/git-submodule-remove

@@ -25,4 +25,3 @@ rm -rf "${1}"
 rm -rf "$(git-dir)/modules/${1}"
 
 return 0
-

modules/git/init.zsh

@@ -15,4 +15,3 @@ pmodload 'helper'
 
 # Source module files.
 source "${0:h}/alias.zsh"
-

modules/gnu-utility/README.md

@@ -1,7 +1,7 @@
 GNU Utility
 ===========
 
-Provides for the interactive use of GNU utilities on non-GNU systems.
+Provides for the interactive use of GNU utilities on BSD systems.
 
 Installing GNU utilities on non-GNU systems in `$PATH` without a prefix, i.e.
 `ls` instead of `gls`, is not recommended since scripts that target other
@@ -30,4 +30,3 @@ Authors
   - [Sorin Ionescu](https://github.com/sorin-ionescu)
 
 [1]: https://github.com/sorin-ionescu/prezto/issues
-

modules/gnu-utility/init.zsh

@@ -58,4 +58,3 @@ for _gnu_utility_cmd in "${_gnu_utility_cmds[@]}"; do
 done
 
 unset _gnu_utility_{p,cmds,cmd,pcmd}
-

modules/gpg/README.md

@@ -24,4 +24,3 @@ Authors
 [1]: http://www.gnupg.org
 [2]: http://linux.die.net/man/1/gpg-agent
 [3]: https://github.com/sorin-ionescu/prezto/issues
-

modules/gpg/init.zsh

@@ -15,11 +15,14 @@ _gpg_agent_conf="$HOME/.gnupg/gpg-agent.conf"
 _gpg_agent_env="${TMPDIR:-/tmp}/gpg-agent.env"
 
 # Start gpg-agent if not started.
-if ! ps -U "$USER" -o ucomm | grep -q gpg-agent; then
-  eval "$(gpg-agent --daemon | tee "$_gpg_agent_env")"
-else
+if [[ -z "$GPG_AGENT_INFO" ]]; then
   # Export environment variables.
   source "$_gpg_agent_env" 2> /dev/null
+
+  # Start gpg-agent if not started.
+  if ! ps -U "$USER" -o pid,ucomm | grep -q -- "${${${(s.:.)GPG_AGENT_INFO}[2]}:--1} gpg-agent"; then
+    eval "$(gpg-agent --daemon | tee "$_gpg_agent_env")"
+  fi
 fi
 
 # Inform gpg-agent of the current TTY for user prompts.
@@ -41,4 +44,3 @@ unset _gpg_agent_{conf,env}
 if [[ -n "$SSH_CONNECTION" ]]; then
   export PINENTRY_USER_DATA='USE_CURSES=1'
 fi
-

modules/haskell/README.md

@@ -26,4 +26,3 @@ Authors
 
 [1]: http://www.haskell.org/cabal/
 [2]: https://github.com/sorin-ionescu/prezto/issues
-

modules/helper/README.md

@@ -22,4 +22,3 @@ Authors
   - [Sorin Ionescu](https://github.com/sorin-ionescu)
 
 [1]: https://github.com/sorin-ionescu/prezto/issues
-

modules/helper/functions/add-zsh-trap

@@ -39,4 +39,3 @@ function add-zsh-trap {
 }
 
 add-zsh-trap "$@"
-

modules/helper/init.zsh

@@ -29,4 +29,3 @@ function coalesce {
   done
   return 1
 }
-

modules/history-substring-search/README.md

@@ -59,4 +59,3 @@ Authors
 [1]: https://github.com/zsh-users/zsh-history-substring-search
 [2]: http://fishshell.com
 [3]: https://github.com/sorin-ionescu/prezto/issues
-

modules/history-substring-search/init.zsh

@@ -55,4 +55,3 @@ if [[ -n "$key_info" ]]; then
     bindkey -M "$keymap" "$key_info[Down]" history-substring-search-down
   done
 fi
-

modules/history/README.md

@@ -41,4 +41,3 @@ Authors
 
 [1]: http://zsh.sourceforge.net/Guide/zshguide02.html#l16
 [2]: https://github.com/sorin-ionescu/prezto/issues
-

modules/homebrew/README.md

@@ -6,6 +6,8 @@ Defines Homebrew aliases.
 Aliases
 -------
 
+### Homebrew
+
   - `brewc` cleans outdated brews and their cached archives.
   - `brewC` cleans outdated brews, including keg-only, and their cached archives.
   - `brewi` installs a formula.
@@ -15,12 +17,22 @@ Aliases
   - `brewu` upgrades Homebrew.
   - `brewx` uninstalls a formula.
 
+### Homebrew Cask
+
+  - `cask` is aliased to `brew cask`.
+  - `caskc` cleans up old cached downloads.
+  - `caskC` cleans up all cached downloads.
+  - `caski` installs a cask.
+  - `caskl` lists installed casks.
+  - `casks` searches for a cask.
+  - `caskx` uninstalls a cask.
+
 Authors
 -------
 
 *The authors of this module should be contacted via the [issue tracker][1].*
 
   - [Sorin Ionescu](https://github.com/sorin-ionescu)
+  - [Griffin Yourick](https://github.com/tough-griff)
 
 [1]: https://github.com/sorin-ionescu/prezto/issues
-

modules/homebrew/init.zsh

@@ -14,6 +14,7 @@ fi
 # Aliases
 #
 
+# Homebrew
 alias brewc='brew cleanup'
 alias brewC='brew cleanup --force'
 alias brewi='brew install'
@@ -23,3 +24,11 @@ alias brewu='brew upgrade'
 alias brewU='brew update && brew upgrade'
 alias brewx='brew remove'
 
+# Homebrew Cask
+alias cask='brew cask'
+alias caskc='brew cask cleanup --outdated'
+alias caskC='brew cask cleanup'
+alias caski='brew cask install'
+alias caskl='brew cask list'
+alias casks='brew cask search'
+alias caskx='brew cask uninstall'

modules/macports/README.md

@@ -23,4 +23,3 @@ Authors
   - [Sorin Ionescu](https://github.com/sorin-ionescu)
 
 [1]: https://github.com/sorin-ionescu/prezto/issues
-

modules/macports/init.zsh

@@ -32,4 +32,3 @@ alias portU='sudo port selfupdate && sudo port upgrade outdated'
 alias portu='sudo port upgrade'
 alias portX='sudo port -u uninstall'
 alias portx='sudo port uninstall'
-

modules/node/README.md

@@ -43,4 +43,3 @@ Authors
 [3]: http://nodejs.org/api
 [4]: https://github.com/sorin-ionescu/prezto/issues
 [5]: https://github.com/creationix/nvm
-

modules/node/functions/node-doc

@@ -5,6 +5,10 @@
 #   Sorin Ionescu <sorin.ionescu@gmail.com>
 #
 
-# TODO: Make the sections easier to use.
-open "http://nodejs.org/docs/$(node --version | sed 's/-.*//')/api/all.html#${1}"
+if [[ -z "$BROWSER" ]]; then
+  print "$0: no web browser defined" >&2
+  return 1
+fi
 
+# TODO: Make the sections easier to use.
+"$BROWSER" "http://nodejs.org/docs/$(node --version | sed 's/-.*//')/api/all.html#${1}"

modules/node/functions/node-info

@@ -17,9 +17,8 @@ if (( $+functions[nvm_version] )); then
   version="${$(nvm_version)#v}"
 fi
 
-if [[ -n "$version" ]]; then
+if [[ "$version" != (none|) ]]; then
   zstyle -s ':prezto:module:node:info:version' format 'version_format'
   zformat -f version_formatted "$version_format" "v:$version"
   node_info[version]="$version_formatted"
 fi
-

modules/node/init.zsh

@@ -6,9 +6,13 @@
 #   Zeh Rizzatti <zehrizzatti@gmail.com>
 #
 
-# Load NVM into the shell session.
+# Load manually installed NVM into the shell session.
 if [[ -s "$HOME/.nvm/nvm.sh" ]]; then
   source "$HOME/.nvm/nvm.sh"
+
+# Load package manager installed NVM into the shell session.
+elif (( $+commands[brew] )) && [[ -d "$(brew --prefix nvm 2>/dev/null)" ]]; then
+  source $(brew --prefix nvm)/nvm.sh
 fi
 
 # Return if requirements are not found.
@@ -29,4 +33,3 @@ if (( $+commands[npm] )); then
 
   unset cache_file
 fi
-

modules/ocaml/README.md

@@ -1,15 +1,15 @@
-Ocaml
+OCaml
 =====
 
-Initializes [Ocaml][1] package management.
+Initializes [OCaml][1] package management.
 
 OPAM
 ----
 
-[OPAM][2] is a package manager for Ocaml.
+[OPAM][2] is a package manager for OCaml.
 
 This module enables local package installation with OPAM by extending the
-relevant path and Ocaml variables.
+relevant path and OCaml variables.
 
 ### Usage
 
@@ -25,4 +25,3 @@ Authors
 [1]: http://ocaml.org/
 [2]: http://opam.ocamlpro.com/
 [3]: https://github.com/sorin-ionescu/prezto/issues
-

modules/ocaml/init.zsh

@@ -1,15 +1,14 @@
 #
-# Initializes Ocaml package management.
+# Initializes OCaml package management.
 #
 # Authors:
 #   Sebastian Wiesner <lunaryorn@gmail.com>
 #
 
 # Return if requirements are not found.
-if (( ! $+commands[opam] )); then
+if [[ ! -f "$HOME/.opam/opam-init/init.zsh" ]]; then
   return 1
 fi
 
 # Initialize OPAM.
-eval "$(opam config env)"
-
+source "$HOME/.opam/opam-init/init.zsh"

modules/osx/functions/_manb_mand_manp

@@ -9,4 +9,3 @@
 #
 
 _man
-

modules/osx/functions/mand

@@ -18,4 +18,3 @@ function mand {
 }
 
 mand "$@"
-

modules/osx/functions/manp

@@ -17,4 +17,3 @@ function manp {
 }
 
 manp "$@"
-

modules/osx/functions/tab

@@ -39,4 +39,3 @@ EOF
     end tell
 EOF
 }
-

modules/pacman/README.md

@@ -63,4 +63,3 @@ Authors
 [1]: http://www.archlinux.org/pacman/
 [2]: http://archlinux.fr/yaourt-en
 [3]: https://github.com/sorin-ionescu/prezto/issues
-

modules/pacman/functions/pacman-list-disowned

@@ -20,4 +20,3 @@ find /bin /etc /lib /sbin /usr \
     \( -type d -printf '%p/\n' -o -print \) | sort > "$fs"
 
 comm -23 "$fs" "$db"
-

modules/pacman/functions/pacman-list-explicit

@@ -18,4 +18,3 @@ pacman --query --explicit --info \
         print $2
       }
     '
-

modules/pacman/init.zsh

@@ -72,7 +72,7 @@ alias pacman-remove-orphans="${_pacman_sudo}${_pacman_frontend} --remove --recur
 # Synchronizes the local package and Arch Build System databases against the
 # repositories.
 if (( $+commands[abs] )); then
-  alias pacu="${_pacman_sudo}${_pacman_frontend} --sync --refresh && ${_pacman_sudo}abs"
+  alias pacu="${_pacman_sudo}${_pacman_frontend} --sync --refresh && sudo abs"
 else
   alias pacu="${_pacman_sudo}${_pacman_frontend} --sync --refresh"
 fi
@@ -82,4 +82,3 @@ fi
 alias pacU="${_pacman_sudo}${_pacman_frontend} --sync --refresh --sysupgrade"
 
 unset _pacman_{frontend,sudo}
-

modules/pacman/yaourt.zsh

@@ -16,4 +16,3 @@ fi
 
 # Manages .pac* files.
 alias pacc='yaourt -C'
-

modules/perl/README.md

@@ -1,7 +1,7 @@
 Perl
 ====
 
-Enables local [Perl][1] module installation on Mac OS X and defines alises.
+Enables local [Perl][1] module installation on Mac OS X and defines aliases.
 
 Local Module Installation
 -------------------------
@@ -61,4 +61,3 @@ Authors
 [1]: http://www.perl.org
 [2]: http://perlbrew.pl
 [3]: https://github.com/sorin-ionescu/prezto/issues
-

modules/perl/init.zsh

@@ -50,4 +50,3 @@ alias plbO='perlbrew switch-off'
 alias plbs='perlbrew switch'
 alias plbu='perlbrew use'
 alias plbx='perlbrew uninstall'
-

modules/prompt/README.md

@@ -109,4 +109,3 @@ Authors
 [1]: http://zsh.sourceforge.net/Doc/Release/User-Contributions.html#Prompt-Themes
 [2]: http://zsh.sourceforge.net/Doc/Release/Functions.html#Hook-Functions
 [3]: https://github.com/sorin-ionescu/prezto/issues
-

modules/prompt/functions/prompt_minimal_setup

@@ -48,4 +48,3 @@ function prompt_minimal_setup {
 }
 
 prompt_minimal_setup "$@"
-

modules/prompt/functions/prompt_nicoulaj_setup

@@ -58,4 +58,3 @@ function prompt_nicoulaj_setup {
 }
 
 prompt_nicoulaj_setup "$@"
-

modules/prompt/functions/prompt_peepcode_setup

@@ -85,4 +85,3 @@ function prompt_peepcode_preview {
 }
 
 prompt_peepcode_setup "$@"
-

modules/prompt/functions/prompt_sorin_setup

@@ -18,7 +18,7 @@ function prompt_sorin_pwd {
     _prompt_sorin_pwd="$MATCH"
     unset MATCH
   else
-    _prompt_sorin_pwd="${${${(@j:/:M)${(@s:/:)pwd}##.#?}:h}%/}/${pwd:t}"
+    _prompt_sorin_pwd="${${${${(@j:/:M)${(@s:/:)pwd}##.#?}:h}%/}//\%/%%}/${${pwd:t}//\%/%%}"
   fi
 }
 
@@ -78,4 +78,3 @@ function prompt_sorin_setup {
 }
 
 prompt_sorin_setup "$@"
-

modules/prompt/functions/prompt_steeef_setup

@@ -92,4 +92,3 @@ ${_prompt_steeef_colors[3]}%n%f at ${_prompt_steeef_colors[2]}%m%f in ${_prompt_
 }
 
 prompt_steeef_setup "$@"
-

modules/prompt/init.zsh

@@ -16,4 +16,3 @@ else
   prompt 'off'
 fi
 unset prompt_argv
-

modules/python/README.md

@@ -97,4 +97,3 @@ Authors
 [3]: http://pypi.python.org/pypi/virtualenv
 [4]: https://github.com/yyuu/pyenv
 [5]: https://github.com/sorin-ionescu/prezto/issues
-

modules/python/functions/python-info

@@ -19,4 +19,3 @@ if [[ -n "$VIRTUAL_ENV" ]]; then
   zformat -f virtualenv_formatted "$virtualenv_format" "v:${VIRTUAL_ENV:t}"
   python_info[virtualenv]="$virtualenv_formatted"
 fi
-

modules/python/init.zsh

@@ -16,9 +16,12 @@ elif (( $+commands[pyenv] )); then
   eval "$(pyenv init -)"
 
 # Prepend PEP 370 per user site packages directory, which defaults to
-# ~/Library/Python on Mac OS X and ~/.local elsewhere, to PATH.
+# ~/Library/Python on Mac OS X and ~/.local elsewhere, to PATH. The
+# path can be overridden using PYTHONUSERBASE.
 else
-  if [[ "$OSTYPE" == darwin* ]]; then
+  if [[ -n "$PYTHONUSERBASE" ]]; then
+    path=($PYTHONUSERBASE/bin $path)
+  elif [[ "$OSTYPE" == darwin* ]]; then
     path=($HOME/Library/Python/*/bin(N) $path)
   else
     # This is subject to change.
@@ -32,14 +35,14 @@ if (( ! $+commands[python] && ! $+commands[pyenv] )); then
 fi
 
 # Load virtualenvwrapper into the shell session.
-if (( $+commands[virtualenvwrapper_lazy.sh] )); then
+if (( $+commands[virtualenvwrapper.sh] )); then
   # Set the directory where virtual environments are stored.
   export WORKON_HOME="$HOME/.virtualenvs"
 
   # Disable the virtualenv prompt.
   VIRTUAL_ENV_DISABLE_PROMPT=1
 
-  source "$commands[virtualenvwrapper_lazy.sh]"
+  source "$commands[virtualenvwrapper.sh]"
 fi
 
 #
@@ -47,4 +50,3 @@ fi
 #
 
 alias py='python'
-

modules/rails/README.md

@@ -32,4 +32,3 @@ Authors
 
 [1]: http://rubyonrails.org
 [2]: https://github.com/sorin-ionescu/prezto/issues
-

modules/rails/init.zsh

@@ -33,4 +33,3 @@ alias rorr='bundle exec rails runner'
 alias rors='bundle exec rails server'
 alias rorsd='bundle exec rails server --debugger'
 alias rorx='bundle exec rails destroy'
-

modules/rsync/README.md

@@ -25,4 +25,3 @@ Authors
 [1]: http://rsync.samba.org
 [2]: http://help.bombich.com/kb/overview/credits#opensource
 [3]: https://github.com/sorin-ionescu/prezto/issues
-

modules/rsync/init.zsh

@@ -16,10 +16,14 @@ fi
 
 _rsync_cmd='rsync --verbose --progress --human-readable --compress --archive --hard-links --one-file-system'
 
+if grep -q 'xattrs' <(rsync --help 2>&1); then
+  _rsync_cmd="${_rsync_cmd} --acls --xattrs"
+fi
+
 # Mac OS X and HFS+ Enhancements
 # http://help.bombich.com/kb/overview/credits#opensource
 if [[ "$OSTYPE" == darwin* ]] && grep -q 'file-flags' <(rsync --help 2>&1); then
-  _rsync_cmd="${_rsync_cmd} --crtimes --acls --xattrs --fileflags --protect-decmpfs --force-change"
+  _rsync_cmd="${_rsync_cmd} --crtimes --fileflags --protect-decmpfs --force-change"
 fi
 
 alias rsync-copy="${_rsync_cmd}"
@@ -28,4 +32,3 @@ alias rsync-update="${_rsync_cmd} --update"
 alias rsync-synchronize="${_rsync_cmd} --update --delete"
 
 unset _rsync_cmd
-

modules/ruby/functions/ruby-app-root

@@ -16,4 +16,3 @@ while [[ "$root_dir" != '/' ]]; do
 done
 
 return 1
-

modules/ruby/functions/ruby-info

@@ -28,4 +28,3 @@ if [[ -n "$version" ]]; then
   zformat -f version_formatted "$version_format" "v:$version"
   ruby_info[version]="$version_formatted"
 fi
-

modules/ruby/init.zsh

@@ -63,4 +63,3 @@ if (( $+commands[bundle] )); then
     && print vendor/bundle >>! .gitignore \
     && print vendor/cache  >>! .gitignore'
 fi
-

modules/screen/README.md

@@ -38,4 +38,3 @@ Authors
 
 [1]: http://www.gnu.org/software/screen/
 [2]: https://github.com/sorin-ionescu/prezto/issues
-