Skip to content

Commit

Permalink
[Fix] nvm ls, nvm alias, nvm install: error when an LTS name is…
Browse files Browse the repository at this point in the history
… invalid
  • Loading branch information
ljharb committed Sep 4, 2024
1 parent 9fb9dec commit da2720a
Show file tree
Hide file tree
Showing 5 changed files with 67 additions and 17 deletions.
17 changes: 13 additions & 4 deletions nvm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -1253,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
Expand Down Expand Up @@ -1656,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

Expand Down Expand Up @@ -3421,9 +3425,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
Expand All @@ -3432,6 +3438,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
Expand Down Expand Up @@ -3496,7 +3506,6 @@ nvm() {
FLAVOR="$(nvm_node_prefix)"
fi

local EXIT_CODE
EXIT_CODE=0

if nvm_is_version_installed "${VERSION}"; then
Expand Down
35 changes: 35 additions & 0 deletions test/fast/Unit tests/nvm install with nonlowercase LTS name
Original file line number Diff line number Diff line change
@@ -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}<"
10 changes: 8 additions & 2 deletions test/fast/Unit tests/nvm ls-remote
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
#!/bin/sh

set -e

die () { echo "$@" ; cleanup ; exit 1; }

cleanup() {
Expand Down Expand Up @@ -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}"
Expand Down
2 changes: 1 addition & 1 deletion test/fast/Unit tests/nvm_install_no_progress_bar
Original file line number Diff line number Diff line change
Expand Up @@ -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; }
Expand Down
20 changes: 10 additions & 10 deletions test/installation_node/install LTS
Original file line number Diff line number Diff line change
Expand Up @@ -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 '3' (with LTS filter) not found - try \`nvm ls-remote --lts\` to browse available versions."
[ "${EXIT_CODE}" = 3 ] || die "\`nvm install --lts 3\` did not exit with 3, got >${EXIT_CODE}<"
EXPECTED_OUTPUT="Version '0.12' (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}<"
[ "${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)"
set -ex
EXIT_CODE="$(nvm install --lts=argon 3 >/dev/null 2>&1 && echo $? || echo $?)"
EXPECTED_OUTPUT="Version '3' (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}<"
[ "${OUTPUT}" = "${EXPECTED_OUTPUT}" ] || die "\`nvm install --lts=argon 3\` output >${OUTPUT}<, expected >${EXPECTED_OUTPUT}<"
OUTPUT="$(nvm install --lts=argon 0.12 2>&1)"
EXIT_CODE="$?"
set -x
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 0.12\` did not exit with 3, got >${EXIT_CODE}<"
[ "${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'

Expand Down

0 comments on commit da2720a

Please sign in to comment.