0.9.2

xonixx · Dec 5, 2020 · 33038d4 · 33038d4
1 parent bee7d9d
commit 33038d4
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 21 deletions.
diff --git a/makesure b/makesure
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-VERSION="0.9.1"
+VERSION="0.9.2"
 
 exec awk -v "Version=$VERSION" -f - Makesurefile "$@" <<'MAKESURE'
 
@@ -192,12 +192,6 @@ function do_work(    i,j,goal_name,dep_cnt,dep,reached_if_condition,body,prelude
         }
     } else if ("-p" in Args || "--print" in Args) {
         print Script
-        print "__resolved_goals() {"
-        for (i = 1; i <= resolved_goals[0]; i++) {
-           print "  " resolved_goals[i]
-        }
-        print "}"
-        print "__resolved_goals"
     } else {
         cmd = Shell " -e"
         print Script | cmd
@@ -222,11 +216,12 @@ function issue_resolved_goals_to_run(result,    i, g, loop) {
         die_msg("There is a loop in goal dependencies via " loop[1] " -> " loop[2])
     }
 
-    issue_script_line("# resolved goals to execute")
-
+    issue_script_line("__resolved_goals() {")
     for (i = 1; i <= result[0]; i++) {
-        issue_script_line(result[i])
+       issue_script_line("  " result[i])
     }
+    issue_script_line("}")
+    issue_script_line("__resolved_goals")
 }
 
 function issue_script_line(line) {

diff --git a/makesure_stable b/makesure_stable
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-VERSION="0.9.1"
+VERSION="0.9.2"
 
 exec awk -v "Version=$VERSION" -f - Makesurefile "$@" <<'MAKESURE'
 
@@ -192,12 +192,6 @@ function do_work(    i,j,goal_name,dep_cnt,dep,reached_if_condition,body,prelude
         }
     } else if ("-p" in Args || "--print" in Args) {
         print Script
-        print "__resolved_goals() {"
-        for (i = 1; i <= resolved_goals[0]; i++) {
-           print "  " resolved_goals[i]
-        }
-        print "}"
-        print "__resolved_goals"
     } else {
         cmd = Shell " -e"
         print Script | cmd
@@ -222,11 +216,12 @@ function issue_resolved_goals_to_run(result,    i, g, loop) {
         die_msg("There is a loop in goal dependencies via " loop[1] " -> " loop[2])
     }
 
-    issue_script_line("# resolved goals to execute")
-
+    issue_script_line("__resolved_goals() {")
     for (i = 1; i <= result[0]; i++) {
-        issue_script_line(result[i])
+       issue_script_line("  " result[i])
     }
+    issue_script_line("}")
+    issue_script_line("__resolved_goals")
 }
 
 function issue_script_line(line) {

diff --git a/tests/0.tush b/tests/0.tush
@@ -1,7 +1,7 @@
 
 $ cd "$MYDIR"; ./makesure -v; ./makesure --version
 | 0.9.2
-| 0.9.1
+| 0.9.2
 
 $ cd "$MYDIR"; ./makesure -f non-existent-file
 @ makesure file not found: non-existent-file

diff --git a/tests/1_goals.tush b/tests/1_goals.tush
@@ -5,6 +5,12 @@ $ cd "$MYDIR"; ./makesure -f tests/1_goals.sh
 | aaa
 |   goal 'default' [empty].
 
+$ cd "$MYDIR"; ./makesure -f tests/1_goals.sh fail
+|   goal 'fail' ...
+| stdout
+@ stderr
+? 1
+
 $ cd "$MYDIR"; ./makesure -f tests/1_goals.sh -p | bash
 |   goal 'bbb' [already satisfied].
 |   goal 'aaa' ...

diff --git a/tests/4_trace.tush b/tests/4_trace.tush
@@ -11,6 +11,7 @@ $ cd "$MYDIR"; bash -c "./makesure -f tests/4_trace.sh -x 2> >(sed 's#\/.*\/test
 @ + cd tests
 @ + export A=aaa
 @ + A=aaa
+@ + __resolved_goals
 @ + default
 @ + bash -e
 @ + echo A=aaa