bump warg

Author: bbkane

go.mod

@@ -12,7 +12,7 @@ require (
 	github.com/pkg/errors v0.9.1
 	github.com/vartanbeno/go-reddit/v2 v2.0.1
 	go.bbkane.com/logos v0.3.0
-	go.bbkane.com/warg v0.0.12
+	go.bbkane.com/warg v0.0.13
 	go.uber.org/atomic v1.9.0 // indirect
 	go.uber.org/multierr v1.7.0 // indirect
 	go.uber.org/zap v1.20.0

go.sum

@@ -148,6 +148,8 @@ go.bbkane.com/logos v0.3.0 h1:NJZAoUp0dYW5Kl5A2Zxw+uGKGwiG/t7CgxGaM167+28=
 go.bbkane.com/logos v0.3.0/go.mod h1:IqUA0K5saG+eDGkY9LQOfJYO1nJOF3nnq8AWeHuViIU=
 go.bbkane.com/warg v0.0.12 h1:+Jwf70ey/dlPCDmEREJSd045p1eGTX7r482bT2v3Cwc=
 go.bbkane.com/warg v0.0.12/go.mod h1:kfv+iD8YFvnpqv9bUR2zp1PYTHHJWesIikcRcuJTgIc=
+go.bbkane.com/warg v0.0.13 h1:BlnLM/gvELYqMpgAlAZCHLDJXKq1/uXKx1tLa+NtqXA=
+go.bbkane.com/warg v0.0.13/go.mod h1:kfv+iD8YFvnpqv9bUR2zp1PYTHHJWesIikcRcuJTgIc=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
 go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=

main.go

@@ -11,7 +11,7 @@ import (
 	"go.bbkane.com/warg/value"
 )
 
-func main() {
+func app() *warg.App {
 	appFooter := `Examples (assuming BASH-like shell):
 
   # Grab from passed flags
@@ -28,29 +28,29 @@ func main() {
   grabbit grab
 `
 	grabCmd := command.New(
-		command.HelpShort("Grab images. Optionally use `config edit` first to create a config"),
+		"Grab images. Optionally use `config edit` first to create a config",
 		grab,
 		command.Flag(
-			flag.Name("--subreddit-name"),
-			flag.HelpShort("subreddit to grab"),
+			"--subreddit-name",
+			"subreddit to grab",
 			value.StringSlice,
 			flag.Alias("-sn"),
 			flag.Default("earthporn", "wallpapers"),
 			flag.ConfigPath("subreddits[].name"),
 			flag.Required(),
 		),
 		command.Flag(
-			flag.Name("--subreddit-destination"),
-			flag.HelpShort("Where to store the subreddit"),
+			"--subreddit-destination",
+			"Where to store the subreddit",
 			value.PathSlice,
 			flag.Alias("-sd"),
 			flag.Default(".", "."),
 			flag.ConfigPath("subreddits[].destination"),
 			flag.Required(),
 		),
 		command.Flag(
-			flag.Name("--subreddit-timeframe"),
-			flag.HelpShort("Take the top subreddits from this timeframe"),
+			"--subreddit-timeframe",
+			"Take the top subreddits from this timeframe",
 			// TODO: this should be a StringEnumSlice once that's implemented
 			value.StringSlice,
 			flag.Alias("-st"),
@@ -59,8 +59,8 @@ func main() {
 			flag.Required(),
 		),
 		command.Flag(
-			flag.Name("--subreddit-limit"),
-			flag.HelpShort("max number of links to try to download"),
+			"--subreddit-limit",
+			"max number of links to try to download",
 			value.IntSlice,
 			flag.Alias("-sl"),
 			flag.Default("2", "3"),
@@ -70,67 +70,66 @@ func main() {
 	)
 
 	app := warg.New(
-		"grabbit",
 		section.New(
-			section.HelpShort("Get top images from subreddits"),
+			"Get top images from subreddits",
 			section.ExistingCommand(
-				command.Name("grab"),
+				"grab",
 				grabCmd,
 			),
 			section.Footer(appFooter),
 			section.Command(
-				command.Name("version"),
-				command.HelpShort("Print version"),
+				"version",
+				"Print version",
 				printVersion,
 			),
 			section.Flag(
-				flag.Name("--color"),
-				flag.HelpShort("Use colorized output"),
+				"--color",
+				"Use colorized output",
 				value.StringEnum("true", "false", "auto"),
 				flag.Default("auto"),
 			),
 			section.Flag(
-				flag.Name("--log-filename"),
-				flag.HelpShort("log filename"),
+				"--log-filename",
+				"log filename",
 				value.Path,
 				flag.Default("~/.config/grabbit.jsonl"),
 				flag.ConfigPath("lumberjacklogger.filename"),
 				flag.Required(),
 			),
 			section.Flag(
-				flag.Name("--log-maxage"),
-				flag.HelpShort("max age before log rotation in days"),
+				"--log-maxage",
+				"max age before log rotation in days",
 				value.Int,
 				flag.Default("30"),
 				flag.ConfigPath("lumberjacklogger.maxage"),
 				flag.Required(),
 			),
 			section.Flag(
-				flag.Name("--log-maxbackups"),
-				flag.HelpShort("num backups for the log"),
+				"--log-maxbackups",
+				"num backups for the log",
 				value.Int,
 				flag.Default("0"),
 				flag.ConfigPath("lumberjacklogger.maxbackups"),
 				flag.Required(),
 			),
 			section.Flag(
-				flag.Name("--log-maxsize"),
-				flag.HelpShort("max size of log in megabytes"),
+				"--log-maxsize",
+				"max size of log in megabytes",
 				value.Int,
 				flag.Default("5"),
 				flag.ConfigPath("lumberjacklogger.maxsize"),
 				flag.Required(),
 			),
 			section.Section(
-				section.Name("config"),
-				section.HelpShort("Config commands"),
+				"config",
+				"Config commands",
 				section.Command(
-					command.Name("edit"),
-					command.HelpShort("Edit or create configuration file."),
+					"edit",
+					"Edit or create configuration file.",
 					editConfig,
 					command.Flag(
-						flag.Name("--editor"),
-						flag.HelpShort("path to editor"),
+						"--editor",
+						"path to editor",
 						value.String,
 						flag.Alias("-e"),
 						flag.Default("vi"),
@@ -141,12 +140,17 @@ func main() {
 			),
 		),
 		warg.ConfigFlag(
-			flag.Name("--config"),
+			"--config",
 			yamlreader.New,
 			"config filepath",
 			flag.Alias("-c"),
 			flag.Default("~/.config/grabbit.yaml"),
 		),
+		warg.SkipValidation(),
 	)
-	app.MustRun(os.Args, os.LookupEnv)
+	return &app
+}
+
+func main() {
+	app().MustRun(os.Args, os.LookupEnv)
 }

main_test.go

@@ -0,0 +1,11 @@
+package main
+
+import (
+	"testing"
+)
+
+func TestBuildApp(t *testing.T) {
+	if err := app().Validate(); err != nil {
+		t.Fatal(err)
+	}
+}