From 7a07eb7ae0aaf7c23d75bca935678677439b60b2 Mon Sep 17 00:00:00 2001 From: ryenus Date: Mon, 29 Jan 2024 21:04:48 +0800 Subject: [PATCH 1/9] show only versions newer than NVM_MIN_VER if set --- nvm.sh | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/nvm.sh b/nvm.sh index 6dc779e..bba4f18 100644 --- a/nvm.sh +++ b/nvm.sh @@ -1820,12 +1820,14 @@ nvm_print_versions() { fi command awk \ - -v remote_versions="$(printf '%s' "${1-}" | tr '\n' '|')" \ + -v remote_versions="$(printf '%s' "${1-}" | tr '\n' '|')" -v min_ver="${NVM_MIN_VER:-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 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 *"; @@ -1840,13 +1842,15 @@ BEGIN { split(remote_versions, lines, "|"); split(installed_versions, installed, "|"); rows = alen(lines); - - for (n = 1; n <= rows; n++) { + filter = (min_ver != "v0"); + for (m = n = 1; n <= rows; n++) { split(lines[n], fields, "[[:blank:]]+"); cols = alen(fields); version = fields[1]; - is_installed = 0; + if (filter && comp(version, min_ver) < 0) continue; + filter = 0; + is_installed = 0; for (i in installed) { if (version == installed[i]) { is_installed = 1; @@ -1863,8 +1867,7 @@ BEGIN { 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) { @@ -1873,11 +1876,11 @@ BEGIN { formatted = sprintf((fmt_version padding fmt_latest_lts), version, fields[2]); } - output[n] = formatted; + output[m++] = formatted; } - for (n = 1; n <= rows; n++) { - print output[n] + for (m in output) { + print output[m] } exit From a95fcdc0b22b11426e5e853de0599d8e2f497d39 Mon Sep 17 00:00:00 2001 From: ryenus Date: Sat, 29 Jun 2024 10:18:07 +0800 Subject: [PATCH 2/9] always list installed versions --- nvm.sh | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/nvm.sh b/nvm.sh index bba4f18..61d8bd7 100644 --- a/nvm.sh +++ b/nvm.sh @@ -1842,14 +1842,11 @@ BEGIN { split(remote_versions, lines, "|"); split(installed_versions, installed, "|"); rows = alen(lines); - filter = (min_ver != "v0"); + filter_on = (vcmp("v0.0.0", min_ver) != 0); for (m = n = 1; n <= rows; n++) { split(lines[n], fields, "[[:blank:]]+"); cols = alen(fields); version = fields[1]; - if (filter && comp(version, min_ver) < 0) continue; - - filter = 0; is_installed = 0; for (i in installed) { if (version == installed[i]) { @@ -1858,6 +1855,14 @@ BEGIN { } } + if (filter_on && !is_installed) { + if (vcmp(version, min_ver) >= 0) { + filter_on = 0; + } else { + continue; + } + } + fmt_version = "%15s"; if (version == current) { fmt_version = fmt_current; @@ -1879,8 +1884,8 @@ BEGIN { output[m++] = formatted; } - for (m in output) { - print output[m] + for (n = 1; n < m; n++) { + print output[n] } exit From 0fc50b599ab56445b71ff7ca99b0aab8f280df15 Mon Sep 17 00:00:00 2001 From: ryenus Date: Sat, 29 Jun 2024 13:47:51 +0800 Subject: [PATCH 3/9] add test for NVM_MIN_VER support show only versions newer than NVM_MIN_VER if set --- test/fast/Unit tests/nvm_print_versions | 139 ++++++++++++++++++++++++ 1 file changed, 139 insertions(+) create mode 100755 test/fast/Unit tests/nvm_print_versions diff --git a/test/fast/Unit tests/nvm_print_versions b/test/fast/Unit tests/nvm_print_versions new file mode 100755 index 0000000..124c930 --- /dev/null +++ b/test/fast/Unit tests/nvm_print_versions @@ -0,0 +1,139 @@ +#!/bin/sh + +# shellcheck disable=SC2317 + +die () { echo "$@" ; cleanup ; exit 1; } + +cleanup() { + unset -f nvm_remote_versions nvm_ls nvm_ls_current nvm_remote_versions + if [ -n "$TEMP_NVM_MIN_VER" ]; then + export NVM_MIN_VER="$TEMP_NVM_MIN_VER" + fi +} + +\. ../../../nvm.sh + + +if [ -n "$NVM_MIN_VER" ]; then + TEMP_NVM_MIN_VER="$NVM_MIN_VER" + unset NVM_MIN_VER +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 * +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=1 nvm_print_versions "$(nvm_remote_versions)")" +EXPECTED_OUTPUT=" v16.0.0 + v16.20.2 * (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 "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=1 NVM_MIN_VER=18 nvm_print_versions "$(nvm_remote_versions)")" +EXPECTED_OUTPUT=" v16.20.2 * (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 "NVM_MIN_VER=18 nvm_print_versions did not output all expected versions; got $OUTPUT" + + +# versions lower than 19 should be filtered out +OUTPUT="$(NVM_NO_COLORS=1 NVM_MIN_VER=19 nvm_print_versions "$(nvm_remote_versions)")" +EXPECTED_OUTPUT=" v16.20.2 * (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 "NVM_MIN_VER=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=1 NVM_MIN_VER=20.1 nvm_print_versions "$(nvm_remote_versions)")" +EXPECTED_OUTPUT=" v16.20.2 * (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 "NVM_MIN_VER=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=1 NVM_MIN_VER=20.1 nvm_print_versions "$(nvm_remote_versions)")" +EXPECTED_OUTPUT="-> v16.20.2 * (Latest LTS: Gallium) + v20.8.1 + v20.9.0 (Latest LTS: Iron) + v21.0.0 + v21.1.0" + +[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "NVM_MIN_VER=20.1 nvm_print_versions did not output all expected versions; got $OUTPUT" + + +cleanup From cbe58242d8a5963cae036bd378e872379d58f7a1 Mon Sep 17 00:00:00 2001 From: ryenus Date: Sat, 29 Jun 2024 13:17:25 +0800 Subject: [PATCH 4/9] trim leading space in mock output due to eclint errors --- test/fast/Unit tests/nvm_print_versions | 94 ++++++++++++------------- 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/test/fast/Unit tests/nvm_print_versions b/test/fast/Unit tests/nvm_print_versions index 124c930..dc12d55 100755 --- a/test/fast/Unit tests/nvm_print_versions +++ b/test/fast/Unit tests/nvm_print_versions @@ -51,67 +51,67 @@ v21.1.0" # nvm_print_versions should print all versions from nvm_remote_versions -OUTPUT="$(NVM_NO_COLORS=1 nvm_print_versions "$(nvm_remote_versions)")" -EXPECTED_OUTPUT=" v16.0.0 - v16.20.2 * (Latest LTS: Gallium) - v17.0.0 - v17.9.1 - v18.0.0 - v18.1.0 - v18.20.2 (LTS: Hydrogen) +OUTPUT="$(NVM_NO_COLORS=1 nvm_print_versions "$(nvm_remote_versions)" | sed -r 's/^[ \t]+//')" +EXPECTED_OUTPUT="v16.0.0 +v16.20.2 * (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" +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 "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=1 NVM_MIN_VER=18 nvm_print_versions "$(nvm_remote_versions)")" -EXPECTED_OUTPUT=" v16.20.2 * (Latest LTS: Gallium) - v18.0.0 - v18.1.0 - v18.20.2 (LTS: Hydrogen) +OUTPUT="$(NVM_NO_COLORS=1 NVM_MIN_VER=18 nvm_print_versions "$(nvm_remote_versions)" | sed -r 's/^[ \t]+//')" +EXPECTED_OUTPUT="v16.20.2 * (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" +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 "NVM_MIN_VER=18 nvm_print_versions did not output all expected versions; got $OUTPUT" # versions lower than 19 should be filtered out -OUTPUT="$(NVM_NO_COLORS=1 NVM_MIN_VER=19 nvm_print_versions "$(nvm_remote_versions)")" -EXPECTED_OUTPUT=" v16.20.2 * (Latest LTS: Gallium) +OUTPUT="$(NVM_NO_COLORS=1 NVM_MIN_VER=19 nvm_print_versions "$(nvm_remote_versions)" | sed -r 's/^[ \t]+//')" +EXPECTED_OUTPUT="v16.20.2 * (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" +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 "NVM_MIN_VER=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=1 NVM_MIN_VER=20.1 nvm_print_versions "$(nvm_remote_versions)")" -EXPECTED_OUTPUT=" v16.20.2 * (Latest LTS: Gallium) +OUTPUT="$(NVM_NO_COLORS=1 NVM_MIN_VER=20.1 nvm_print_versions "$(nvm_remote_versions)" | sed -r 's/^[ \t]+//')" +EXPECTED_OUTPUT="v16.20.2 * (Latest LTS: Gallium) -> v18.20.3 * (Latest LTS: Hydrogen) - v20.8.1 - v20.9.0 (Latest LTS: Iron) - v21.0.0 - v21.1.0" +v20.8.1 +v20.9.0 (Latest LTS: Iron) +v21.0.0 +v21.1.0" [ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "NVM_MIN_VER=20.1 nvm_print_versions did not output all expected versions; got $OUTPUT" @@ -126,12 +126,12 @@ nvm_ls_current() { echo "v16.20.2" } -OUTPUT="$(NVM_NO_COLORS=1 NVM_MIN_VER=20.1 nvm_print_versions "$(nvm_remote_versions)")" +OUTPUT="$(NVM_NO_COLORS=1 NVM_MIN_VER=20.1 nvm_print_versions "$(nvm_remote_versions)" | sed -r 's/^[ \t]+//')" EXPECTED_OUTPUT="-> v16.20.2 * (Latest LTS: Gallium) - v20.8.1 - v20.9.0 (Latest LTS: Iron) - v21.0.0 - v21.1.0" +v20.8.1 +v20.9.0 (Latest LTS: Iron) +v21.0.0 +v21.1.0" [ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "NVM_MIN_VER=20.1 nvm_print_versions did not output all expected versions; got $OUTPUT" From b2840f10d091f2cfc3ec3b3a45ef06cd1c2a1f83 Mon Sep 17 00:00:00 2001 From: ryenus Date: Sun, 30 Jun 2024 01:50:15 +0800 Subject: [PATCH 5/9] rename NVM_MIN_VER to NVM_MIN since nvm is all about versions, so no need for the explicit suffix. --- nvm.sh | 2 +- test/fast/Unit tests/nvm_print_versions | 26 ++++++++++++------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/nvm.sh b/nvm.sh index 61d8bd7..333e71b 100644 --- a/nvm.sh +++ b/nvm.sh @@ -1820,7 +1820,7 @@ nvm_print_versions() { fi command awk \ - -v remote_versions="$(printf '%s' "${1-}" | tr '\n' '|')" -v min_ver="${NVM_MIN_VER:-v0}" \ + -v remote_versions="$(printf '%s' "${1-}" | tr '\n' '|')" -v min_ver="${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" \ diff --git a/test/fast/Unit tests/nvm_print_versions b/test/fast/Unit tests/nvm_print_versions index dc12d55..39113ec 100755 --- a/test/fast/Unit tests/nvm_print_versions +++ b/test/fast/Unit tests/nvm_print_versions @@ -6,17 +6,17 @@ die () { echo "$@" ; cleanup ; exit 1; } cleanup() { unset -f nvm_remote_versions nvm_ls nvm_ls_current nvm_remote_versions - if [ -n "$TEMP_NVM_MIN_VER" ]; then - export NVM_MIN_VER="$TEMP_NVM_MIN_VER" + if [ -n "$TEMP_NVM_MIN" ]; then + export NVM_MIN="$TEMP_NVM_MIN" fi } \. ../../../nvm.sh -if [ -n "$NVM_MIN_VER" ]; then - TEMP_NVM_MIN_VER="$NVM_MIN_VER" - unset NVM_MIN_VER +if [ -n "$NVM_MIN" ]; then + TEMP_NVM_MIN="$NVM_MIN" + unset NVM_MIN fi # mock currently installed versions @@ -72,7 +72,7 @@ v21.1.0" # versions lower than 18 should be filtered out, but v16.20.2 should be kept since it's installed -OUTPUT="$(NVM_NO_COLORS=1 NVM_MIN_VER=18 nvm_print_versions "$(nvm_remote_versions)" | sed -r 's/^[ \t]+//')" +OUTPUT="$(NVM_NO_COLORS=1 NVM_MIN=18 nvm_print_versions "$(nvm_remote_versions)" | sed -r 's/^[ \t]+//')" EXPECTED_OUTPUT="v16.20.2 * (Latest LTS: Gallium) v18.0.0 v18.1.0 @@ -86,11 +86,11 @@ v20.9.0 (Latest LTS: Iron) v21.0.0 v21.1.0" -[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "NVM_MIN_VER=18 nvm_print_versions did not output all expected versions; got $OUTPUT" +[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "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=1 NVM_MIN_VER=19 nvm_print_versions "$(nvm_remote_versions)" | sed -r 's/^[ \t]+//')" +OUTPUT="$(NVM_NO_COLORS=1 NVM_MIN=19 nvm_print_versions "$(nvm_remote_versions)" | sed -r 's/^[ \t]+//')" EXPECTED_OUTPUT="v16.20.2 * (Latest LTS: Gallium) -> v18.20.3 * (Latest LTS: Hydrogen) v19.0.0 @@ -101,11 +101,11 @@ v20.9.0 (Latest LTS: Iron) v21.0.0 v21.1.0" -[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "NVM_MIN_VER=19 nvm_print_versions did not output all expected versions; got $OUTPUT" +[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "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=1 NVM_MIN_VER=20.1 nvm_print_versions "$(nvm_remote_versions)" | sed -r 's/^[ \t]+//')" +OUTPUT="$(NVM_NO_COLORS=1 NVM_MIN=20.1 nvm_print_versions "$(nvm_remote_versions)" | sed -r 's/^[ \t]+//')" EXPECTED_OUTPUT="v16.20.2 * (Latest LTS: Gallium) -> v18.20.3 * (Latest LTS: Hydrogen) v20.8.1 @@ -113,7 +113,7 @@ v20.9.0 (Latest LTS: Iron) v21.0.0 v21.1.0" -[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "NVM_MIN_VER=20.1 nvm_print_versions did not output all expected versions; got $OUTPUT" +[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "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 @@ -126,14 +126,14 @@ nvm_ls_current() { echo "v16.20.2" } -OUTPUT="$(NVM_NO_COLORS=1 NVM_MIN_VER=20.1 nvm_print_versions "$(nvm_remote_versions)" | sed -r 's/^[ \t]+//')" +OUTPUT="$(NVM_NO_COLORS=1 NVM_MIN=20.1 nvm_print_versions "$(nvm_remote_versions)" | sed -r 's/^[ \t]+//')" EXPECTED_OUTPUT="-> v16.20.2 * (Latest LTS: Gallium) v20.8.1 v20.9.0 (Latest LTS: Iron) v21.0.0 v21.1.0" -[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "NVM_MIN_VER=20.1 nvm_print_versions did not output all expected versions; got $OUTPUT" +[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "NVM_MIN=20.1 nvm_print_versions did not output all expected versions; got $OUTPUT" cleanup From b106798ad20b4a06c59f71af9d0407548dbb1eab Mon Sep 17 00:00:00 2001 From: ryenus Date: Sun, 30 Jun 2024 10:46:11 +0800 Subject: [PATCH 6/9] prefixed versions like v18 also work --- test/fast/Unit tests/nvm_print_versions | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/fast/Unit tests/nvm_print_versions b/test/fast/Unit tests/nvm_print_versions index 39113ec..c042068 100755 --- a/test/fast/Unit tests/nvm_print_versions +++ b/test/fast/Unit tests/nvm_print_versions @@ -72,7 +72,7 @@ v21.1.0" # versions lower than 18 should be filtered out, but v16.20.2 should be kept since it's installed -OUTPUT="$(NVM_NO_COLORS=1 NVM_MIN=18 nvm_print_versions "$(nvm_remote_versions)" | sed -r 's/^[ \t]+//')" +OUTPUT="$(NVM_NO_COLORS=1 NVM_MIN=v18 nvm_print_versions "$(nvm_remote_versions)" | sed -r 's/^[ \t]+//')" EXPECTED_OUTPUT="v16.20.2 * (Latest LTS: Gallium) v18.0.0 v18.1.0 @@ -105,7 +105,7 @@ v21.1.0" # versions lower than 20.1 should be filtered out, so v20.0.0 is out -OUTPUT="$(NVM_NO_COLORS=1 NVM_MIN=20.1 nvm_print_versions "$(nvm_remote_versions)" | sed -r 's/^[ \t]+//')" +OUTPUT="$(NVM_NO_COLORS=1 NVM_MIN=v20.1 nvm_print_versions "$(nvm_remote_versions)" | sed -r 's/^[ \t]+//')" EXPECTED_OUTPUT="v16.20.2 * (Latest LTS: Gallium) -> v18.20.3 * (Latest LTS: Hydrogen) v20.8.1 From ce329fbe613705c5f237b961230ac3139e0b990e Mon Sep 17 00:00:00 2001 From: ryenus Date: Sun, 14 Jul 2024 11:45:52 +0800 Subject: [PATCH 7/9] remove function ref duplication --- test/fast/Unit tests/nvm_print_versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/fast/Unit tests/nvm_print_versions b/test/fast/Unit tests/nvm_print_versions index c042068..b9d22b8 100755 --- a/test/fast/Unit tests/nvm_print_versions +++ b/test/fast/Unit tests/nvm_print_versions @@ -5,7 +5,7 @@ die () { echo "$@" ; cleanup ; exit 1; } cleanup() { - unset -f nvm_remote_versions nvm_ls nvm_ls_current nvm_remote_versions + unset -f nvm_remote_versions nvm_ls nvm_ls_current if [ -n "$TEMP_NVM_MIN" ]; then export NVM_MIN="$TEMP_NVM_MIN" fi From 477d22917182736d5e1e58fc17bda20607764170 Mon Sep 17 00:00:00 2001 From: ryenus Date: Sun, 14 Jul 2024 14:18:11 +0800 Subject: [PATCH 8/9] always show updates for installed versions even if they're older than $NVM_MIN --- nvm.sh | 12 +++++++---- test/fast/Unit tests/nvm_print_versions | 28 +++++++++++++++---------- 2 files changed, 25 insertions(+), 15 deletions(-) diff --git a/nvm.sh b/nvm.sh index 333e71b..83194ff 100644 --- a/nvm.sh +++ b/nvm.sh @@ -1827,6 +1827,7 @@ nvm_print_versions() { -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 *"; @@ -1843,6 +1844,7 @@ BEGIN { split(installed_versions, installed, "|"); rows = alen(lines); filter_on = (vcmp("v0.0.0", min_ver) != 0); + current_major = -1; for (m = n = 1; n <= rows; n++) { split(lines[n], fields, "[[:blank:]]+"); cols = alen(fields); @@ -1855,10 +1857,12 @@ BEGIN { } } - if (filter_on && !is_installed) { - if (vcmp(version, min_ver) >= 0) { + if (filter_on != 0) { + if (is_installed != 0) { + current_major = v2m(version); + } else if (vcmp(version, min_ver) >= 0) { filter_on = 0; - } else { + } else if (v2m(version) != current_major) { continue; } } @@ -1868,7 +1872,7 @@ BEGIN { 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; } diff --git a/test/fast/Unit tests/nvm_print_versions b/test/fast/Unit tests/nvm_print_versions index b9d22b8..3e21498 100755 --- a/test/fast/Unit tests/nvm_print_versions +++ b/test/fast/Unit tests/nvm_print_versions @@ -33,7 +33,8 @@ nvm_ls_current() { nvm_remote_versions() { echo "v16.0.0 -v16.20.2 Gallium * +v16.20.2 Gallium +v16.20.3 Gallium * v17.0.0 v17.9.1 v18.0.0 @@ -53,7 +54,8 @@ v21.1.0" # nvm_print_versions should print all versions from nvm_remote_versions OUTPUT="$(NVM_NO_COLORS=1 nvm_print_versions "$(nvm_remote_versions)" | sed -r 's/^[ \t]+//')" EXPECTED_OUTPUT="v16.0.0 -v16.20.2 * (Latest LTS: Gallium) +v16.20.2 * (LTS: Gallium) +v16.20.3 (Latest LTS: Gallium) v17.0.0 v17.9.1 v18.0.0 @@ -68,12 +70,13 @@ v20.9.0 (Latest LTS: Iron) v21.0.0 v21.1.0" -[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "nvm_print_versions did not output all expected versions; got $OUTPUT" +[ "_$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=1 NVM_MIN=v18 nvm_print_versions "$(nvm_remote_versions)" | sed -r 's/^[ \t]+//')" -EXPECTED_OUTPUT="v16.20.2 * (Latest LTS: Gallium) +EXPECTED_OUTPUT="v16.20.2 * (LTS: Gallium) +v16.20.3 (Latest LTS: Gallium) v18.0.0 v18.1.0 v18.20.2 (LTS: Hydrogen) @@ -86,12 +89,13 @@ v20.9.0 (Latest LTS: Iron) v21.0.0 v21.1.0" -[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "NVM_MIN=18 nvm_print_versions did not output all expected versions; got $OUTPUT" +[ "_$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=1 NVM_MIN=19 nvm_print_versions "$(nvm_remote_versions)" | sed -r 's/^[ \t]+//')" -EXPECTED_OUTPUT="v16.20.2 * (Latest LTS: Gallium) +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 @@ -101,19 +105,20 @@ v20.9.0 (Latest LTS: Iron) v21.0.0 v21.1.0" -[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "NVM_MIN=19 nvm_print_versions did not output all expected versions; got $OUTPUT" +[ "_$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=1 NVM_MIN=v20.1 nvm_print_versions "$(nvm_remote_versions)" | sed -r 's/^[ \t]+//')" -EXPECTED_OUTPUT="v16.20.2 * (Latest LTS: Gallium) +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 "NVM_MIN=20.1 nvm_print_versions did not output all expected versions; got $OUTPUT" +[ "_$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 @@ -127,13 +132,14 @@ nvm_ls_current() { } OUTPUT="$(NVM_NO_COLORS=1 NVM_MIN=20.1 nvm_print_versions "$(nvm_remote_versions)" | sed -r 's/^[ \t]+//')" -EXPECTED_OUTPUT="-> v16.20.2 * (Latest LTS: Gallium) +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 "NVM_MIN=20.1 nvm_print_versions did not output all expected versions; got $OUTPUT" +[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "(5) NVM_MIN=20.1 nvm_print_versions did not output all expected versions; got $OUTPUT" cleanup From df9ec5851271f550f2af4b7d23705d78c901f881 Mon Sep 17 00:00:00 2001 From: ryenus Date: Sun, 14 Jul 2024 18:43:55 +0800 Subject: [PATCH 9/9] ls-remote: add CLI option --min= When omitted, fallback to the environment variable "NVM_MIN" if set. And the CLI option --min= takes precedence over the environment variable "NVM_MIN" if both are present. --- nvm.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nvm.sh b/nvm.sh index 83194ff..228e331 100644 --- a/nvm.sh +++ b/nvm.sh @@ -3036,6 +3036,7 @@ nvm() { nvm_echo ' nvm ls-remote [] List remote versions available for install, matching a given if provided' nvm_echo ' --lts When listing, only show LTS (long-term support) versions' nvm_echo ' --lts= When listing, only show versions for a specific LTS line' + nvm_echo ' --min= When listing, only show versions greater than or equal to , including minor/patch updates for installed versions' nvm_echo ' --no-colors Suppress colored output' nvm_echo ' nvm version Resolve the given description to a single local version' nvm_echo ' nvm version-remote Resolve the given description to a single remote version' @@ -4012,6 +4013,7 @@ nvm() { ;; "ls-remote" | "list-remote") local NVM_LTS + local NVM_MIN="${NVM_MIN-}" local PATTERN local NVM_NO_COLORS @@ -4024,6 +4026,9 @@ nvm() { --lts=*) NVM_LTS="${1##--lts=}" ;; + --min=*) + NVM_MIN="${1##--min=}" + ;; --no-colors) NVM_NO_COLORS="${1}" ;; --*) nvm_err "Unsupported option \"${1}\"."