Skip to content
This repository has been archived by the owner on Mar 29, 2018. It is now read-only.

Commit

Permalink
fix short flags by removing short flags
Browse files Browse the repository at this point in the history
  • Loading branch information
@bryanl
bryanl committed Mar 23, 2016
1 parent 95008bd commit 23e53b7
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 60 deletions.
3 changes: 1 addition & 2 deletions commands/actions.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,7 @@ func Actions() *Command {

cmdActionWait := CmdBuilder(cmd, RunCmdActionWait, "wait ACTIONID", "wait for action to complete", Writer,
aliasOpt("w"), displayerType(&action{}), docCategories("action"))
AddIntFlag(cmdActionWait, doit.ArgPollTime, 5, "Re-poll time in seconds",
shortFlag("p"))
AddIntFlag(cmdActionWait, doit.ArgPollTime, 5, "Re-poll time in seconds")

return cmd
}
Expand Down
9 changes: 2 additions & 7 deletions commands/doit.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,12 +143,6 @@ func requiredOpt() flagOpt {
}
}

func shortFlag(f string) flagOpt {
return func(c *Command, name, key string) {
c.Flag(name).Shorthand = f
}
}

func requiredKey(key string) string {
return fmt.Sprintf("%s.required", key)
}
Expand All @@ -157,11 +151,12 @@ func requiredKey(key string) string {
func AddStringFlag(cmd *Command, name, dflt, desc string, opts ...flagOpt) {
fn := flagName(cmd, name)
cmd.Flags().String(name, dflt, desc)
viper.BindPFlag(fn, cmd.Flags().Lookup(name))

for _, o := range opts {
o(cmd, name, fn)
}

viper.BindPFlag(fn, cmd.Flags().Lookup(name))
}

// AddIntFlag adds an integr flag to a command.
Expand Down
48 changes: 16 additions & 32 deletions commands/droplet_actions.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,105 +53,89 @@ func DropletAction() *Command {
cmdDropletActionDisableBackups := CmdBuilder(cmd, RunDropletActionDisableBackups,
"disable-backups <droplet-id>", "disable backups", Writer,
displayerType(&action{}), docCategories("droplet"))
AddBoolFlag(cmdDropletActionDisableBackups, doit.ArgCommandWait, false, "Wait for action to complete",
shortFlag("w"))
AddBoolFlag(cmdDropletActionDisableBackups, doit.ArgCommandWait, false, "Wait for action to complete")

cmdDropletActionReboot := CmdBuilder(cmd, RunDropletActionReboot,
"reboot <droplet-id>", "reboot droplet", Writer,
displayerType(&action{}), docCategories("droplet"))
AddBoolFlag(cmdDropletActionReboot, doit.ArgCommandWait, false, "Wait for action to complete",
shortFlag("w"))
AddBoolFlag(cmdDropletActionReboot, doit.ArgCommandWait, false, "Wait for action to complete")

cmdDropletActionPowerCycle := CmdBuilder(cmd, RunDropletActionPowerCycle,
"power-cycle <droplet-id>", "power cycle droplet", Writer,
displayerType(&action{}), docCategories("droplet"))
AddBoolFlag(cmdDropletActionPowerCycle, doit.ArgCommandWait, false, "Wait for action to complete",
shortFlag("w"))
AddBoolFlag(cmdDropletActionPowerCycle, doit.ArgCommandWait, false, "Wait for action to complete")

cmdDropletActionShutdown := CmdBuilder(cmd, RunDropletActionShutdown,
"shutdown <droplet-id>", "shutdown droplet", Writer,
displayerType(&action{}), docCategories("droplet"))
AddBoolFlag(cmdDropletActionShutdown, doit.ArgCommandWait, false, "Wait for action to complete",
shortFlag("w"))
AddBoolFlag(cmdDropletActionShutdown, doit.ArgCommandWait, false, "Wait for action to complete")

cmdDropletActionPowerOff := CmdBuilder(cmd, RunDropletActionPowerOff,
"power-off <droplet-id>", "power off droplet", Writer,
displayerType(&action{}), docCategories("droplet"))
AddBoolFlag(cmdDropletActionPowerOff, doit.ArgCommandWait, false, "Wait for action to complete",
shortFlag("w"))
AddBoolFlag(cmdDropletActionPowerOff, doit.ArgCommandWait, false, "Wait for action to complete")

cmdDropletActionPowerOn := CmdBuilder(cmd, RunDropletActionPowerOn,
"power-on <droplet-id>", "power on droplet", Writer,
displayerType(&action{}), docCategories("droplet"))
AddBoolFlag(cmdDropletActionPowerOn, doit.ArgCommandWait, false, "Wait for action to complete",
shortFlag("w"))
AddBoolFlag(cmdDropletActionPowerOn, doit.ArgCommandWait, false, "Wait for action to complete")

cmdDropletActionPasswordReset := CmdBuilder(cmd, RunDropletActionPasswordReset,
"power-reset <droplet-id>", "power reset droplet", Writer,
displayerType(&action{}), docCategories("droplet"))
AddBoolFlag(cmdDropletActionPasswordReset, doit.ArgCommandWait, false, "Wait for action to complete",
shortFlag("w"))
AddBoolFlag(cmdDropletActionPasswordReset, doit.ArgCommandWait, false, "Wait for action to complete")

cmdDropletActionEnableIPv6 := CmdBuilder(cmd, RunDropletActionEnableIPv6,
"enable-ipv6 <droplet-id>", "enable ipv6", Writer,
displayerType(&action{}), docCategories("droplet"))
AddBoolFlag(cmdDropletActionEnableIPv6, doit.ArgCommandWait, false, "Wait for action to complete",
shortFlag("w"))
AddBoolFlag(cmdDropletActionEnableIPv6, doit.ArgCommandWait, false, "Wait for action to complete")

cmdDropletActionEnablePrivateNetworking := CmdBuilder(cmd, RunDropletActionEnablePrivateNetworking,
"enable-private-networking <droplet-id>", "enable private networking", Writer,
displayerType(&action{}), docCategories("droplet"))
AddBoolFlag(cmdDropletActionEnablePrivateNetworking, doit.ArgCommandWait, false, "Wait for action to complete",
shortFlag("w"))
AddBoolFlag(cmdDropletActionEnablePrivateNetworking, doit.ArgCommandWait, false, "Wait for action to complete")

cmdDropletActionUpgrade := CmdBuilder(cmd, RunDropletActionUpgrade,
"upgrade <droplet-id>", "upgrade droplet", Writer,
displayerType(&action{}), docCategories("droplet"))
AddBoolFlag(cmdDropletActionUpgrade, doit.ArgCommandWait, false, "Wait for action to complete",
shortFlag("w"))
AddBoolFlag(cmdDropletActionUpgrade, doit.ArgCommandWait, false, "Wait for action to complete")

cmdDropletActionRestore := CmdBuilder(cmd, RunDropletActionRestore,
"restore <droplet-id>", "restore backup", Writer,
displayerType(&action{}), docCategories("droplet"))
AddIntFlag(cmdDropletActionRestore, doit.ArgImageID, 0, "Image ID", requiredOpt())
AddBoolFlag(cmdDropletActionRestore, doit.ArgCommandWait, false, "Wait for action to complete",
shortFlag("w"))
AddBoolFlag(cmdDropletActionRestore, doit.ArgCommandWait, false, "Wait for action to complete")

cmdDropletActionResize := CmdBuilder(cmd, RunDropletActionResize,
"resize <droplet-id>", "resize droplet", Writer,
displayerType(&action{}), docCategories("droplet"))
AddBoolFlag(cmdDropletActionResize, doit.ArgResizeDisk, false, "Resize disk")
AddStringFlag(cmdDropletActionResize, doit.ArgSizeSlug, "", "New size")
AddBoolFlag(cmdDropletActionResize, doit.ArgCommandWait, false, "Wait for action to complete",
shortFlag("w"))
AddBoolFlag(cmdDropletActionResize, doit.ArgCommandWait, false, "Wait for action to complete")

cmdDropletActionRebuild := CmdBuilder(cmd, RunDropletActionRebuild,
"rebuild <droplet-id>", "rebuild droplet", Writer,
displayerType(&action{}), docCategories("droplet"))
AddIntFlag(cmdDropletActionRebuild, doit.ArgImageID, 0, "Image ID", requiredOpt())
AddBoolFlag(cmdDropletActionRebuild, doit.ArgCommandWait, false, "Wait for action to complete",
shortFlag("w"))
AddBoolFlag(cmdDropletActionRebuild, doit.ArgCommandWait, false, "Wait for action to complete")

cmdDropletActionRename := CmdBuilder(cmd, RunDropletActionRename,
"rename <droplet-id>", "rename droplet", Writer,
displayerType(&action{}), docCategories("droplet"))
AddStringFlag(cmdDropletActionRename, doit.ArgDropletName, "", "Droplet name", requiredOpt())
AddBoolFlag(cmdDropletActionRename, doit.ArgCommandWait, false, "Wait for action to complete",
shortFlag("w"))
AddBoolFlag(cmdDropletActionRename, doit.ArgCommandWait, false, "Wait for action to complete")

cmdDropletActionChangeKernel := CmdBuilder(cmd, RunDropletActionChangeKernel,
"change-kernel <droplet-id>", "change kernel", Writer,
docCategories("droplet"))
AddIntFlag(cmdDropletActionChangeKernel, doit.ArgKernelID, 0, "Kernel ID", requiredOpt())
AddBoolFlag(cmdDropletActionChangeKernel, doit.ArgCommandWait, false, "Wait for action to complete",
shortFlag("w"))
AddBoolFlag(cmdDropletActionChangeKernel, doit.ArgCommandWait, false, "Wait for action to complete")

cmdDropletActionSnapshot := CmdBuilder(cmd, RunDropletActionSnapshot,
"snapshot <droplet-id>", "snapshot droplet", Writer,
displayerType(&action{}), docCategories("droplet"))
AddStringFlag(cmdDropletActionSnapshot, doit.ArgSnapshotName, "", "Snapshot name", requiredOpt())
AddBoolFlag(cmdDropletActionSnapshot, doit.ArgCommandWait, false, "Wait for action to complete",
shortFlag("w"))
AddBoolFlag(cmdDropletActionSnapshot, doit.ArgCommandWait, false, "Wait for action to complete")

return cmd
}
Expand Down
27 changes: 10 additions & 17 deletions commands/droplets.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,26 +36,19 @@ func Droplet() *Command {

cmdDropletCreate := CmdBuilder(cmd, RunDropletCreate, "create NAME [NAME ...]", "create droplet", Writer,
aliasOpt("c"), displayerType(&droplet{}), docCategories("droplet"))
AddStringSliceFlag(cmdDropletCreate, doit.ArgSSHKeys, []string{}, "SSH Keys or fingerprints",
shortFlag("k"))
AddStringFlag(cmdDropletCreate, doit.ArgUserData, "", "User data",
shortFlag("u"))
AddStringFlag(cmdDropletCreate, doit.ArgUserDataFile, "", "User data file",
shortFlag("f"))
AddBoolFlag(cmdDropletCreate, doit.ArgCommandWait, false, "Wait for droplet to be created",
shortFlag("w"))
AddStringSliceFlag(cmdDropletCreate, doit.ArgSSHKeys, []string{}, "SSH Keys or fingerprints")
AddStringFlag(cmdDropletCreate, doit.ArgUserData, "", "User data")
AddStringFlag(cmdDropletCreate, doit.ArgUserDataFile, "", "User data file")
AddBoolFlag(cmdDropletCreate, doit.ArgCommandWait, false, "Wait for droplet to be created")
AddStringFlag(cmdDropletCreate, doit.ArgRegionSlug, "", "Droplet region",
requiredOpt(), shortFlag("r"))
requiredOpt())
AddStringFlag(cmdDropletCreate, doit.ArgSizeSlug, "", "Droplet size",
requiredOpt(), shortFlag("s"))
AddBoolFlag(cmdDropletCreate, doit.ArgBackups, false, "Backup droplet",
shortFlag("b"))
AddBoolFlag(cmdDropletCreate, doit.ArgIPv6, false, "IPv6 support",
shortFlag("6"))
AddBoolFlag(cmdDropletCreate, doit.ArgPrivateNetworking, false, "Private networking",
shortFlag("p"))
requiredOpt())
AddBoolFlag(cmdDropletCreate, doit.ArgBackups, false, "Backup droplet")
AddBoolFlag(cmdDropletCreate, doit.ArgIPv6, false, "IPv6 support")
AddBoolFlag(cmdDropletCreate, doit.ArgPrivateNetworking, false, "Private networking")
AddStringFlag(cmdDropletCreate, doit.ArgImage, "", "Droplet image",
requiredOpt(), shortFlag("i"))
requiredOpt())

CmdBuilder(cmd, RunDropletDelete, "delete ID [ID|Name ...]", "Delete droplet by id or name", Writer,
aliasOpt("d", "del", "rm"), docCategories("droplet"))
Expand Down
3 changes: 1 addition & 2 deletions commands/image_actions.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@ func ImageAction() *Command {
"transfer <image-id>", "transfer image", Writer,
displayerType(&action{}), docCategories("image"))
AddStringFlag(cmdImageActionsTransfer, doit.ArgRegionSlug, "", "region", requiredOpt())
AddBoolFlag(cmdImageActionsTransfer, doit.ArgCommandWait, false, "Wait for action to complete",
shortFlag("w"))
AddBoolFlag(cmdImageActionsTransfer, doit.ArgCommandWait, false, "Wait for action to complete")

return cmd
}
Expand Down

0 comments on commit 23e53b7

Please sign in to comment.