make small enhancements

cmd/cmd.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
+	"github.com/mhewedy/vermin/log"
 	"github.com/mhewedy/vermin/progress"
 	"os"
 	"os/exec"
@@ -97,11 +98,12 @@ func prepend(x []string, y string) []string {
 }
 
 func (c *Cmd) log() {
-	if _, ok := os.LookupEnv("VERMIN_DEBUG_CMD"); ok {
-		fmt.Print("$ ", c.Command, " ")
+	if log.IsDebugEnabled() {
+		buf := bytes.NewBufferString("")
+		_, _ = fmt.Fprint(buf, "$ ", c.Command, " ")
 		for _, arg := range c.Args {
-			fmt.Print(arg, " ")
+			_, _ = fmt.Fprint(buf, arg, " ")
 		}
-		fmt.Println()
+		log.Debug(buf.String())
 	}
 }

command/restart.go

@@ -30,11 +30,7 @@ var restartCmd = &cobra.Command{
 	Long:  `Restart one or more VMs`,
 	Run: func(cmd *cobra.Command, args []string) {
 		for _, vmName := range args {
-			if err := vms.Stop(normalizeVmName(vmName)); err != nil {
-				fmt.Println(err)
-				os.Exit(1)
-			}
-			if err := vms.Start(normalizeVmName(vmName)); err != nil {
+			if err := vms.Restart(normalizeVmName(vmName)); err != nil {
 				fmt.Println(err)
 				os.Exit(1)
 			}

images/images.go

@@ -7,7 +7,7 @@ import (
 )
 
 var (
-	format = "%-40s%-10s\n"
+	format = "%-30s%-10s\n"
 	header = fmt.Sprintf(format, "IMAGE NAME", "DISK")
 )
 

log/log.go

@@ -8,12 +8,21 @@ import (
 	"time"
 )
 
+func IsDebugEnabled() bool {
+	_, ok := os.LookupEnv("VERMIN_DEBUG")
+	return ok
+}
+
 func Debug(format string, a ...interface{}) {
-	if _, ok := os.LookupEnv("VERMIN_DEBUG"); ok {
-		Info(format, a)
+	if IsDebugEnabled() {
+		Info("DEBUG: "+format, a...)
 	}
 }
 
+func Error(format string, a ...interface{}) {
+	Info("ERROR: "+format, a...)
+}
+
 func Info(format string, a ...interface{}) {
 	year, month, _ := time.Now().Date()
 	logFilePath := filepath.Join(db.BaseDir, fmt.Sprintf("log_%d-%d.log", year, month))

vms/list.go

@@ -13,7 +13,7 @@ import (
 )
 
 var (
-	format = "%-15s%-40s%-10s%-10s%-13s%s\n"
+	format = "%-15s%-30s%-10s%-10s%-13s%s\n"
 	header = fmt.Sprintf(format, "VM NAME", "IMAGE", "CPUS", "MEM", "DISK", "TAGS")
 )
 

vms/vms.go

@@ -56,6 +56,13 @@ func Stop(vmName string) error {
 	return nil
 }
 
+func Restart(vmName string) error {
+	if err := Stop(vmName); err != nil {
+		return nil
+	}
+	return start(vmName)
+}
+
 func SecureShell(vmName string) error {
 	if err := checkRunningVM(vmName); err != nil {
 		return err