From 3337257fe24b67871406217e98862d34647dd725 Mon Sep 17 00:00:00 2001
From: Flu0r1ne <flur01ne@flu0r1ne.net>
Date: Fri, 13 Aug 2021 16:31:04 -0500
Subject: Add colorized output and build traces

---
 cmd/planr/sub/evaluate.go | 40 +++++++++++++---------------------------
 1 file changed, 13 insertions(+), 27 deletions(-)

(limited to 'cmd/planr/sub/evaluate.go')

diff --git a/cmd/planr/sub/evaluate.go b/cmd/planr/sub/evaluate.go
index 1174b3f..8ce4d81 100644
--- a/cmd/planr/sub/evaluate.go
+++ b/cmd/planr/sub/evaluate.go
@@ -1,7 +1,6 @@
 package sub
 
 import (
-  "fmt"
   "golang.flu0r1ne.net/planr"
 )
 
@@ -10,43 +9,30 @@ func Evaluate(params []string) {
 
   tcs := Runner().Evaluate(rd)
 
-  fmt.Printf("\n\nREPORT:\n=======\n\n")
-
   earned := 0.0
   total  := 0.0
+  passed := 0
   for _, tc := range tcs {
     cfg := tc.Config
-  
-    name := tc.Cname
-    if cfg.Title != nil {
-      name = *cfg.Title
-    }
 
-    var points float64 =  0.0
     if cfg.Points != nil {
-      points = float64(*cfg.Points)
-    }
+      points := float64(*cfg.Points)
+
+      total += points
 
-    status := "SILENT"
-    if tc.Result != nil {
-      if tc.Result.Pass {
-        status = "PASS"
+      if tc.Result.Status == planr.PASSING {
         earned += points
-      } else {
-        status = "FAIL"
+        passed++
       }
     }
 
-    total += points
-
-    fmt.Printf("[%s] %s (%f)\n", status, name, points)
-
-    if cfg.Description != nil {
-      fmt.Printf("> %s\n", *cfg.Description)
-    }
-
-    fmt.Println()
+    tcPprint(tc)
   }
 
-  fmt.Printf("Score: %f (%f%%)\n", earned, (earned / total) * 100)
+  printResults(
+    passed,
+    len(tcs),
+    earned,
+    total,
+  );
 }
-- 
cgit v1.2.3