Merge pull request #1069 from viclim/fix-issue-1065

Ignore empty `.ruby-version` files
This commit is contained in:
Mislav Marohnić 2018-02-26 10:53:46 +01:00 committed by GitHub
commit c8ba27fd07
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions

View File

@ -9,7 +9,7 @@ target_dir="$1"
find_local_version_file() { find_local_version_file() {
local root="$1" local root="$1"
while ! [[ "$root" =~ ^//[^/]*$ ]]; do while ! [[ "$root" =~ ^//[^/]*$ ]]; do
if [ -f "${root}/.ruby-version" ]; then if [ -s "${root}/.ruby-version" ]; then
echo "${root}/.ruby-version" echo "${root}/.ruby-version"
return 0 return 0
fi fi

View File

@ -9,7 +9,7 @@ setup() {
create_file() { create_file() {
mkdir -p "$(dirname "$1")" mkdir -p "$(dirname "$1")"
touch "$1" echo "system" > "$1"
} }
@test "detects global 'version' file" { @test "detects global 'version' file" {

View File

@ -26,7 +26,7 @@ setup() {
} }
@test "detects local file" { @test "detects local file" {
touch .ruby-version echo "system" > .ruby-version
run rbenv-version-origin run rbenv-version-origin
assert_success "${PWD}/.ruby-version" assert_success "${PWD}/.ruby-version"
} }