deis fixed bugs

Author: smothiki

cmd/cmd.go

@@ -2,9 +2,8 @@ package cmd
 
 import (
 	"fmt"
-	"github.com/deis/deis/tests/dockercli"
 	"github.com/deis/deisctl/client"
-	"github.com/deis/deisctl/updatectl"
+	"github.com/deis/deisctl/utils"
 	"regexp"
 	"strconv"
 	"strings"
@@ -16,9 +15,9 @@ func List(c client.Client) error {
 }
 
 func PullImage(service string) error {
-	Dockercli, _, _ := dockercli.GetNewClient()
+	dockercli, _, _ := utils.GetNewClient()
 	fmt.Println("pulling image :" + strings.Split(service, ".")[0])
-	err := cli.CmdPull(strings.Split(service, ".")[0])
+	err := utils.CmdPull(dockercli, strings.Split(service, ".")[0])
 	if err != nil {
 		return err
 	}

utils/utils.go

@@ -6,6 +6,8 @@ import (
 	_ "bufio"
 	"bytes"
 	"fmt"
+	"github.com/docker/docker/api/client"
+	"github.com/satori/go.uuid"
 	"io"
 	"io/ioutil"
 	"net"
@@ -16,8 +18,6 @@ import (
 	"syscall"
 	"testing"
 	"time"
-
-	"github.com/satori/go.uuid"
 )
 
 // NewUuid returns a new V4-style unique identifier.
@@ -27,6 +27,22 @@ func NewUuid() string {
 	return strings.Split(s1, "-")[0]
 }
 
+func GetNewClient() (
+	cli *client.DockerCli, stdout *io.PipeReader, stdoutPipe *io.PipeWriter) {
+	testDaemonAddr := "/var/run/docker.sock"
+	testDaemonProto := "unix"
+	stdout, stdoutPipe = io.Pipe()
+	cli = client.NewDockerCli(
+		nil, stdoutPipe, nil, testDaemonProto, testDaemonAddr, nil)
+	return
+}
+
+func PullImage(cli *client.DockerCli, args ...string) error {
+	fmt.Println("pulling image :" + args[0])
+	err := cli.CmdPull(args...)
+	return err
+}
+
 func GetServices() []string {
 	service := []string{
 		"deis-builder.service",