github/pyenv
1
0
Fork 0
mirror of https://github.com/pyenv/pyenv.git synced 2024-11-21 20:47:00 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'rbenv-local-respects-ancestry'

Browse source
This commit is contained in:
Mislav Marohnić 2015-12-23 15:30:18 +01:00
commit a62a75369e
4 changed files with 42 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
libexec/rbenv-local
View file

@ -47,9 +47,10 @@ elif [ -n "$RBENV_VERSION" ]; then
} >&2 } >&2
fi fi
else else
rbenv-version-file-read .ruby-version || if version_file="$(rbenv-version-file "$PWD")"; then
rbenv-version-file-read .rbenv-version || rbenv-version-file-read "$version_file"
{ echo "rbenv: no local version configured for this directory" else
echo "rbenv: no local version configured for this directory" >&2
exit 1 exit 1
} >&2 fi
fi fi

34
libexec/rbenv-version-file
View file

@ -1,35 +1,45 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# Usage: rbenv version-file [<dir>]
# Summary: Detect the file that sets the current rbenv version # Summary: Detect the file that sets the current rbenv version
set -e set -e
[ -n "$RBENV_DEBUG" ] && set -x [ -n "$RBENV_DEBUG" ] && set -x
target_dir="$1"
find_local_version_file() { find_local_version_file() {
local root="$1" local root="$1"
while true; do while ! [[ "$root" =~ ^//[^/]*$ ]]; do
[[ "$root" =~ ^//[^/]*$ ]] && break
if [ -e "${root}/.ruby-version" ]; then if [ -e "${root}/.ruby-version" ]; then
echo "${root}/.ruby-version" echo "${root}/.ruby-version"
exit return 0
elif [ -e "${root}/.rbenv-version" ]; then elif [ -e "${root}/.rbenv-version" ]; then
echo "${root}/.rbenv-version" echo "${root}/.rbenv-version"
exit return 0
fi fi
[ -n "$root" ] || break [ -n "$root" ] || break
root="${root%/*}" root="${root%/*}"
done done
return 1
} }
find_local_version_file "$RBENV_DIR" find_global_version_file() {
[ "$RBENV_DIR" = "$PWD" ] || find_local_version_file "$PWD" local global_version_file="${RBENV_ROOT}/version"
global_version_file="${RBENV_ROOT}/version" if [ -e "$global_version_file" ]; then
if [ -e "$global_version_file" ]; then
echo "$global_version_file" echo "$global_version_file"
elif [ -e "${RBENV_ROOT}/global" ]; then elif [ -e "${RBENV_ROOT}/global" ]; then
echo "${RBENV_ROOT}/global" echo "${RBENV_ROOT}/global"
elif [ -e "${RBENV_ROOT}/default" ]; then elif [ -e "${RBENV_ROOT}/default" ]; then
echo "${RBENV_ROOT}/default" echo "${RBENV_ROOT}/default"
else else
echo "$global_version_file" echo "$global_version_file"
fi
}
if [ -n "$target_dir" ]; then
find_local_version_file "$target_dir"
else
find_local_version_file "$RBENV_DIR" || {
[ "$RBENV_DIR" != "$PWD" ] && find_local_version_file "$PWD"
} || find_global_version_file
fi fi

4
test/local.bats
View file

@ -32,11 +32,11 @@ setup() {
assert_success "2.0" assert_success "2.0"
} }
@test "ignores version in parent directory" { @test "discovers version file in parent directory" {
echo "1.2.3" > .ruby-version echo "1.2.3" > .ruby-version
mkdir -p "subdir" && cd "subdir" mkdir -p "subdir" && cd "subdir"
run rbenv-local run rbenv-local
assert_failure assert_success "1.2.3"
} }
@test "ignores RBENV_DIR" { @test "ignores RBENV_DIR" {

11
test/version-file.bats
View file

@ -97,3 +97,14 @@ create_file() {
RBENV_DIR="${RBENV_TEST_DIR}/widget/blank" run rbenv-version-file RBENV_DIR="${RBENV_TEST_DIR}/widget/blank" run rbenv-version-file
assert_success "${RBENV_TEST_DIR}/project/.ruby-version" assert_success "${RBENV_TEST_DIR}/project/.ruby-version"
} }
@test "finds version file in target directory" {
create_file "project/.ruby-version"
run rbenv-version-file "${PWD}/project"
assert_success "${RBENV_TEST_DIR}/project/.ruby-version"
}
@test "fails when no version file in target directory" {
run rbenv-version-file "$PWD"
assert_failure ""
}