Set SHPEC_ROOT without using find

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 ## 0.0.9 Unreleased
 
- *
+ * Set SHPEC_ROOT without using find
 
 ## 0.0.8 (Mar 6 2013)
 

bin/shpec

@@ -96,8 +96,7 @@ print_result() {
   fi
 }
 
-shpec_root=${SHPEC_ROOT:-$(find . -name 'shpec' -type d | grep -v '.git')}
-shpec_root=${shpec_root:-.} # default to current directory
+SHPEC_ROOT=${SHPEC_ROOT:-$([[ -d './shpec' ]] && echo './shpec' || echo '.')}
 
 case "$1" in
 
@@ -107,13 +106,13 @@ case "$1" in
 
   * )
 
-    matcher_files="$(find "$shpec_root/matchers" -name '*.sh' 2>/dev/null)"
+    matcher_files="$(find "$SHPEC_ROOT/matchers" -name '*.sh' 2>/dev/null)"
 
     for matcher_file in $matcher_files; do
       . "$matcher_file"
     done
 
-    files="${@:-$(find "$shpec_root" -name '*_shpec.sh')}"
+    files="${@:-$(find $SHPEC_ROOT -name '*_shpec.sh')}"
 
     time for file in $files; do
       . "$file"

shpec/shpec_shpec.sh

@@ -79,37 +79,37 @@ line'
   end_describe
 
   describe "exit codes"
-    shpec_cmd="$shpec_root/../bin/shpec"
+    shpec_cmd="$SHPEC_ROOT/../bin/shpec"
     it "returns nonzero if any test fails"
-      $shpec_cmd $shpec_root/etc/failing_example &> /dev/null
+      $shpec_cmd $SHPEC_ROOT/etc/failing_example &> /dev/null
       assert unequal "$?" "0"
 
     it "returns zero if a suite passes"
-      $shpec_cmd $shpec_root/etc/passing_example &> /dev/null
+      $shpec_cmd $SHPEC_ROOT/etc/passing_example &> /dev/null
       assert equal "$?" "0"
   end_describe
 
   describe "output"
     it "outputs passing tests to STDOUT"
-      message="$(. $shpec_root/etc/passing_example)"
+      message="$(. $SHPEC_ROOT/etc/passing_example)"
       assert match "$message" "a\ passing\ test"
 
     it "outputs failing tests to STDOUT"
-      message="$(. $shpec_root/etc/failing_example)"
+      message="$(. $SHPEC_ROOT/etc/failing_example)"
       assert match "$message" "a\ failing\ test"
   end_describe
 
   describe "commandline options"
-    shpec_cmd="$shpec_root/../bin/shpec"
+    shpec_cmd="$SHPEC_ROOT/../bin/shpec"
     describe "--version"
       it "outputs the current version number"
         message="$($shpec_cmd --version)"
-        assert match "$message" "$(cat $shpec_root/../VERSION)"
+        assert match "$message" "$(cat $SHPEC_ROOT/../VERSION)"
     end_describe
     describe "-v"
       it "outputs the current version number"
         message="$($shpec_cmd -v)"
-        assert match "$message" "$(cat $shpec_root/../VERSION)"
+        assert match "$message" "$(cat $SHPEC_ROOT/../VERSION)"
     end_describe
   end_describe
 end_describe