adjust byte buffer reading

gauntlet/gauntlet.go

@@ -2,9 +2,10 @@
 package gauntlet
 
 import (
-	"bufio"
+	"bytes"
 	"errors"
 	"fmt"
+	"io"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -73,7 +74,6 @@ type ExecCommandOptions struct {
 //
 //	It will also check for any errors you specify in the output via the errHandling slice.
 func (g *Gauntlet) ExecCommand(args []string, options ExecCommandOptions) (string, error) {
-	output := ""
 	var updatedArgs []string
 	if g.Command == "gauntlet" {
 		updatedArgs = append([]string{g.Command}, args...)
@@ -93,22 +93,34 @@ func (g *Gauntlet) ExecCommand(args []string, options ExecCommandOptions) (strin
 	stderr, _ := cmd.StderrPipe()
 	cmdErr := cmd.Start()
 
-	reader := bufio.NewReader(stdout)
-	line, err := reader.ReadString('\n')
-	for err == nil {
-		log.Info().Str("stdout", line).Msg(g.Command)
-		output = fmt.Sprintf("%s%s", output, line)
-		line, err = reader.ReadString('\n')
+	// reader := bufio.NewReader(stdout)
+	// line, err := reader.ReadString('\n')
+	// for err == nil {
+	// 	log.Info().Str("stdout", line).Msg(g.Command)
+	// 	output = fmt.Sprintf("%s%s", output, line)
+	// 	line, err = reader.ReadString('\n')
+	// }
+
+	// reader = bufio.NewReader(stderr)
+	// line, err = reader.ReadString('\n')
+	// for err == nil {
+	// 	log.Info().Str("stderr", line).Msg(g.Command)
+	// 	output = fmt.Sprintf("%s%s", output, line)
+	// 	line, err = reader.ReadString('\n')
+	// }
+
+	outBytes, _ := io.ReadAll(stdout)
+	errBytes, _ := io.ReadAll(stderr)
+
+	for _, line := range bytes.Split(outBytes, []byte("\n")) {
+		log.Info().Str("stdout", string(line)).Msg(g.Command)
 	}
-
-	reader = bufio.NewReader(stderr)
-	line, err = reader.ReadString('\n')
-	for err == nil {
-		log.Info().Str("stderr", line).Msg(g.Command)
-		output = fmt.Sprintf("%s%s", output, line)
-		line, err = reader.ReadString('\n')
+	for _, line := range bytes.Split(errBytes, []byte("\n")) {
+		log.Info().Str("stderr", string(line)).Msg(g.Command)
 	}
 
+	output := string(outBytes) + "\n" + string(errBytes)
+
 	// return cmdErr from before, after stdout + stderr logging
 	if cmdErr != nil {
 		return output, cmdErr
@@ -121,12 +133,12 @@ func (g *Gauntlet) ExecCommand(args []string, options ExecCommandOptions) (strin
 		}
 	}
 
-	if strings.Compare("EOF", err.Error()) > 0 {
-		return output, err
-	}
+	// if strings.Compare("EOF", err.Error()) > 0 {
+	// 	return output, err
+	// }
 
 	// catch any exit codes
-	err = cmd.Wait()
+	err := cmd.Wait()
 
 	log.Debug().Str("Command", g.Command).Msg("command Completed")
 	return output, err