more rebust error reporting

Author: linkdata

pkg/gitter.go

@@ -50,11 +50,31 @@ type DefaultGitter struct {
 	DebugOut io.Writer
 }
 
+func MaybeSync(w io.Writer) {
+	if syncer, ok := w.(interface{ Sync() error }); ok {
+		_ = syncer.Sync()
+	}
+}
+
 func (dg DefaultGitter) Exec(args ...string) (output []byte, err error) {
 	var sout, serr bytes.Buffer
 	cmd := exec.Command(dg.Git, args...) /* #nosec G204 */
 	cmd.Stdout = &sout
 	cmd.Stderr = &serr
+	if dg.DebugOut != nil {
+		fmt.Fprintf(dg.DebugOut, "%q =>", strings.Join(cmd.Args, " "))
+		MaybeSync(dg.DebugOut)
+		defer func(w io.Writer) {
+			result := "OK"
+			if err != nil {
+				result = err.Error()
+			} else if serr.Len() > 0 {
+				result = serr.String()
+			}
+			fmt.Fprintf(w, " (%v+%v) %v\n", sout.Len(), serr.Len(), result)
+			MaybeSync(w)
+		}(dg.DebugOut)
+	}
 	err = cmd.Run()
 	output = bytes.TrimSpace(sout.Bytes())
 	stderr := bytes.TrimSpace(serr.Bytes())
@@ -63,13 +83,6 @@ func (dg DefaultGitter) Exec(args ...string) (output []byte, err error) {
 	} else {
 		output = append(output, stderr...)
 	}
-	if dg.DebugOut != nil {
-		result := "OK"
-		if err != nil {
-			result = err.Error()
-		}
-		fmt.Fprintf(dg.DebugOut, "%q => (%v+%v) %v\n", strings.Join(cmd.Args, " "), len(output), len(stderr), result)
-	}
 	return
 }
 

pkg/gitter_test.go

@@ -203,6 +203,13 @@ func Test_DefaultGitter_GetBuild(t *testing.T) {
 	}
 }
 
+func Test_maybeSync(t *testing.T) {
+	if f, err := os.CreateTemp("", ""); err == nil {
+		defer os.Remove(f.Name())
+		gitsemver.MaybeSync(f)
+	}
+}
+
 func Test_DefaultGitter_FetchTags(t *testing.T) {
 	dg, err := gitsemver.NewDefaultGitter("git", nil)
 	if err != nil {