Просмотр исходного кода

Have `versions` emit a warning when no Ruby version was found

pull/360/head^2
Mislav Marohnić 11 лет назад
Родитель
Сommit
f237a11f4f
2 измененных файлов: 16 добавлений и 0 удалений
  1. +10
    -0
      libexec/rbenv-versions
  2. +6
    -0
      test/versions.bats

+ 10
- 0
libexec/rbenv-versions Просмотреть файл

@ -19,12 +19,15 @@ else
include_system="1"
fi
num_versions=0
print_version() {
if [ "$1" == "$current_version" ]; then
echo "${hit_prefix}$(rbenv-version 2>/dev/null)"
else
echo "${miss_prefix}$1"
fi
num_versions=$((num_versions + 1))
}
# Include "system" in the non-bare output, if it exists
@ -32,8 +35,15 @@ if [ -n "$include_system" ] && RBENV_VERSION=system rbenv-which ruby >/dev/null
print_version system
fi
shopt -s nullglob
for path in "${RBENV_ROOT}/versions/"*; do
if [ -d "$path" ]; then
print_version "${path##*/}"
fi
done
shopt -u nullglob
if [ "$num_versions" -eq 0 ] && [ -n "$include_system" ]; then
echo "Warning: no Ruby detected on the system" >&2
exit 1
fi

+ 6
- 0
test/versions.bats Просмотреть файл

@ -24,6 +24,12 @@ stub_system_ruby() {
assert_success "* system (set by ${RBENV_ROOT}/version)"
}
@test "not even system ruby available" {
PATH="$(path_without ruby)" run rbenv-versions
assert_failure
assert_output "Warning: no Ruby detected on the system"
}
@test "bare output no versions installed" {
assert [ ! -d "${RBENV_ROOT}/versions" ]
run rbenv-versions --bare

Загрузка…
Отмена
Сохранить