Perform an ascending search for .ruby-version (issue #40).

* Added @wilmoore's test case.

share/chruby/auto.sh

@@ -1,13 +1,28 @@
 function chruby_auto() {
-	if [[ -f .ruby-version ]]; then
-		chruby $(cat .ruby-version) && export RUBY_VERSIONED_DIR="$PWD"
-	elif [[ "$PWD" != "$RUBY_VERSIONED_DIR"/* ]]; then
-		chruby_reset; unset RUBY_VERSIONED_DIR
+	if [[ -n "$RUBY_VERSIONED_DIR" ]]; then
+		if [[ "$PWD" != "$RUBY_VERSIONED_DIR"/* ]]; then
+			chruby_reset
+			unset RUBY_VERSIONED_DIR
+		fi
+	else
+		local dir="$PWD"
+		local version_file
+
+		until [[ "$dir" == / ]]; do
+			version_file="$dir/.ruby-version"
+
+			if [[ -f "$version_file" ]]; then
+				chruby $(cat "$version_file") || return 1
+
+				export RUBY_VERSIONED_DIR="$dir"
+				break
+			fi
+
+			dir=$(dirname "$dir")
+		done
 	fi
 }
 
-if [[ -n "$ZSH_VERSION" ]]; then
-	precmd_functions+=("chruby_auto")
-else
-	PROMPT_COMMAND="chruby_auto; $PROMPT_COMMAND"
+if [[ -n "$ZSH_VERSION" ]]; then precmd_functions+=("chruby_auto")
+else                             PROMPT_COMMAND="chruby_auto; $PROMPT_COMMAND"
 fi

test/chruby_auto_test.sh

@@ -8,6 +8,7 @@ PROJECT_DIR="$PWD/test/project"
 setUp()
 {
 	chruby_reset
+	unset RUBY_VERSIONED_DIR
 }
 
 test_chruby_auto_enter_project_dir()
@@ -18,12 +19,12 @@ test_chruby_auto_enter_project_dir()
 		     "$TEST_RUBY" "$RUBY"
 }
 
-test_chruby_auto_skip_project_dir()
+test_chruby_auto_enter_subdir_directly()
 {
-	cd "$PROJECT_DIR/dir1" && chruby_auto
+	cd "$PROJECT_DIR/dir1/dir2" && chruby_auto
 
-	assertNull "did switch Ruby when not explicitly entering the project" \
-		   "$RUBY"
+	assertEquals "did not switch Ruby when directly entering a sub-directory of a versioned directory" \
+		     "$TEST_RUBY" "$RUBY"
 }
 
 test_chruby_auto_enter_subdir()