Merge pull request #30 from codecrafters-io/temp

temp

executable/executable.go

@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"time"
@@ -18,7 +17,7 @@ import (
 
 // Executable represents a program that can be executed
 type Executable struct {
-	path          string
+	Path          string
 	timeoutInSecs int
 	loggerFunc    func(string)
 
@@ -69,7 +68,7 @@ func nullLogger(msg string) {
 
 func (e *Executable) Clone() *Executable {
 	return &Executable{
-		path:          e.path,
+		Path:          e.Path,
 		timeoutInSecs: e.timeoutInSecs,
 		loggerFunc:    e.loggerFunc,
 		WorkingDir:    e.WorkingDir,
@@ -78,12 +77,12 @@ func (e *Executable) Clone() *Executable {
 
 // NewExecutable returns an Executable
 func NewExecutable(path string) *Executable {
-	return &Executable{path: path, timeoutInSecs: 10, loggerFunc: nullLogger}
+	return &Executable{Path: path, timeoutInSecs: 10, loggerFunc: nullLogger}
 }
 
 // NewVerboseExecutable returns an Executable struct with a logger configured
 func NewVerboseExecutable(path string, loggerFunc func(string)) *Executable {
-	return &Executable{path: path, timeoutInSecs: 10, loggerFunc: loggerFunc}
+	return &Executable{Path: path, timeoutInSecs: 10, loggerFunc: loggerFunc}
 }
 
 func (e *Executable) isRunning() bool {
@@ -106,27 +105,27 @@ func (e *Executable) Start(args ...string) error {
 
 	// While passing executables present on PATH, filepath.Abs is unable to resolve their absolute path.
 	// In those cases we use the path returned by LookPath.
-	resolvedPath, err = exec.LookPath(e.path)
+	resolvedPath, err = exec.LookPath(e.Path)
 	if err == nil {
 		absolutePath = resolvedPath
 	} else {
-		absolutePath, err = filepath.Abs(e.path)
+		absolutePath, err = filepath.Abs(e.Path)
 		if err != nil {
-			return fmt.Errorf("%s not found", e.path)
+			return fmt.Errorf("%s not found", e.Path)
 		}
 	}
 	fileInfo, err := os.Stat(absolutePath)
 	if err != nil {
-		return fmt.Errorf("%s not found", e.path)
+		return fmt.Errorf("%s not found", e.Path)
 	}
 
 	// Check executable permission
 	if fileInfo.Mode().Perm()&0111 == 0 || fileInfo.IsDir() {
-		return fmt.Errorf("%s is not an executable file", e.path)
+		return fmt.Errorf("%s is not an executable file", e.Path)
 	}
 
 	// TODO: Use timeout!
-	cmd := exec.Command(e.path, args...)
+	cmd := exec.Command(e.Path, args...)
 	cmd.Dir = e.WorkingDir
 	cmd.SysProcAttr = &syscall.SysProcAttr{Setpgid: true}
 	e.readDone = make(chan bool)
@@ -181,7 +180,7 @@ func (e *Executable) setupIORelay(source io.Reader, destination1 io.Writer, dest
 
 		e.atleastOneReadDone = true
 		e.readDone <- true
-		io.Copy(ioutil.Discard, source) // Let's drain the pipe in case any content is leftover
+		io.Copy(io.Discard, source) // Let's drain the pipe in case any content is leftover
 	}()
 }
 

logger/logger.go

@@ -180,6 +180,14 @@ func (l *Logger) Debugln(msg string) {
 	}
 }
 
+func (l *Logger) Plainf(fstring string, args ...interface{}) {
+	formattedString := fmt.Sprintf(fstring, args...)
+
+	for _, line := range strings.Split(formattedString, "\n") {
+		l.logger.Println(line)
+	}
+}
+
 func (l *Logger) Plainln(msg string) {
 	lines := strings.Split(msg, "\n")