Replace global 'version' flag with VERSION

More consistent with other global flags.

I thought about removing the long name entirely and just having -V, so I
made some slight changes in the usage generation code to support that,
but ultimately decided against that for this flag.

Now our release script can safely have an arg named 'version' so we
rename the 'new_version' one to that.

core/flags_global.go

@@ -12,6 +12,7 @@ var (
 	FlagStdinScriptName StringRslArg
 	FlagMockResponse    MockResponseRslArg
 
+	// ordering here matters -- it's the order in which they are printed in the usage string
 	Flags = []RslArg{
 		&FlagHelp,
 		&FlagDebug,
@@ -32,8 +33,7 @@ func CreateAndRegisterGlobalFlags() []RslArg {
 	FlagNoColor = NewBoolRadArg("NO-COLOR", "", "Disable colorized output.", false)
 	FlagQuiet = NewBoolRadArg("QUIET", "Q", "Suppresses some output.", false)
 	FlagShell = NewBoolRadArg("SHELL", "", "Outputs shell/bash exports of variables, so they can be eval'd", false)
-	// todo the --version flag is inconsistent in its capitalization, maybe don't have it? Just the shorthand?
-	FlagVersion = NewBoolRadArg("version", "V", "Print rad version information.", false)
+	FlagVersion = NewBoolRadArg("VERSION", "V", "Print rad version information.", false)
 	FlagStdinScriptName = NewStringRadArg("STDIN", "", "script-name", "Enables reading RSL from stdin, and takes a string arg to be treated as the 'script name'.", "")
 	FlagMockResponse = NewMockResponseRadArg("MOCK-RESPONSE", "", "Add mock response for json requests (pattern:filePath)")
 	registerGlobalFlags()

core/runner_usage.go

@@ -25,7 +25,7 @@ func (r *RadRunner) RunUsageExit() {
 func (r *RadRunner) printScriptlessUsage() {
 	buf := new(bytes.Buffer)
 
-	fmt.Fprintf(buf, "Request And Display (RAD): A tool for writing user-friendly command line scripts.\n\n")
+	fmt.Fprintf(buf, "rad: A tool for writing user-friendly command line scripts.\n\n")
 	greenBold(buf, "Usage:\n")
 	bold(buf, "  rad")
 	cyan(buf, " [script path] [flags]\n\n")
@@ -88,10 +88,12 @@ func flagUsage(buf *bytes.Buffer, flags []RslArg) {
 		}
 
 		line := ""
-		if f.GetShort() != "" {
+		if f.GetShort() != "" && f.GetName() != "" {
 			line = fmt.Sprintf("  -%s, --%s", f.GetShort(), f.GetName())
-		} else {
+		} else if f.GetShort() == "" {
 			line = fmt.Sprintf("      --%s", f.GetName())
+		} else if f.GetName() == "" {
+			line = fmt.Sprintf("  -%s", f.GetShort())
 		}
 
 		argUsage := f.GetArgUsage()

core/testing/args_test.go

@@ -247,7 +247,7 @@ Global flags:
       --NO-COLOR               Disable colorized output.
   -Q, --QUIET                  Suppresses some output.
       --SHELL                  Outputs shell/bash exports of variables, so they can be eval'd
-  -V, --version                Print rad version information.
+  -V, --VERSION                Print rad version information.
       --MOCK-RESPONSE string   Add mock response for json requests (pattern:filePath)
 `
 	assertOnlyOutput(t, stdErrBuffer, expected)

core/testing/misc_test.go

@@ -49,7 +49,7 @@ print("{-12}")
 }
 
 func TestMisc_Version(t *testing.T) {
-	setupAndRunCode(t, "", "--version")
+	setupAndRunCode(t, "", "--VERSION")
 	assertOnlyOutput(t, stdErrBuffer, "rad version "+core.Version+"\n")
 	assertNoErrors(t)
 	resetTestState()
@@ -64,7 +64,7 @@ func TestMisc_VersionShort(t *testing.T) {
 
 func TestMisc_PrioritizesHelpIfBothHelpAndVersionSpecified(t *testing.T) {
 	setupAndRunCode(t, "", "-h", "-V", "--NO-COLOR")
-	expected := `Request And Display (RAD): A tool for writing user-friendly command line scripts.
+	expected := `rad: A tool for writing user-friendly command line scripts.
 
 Usage:
   rad [script path] [flags]

core/testing/test_helpers.go

@@ -18,7 +18,7 @@ const globalFlagHelp = `Global flags:
       --NO-COLOR               Disable colorized output.
   -Q, --QUIET                  Suppresses some output.
       --SHELL                  Outputs shell/bash exports of variables, so they can be eval'd
-  -V, --version                Print rad version information.
+  -V, --VERSION                Print rad version information.
       --STDIN script-name      Enables reading RSL from stdin, and takes a string arg to be treated as the 'script name'.
       --MOCK-RESPONSE string   Add mock response for json requests (pattern:filePath)
 `

new_release.rsl → release.rsl

@@ -6,7 +6,7 @@ Bumps the version in rad, creates a commit, tags it, and optionally pushes it
 This will trigger a GitHub action to create a homebrew-rad PR with the new version
 ---
 args:
-    new_version string # The new release version to bump to
+    version string # The new release version to bump to
     push p bool # Whether or not a push should also be performed
 
 // Build & test
@@ -17,13 +17,13 @@ fail:
 path = "./core/version.go"
 
 // Update Version in ./core/version.go
-$`sed -i '' "s/Version = \".*\"/Version = \"{new_version}\"/" {path}`
+$`sed -i '' "s/Version = \".*\"/Version = \"{version}\"/" {path}`
 fail:
     print("❌ Failed to update version in code!")
 
 $!`git add {path}`
-$!`git commit -m "Bump version to {new_version}" {path}`
-$!`git tag -a "{new_version}" -m "Bump version to {new_version}"`
+$!`git commit -m "Bump version to {version}" {path}`
+$!`git tag -a "{version}" -m "Bump version to {version}"`
 
 if push:
     $`./push.rsl`