From 5e9b3727b8f5d101b7b1f859d4f95fdf8e91ed19 Mon Sep 17 00:00:00 2001
From: Solomon Hykes <solomon@docker.com>
Date: Sun, 10 Aug 2014 04:31:59 +0000
Subject: [PATCH 1/2] Move declaration of DockerCli to top of file for
 readability

Signed-off-by: Solomon Hykes <solomon@docker.com>
---
 api/client/cli.go | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/api/client/cli.go b/api/client/cli.go
index 0b7ffeaa23..f10cc2ecd7 100644
--- a/api/client/cli.go
+++ b/api/client/cli.go
@@ -15,6 +15,19 @@ import (
 	"github.com/docker/docker/registry"
 )
 
+type DockerCli struct {
+	proto      string
+	addr       string
+	configFile *registry.ConfigFile
+	in         io.ReadCloser
+	out        io.Writer
+	err        io.Writer
+	isTerminal bool
+	terminalFd uintptr
+	tlsConfig  *tls.Config
+	scheme     string
+}
+
 var funcMap = template.FuncMap{
 	"json": func(v interface{}) string {
 		a, _ := json.Marshal(v)
@@ -97,16 +110,3 @@ func NewDockerCli(in io.ReadCloser, out, err io.Writer, proto, addr string, tlsC
 		scheme:     scheme,
 	}
 }
-
-type DockerCli struct {
-	proto      string
-	addr       string
-	configFile *registry.ConfigFile
-	in         io.ReadCloser
-	out        io.Writer
-	err        io.Writer
-	isTerminal bool
-	terminalFd uintptr
-	tlsConfig  *tls.Config
-	scheme     string
-}

From a110ce2f284d09df3e047b1999a1535770433d5f Mon Sep 17 00:00:00 2001
From: Solomon Hykes <solomon@docker.com>
Date: Sun, 10 Aug 2014 04:33:19 +0000
Subject: [PATCH 2/2] Rename a method for clarity

Signed-off-by: Solomon Hykes <solomon@docker.com>
---
 api/client/cli.go | 3 ++-
 docker/docker.go  | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/api/client/cli.go b/api/client/cli.go
index f10cc2ecd7..d80f9cc32c 100644
--- a/api/client/cli.go
+++ b/api/client/cli.go
@@ -47,7 +47,8 @@ func (cli *DockerCli) getMethod(name string) (func(...string) error, bool) {
 	return method.Interface().(func(...string) error), true
 }
 
-func (cli *DockerCli) ParseCommands(args ...string) error {
+// Cmd executes the specified command
+func (cli *DockerCli) Cmd(args ...string) error {
 	if len(args) > 0 {
 		method, exists := cli.getMethod(args[0])
 		if !exists {
diff --git a/docker/docker.go b/docker/docker.go
index 38a4da0d44..cb0c348af8 100644
--- a/docker/docker.go
+++ b/docker/docker.go
@@ -99,7 +99,7 @@ func main() {
 		cli = client.NewDockerCli(os.Stdin, os.Stdout, os.Stderr, protoAddrParts[0], protoAddrParts[1], nil)
 	}
 
-	if err := cli.ParseCommands(flag.Args()...); err != nil {
+	if err := cli.Cmd(flag.Args()...); err != nil {
 		if sterr, ok := err.(*utils.StatusError); ok {
 			if sterr.Status != "" {
 				log.Println(sterr.Status)