Change the structure of the temporary files

lib/core/dsl.sh

@@ -135,6 +135,14 @@ shellspec_example() {
 shellspec_invoke_example() {
   shellspec_output EXAMPLE
 
+  # shellcheck disable=SC2034
+  {
+    SHELLSPEC_WORKDIR="$SHELLSPEC_TMPBASE/$SHELLSPEC_SPEC_NO"
+    SHELLSPEC_STDIN_FILE="$SHELLSPEC_WORKDIR/$SHELLSPEC_EXAMPLE_NO.stdin"
+    SHELLSPEC_STDOUT_FILE="$SHELLSPEC_WORKDIR/$SHELLSPEC_EXAMPLE_NO.stdout"
+    SHELLSPEC_STDERR_FILE="$SHELLSPEC_WORKDIR/$SHELLSPEC_EXAMPLE_NO.stderr"
+  }
+
   shellspec_on NOT_IMPLEMENTED
   shellspec_off FAILED WARNED EXPECTATION
   shellspec_off UNHANDLED_STATUS UNHANDLED_STDOUT UNHANDLED_STDERR

lib/core/evaluation.sh

@@ -1,8 +1,5 @@
 #shellcheck shell=sh
 
-SHELLSPEC_STDIN_FILE="$SHELLSPEC_TMPBASE/$$.stdin"
-SHELLSPEC_STDOUT_FILE="$SHELLSPEC_TMPBASE/$$.stdout"
-SHELLSPEC_STDERR_FILE="$SHELLSPEC_TMPBASE/$$.stderr"
 SHELLSPEC_SHELL_OPTIONS=''
 
 SHELLSPEC_STDIN_DEV=/dev/null

lib/core/matchers/satisfy.sh

@@ -2,11 +2,12 @@
 
 shellspec_syntax 'shellspec_matcher_satisfy'
 
-SHELLSPEC_SATISFY_STDOUT_FILE="$SHELLSPEC_TMPBASE/$$.satisfy.stdout"
-SHELLSPEC_SATISFY_STDERR_FILE="$SHELLSPEC_TMPBASE/$$.satisfy.stderr"
 
 shellspec_matcher_satisfy() {
   shellspec_matcher__match() {
+    SHELLSPEC_SATISFY_STDOUT_FILE="$SHELLSPEC_WORKDIR/satisfy.stdout"
+    SHELLSPEC_SATISFY_STDERR_FILE="$SHELLSPEC_WORKDIR/satisfy.stderr"
+
     if ! shellspec_is_function "${1:-}"; then
       shellspec_output SYNTAX_ERROR "'$1' is not function name"
       return 0

lib/core/modifiers/result.sh

@@ -2,10 +2,10 @@
 
 shellspec_syntax 'shellspec_modifier_result'
 
-SHELLSPEC_RESULT_STDOUT_FILE="$SHELLSPEC_TMPBASE/$$.result.stdout"
-SHELLSPEC_RESULT_STDERR_FILE="$SHELLSPEC_TMPBASE/$$.result.stderr"
-
 shellspec_modifier_result() {
+  SHELLSPEC_RESULT_STDOUT_FILE="$SHELLSPEC_WORKDIR/result.stdout"
+  SHELLSPEC_RESULT_STDERR_FILE="$SHELLSPEC_WORKDIR/result.stderr"
+
   if [ "${SHELLSPEC_SUBJECT+x}" ]; then
     if ! shellspec_is_function "$SHELLSPEC_SUBJECT"; then
       shellspec_output SYNTAX_ERROR "'$SHELLSPEC_SUBJECT' is not function name"

lib/libexec/executor.sh

@@ -0,0 +1,16 @@
+#shellcheck shell=sh disable=SC2004
+
+count_specfiles() {
+  eval "$1=0; found_specfile() { $1=\$((\$$1 + 1)); }"
+  shift
+  eval find_specfiles found_specfile ${1+'"$@"'}
+}
+
+create_workdirs() {
+  i=0
+  while [ "$i" -lt "$1" ] && i=$(($i + 1)); do
+    set -- "$@" "$SHELLSPEC_TMPBASE/$i"
+  done
+  shift
+  [ $# -eq 0 ] || mkdir "$@"
+}

lib/libexec/kcov-executor.sh

@@ -5,17 +5,14 @@
 
 use includes replace_all
 
-kcov_preprocess() {
-  [ -d "$SHELLSPEC_COVERAGE_DIR" ] || return 0
-
-  # Cleanup previous coverage data
-  rm -rf "${SHELLSPEC_COVERAGE_DIR:?}/${SHELLSPEC_KCOV_FILENAME:?}"*
-}
-
 executor() {
   #shellcheck disable=SC2039
   [ "$(ulimit -n)" -lt 1024 ] && ulimit -n 1024
 
+  count=0
+  eval count_specfiles count ${1+'"$@"'}
+  create_workdirs "$count"
+
   #shellcheck disable=SC2034
   SHELLSPEC_COVERAGE_SETUP="$SHELLSPEC_LIB/cov/kcov-setup.sh"
   #shellcheck disable=SC2034
@@ -41,6 +38,13 @@ executor() {
   eval "kcov_postprocess; return $?"
 }
 
+kcov_preprocess() {
+  [ -d "$SHELLSPEC_COVERAGE_DIR" ] || return 0
+
+  # Cleanup previous coverage data
+  rm -rf "${SHELLSPEC_COVERAGE_DIR:?}/${SHELLSPEC_KCOV_FILENAME:?}"*
+}
+
 kcov_postprocess() {
   [ -d "$SHELLSPEC_COVERAGE_DIR" ] || return 0
 

lib/libexec/parallel-executor.sh

@@ -40,6 +40,7 @@ executor() {
     putsn "$1" > "$SHELLSPEC_JOBDIR/$jobs.job"
   }
   eval find_specfiles specfile ${1+'"$@"'}
+  create_workdirs "$jobs"
 
   translator --no-finished | $SHELLSPEC_SHELL # output only metadata
   callback() { worker "$1" "$jobs" & }

lib/libexec/serial-executor.sh

@@ -4,5 +4,8 @@
 . "${SHELLSPEC_LIB:-./lib}/libexec.sh"
 
 executor() {
+  count=0
+  eval count_specfiles count ${1+'"$@"'}
+  create_workdirs "$count"
   translator "$@" | $SHELLSPEC_SHELL
 }

libexec/shellspec-executor.sh

@@ -3,6 +3,9 @@
 
 set -eu
 
+# shellcheck source=lib/libexec/executor.sh
+. "${SHELLSPEC_LIB:-./lib}/libexec/executor.sh"
+
 if [ "$SHELLSPEC_KCOV" -gt 0 ]; then
   # shellcheck source=lib/libexec/kcov-executor.sh
   . "${SHELLSPEC_LIB:-./lib}/libexec/kcov-executor.sh"

libexec/shellspec-reporter.sh

@@ -10,7 +10,7 @@ interrupt=''
 if (trap - INT) 2>/dev/null; then trap 'interrupt=1' INT; fi
 if (trap - TERM) 2>/dev/null; then trap '' TERM; fi
 
-[ "${SHELLSPEC_TMPBASE:-}" ] && echo $$ > "$SHELLSPEC_TMPBASE/reporter.pid"
+echo $$ > "$SHELLSPEC_TMPBASE/$SHELLSPEC_REPORTER_PID"
 
 # shellcheck source=lib/libexec/reporter.sh
 . "${SHELLSPEC_LIB:-./lib}/libexec/reporter.sh"

libexec/shellspec-runner.sh

@@ -22,16 +22,17 @@ stop_profiler() {
 
 cleanup() {
   if (trap - INT) 2>/dev/null; then trap '' INT; fi
-  [ "$SHELLSPEC_TMPBASE" ] || return 0
-  tmpbase="$SHELLSPEC_TMPBASE" && SHELLSPEC_TMPBASE=''
-  [ "$SHELLSPEC_KEEP_TEMPDIR" ] || rmtempdir "$tmpbase"
+  set -- "$SHELLSPEC_TMPBASE" && SHELLSPEC_TMPBASE=''
+  [ "$SHELLSPEC_KEEP_TEMPDIR" ] && return 0
+  [ "$1" ] || return 0
+  rmtempdir "$1" &
 }
 
 interrupt() {
   trap '' TERM # Workaround for posh: Prevent display 'Terminated'.
   stop_profiler
   reporter_pid=''
-  read_pid_file reporter_pid "$SHELLSPEC_TMPBASE/reporter.pid" 0
+  read_pid_file reporter_pid "$SHELLSPEC_TMPBASE/$SHELLSPEC_REPORTER_PID" 0
   [ "$reporter_pid" ] && sleep_wait sigchk "$reporter_pid"
   sigterm 0 &&:
   cleanup

package.json

@@ -54,6 +54,7 @@
     "lib/general.sh",
     "lib/libexec.sh",
     "lib/libexec/binary.sh",
+    "lib/libexec/executor.sh",
     "lib/libexec/grammar.sh",
     "lib/libexec/grammar/blocks",
     "lib/libexec/grammar/directives",

shellspec

@@ -74,10 +74,11 @@ export SHELLSPEC_KCOV_COMMON_OPTS=''
 export SHELLSPEC_KCOV_OPTS=''
 export SHELLSPEC_KCOV_FILENAME=''
 export SHELLSPEC_KCOV_IN_FILE=''
+export SHELLSPEC_REPORTER_PID='.shellspec-reporter.pid'
 export SHELLSPEC_PROFILER=''
 export SHELLSPEC_PROFILER_LOG=''
 export SHELLSPEC_PROFILER_LIMIT=10
-export SHELLSPEC_PROFILER_REPORT="profiler.log"
+export SHELLSPEC_PROFILER_REPORT=".shellspec-profiler.log"
 export SHELLSPEC_DEFECT_READONLY=''
 export SHELLSPEC_DEFECT_BUILTIN=''
 export SHELLSPEC_DEFECT_REDEFINE=''

spec/libexec/executor_spec.sh

@@ -0,0 +1,32 @@
+#shellcheck shell=sh
+
+Describe "libexec/executor.sh"
+  Include "$SHELLSPEC_LIB/libexec/executor.sh"
+
+  Describe "count_specfiles()"
+    Before count=''
+
+    find_specfiles() {
+      _callback=$1 && shift
+      while [ $# -gt 0 ]; do "$_callback"; shift ; done
+    }
+
+    It 'counts specfiles'
+      When call count_specfiles count file1 file3 file3
+      The variable count should eq 3
+    End
+  End
+
+  Describe "create_workdirs()"
+    mkdir() { printf '%s\n' "$@"; }
+
+    It 'creates workdirs'
+      When call create_workdirs 5
+      The line 1 of stdout should eq "$SHELLSPEC_TMPBASE/1"
+      The line 2 of stdout should eq "$SHELLSPEC_TMPBASE/2"
+      The line 3 of stdout should eq "$SHELLSPEC_TMPBASE/3"
+      The line 4 of stdout should eq "$SHELLSPEC_TMPBASE/4"
+      The line 5 of stdout should eq "$SHELLSPEC_TMPBASE/5"
+    End
+  End
+End