`nvm alias`: factor out alias printing logic to functions

nvm.sh

@@ -389,6 +389,50 @@ nvm_binary_available() {
   nvm_version_greater_than_or_equal_to "$(nvm_strip_iojs_prefix "$1")" "$FIRST_VERSION_WITH_BINARY"
 }
 
+nvm_print_alias_path() {
+  local NVM_ALIAS_DIR
+  NVM_ALIAS_DIR="${1-}"
+  if [ -z "$NVM_ALIAS_DIR" ]; then
+    >&2 echo 'An alias dir is required.'
+    return 1
+  fi
+  local ALIAS_PATH
+  ALIAS_PATH="${2-}"
+  if [ -z "$ALIAS_PATH" ]; then
+    >&2 echo 'An alias path is required.'
+    return 2
+  fi
+  local ALIAS
+  ALIAS="${ALIAS_PATH##$NVM_ALIAS_DIR\/}"
+  local DEST
+  DEST="$(nvm_alias "$ALIAS" 2> /dev/null)"
+  if [ -n "$DEST" ]; then
+    local VERSION
+    VERSION="$(nvm_version "$DEST")"
+    if [ "_$DEST" = "_$VERSION" ]; then
+      echo "$ALIAS -> $DEST"
+    else
+      echo "$ALIAS -> $DEST (-> $VERSION)"
+    fi
+  fi
+}
+
+nvm_print_default_alias() {
+  local ALIAS
+  ALIAS="${1-}"
+  local DEST
+  DEST="$(nvm_print_implicit_alias local "$ALIAS")"
+  if [ "_$DEST" != '_' ]; then
+    local VERSION
+    VERSION="$(nvm_version "$DEST")"
+    if [ "_$DEST" = "_$VERSION" ]; then
+      echo "$ALIAS -> $DEST (default)"
+    else
+      echo "$ALIAS -> $DEST (-> $VERSION) (default)"
+    fi
+  fi
+}
+
 nvm_alias() {
   local ALIAS
   ALIAS="${1-}"
@@ -1561,7 +1605,6 @@ nvm() {
   # initialize local variables
   local VERSION
   local ADDITIONAL_PARAMETERS
-  local ALIAS
 
   case $1 in
     "help" )
@@ -2258,35 +2301,15 @@ $NVM_LS_REMOTE_POST_MERGED_OUTPUT" | command grep -v "N/A" | command sed '/^$/d'
       NVM_ALIAS_DIR="$(nvm_alias_path)"
       command mkdir -p "$NVM_ALIAS_DIR"
       if [ $# -le 2 ]; then
-        local DEST
-        local ALIAS
         local ALIAS_PATH
         for ALIAS_PATH in "$NVM_ALIAS_DIR/${2-}"*; do
-          ALIAS="${ALIAS_PATH/$NVM_ALIAS_DIR\//}"
+          nvm_print_alias_path "$NVM_ALIAS_DIR" "$ALIAS_PATH"
-          DEST="$(nvm_alias "$ALIAS" 2> /dev/null)"
-          if [ -n "$DEST" ]; then
-            VERSION="$(nvm_version "$DEST")"
-            if [ "_$DEST" = "_$VERSION" ]; then
-              echo "$ALIAS -> $DEST"
-            else
-              echo "$ALIAS -> $DEST (-> $VERSION)"
-            fi
-          fi
         done
 
+        local ALIAS
         for ALIAS in "$(nvm_node_prefix)" "stable" "unstable" "$(nvm_iojs_prefix)"; do
-          if [ ! -f "$NVM_ALIAS_DIR/$ALIAS" ]; then
+          if [ ! -f "$NVM_ALIAS_DIR/$ALIAS" ] && ([ $# -lt 2 ] || [ "~$ALIAS" = "~${2-}" ]); then
-            if [ $# -lt 2 ] || [ "~$ALIAS" = "~$2" ]; then
+            nvm_print_default_alias "$ALIAS"
-              DEST="$(nvm_print_implicit_alias local "$ALIAS")"
-              if [ "_$DEST" != "_" ]; then
-                VERSION="$(nvm_version "$DEST")"
-                if [ "_$DEST" = "_$VERSION" ]; then
-                  echo "$ALIAS -> $DEST (default)"
-                else
-                  echo "$ALIAS -> $DEST (-> $VERSION) (default)"
-                fi
-              fi
-            fi
           fi
         done
         return

test/fast/Unit tests/nvm_print_alias_path

@@ -0,0 +1,43 @@
+#!/bin/sh
+
+die () { echo $@ ; cleanup ; exit 1; }
+
+cleanup () {
+  unset -f nvm_alias nvm_version
+}
+
+. ../../../nvm.sh
+
+NVM_ALIAS_DIR='path/to/the alias/dir'
+
+OUTPUT="$(nvm_print_alias_path 2>&1)"
+EXPECTED_OUTPUT='An alias dir is required.'
+[ "$OUTPUT" = "$EXPECTED_OUTPUT" ] || die "'nvm_print_alias_path' produced wrong output; got '$OUTPUT', expected '$EXPECTED_OUTPUT'"
+
+OUTPUT="$(nvm_print_alias_path "$NVM_ALIAS_DIR" 2>&1)"
+EXPECTED_OUTPUT='An alias path is required.'
+[ "$OUTPUT" = "$EXPECTED_OUTPUT" ] || die "'nvm_print_alias_path \"\$NVM_ALIAS_DIR\"' produced wrong output; got '$OUTPUT', expected '$EXPECTED_OUTPUT'"
+
+nvm_alias() {
+  echo ''
+}
+
+OUTPUT="$(nvm_print_alias_path "$NVM_ALIAS_DIR" foo)"
+EXPECTED_OUTPUT=''
+[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "'nvm_print_alias_path \"\$NVM_ALIAS_DIR\" foo' should produce no output when nvm_alias does not; got '$OUTPUT'"
+
+EXIT_CODE="$(nvm_print_alias_path "$NVM_ALIAS_DIR" foo >/dev/null 2>&1 ; echo $?)"
+[ "$EXIT_CODE" = '0' ] || die "'nvm_print_alias_path \"\$NVM_ALIAS_DIR\" foo' should exit zero when nvm_alias produces no output; got $EXIT_CODE"
+
+nvm_alias() {
+  echo "\"$1\""
+}
+nvm_version() {
+  echo "v$1"
+}
+
+OUTPUT="$(nvm_print_alias_path "$NVM_ALIAS_DIR" "$NVM_ALIAS_DIR/blah")"
+EXPECTED_OUTPUT='blah -> "blah" (-> v"blah")'
+[ "$OUTPUT" = "$EXPECTED_OUTPUT" ] || die "'nvm_print_alias_path \"\$NVM_ALIAS_DIR\" \"\$NVM_ALIAS_DIR/blah\"' should strip alias dir and print nvm_alias output; got '$OUTPUT', expected '$EXPECTED_OUTPUT'"
+
+cleanup

test/fast/Unit tests/nvm_print_default_alias

@@ -0,0 +1,33 @@
+#!/bin/sh
+
+die () { echo $@ ; cleanup ; exit 1; }
+
+cleanup () {
+  unset -f nvm_print_implicit_alias nvm_version
+}
+
+. ../../../nvm.sh
+
+nvm_print_implicit_alias() {
+  echo ''
+}
+
+OUTPUT="$(nvm_print_default_alias foo)"
+EXPECTED_OUTPUT=''
+[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "'nvm_print_default_alias foo' should produce no output when nvm_print_implicit_alias does not; got '$OUTPUT'"
+
+EXIT_CODE="$(nvm_print_default_alias foo >/dev/null 2>&1 ; echo $?)"
+[ "$EXIT_CODE" = '0' ] || die "'nvm_print_default_alias foo' should exit zero when nvm_print_implicit_alias produces no output; got $EXIT_CODE"
+
+nvm_print_implicit_alias() {
+  echo "\"$1-$2\""
+}
+nvm_version() {
+  echo "v$1"
+}
+
+OUTPUT="$(nvm_print_default_alias blah)"
+EXPECTED_OUTPUT='blah -> "local-blah" (-> v"local-blah") (default)'
+[ "$OUTPUT" = "$EXPECTED_OUTPUT" ] || die "'nvm_print_default_alias blah' should strip alias dir and print nvm_print_implicit_alias output; got '$OUTPUT', expected '$EXPECTED_OUTPUT'"
+
+cleanup