Merge 01a05672ad554b2ed1337580ce5bf2ef411c4ae3 into da2720a4292d02746a6b7fdc680c7e163c347355

Fixes #3417

nvm.sh

@@ -891,6 +891,10 @@ nvm_normalize_lts() {
       fi
     ;;
     *)
+      if [ "${LTS}" != "$(echo "${LTS}" | command tr '[:upper:]' '[:lower:]')" ]; then
+        nvm_err 'LTS names must be lowercase'
+        return 3
+      fi
       nvm_echo "${LTS}"
     ;;
   esac
@@ -1249,7 +1253,9 @@ nvm_alias() {
     nvm_err 'An alias is required.'
     return 1
   fi
-  ALIAS="$(nvm_normalize_lts "${ALIAS}")"
+  if ! ALIAS="$(nvm_normalize_lts "${ALIAS}")"; then
+    return $?
+  fi
 
   if [ -z "${ALIAS}" ]; then
     return 2
@@ -1652,7 +1658,9 @@ $VERSION_LIST
 EOF
 
   if [ -n "${LTS-}" ]; then
-    LTS="$(nvm_normalize_lts "lts/${LTS}")"
+    if ! LTS="$(nvm_normalize_lts "lts/${LTS}")"; then
+      return $?
+    fi
     LTS="${LTS#lts/}"
   fi
 
@@ -1846,12 +1854,15 @@ nvm_print_versions() {
   fi
 
   command awk \
-    -v remote_versions="$(printf '%s' "${1-}" | tr '\n' '|')" \
+    -v remote_versions="$(printf '%s' "${1-}" | tr '\n' '|')" -v min="${NVM_MIN:-v0}" \
     -v installed_versions="$(nvm_ls | tr '\n' '|')" -v current="$NVM_CURRENT" \
     -v installed_color="$INSTALLED_COLOR" -v system_color="$SYSTEM_COLOR" \
     -v current_color="$CURRENT_COLOR" -v default_color="$DEFAULT_COLOR" \
     -v old_lts_color="$DEFAULT_COLOR" -v has_colors="$NVM_HAS_COLORS" '
 function alen(arr, i, len) { len=0; for(i in arr) len++; return len; }
+function v2a(v, a) { sub(/^(iojs-)?v/, "", v); split(v, a, "."); }
+function v2m(v, a) { sub(/^(iojs-)?v/, "", v); split(v, a, "."); return a[1]; }
+function vcmp(v1,v2,a1,a2,i,d) { v2a(v1,a1); v2a(v2,a2); for(i=1;i<4;i++) { d = a1[i] - a2[i]; if(d!=0) return d; } return 0; }
 BEGIN {
   fmt_installed = has_colors ? (installed_color ? "\033[" installed_color "%15s\033[0m" : "%15s") : "%15s *";
   fmt_system = has_colors ? (system_color ? "\033[" system_color "%15s\033[0m" : "%15s") : "%15s *";
@@ -1866,13 +1877,13 @@ BEGIN {
   split(remote_versions, lines, "|");
   split(installed_versions, installed, "|");
   rows = alen(lines);
-
+  filter_on = (vcmp("v0.0.0", min) != 0);
-  for (n = 1; n <= rows; n++) {
+  current_major = -1;
+  for (m = n = 1; n <= rows; n++) {
     split(lines[n], fields, "[[:blank:]]+");
     cols = alen(fields);
     version = fields[1];
     is_installed = 0;
-
     for (i in installed) {
       if (version == installed[i]) {
         is_installed = 1;
@@ -1880,17 +1891,26 @@ BEGIN {
       }
     }
 
+    if (filter_on != 0) {
+      if (is_installed != 0) {
+        current_major = v2m(version);
+      } else if (vcmp(version, min) >= 0) {
+        filter_on = 0;
+      } else if (v2m(version) != current_major) {
+        continue;
+      }
+    }
+
     fmt_version = "%15s";
     if (version == current) {
       fmt_version = fmt_current;
     } else if (version == "system") {
       fmt_version = fmt_system;
-    } else if (is_installed) {
+    } else if (is_installed != 0) {
       fmt_version = fmt_installed;
     }
 
-    padding = (!has_colors && is_installed) ? "" : "  ";
+    padding = (is_installed && !has_colors) ? "" : "  ";
-
     if (cols == 1) {
       formatted = sprintf(fmt_version, version);
     } else if (cols == 2) {
@@ -1899,10 +1919,10 @@ BEGIN {
       formatted = sprintf((fmt_version padding fmt_latest_lts), version, fields[2]);
     }
 
-    output[n] = formatted;
+    output[m++] = formatted;
   }
 
-  for (n = 1; n <= rows; n++) {
+  for (n = 1; n < m; n++) {
     print output[n]
   }
 
@@ -3069,6 +3089,7 @@ nvm() {
         nvm_echo '  nvm ls-remote [<version>]                   List remote versions available for install, matching a given <version> if provided'
         nvm_echo '    --lts                                     When listing, only show LTS (long-term support) versions'
         nvm_echo '    --lts=<LTS name>                          When listing, only show versions for a specific LTS line'
+        nvm_echo '    --min=<version>                           When listing, only show versions greater than or equal to <version>, including minor/patch updates for installed versions'
         nvm_echo '    --no-colors                               Suppress colored output'
         nvm_echo '  nvm version <version>                       Resolve the given description to a single local version'
         nvm_echo '  nvm version-remote <version>                Resolve the given description to a single remote version'
@@ -3417,9 +3438,11 @@ nvm() {
         ;;
       esac
 
+      local EXIT_CODE
       VERSION="$(NVM_VERSION_ONLY=true NVM_LTS="${LTS-}" nvm_remote_version "${provided_version}")"
+      EXIT_CODE="$?"
 
-      if [ "${VERSION}" = 'N/A' ]; then
+      if [ "${VERSION}" = 'N/A' ] || [ $EXIT_CODE -ne 0 ]; then
         local LTS_MSG
         local REMOTE_CMD
         if [ "${LTS-}" = '*' ]; then
@@ -3428,6 +3451,10 @@ nvm() {
         elif [ -n "${LTS-}" ]; then
           LTS_MSG="(with LTS filter '${LTS}') "
           REMOTE_CMD="nvm ls-remote --lts=${LTS}"
+          if [ -z "${provided_version}" ]; then
+            nvm_err "Version with LTS filter '${LTS}' not found - try \`${REMOTE_CMD}\` to browse available versions."
+            return 3
+          fi
         else
           REMOTE_CMD='nvm ls-remote'
         fi
@@ -3492,7 +3519,6 @@ nvm() {
         FLAVOR="$(nvm_node_prefix)"
       fi
 
-      local EXIT_CODE
       EXIT_CODE=0
 
       if nvm_is_version_installed "${VERSION}"; then
@@ -4082,6 +4108,10 @@ nvm() {
       local NVM_LTS
       local PATTERN
       local NVM_NO_COLORS
+      local NVM_MIN_ENV
+      NVM_MIN_ENV="${NVM_MIN-}"
+      local NVM_MIN
+      NVM_MIN="${NVM_MIN_ENV-}"
 
       while [ $# -gt 0 ]; do
         case "${1-}" in
@@ -4092,6 +4122,9 @@ nvm() {
           --lts=*)
             NVM_LTS="${1##--lts=}"
           ;;
+          --min=*)
+            NVM_MIN="${1##--min=}"
+          ;;
           --no-colors) NVM_NO_COLORS="${1}" ;;
           --*)
             nvm_err "Unsupported option \"${1}\"."

test/fast/Unit tests/nvm install with nonlowercase LTS name

@@ -0,0 +1,35 @@
+#!/bin/sh
+
+die () { echo "$@" ; exit 1; }
+
+\. ../../../nvm.sh
+
+REMOTE="${PWD}/mocks/nvm_ls_remote.txt"
+REMOTE_IOJS="${PWD}/mocks/nvm_ls_remote_iojs.txt"
+
+nvm_download() {
+  if [ "$*" = "-L -s $(nvm_get_mirror node std)/index.tab -o -" ]; then
+    cat "${REMOTE}"
+  elif [ "$*" = "-L -s $(nvm_get_mirror iojs)/index.tab -o -" ]; then
+    cat "${REMOTE_IOJS}"
+  else
+    nvm_err "unknown nvm_download call: $*"
+    return 42
+  fi
+}
+
+nvm_install_binary() {
+  return 42
+}
+nvm_install_source() {
+  return 42
+}
+
+ACTUAL="$(nvm install lts/ARGON 2>&1)"
+EXIT_CODE=$?
+[ $EXIT_CODE -eq 3 ] || die "Expected exit code of 3, got ${EXIT_CODE}"
+
+EXPECTED="LTS names must be lowercase
+Version with LTS filter 'ARGON' not found - try \`nvm ls-remote --lts=ARGON\` to browse available versions."
+
+[ "${ACTUAL}" = "${EXPECTED}" ] || die "Expected >${EXPECTED}<, got >${ACTUAL}<"

test/fast/Unit tests/nvm ls-remote

@@ -1,7 +1,5 @@
 #!/bin/sh
 
-set -e
-
 die () { echo "$@" ; cleanup ; exit 1; }
 
 cleanup() {
@@ -56,6 +54,14 @@ printf '%s\n' "${LTS_LIST}" | while IFS= read -r LTS; do
   INDEX=$(($INDEX + 1))
 done
 
+OUTPUT="$(nvm ls-remote lts/ARGON 2>&1)"
+EXIT_CODE=$?
+[ $EXIT_CODE -eq 3 ] || die "nvm ls-remote lts/ARGON did not exit 3, got '${EXIT_CODE}'"
+
+EXPECTED_OUTPUT="LTS names must be lowercase
+            N/A"
+[ "_${OUTPUT}" = "_${EXPECTED_OUTPUT}" ] || die "nvm ls-remote lts/ARGON did not output expected error message; got >${OUTPUT}< expected >${EXPECTED_OUTPUT}<"
+
 REMOTE="${PWD}/mocks/nvm_ls_remote.txt"
 nvm_ls_remote() {
   cat "${REMOTE}"

test/fast/Unit tests/nvm_install_no_progress_bar

@@ -6,7 +6,7 @@ cleanup () {
   nvm cache clear
   nvm deactivate
   rm -rf ${NVM_DIR}/v*
-  nvm unalias default
+  nvm unalias default || true
 }
 
 die () { >&2 echo "$@" ; cleanup ; exit 1; }

test/fast/Unit tests/nvm_normalize_lts

@@ -16,6 +16,9 @@ ACTUAL="$(nvm_normalize_lts "lts/*")"
 EXPECTED='lts/*'
 [ "${ACTUAL}" = "${EXPECTED}" ] || die "expected >${EXPECTED}<, got >${ACTUAL}<"
 
+if ACTUAL="$(nvm_normalize_lts lts/ARGON)"; then
+  die "expected failure, got >${ACTUAL}<"
+fi
 
 MOCKS_DIR="../Unit tests/mocks"
 STAR="$(cat "$MOCKS_DIR/lts-star.txt")"

test/fast/Unit tests/nvm_print_versions

@@ -0,0 +1,146 @@
+#!/bin/sh
+
+# shellcheck disable=SC2317
+
+die () { echo "$@" ; cleanup ; exit 1; }
+
+cleanup() {
+  unset -f nvm_remote_versions nvm_ls nvm_ls_current
+  if [ -n "$TEMP_NVM_MIN" ]; then
+    export NVM_MIN="$TEMP_NVM_MIN"
+    unset TEMP_NVM_MIN
+  fi
+}
+
+\. ../../../nvm.sh
+
+
+if [ -n "$NVM_MIN" ]; then
+  TEMP_NVM_MIN="$NVM_MIN"
+  unset NVM_MIN
+fi
+
+# mock currently installed versions
+nvm_ls() {
+  echo "v16.20.2
+v18.20.3
+system"
+}
+
+# mock currently active version
+nvm_ls_current() {
+  echo "v18.20.3"
+}
+
+nvm_remote_versions() {
+  echo "v16.0.0
+v16.20.2 Gallium
+v16.20.3 Gallium *
+v17.0.0
+v17.9.1
+v18.0.0
+v18.1.0
+v18.20.2 Hydrogen
+v18.20.3 Hydrogen *
+v19.0.0
+v19.9.0
+v20.0.0
+v20.8.1
+v20.9.0 Iron *
+v21.0.0
+v21.1.0"
+}
+
+
+# nvm_print_versions should print all versions from nvm_remote_versions
+OUTPUT="$(NVM_NO_COLORS='--no-colors' nvm_print_versions "$(nvm_remote_versions)" | sed -r 's/^[ \t]+//')"
+EXPECTED_OUTPUT="v16.0.0
+v16.20.2 * (LTS: Gallium)
+v16.20.3   (Latest LTS: Gallium)
+v17.0.0
+v17.9.1
+v18.0.0
+v18.1.0
+v18.20.2   (LTS: Hydrogen)
+->     v18.20.3 * (Latest LTS: Hydrogen)
+v19.0.0
+v19.9.0
+v20.0.0
+v20.8.1
+v20.9.0   (Latest LTS: Iron)
+v21.0.0
+v21.1.0"
+
+[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "(1) nvm_print_versions did not output all expected versions; got $OUTPUT"
+
+
+# versions lower than 18 should be filtered out, but v16.20.2 should be kept since it's installed
+OUTPUT="$(NVM_NO_COLORS='--no-colors' NVM_MIN=v18 nvm_print_versions "$(nvm_remote_versions)" | sed -r 's/^[ \t]+//')"
+EXPECTED_OUTPUT="v16.20.2 * (LTS: Gallium)
+v16.20.3   (Latest LTS: Gallium)
+v18.0.0
+v18.1.0
+v18.20.2   (LTS: Hydrogen)
+->     v18.20.3 * (Latest LTS: Hydrogen)
+v19.0.0
+v19.9.0
+v20.0.0
+v20.8.1
+v20.9.0   (Latest LTS: Iron)
+v21.0.0
+v21.1.0"
+
+[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "(2) NVM_MIN=18 nvm_print_versions did not output all expected versions; got $OUTPUT"
+
+
+# versions lower than 19 should be filtered out
+OUTPUT="$(NVM_NO_COLORS='--no-colors' NVM_MIN=19 nvm_print_versions "$(nvm_remote_versions)" | sed -r 's/^[ \t]+//')"
+EXPECTED_OUTPUT="v16.20.2 * (LTS: Gallium)
+v16.20.3   (Latest LTS: Gallium)
+->     v18.20.3 * (Latest LTS: Hydrogen)
+v19.0.0
+v19.9.0
+v20.0.0
+v20.8.1
+v20.9.0   (Latest LTS: Iron)
+v21.0.0
+v21.1.0"
+
+[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "(3) NVM_MIN=19 nvm_print_versions did not output all expected versions; got $OUTPUT"
+
+
+# versions lower than 20.1 should be filtered out, so v20.0.0 is out
+OUTPUT="$(NVM_NO_COLORS='--no-colors' NVM_MIN=v20.1 nvm_print_versions "$(nvm_remote_versions)" | sed -r 's/^[ \t]+//')"
+EXPECTED_OUTPUT="v16.20.2 * (LTS: Gallium)
+v16.20.3   (Latest LTS: Gallium)
+->     v18.20.3 * (Latest LTS: Hydrogen)
+v20.8.1
+v20.9.0   (Latest LTS: Iron)
+v21.0.0
+v21.1.0"
+
+[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "(4) NVM_MIN=20.1 nvm_print_versions did not output all expected versions; got $OUTPUT"
+
+
+# assume v18.20.3 is NOT installed, so now it should be filtered out
+nvm_ls() {
+  echo "v16.20.2
+system"
+}
+
+nvm_ls_current() {
+  echo "v16.20.2"
+}
+
+OUTPUT="$(NVM_NO_COLORS='--no-colors' NVM_MIN=20.1 nvm_print_versions "$(nvm_remote_versions)" | sed -r 's/^[ \t]+//')"
+EXPECTED_OUTPUT="->     v16.20.2 * (LTS: Gallium)
+v16.20.3   (Latest LTS: Gallium)
+v20.8.1
+v20.9.0   (Latest LTS: Iron)
+v21.0.0
+v21.1.0"
+
+[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "(5) NVM_MIN=20.1 nvm_print_versions did not output all expected versions; got $OUTPUT"
+
+
+cleanup

test/installation_node/install LTS

@@ -9,20 +9,20 @@ die () { echo "$@" ; exit 1; }
 nvm unalias default >/dev/null 2>&1 || die 'unable to unalias default'
 
 set +ex # needed for stderr
-OUTPUT="$(nvm install --lts 3 2>&1)"
+OUTPUT="$(nvm install --lts 0.12 2>&1)"
+EXIT_CODE="$?"
 set -ex
-EXIT_CODE="$(nvm install --lts 3 >/dev/null 2>&1 && echo $? || echo $?)"
+EXPECTED_OUTPUT="Version '0.12' (with LTS filter) not found - try \`nvm ls-remote --lts\` to browse available versions."
-EXPECTED_OUTPUT="Version '3' (with LTS filter) not found - try \`nvm ls-remote --lts\` to browse available versions."
+[ "${EXIT_CODE}" = 3 ] || die "\`nvm install --lts 0.12\` did not exit with 3, got >${EXIT_CODE}<"
-[ "${EXIT_CODE}" = 3 ] || die "\`nvm install --lts 3\` did not exit with 3, got >${EXIT_CODE}<"
 [ "${OUTPUT}" = "${EXPECTED_OUTPUT}" ] || die "\`nvm install --lts 3\` output >${OUTPUT}<, expected >${EXPECTED_OUTPUT}<"
 
 set +ex # needed for stderr
-OUTPUT="$(nvm install --lts=argon 3 2>&1)"
+OUTPUT="$(nvm install --lts=argon 0.12 2>&1)"
-set -ex
+EXIT_CODE="$?"
-EXIT_CODE="$(nvm install --lts=argon 3 >/dev/null 2>&1 && echo $? || echo $?)"
+set -x
-EXPECTED_OUTPUT="Version '3' (with LTS filter 'argon') not found - try \`nvm ls-remote --lts=argon\` to browse available versions."
+EXPECTED_OUTPUT="Version '0.12' (with LTS filter 'argon') not found - try \`nvm ls-remote --lts=argon\` to browse available versions."
-[ "${EXIT_CODE}" = 3 ] || die "\`nvm install --lts=argon 3\` did not exit with 3, got >${EXIT_CODE}<"
+[ "${EXIT_CODE}" = 3 ] || die "\`nvm install --lts=argon 0.12\` did not exit with 3, got >${EXIT_CODE}<"
-[ "${OUTPUT}" = "${EXPECTED_OUTPUT}" ] || die "\`nvm install --lts=argon 3\` output >${OUTPUT}<, expected >${EXPECTED_OUTPUT}<"
+[ "${OUTPUT}" = "${EXPECTED_OUTPUT}" ] || die "\`nvm install --lts=argon 0.12\` output >${OUTPUT}<, expected >${EXPECTED_OUTPUT}<"
 
 nvm install --lts 4.2.2 || die 'nvm install --lts 4.2.2 failed'