diff --git a/cmd/radioctl/radioctl.go b/cmd/radioctl/radioctl.go
index b79af4ffa17d2bb44d645fac7a9e785f10fc7ffe..48f3ad83604177604650c1b84f4cb2e853ee67e6 100644
--- a/cmd/radioctl/radioctl.go
+++ b/cmd/radioctl/radioctl.go
@@ -15,8 +15,7 @@ import (
"git.autistici.org/ale/autoradio"
"git.autistici.org/ale/autoradio/client"
pb "git.autistici.org/ale/autoradio/proto"
- "github.com/gonuts/commander"
- gonutsflag "github.com/gonuts/flag"
+ "github.com/google/subcommands"
"go.etcd.io/etcd/clientv3"
)
@@ -30,46 +29,30 @@ type optionalValue struct {
isSet bool
}
-func (v *optionalValue) IsSet() bool {
+func (v optionalValue) IsSet() bool {
return v.isSet
}
type stringOptionalValue struct {
- *optionalValue
+ optionalValue
value string
}
-func newStringOptionalValue() *stringOptionalValue {
- return &stringOptionalValue{optionalValue: &optionalValue{}}
-}
-
func (v *stringOptionalValue) Set(val string) error {
v.isSet = true
v.value = val
return nil
}
-func (v *stringOptionalValue) Value() string {
- return v.value
-}
-
func (v *stringOptionalValue) String() string {
return v.value
}
-func (v *stringOptionalValue) Get() interface{} {
- return v.value
-}
-
type intOptionalValue struct {
- *optionalValue
+ optionalValue
value int
}
-func newIntOptionalValue() *intOptionalValue {
- return &intOptionalValue{optionalValue: &optionalValue{}}
-}
-
func (v *intOptionalValue) Set(val string) error {
ival, err := strconv.Atoi(val)
v.value = ival
@@ -77,27 +60,15 @@ func (v *intOptionalValue) Set(val string) error {
return err
}
-func (v *intOptionalValue) Value() int {
- return v.value
-}
-
func (v *intOptionalValue) String() string {
return fmt.Sprintf("%v", v.value)
}
-func (v *intOptionalValue) Get() interface{} {
- return v.value
-}
-
type floatOptionalValue struct {
- *optionalValue
+ optionalValue
value float64
}
-func newFloatOptionalValue() *floatOptionalValue {
- return &floatOptionalValue{optionalValue: &optionalValue{}}
-}
-
func (v *floatOptionalValue) Set(val string) error {
fval, err := strconv.ParseFloat(val, 64)
v.value = fval
@@ -105,44 +76,10 @@ func (v *floatOptionalValue) Set(val string) error {
return err
}
-func (v *floatOptionalValue) Value() float64 {
- return v.value
-}
-
func (v *floatOptionalValue) String() string {
return fmt.Sprintf("%v", v.value)
}
-func (v *floatOptionalValue) Get() interface{} {
- return v.value
-}
-
-type hasAddFlags interface {
- AddFlags(*gonutsflag.FlagSet)
-}
-
-type commandInterface interface {
- Run([]string)
- Command() *commander.Command
-}
-
-type baseCommand struct {
- UsageLine string
- Short string
- Long string
-}
-
-func (b *baseCommand) Command() *commander.Command {
- return &commander.Command{
- UsageLine: b.UsageLine,
- Short: b.Short,
- Long: b.Long,
- }
-}
-
-func (b *baseCommand) Run(args []string) {
-}
-
var auClient *client.Client
func getClient() *client.Client {
@@ -206,75 +143,74 @@ func printMount(m *pb.Mount) {
}
}
-func mountExists(name string, c *client.Client) bool {
- m, _ := c.GetMount(context.Background(), name)
+func mountExists(ctx context.Context, name string, c *client.Client) bool {
+ m, _ := c.GetMount(ctx, name)
return m != nil
}
// Create a new mountpoint.
type createMountCommand struct {
- baseCommand
relay string
fallback string
}
-func newCreateMountCommand() *createMountCommand {
- return &createMountCommand{
- baseCommand: baseCommand{
- UsageLine: "create-mount <path>",
- Short: "Create a new mountpoint",
- Long: `
+func (c *createMountCommand) Name() string { return "create-mount" }
+func (c *createMountCommand) Synopsis() string { return "Create a new mountpoint" }
+func (c *createMountCommand) Usage() string {
+ return `create-mount <path>
+
Create a new mountpoint at the specified PATH (which will become the
absolute URL of the stream).
-`,
- },
- }
+
+`
}
-func (cmd *createMountCommand) AddFlags(f *gonutsflag.FlagSet) {
- f.StringVar(&cmd.relay, "relay", "", "Upstream URL to relay")
- f.StringVar(&cmd.fallback, "fallback", "", "Fallback stream URL")
+func (c *createMountCommand) SetFlags(f *flag.FlagSet) {
+ f.StringVar(&c.relay, "relay", "", "Upstream URL to relay")
+ f.StringVar(&c.fallback, "fallback", "", "Fallback stream URL")
}
-func (cmd *createMountCommand) Run(args []string) {
- if len(args) != 1 {
- log.Fatal("Wrong number of arguments")
+func (c *createMountCommand) Execute(ctx context.Context, f *flag.FlagSet, _ ...interface{}) subcommands.ExitStatus {
+ if f.NArg() != 1 {
+ log.Printf("Wrong number of arguments")
+ return subcommands.ExitUsageError
}
- fmt.Printf("args: %v\n", args)
- path := args[0]
+ path := f.Arg(0)
if !strings.HasPrefix(path, "/") {
log.Printf("Warning: mountpoint %s does not start with a slash, using /%s instead", path, path)
path = "/" + path
}
// Check if the mount already exists.
- c := getClient()
- if mountExists(path, c) {
- log.Fatal("ERROR: A mount with that name already exists!")
+ client := getClient()
+ if mountExists(ctx, path, client) {
+ log.Printf("ERROR: A mount with that name already exists!")
+ return subcommands.ExitFailure
}
// Create the new mount and set the relevant fields (depending
// on the options passed to the command).
m := &pb.Mount{Path: path}
- setRelay(m, cmd.relay)
- m.FallbackPath = cmd.fallback
+ setRelay(m, c.relay)
+ m.FallbackPath = c.fallback
if err := m.Valid(); err != nil {
- log.Fatalf("ERROR: mount configuration is invalid: %v", err)
+ log.Printf("ERROR: mount configuration is invalid: %v", err)
+ return subcommands.ExitFailure
}
- if err := c.SetMount(context.Background(), m); err != nil {
- log.Fatalf("ERROR: creating mount: %v", err)
+ if err := client.SetMount(ctx, m); err != nil {
+ log.Printf("ERROR: creating mount: %v", err)
+ return subcommands.ExitFailure
}
printMount(m)
+ return subcommands.ExitSuccess
}
// Create a submount (transcoded stream).
type createTranscodingMountCommand struct {
- baseCommand
-
sourcePath string
format string
quality float64
@@ -285,140 +221,130 @@ type createTranscodingMountCommand struct {
fallback string
}
-func newCreateTranscodingMountCommand() *createTranscodingMountCommand {
- return &createTranscodingMountCommand{
- baseCommand: baseCommand{
- UsageLine: "create-transcoding-mount <path>",
- Short: "Create a transcoding mount",
- Long: `
+func (c *createTranscodingMountCommand) Name() string { return "create-transcoding-mount" }
+func (c *createTranscodingMountCommand) Synopsis() string { return "Create a transcoding mount" }
+func (c *createTranscodingMountCommand) Usage() string {
+ return `create-transcoding-mount <path>
+
Create a new stream that will transcode the parent stream with
different encoding parameters.
-`,
- },
- }
+
+`
}
-func (cmd *createTranscodingMountCommand) AddFlags(f *gonutsflag.FlagSet) {
- f.StringVar(&cmd.sourcePath, "source", "", "Source mountpoint")
- f.StringVar(&cmd.format, "codec", "mp3", "Encoding format")
- f.Float64Var(&cmd.quality, "quality", 0, "Quality (for VBR encoders)")
- f.IntVar(&cmd.bitRate, "bitrate", 32, "Bitrate (Kbps)")
- f.IntVar(&cmd.sampleRate, "samplerate", 44100, "Sample rate (Hz)")
- f.IntVar(&cmd.channels, "channels", 2, "Number of channels")
- f.StringVar(&cmd.stereoMode, "stereo-mode", "joint_stereo", "Stereo mode for mp3 codec (stereo, joint_stereo)")
- f.StringVar(&cmd.fallback, "fallback", "", "Fallback stream URL")
+func (c *createTranscodingMountCommand) SetFlags(f *flag.FlagSet) {
+ f.StringVar(&c.sourcePath, "source", "", "Source mountpoint")
+ f.StringVar(&c.format, "codec", "mp3", "Encoding format")
+ f.Float64Var(&c.quality, "quality", 0, "Quality (for VBR encoders)")
+ f.IntVar(&c.bitRate, "bitrate", 32, "Bitrate (Kbps)")
+ f.IntVar(&c.sampleRate, "samplerate", 44100, "Sample rate (Hz)")
+ f.IntVar(&c.channels, "channels", 2, "Number of channels")
+ f.StringVar(&c.stereoMode, "stereo-mode", "joint_stereo", "Stereo mode for mp3 codec (stereo, joint_stereo)")
+ f.StringVar(&c.fallback, "fallback", "", "Fallback stream URL")
}
-func (cmd *createTranscodingMountCommand) Run(args []string) {
- if len(args) != 1 {
- log.Fatal("Wrong number of arguments")
+func (c *createTranscodingMountCommand) Execute(ctx context.Context, f *flag.FlagSet, _ ...interface{}) subcommands.ExitStatus {
+ if f.NArg() != 1 {
+ log.Printf("Wrong number of arguments")
+ return subcommands.ExitUsageError
}
- path := args[0]
+ path := f.Arg(0)
if !strings.HasPrefix(path, "/") {
log.Printf("Warning: mountpoint %s does not start with a slash, using /%s instead", path, path)
path = "/" + path
}
// The mount path should not exist.
- c := getClient()
- if mountExists(path, c) {
- log.Fatal("ERROR: a mount with that name already exists!")
+ client := getClient()
+ if mountExists(ctx, path, client) {
+ log.Printf("ERROR: a mount with that name already exists!")
+ return subcommands.ExitFailure
}
// The source mount should exist.
- if !mountExists(cmd.sourcePath, c) {
- log.Fatal("ERROR: the source mount does not exist!")
+ if !mountExists(ctx, c.sourcePath, client) {
+ log.Printf("ERROR: the source mount does not exist!")
+ return subcommands.ExitFailure
}
// Retrieve the parent mount point and add a TranscodingMount.
m := &pb.Mount{
Path: path,
- FallbackPath: cmd.fallback,
+ FallbackPath: c.fallback,
Transcode: true,
TranscodeParams: &pb.EncodingParams{
- SourcePath: cmd.sourcePath,
- Format: cmd.format,
- BitRate: int32(cmd.bitRate),
- SampleRate: int32(cmd.sampleRate),
- Channels: int32(cmd.channels),
- StereoMode: cmd.stereoMode,
- Quality: float32(cmd.quality),
+ SourcePath: c.sourcePath,
+ Format: c.format,
+ BitRate: int32(c.bitRate),
+ SampleRate: int32(c.sampleRate),
+ Channels: int32(c.channels),
+ StereoMode: c.stereoMode,
+ Quality: float32(c.quality),
},
}
setRelay(m, "")
if err := m.Valid(); err != nil {
- log.Fatalf("ERROR: mount configuration is invalid: %v", err)
+ log.Printf("ERROR: mount configuration is invalid: %v", err)
+ return subcommands.ExitFailure
}
- if err := c.SetMount(context.Background(), m); err != nil {
- log.Fatalf("ERROR: creating mount: %v", err)
+ if err := client.SetMount(ctx, m); err != nil {
+ log.Printf("ERROR: creating mount: %v", err)
+ return subcommands.ExitFailure
}
printMount(m)
+ return subcommands.ExitSuccess
}
// Edit a mountpoint.
type editMountCommand struct {
- baseCommand
- relay *stringOptionalValue
- fallback *stringOptionalValue
- transFormat *stringOptionalValue
- transSource *stringOptionalValue
- transBitRate *intOptionalValue
- transSampleRate *intOptionalValue
- transChannels *intOptionalValue
- transStereoMode *stringOptionalValue
- transQuality *floatOptionalValue
-}
-
-var UNSET = "UNSET"
-
-func newEditMountCommand() *editMountCommand {
- return &editMountCommand{
- baseCommand: baseCommand{
- UsageLine: "edit-mount <path>",
- Short: "Edit an existing mountpoint",
- Long: `
+ relay stringOptionalValue
+ fallback stringOptionalValue
+ transFormat stringOptionalValue
+ transSource stringOptionalValue
+ transBitRate intOptionalValue
+ transSampleRate intOptionalValue
+ transChannels intOptionalValue
+ transStereoMode stringOptionalValue
+ transQuality floatOptionalValue
+}
+
+func (c *editMountCommand) Name() string { return "edit-mount" }
+func (c *editMountCommand) Synopsis() string { return "Edit an existing mountpoint" }
+func (c *editMountCommand) Usage() string {
+ return `edit-mount <path>
+
Modify parameters of the specified mountpoint, such as the relay
and the fallback URL. If the relay option is set, the mountpoint
will not accept source connections anymore. To revert to the
default, non-relay behavior, set the relay to the empty string
(with --relay="").
-`,
- },
- relay: newStringOptionalValue(),
- fallback: newStringOptionalValue(),
- transFormat: newStringOptionalValue(),
- transSource: newStringOptionalValue(),
- transBitRate: newIntOptionalValue(),
- transSampleRate: newIntOptionalValue(),
- transChannels: newIntOptionalValue(),
- transStereoMode: newStringOptionalValue(),
- transQuality: newFloatOptionalValue(),
- }
+
+`
}
-func (cmd *editMountCommand) AddFlags(f *gonutsflag.FlagSet) {
- f.Var(cmd.relay, "relay", "Upstream URL to relay")
- f.Var(cmd.fallback, "fallback", "Fallback stream URL")
+func (c *editMountCommand) SetFlags(f *flag.FlagSet) {
+ f.Var(&c.relay, "relay", "Upstream URL to relay")
+ f.Var(&c.fallback, "fallback", "Fallback stream URL")
- f.Var(cmd.transSource, "source", "[transcoding] Source mountpoint")
- f.Var(cmd.transFormat, "codec", "[transcoding] Encoding format")
- f.Var(cmd.transQuality, "quality", "[transcoding] Quality (for VBR encoders)")
- f.Var(cmd.transBitRate, "bitrate", "[transcoding] Bitrate (Kbps)")
- f.Var(cmd.transSampleRate, "samplerate", "[transcoding] Sample rate (Hz)")
- f.Var(cmd.transChannels, "channels", "[transcoding] Number of channels")
- f.Var(cmd.transStereoMode, "stereo-mode", "[transcoding] Stereo mode for mp3 encoding (stereo, joint_stereo)")
+ f.Var(&c.transSource, "source", "[transcoding] Source mountpoint")
+ f.Var(&c.transFormat, "codec", "[transcoding] Encoding format")
+ f.Var(&c.transQuality, "quality", "[transcoding] Quality (for VBR encoders)")
+ f.Var(&c.transBitRate, "bitrate", "[transcoding] Bitrate (Kbps)")
+ f.Var(&c.transSampleRate, "samplerate", "[transcoding] Sample rate (Hz)")
+ f.Var(&c.transChannels, "channels", "[transcoding] Number of channels")
+ f.Var(&c.transStereoMode, "stereo-mode", "[transcoding] Stereo mode for mp3 encoding (stereo, joint_stereo)")
}
-func (cmd *editMountCommand) transcodingOptionsSet() bool {
+func (c *editMountCommand) transcodingOptionsSet() bool {
opts := []interface {
IsSet() bool
}{
- cmd.transSource, cmd.transFormat, cmd.transQuality,
- cmd.transBitRate, cmd.transSampleRate, cmd.transChannels,
- cmd.transStereoMode,
+ &c.transSource, &c.transFormat, &c.transQuality,
+ &c.transBitRate, &c.transSampleRate, &c.transChannels,
+ &c.transStereoMode,
}
for _, o := range opts {
if o.IsSet() {
@@ -428,138 +354,148 @@ func (cmd *editMountCommand) transcodingOptionsSet() bool {
return false
}
-func (cmd *editMountCommand) Run(args []string) {
- if len(args) != 1 {
- log.Fatal("Wrong number of arguments")
+func (c *editMountCommand) Execute(ctx context.Context, f *flag.FlagSet, _ ...interface{}) subcommands.ExitStatus {
+ if f.NArg() != 1 {
+ log.Printf("Wrong number of arguments")
+ return subcommands.ExitUsageError
}
- c := getClient()
- m, err := c.GetMount(context.Background(), args[0])
+ client := getClient()
+ m, err := client.GetMount(ctx, f.Arg(0))
if err != nil {
- log.Fatalf("ERROR: %v", err)
+ log.Printf("ERROR: %v", err)
+ return subcommands.ExitFailure
}
if m == nil {
- log.Fatal("ERROR: mount not found")
+ log.Printf("ERROR: mount not found")
+ return subcommands.ExitFailure
}
// Only set those fields that were passed on the command line.
- if cmd.fallback.IsSet() {
- m.FallbackPath = cmd.fallback.Value()
+ if c.fallback.IsSet() {
+ m.FallbackPath = c.fallback.value
}
- if cmd.relay.IsSet() {
- setRelay(m, cmd.relay.Value())
+ if c.relay.IsSet() {
+ setRelay(m, c.relay.value)
}
- if cmd.transcodingOptionsSet() && !m.Transcode {
- log.Fatal("ERROR: can't set transcoding options on a non-transcoding mount (delete and re-create)")
+ if c.transcodingOptionsSet() && !m.Transcode {
+ log.Printf("ERROR: can't set transcoding options on a non-transcoding mount (delete and re-create)")
+ return subcommands.ExitFailure
}
- if cmd.transFormat.IsSet() {
- m.TranscodeParams.Format = cmd.transFormat.Value()
+ if c.transFormat.IsSet() {
+ m.TranscodeParams.Format = c.transFormat.value
}
- if cmd.transSource.IsSet() {
- m.TranscodeParams.SourcePath = cmd.transSource.Value()
+ if c.transSource.IsSet() {
+ m.TranscodeParams.SourcePath = c.transSource.value
}
- if cmd.transBitRate.IsSet() {
- m.TranscodeParams.BitRate = int32(cmd.transBitRate.Value())
+ if c.transBitRate.IsSet() {
+ m.TranscodeParams.BitRate = int32(c.transBitRate.value)
}
- if cmd.transSampleRate.IsSet() {
- m.TranscodeParams.SampleRate = int32(cmd.transSampleRate.Value())
+ if c.transSampleRate.IsSet() {
+ m.TranscodeParams.SampleRate = int32(c.transSampleRate.value)
}
- if cmd.transQuality.IsSet() {
- m.TranscodeParams.Quality = float32(cmd.transQuality.Value())
+ if c.transQuality.IsSet() {
+ m.TranscodeParams.Quality = float32(c.transQuality.value)
}
- if cmd.transChannels.IsSet() {
- m.TranscodeParams.Channels = int32(cmd.transChannels.Value())
+ if c.transChannels.IsSet() {
+ m.TranscodeParams.Channels = int32(c.transChannels.value)
}
- if cmd.transStereoMode.IsSet() {
- m.TranscodeParams.StereoMode = cmd.transStereoMode.Value()
+ if c.transStereoMode.IsSet() {
+ m.TranscodeParams.StereoMode = c.transStereoMode.value
}
if err := m.Valid(); err != nil {
- log.Fatalf("ERROR: mount configuration is invalid: %v", err)
+ log.Printf("ERROR: mount configuration is invalid: %v", err)
+ return subcommands.ExitFailure
}
- if err := c.SetMount(context.Background(), m); err != nil {
- log.Fatalf("ERROR: updating mount: %v", err)
+ if err := client.SetMount(ctx, m); err != nil {
+ log.Printf("ERROR: updating mount: %v", err)
+ return subcommands.ExitFailure
}
printMount(m)
+ return subcommands.ExitSuccess
}
// Delete an existing mountpoint.
type deleteMountCommand struct {
- baseCommand
}
-func newDeleteMountCommand() *deleteMountCommand {
- return &deleteMountCommand{
- baseCommand{
- UsageLine: "delete-mount <path>",
- Short: "Delete a mountpoint",
- Long: `
+func (c *deleteMountCommand) Name() string { return "delete-mount" }
+func (c *deleteMountCommand) Synopsis() string { return "Delete a mountpoint" }
+func (c *deleteMountCommand) Usage() string {
+ return `delete-mount <path>
+
Delete the specified mountpoint.
-`,
- },
- }
+`
}
-func (cmd *deleteMountCommand) Run(args []string) {
- if len(args) != 1 {
- log.Fatal("Wrong number of arguments")
+func (c *deleteMountCommand) SetFlags(_ *flag.FlagSet) {}
+
+func (c *deleteMountCommand) Execute(ctx context.Context, f *flag.FlagSet, _ ...interface{}) subcommands.ExitStatus {
+ if f.NArg() != 1 {
+ log.Printf("Wrong number of arguments")
+ return subcommands.ExitUsageError
}
- path := args[0]
- c := getClient()
- if !mountExists(path, c) {
- log.Fatal("ERROR: mount not found")
+ path := f.Arg(0)
+ client := getClient()
+ if !mountExists(ctx, path, client) {
+ log.Printf("ERROR: mount not found")
+ return subcommands.ExitFailure
}
- if err := c.DeleteMount(context.Background(), path); err != nil {
- log.Fatalf("ERROR: deleting mount: %v", err)
+ if err := client.DeleteMount(ctx, path); err != nil {
+ log.Printf("ERROR: deleting mount: %v", err)
+ return subcommands.ExitFailure
}
// Delete all the transcoding mounts that have this as a
// source.
- mounts, err := c.ListMounts(context.Background())
+ mounts, err := client.ListMounts(ctx)
if err != nil {
- log.Fatalf("ERROR: %v", err)
+ log.Printf("ERROR: %v", err)
+ return subcommands.ExitFailure
}
for _, m := range mounts {
if m.HasTranscoder() && m.TranscodeParams.SourcePath == path {
- if err := c.DeleteMount(context.Background(), m.Path); err != nil {
+ if err := client.DeleteMount(ctx, m.Path); err != nil {
log.Printf("ERROR: deleting transcoded mount %s: %v", m.Path, err)
+ return subcommands.ExitFailure
}
}
}
log.Printf("mountpoint %s removed", path)
+ return subcommands.ExitSuccess
}
// List known mountpoints.
-type listMountsCommand struct {
- baseCommand
-}
+type listMountsCommand struct{}
+
+func (c *listMountsCommand) Name() string { return "list-mounts" }
+func (c *listMountsCommand) Synopsis() string { return "List all configured mountpoints" }
+func (c *listMountsCommand) Usage() string {
+ return `list-mounts
-func newListMountsCommand() *listMountsCommand {
- return &listMountsCommand{
- baseCommand{
- UsageLine: "list-mounts",
- Short: "List all configured mountpoints",
- Long: `
Outputs a list of all the currently configured mountpoints.
-`,
- },
- }
+`
}
-func (cmd *listMountsCommand) Run(args []string) {
- if len(args) != 0 {
- log.Fatal("Too many arguments")
+func (c *listMountsCommand) SetFlags(_ *flag.FlagSet) {}
+
+func (c *listMountsCommand) Execute(ctx context.Context, f *flag.FlagSet, _ ...interface{}) subcommands.ExitStatus {
+ if f.NArg() > 0 {
+ log.Printf("Too many arguments")
+ return subcommands.ExitUsageError
}
- mounts, err := getClient().ListMounts(context.Background())
+ mounts, err := getClient().ListMounts(ctx)
if err != nil {
- log.Fatalf("ERROR: %v", err)
+ log.Printf("ERROR: %v", err)
+ return subcommands.ExitFailure
}
var names []string
for _, m := range mounts {
@@ -577,148 +513,136 @@ func (cmd *listMountsCommand) Run(args []string) {
fmt.Println(n)
}
}
+
+ return subcommands.ExitSuccess
}
// Show mountpoint information.
-type showMountCommand struct {
- baseCommand
-}
+type showMountCommand struct{}
+
+func (c *showMountCommand) Name() string { return "show-mount" }
+func (c *showMountCommand) Synopsis() string { return "Show mountpoint information" }
+func (c *showMountCommand) Usage() string {
+ return `show-mount <path>
-func newShowMountCommand() *showMountCommand {
- return &showMountCommand{
- baseCommand{
- UsageLine: "show-mount <path>",
- Short: "Show mountpoint information",
- Long: `
Print information about the specified mountpoint (including
the source credentials).
-`,
- },
- }
+`
}
-func (cmd *showMountCommand) Run(args []string) {
- if len(args) != 1 {
- log.Fatal("Wrong number of arguments")
+func (c *showMountCommand) SetFlags(_ *flag.FlagSet) {}
+
+func (c *showMountCommand) Execute(ctx context.Context, f *flag.FlagSet, _ ...interface{}) subcommands.ExitStatus {
+ if f.NArg() != 1 {
+ log.Printf("Wrong number of arguments")
+ return subcommands.ExitUsageError
}
- m, err := getClient().GetMount(context.Background(), args[0])
+ m, err := getClient().GetMount(ctx, f.Arg(0))
if err != nil {
- log.Fatalf("ERROR: %v", err)
+ log.Printf("ERROR: %v", err)
+ return subcommands.ExitFailure
}
if m == nil {
- log.Fatal("ERROR: mount not found")
+ log.Printf("ERROR: mount not found")
+ return subcommands.ExitFailure
}
printMount(m)
+ return subcommands.ExitSuccess
}
// Backup mount configuration.
-type backupCommand struct {
- baseCommand
-}
+type backupCommand struct{}
+
+func (c *backupCommand) Name() string { return "backup" }
+func (c *backupCommand) Synopsis() string { return "Backup mount configuration" }
+func (c *backupCommand) Usage() string {
+ return `backup
-func newBackupCommand() *backupCommand {
- return &backupCommand{
- baseCommand{
- UsageLine: "backup",
- Short: "Backup mount configuration",
- Long: `
Dump the autoradio configuration to stdout, in a format that is
understood by the "restore" command.
-`,
- },
- }
+`
}
-func (cmd *backupCommand) Run(args []string) {
- if len(args) != 0 {
- log.Fatal("Too many arguments")
+func (c *backupCommand) SetFlags(_ *flag.FlagSet) {}
+
+func (c *backupCommand) Execute(ctx context.Context, f *flag.FlagSet, _ ...interface{}) subcommands.ExitStatus {
+ if f.NArg() > 0 {
+ log.Printf("Too many arguments")
+ return subcommands.ExitUsageError
}
- mounts, err := getClient().ListMounts(context.Background())
+ mounts, err := getClient().ListMounts(ctx)
if err != nil {
- log.Fatalf("ERROR: %v", err)
+ log.Printf("ERROR: %v", err)
+ return subcommands.ExitFailure
}
if err := json.NewEncoder(os.Stdout).Encode(mounts); err != nil {
- log.Fatalf("ERROR: %v", err)
+ log.Printf("ERROR: %v", err)
+ return subcommands.ExitFailure
}
+ return subcommands.ExitSuccess
}
// Restore mount configuration.
-type restoreCommand struct {
- baseCommand
-}
+type restoreCommand struct{}
+
+func (c *restoreCommand) Name() string { return "restore" }
+func (c *restoreCommand) Synopsis() string { return "Restore mount configuration" }
+func (c *restoreCommand) Usage() string {
+ return `restore
-func newRestoreCommand() *restoreCommand {
- return &restoreCommand{
- baseCommand{
- UsageLine: "restore",
- Short: "Restore mount configuration",
- Long: `
Read a configuration dump from standard input and restore it.
-`,
- },
- }
+`
}
-func (cmd *restoreCommand) Run(args []string) {
- if len(args) != 0 {
- log.Fatal("Too many arguments")
+func (c *restoreCommand) SetFlags(_ *flag.FlagSet) {}
+
+func (c *restoreCommand) Execute(ctx context.Context, f *flag.FlagSet, _ ...interface{}) subcommands.ExitStatus {
+ if f.NArg() > 0 {
+ log.Printf("Too many arguments")
+ return subcommands.ExitUsageError
}
var mounts []*pb.Mount
if err := json.NewDecoder(os.Stdin).Decode(&mounts); err != nil {
- log.Fatalf("ERROR: %v", err)
+ log.Printf("ERROR: %v", err)
+ return subcommands.ExitFailure
}
- c := getClient()
+ client := getClient()
+ errs := 0
for _, m := range mounts {
- if err := c.SetMount(context.Background(), m); err != nil {
+ if err := client.SetMount(ctx, m); err != nil {
log.Printf("ERROR: creating mount %s: %v", m.Path, err)
+ errs++
}
}
-}
-
-var cmdr = &commander.Command{
- UsageLine: "radioctl <command> [<args>...]",
- Short: "Manage `autoradio' configuration",
-}
-
-func addCommand(c commandInterface) {
- cmd := c.Command()
- cmd.Run = func(unused *commander.Command, args []string) error {
- c.Run(args)
- return nil
- }
- if afc, ok := c.(hasAddFlags); ok {
- afc.AddFlags(&cmd.Flag)
+ if errs > 0 {
+ return subcommands.ExitFailure
}
- cmdr.Subcommands = append(cmdr.Subcommands, cmd)
+ return subcommands.ExitSuccess
}
func init() {
- addCommand(newCreateMountCommand())
- addCommand(newCreateTranscodingMountCommand())
- addCommand(newEditMountCommand())
- addCommand(newDeleteMountCommand())
- addCommand(newListMountsCommand())
- addCommand(newShowMountCommand())
- addCommand(newBackupCommand())
- addCommand(newRestoreCommand())
- flag.Usage = usage
-}
+ subcommands.Register(subcommands.HelpCommand(), "")
+ subcommands.Register(subcommands.FlagsCommand(), "")
+ subcommands.Register(subcommands.CommandsCommand(), "")
-func usage() {
- fmt.Fprintf(os.Stderr, "Usage: %s\n\nGlobal options:\n", cmdr.UsageLine)
- flag.PrintDefaults()
- fmt.Fprintf(os.Stderr, "\nType \"radioctl help\" for more documentation.\n\n")
+ subcommands.Register(&createMountCommand{}, "")
+ subcommands.Register(&createTranscodingMountCommand{}, "")
+ subcommands.Register(&editMountCommand{}, "")
+ subcommands.Register(&deleteMountCommand{}, "")
+ subcommands.Register(&listMountsCommand{}, "")
+ subcommands.Register(&showMountCommand{}, "")
+ subcommands.Register(&backupCommand{}, "")
+ subcommands.Register(&restoreCommand{}, "")
}
func main() {
flag.Parse()
log.SetFlags(0)
- if err := cmdr.Dispatch(flag.Args()); err != nil {
- log.Fatal(err)
- }
+
+ os.Exit(int(subcommands.Execute(context.Background())))
}
diff --git a/vendor/github.com/gonuts/commander/AUTHORS b/vendor/github.com/gonuts/commander/AUTHORS
deleted file mode 100644
index be7ce33fc81d3420fa1ce03c2da6927d5b47a17d..0000000000000000000000000000000000000000
--- a/vendor/github.com/gonuts/commander/AUTHORS
+++ /dev/null
@@ -1,11 +0,0 @@
-# This is the official list of Go-Commander authors for copyright purposes.
-# This file is distinct from the CONTRIBUTORS files.
-# See the latter for an explanation.
-
-# Names should be added to this file as
-# Name or Organization <email address>
-# The email address is not required for organizations.
-
-# Please keep the list sorted.
-
-Google Inc
diff --git a/vendor/github.com/gonuts/commander/CONTRIBUTORS b/vendor/github.com/gonuts/commander/CONTRIBUTORS
deleted file mode 100644
index b38ea4974b536f35b2a27271a1788cda3b977cd3..0000000000000000000000000000000000000000
--- a/vendor/github.com/gonuts/commander/CONTRIBUTORS
+++ /dev/null
@@ -1,31 +0,0 @@
-# This is the official list of people who can contribute
-# (and typically have contributed) code to the Go-Commander repository.
-# The AUTHORS file lists the copyright holders; this file
-# lists people. For example, Google employees are listed here
-# but not in AUTHORS, because Google holds the copyright.
-#
-# The submission process automatically checks to make sure
-# that people submitting code are listed in this file (by email address).
-#
-# Names should be added to this file only after verifying that
-# the individual or the individual's organization has agreed to
-# the appropriate Contributor License Agreement, found here:
-#
-# http://code.google.com/legal/individual-cla-v1.0.html
-# http://code.google.com/legal/corporate-cla-v1.0.html
-#
-# The agreement for individuals can be filled out on the web.
-#
-# When adding J Random Contributor's name to this file,
-# either J's name or J's organization's name should be
-# added to the AUTHORS file, depending on whether the
-# individual or corporate CLA was used.
-
-# Names should be added to this file like so:
-# Name <email address>
-
-# Please keep the list sorted.
-
-Juan Batiz-Benet <juan@benet.ai>
-Sebastien Binet <seb.binet@gmail.com>
-Yves Junqueira <yves.junqueira@gmail.com>
diff --git a/vendor/github.com/gonuts/commander/LICENSE b/vendor/github.com/gonuts/commander/LICENSE
deleted file mode 100644
index 811abfed508ef790f5c1491f1e76a2efca12cd73..0000000000000000000000000000000000000000
--- a/vendor/github.com/gonuts/commander/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2012 The Go-Commander Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
- * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
- * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/github.com/gonuts/commander/README.md b/vendor/github.com/gonuts/commander/README.md
deleted file mode 100644
index 5a773a8435a9d2d61cfe659a6952932b2955b7ce..0000000000000000000000000000000000000000
--- a/vendor/github.com/gonuts/commander/README.md
+++ /dev/null
@@ -1,107 +0,0 @@
-commander
-============
-
-[](https://drone.io/github.com/gonuts/commander/latest)
-
-``commander`` is a spin off of [golang](http://golang.org) ``go tool`` infrastructure to provide commands and sub-commands.
-
-A ``commander.Command`` has a ``Subcommands`` field holding ``[]*commander.Command`` subcommands, referenced by name from the command line.
-
-So a ``Command`` can have sub commands.
-
-So you can have, _e.g._:
-```sh
-$ mycmd action1 [options...]
-$ mycmd subcmd1 action1 [options...]
-```
-
-Example provided by:
-- [hwaf](https://github.com/hwaf/hwaf)
-- [examples/my-cmd](examples/my-cmd)
-
-## Documentation
-Is available on [godoc](http://godoc.org/github.com/gonuts/commander)
-
-## Installation
-Is performed with the usual:
-```sh
-$ go get github.com/gonuts/commander
-```
-
-## Example
-
-See the simple ``my-cmd`` example command for how this all hangs
-together [there](http://github.com/gonuts/commander/blob/master/examples/my-cmd/main.go):
-
-```sh
-$ my-cmd cmd1
-my-cmd-cmd1: hello from cmd1 (quiet=true)
-
-$ my-cmd cmd1 -q
-my-cmd-cmd1: hello from cmd1 (quiet=true)
-
-$ my-cmd cmd1 -q=0
-my-cmd-cmd1: hello from cmd1 (quiet=false)
-
-$ my-cmd cmd2
-my-cmd-cmd2: hello from cmd2 (quiet=true)
-
-$ my-cmd subcmd1 cmd1
-my-cmd-subcmd1-cmd1: hello from subcmd1-cmd1 (quiet=true)
-
-$ my-cmd subcmd1 cmd2
-my-cmd-subcmd1-cmd2: hello from subcmd1-cmd2 (quiet=true)
-
-$ my-cmd subcmd2 cmd1
-my-cmd-subcmd2-cmd1: hello from subcmd2-cmd1 (quiet=true)
-
-$ my-cmd subcmd2 cmd2
-my-cmd-subcmd2-cmd2: hello from subcmd2-cmd2 (quiet=true)
-
-$ my-cmd help
-Usage:
-
- my-cmd command [arguments]
-
-The commands are:
-
- cmd1 runs cmd1 and exits
- cmd2 runs cmd2 and exits
- subcmd1 subcmd1 subcommand. does subcmd1 thingies
- subcmd2 subcmd2 subcommand. does subcmd2 thingies
-
-Use "my-cmd help [command]" for more information about a command.
-
-Additional help topics:
-
-
-Use "my-cmd help [topic]" for more information about that topic.
-
-
-$ my-cmd help subcmd1
-Usage:
-
- subcmd1 command [arguments]
-
-The commands are:
-
- cmd1 runs cmd1 and exits
- cmd2 runs cmd2 and exits
-
-
-Use "subcmd1 help [command]" for more information about a command.
-
-Additional help topics:
-
-
-Use "subcmd1 help [topic]" for more information about that topic.
-
-```
-
-
-## TODO
-
-- automatically generate the bash/zsh/csh autocompletion lists
-- automatically generate Readme examples text
-- test cases
-
diff --git a/vendor/github.com/gonuts/commander/commands.go b/vendor/github.com/gonuts/commander/commands.go
deleted file mode 100644
index dabad4039c4188c0f50f71fe9f1588462473b926..0000000000000000000000000000000000000000
--- a/vendor/github.com/gonuts/commander/commands.go
+++ /dev/null
@@ -1,358 +0,0 @@
-// Copyright 2012 The Go-Commander Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-//
-// Based on the original work by The Go Authors:
-// Copyright 2011 The Go Authors. All rights reserved.
-
-// commander helps creating command line programs whose arguments are flags,
-// commands and subcommands.
-package commander
-
-import (
- "bytes"
- "fmt"
- "io"
- "os"
- "os/exec"
- "sort"
- "strings"
- "text/template"
-
- "github.com/gonuts/flag"
-)
-
-// UsageSection differentiates between sections in the usage text.
-type Listing int
-
-const (
- CommandsList = iota
- HelpTopicsList
- Unlisted
-)
-
-// A Command is an implementation of a subcommand.
-type Command struct {
-
- // UsageLine is the short usage message.
- // The first word in the line is taken to be the command name.
- UsageLine string
-
- // Short is the short description line shown in command lists.
- Short string
-
- // Long is the long description shown in the 'help <this-command>' output.
- Long string
-
- // List reports which list to show this command in Usage and Help.
- // Choose between {CommandsList (default), HelpTopicsList, Unlisted}
- List Listing
-
- // Run runs the command.
- // The args are the arguments after the command name.
- Run func(cmd *Command, args []string) error
-
- // Flag is a set of flags specific to this command.
- Flag flag.FlagSet
-
- // CustomFlags indicates that the command will do its own
- // flag parsing.
- CustomFlags bool
-
- // Subcommands are dispatched from this command
- Subcommands []*Command
-
- // Parent command, nil for root.
- Parent *Command
-
- // UsageTemplate formats the usage (short) information displayed to the user
- // (leave empty for default)
- UsageTemplate string
-
- // HelpTemplate formats the help (long) information displayed to the user
- // (leave empty for default)
- HelpTemplate string
-
- // Stdout and Stderr by default are os.Stdout and os.Stderr, but you can
- // point them at any io.Writer
- Stdout io.Writer
- Stderr io.Writer
-}
-
-// Name returns the command's name: the first word in the usage line.
-func (c *Command) Name() string {
- name := c.UsageLine
- i := strings.Index(name, " ")
- if i >= 0 {
- name = name[:i]
- }
- return name
-}
-
-// Usage prints the usage details to the standard error output.
-func (c *Command) Usage() {
- c.usage()
-}
-
-// FlagOptions returns the flag's options as a string
-func (c *Command) FlagOptions() string {
- var buf bytes.Buffer
- c.Flag.SetOutput(&buf)
- c.Flag.PrintDefaults()
-
- str := string(buf.Bytes())
- if len(str) > 0 {
- return fmt.Sprintf("\nOptions:\n%s", str)
- }
- return ""
-}
-
-// Runnable reports whether the command can be run; otherwise
-// it is a documentation pseudo-command such as importpath.
-func (c *Command) Runnable() bool {
- return c.Run != nil
-}
-
-// Type to allow us to use sort.Sort on a slice of Commands
-type CommandSlice []*Command
-
-func (c CommandSlice) Len() int {
- return len(c)
-}
-
-func (c CommandSlice) Less(i, j int) bool {
- return c[i].Name() < c[j].Name()
-}
-
-func (c CommandSlice) Swap(i, j int) {
- c[i], c[j] = c[j], c[i]
-}
-
-// Sort the commands
-func (c *Command) SortCommands() {
- sort.Sort(CommandSlice(c.Subcommands))
-}
-
-// Init the command
-func (c *Command) init() {
- if c.Parent != nil {
- return // already initialized.
- }
-
- // setup strings
- if len(c.UsageLine) < 1 {
- c.UsageLine = Defaults.UsageLine
- }
- if len(c.UsageTemplate) < 1 {
- c.UsageTemplate = Defaults.UsageTemplate
- }
- if len(c.HelpTemplate) < 1 {
- c.HelpTemplate = Defaults.HelpTemplate
- }
-
- if c.Stderr == nil {
- c.Stderr = os.Stderr
- }
- if c.Stdout == nil {
- c.Stdout = os.Stdout
- }
-
- // init subcommands
- for _, cmd := range c.Subcommands {
- cmd.init()
- }
-
- // init hierarchy...
- for _, cmd := range c.Subcommands {
- cmd.Parent = c
- }
-}
-
-// Dispatch executes the command using the provided arguments.
-// If a subcommand exists matching the first argument, it is dispatched.
-// Otherwise, the command's Run function is called.
-func (c *Command) Dispatch(args []string) error {
- if c == nil {
- return fmt.Errorf("Called Run() on a nil Command")
- }
-
- // Ensure command is initialized.
- c.init()
-
- // First, try a sub-command
- if len(args) > 0 {
- for _, cmd := range c.Subcommands {
- n := cmd.Name()
- if n == args[0] {
- return cmd.Dispatch(args[1:])
- }
- }
-
- // help is builtin (but after, to allow overriding)
- if args[0] == "help" {
- return c.help(args[1:])
- }
-
- // then, try out an external binary (git-style)
- bin, err := exec.LookPath(c.FullName() + "-" + args[0])
- if err == nil {
- cmd := exec.Command(bin, args[1:]...)
- cmd.Stdin = os.Stdin
- cmd.Stdout = c.Stdout
- cmd.Stderr = c.Stderr
- return cmd.Run()
- }
- }
-
- // then, try running this command
- if c.Runnable() {
- if !c.CustomFlags {
- var err = error(nil)
- c.Flag.Usage = func() {
- c.Usage()
- err = fmt.Errorf("Failed to parse flags.")
- }
- c.Flag.Parse(args)
- if err != nil {
- return err
- }
- args = c.Flag.Args()
- }
- return c.Run(c, args)
- }
-
- // TODO: try an alias
- //...
-
- // Last, print usage
- if err := c.usage(); err != nil {
- return err
- }
- return nil
-}
-
-func (c *Command) usage() error {
- c.SortCommands()
- err := tmpl(c.Stderr, c.UsageTemplate, c)
- if err != nil {
- fmt.Println(err)
- }
- return err
-}
-
-// help implements the 'help' command.
-func (c *Command) help(args []string) error {
-
- // help exactly for this command?
- if len(args) == 0 {
- if len(c.Long) > 0 {
- return tmpl(c.Stdout, c.HelpTemplate, c)
- } else {
- return c.usage()
- }
- }
-
- arg := args[0]
-
- // is this help for a subcommand?
- for _, cmd := range c.Subcommands {
- n := cmd.Name()
- // strip out "<parent>-"" name
- if strings.HasPrefix(n, c.Name()+"-") {
- n = n[len(c.Name()+"-"):]
- }
- if n == arg {
- return cmd.help(args[1:])
- }
- }
-
- return fmt.Errorf("Unknown help topic %#q. Run '%v help'.\n", arg, c.Name())
-}
-
-func (c *Command) MaxLen() (res int) {
- res = 0
- for _, cmd := range c.Subcommands {
- i := len(cmd.Name())
- if i > res {
- res = i
- }
- }
- return
-}
-
-// ColFormat returns the column header size format for printing in the template
-func (c *Command) ColFormat() string {
- sz := c.MaxLen()
- if sz < 11 {
- sz = 11
- }
- return fmt.Sprintf("%%-%ds", sz)
-}
-
-// FullName returns the full name of the command, prefixed with parent commands
-func (c *Command) FullName() string {
- n := c.Name()
- if c.Parent != nil {
- n = c.Parent.FullName() + "-" + n
- }
- return n
-}
-
-// FullSpacedName returns the full name of the command, with ' ' instead of '-'
-func (c *Command) FullSpacedName() string {
- n := c.Name()
- if c.Parent != nil {
- n = c.Parent.FullSpacedName() + " " + n
- }
- return n
-}
-
-func (c *Command) SubcommandList(list Listing) []*Command {
- var cmds []*Command
- for _, cmd := range c.Subcommands {
- if cmd.List == list {
- cmds = append(cmds, cmd)
- }
- }
- return cmds
-}
-
-var Defaults = Command{
- UsageTemplate: `{{if .Runnable}}Usage: {{if .Parent}}{{.Parent.FullSpacedName}}{{end}} {{.UsageLine}}
-
-{{end}}{{.FullSpacedName}} - {{.Short}}
-
-{{if commandList}}Commands:
-{{range commandList}}
- {{.Name | printf (colfmt)}} {{.Short}}{{end}}
-
-Use "{{.Name}} help <command>" for more information about a command.
-
-{{end}}{{.FlagOptions}}{{if helpList}}
-Additional help topics:
-{{range helpList}}
- {{.Name | printf (colfmt)}} {{.Short}}{{end}}
-
-Use "{{.Name}} help <topic>" for more information about that topic.
-
-{{end}}`,
-
- HelpTemplate: `{{if .Runnable}}Usage: {{if .Parent}}{{.Parent.FullSpacedName}}{{end}} {{.UsageLine}}
-
-{{end}}{{.Long | trim}}
-{{.FlagOptions}}
-`,
-}
-
-// tmpl executes the given template text on data, writing the result to w.
-func tmpl(w io.Writer, text string, data interface{}) error {
- t := template.New("top")
- t.Funcs(template.FuncMap{
- "trim": strings.TrimSpace,
- "colfmt": func() string { return data.(*Command).ColFormat() },
- "commandList": func() []*Command { return data.(*Command).SubcommandList(CommandsList) },
- "helpList": func() []*Command { return data.(*Command).SubcommandList(HelpTopicsList) },
- })
- template.Must(t.Parse(text))
- return t.Execute(w, data)
-}
diff --git a/vendor/github.com/gonuts/flag/LICENSE b/vendor/github.com/gonuts/flag/LICENSE
deleted file mode 100644
index 74487567632c8f137ef3971b0f5912ca50bebcda..0000000000000000000000000000000000000000
--- a/vendor/github.com/gonuts/flag/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2012 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
- * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
- * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/github.com/gonuts/flag/README.md b/vendor/github.com/gonuts/flag/README.md
deleted file mode 100644
index 06b7a02be7d941c511d7f04bfe6c08741141f812..0000000000000000000000000000000000000000
--- a/vendor/github.com/gonuts/flag/README.md
+++ /dev/null
@@ -1,6 +0,0 @@
-flag
-=======
-
-[](https://drone.io/github.com/gonuts/flag/latest)
-
-A fork of the official "flag" package but with the flag.Value interface extended to provide a ``Get() interface{}`` method.
diff --git a/vendor/github.com/gonuts/flag/flag.go b/vendor/github.com/gonuts/flag/flag.go
deleted file mode 100644
index 1e939e9efa11d662b04f6edaf856ee921eb7cf9f..0000000000000000000000000000000000000000
--- a/vendor/github.com/gonuts/flag/flag.go
+++ /dev/null
@@ -1,816 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-/*
- Package flag implements command-line flag parsing.
-
- Usage:
-
- Define flags using flag.String(), Bool(), Int(), etc.
-
- This declares an integer flag, -flagname, stored in the pointer ip, with type *int.
- import "flag"
- var ip = flag.Int("flagname", 1234, "help message for flagname")
- If you like, you can bind the flag to a variable using the Var() functions.
- var flagvar int
- func init() {
- flag.IntVar(&flagvar, "flagname", 1234, "help message for flagname")
- }
- Or you can create custom flags that satisfy the Value interface (with
- pointer receivers) and couple them to flag parsing by
- flag.Var(&flagVal, "name", "help message for flagname")
- For such flags, the default value is just the initial value of the variable.
-
- After all flags are defined, call
- flag.Parse()
- to parse the command line into the defined flags.
-
- Flags may then be used directly. If you're using the flags themselves,
- they are all pointers; if you bind to variables, they're values.
- fmt.Println("ip has value ", *ip)
- fmt.Println("flagvar has value ", flagvar)
-
- After parsing, the arguments after the flag are available as the
- slice flag.Args() or individually as flag.Arg(i).
- The arguments are indexed from 0 up to flag.NArg().
-
- Command line flag syntax:
- -flag
- -flag=x
- -flag x // non-boolean flags only
- One or two minus signs may be used; they are equivalent.
- The last form is not permitted for boolean flags because the
- meaning of the command
- cmd -x *
- will change if there is a file called 0, false, etc. You must
- use the -flag=false form to turn off a boolean flag.
-
- Flag parsing stops just before the first non-flag argument
- ("-" is a non-flag argument) or after the terminator "--".
-
- Integer flags accept 1234, 0664, 0x1234 and may be negative.
- Boolean flags may be 1, 0, t, f, true, false, TRUE, FALSE, True, False.
- Duration flags accept any input valid for time.ParseDuration.
-
- The default set of command-line flags is controlled by
- top-level functions. The FlagSet type allows one to define
- independent sets of flags, such as to implement subcommands
- in a command-line interface. The methods of FlagSet are
- analogous to the top-level functions for the command-line
- flag set.
-*/
-package flag
-
-import (
- "errors"
- "fmt"
- "io"
- "os"
- "sort"
- "strconv"
- "time"
-)
-
-// ErrHelp is the error returned if the flag -help is invoked but no such flag is defined.
-var ErrHelp = errors.New("flag: help requested")
-
-// -- bool Value
-type boolValue bool
-
-func newBoolValue(val bool, p *bool) *boolValue {
- *p = val
- return (*boolValue)(p)
-}
-
-func (b *boolValue) Set(s string) error {
- v, err := strconv.ParseBool(s)
- *b = boolValue(v)
- return err
-}
-
-func (b *boolValue) Get() interface{} { return bool(*b) }
-
-func (b *boolValue) String() string { return fmt.Sprintf("%v", *b) }
-
-// -- int Value
-type intValue int
-
-func newIntValue(val int, p *int) *intValue {
- *p = val
- return (*intValue)(p)
-}
-
-func (i *intValue) Set(s string) error {
- v, err := strconv.ParseInt(s, 0, 64)
- *i = intValue(v)
- return err
-}
-
-func (i *intValue) Get() interface{} { return int(*i) }
-
-func (i *intValue) String() string { return fmt.Sprintf("%v", *i) }
-
-// -- int64 Value
-type int64Value int64
-
-func newInt64Value(val int64, p *int64) *int64Value {
- *p = val
- return (*int64Value)(p)
-}
-
-func (i *int64Value) Set(s string) error {
- v, err := strconv.ParseInt(s, 0, 64)
- *i = int64Value(v)
- return err
-}
-
-func (i *int64Value) Get() interface{} { return int64(*i) }
-
-func (i *int64Value) String() string { return fmt.Sprintf("%v", *i) }
-
-// -- uint Value
-type uintValue uint
-
-func newUintValue(val uint, p *uint) *uintValue {
- *p = val
- return (*uintValue)(p)
-}
-
-func (i *uintValue) Set(s string) error {
- v, err := strconv.ParseUint(s, 0, 64)
- *i = uintValue(v)
- return err
-}
-
-func (i *uintValue) Get() interface{} { return uint(*i) }
-
-func (i *uintValue) String() string { return fmt.Sprintf("%v", *i) }
-
-// -- uint64 Value
-type uint64Value uint64
-
-func newUint64Value(val uint64, p *uint64) *uint64Value {
- *p = val
- return (*uint64Value)(p)
-}
-
-func (i *uint64Value) Set(s string) error {
- v, err := strconv.ParseUint(s, 0, 64)
- *i = uint64Value(v)
- return err
-}
-
-func (i *uint64Value) Get() interface{} { return uint64(*i) }
-
-func (i *uint64Value) String() string { return fmt.Sprintf("%v", *i) }
-
-// -- string Value
-type stringValue string
-
-func newStringValue(val string, p *string) *stringValue {
- *p = val
- return (*stringValue)(p)
-}
-
-func (s *stringValue) Set(val string) error {
- *s = stringValue(val)
- return nil
-}
-
-func (s *stringValue) Get() interface{} { return s.String() }
-
-func (s *stringValue) String() string { return fmt.Sprintf("%s", *s) }
-
-// -- float64 Value
-type float64Value float64
-
-func newFloat64Value(val float64, p *float64) *float64Value {
- *p = val
- return (*float64Value)(p)
-}
-
-func (f *float64Value) Set(s string) error {
- v, err := strconv.ParseFloat(s, 64)
- *f = float64Value(v)
- return err
-}
-
-func (f *float64Value) Get() interface{} { return float64(*f) }
-
-func (f *float64Value) String() string { return fmt.Sprintf("%v", *f) }
-
-// -- time.Duration Value
-type durationValue time.Duration
-
-func newDurationValue(val time.Duration, p *time.Duration) *durationValue {
- *p = val
- return (*durationValue)(p)
-}
-
-func (d *durationValue) Set(s string) error {
- v, err := time.ParseDuration(s)
- *d = durationValue(v)
- return err
-}
-
-func (d *durationValue) Get() interface{} { return *(*time.Duration)(d) }
-
-func (d *durationValue) String() string { return (*time.Duration)(d).String() }
-
-// Value is the interface to the dynamic value stored in a flag.
-// (The default value is represented as a string.)
-type Value interface {
- String() string
- Set(string) error
- Get() interface{}
-}
-
-// ErrorHandling defines how to handle flag parsing errors.
-type ErrorHandling int
-
-const (
- ContinueOnError ErrorHandling = iota
- ExitOnError
- PanicOnError
-)
-
-// A FlagSet represents a set of defined flags.
-type FlagSet struct {
- // Usage is the function called when an error occurs while parsing flags.
- // The field is a function (not a method) that may be changed to point to
- // a custom error handler.
- Usage func()
-
- name string
- parsed bool
- actual map[string]*Flag
- formal map[string]*Flag
- args []string // arguments after flags
- exitOnError bool // does the program exit if there's an error?
- errorHandling ErrorHandling
- output io.Writer // nil means stderr; use out() accessor
-}
-
-// A Flag represents the state of a flag.
-type Flag struct {
- Name string // name as it appears on command line
- Usage string // help message
- Value Value // value as set
- DefValue string // default value (as text); for usage message
-}
-
-// sortFlags returns the flags as a slice in lexicographical sorted order.
-func sortFlags(flags map[string]*Flag) []*Flag {
- list := make(sort.StringSlice, len(flags))
- i := 0
- for _, f := range flags {
- list[i] = f.Name
- i++
- }
- list.Sort()
- result := make([]*Flag, len(list))
- for i, name := range list {
- result[i] = flags[name]
- }
- return result
-}
-
-func (f *FlagSet) out() io.Writer {
- if f.output == nil {
- return os.Stderr
- }
- return f.output
-}
-
-// SetOutput sets the destination for usage and error messages.
-// If output is nil, os.Stderr is used.
-func (f *FlagSet) SetOutput(output io.Writer) {
- f.output = output
-}
-
-// VisitAll visits the flags in lexicographical order, calling fn for each.
-// It visits all flags, even those not set.
-func (f *FlagSet) VisitAll(fn func(*Flag)) {
- for _, flag := range sortFlags(f.formal) {
- fn(flag)
- }
-}
-
-// VisitAll visits the command-line flags in lexicographical order, calling
-// fn for each. It visits all flags, even those not set.
-func VisitAll(fn func(*Flag)) {
- commandLine.VisitAll(fn)
-}
-
-// Visit visits the flags in lexicographical order, calling fn for each.
-// It visits only those flags that have been set.
-func (f *FlagSet) Visit(fn func(*Flag)) {
- for _, flag := range sortFlags(f.actual) {
- fn(flag)
- }
-}
-
-// Visit visits the command-line flags in lexicographical order, calling fn
-// for each. It visits only those flags that have been set.
-func Visit(fn func(*Flag)) {
- commandLine.Visit(fn)
-}
-
-// Lookup returns the Flag structure of the named flag, returning nil if none exists.
-func (f *FlagSet) Lookup(name string) *Flag {
- return f.formal[name]
-}
-
-// Lookup returns the Flag structure of the named command-line flag,
-// returning nil if none exists.
-func Lookup(name string) *Flag {
- return commandLine.formal[name]
-}
-
-// Set sets the value of the named flag.
-func (f *FlagSet) Set(name, value string) error {
- flag, ok := f.formal[name]
- if !ok {
- return fmt.Errorf("no such flag -%v", name)
- }
- err := flag.Value.Set(value)
- if err != nil {
- return err
- }
- if f.actual == nil {
- f.actual = make(map[string]*Flag)
- }
- f.actual[name] = flag
- return nil
-}
-
-// Set sets the value of the named command-line flag.
-func Set(name, value string) error {
- return commandLine.Set(name, value)
-}
-
-// PrintDefaults prints, to standard error unless configured
-// otherwise, the default values of all defined flags in the set.
-func (f *FlagSet) PrintDefaults() {
- f.VisitAll(func(flag *Flag) {
- format := " -%s=%s: %s\n"
- if _, ok := flag.Value.(*stringValue); ok {
- // put quotes on the value
- format = " -%s=%q: %s\n"
- }
- fmt.Fprintf(f.out(), format, flag.Name, flag.DefValue, flag.Usage)
- })
-}
-
-// PrintDefaults prints to standard error the default values of all defined command-line flags.
-func PrintDefaults() {
- commandLine.PrintDefaults()
-}
-
-// defaultUsage is the default function to print a usage message.
-func defaultUsage(f *FlagSet) {
- fmt.Fprintf(f.out(), "Usage of %s:\n", f.name)
- f.PrintDefaults()
-}
-
-// NOTE: Usage is not just defaultUsage(commandLine)
-// because it serves (via godoc flag Usage) as the example
-// for how to write your own usage function.
-
-// Usage prints to standard error a usage message documenting all defined command-line flags.
-// The function is a variable that may be changed to point to a custom function.
-var Usage = func() {
- fmt.Fprintf(os.Stderr, "Usage of %s:\n", os.Args[0])
- PrintDefaults()
-}
-
-// NFlag returns the number of flags that have been set.
-func (f *FlagSet) NFlag() int { return len(f.actual) }
-
-// NFlag returns the number of command-line flags that have been set.
-func NFlag() int { return len(commandLine.actual) }
-
-// Arg returns the i'th argument. Arg(0) is the first remaining argument
-// after flags have been processed.
-func (f *FlagSet) Arg(i int) string {
- if i < 0 || i >= len(f.args) {
- return ""
- }
- return f.args[i]
-}
-
-// Arg returns the i'th command-line argument. Arg(0) is the first remaining argument
-// after flags have been processed.
-func Arg(i int) string {
- return commandLine.Arg(i)
-}
-
-// NArg is the number of arguments remaining after flags have been processed.
-func (f *FlagSet) NArg() int { return len(f.args) }
-
-// NArg is the number of arguments remaining after flags have been processed.
-func NArg() int { return len(commandLine.args) }
-
-// Args returns the non-flag arguments.
-func (f *FlagSet) Args() []string { return f.args }
-
-// Args returns the non-flag command-line arguments.
-func Args() []string { return commandLine.args }
-
-// BoolVar defines a bool flag with specified name, default value, and usage string.
-// The argument p points to a bool variable in which to store the value of the flag.
-func (f *FlagSet) BoolVar(p *bool, name string, value bool, usage string) {
- f.Var(newBoolValue(value, p), name, usage)
-}
-
-// BoolVar defines a bool flag with specified name, default value, and usage string.
-// The argument p points to a bool variable in which to store the value of the flag.
-func BoolVar(p *bool, name string, value bool, usage string) {
- commandLine.Var(newBoolValue(value, p), name, usage)
-}
-
-// Bool defines a bool flag with specified name, default value, and usage string.
-// The return value is the address of a bool variable that stores the value of the flag.
-func (f *FlagSet) Bool(name string, value bool, usage string) *bool {
- p := new(bool)
- f.BoolVar(p, name, value, usage)
- return p
-}
-
-// Bool defines a bool flag with specified name, default value, and usage string.
-// The return value is the address of a bool variable that stores the value of the flag.
-func Bool(name string, value bool, usage string) *bool {
- return commandLine.Bool(name, value, usage)
-}
-
-// IntVar defines an int flag with specified name, default value, and usage string.
-// The argument p points to an int variable in which to store the value of the flag.
-func (f *FlagSet) IntVar(p *int, name string, value int, usage string) {
- f.Var(newIntValue(value, p), name, usage)
-}
-
-// IntVar defines an int flag with specified name, default value, and usage string.
-// The argument p points to an int variable in which to store the value of the flag.
-func IntVar(p *int, name string, value int, usage string) {
- commandLine.Var(newIntValue(value, p), name, usage)
-}
-
-// Int defines an int flag with specified name, default value, and usage string.
-// The return value is the address of an int variable that stores the value of the flag.
-func (f *FlagSet) Int(name string, value int, usage string) *int {
- p := new(int)
- f.IntVar(p, name, value, usage)
- return p
-}
-
-// Int defines an int flag with specified name, default value, and usage string.
-// The return value is the address of an int variable that stores the value of the flag.
-func Int(name string, value int, usage string) *int {
- return commandLine.Int(name, value, usage)
-}
-
-// Int64Var defines an int64 flag with specified name, default value, and usage string.
-// The argument p points to an int64 variable in which to store the value of the flag.
-func (f *FlagSet) Int64Var(p *int64, name string, value int64, usage string) {
- f.Var(newInt64Value(value, p), name, usage)
-}
-
-// Int64Var defines an int64 flag with specified name, default value, and usage string.
-// The argument p points to an int64 variable in which to store the value of the flag.
-func Int64Var(p *int64, name string, value int64, usage string) {
- commandLine.Var(newInt64Value(value, p), name, usage)
-}
-
-// Int64 defines an int64 flag with specified name, default value, and usage string.
-// The return value is the address of an int64 variable that stores the value of the flag.
-func (f *FlagSet) Int64(name string, value int64, usage string) *int64 {
- p := new(int64)
- f.Int64Var(p, name, value, usage)
- return p
-}
-
-// Int64 defines an int64 flag with specified name, default value, and usage string.
-// The return value is the address of an int64 variable that stores the value of the flag.
-func Int64(name string, value int64, usage string) *int64 {
- return commandLine.Int64(name, value, usage)
-}
-
-// UintVar defines a uint flag with specified name, default value, and usage string.
-// The argument p points to a uint variable in which to store the value of the flag.
-func (f *FlagSet) UintVar(p *uint, name string, value uint, usage string) {
- f.Var(newUintValue(value, p), name, usage)
-}
-
-// UintVar defines a uint flag with specified name, default value, and usage string.
-// The argument p points to a uint variable in which to store the value of the flag.
-func UintVar(p *uint, name string, value uint, usage string) {
- commandLine.Var(newUintValue(value, p), name, usage)
-}
-
-// Uint defines a uint flag with specified name, default value, and usage string.
-// The return value is the address of a uint variable that stores the value of the flag.
-func (f *FlagSet) Uint(name string, value uint, usage string) *uint {
- p := new(uint)
- f.UintVar(p, name, value, usage)
- return p
-}
-
-// Uint defines a uint flag with specified name, default value, and usage string.
-// The return value is the address of a uint variable that stores the value of the flag.
-func Uint(name string, value uint, usage string) *uint {
- return commandLine.Uint(name, value, usage)
-}
-
-// Uint64Var defines a uint64 flag with specified name, default value, and usage string.
-// The argument p points to a uint64 variable in which to store the value of the flag.
-func (f *FlagSet) Uint64Var(p *uint64, name string, value uint64, usage string) {
- f.Var(newUint64Value(value, p), name, usage)
-}
-
-// Uint64Var defines a uint64 flag with specified name, default value, and usage string.
-// The argument p points to a uint64 variable in which to store the value of the flag.
-func Uint64Var(p *uint64, name string, value uint64, usage string) {
- commandLine.Var(newUint64Value(value, p), name, usage)
-}
-
-// Uint64 defines a uint64 flag with specified name, default value, and usage string.
-// The return value is the address of a uint64 variable that stores the value of the flag.
-func (f *FlagSet) Uint64(name string, value uint64, usage string) *uint64 {
- p := new(uint64)
- f.Uint64Var(p, name, value, usage)
- return p
-}
-
-// Uint64 defines a uint64 flag with specified name, default value, and usage string.
-// The return value is the address of a uint64 variable that stores the value of the flag.
-func Uint64(name string, value uint64, usage string) *uint64 {
- return commandLine.Uint64(name, value, usage)
-}
-
-// StringVar defines a string flag with specified name, default value, and usage string.
-// The argument p points to a string variable in which to store the value of the flag.
-func (f *FlagSet) StringVar(p *string, name string, value string, usage string) {
- f.Var(newStringValue(value, p), name, usage)
-}
-
-// StringVar defines a string flag with specified name, default value, and usage string.
-// The argument p points to a string variable in which to store the value of the flag.
-func StringVar(p *string, name string, value string, usage string) {
- commandLine.Var(newStringValue(value, p), name, usage)
-}
-
-// String defines a string flag with specified name, default value, and usage string.
-// The return value is the address of a string variable that stores the value of the flag.
-func (f *FlagSet) String(name string, value string, usage string) *string {
- p := new(string)
- f.StringVar(p, name, value, usage)
- return p
-}
-
-// String defines a string flag with specified name, default value, and usage string.
-// The return value is the address of a string variable that stores the value of the flag.
-func String(name string, value string, usage string) *string {
- return commandLine.String(name, value, usage)
-}
-
-// Float64Var defines a float64 flag with specified name, default value, and usage string.
-// The argument p points to a float64 variable in which to store the value of the flag.
-func (f *FlagSet) Float64Var(p *float64, name string, value float64, usage string) {
- f.Var(newFloat64Value(value, p), name, usage)
-}
-
-// Float64Var defines a float64 flag with specified name, default value, and usage string.
-// The argument p points to a float64 variable in which to store the value of the flag.
-func Float64Var(p *float64, name string, value float64, usage string) {
- commandLine.Var(newFloat64Value(value, p), name, usage)
-}
-
-// Float64 defines a float64 flag with specified name, default value, and usage string.
-// The return value is the address of a float64 variable that stores the value of the flag.
-func (f *FlagSet) Float64(name string, value float64, usage string) *float64 {
- p := new(float64)
- f.Float64Var(p, name, value, usage)
- return p
-}
-
-// Float64 defines a float64 flag with specified name, default value, and usage string.
-// The return value is the address of a float64 variable that stores the value of the flag.
-func Float64(name string, value float64, usage string) *float64 {
- return commandLine.Float64(name, value, usage)
-}
-
-// DurationVar defines a time.Duration flag with specified name, default value, and usage string.
-// The argument p points to a time.Duration variable in which to store the value of the flag.
-func (f *FlagSet) DurationVar(p *time.Duration, name string, value time.Duration, usage string) {
- f.Var(newDurationValue(value, p), name, usage)
-}
-
-// DurationVar defines a time.Duration flag with specified name, default value, and usage string.
-// The argument p points to a time.Duration variable in which to store the value of the flag.
-func DurationVar(p *time.Duration, name string, value time.Duration, usage string) {
- commandLine.Var(newDurationValue(value, p), name, usage)
-}
-
-// Duration defines a time.Duration flag with specified name, default value, and usage string.
-// The return value is the address of a time.Duration variable that stores the value of the flag.
-func (f *FlagSet) Duration(name string, value time.Duration, usage string) *time.Duration {
- p := new(time.Duration)
- f.DurationVar(p, name, value, usage)
- return p
-}
-
-// Duration defines a time.Duration flag with specified name, default value, and usage string.
-// The return value is the address of a time.Duration variable that stores the value of the flag.
-func Duration(name string, value time.Duration, usage string) *time.Duration {
- return commandLine.Duration(name, value, usage)
-}
-
-// Var defines a flag with the specified name and usage string. The type and
-// value of the flag are represented by the first argument, of type Value, which
-// typically holds a user-defined implementation of Value. For instance, the
-// caller could create a flag that turns a comma-separated string into a slice
-// of strings by giving the slice the methods of Value; in particular, Set would
-// decompose the comma-separated string into the slice.
-func (f *FlagSet) Var(value Value, name string, usage string) {
- // Remember the default value as a string; it won't change.
- flag := &Flag{name, usage, value, value.String()}
- _, alreadythere := f.formal[name]
- if alreadythere {
- msg := fmt.Sprintf("%s flag redefined: %s", f.name, name)
- fmt.Fprintln(f.out(), msg)
- panic(msg) // Happens only if flags are declared with identical names
- }
- if f.formal == nil {
- f.formal = make(map[string]*Flag)
- }
- f.formal[name] = flag
-}
-
-// Var defines a flag with the specified name and usage string. The type and
-// value of the flag are represented by the first argument, of type Value, which
-// typically holds a user-defined implementation of Value. For instance, the
-// caller could create a flag that turns a comma-separated string into a slice
-// of strings by giving the slice the methods of Value; in particular, Set would
-// decompose the comma-separated string into the slice.
-func Var(value Value, name string, usage string) {
- commandLine.Var(value, name, usage)
-}
-
-// failf prints to standard error a formatted error and usage message and
-// returns the error.
-func (f *FlagSet) failf(format string, a ...interface{}) error {
- err := fmt.Errorf(format, a...)
- fmt.Fprintln(f.out(), err)
- f.usage()
- return err
-}
-
-// usage calls the Usage method for the flag set, or the usage function if
-// the flag set is commandLine.
-func (f *FlagSet) usage() {
- if f == commandLine {
- Usage()
- } else if f.Usage == nil {
- defaultUsage(f)
- } else {
- f.Usage()
- }
-}
-
-// parseOne parses one flag. It returns whether a flag was seen.
-func (f *FlagSet) parseOne() (bool, error) {
- if len(f.args) == 0 {
- return false, nil
- }
- s := f.args[0]
- if len(s) == 0 || s[0] != '-' || len(s) == 1 {
- return false, nil
- }
- num_minuses := 1
- if s[1] == '-' {
- num_minuses++
- if len(s) == 2 { // "--" terminates the flags
- f.args = f.args[1:]
- return false, nil
- }
- }
- name := s[num_minuses:]
- if len(name) == 0 || name[0] == '-' || name[0] == '=' {
- return false, f.failf("bad flag syntax: %s", s)
- }
-
- // it's a flag. does it have an argument?
- f.args = f.args[1:]
- has_value := false
- value := ""
- for i := 1; i < len(name); i++ { // equals cannot be first
- if name[i] == '=' {
- value = name[i+1:]
- has_value = true
- name = name[0:i]
- break
- }
- }
- m := f.formal
- flag, alreadythere := m[name] // BUG
- if !alreadythere {
- if name == "help" || name == "h" { // special case for nice help message.
- f.usage()
- return false, ErrHelp
- }
- return false, f.failf("flag provided but not defined: -%s", name)
- }
- if fv, ok := flag.Value.(*boolValue); ok { // special case: doesn't need an arg
- if has_value {
- if err := fv.Set(value); err != nil {
- f.failf("invalid boolean value %q for -%s: %v", value, name, err)
- }
- } else {
- fv.Set("true")
- }
- } else {
- // It must have a value, which might be the next argument.
- if !has_value && len(f.args) > 0 {
- // value is the next arg
- has_value = true
- value, f.args = f.args[0], f.args[1:]
- }
- if !has_value {
- return false, f.failf("flag needs an argument: -%s", name)
- }
- if err := flag.Value.Set(value); err != nil {
- return false, f.failf("invalid value %q for flag -%s: %v", value, name, err)
- }
- }
- if f.actual == nil {
- f.actual = make(map[string]*Flag)
- }
- f.actual[name] = flag
- return true, nil
-}
-
-// Parse parses flag definitions from the argument list, which should not
-// include the command name. Must be called after all flags in the FlagSet
-// are defined and before flags are accessed by the program.
-// The return value will be ErrHelp if -help was set but not defined.
-func (f *FlagSet) Parse(arguments []string) error {
- f.parsed = true
- f.args = arguments
- for {
- seen, err := f.parseOne()
- if seen {
- continue
- }
- if err == nil {
- break
- }
- switch f.errorHandling {
- case ContinueOnError:
- return err
- case ExitOnError:
- os.Exit(2)
- case PanicOnError:
- panic(err)
- }
- }
- return nil
-}
-
-// Parsed reports whether f.Parse has been called.
-func (f *FlagSet) Parsed() bool {
- return f.parsed
-}
-
-// Parse parses the command-line flags from os.Args[1:]. Must be called
-// after all flags are defined and before flags are accessed by the program.
-func Parse() {
- // Ignore errors; commandLine is set for ExitOnError.
- commandLine.Parse(os.Args[1:])
-}
-
-// Parsed returns true if the command-line flags have been parsed.
-func Parsed() bool {
- return commandLine.Parsed()
-}
-
-// The default set of command-line flags, parsed from os.Args.
-var commandLine = NewFlagSet(os.Args[0], ExitOnError)
-
-// NewFlagSet returns a new, empty flag set with the specified name and
-// error handling property.
-func NewFlagSet(name string, errorHandling ErrorHandling) *FlagSet {
- f := &FlagSet{
- name: name,
- errorHandling: errorHandling,
- }
- return f
-}
-
-// Init sets the name and error handling property for a flag set.
-// By default, the zero FlagSet uses an empty name and the
-// ContinueOnError error handling policy.
-func (f *FlagSet) Init(name string, errorHandling ErrorHandling) {
- f.name = name
- f.errorHandling = errorHandling
-}
diff --git a/vendor/github.com/google/subcommands/CONTRIBUTING b/vendor/github.com/google/subcommands/CONTRIBUTING
new file mode 100644
index 0000000000000000000000000000000000000000..2827b7d3fa277e2daab95ea3cfaff1c2bfc1389e
--- /dev/null
+++ b/vendor/github.com/google/subcommands/CONTRIBUTING
@@ -0,0 +1,27 @@
+Want to contribute? Great! First, read this page (including the small print at the end).
+
+### Before you contribute
+Before we can use your code, you must sign the
+[Google Individual Contributor License Agreement]
+(https://cla.developers.google.com/about/google-individual)
+(CLA), which you can do online. The CLA is necessary mainly because you own the
+copyright to your changes, even after your contribution becomes part of our
+codebase, so we need your permission to use and distribute your code. We also
+need to be sure of various other things—for instance that you'll tell us if you
+know that your code infringes on other people's patents. You don't have to sign
+the CLA until after you've submitted your code for review and a member has
+approved it, but you must do it before we can put your code into our codebase.
+Before you start working on a larger contribution, you should get in touch with
+us first through the issue tracker with your idea so that we can help out and
+possibly guide you. Coordinating up front makes it much easier to avoid
+frustration later on.
+
+### Code reviews
+All submissions, including submissions by project members, require review. We
+use Github pull requests for this purpose.
+
+### The small print
+Contributions made by corporations are covered by a different agreement than
+the one above, the
+[Software Grant and Corporate Contributor License Agreement]
+(https://cla.developers.google.com/about/google-corporate).
diff --git a/vendor/github.com/google/subcommands/LICENSE b/vendor/github.com/google/subcommands/LICENSE
new file mode 100644
index 0000000000000000000000000000000000000000..d645695673349e3947e8e5ae42332d0ac3164cd7
--- /dev/null
+++ b/vendor/github.com/google/subcommands/LICENSE
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
diff --git a/vendor/github.com/google/subcommands/README.md b/vendor/github.com/google/subcommands/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..c769745c55121f77016a8d9189947bd642a587f9
--- /dev/null
+++ b/vendor/github.com/google/subcommands/README.md
@@ -0,0 +1,67 @@
+# subcommands #
+
+[](https://godoc.org/github.com/google/subcommands)
+Subcommands is a Go package that implements a simple way for a single command to
+have many subcommands, each of which takes arguments and so forth.
+
+This is not an official Google product.
+
+## Usage ##
+
+Set up a 'print' subcommand:
+
+```go
+import (
+ "context"
+ "flag"
+ "fmt"
+ "os"
+ "strings"
+
+ "github.com/google/subcommands"
+)
+
+type printCmd struct {
+ capitalize bool
+}
+
+func (*printCmd) Name() string { return "print" }
+func (*printCmd) Synopsis() string { return "Print args to stdout." }
+func (*printCmd) Usage() string {
+ return `print [-capitalize] <some text>:
+ Print args to stdout.
+`
+}
+
+func (p *printCmd) SetFlags(f *flag.FlagSet) {
+ f.BoolVar(&p.capitalize, "capitalize", false, "capitalize output")
+}
+
+func (p *printCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{}) subcommands.ExitStatus {
+ for _, arg := range f.Args() {
+ if p.capitalize {
+ arg = strings.ToUpper(arg)
+ }
+ fmt.Printf("%s ", arg)
+ }
+ fmt.Println()
+ return subcommands.ExitSuccess
+}
+```
+
+Register using the default Commander, also use some built in subcommands,
+finally run Execute using ExitStatus as the exit code:
+
+```go
+func main() {
+ subcommands.Register(subcommands.HelpCommand(), "")
+ subcommands.Register(subcommands.FlagsCommand(), "")
+ subcommands.Register(subcommands.CommandsCommand(), "")
+ subcommands.Register(&printCmd{}, "")
+
+ flag.Parse()
+ ctx := context.Background()
+ os.Exit(int(subcommands.Execute(ctx)))
+}
+```
+
diff --git a/vendor/github.com/google/subcommands/go.mod b/vendor/github.com/google/subcommands/go.mod
new file mode 100644
index 0000000000000000000000000000000000000000..f502431f96a92db1cff771a869504db3fc8f79c6
--- /dev/null
+++ b/vendor/github.com/google/subcommands/go.mod
@@ -0,0 +1 @@
+module github.com/google/subcommands
diff --git a/vendor/github.com/google/subcommands/subcommands.go b/vendor/github.com/google/subcommands/subcommands.go
new file mode 100644
index 0000000000000000000000000000000000000000..39268f7362faf5b85bdeb764be91a91a0f806f5d
--- /dev/null
+++ b/vendor/github.com/google/subcommands/subcommands.go
@@ -0,0 +1,512 @@
+/*
+Copyright 2016 Google Inc. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Package subcommands implements a simple way for a single command to have many
+// subcommands, each of which takes arguments and so forth.
+package subcommands
+
+import (
+ "context"
+ "flag"
+ "fmt"
+ "io"
+ "os"
+ "path"
+ "sort"
+ "strings"
+)
+
+// A Command represents a single command.
+type Command interface {
+ // Name returns the name of the command.
+ Name() string
+
+ // Synopsis returns a short string (less than one line) describing the command.
+ Synopsis() string
+
+ // Usage returns a long string explaining the command and giving usage
+ // information.
+ Usage() string
+
+ // SetFlags adds the flags for this command to the specified set.
+ SetFlags(*flag.FlagSet)
+
+ // Execute executes the command and returns an ExitStatus.
+ Execute(ctx context.Context, f *flag.FlagSet, args ...interface{}) ExitStatus
+}
+
+// A Commander represents a set of commands.
+type Commander struct {
+ commands []*CommandGroup
+ topFlags *flag.FlagSet // top-level flags
+ important []string // important top-level flags
+ name string // normally path.Base(os.Args[0])
+
+ Explain func(io.Writer) // A function to print a top level usage explanation. Can be overridden.
+ ExplainGroup func(io.Writer, *CommandGroup) // A function to print a command group's usage explanation. Can be overridden.
+ ExplainCommand func(io.Writer, Command) // A function to print a command usage explanation. Can be overridden.
+
+ Output io.Writer // Output specifies where the commander should write its output (default: os.Stdout).
+ Error io.Writer // Error specifies where the commander should write its error (default: os.Stderr).
+}
+
+// A CommandGroup represents a set of commands about a common topic.
+type CommandGroup struct {
+ name string
+ commands []Command
+}
+
+// Name returns the group name
+func (g *CommandGroup) Name() string {
+ return g.name
+}
+
+// An ExitStatus represents a Posix exit status that a subcommand
+// expects to be returned to the shell.
+type ExitStatus int
+
+const (
+ ExitSuccess ExitStatus = iota
+ ExitFailure
+ ExitUsageError
+)
+
+// NewCommander returns a new commander with the specified top-level
+// flags and command name. The Usage function for the topLevelFlags
+// will be set as well.
+func NewCommander(topLevelFlags *flag.FlagSet, name string) *Commander {
+ cdr := &Commander{
+ topFlags: topLevelFlags,
+ name: name,
+ Output: os.Stdout,
+ Error: os.Stderr,
+ }
+
+ cdr.Explain = cdr.explain
+ cdr.ExplainGroup = explainGroup
+ cdr.ExplainCommand = explain
+ topLevelFlags.Usage = func() { cdr.Explain(cdr.Error) }
+ return cdr
+}
+
+// Name returns the commander's name
+func (cdr *Commander) Name() string {
+ return cdr.name
+}
+
+// Register adds a subcommand to the supported subcommands in the
+// specified group. (Help output is sorted and arranged by group name.)
+// The empty string is an acceptable group name; such subcommands are
+// explained first before named groups.
+func (cdr *Commander) Register(cmd Command, group string) {
+ for _, g := range cdr.commands {
+ if g.name == group {
+ g.commands = append(g.commands, cmd)
+ return
+ }
+ }
+ cdr.commands = append(cdr.commands, &CommandGroup{
+ name: group,
+ commands: []Command{cmd},
+ })
+}
+
+// ImportantFlag marks a top-level flag as important, which means it
+// will be printed out as part of the output of an ordinary "help"
+// subcommand. (All flags, important or not, are printed by the
+// "flags" subcommand.)
+func (cdr *Commander) ImportantFlag(name string) {
+ cdr.important = append(cdr.important, name)
+}
+
+// VisitGroups visits each command group in lexicographical order, calling
+// fn for each.
+func (cdr *Commander) VisitGroups(fn func(*CommandGroup)) {
+ sort.Sort(byGroupName(cdr.commands))
+ for _, g := range cdr.commands {
+ fn(g)
+ }
+}
+
+// VisitCommands visits each command in registered order grouped by
+// command group in lexicographical order, calling fn for each.
+func (cdr *Commander) VisitCommands(fn func(*CommandGroup, Command)) {
+ cdr.VisitGroups(func(g *CommandGroup) {
+ for _, cmd := range g.commands {
+ fn(g, cmd)
+ }
+ })
+}
+
+// VisitAllImportant visits the important top level flags in lexicographical
+// order, calling fn for each. It visits all flags, even those not set.
+func (cdr *Commander) VisitAllImportant(fn func(*flag.Flag)) {
+ sort.Strings(cdr.important)
+ for _, name := range cdr.important {
+ f := cdr.topFlags.Lookup(name)
+ if f == nil {
+ panic(fmt.Sprintf("Important flag (%s) is not defined", name))
+ }
+ fn(f)
+ }
+}
+
+// VisitAll visits the top level flags in lexicographical order, calling fn
+// for each. It visits all flags, even those not set.
+func (cdr *Commander) VisitAll(fn func(*flag.Flag)) {
+ if cdr.topFlags != nil {
+ cdr.topFlags.VisitAll(fn)
+ }
+}
+
+// countFlags returns the number of top-level flags defined, even those not set.
+func (cdr *Commander) countTopFlags() int {
+ count := 0
+ cdr.VisitAll(func(*flag.Flag) {
+ count++
+ })
+ return count
+}
+
+// Execute should be called once the top-level-flags on a Commander
+// have been initialized. It finds the correct subcommand and executes
+// it, and returns an ExitStatus with the result. On a usage error, an
+// appropriate message is printed to os.Stderr, and ExitUsageError is
+// returned. The additional args are provided as-is to the Execute method
+// of the selected Command.
+func (cdr *Commander) Execute(ctx context.Context, args ...interface{}) ExitStatus {
+ if cdr.topFlags.NArg() < 1 {
+ cdr.topFlags.Usage()
+ return ExitUsageError
+ }
+
+ name := cdr.topFlags.Arg(0)
+
+ for _, group := range cdr.commands {
+ for _, cmd := range group.commands {
+ if name != cmd.Name() {
+ continue
+ }
+ f := flag.NewFlagSet(name, flag.ContinueOnError)
+ f.Usage = func() { cdr.ExplainCommand(cdr.Error, cmd) }
+ cmd.SetFlags(f)
+ if f.Parse(cdr.topFlags.Args()[1:]) != nil {
+ return ExitUsageError
+ }
+ return cmd.Execute(ctx, f, args...)
+ }
+ }
+
+ // Cannot find this command.
+ cdr.topFlags.Usage()
+ return ExitUsageError
+}
+
+// Sorting of a slice of command groups.
+type byGroupName []*CommandGroup
+
+// TODO Sort by function rather than implement sortable?
+func (p byGroupName) Len() int { return len(p) }
+func (p byGroupName) Less(i, j int) bool { return p[i].name < p[j].name }
+func (p byGroupName) Swap(i, j int) { p[i], p[j] = p[j], p[i] }
+
+// explain prints a brief description of all the subcommands and the
+// important top-level flags.
+func (cdr *Commander) explain(w io.Writer) {
+ fmt.Fprintf(w, "Usage: %s <flags> <subcommand> <subcommand args>\n\n", cdr.name)
+ sort.Sort(byGroupName(cdr.commands))
+ for _, group := range cdr.commands {
+ cdr.ExplainGroup(w, group)
+ }
+ if cdr.topFlags == nil {
+ fmt.Fprintln(w, "\nNo top level flags.")
+ return
+ }
+
+ sort.Strings(cdr.important)
+ if len(cdr.important) == 0 {
+ if cdr.countTopFlags() > 0 {
+ fmt.Fprintf(w, "\nUse \"%s flags\" for a list of top-level flags\n", cdr.name)
+ }
+ return
+ }
+
+ fmt.Fprintf(w, "\nTop-level flags (use \"%s flags\" for a full list):\n", cdr.name)
+ for _, name := range cdr.important {
+ f := cdr.topFlags.Lookup(name)
+ if f == nil {
+ panic(fmt.Sprintf("Important flag (%s) is not defined", name))
+ }
+ fmt.Fprintf(w, " -%s=%s: %s\n", f.Name, f.DefValue, f.Usage)
+ }
+}
+
+// Sorting of the commands within a group.
+func (g CommandGroup) Len() int { return len(g.commands) }
+func (g CommandGroup) Less(i, j int) bool { return g.commands[i].Name() < g.commands[j].Name() }
+func (g CommandGroup) Swap(i, j int) { g.commands[i], g.commands[j] = g.commands[j], g.commands[i] }
+
+// explainGroup explains all the subcommands for a particular group.
+func explainGroup(w io.Writer, group *CommandGroup) {
+ if len(group.commands) == 0 {
+ return
+ }
+ if group.name == "" {
+ fmt.Fprintf(w, "Subcommands:\n")
+ } else {
+ fmt.Fprintf(w, "Subcommands for %s:\n", group.name)
+ }
+ sort.Sort(group)
+
+ aliases := make(map[string][]string)
+ for _, cmd := range group.commands {
+ if alias, ok := cmd.(*aliaser); ok {
+ root := dealias(alias).Name()
+
+ if _, ok := aliases[root]; !ok {
+ aliases[root] = []string{}
+ }
+ aliases[root] = append(aliases[root], alias.Name())
+ }
+ }
+
+ for _, cmd := range group.commands {
+ if _, ok := cmd.(*aliaser); ok {
+ continue
+ }
+
+ name := cmd.Name()
+ names := []string{name}
+
+ if a, ok := aliases[name]; ok {
+ names = append(names, a...)
+ }
+
+ fmt.Fprintf(w, "\t%-15s %s\n", strings.Join(names, ", "), cmd.Synopsis())
+ }
+ fmt.Fprintln(w)
+}
+
+// explainCmd prints a brief description of a single command.
+func explain(w io.Writer, cmd Command) {
+ fmt.Fprintf(w, "%s", cmd.Usage())
+ subflags := flag.NewFlagSet(cmd.Name(), flag.PanicOnError)
+ subflags.SetOutput(w)
+ cmd.SetFlags(subflags)
+ subflags.PrintDefaults()
+}
+
+// A helper is a Command implementing a "help" command for
+// a given Commander.
+type helper Commander
+
+func (h *helper) Name() string { return "help" }
+func (h *helper) Synopsis() string { return "describe subcommands and their syntax" }
+func (h *helper) SetFlags(*flag.FlagSet) {}
+func (h *helper) Usage() string {
+ return `help [<subcommand>]:
+ With an argument, prints detailed information on the use of
+ the specified subcommand. With no argument, print a list of
+ all commands and a brief description of each.
+`
+}
+func (h *helper) Execute(_ context.Context, f *flag.FlagSet, args ...interface{}) ExitStatus {
+ switch f.NArg() {
+ case 0:
+ (*Commander)(h).Explain(h.Output)
+ return ExitSuccess
+
+ case 1:
+ for _, group := range h.commands {
+ for _, cmd := range group.commands {
+ if f.Arg(0) != cmd.Name() {
+ continue
+ }
+ (*Commander)(h).ExplainCommand(h.Output, cmd)
+ return ExitSuccess
+ }
+ }
+ fmt.Fprintf(h.Error, "Subcommand %s not understood\n", f.Arg(0))
+ }
+
+ f.Usage()
+ return ExitUsageError
+}
+
+// HelpCommand returns a Command which implements a "help" subcommand.
+func (cdr *Commander) HelpCommand() Command {
+ return (*helper)(cdr)
+}
+
+// A flagger is a Command implementing a "flags" command for a given Commander.
+type flagger Commander
+
+func (flg *flagger) Name() string { return "flags" }
+func (flg *flagger) Synopsis() string { return "describe all known top-level flags" }
+func (flg *flagger) SetFlags(*flag.FlagSet) {}
+func (flg *flagger) Usage() string {
+ return `flags [<subcommand>]:
+ With an argument, print all flags of <subcommand>. Else,
+ print a description of all known top-level flags. (The basic
+ help information only discusses the most generally important
+ top-level flags.)
+`
+}
+func (flg *flagger) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{}) ExitStatus {
+ if f.NArg() > 1 {
+ f.Usage()
+ return ExitUsageError
+ }
+
+ if f.NArg() == 0 {
+ if flg.topFlags == nil {
+ fmt.Fprintln(flg.Output, "No top-level flags are defined.")
+ } else {
+ flg.topFlags.PrintDefaults()
+ }
+ return ExitSuccess
+ }
+
+ for _, group := range flg.commands {
+ for _, cmd := range group.commands {
+ if f.Arg(0) != cmd.Name() {
+ continue
+ }
+ subflags := flag.NewFlagSet(cmd.Name(), flag.PanicOnError)
+ subflags.SetOutput(flg.Output)
+ cmd.SetFlags(subflags)
+ subflags.PrintDefaults()
+ return ExitSuccess
+ }
+ }
+ fmt.Fprintf(flg.Error, "Subcommand %s not understood\n", f.Arg(0))
+ return ExitFailure
+}
+
+// FlagsCommand returns a Command which implements a "flags" subcommand.
+func (cdr *Commander) FlagsCommand() Command {
+ return (*flagger)(cdr)
+}
+
+// A lister is a Command implementing a "commands" command for a given Commander.
+type lister Commander
+
+func (l *lister) Name() string { return "commands" }
+func (l *lister) Synopsis() string { return "list all command names" }
+func (l *lister) SetFlags(*flag.FlagSet) {}
+func (l *lister) Usage() string {
+ return `commands:
+ Print a list of all commands.
+`
+}
+func (l *lister) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{}) ExitStatus {
+ if f.NArg() != 0 {
+ f.Usage()
+ return ExitUsageError
+ }
+
+ for _, group := range l.commands {
+ for _, cmd := range group.commands {
+ fmt.Fprintf(l.Output, "%s\n", cmd.Name())
+ }
+ }
+ return ExitSuccess
+}
+
+// CommandsCommand returns Command which implements a "commands" subcommand.
+func (cdr *Commander) CommandsCommand() Command {
+ return (*lister)(cdr)
+}
+
+// An aliaser is a Command wrapping another Command but returning a
+// different name as its alias.
+type aliaser struct {
+ alias string
+ Command
+}
+
+func (a *aliaser) Name() string { return a.alias }
+
+// Alias returns a Command alias which implements a "commands" subcommand.
+func Alias(alias string, cmd Command) Command {
+ return &aliaser{alias, cmd}
+}
+
+// dealias recursivly dealiases a command until a non-aliased command
+// is reached.
+func dealias(cmd Command) Command {
+ if alias, ok := cmd.(*aliaser); ok {
+ return dealias(alias.Command)
+ }
+
+ return cmd
+}
+
+// DefaultCommander is the default commander using flag.CommandLine for flags
+// and os.Args[0] for the command name.
+var DefaultCommander *Commander
+
+func init() {
+ DefaultCommander = NewCommander(flag.CommandLine, path.Base(os.Args[0]))
+}
+
+// Register adds a subcommand to the supported subcommands in the
+// specified group. (Help output is sorted and arranged by group
+// name.) The empty string is an acceptable group name; such
+// subcommands are explained first before named groups. It is a
+// wrapper around DefaultCommander.Register.
+func Register(cmd Command, group string) {
+ DefaultCommander.Register(cmd, group)
+}
+
+// ImportantFlag marks a top-level flag as important, which means it
+// will be printed out as part of the output of an ordinary "help"
+// subcommand. (All flags, important or not, are printed by the
+// "flags" subcommand.) It is a wrapper around
+// DefaultCommander.ImportantFlag.
+func ImportantFlag(name string) {
+ DefaultCommander.ImportantFlag(name)
+}
+
+// Execute should be called once the default flags have been
+// initialized by flag.Parse. It finds the correct subcommand and
+// executes it, and returns an ExitStatus with the result. On a usage
+// error, an appropriate message is printed to os.Stderr, and
+// ExitUsageError is returned. The additional args are provided as-is
+// to the Execute method of the selected Command. It is a wrapper
+// around DefaultCommander.Execute.
+func Execute(ctx context.Context, args ...interface{}) ExitStatus {
+ return DefaultCommander.Execute(ctx, args...)
+}
+
+// HelpCommand returns a Command which implements "help" for the
+// DefaultCommander. Use Register(HelpCommand(), <group>) for it to be
+// recognized.
+func HelpCommand() Command {
+ return DefaultCommander.HelpCommand()
+}
+
+// FlagsCommand returns a Command which implements "flags" for the
+// DefaultCommander. Use Register(FlagsCommand(), <group>) for it to be
+// recognized.
+func FlagsCommand() Command {
+ return DefaultCommander.FlagsCommand()
+}
+
+// CommandsCommand returns Command which implements a "commands" subcommand.
+func CommandsCommand() Command {
+ return DefaultCommander.CommandsCommand()
+}
diff --git a/vendor/vendor.json b/vendor/vendor.json
index 9fe7e0a25f69f89ae32ae13833a9bb9b328932fe..043d453361a20050eb218baf72b9a52797501d29 100644
--- a/vendor/vendor.json
+++ b/vendor/vendor.json
@@ -128,18 +128,6 @@
"revision": "e91709a02e0e8ff8b86b7aa913fdc9ae9498e825",
"revisionTime": "2019-04-09T05:09:43Z"
},
- {
- "checksumSHA1": "fqOeX6hfVZtiqrpyFf3QHyXfwFI=",
- "path": "github.com/gonuts/commander",
- "revision": "f8ba4e959ca914268227c3ebbd7f6bf0bb35541a",
- "revisionTime": "2014-02-05T14:10:49Z"
- },
- {
- "checksumSHA1": "EtSsEEeO8SdIjdyBdHdidmEwNvM=",
- "path": "github.com/gonuts/flag",
- "revision": "741a6cbd37a30dedc93f817e7de6aaf0ca38a493",
- "revisionTime": "2013-05-24T08:13:38Z"
- },
{
"checksumSHA1": "nTzIVdyrnFQIDJWGkA9kNoT/Gj4=",
"origin": "go.etcd.io/etcd/vendor/github.com/google/btree",
@@ -147,6 +135,12 @@
"revision": "a621d807f061e1dd635033a8d6bc261461429e27",
"revisionTime": "2019-04-01T20:57:24Z"
},
+ {
+ "checksumSHA1": "Y4eZD9qtvN9LQ3+whqrANsDd5X8=",
+ "path": "github.com/google/subcommands",
+ "revision": "24aea2b9b9c12400919203843c92ef808c7ad560",
+ "revisionTime": "2019-09-04T16:18:56Z"
+ },
{
"checksumSHA1": "C+zzeVyMEN61Nq58sk4/VzhhyI4=",
"origin": "go.etcd.io/etcd/vendor/github.com/google/uuid",