abra zsh config 2.0

.zprezto/modules/node/README.md

@@ -10,6 +10,13 @@ nvm
 [nvm][5] allows for managing multiple, isolated Node.js installations in the
 home directory.
 
+nodenv
+------
+
+[nodenv][6] does one thing well. nodenv is concerned solely with switching
+Node versions. It's simple and predictable, Just Works, and is rock solid in
+production. nodenv is forked from the popular [rbenv][7].
+
 Functions
 ---------
 
@@ -24,8 +31,10 @@ Theming
 To display the version number of the current Node.js version, define the
 following style inside the `prompt_name_setup` function.
 
-    # %v - Node.js version.
-    zstyle ':prezto:module:node:info:version' format 'version:%v'
+```sh
+# %v - Node.js version.
+zstyle ':prezto:module:node:info:version' format 'version:%v'
+```
 
 Then add `$node_info[version]` to either `$PROMPT` or `$RPROMPT` and call
 `node-info` in `prompt_name_preexec` hook function.
@@ -43,3 +52,5 @@ Authors
 [3]: http://nodejs.org/api
 [4]: https://github.com/sorin-ionescu/prezto/issues
 [5]: https://github.com/creationix/nvm
+[6]: https://github.com/nodenv/nodenv
+[7]: https://github.com/sstephenson/rbenv

.zprezto/modules/node/functions/node-doc

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

.zprezto/modules/node/functions/node-info

@@ -6,6 +6,8 @@
 #   Zeh Rizzatti <zehrizzatti@gmail.com>
 #
 
+# function node-info {
+
 local version
 local version_format
 local version_formatted
@@ -15,6 +17,10 @@ typeset -gA node_info
 
 if (( $+functions[nvm_version] )); then
   version="${$(nvm_version)#v}"
+elif (( $+commands[nodenv] )); then
+  version="${${$(nodenv version)#v}[(w)0]}"
+elif (( $+commands[node] )) ; then
+  version="${$(node -v)#v}"  
 fi
 
 if [[ "$version" != (none|) ]]; then
@@ -22,3 +28,5 @@ if [[ "$version" != (none|) ]]; then
   zformat -f version_formatted "$version_format" "v:$version"
   node_info[version]="$version_formatted"
 fi
+
+# }

.zprezto/modules/node/init.zsh

@@ -11,8 +11,17 @@ 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
+elif (( $+commands[brew] )) && [[ -d "$(brew --prefix nvm 2> /dev/null)" ]]; then
+  source "$(brew --prefix nvm)/nvm.sh"
+
+# Load manually installed nodenv into the shell session.
+elif [[ -s "$HOME/.nodenv/bin/nodenv" ]]; then
+  path=("$HOME/.nodenv/bin" $path)
+  eval "$(nodenv init - --no-rehash zsh)"
+
+# Load package manager installed nodenv into the shell session.
+elif (( $+commands[nodenv] )); then
+  eval "$(nodenv init - --no-rehash zsh)"
 
 # Return if requirements are not found.
 elif (( ! $+commands[node] )); then
@@ -21,9 +30,11 @@ fi
 
 # Load NPM completion.
 if (( $+commands[npm] )); then
-  cache_file="${0:h}/cache.zsh"
+  cache_file="${TMPDIR:-/tmp}/prezto-node-cache.$UID.zsh"
 
-  if [[ "$commands[npm]" -nt "$cache_file" || ! -s "$cache_file" ]]; then
+  if [[ "$commands[npm]" -nt "$cache_file" \
+        || "${ZDOTDIR:-$HOME}/.zpreztorc" -nt "$cache_file" \
+        || ! -s "$cache_file" ]]; then
     # npm is slow; cache its output.
     npm completion >! "$cache_file" 2> /dev/null
   fi