updated the runners

Author: Keloran

apps/apps.go

@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"io"
 	"io/ioutil"
-  "log"
-  "os"
+	"log"
+	"os"
 	"os/exec"
 	"strings"
 
@@ -91,8 +91,8 @@ func (a Apps) brewInstall() error {
 			defer stdin.Close()
 			_, err := io.WriteString(stdin, a.SudoPassword)
 			if err != nil {
-			  log.Fatalf("brew install write sudo: %+v", err)
-      }
+				log.Fatalf("brew install write sudo: %+v", err)
+			}
 		}()
 
 		_, err = c.CombinedOutput()
@@ -139,6 +139,7 @@ func (a Apps) InstallCLI() error {
 		for _, installer := range apps {
 			switch installer.Installer {
 			case "brew":
+				c := console.NewConsole(false).Start("Brew Installs")
 				for _, app := range installer.ToInstall {
 					if installer.Extra == "tap" {
 						if err := tap(app); err != nil {
@@ -148,39 +149,50 @@ func (a Apps) InstallCLI() error {
 					}
 
 					i := Brew{
-						App: app,
+						App:     app,
+						Console: c,
 					}
 					if err := Install(i); err != nil {
 						return fmt.Errorf("brew install: %w", err)
 					}
 				}
+				c.End("Brew Installs")
 			case "cask":
+				c := console.NewConsole(false).Start("Cask Installs")
 				for _, app := range installer.ToInstall {
 					i := Cask{
-						App: app,
+						App:     app,
+						Console: c,
 					}
 					if err := Install(i); err != nil {
 						return fmt.Errorf("cask install: %w", err)
 					}
 				}
+				c.End("Cask Installs")
 			case "apm":
+				c := console.NewConsole(false).Start("APM Installs")
 				for _, app := range installer.ToInstall {
 					i := APM{
 						Package: app,
+						Console: c,
 					}
 					if err := Install(i); err != nil {
 						return fmt.Errorf("APM install: %w", err)
 					}
 				}
+				c.End("APN Installs")
 			case "mas":
+				c := console.NewConsole(false).Start("MAS Installs")
 				for _, app := range installer.ToInstall {
 					i := MAS{
-						App: app,
+						App:     app,
+						Console: c,
 					}
 					if err := Install(i); err != nil {
 						return fmt.Errorf("MAS install: %w", err)
 					}
 				}
+				c.End("MAS Installs")
 			}
 		}
 	}

apps/runners.go

@@ -3,26 +3,32 @@ package apps
 import (
 	"fmt"
 	"os/exec"
+
+	"github.com/Keloran/dotfilesLoader/console"
 )
 
 type Runner interface {
 	install() error
 }
 
 type Brew struct {
-	App string
+	App     string
+	Console console.Console
 }
 
 type Cask struct {
-	App string
+	App     string
+	Console console.Console
 }
 
 type MAS struct {
-	App string
+	App     string
+	Console console.Console
 }
 
 type APM struct {
 	Package string
+	Console console.Console
 }
 
 func Install(r Runner) error {
@@ -36,22 +42,55 @@ func (i Brew) install() error {
 	}
 
 	if len(out) > 0 {
-		fmt.Printf("%s\n", out)
+		i.Console.Log(fmt.Sprintf("%s output: %s\n", i.App, out))
 	} else {
-		fmt.Printf("%s installed\n", i.App)
+		i.Console.Info(fmt.Sprintf("%s installed\n", i.App))
 	}
 
 	return nil
 }
 
 func (i Cask) install() error {
+	out, err := exec.Command("brew", "cask", "install", i.App).Output()
+	if err != nil {
+		return fmt.Errorf("runners casks: %w", err)
+	}
+
+	if len(out) > 0 {
+		i.Console.Log(fmt.Sprintf("%s output: %s\n", i.App, out))
+	} else {
+		i.Console.Info(fmt.Sprintf("%s installed\n", i.App))
+	}
+
 	return nil
 }
 
 func (i MAS) install() error {
+	out, err := exec.Command("mas", "install", i.App).Output()
+	if err != nil {
+		return fmt.Errorf("runners mas: %w", err)
+	}
+
+	if len(out) > 0 {
+		i.Console.Log(fmt.Sprintf("%s output: %s\n", i.App, out))
+	} else {
+		i.Console.Info(fmt.Sprintf("%s installed\n", i.App))
+	}
+
 	return nil
 }
 
 func (i APM) install() error {
+	out, err := exec.Command("apm", "install", i.Package).Output()
+	if err != nil {
+		return fmt.Errorf("runners mas: %w", err)
+	}
+
+	if len(out) > 0 {
+		i.Console.Log(fmt.Sprintf("%s output: %s\n", i.Package, out))
+	} else {
+		i.Console.Info(fmt.Sprintf("%s installed\n", i.Package))
+	}
+
 	return nil
 }