v0.22.0

Support `--install` option on sourcing `nvm.sh`

README.markdown

@@ -12,11 +12,11 @@ Note: `nvm` does not support Windows (see [#284](https://github.com/creationix/n
 
 To install you could use the [install script][2] using cURL:
 
-    curl https://raw.githubusercontent.com/creationix/nvm/v0.21.0/install.sh | bash
+    curl https://raw.githubusercontent.com/creationix/nvm/v0.22.0/install.sh | bash
 
 or Wget:
 
-    wget -qO- https://raw.githubusercontent.com/creationix/nvm/v0.21.0/install.sh | bash
+    wget -qO- https://raw.githubusercontent.com/creationix/nvm/v0.22.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>
 
@@ -191,7 +191,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.21.0/install.sh
+[2]: https://github.com/creationix/nvm/blob/v0.22.0/install.sh
 [3]: https://travis-ci.org/creationix/nvm
 [Urchin]: https://github.com/scraperwiki/urchin
 

install.sh

@@ -27,9 +27,9 @@ nvm_source() {
     return 0
   fi
   if [ "_$NVM_METHOD" = "_script" ]; then
-    NVM_SOURCE="https://raw.githubusercontent.com/creationix/nvm/v0.21.0/nvm.sh"
+    NVM_SOURCE="https://raw.githubusercontent.com/creationix/nvm/v0.22.0/nvm.sh"
   elif [ "_$NVM_METHOD" = "_script-nvm-exec" ]; then
-    NVM_SOURCE="https://raw.githubusercontent.com/creationix/nvm/v0.21.0/nvm-exec"
+    NVM_SOURCE="https://raw.githubusercontent.com/creationix/nvm/v0.22.0/nvm-exec"
   elif [ "_$NVM_METHOD" = "_git" ] || [ -z "$NVM_METHOD" ]; then
     NVM_SOURCE="https://github.com/creationix/nvm.git"
   else
@@ -69,7 +69,7 @@ install_nvm_from_git() {
     mkdir -p "$NVM_DIR"
     git clone "$(nvm_source "git")" "$NVM_DIR"
   fi
-  cd "$NVM_DIR" && git checkout --quiet v0.21.0 && git branch --quiet -D master >/dev/null 2>&1
+  cd "$NVM_DIR" && git checkout --quiet v0.22.0 && git branch --quiet -D master >/dev/null 2>&1
   return
 }
 

nvm.sh

@@ -1099,10 +1099,10 @@ nvm() {
       nvm_version $2
     ;;
     "--version" )
-      echo "0.21.0"
+      echo "0.22.0"
     ;;
     "unload" )
-      unset -f nvm nvm_print_versions nvm_checksum nvm_ls_remote nvm_ls nvm_remote_version nvm_version nvm_rc_version nvm_version_greater nvm_version_greater_than_or_equal_to > /dev/null 2>&1
+      unset -f nvm nvm_print_versions nvm_checksum nvm_ls_remote nvm_ls nvm_remote_version nvm_version nvm_rc_version nvm_version_greater nvm_version_greater_than_or_equal_to nvm_supports_source_options > /dev/null 2>&1
       unset RC_VERSION NVM_NODEJS_ORG_MIRROR NVM_DIR NVM_CD_FLAGS > /dev/null 2>&1
     ;;
     * )
@@ -1111,7 +1111,18 @@ nvm() {
   esac
 }
 
-if nvm ls default >/dev/null; then
+nvm_supports_source_options() {
+  [ "_$(echo 'echo $1' | . /dev/stdin yes)" = "_yes" ]
+}
+
+if nvm_supports_source_options && [ "_$1" = "_--install" ]; then
+  VERSION="$(nvm_alias default 2>/dev/null)"
+  if [ -n "$VERSION" ]; then
+    nvm install "$VERSION" >/dev/null
+  elif nvm_rc_version >/dev/null 2>&1; then
+    nvm install >/dev/null
+  fi
+elif nvm ls default >/dev/null; then
   nvm use default >/dev/null
 elif nvm_rc_version >/dev/null 2>&1; then
   nvm use >/dev/null

package.json

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

test/installation/nvm_get_latest/nvm_get_latest

@@ -31,7 +31,7 @@ wget() {
 --2014-12-21 18:11:14--  http://latest.nvm.sh/
 Resolving latest.nvm.sh... 50.31.209.229
 Connecting to latest.nvm.sh|50.31.209.229|:80... connected.
-HTTP request sent, awaiting response... 
+HTTP request sent, awaiting response...
   HTTP/1.1 301 Moved Permanently
   Location: https://github.com/creationix/nvm/releases/latest
   Content-Type: text/html; charset=utf-8
@@ -41,7 +41,7 @@ Location: https://github.com/creationix/nvm/releases/latest [following]
 --2014-12-21 18:11:15--  https://github.com/creationix/nvm/releases/latest
 Resolving github.com... 192.30.252.130
 Connecting to github.com|192.30.252.130|:443... connected.
-HTTP request sent, awaiting response... 
+HTTP request sent, awaiting response...
   HTTP/1.1 302 Found
   Server: GitHub.com
   Date: Mon, 22 Dec 2014 02:11:15 GMT
@@ -68,7 +68,7 @@ HTTP request sent, awaiting response...
 Location: $URL [following]
 --2014-12-21 18:11:15--  $URL
 Reusing existing connection to github.com:443.
-HTTP request sent, awaiting response... 
+HTTP request sent, awaiting response...
   HTTP/1.1 200 OK
   Server: GitHub.com
   Date: Mon, 22 Dec 2014 02:11:15 GMT

test/sourcing/Sourcing nvm.sh with --install and .nvmrc should install it

@@ -0,0 +1,28 @@
+#!/bin/sh
+
+die () { echo $@ ; exit 1; }
+supports_source_options () {
+  [ "_$(echo 'echo $1' | . /dev/stdin yes)" = "_yes" ]
+}
+
+if ! supports_source_options; then
+  echo 'this shell does not support passing options on sourcing'
+  exit 0;
+fi
+
+echo '0.10.2' > ../../.nvmrc || die 'creation of .nvmrc failed'
+
+. ../../nvm.sh --install
+EXIT_CODE="$(echo $?)"
+
+echo 'sourcing complete.'
+
+nvm_version 0.10.2 >/dev/null 2>&1 || die "v0.10.2 not installed: $(nvm ls)"
+
+[ "_$(nvm_rc_version | \grep -o -e 'with version .*$')" = "_with version <0.10.2>" ] || die "nvm_rc_version $(nvm_rc_version)"
+
+[ "_$EXIT_CODE" = "_0" ] || die "sourcing returned nonzero exit code: $EXIT_CODE"
+
+NVM_LS_CURRENT="$(nvm ls current | \grep -o v0.10.2)"
+[ "_$NVM_LS_CURRENT" = '_v0.10.2' ] || die "'nvm ls current' did not return '-> v0.10.2', got '$NVM_LS_CURRENT' `nvm ls`"
+

test/sourcing/Sourcing nvm.sh with --install should install the default

@@ -0,0 +1,32 @@
+#!/bin/sh
+
+die () { echo $@ ; exit 1; }
+supports_source_options () {
+  [ "_$(echo 'echo $1' | . /dev/stdin yes)" = "_yes" ]
+}
+
+if ! supports_source_options; then
+  echo 'this shell does not support passing options on sourcing'
+  exit 0;
+fi
+
+echo '0.10.2' > ../../alias/default || die 'creation of default alias failed'
+
+echo 'sourcing nvm with --install...'
+
+. ../../nvm.sh --install
+EXIT_CODE="$(echo $?)"
+
+echo 'sourcing complete.'
+
+nvm_version 0.10.2 >/dev/null 2>&1 || die "v0.10.2 not installed: $(nvm ls)"
+
+[ "_$EXIT_CODE" = "_0" ] || die "sourcing returned nonzero exit code: $EXIT_CODE"
+
+NVM_LS_CURRENT="$(nvm ls current | \grep -o v0.10.2)"
+[ "_$NVM_LS_CURRENT" = '_v0.10.2' ] || die "'nvm ls current' did not return '-> v0.10.2', got '$NVM_LS_CURRENT'"
+
+NVM_ALIAS_DEFAULT="$(nvm alias default)"
+[ "_$NVM_ALIAS_DEFAULT" = "_default -> 0.10.2 (-> v0.10.2)" ] \
+  || die "'nvm alias default did not return 'default -> 0.10.2 (-> v0.10.2)', got '$NVM_ALIAS_DEFAULT'"
+