@@ -6,7 +6,8 @@ type Command struct {

 	Description string

 }

-var dockerCommands = []Command{

+// DockerCommandUsage lists the top level docker commands and their short usage

+var DockerCommandUsage = []Command{

 	{"attach", "Attach to a running container"},

 	{"build", "Build an image from a Dockerfile"},

 	{"commit", "Create a new image from a container's changes"},

@@ -55,7 +56,7 @@ var dockerCommands = []Command{

 var DockerCommands = make(map[string]Command)

 func init() {

-	for _, cmd := range dockerCommands {

+	for _, cmd := range DockerCommandUsage {

 		DockerCommands[cmd.Name] = cmd

 	}

 }

deleted file mode 100644

@@ -1,37 +0,0 @@

-package main

-

-import (

-	"path/filepath"

-

-	cliflags "github.com/docker/docker/cli/flags"

-	"github.com/docker/docker/cliconfig"

-	flag "github.com/docker/docker/pkg/mflag"

-	"github.com/docker/docker/utils"

-)

-

-var (

-	commonFlags = cliflags.InitCommonFlags()

-	clientFlags = &cliflags.ClientFlags{FlagSet: new(flag.FlagSet), Common: commonFlags}

-)

-

-func init() {

-

-	client := clientFlags.FlagSet

-	client.StringVar(&clientFlags.ConfigDir, []string{"-config"}, cliconfig.ConfigDir(), "Location of client config files")

-

-	clientFlags.PostParse = func() {

-		clientFlags.Common.PostParse()

-

-		if clientFlags.ConfigDir != "" {

-			cliconfig.SetConfigDir(clientFlags.ConfigDir)

-		}

-

-		if clientFlags.Common.TrustKey == "" {

-			clientFlags.Common.TrustKey = filepath.Join(cliconfig.ConfigDir(), cliflags.DefaultTrustKeyFile)

-		}

-

-		if clientFlags.Common.Debug {

-			utils.EnableDebug()

-		}

-	}

-}

deleted file mode 100644

@@ -1,23 +0,0 @@

-package main

-

-import (

-	"os"

-	"testing"

-

-	"github.com/Sirupsen/logrus"

-	"github.com/docker/docker/utils"

-)

-

-func TestClientDebugEnabled(t *testing.T) {

-	defer utils.DisableDebug()

-

-	clientFlags.Common.FlagSet.Parse([]string{"-D"})

-	clientFlags.PostParse()

-

-	if os.Getenv("DEBUG") != "1" {

-		t.Fatal("expected debug enabled, got false")

-	}

-	if logrus.GetLevel() != logrus.DebugLevel {

-		t.Fatalf("expected logrus debug level, got %v", logrus.GetLevel())

-	}

-}

@@ -3,16 +3,26 @@ package main

 import (

 	"fmt"

 	"os"

+	"path/filepath"

 	"github.com/Sirupsen/logrus"

 	"github.com/docker/docker/api/client"

 	"github.com/docker/docker/cli"

+	cliflags "github.com/docker/docker/cli/flags"

+	"github.com/docker/docker/cliconfig"

 	"github.com/docker/docker/dockerversion"

 	flag "github.com/docker/docker/pkg/mflag"

 	"github.com/docker/docker/pkg/term"

 	"github.com/docker/docker/utils"

 )

+var (

+	commonFlags = cliflags.InitCommonFlags()

+	clientFlags = initClientFlags(commonFlags)

+	flHelp      = flag.Bool([]string{"h", "-help"}, false, "Print usage")

+	flVersion   = flag.Bool([]string{"v", "-version"}, false, "Print version information and quit")

+)

+

 func main() {

 	// Set terminal emulation based on platform as required.

 	stdin, stdout, stderr := term.StdStreams()

@@ -30,6 +40,7 @@ func main() {

 		help := "\nCommands:\n"

+		dockerCommands := sortCommands(cli.DockerCommandUsage)

 		for _, cmd := range dockerCommands {

 			help += fmt.Sprintf("    %-10.10s%s\n", cmd.Name, cmd.Description)

 		}

@@ -75,3 +86,26 @@ func showVersion() {

 		fmt.Printf("Docker version %s, build %s\n", dockerversion.Version, dockerversion.GitCommit)

 	}

 }

+

+func initClientFlags(commonFlags *cliflags.CommonFlags) *cliflags.ClientFlags {

+	clientFlags := &cliflags.ClientFlags{FlagSet: new(flag.FlagSet), Common: commonFlags}

+	client := clientFlags.FlagSet

+	client.StringVar(&clientFlags.ConfigDir, []string{"-config"}, cliconfig.ConfigDir(), "Location of client config files")

+

+	clientFlags.PostParse = func() {

+		clientFlags.Common.PostParse()

+

+		if clientFlags.ConfigDir != "" {

+			cliconfig.SetConfigDir(clientFlags.ConfigDir)

+		}

+

+		if clientFlags.Common.TrustKey == "" {

+			clientFlags.Common.TrustKey = filepath.Join(cliconfig.ConfigDir(), cliflags.DefaultTrustKeyFile)

+		}

+

+		if clientFlags.Common.Debug {

+			utils.EnableDebug()

+		}

+	}

+	return clientFlags

+}

new file mode 100644

@@ -0,0 +1,23 @@

+package main

+

+import (

+	"os"

+	"testing"

+

+	"github.com/Sirupsen/logrus"

+	"github.com/docker/docker/utils"

+)

+

+func TestClientDebugEnabled(t *testing.T) {

+	defer utils.DisableDebug()

+

+	clientFlags.Common.FlagSet.Parse([]string{"-D"})

+	clientFlags.PostParse()

+

+	if os.Getenv("DEBUG") != "1" {

+		t.Fatal("expected debug enabled, got false")

+	}

+	if logrus.GetLevel() != logrus.DebugLevel {

+		t.Fatalf("expected logrus debug level, got %v", logrus.GetLevel())

+	}

+}

deleted file mode 100644

@@ -1,30 +0,0 @@

-package main

-

-import (

-	"sort"

-

-	"github.com/docker/docker/cli"

-	flag "github.com/docker/docker/pkg/mflag"

-)

-

-var (

-	flHelp    = flag.Bool([]string{"h", "-help"}, false, "Print usage")

-	flVersion = flag.Bool([]string{"v", "-version"}, false, "Print version information and quit")

-)

-

-type byName []cli.Command

-

-func (a byName) Len() int           { return len(a) }

-func (a byName) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }

-func (a byName) Less(i, j int) bool { return a[i].Name < a[j].Name }

-

-var dockerCommands []cli.Command

-

-// TODO(tiborvass): do not show 'daemon' on client-only binaries

-

-func init() {

-	for _, cmd := range cli.DockerCommands {

-		dockerCommands = append(dockerCommands, cmd)

-	}

-	sort.Sort(byName(dockerCommands))

-}

deleted file mode 100644

@@ -1,13 +0,0 @@

-package main

-

-import (

-	"sort"

-	"testing"

-)

-

-// Tests if the subcommands of docker are sorted

-func TestDockerSubcommandsAreSorted(t *testing.T) {

-	if !sort.IsSorted(byName(dockerCommands)) {

-		t.Fatal("Docker subcommands are not in sorted order")

-	}

-}

new file mode 100644

@@ -0,0 +1,22 @@

+package main

+

+import (

+	"sort"

+

+	"github.com/docker/docker/cli"

+)

+

+type byName []cli.Command

+

+func (a byName) Len() int           { return len(a) }

+func (a byName) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }

+func (a byName) Less(i, j int) bool { return a[i].Name < a[j].Name }

+

+// TODO(tiborvass): do not show 'daemon' on client-only binaries

+

+func sortCommands(commands []cli.Command) []cli.Command {

+	dockerCommands := make([]cli.Command, len(commands))

+	copy(dockerCommands, commands)

+	sort.Sort(byName(dockerCommands))

+	return dockerCommands

+}

new file mode 100644

@@ -0,0 +1,15 @@

+package main

+

+import (

+	"sort"

+	"testing"

+

+	"github.com/docker/docker/cli"

+)

+

+// Tests if the subcommands of docker are sorted

+func TestDockerSubcommandsAreSorted(t *testing.T) {

+	if !sort.IsSorted(byName(cli.DockerCommandUsage)) {

+		t.Fatal("Docker subcommands are not in sorted order")

+	}

+}