Avoid allowing app parameter per command

destroy.go

@@ -32,14 +32,14 @@ func runDestroy(cmd *Command, args []string) {
 	if err == nil && len(dynos) > 0 {
 		log.Println("App", name, "has", len(dynos), "running dynos")
 		log.Println("To destroy this app, first scale to zero")
-		log.Println("To list dynos: hk ps -a", name)
+		log.Println("To list dynos: hk ps")
 		log.Println("For more on scaling: hk help scale")
 		os.Exit(1)
 	}
 	if res := getMergedAddons(name); len(res) > 0 {
 		log.Println("App", name, "has", len(res), "addons")
 		log.Println("To destroy this app, first remove its addons")
-		log.Println("To list them: hk ls -a", name, "addons")
+		log.Println("To list them: hk ls addons")
 		// TODO(kr): uncomment this when the command is known
 		//log.Println("For more on removing addons: hk help XXXXX")
 		os.Exit(1)

env.go

@@ -9,18 +9,11 @@ import (
 
 var cmdEnv = &Command{
 	Run:   runEnv,
-	Usage: "env [-a app]",
+	Usage: "env",
 	Short: "list config vars",
 	Long:  `Show all config vars.`,
 }
 
-func init() {
-	cmds := []*Command{cmdEnv, cmdGet, cmdSet, cmdUnset}
-	for _, c := range cmds {
-		c.Flag.StringVar(&flagApp, "a", "", "app")
-	}
-}
-
 func runEnv(cmd *Command, args []string) {
 	var config map[string]string
 	must(Get(&config, "/apps/"+mustApp()+"/config-vars"))
@@ -36,7 +29,7 @@ func runEnv(cmd *Command, args []string) {
 
 var cmdGet = &Command{
 	Run:   runGet,
-	Usage: "get [-a app] name",
+	Usage: "get name",
 	Short: "get config var" + extra,
 	Long: `
 Get the value of a config var.
@@ -63,7 +56,7 @@ func runGet(cmd *Command, args []string) {
 
 var cmdSet = &Command{
 	Run:   runSet,
-	Usage: "set [-a app] name=value ...",
+	Usage: "set name=value ...",
 	Short: "set config var",
 	Long: `
 Set the value of a config var.
@@ -91,7 +84,7 @@ func runSet(cmd *Command, args []string) {
 
 var cmdUnset = &Command{
 	Run:   runUnset,
-	Usage: "unset [-a app] name ...",
+	Usage: "unset name ...",
 	Short: "unset config var",
 	Long: `
 Unset a config var.

info.go

@@ -6,15 +6,11 @@ import (
 
 var cmdInfo = &Command{
 	Run:   runInfo,
-	Usage: "info [-a app]",
+	Usage: "info",
 	Short: "show app info",
 	Long:  `Info shows general information about the current app.`,
 }
 
-func init() {
-	cmdInfo.Flag.StringVar(&flagApp, "a", "", "app")
-}
-
 func runInfo(cmd *Command, args []string) {
 	var app App
 	must(Get(&app, "/apps/"+mustApp()))

ls.go

@@ -16,16 +16,15 @@ var cmdLs = &Command{
 	Usage: "ls [-l] [app...]",
 	Short: "list apps, addons, dynos, and releases",
 	Long: `
-       hk ls [-l] [-a app] releases [name...]
+       hk ls [-l] releases [name...]
 
-       hk ls [-l] [-a app] addons [name...]
+       hk ls [-l] addons [name...]
 
 Command hk ls lists apps, releases, and addons.
 
 Options:
 
     -l       long listing
-    -a=name  app name
 
 Long listing for apps shows the owner, slug size, last release
 time (or time the app was created, if it's never been released),
@@ -78,7 +77,6 @@ Examples:
 }
 
 func init() {
-	cmdLs.Flag.StringVar(&flagApp, "a", "", "app")
 	cmdLs.Flag.BoolVar(&flagLong, "l", false, "long listing")
 }
 

restart.go

@@ -4,13 +4,9 @@ import (
 	"log"
 )
 
-func init() {
-	cmdRestart.Flag.StringVar(&flagApp, "a", "", "app")
-}
-
 var cmdRestart = &Command{
 	Run:   runRestart,
-	Usage: "restart [-a app] [type or name]",
+	Usage: "restart [type or name]",
 	Short: "restart dynos",
 	Long: `
 Restart all app dynos, all dynos of a specific type, or a single dyno.

run.go

@@ -20,13 +20,12 @@ var (
 
 var cmdRun = &Command{
 	Run:   runRun,
-	Usage: "run [-a app] command [arguments]",
+	Usage: "run command [arguments]",
 	Short: "run a process in a dyno",
 	Long:  `Run a process on Heroku`,
 }
 
 func init() {
-	cmdRun.Flag.StringVar(&flagApp, "a", "", "app")
 	cmdRun.Flag.BoolVar(&detachedRun, "d", false, "detached")
 }
 

scale.go

@@ -9,7 +9,7 @@ import (
 
 var cmdScale = &Command{
 	Run:   runScale,
-	Usage: "scale [-a app] type=n...",
+	Usage: "scale type=n...",
 	Short: "change dyno counts",
 	Long: `
 Scale changes the number of dynos for each process type.
@@ -20,10 +20,6 @@ Example:
 `,
 }
 
-func init() {
-	cmdScale.Flag.StringVar(&flagApp, "a", "", "app")
-}
-
 // takes args of the form "web=1", "worker=3", etc
 func runScale(cmd *Command, args []string) {
 	todo := make(map[string]int)

tail.go

@@ -19,13 +19,12 @@ var (
 
 var cmdTail = &Command{
 	Run:   runTail,
-	Usage: "tail [-a app] [-f] [-n lines] [-s source] [-p process]",
+	Usage: "tail [-f] [-n lines] [-s source] [-p process]",
 	Short: "show the last part of the app log",
 	Long:  `Tail prints recent application logs.`,
 }
 
 func init() {
-	cmdTail.Flag.StringVar(&flagApp, "a", "", "app")
 	cmdTail.Flag.BoolVar(&follow, "f", false, "do not stop when end of file is reached")
 	cmdTail.Flag.IntVar(&lines, "n", -1, "number of log lines to request")
 	cmdTail.Flag.StringVar(&source, "s", "", "only display logs from the given source")

url.go

@@ -6,15 +6,11 @@ import (
 
 var cmdURL = &Command{
 	Run:   runURL,
-	Usage: "url [-a app]",
+	Usage: "url",
 	Short: "show app url" + extra,
 	Long:  `Prints the web URL for the app.`,
 }
 
-func init() {
-	cmdURL.Flag.StringVar(&flagApp, "a", "", "app")
-}
-
 func runURL(cmd *Command, args []string) {
 	fmt.Println("https://" + mustApp() + ".herokuapp.com/")
 }