Merge pull request #2401 from mboersma/fix-deisctl-help

fix(deisctl): handle "deisctl help <command>" consistently

Author: mboersma

deisctl/client/client.go

@@ -10,18 +10,18 @@ import (
 
 // DeisCtlClient manages Deis components, configuration, and related tasks.
 type DeisCtlClient interface {
-	Config() error
-	Install(targets []string) error
-	Journal(targets []string) error
-	List() error
-	RefreshUnits() error
-	Restart(targets []string) error
-	Scale(targets []string) error
-	Start(targets []string) error
-	Status(targets []string) error
-	Stop(targets []string) error
-	Uninstall(targets []string) error
-	Update() error
+	Config(argv []string) error
+	Install(argv []string) error
+	Journal(argv []string) error
+	List(argv []string) error
+	RefreshUnits(argv []string) error
+	Restart(argv []string) error
+	Scale(argv []string) error
+	Start(argv []string) error
+	Status(argv []string) error
+	Stop(argv []string) error
+	Uninstall(argv []string) error
+	Update(argv []string) error
 }
 
 // Client uses a backend to implement the DeisCtlClient interface.
@@ -56,61 +56,63 @@ func NewClient(requestedBackend string) (*Client, error) {
 // A configuration value is stored and retrieved from a key/value store (in this case, etcd)
 // at /deis/<component>/<config>. Configuration values are typically used for component-level
 // configuration, such as enabling TLS for the routers.
-func (c *Client) Config() error {
-	return cmd.Config()
+func (c *Client) Config(argv []string) error {
+	return cmd.Config(argv)
 }
 
-// Install loads components' definitions from local unit files.
-func (c *Client) Install(targets []string) error {
-	return cmd.Install(c.Backend, targets)
+// Install loads the definitions of components from local unit files.
+// After Install, the components will be available to Start.
+func (c *Client) Install(argv []string) error {
+	return cmd.Install(argv, c.Backend)
 }
 
 // Journal prints log output for the specified components.
-func (c *Client) Journal(targets []string) error {
-	return cmd.Journal(c.Backend, targets)
+func (c *Client) Journal(argv []string) error {
+	return cmd.Journal(argv, c.Backend)
 }
 
 // List prints a summary of installed components.
-func (c *Client) List() error {
-	return cmd.ListUnits(c.Backend)
+func (c *Client) List(argv []string) error {
+	return cmd.ListUnits(argv, c.Backend)
 }
 
 // RefreshUnits overwrites local unit files with those requested.
-func (c *Client) RefreshUnits() error {
-	return cmd.RefreshUnits()
+func (c *Client) RefreshUnits(argv []string) error {
+	return cmd.RefreshUnits(argv)
 }
 
 // Restart stops and then starts components.
-func (c *Client) Restart(targets []string) error {
-	return cmd.Restart(c.Backend, targets)
+func (c *Client) Restart(argv []string) error {
+	return cmd.Restart(argv, c.Backend)
 }
 
 // Scale grows or shrinks the number of running components.
-func (c *Client) Scale(targets []string) error {
-	return cmd.Scale(c.Backend, targets)
+func (c *Client) Scale(argv []string) error {
+	return cmd.Scale(argv, c.Backend)
 }
 
 // Start activates the specified components.
-func (c *Client) Start(targets []string) error {
-	return cmd.Start(c.Backend, targets)
+func (c *Client) Start(argv []string) error {
+	return cmd.Start(argv, c.Backend)
 }
 
-// Status prints the current state of components.
-func (c *Client) Status(targets []string) error {
-	return cmd.Status(c.Backend, targets)
+// Status prints the current status of components.
+func (c *Client) Status(argv []string) error {
+	return cmd.Status(argv, c.Backend)
 }
 
 // Stop deactivates the specified components.
-func (c *Client) Stop(targets []string) error {
-	return cmd.Stop(c.Backend, targets)
+func (c *Client) Stop(argv []string) error {
+	return cmd.Stop(argv, c.Backend)
 }
 
-// Uninstall unloads components' definitions.
-func (c *Client) Uninstall(targets []string) error {
-	return cmd.Uninstall(c.Backend, targets)
+// Uninstall unloads the definitions of the specified components.
+// After Uninstall, the components will be unavailable until Install is called.
+func (c *Client) Uninstall(argv []string) error {
+	return cmd.Uninstall(argv, c.Backend)
 }
 
 // Update changes the platform version on a cluster host.
-func (c *Client) Update() error {
-	return cmd.Update()
+func (c *Client) Update(argv []string) error {
+	return cmd.Update(argv)
 }