v0.12.0

install.sh: make sure to not error out if master branch does not exist

Makefile

@@ -20,7 +20,7 @@ endif
 
 release: verify-tag
 	@ OLD_TAG=`git describe --abbrev=0 --tags` && \
-		replace "$${OLD_TAG/v/}" "$(TAG)" -- nvm.sh install.sh README.markdown && \
+		replace "$${OLD_TAG/v/}" "$(TAG)" -- nvm.sh install.sh README.markdown package.json && \
 		git commit -m "v$(TAG)" nvm.sh install.sh README.markdown package.json && \
 		git tag "v$(TAG)"
 

README.markdown

@@ -8,11 +8,11 @@ First you'll need to make sure your system has a c++ compiler.  For OSX, XCode w
 
 To install you could use the [install script][2] using cURL:
 
-    curl https://raw.githubusercontent.com/creationix/nvm/v0.11.1/install.sh | bash
+    curl https://raw.githubusercontent.com/creationix/nvm/v0.12.0/install.sh | bash
 
 or Wget:
 
-    wget -qO- https://raw.githubusercontent.com/creationix/nvm/v0.11.1/install.sh | bash
+    wget -qO- https://raw.githubusercontent.com/creationix/nvm/v0.12.0/install.sh | bash
 
 <sub>The script clones the nvm repository to `~/.nvm` and adds the source line to your profile (`~/.bash_profile`, `~/.zshrc` or `~/.profile`).</sub>
 
@@ -163,7 +163,7 @@ After the v0.8.6 release of node, nvm tries to install from binary packages. But
     nvm install -s 0.8.6
 
 [1]: https://github.com/creationix/nvm.git
-[2]: https://github.com/creationix/nvm/blob/v0.11.1/install.sh
+[2]: https://github.com/creationix/nvm/blob/v0.12.0/install.sh
 [3]: https://travis-ci.org/creationix/nvm
 [Urchin]: https://github.com/scraperwiki/urchin
 

install.sh

@@ -16,13 +16,12 @@ nvm_download() {
     curl $*
   elif nvm_has "wget"; then
     # Emulate curl with wget
-    ARGS="$*"
-    ARGS=${ARGS/--progress-bar /--progress=bar }
-    ARGS=${ARGS/-L /}
-    ARGS=${ARGS/-I /}
-    ARGS=${ARGS/-s /-q }
-    ARGS=${ARGS/-o /-O }
-    ARGS=${ARGS/-C - /-c }
+    ARGS=$(echo "$*" | sed -e 's/--progress-bar /--progress=bar /' \
+                           -e 's/-L //' \
+                           -e 's/-I //' \
+                           -e 's/-s /-q /' \
+                           -e 's/-o /-O /' \
+                           -e 's/-C - /-c /')
     wget $ARGS
   fi
 }
@@ -45,12 +44,12 @@ install_nvm_from_git() {
     mkdir -p "$NVM_DIR"
     git clone "$NVM_SOURCE" "$NVM_DIR"
   fi
-  cd $NVM_DIR && git checkout v0.11.1 && git branch -D master
+  cd $NVM_DIR && git checkout v0.12.0 && git branch -D master || true
 }
 
 install_nvm_as_script() {
   if [ -z "$NVM_SOURCE" ]; then
-    NVM_SOURCE="https://raw.githubusercontent.com/creationix/nvm/v0.11.1/nvm.sh"
+    NVM_SOURCE="https://raw.githubusercontent.com/creationix/nvm/v0.12.0/nvm.sh"
   fi
 
   # Downloading to $NVM_DIR

nvm.sh

@@ -17,13 +17,12 @@ nvm_download() {
     curl $*
   elif nvm_has "wget"; then
     # Emulate curl with wget
-    ARGS="$*"
-    ARGS=${ARGS/--progress-bar /--progress=bar }
-    ARGS=${ARGS/-L /}
-    ARGS=${ARGS/-I /}
-    ARGS=${ARGS/-s /-q }
-    ARGS=${ARGS/-o /-O }
-    ARGS=${ARGS/-C - /-c }
+    ARGS=$(echo "$*" | sed -e 's/--progress-bar /--progress=bar /' \
+                           -e 's/-L //' \
+                           -e 's/-I //' \
+                           -e 's/-s /-q /' \
+                           -e 's/-o /-O /' \
+                           -e 's/-C - /-c /')
     wget $ARGS
   fi
 }
@@ -54,6 +53,19 @@ if [ -z "$NVM_NODEJS_ORG_MIRROR" ]; then
   export NVM_NODEJS_ORG_MIRROR="http://nodejs.org/dist"
 fi
 
+nvm_tree_contains_path() {
+  local tree
+  tree="$1"
+  local path
+  path="$2"
+  local pathdir
+  pathdir=$(dirname "$path")
+  while [ "$pathdir" != "" ] && [ "$pathdir" != "." ] && [ "$pathdir" != "/" ] && [ "$pathdir" != "$tree" ]; do
+    pathdir=$(dirname "$pathdir")
+  done
+  [ "$pathdir" = "$tree" ]
+}
+
 # Traverse up in directory tree to find containing folder
 nvm_find_up() {
   local path
@@ -93,6 +105,11 @@ nvm_version() {
     PATTERN='current'
   fi
 
+  if [ "$PATTERN" = "current" ]; then
+    nvm_ls_current
+    return $?
+  fi
+
   VERSION=`nvm_ls $PATTERN | tail -n1`
   echo "$VERSION"
 
@@ -143,7 +160,15 @@ nvm_binary_available() {
 }
 
 nvm_ls_current() {
-  echo `node -v 2>/dev/null`
+  local NODE_PATH
+  NODE_PATH="$(which node)"
+  if [ $? -ne 0 ]; then
+    echo 'none'
+  elif nvm_tree_contains_path "$NVM_DIR" "$NODE_PATH"; then
+    echo `node -v 2>/dev/null`
+  else
+    echo 'system'
+  fi
 }
 
 nvm_ls() {
@@ -177,6 +202,9 @@ nvm_ls() {
     echo "N/A"
     return 3
   fi
+  if [ -z "$PATTERN" ] && nvm_has_system_node; then
+    VERSIONS="$VERSIONS$(printf '\n%s' 'system')"
+  fi
   echo "$VERSIONS"
   return
 }
@@ -234,6 +262,8 @@ nvm_print_versions() {
       FORMAT='\033[0;32m-> %9s\033[0m'
     elif [ -d "$NVM_DIR/$VERSION" ]; then
       FORMAT='\033[0;34m%12s\033[0m'
+    elif [ "$VERSION" = "system" ]; then
+      FORMAT='\033[0;33m%12s\033[0m'
     else
       FORMAT='%12s'
     fi
@@ -318,7 +348,7 @@ nvm() {
       version_not_provided=0
       local provided_version
 
-      if ! nvm_has "nvm_download"; then
+      if ! nvm_has "curl" && ! nvm_has "wget"; then
         echo 'nvm needs curl or wget to proceed.' >&2;
         return 1
       fi
@@ -520,7 +550,17 @@ nvm() {
           VERSION=`nvm_version $NVM_RC_VERSION`
         fi
       else
-        VERSION=`nvm_version $2`
+        if [ $2 = 'system' ]; then
+          if nvm_has_system_node && nvm deactivate; then
+            echo "Now using system version of node: $(node -v 2>/dev/null)."
+            return
+          else
+            echo "System version of node not found." >&2
+            return 127
+          fi
+        else
+          VERSION=`nvm_version $2`
+        fi
       fi
       if [ -z "$VERSION" ]; then
         nvm help
@@ -683,7 +723,7 @@ nvm() {
       nvm_version $2
     ;;
     "--version" )
-      echo "0.11.1"
+      echo "0.12.0"
     ;;
     "unload" )
       unset -f nvm nvm_print_versions nvm_checksum nvm_ls_remote nvm_ls nvm_remote_version nvm_version nvm_rc_version > /dev/null 2>&1

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nvm",
-  "version": "0.11.1",
+  "version": "0.12.0",
   "description": "Node Version Manager - Simple bash script to manage multiple active node.js versions",
   "directories": {
     "test": "test"

test/fast/Listing versions/Running "nvm ls" should include "system" when appropriate

@@ -0,0 +1,21 @@
+#!/bin/sh
+
+die () { echo $@ ; exit 1; }
+
+. ../../../nvm.sh
+
+mkdir -p ../../../v0.0.1
+mkdir -p ../../../v0.0.3
+mkdir -p ../../../v0.0.9
+mkdir -p ../../../v0.3.1
+mkdir -p ../../../v0.3.3
+mkdir -p ../../../v0.3.9
+
+nvm_has_system_node() { return 0; }
+nvm ls | grep system 2>&1 > /dev/null
+[ $? -eq 0 ] || die '"nvm ls" did not contain "system" when system node is present'
+
+nvm_has_system_node() { return 1; }
+nvm ls | grep system 2>&1 > /dev/null
+[ $? -ne 0 ] || die '"nvm ls" contained "system" when system node is not present'
+

test/fast/Running "nvm current" should display current nvm environment.

@@ -3,4 +3,8 @@
 die () { echo $@ ; exit 1; }
 
 . ../../nvm.sh
-[ "$(nvm current)" = "$(node -v)" ] || die "Failed to find current version"
+
+nvm deactivate 2>&1
+
+[ "$(nvm current)" = "system" ] || [ "$(nvm current)" = "none" ] || die '"nvm current" did not report "system" or "none" when deactivated'
+

test/fast/Running "nvm use system" should work as expected

@@ -0,0 +1,13 @@
+#!/bin/sh
+
+die () { echo $@ ; exit 1; }
+
+. ../../nvm.sh
+
+nvm_has_system_node() { return 0; }
+[ "$(nvm use system 2>&1 | tail -n1)" = "Now using system version of node: $(node -v)." ] || die "Could not use system version of node"
+
+nvm_has_system_node() { return 1; }
+[ "$(nvm use system 2>&1 | tail -n1)" = "System version of node not found." ] || die "Did not report error, system node not found"
+nvm use system 2>&1 > /dev/null || [ $? -eq 127 ] || die "Did not return error code, system node not found"
+

test/fast/Unit tests/nvm_tree_contains_path

@@ -0,0 +1,27 @@
+#!/bin/sh
+
+cleanup () {
+  rm tmp/node
+  rmdir tmp
+  rm tmp2/node
+  rmdir tmp2
+}
+die () { echo $@ ; cleanup; exit 1; }
+
+. ../../../nvm.sh
+
+mkdir -p tmp
+touch -p tmp/node
+mkdir -p tmp2
+touch -p tmp2/node
+
+nvm_tree_contains_path tmp tmp/node || die '"tmp" should contain "tmp/node"'
+
+nvm_tree_contains_path tmp tmp2/node && die '"tmp" should not contain "tmp2/node"'
+
+nvm_tree_contains_path tmp2 tmp2/node || die '"tmp2" should contain "tmp2/node"'
+
+nvm_tree_contains_path tmp2 tmp/node && die '"tmp2" should not contain "tmp/node"'
+
+cleanup
+

test/slow/Running "nvm current" should display current nvm environment.

@@ -0,0 +1,10 @@
+#!/bin/sh
+
+die () { echo $@ ; exit 1; }
+
+. ../../nvm.sh
+
+nvm install 0.10
+
+[ "$(nvm current)" = "$(node -v)" ] || die "Failed to find current version: got \"$(nvm current)\", expected \"$(node -v)\""
+