Display globally available 'juju' command options for all sub-commands.

anastasiamac · anastasiamac · commit 8f0624eabf23 · 2019-01-17T10:05:58.000+10:00
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -287,7 +287,7 @@
 
 [[constraint]]
   name = "github.com/juju/cmd"
-  revision = "fd568e4a4120f7d5a417252d701daff61a6322b4"
+  revision = "a8c88215d37e4d65036822bca0522d11f888f7eb"
 
 [[constraint]]
   name = "github.com/juju/collections"
diff --git a/cmd/juju/commands/helptool_test.go b/cmd/juju/commands/helptool_test.go
@@ -26,6 +26,20 @@ func (suite *HelpToolSuite) TestHelpToolHelp(c *gc.C) {
 Summary:
 Show help on a Juju charm hook tool.
 
+Global Options:
+--debug  (= false)
+    equivalent to --show-log --logging-config=<root>=DEBUG
+-h, --help  (= false)
+    Show help on a command or other topic.
+--logging-config (= "")
+    specify log levels for modules
+--quiet  (= false)
+    show no informational output
+--show-log  (= false)
+    if set, write the log file to stderr
+--verbose  (= false)
+    show more verbose output
+
 Details:
 Juju charms can access a series of built-in helpers called 'hook-tools'.
 These are useful for the charm to be able to inspect its running environment.
diff --git a/cmd/juju/commands/main_test.go b/cmd/juju/commands/main_test.go
@@ -25,6 +25,7 @@ import (
 	"github.com/juju/version"
 	gc "gopkg.in/check.v1"
 
+	jujucmd "github.com/juju/juju/cmd"
 	"github.com/juju/juju/cmd/juju/application"
 	"github.com/juju/juju/cmd/juju/cloud"
 	"github.com/juju/juju/cmd/modelcmd"
@@ -48,7 +49,15 @@ func helpText(command cmd.Command, name string) string {
 	info.Name = name
 	f := gnuflag.NewFlagSetWithFlagKnownAs(info.Name, gnuflag.ContinueOnError, cmd.FlagAlias(command, "option"))
 	command.SetFlags(f)
-	buff.Write(info.Help(f))
+
+	superJuju := jujucmd.NewSuperCommand(cmd.SuperCommandParams{
+		Name:        "juju",
+		FlagKnownAs: "option",
+	})
+	superF := gnuflag.NewFlagSetWithFlagKnownAs("juju", gnuflag.ContinueOnError, "option")
+	superJuju.SetFlags(superF)
+
+	buff.Write(info.HelpWithSuperFlags(superF, f))
 	return buff.String()
 }
 
diff --git a/cmd/juju/resource/charmresources_test.go b/cmd/juju/resource/charmresources_test.go
@@ -58,7 +58,8 @@ For cs:~user/trusty/mysql
 Where the series is not supplied, the series from your local host is used.
 Thus the above examples imply that the local series is trusty.
 `,
-		FlagKnownAs: "option",
+		FlagKnownAs:    "option",
+		ShowSuperFlags: []string{"show-log", "debug", "logging-config", "verbose", "quiet", "h", "help"},
 	})
 }
 
diff --git a/cmd/juju/resource/list_charm_resources_test.go b/cmd/juju/resource/list_charm_resources_test.go
@@ -58,8 +58,9 @@ For cs:~user/trusty/mysql
 Where the series is not supplied, the series from your local host is used.
 Thus the above examples imply that the local series is trusty.
 `,
-		Aliases:     []string{"list-resources"},
-		FlagKnownAs: "option",
+		Aliases:        []string{"list-resources"},
+		FlagKnownAs:    "option",
+		ShowSuperFlags: []string{"show-log", "debug", "logging-config", "verbose", "quiet", "h", "help"},
 	})
 }
 
diff --git a/cmd/juju/resource/list_test.go b/cmd/juju/resource/list_test.go
@@ -71,7 +71,8 @@ This command shows the resources required by and those in use by an existing
 application or unit in your model.  When run for an application, it will also show any
 updates available for resources from the charmstore.
 `,
-		FlagKnownAs: "option",
+		FlagKnownAs:    "option",
+		ShowSuperFlags: []string{"show-log", "debug", "logging-config", "verbose", "quiet", "h", "help"},
 	})
 }
 
diff --git a/cmd/juju/resource/upload_test.go b/cmd/juju/resource/upload_test.go
@@ -97,8 +97,9 @@ func (s *UploadSuite) TestInfo(c *gc.C) {
 This command uploads a file from your local disk to the juju controller to be
 used as a resource for an application.
 `,
-		Aliases:     []string{"attach"},
-		FlagKnownAs: "option",
+		Aliases:        []string{"attach"},
+		FlagKnownAs:    "option",
+		ShowSuperFlags: []string{"show-log", "debug", "logging-config", "verbose", "quiet", "h", "help"},
 	})
 }
 
diff --git a/cmd/supercommand.go b/cmd/supercommand.go
@@ -61,5 +61,6 @@ func runNotifier(name string) {
 func Info(i *cmd.Info) *cmd.Info {
 	info := *i
 	info.FlagKnownAs = "option"
+	info.ShowSuperFlags = []string{"show-log", "debug", "logging-config", "verbose", "quiet", "h", "help"}
 	return &info
 }

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,8 @@ For cs:~user/trusty/mysql`
`58`	`58`	`Where the series is not supplied, the series from your local host is used.`
`59`	`59`	`Thus the above examples imply that the local series is trusty.`
`60`	`60`	`,
`61`		`- FlagKnownAs: "option",`
	`61`	`+ FlagKnownAs: "option",`
	`62`	`+ ShowSuperFlags: []string{"show-log", "debug", "logging-config", "verbose", "quiet", "h", "help"},`
`62`	`63`	`})`
`63`	`64`	`}`
`64`	`65`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,8 @@ This command shows the resources required by and those in use by an existing`
`71`	`71`	`application or unit in your model. When run for an application, it will also show any`
`72`	`72`	`updates available for resources from the charmstore.`
`73`	`73`	`,
`74`		`- FlagKnownAs: "option",`
	`74`	`+ FlagKnownAs: "option",`
	`75`	`+ ShowSuperFlags: []string{"show-log", "debug", "logging-config", "verbose", "quiet", "h", "help"},`
`75`	`76`	`})`
`76`	`77`	`}`
`77`	`78`
Original file line number	Diff line number	Diff line change
`@@ -61,5 +61,6 @@ func runNotifier(name string) {`
`61`	`61`	`func Info(i cmd.Info) cmd.Info {`
`62`	`62`	`info := *i`
`63`	`63`	`info.FlagKnownAs = "option"`
	`64`	`+ info.ShowSuperFlags = []string{"show-log", "debug", "logging-config", "verbose", "quiet", "h", "help"}`
`64`	`65`	`return &info`
`65`	`66`	`}`