This branch refactors the Command interface.

cmd/juju/ssh.go

 package main
 
 import (
         "errors"
         "fmt"
         "launchpad.net/gnuflag"
         "launchpad.net/juju-core/cmd"
         "launchpad.net/juju-core/juju"
         "launchpad.net/juju-core/log"
         "launchpad.net/juju-core/state"
@@ skipping 10 matching lines @@
         EnvName string
         Target  string
         Args    []string
         *juju.Conn
 }
 
 func (c *SSHCommand) Info() *cmd.Info {
         return &cmd.Info{"ssh", "", "launch an ssh shell on a given unit or machine", ""}
 }
 
-func (c *SSHCommand) Init(f *gnuflag.FlagSet, args []string) error {
+func (c *SSHCommand) SetFlags(f *gnuflag.FlagSet) {
         addEnvironFlags(&c.EnvName, f)
-        if err := f.Parse(true, args); err != nil {
-                return err
-        }
-        args = f.Args()
+}
+
+func (c *SSHCommand) Init(args []string) error {
         if len(args) == 0 {
                 return errors.New("no service name specified")
         }
         c.Target, c.Args = args[0], args[1:]
         return nil
 }
 
 // Run resolves c.Target to a machine, to the address of a i
 // machine or unit forks ssh passing any arguments provided.
 func (c *SSHCommand) Run(ctx *cmd.Context) error {
@@ skipping 56 matching lines @@
                         }
                         return inst[0].WaitDNSName()
                 }
                 // BUG(dfc) this does not refresh the machine, so
                 // this loop will loop forever if it gets to this point.
                 // https://bugs.launchpad.net/juju-core/+bug/1130051
         }
         // oops, watcher closed before we could get an answer
         return "", w.Stop()
 }