Revert "Add BeforeAll/AfterAll"

This reverts commit 80fac44.
shellspec · Nov 29, 2019 · 5139e6b · 5139e6b
1 parent 8670210
commit 5139e6b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 46 deletions.
diff --git a/lib/core/dsl.sh b/lib/core/dsl.sh
@@ -56,7 +56,6 @@ shellspec_description() {
 shellspec_example_group() {
   shellspec_description "example_group" "${1:-}${1:+$SHELLSPEC_VT}"
   shellspec_yield
-  shellspec_call_after_hooks ALL
 }
 
 shellspec_example_block() {
@@ -95,8 +94,6 @@ shellspec_example() {
       shellspec_output EXAMPLE
       shellspec_output SUCCEEDED
     else
-      shellspec_call_before_hooks ALL
-      shellspec_mark_executed_group "$SHELLSPEC_GROUP_ID"
       shellspec_profile_start
       case $- in
         *e*)
@@ -269,9 +266,6 @@ shellspec_the() {
   shellspec_statement_preposition "$@"
 }
 
-shellspec_proxy shellspec_before_all "shellspec_register_before_hook ALL"
-shellspec_proxy shellspec_after_all "shellspec_register_after_hook ALL"
-
 shellspec_proxy shellspec_before "shellspec_register_before_hook EACH"
 shellspec_proxy shellspec_after "shellspec_register_after_hook EACH"
 

diff --git a/lib/core/hook.sh b/lib/core/hook.sh
@@ -9,9 +9,9 @@ shellspec_register_hook() {
     shift 2; \
     while [ \$# -gt 0 ]; do \
       SHELLSPEC_$1_$2_INDEX=\$((\$SHELLSPEC_$1_$2_INDEX + 1)); \
-      shellspec_hook_index SHELLSPEC_$1_$2_\$SHELLSPEC_$1_$2_INDEX \"\$1\"; \
+      shellspec_hook_index $1 $2 \$SHELLSPEC_$1_$2_INDEX \"\$1\"; \
       shift; \
-    done
+    done; \
   "
   eval "$SHELLSPEC_EVAL"
 }
@@ -20,28 +20,13 @@ shellspec_proxy shellspec_register_before_hook "shellspec_register_hook BEFORE"
 shellspec_proxy shellspec_register_after_hook "shellspec_register_hook AFTER"
 
 shellspec_hook_index() {
-  eval "$1=\$SHELLSPEC_SPEC_NO@\$SHELLSPEC_GROUP_ID@\$SHELLSPEC_AUX_LINENO:\$2"
+  eval "SHELLSPEC_$1_$2_$3=\$4:\${SHELLSPEC_AUX_LINENO:-}"
 }
 
 shellspec_call_hook() {
-  eval "SHELLSPEC_HOOK=\${$2#*:} SHELLSPEC_HOOK_ID=\${$2%:*}"
-  #shellcheck disable=SC2034
-  SHELLSPEC_HOOK_LINENO=${SHELLSPEC_HOOK_ID##*@}
-
-  case $1 in
-    BEFORE-ALL) shellspec_marked_tag "$SHELLSPEC_HOOK_ID" && return 0 ;;
-    AFTER-ALL)
-      [ "${SHELLSPEC_HOOK_ID%@*}" = "$SHELLSPEC_SPEC_NO@$SHELLSPEC_GROUP_ID" ] || return 0
-      shellspec_marked_tag "${SHELLSPEC_HOOK_ID%@*}" || return 0
-  esac
-
+  eval "SHELLSPEC_HOOK=\${$1%:*} SHELLSPEC_HOOK_LINENO=\${$1#*:}"
   eval "$SHELLSPEC_HOOK &&:" &&:
   SHELLSPEC_HOOK_STATUS=$?
-
-  case $1 in
-    BEFORE-ALL) shellspec_mark_tag "$SHELLSPEC_HOOK_ID"
-  esac
-
   return $SHELLSPEC_HOOK_STATUS
 }
 
@@ -50,7 +35,7 @@ shellspec_call_before_hooks() {
     shellspec_call_before_hooks "$1" 1
   else
     eval "[ \"\${2:-1}\" -gt \"\$SHELLSPEC_BEFORE_$1_INDEX\" ] &&:" && return 0
-    shellspec_call_hook "BEFORE-$1" "SHELLSPEC_BEFORE_$1_${2:-1}" || return $?
+    shellspec_call_hook "SHELLSPEC_BEFORE_$1_${2:-1}" || return $?
     shellspec_call_before_hooks "$1" "$((${2:-1} + 1))"
   fi
 }
@@ -61,27 +46,11 @@ shellspec_call_after_hooks() {
     shellspec_call_after_hooks "$1" "$2"
   else
     [ "$2" -lt 1 ] && return 0
-    shellspec_call_hook "AFTER-$1" "SHELLSPEC_AFTER_$1_$2" || return $?
+    shellspec_call_hook "SHELLSPEC_AFTER_$1_$2" || return $?
     shellspec_call_after_hooks "$1" $(($2 - 1))
   fi
 }
 
-shellspec_mark_executed_group() {
-  shellspec_mark_tag "$SHELLSPEC_SPEC_NO@$1"
-  case $1 in (*-*)
-    shellspec_mark_executed_group "${1%-*}"
-  esac
-}
-
-shellspec_mark_tag() {
-  [ -e "$SHELLSPEC_TMPBASE/$1" ] || : > "$SHELLSPEC_TMPBASE/$1"
-}
-
-shellspec_marked_tag() {
-  [ -e "$SHELLSPEC_TMPBASE/$1" ]
-}
-
 shellspec_create_hook EACH
 shellspec_create_hook CALL
 shellspec_create_hook RUN
-shellspec_create_hook ALL
diff --git a/lib/libexec/grammar.sh b/lib/libexec/grammar.sh
@@ -52,8 +52,6 @@ mapping() {
     Path              )   control path        "$2" ;;
     File              )   control path        "$2" ;;
     Dir               )   control path        "$2" ;;
-    BeforeAll         )   control before_all  "$2" ;;
-    AfterAll          )   control after_all   "$2" ;;
     Before            )   control before      "$2" ;;
     After             )   control after       "$2" ;;
     BeforeCall        )   control before_call "$2" ;;

diff --git a/lib/libexec/parallel-executor.sh b/lib/libexec/parallel-executor.sh
@@ -31,7 +31,7 @@ reduce() {
 }
 
 executor() {
-  SHELLSPEC_JOBDIR="$SHELLSPEC_TMPBASE/$$.jobs"
+  SHELLSPEC_JOBDIR="$SHELLSPEC_TMPBASE/jobs"
 
   mkdir "$SHELLSPEC_JOBDIR"