add spartan mode

5 files changed, 39 insertions, 81 deletions

diff --git a/cmd/dcat/main.go b/cmd/dcat/main.go
index 2ac773a..63b4b61 100644
--- a/cmd/dcat/main.go
+++ b/cmd/dcat/main.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"flag"
 	"os"
-	"strings"
 
 	"github.com/mimecast/dtail/internal/clients"
 	"github.com/mimecast/dtail/internal/config"
@@ -20,16 +19,16 @@ func main() {
 	var cfgFile string
 	var debugEnable bool
 	var displayVersion bool
-	var noColor bool
 	var sshPort int
 
 	userName := user.Name()
 
+	flag.BoolVar(&args.Quiet, "quiet", false, "Quiet output mode")
+	flag.BoolVar(&args.Spartan, "spartan", false, "Spartan output mode")
 	flag.BoolVar(&args.TrustAllHosts, "trustAllHosts", false, "Auto trust all unknown host keys")
 	flag.BoolVar(&debugEnable, "debug", false, "Activate debug messages")
 	flag.BoolVar(&displayVersion, "version", false, "Display version")
-	flag.BoolVar(&noColor, "noColor", false, "Disable ANSII terminal colors")
-	flag.BoolVar(&args.Quiet, "quiet", false, "Quiet output mode")
+	flag.BoolVar(&args.NoColor, "noColor", false, "Disable ANSII terminal colors")
 	flag.IntVar(&args.ConnectionsPerCPU, "cpc", 10, "How many connections established per CPU core concurrently")
 	flag.IntVar(&sshPort, "port", 2222, "SSH server port")
 	flag.StringVar(&args.Discovery, "discovery", "", "Server discovery method")
@@ -40,25 +39,16 @@ func main() {
 	flag.StringVar(&cfgFile, "cfg", "", "Config file path")
 
 	flag.Parse()
-
-	if args.What == "" {
-		// Interpret additional args as file list.
-		var files []string
-		for _, file := range flag.Args() {
-			files = append(files, file)
-		}
-		args.What = strings.Join(files, ",")
-	}
-
-	config.Read(cfgFile, sshPort)
-	if noColor {
-		config.Client.TermColorsEnable = false
-	}
+	args.Transform(flag.Args())
+	config.Read(cfgFile, sshPort, args.NoColor)
+	args.TransformAfterConfigFile()
 
 	if displayVersion {
 		version.PrintAndExit()
 	}
-	version.Print()
+	if !args.Spartan {
+		version.Print()
+	}
 
 	ctx := context.TODO()
 	logger.Start(ctx, logger.Modes{
diff --git a/cmd/dgrep/main.go b/cmd/dgrep/main.go
index 35b2236..7b96472 100644
--- a/cmd/dgrep/main.go
+++ b/cmd/dgrep/main.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"flag"
 	"os"
-	"strings"
 
 	"github.com/mimecast/dtail/internal/clients"
 	"github.com/mimecast/dtail/internal/config"
@@ -21,17 +20,17 @@ func main() {
 	var debugEnable bool
 	var displayVersion bool
 	var grep string
-	var noColor bool
 	var sshPort int
 
 	userName := user.Name()
 
+	flag.BoolVar(&args.Quiet, "quiet", false, "Quiet output mode")
 	flag.BoolVar(&args.RegexInvert, "invert", false, "Invert regex")
+	flag.BoolVar(&args.Spartan, "spartan", false, "Spartan output mode")
 	flag.BoolVar(&args.TrustAllHosts, "trustAllHosts", false, "Auto trust all unknown host keys")
 	flag.BoolVar(&debugEnable, "debug", false, "Activate debug messages")
 	flag.BoolVar(&displayVersion, "version", false, "Display version")
-	flag.BoolVar(&noColor, "noColor", false, "Disable ANSII terminal colors")
-	flag.BoolVar(&args.Quiet, "quiet", false, "Quiet output mode")
+	flag.BoolVar(&args.NoColor, "noColor", false, "Disable ANSII terminal colors")
 	flag.IntVar(&args.ConnectionsPerCPU, "cpc", 10, "How many connections established per CPU core concurrently")
 	flag.IntVar(&sshPort, "port", 2222, "SSH server port")
 	flag.StringVar(&args.Discovery, "discovery", "", "Server discovery method")
@@ -44,25 +43,16 @@ func main() {
 	flag.StringVar(&grep, "grep", "", "Alias for -regex")
 
 	flag.Parse()
-
-	if args.What == "" {
-		// Interpret additional args as file list.
-		var files []string
-		for _, file := range flag.Args() {
-			files = append(files, file)
-		}
-		args.What = strings.Join(files, ",")
-	}
-
-	config.Read(cfgFile, sshPort)
-	if noColor {
-		config.Client.TermColorsEnable = false
-	}
+	args.Transform(flag.Args())
+	config.Read(cfgFile, sshPort, args.NoColor)
+	args.TransformAfterConfigFile()
 
 	if displayVersion {
 		version.PrintAndExit()
 	}
-	version.Print()
+	if !args.Spartan {
+		version.Print()
+	}
 
 	ctx := context.TODO()
 	logger.Start(ctx, logger.Modes{
diff --git a/cmd/dmap/main.go b/cmd/dmap/main.go
index ab710ac..4525503 100644
--- a/cmd/dmap/main.go
+++ b/cmd/dmap/main.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"flag"
 	"os"
-	"strings"
 
 	"github.com/mimecast/dtail/internal/clients"
 	"github.com/mimecast/dtail/internal/config"
@@ -20,7 +19,6 @@ func main() {
 	var cfgFile string
 	var debugEnable bool
 	var displayVersion bool
-	var noColor bool
 	var queryStr string
 	var sshPort int
 
@@ -30,11 +28,12 @@ func main() {
 
 	userName := user.Name()
 
+	flag.BoolVar(&args.Quiet, "quiet", false, "Quiet output mode")
+	flag.BoolVar(&args.Spartan, "spartan", false, "Spartan output mode")
 	flag.BoolVar(&args.TrustAllHosts, "trustAllHosts", false, "Auto trust all unknown host keys")
 	flag.BoolVar(&debugEnable, "debug", false, "Activate debug messages")
 	flag.BoolVar(&displayVersion, "version", false, "Display version")
-	flag.BoolVar(&noColor, "noColor", false, "Disable ANSII terminal colors")
-	flag.BoolVar(&args.Quiet, "quiet", false, "Quiet output mode")
+	flag.BoolVar(&args.NoColor, "noColor", false, "Disable ANSII terminal colors")
 	flag.IntVar(&args.ConnectionsPerCPU, "cpc", 10, "How many connections established per CPU core concurrently")
 	flag.IntVar(&args.Timeout, "timeout", 0, "Max time dtail server will collect data until disconnection")
 	flag.IntVar(&sshPort, "port", 2222, "SSH server port")
@@ -47,25 +46,16 @@ func main() {
 	flag.StringVar(&queryStr, "query", "", "Map reduce query")
 
 	flag.Parse()
-
-	if args.What == "" {
-		// Interpret additional args as file list.
-		var files []string
-		for _, file := range flag.Args() {
-			files = append(files, file)
-		}
-		args.What = strings.Join(files, ",")
-	}
-
-	config.Read(cfgFile, sshPort)
-	if noColor {
-		config.Client.TermColorsEnable = false
-	}
+	args.Transform(flag.Args())
+	config.Read(cfgFile, sshPort, args.NoColor)
+	args.TransformAfterConfigFile()
 
 	if displayVersion {
 		version.PrintAndExit()
 	}
-	version.Print()
+	if !args.Spartan {
+		version.Print()
+	}
 
 	ctx := context.TODO()
 	logger.Start(ctx, logger.Modes{
diff --git a/cmd/dserver/main.go b/cmd/dserver/main.go
index 1fe77a7..bc3cb91 100644
--- a/cmd/dserver/main.go
+++ b/cmd/dserver/main.go
@@ -43,8 +43,8 @@ func main() {
 	flag.StringVar(&logDir, "logDir", "", "Log dir path")
 
 	flag.Parse()
-	config.Read(cfgFile, sshPort)
-	config.Client.TermColorsEnable = color
+	config.Read(cfgFile, sshPort, !color)
+
 	if logDir != "" {
 		config.Common.LogDir = logDir
 		if config.Common.LogStrategy == "" {
diff --git a/cmd/dtail/main.go b/cmd/dtail/main.go
index 3c3443f..5c2d393 100644
--- a/cmd/dtail/main.go
+++ b/cmd/dtail/main.go
@@ -8,7 +8,6 @@ import (
 	_ "net/http"
 	_ "net/http/pprof"
 	"os"
-	"strings"
 	"time"
 
 	"github.com/mimecast/dtail/internal/clients"
@@ -30,7 +29,6 @@ func main() {
 	var displayColorTable bool
 	var displayVersion bool
 	var grep string
-	var noColor bool
 	var pprof int
 	var queryStr string
 	var shutdownAfter int
@@ -40,12 +38,13 @@ func main() {
 
 	flag.BoolVar(&args.Quiet, "quiet", false, "Quiet output mode")
 	flag.BoolVar(&args.RegexInvert, "invert", false, "Invert regex")
+	flag.BoolVar(&args.Spartan, "spartan", false, "Spartan output mode")
 	flag.BoolVar(&args.TrustAllHosts, "trustAllHosts", false, "Auto trust all unknown host keys")
 	flag.BoolVar(&checkHealth, "checkHealth", false, "Only check for server health")
 	flag.BoolVar(&debugEnable, "debug", false, "Activate debug messages")
 	flag.BoolVar(&displayColorTable, "colorTable", false, "Show color table")
 	flag.BoolVar(&displayVersion, "version", false, "Display version")
-	flag.BoolVar(&noColor, "noColor", false, "Disable ANSII terminal colors")
+	flag.BoolVar(&args.NoColor, "noColor", false, "Disable ANSII terminal colors")
 	flag.IntVar(&args.ConnectionsPerCPU, "cpc", 10, "How many connections established per CPU core concurrently")
 	flag.IntVar(&args.Timeout, "timeout", 0, "Max time dtail server will collect data until disconnection")
 	flag.IntVar(&pprof, "pprof", -1, "Start PProf server this port")
@@ -62,32 +61,21 @@ func main() {
 	flag.StringVar(&queryStr, "query", "", "Map reduce query")
 
 	flag.Parse()
-
-	if args.What == "" {
-		// Interpret additional args as file list.
-		var files []string
-		for _, file := range flag.Args() {
-			files = append(files, file)
-		}
-		args.What = strings.Join(files, ",")
-	}
-
 	if grep != "" {
 		args.RegexStr = grep
 	}
-
-	config.Read(cfgFile, sshPort)
-	if noColor {
-		config.Client.TermColorsEnable = false
-	}
+	args.Transform(flag.Args())
+	config.Read(cfgFile, sshPort, args.NoColor)
+	args.TransformAfterConfigFile()
 
 	if displayVersion {
 		version.PrintAndExit()
 	}
-	version.Print()
-
-	if displayColorTable {
-		color.TablePrintAndExit(debugEnable)
+	if !args.Spartan {
+		version.Print()
+		if displayColorTable {
+			color.TablePrintAndExit(debugEnable)
+		}
 	}
 
 	ctx, cancel := context.WithCancel(context.Background())