Add -q and -qq options (#4)

.docker-env/config.yml

@@ -17,7 +17,7 @@ compose_default_profile: app
 compose_sidecar_profile: sidecar
 
 # Debug options
-show_commands: true
+show_executed_commands: true
 
 # Env files to load environmental variables used in the docker-compose.yml file
 # for substitution in the services section

cmd/context.go

@@ -3,6 +3,7 @@ package cmd
 import (
 	"github.com/marcinhlybin/docker-env/addons"
 	"github.com/marcinhlybin/docker-env/config"
+	"github.com/marcinhlybin/docker-env/logger"
 	"github.com/marcinhlybin/docker-env/project"
 	"github.com/marcinhlybin/docker-env/registry"
 	"github.com/urfave/cli/v2"
@@ -42,6 +43,10 @@ func initializeConfig(c *cli.Context) (*config.Config, error) {
 	if err := cfg.LoadConfig(c.String("config")); err != nil {
 		return nil, err
 	}
+
+	// Show executed commands
+	logger.ShowExecutedCommands(cfg.ShowExecutedCommands)
+
 	return cfg, nil
 }
 

config/config.go

@@ -33,7 +33,7 @@ type Config struct {
 	PostStartHook          string   `yaml:"post_start_hook"`
 	PostStopHook           string   `yaml:"post_stop_hook"`
 	RequiredVars           []string `yaml:"required_vars"`
-	ShowCommands           bool     `yaml:"show_commands"`
+	ShowExecutedCommands   bool     `yaml:"show_executed_commands"`
 }
 
 func NewConfig() *Config {
@@ -51,7 +51,7 @@ func NewConfig() *Config {
 		PostStartHook:          "",
 		PostStopHook:           "",
 		RequiredVars:           []string{},
-		ShowCommands:           true,
+		ShowExecutedCommands:   true,
 	}
 }
 
@@ -118,6 +118,6 @@ func (c *Config) ShowConfig() error {
 	fmt.Println("VSCode default service:", c.VscodeDefaultService)
 	fmt.Println("VSCode default directory:", c.VscodeDefaultDir)
 	fmt.Println()
-	fmt.Println("Show commands:", c.ShowCommands)
+	fmt.Println("Show executed commands:", c.ShowExecutedCommands)
 	return nil
 }

docker/docker.go

@@ -20,8 +20,6 @@ type DockerCmd struct {
 }
 
 func NewDockerCmd(cfg *config.Config) *DockerCmd {
-	logger.ShowCommands(cfg.ShowCommands)
-
 	return &DockerCmd{
 		Config: cfg,
 		Cmd:    "docker",
@@ -90,12 +88,12 @@ func (dc *DockerCmd) Execute() error {
 	cmd := exec.Command(dc.Cmd, dc.Args...)
 	logger.Execute(cmd.String())
 
-	cmd.Stdin = os.Stdin
-	cmd.Stdout = os.Stdout
+	// cmd.Stdin = logger.Stdin()
+	cmd.Stdout = logger.Stdout()
 
 	// Capture stderr output
 	var stderrBuf bytes.Buffer
-	cmd.Stderr = io.MultiWriter(os.Stderr, &stderrBuf)
+	cmd.Stderr = io.MultiWriter(logger.Stderr(), &stderrBuf)
 
 	if err := cmd.Run(); err != nil {
 		// Log the captured stderr output

logger/logger.go

@@ -2,19 +2,60 @@ package logger
 
 import (
 	"fmt"
+	"io"
+	"os"
 
 	"github.com/pterm/pterm"
 )
 
+var isQuiet bool
+var isQuieter bool
+var showExecutedCommands bool
+
+// Default prefix texts
 var (
 	infoPrefixText    = "INFO"
 	executePrefixText = "EXECUTE"
 	warningPrefixText = "WARNING"
 	errorPrefixText   = "ERROR"
 	debugPrefixText   = "DEBUG"
-	executeEnabled    = true
 )
 
+// Stdin returns os.Stdin
+func Stdin() *os.File {
+	return os.Stdin
+}
+
+// Stdout returns os.Stdout or os.DevNull depending on the verbosity level
+func Stdout() io.Writer {
+	if isQuieter {
+		return io.Discard
+	}
+	return os.Stdout
+}
+
+// Stderr returns os.Stderr or os.DevNull depending on the verbosity level
+func Stderr() io.Writer {
+	if isQuieter {
+		return io.Discard
+	}
+	return os.Stderr
+}
+
+// Disables info messages
+func SetQuiet(quiet bool) {
+	isQuiet = quiet
+}
+
+// Disables commands output
+func SetQuieter(quiet bool) {
+	if quiet {
+		SetQuiet(quiet)
+	}
+	isQuieter = quiet
+
+}
+
 func SetPrefix(prefix string) {
 	infoPrefixText = prefix
 	executePrefixText = prefix
@@ -28,11 +69,14 @@ func SetDebug(debug bool) {
 	}
 }
 
-func ShowCommands(show bool) {
-	executeEnabled = show
+func ShowExecutedCommands(showCommands bool) {
+	showExecutedCommands = showCommands
 }
 
 func Info(format string, args ...any) {
+	if isQuiet {
+		return
+	}
 	pterm.Info.Prefix = pterm.Prefix{
 		Text:  infoPrefixText,
 		Style: pterm.NewStyle(pterm.BgGreen, pterm.FgBlack),
@@ -43,6 +87,9 @@ func Info(format string, args ...any) {
 }
 
 func Warning(format string, args ...any) {
+	if isQuieter {
+		return
+	}
 	pterm.Warning.Prefix = pterm.Prefix{
 		Text:  warningPrefixText,
 		Style: pterm.NewStyle(pterm.BgYellow, pterm.FgBlack),
@@ -73,7 +120,7 @@ func Error(format string, args ...any) {
 }
 
 func Execute(msg string) {
-	if !executeEnabled {
+	if isQuiet || !showExecutedCommands {
 		return
 	}
 	pterm.Info.Prefix = pterm.Prefix{

main.go

@@ -41,6 +41,16 @@ If environment name is not specified current branch name is used.`,
 				Aliases: []string{"d"},
 				Usage:   "enable debug mode",
 			},
+			&cli.BoolFlag{
+				Name:    "quiet",
+				Aliases: []string{"q"},
+				Usage:   "disable info messages",
+			},
+			&cli.BoolFlag{
+				Name:    "quieter",
+				Aliases: []string{"qq"},
+				Usage:   "disable docker output",
+			},
 		},
 		Before: func(c *cli.Context) error {
 			// Show help if no arguments
@@ -49,9 +59,17 @@ If environment name is not specified current branch name is used.`,
 			}
 
 			// Enable debug mode
-			if c.Bool("debug") {
-				logger.SetDebug(true)
-			}
+			showDebug := c.Bool("debug")
+			logger.SetDebug(showDebug)
+
+			// Disable info messages
+			// Docker output is still visible
+			quiet := c.Bool("quiet")
+			logger.SetQuiet(quiet)
+
+			// Disable all output except errors
+			quieter := c.Bool("quieter")
+			logger.SetQuieter(quieter)
 
 			return nil
 		},