ref: Convert all cmdline users to cmdline2.
This also includes changes in cmdline2 to allow commands with
both Children and Runner set, as long as the runner doesn't take
any args. This makes sense since the runner handles the no-arg
case, while the children handle the with-args case. This was
already being used by "v23 buildcop" and "deviced", and it seemed
better to allow this behavior.
Also fixed a bug in the cmdline2 package where the "at least one
of Children and Runner" check wasn't returning an error, if the
bad Command wasn't the root. Added tests for this case.
Finally, but also important, changed how global flags are
handled. Previously I was hoping we could simply change
"v.io/x/ref/lib/flags" to check flag.Parsed and avoid
double-parsing the flags. But the previous strategy always
merged flags into a new FlagSet, and then overwrote
flag.CommandLine with that value. Our usage of ref/lib/flags
stashes the flag.CommandLine pointer away in an init function,
which breaks that strategy.
In addition, ref/lib/flags has some weird logic to set certain
flags to their "default values". Presumably this was a hack to
deal with double-parsing the flags for flags that are specified
multiple times on the command line, and append their values.
This makes it questionable whether we can really depend on not
double-parsing flags.
I'll look into changing our flags so that they don't depend on
the multi-specification-append behavior, since that's just weird.
But I'll do that separately.
The actual conversions of all programs is mechanical.
MultiPart: 3/3
Change-Id: I3292256e5c8e4a6acf99c9b92c98b009a7fbfcf4
diff --git a/cmd/uniqueid/main.go b/cmd/uniqueid/main.go
index 9cd2737..3d27018 100644
--- a/cmd/uniqueid/main.go
+++ b/cmd/uniqueid/main.go
@@ -11,43 +11,31 @@
"bytes"
"fmt"
"io/ioutil"
- "os"
"regexp"
- "v.io/v23"
"v.io/v23/uniqueid"
- "v.io/x/lib/cmdline"
- _ "v.io/x/ref/profiles/static"
+ "v.io/x/lib/cmdline2"
)
func main() {
- cmdline.HideGlobalFlagsExcept()
- os.Exit(cmdUniqueId.Main())
+ cmdline2.Main(cmdUniqueId)
}
-func runHelper(run cmdline.Runner) cmdline.Runner {
- return func(cmd *cmdline.Command, args []string) error {
- _, shutdown := v23.Init()
- defer shutdown()
- return run(cmd, args)
- }
-}
-
-var cmdUniqueId = &cmdline.Command{
+var cmdUniqueId = &cmdline2.Command{
Name: "uniqueid",
Short: "generates unique identifiers",
Long: `
Command uniqueid generates unique identifiers.
It also has an option of automatically substituting unique ids with placeholders in files.
`,
- Children: []*cmdline.Command{cmdGenerate, cmdInject},
- Topics: []cmdline.Topic{},
+ Children: []*cmdline2.Command{cmdGenerate, cmdInject},
+ Topics: []cmdline2.Topic{},
}
-var cmdGenerate = &cmdline.Command{
- Run: runHelper(runGenerate),
- Name: "generate",
- Short: "Generates UniqueIds",
+var cmdGenerate = &cmdline2.Command{
+ Runner: cmdline2.RunnerFunc(runGenerate),
+ Name: "generate",
+ Short: "Generates UniqueIds",
Long: `
Generates unique ids and outputs them to standard out.
`,
@@ -55,10 +43,10 @@
ArgsLong: "",
}
-var cmdInject = &cmdline.Command{
- Run: runHelper(runInject),
- Name: "inject",
- Short: "Injects UniqueIds into existing files",
+var cmdInject = &cmdline2.Command{
+ Runner: cmdline2.RunnerFunc(runInject),
+ Name: "inject",
+ Short: "Injects UniqueIds into existing files",
Long: `
Injects UniqueIds into existing files.
Strings of the form "$UNIQUEID$" will be replaced with generated ids.
@@ -68,9 +56,9 @@
}
// runGenerate implements the generate command which outputs generated ids to stdout.
-func runGenerate(command *cmdline.Command, args []string) error {
+func runGenerate(env *cmdline2.Env, args []string) error {
if len(args) > 0 {
- return command.UsageErrorf("expected 0 args, got %d", len(args))
+ return env.UsageErrorf("expected 0 args, got %d", len(args))
}
id, err := uniqueid.Random()
if err != nil {
@@ -81,9 +69,9 @@
}
// runInject implements the inject command which replaces $UNIQUEID$ strings with generated ids.
-func runInject(command *cmdline.Command, args []string) error {
+func runInject(env *cmdline2.Env, args []string) error {
if len(args) == 0 {
- return command.UsageErrorf("expected at least one file arg, got 0")
+ return env.UsageErrorf("expected at least one file arg, got 0")
}
for _, arg := range args {
if err := injectIntoFile(arg); err != nil {
