Skip to content

Commit eb5e5b7

Browse files
aj-fosteraj-foster
committed
Refactor "no version set" message to utilities
1 parent 9733daa commit eb5e5b7

5 files changed

Lines changed: 9 additions & 4 deletions

File tree

‎bin/private/asdf-exec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ check_if_plugin_exists "$plugin_name"
1212
full_version=$(get_preset_version_for "$plugin_name")
1313

1414
if [ "$full_version" == "" ]; then
15-
echo "No version set for ${plugin_name}: please run \`asdf <global|local> ${plugin_name} <version>\`"
15+
display_no_version_set "$plugin_name"
1616
exit -1
1717
fi
1818

‎lib/commands/current.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ plugin_current_command() {
1616
check_for_deprecated_plugin "$plugin_name"
1717

1818
if [ -z "$version" ]; then
19-
printf "%s\\n" "No version set for $plugin_name: please run \`asdf <global|local> ${plugin_name} <version>\`"
19+
printf "%s\\n" "$(display_no_version_set "$plugin_name")"
2020
exit 1
2121
else
2222
printf "%-8s%s\\n" "$version" "(set by $version_file_path)"

‎lib/commands/which.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ current_version() {
1414
check_for_deprecated_plugin "$plugin_name"
1515

1616
if [ -z "$version" ]; then
17-
echo "No version set for $plugin_name: please run \`asdf <global|local> ${plugin_name} <version>\`"
17+
display_no_version_set "$plugin_name"
1818
exit 1
1919
else
2020
echo "$version"

‎lib/utils.sh‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,11 @@ find_version() {
160160
fi
161161
}
162162

163+
display_no_version_set() {
164+
local plugin_name=$1
165+
echo "No version set for ${plugin_name}; please run \`asdf <global | local> ${plugin_name} <version>\`"
166+
}
167+
163168
get_version_from_env () {
164169
local plugin_name=$1
165170
local upcase_name

‎test/current_command.bats‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ teardown() {
7575
echo 'foobar 1.0.0' >> $PROJECT_DIR/.tool-versions
7676

7777
run current_command
78-
expected="baz No version set for baz: please run \`asdf <global|local> baz <version>\`
78+
expected="baz No version set for baz; please run \`asdf <global | local> baz <version>\`
7979
dummy 1.1.0 (set by $PROJECT_DIR/.tool-versions)
8080
foobar 1.0.0 (set by $PROJECT_DIR/.tool-versions)"
8181

0 commit comments

Comments
 (0)