add -- after readlink

tests/.urchin/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore

tests/Test root contains .urchin./.meta-assess

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+observed=$(../../urchin "$1" .testsuite/a/b)
+expected=.testsuite/a/b/../..
+
+test "$observed" = "$expected"

tests/Test root contains .urchin./.testsuite/.urchin/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore

tests/Test root contains .urchin./.testsuite/a/b/c/testcase

@@ -0,0 +1 @@
+#!/usr/bin/env true

tests/Test root contains .urchin./Assess root on a file.

@@ -0,0 +1,2 @@
+#!/bin/sh
+../../urchin --root .testsuite/a/b/c/testcase

tests/Test root contains .urchin./Assess root with --root.

@@ -0,0 +1,2 @@
+#!/bin/sh
+./.meta-assess --root

tests/Test root contains .urchin./Assess root with -r.

@@ -0,0 +1,2 @@
+#!/bin/sh
+./.meta-assess -r

tests/Test root contains .urchin./No root set

@@ -0,0 +1,2 @@
+#!/bin/sh
+../../urchin --root /bin 2>&1 | grep "'/bin/.urchin'"

tests/Test root contains .urchin./Wrong filename

@@ -0,0 +1,2 @@
+#!/bin/sh
+! ../../urchin --root .testsuite/a/not-a-file

tests/get_stdout_file/t

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+I_AM_SOURCING_URCHIN_IN_A_TEST=true . ../../urchin
+test $(get_stdout_file t) = aoeu

urchin

@@ -7,7 +7,7 @@
 # No part of urchin, including this file, may be copied, modified, propagated,
 # or distributed except according to the terms contained in the COPYING file.
 
-
+set +e
 
 # Make sure that CDPATH isn't set, as it causes `cd` to behave unpredictably -
 # notably, it can produce output, which breaks fullpath().
@@ -16,11 +16,42 @@ unset CDPATH
 # Urchin version number
 VERSION=0.0.6
 
-fullpath() {
+urchin_root() {
-  (
+  # Call recursively but remember the original argument.
-    cd -- "$1"
+  current="$(remove_trailing_slash "$1")"
-    pwd
+  if test -n "$2"; then
-  )
+    orig="$2"
+  else
+    orig="$1"
+  fi
+
+  if test "$(readlink -f -- "$1")" = /; then
+    # Stop traversing upwards at /
+    if test -d "$orig"; then
+      origdir="$orig"
+    else
+      origdir=$(dirname "$orig")
+    fi
+    echo "You need to create the .urchin directory in the root of your tests,
+maybe like this:
+
+  mkdir '$(readlink -f -- "$(remove_trailing_slash "$origdir")")/.urchin'
+" >&2
+    return 1
+  elif ! test -e "$current"; then
+    echo "$current: No such file or directory">&2
+    return 1
+  elif test -f "$current"; then
+    urchin_root "$(dirname "$current")" "$orig"
+  elif test -d "$current"/.urchin; then
+    remove_trailing_slash "$current"
+  elif test "$current" != . && test "$current" != .. &&
+    echo "$current" | grep '^\.' && > /dev/null; then
+    # Stop traversing upwards at hidden directories.
+    urchin_root / "$orig"
+  else
+    urchin_root "$current"/.. "$orig"
+  fi
 }
 
 indent() {
@@ -30,16 +61,40 @@ indent() {
   fi
 }
 
+remove_trailing_slash() {
+  echo "$1" | sed s/\\/$//
+}
+
+escape_slashes() {
+  echo "$1" | sed s+/+\\\\/+g
+}
+
+get_stdout_file() {
+  root="$(readlink -f -- "$(urchin_root "$1")")"
+  test_file="$(readlink -f -- "$1")"
+  eroot="$(escape_slashes "$root")"
+  base="$(echo "$test_file" | sed "s/^$eroot/$eroot\/.urchin/")"
+  if test -d "$1"; then
+    echo "$base"/.index
+  else
+    echo "$base"
+  fi
+}
+
 recurse() {
   potential_test="$1"
   indent_level="$2"
   shell_for_sh_tests="$3"
 
+  [ "$potential_test" = '.urchin' ] && return
   [ "$potential_test" = 'setup_dir' ] && return
   [ "$potential_test" = 'teardown_dir' ] && return
   [ "$potential_test" = 'setup' ] && return
   [ "$potential_test" = 'teardown' ] && return
 
+  stdout_file="$(get_stdout_file "$potential_test")"
+  mkdir -p "$(dirname "$stdout_file")"
+
   [ $indent_level -eq 0 ] && : > "$stdout_file"
 
   if [ -d "$potential_test" ]
@@ -67,8 +122,10 @@ recurse() {
         [ -f setup ] && [ -x setup ] && ./setup >> "$stdout_file"
 
         # $2 instead of $indent_level so it doesn't clash
-        recurse "${test}" $(( $2 + 1 )) "$shell_for_sh_tests"
+        set +e
+        recurse "${test}" "$(( $2 + 1 ))" "$shell_for_sh_tests"
         exit_code=$?
+        set -e
 
         if $exit_on_fail && test $exit_code -ne 0; then
           [ -f teardown ] && [ -x teardown ] && ./teardown >> "$stdout_file"
@@ -161,7 +218,6 @@ recurse() {
       return 1
     fi
   fi
-  [ $indent_level -eq 0 ] && rm "$stdout_file"
 }
 
 has_sh_or_no_shebang_line() {
@@ -191,6 +247,7 @@ $USAGE
             contain the word "test".
 -t          Format output in Test Anything Protocol (TAP)
 -h, --help  This help.
+-r, --root  Print the Urchin root for a particular file or directory.
 -v          Display the version number.
 
 Go to https://github.com/tlevine/urchin for documentation on writing tests.
@@ -211,12 +268,11 @@ plural () {
 }
 
 urchin_go() {
-  rm -f "$logfile"
   if "$tap_format"; then
     printf \#\ 
   fi
   echo Running tests at $(date +%Y-%m-%dT%H:%M:%S)
-  start=$(date +%s)
+  start="$(date +%s)"
 
   # Determine the environment variable to define for test scripts
   # that reflects the specified or implied shell to use for shell-code tests.
@@ -231,7 +287,10 @@ urchin_go() {
     TEST_SHELL='/bin/sh'
   fi
 
-  recurse "$1" 0 "$2"  # test folder -- indentation level -- [shell to invoke test scripts with]
+  # 1 test folder
+  # 2 indentation level
+  # 3 shell to invoke test scripts with
+  recurse "$1" 0 "$2"
 
   finish=$(date +%s)
   elapsed=$(($finish - $start))
@@ -253,7 +312,7 @@ urchin_go() {
     printf '%s\n' "$failed $(plural test "$failed") failed."
     printf '\033[m'
   fi
-  rm -f "$logfile"
+# rm -f "$logfile"
   test -z "$failed" || test "$failed" -eq '0'
 }
 
@@ -269,51 +328,57 @@ urchin_molly_guard() {
   exit 1
 }
 
-shell_for_sh_tests=
+if test -z "$I_AM_SOURCING_URCHIN_IN_A_TEST"; then
-force=false
+  shell_for_sh_tests=
-exit_on_fail=false
+  force=false
-tap_format=false
+  exit_on_fail=false
-while [ $# -gt 0 ]
+  tap_format=false
-do
+  while [ $# -gt 0 ]
-    case "$1" in
+  do
-        -e) exit_on_fail=true;;
+      case "$1" in
-        -f) force=true;;
+          -e) exit_on_fail=true;;
-        -s)
+          -f) force=true;;
-          shift
+          -r|--root)
-          shell_for_sh_tests=$1
+            shift
-          which "$shell_for_sh_tests" > /dev/null || {
+            urchin_root "$1"
-            echo "Cannot find specified shell: '$shell_for_sh_tests'" >&2
-            urchin_help >&2
-            exit 11
-          } ;;
-        -t) tap_format=true;;
-        -h|--help) urchin_help
-          exit 0;;
-        -v) echo "$VERSION"
             exit;;
-        -*) urchin_help >&2
+          -s)
-            exit 1;;
+            shift
-        *)  break;;
+            shell_for_sh_tests=$1
-    esac
+            which "$shell_for_sh_tests" > /dev/null || {
-    shift
+              echo "Cannot find specified shell: '$shell_for_sh_tests'" >&2
-done
+              urchin_help >&2
+              exit 11
+            } ;;
+          -t) tap_format=true;;
+          -h|--help) urchin_help
+            exit 0;;
+          -v) echo "$VERSION"
+              exit;;
+          -*) urchin_help >&2
+              exit 1;;
+          *)  break;;
+      esac
+      shift
+  done
 
-# Verify argument for main stuff
+  # Verify argument for main stuff
-if [ "$#" != '1' ] || [ ! -d "$1" ]
+  if [ "$#" != '1' ] || [ ! -d "$1" ]
-  then
+    then
-  [ -n "$1" ] && [ ! -d "$1" ] && echo "Not a directory: '$1'" >&2
+    [ -n "$1" ] && [ ! -d "$1" ] && echo "Not a directory: '$1'" >&2
-  echo "$USAGE" >&2
+    echo "$USAGE" >&2
-  exit 11
+    exit 11
-fi
+  fi
-
+
-# Constants
+  # Run or present the Molly guard.
-logfile=$(fullpath "$1")/.urchin.log
+  if ! urchin_root "$1" > /dev/null; then
-stdout_file=$(fullpath "$1")/.urchin_stdout
+    exit 1
-
+  elif basename "$(readlink -f -- "$(urchin_root "$1")")" |
-# Run or present the Molly guard.
+    grep -Fi 'test' > /dev/null || $force; then
-if fullpath "$1" | grep -Fi 'test' > /dev/null || $force
+    logfile="$(readlink -f -- "$(urchin_root "$1")/.urchin/.log")"
-  then
+    printf '' > "$logfile"
-  urchin_go "$1" "$shell_for_sh_tests"
+    urchin_go "$1" "$shell_for_sh_tests"
-else
+  else
-  urchin_molly_guard
+    urchin_molly_guard
+  fi
 fi