@@ -22,9 +22,11 @@ import (

 	"github.com/docker/docker/graph"

 	"github.com/docker/docker/pkg/archive"

 	"github.com/docker/docker/pkg/fileutils"

+	"github.com/docker/docker/pkg/jsonmessage"

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

 	"github.com/docker/docker/pkg/parsers"

 	"github.com/docker/docker/pkg/progressreader"

+	"github.com/docker/docker/pkg/streamformatter"

 	"github.com/docker/docker/pkg/symlink"

 	"github.com/docker/docker/pkg/units"

 	"github.com/docker/docker/pkg/urlutil"

@@ -198,7 +200,7 @@ func (cli *DockerCli) CmdBuild(args ...string) error {

 	// Setup an upload progress bar

 	// FIXME: ProgressReader shouldn't be this annoying to use

 	if context != nil {

-		sf := utils.NewStreamFormatter(false)

+		sf := streamformatter.NewStreamFormatter(false)

 		body = progressreader.New(progressreader.Config{

 			In:        context,

 			Out:       cli.out,

@@ -291,7 +293,7 @@ func (cli *DockerCli) CmdBuild(args ...string) error {

 		headers.Set("Content-Type", "application/tar")

 	}

 	err = cli.stream("POST", fmt.Sprintf("/build?%s", v.Encode()), body, cli.out, headers)

-	if jerr, ok := err.(*utils.JSONError); ok {

+	if jerr, ok := err.(*jsonmessage.JSONError); ok {

 		// If no error code is set, default to 1

 		if jerr.Code == 0 {

 			jerr.Code = 1

@@ -19,11 +19,11 @@ import (

 	"github.com/docker/docker/api"

 	"github.com/docker/docker/autogen/dockerversion"

 	"github.com/docker/docker/engine"

+	"github.com/docker/docker/pkg/jsonmessage"

 	"github.com/docker/docker/pkg/signal"

 	"github.com/docker/docker/pkg/stdcopy"

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

 	"github.com/docker/docker/registry"

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

 )

 var (

@@ -164,7 +164,7 @@ func (cli *DockerCli) streamHelper(method, path string, setRawTerminal bool, in

 	}

 	if api.MatchesContentType(resp.Header.Get("Content-Type"), "application/json") {

-		return utils.DisplayJSONMessagesStream(resp.Body, stdout, cli.outFd, cli.isTerminalOut)

+		return jsonmessage.DisplayJSONMessagesStream(resp.Body, stdout, cli.outFd, cli.isTerminalOut)

 	}

 	if stdout != nil || stderr != nil {

 		// When TTY is ON, use regular copy

@@ -32,6 +32,7 @@ import (

 	"github.com/docker/docker/pkg/listenbuffer"

 	"github.com/docker/docker/pkg/parsers"

 	"github.com/docker/docker/pkg/stdcopy"

+	"github.com/docker/docker/pkg/streamformatter"

 	"github.com/docker/docker/pkg/version"

 	"github.com/docker/docker/registry"

 	"github.com/docker/docker/utils"

@@ -595,7 +596,7 @@ func postImagesCreate(eng *engine.Engine, version version.Version, w http.Respon

 		if !job.Stdout.Used() {

 			return err

 		}

-		sf := utils.NewStreamFormatter(version.GreaterThan("1.0"))

+		sf := streamformatter.NewStreamFormatter(version.GreaterThan("1.0"))

 		w.Write(sf.FormatError(err))

 	}

@@ -680,7 +681,7 @@ func postImagesPush(eng *engine.Engine, version version.Version, w http.Response

 		if !job.Stdout.Used() {

 			return err

 		}

-		sf := utils.NewStreamFormatter(version.GreaterThan("1.0"))

+		sf := streamformatter.NewStreamFormatter(version.GreaterThan("1.0"))

 		w.Write(sf.FormatError(err))

 	}

 	return nil

@@ -1107,7 +1108,7 @@ func postBuild(eng *engine.Engine, version version.Version, w http.ResponseWrite

 		if !job.Stdout.Used() {

 			return err

 		}

-		sf := utils.NewStreamFormatter(version.GreaterThanOrEqualTo("1.8"))

+		sf := streamformatter.NewStreamFormatter(version.GreaterThanOrEqualTo("1.8"))

 		w.Write(sf.FormatError(err))

 	}

 	return nil

@@ -33,6 +33,7 @@ import (

 	"github.com/docker/docker/daemon"

 	"github.com/docker/docker/engine"

 	"github.com/docker/docker/pkg/fileutils"

+	"github.com/docker/docker/pkg/streamformatter"

 	"github.com/docker/docker/pkg/stringid"

 	"github.com/docker/docker/pkg/symlink"

 	"github.com/docker/docker/pkg/tarsum"

@@ -105,7 +106,7 @@ type Builder struct {

 	// Deprecated, original writer used for ImagePull. To be removed.

 	OutOld          io.Writer

-	StreamFormatter *utils.StreamFormatter

+	StreamFormatter *streamformatter.StreamFormatter

 	Config *runconfig.Config // runconfig for cmd, run, entrypoint etc.

@@ -26,6 +26,7 @@ import (

 	"github.com/docker/docker/pkg/archive"

 	"github.com/docker/docker/pkg/chrootarchive"

 	"github.com/docker/docker/pkg/ioutils"

+	"github.com/docker/docker/pkg/jsonmessage"

 	"github.com/docker/docker/pkg/parsers"

 	"github.com/docker/docker/pkg/progressreader"

 	"github.com/docker/docker/pkg/stringid"

@@ -601,7 +602,7 @@ func (b *Builder) run(c *daemon.Container) error {

 	// Wait for it to finish

 	if ret, _ := c.WaitStop(-1 * time.Second); ret != 0 {

-		err := &utils.JSONError{

+		err := &jsonmessage.JSONError{

 			Message: fmt.Sprintf("The command %v returned a non-zero code: %d", b.Config.Cmd, ret),

 			Code:    ret,

 		}

@@ -17,6 +17,7 @@ import (

 	"github.com/docker/docker/graph"

 	"github.com/docker/docker/pkg/archive"

 	"github.com/docker/docker/pkg/parsers"

+	"github.com/docker/docker/pkg/streamformatter"

 	"github.com/docker/docker/pkg/urlutil"

 	"github.com/docker/docker/registry"

 	"github.com/docker/docker/runconfig"

@@ -127,16 +128,16 @@ func (b *BuilderJob) CmdBuild(job *engine.Job) error {

 	}

 	defer context.Close()

-	sf := utils.NewStreamFormatter(job.GetenvBool("json"))

+	sf := streamformatter.NewStreamFormatter(job.GetenvBool("json"))

 	builder := &Builder{

 		Daemon: b.Daemon,

 		Engine: b.Engine,

-		OutStream: &utils.StdoutFormater{

+		OutStream: &streamformatter.StdoutFormater{

 			Writer:          job.Stdout,

 			StreamFormatter: sf,

 		},

-		ErrStream: &utils.StderrFormater{

+		ErrStream: &streamformatter.StderrFormater{

 			Writer:          job.Stdout,

 			StreamFormatter: sf,

 		},

@@ -10,23 +10,23 @@ import (

 	"time"

 	"github.com/docker/docker/engine"

+	"github.com/docker/docker/pkg/jsonmessage"

 	"github.com/docker/docker/pkg/parsers/filters"

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

 )

 const eventsLimit = 64

-type listener chan<- *utils.JSONMessage

+type listener chan<- *jsonmessage.JSONMessage

 type Events struct {

 	mu          sync.RWMutex

-	events      []*utils.JSONMessage

+	events      []*jsonmessage.JSONMessage

 	subscribers []listener

 }

 func New() *Events {

 	return &Events{

-		events: make([]*utils.JSONMessage, 0, eventsLimit),

+		events: make([]*jsonmessage.JSONMessage, 0, eventsLimit),

 	}

 }

@@ -63,7 +63,7 @@ func (e *Events) Get(job *engine.Job) error {

 		timeout.Stop()

 	}

-	listener := make(chan *utils.JSONMessage)

+	listener := make(chan *jsonmessage.JSONMessage)

 	e.subscribe(listener)

 	defer e.unsubscribe(listener)

@@ -107,7 +107,7 @@ func (e *Events) SubscribersCount(job *engine.Job) error {

 	return nil

 }

-func writeEvent(job *engine.Job, event *utils.JSONMessage, eventFilters filters.Args) error {

+func writeEvent(job *engine.Job, event *jsonmessage.JSONMessage, eventFilters filters.Args) error {

 	isFiltered := func(field string, filter []string) bool {

 		if len(filter) == 0 {

 			return false

@@ -170,7 +170,7 @@ func (e *Events) subscribersCount() int {

 func (e *Events) log(action, id, from string) {

 	e.mu.Lock()

 	now := time.Now().UTC().Unix()

-	jm := &utils.JSONMessage{Status: action, ID: id, From: from, Time: now}

+	jm := &jsonmessage.JSONMessage{Status: action, ID: id, From: from, Time: now}

 	if len(e.events) == cap(e.events) {

 		// discard oldest event

 		copy(e.events, e.events[1:])

@@ -9,13 +9,13 @@ import (

 	"time"

 	"github.com/docker/docker/engine"

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

+	"github.com/docker/docker/pkg/jsonmessage"

 )

 func TestEventsPublish(t *testing.T) {

 	e := New()

-	l1 := make(chan *utils.JSONMessage)

-	l2 := make(chan *utils.JSONMessage)

+	l1 := make(chan *jsonmessage.JSONMessage)

+	l2 := make(chan *jsonmessage.JSONMessage)

 	e.subscribe(l1)

 	e.subscribe(l2)

 	count := e.subscribersCount()

@@ -61,7 +61,7 @@ func TestEventsPublish(t *testing.T) {

 func TestEventsPublishTimeout(t *testing.T) {

 	e := New()

-	l := make(chan *utils.JSONMessage)

+	l := make(chan *jsonmessage.JSONMessage)

 	e.subscribe(l)

 	c := make(chan struct{})

@@ -108,9 +108,9 @@ func TestLogEvents(t *testing.T) {

 	}

 	buf = bytes.NewBuffer(buf.Bytes())

 	dec := json.NewDecoder(buf)

-	var msgs []utils.JSONMessage

+	var msgs []jsonmessage.JSONMessage

 	for {

-		var jm utils.JSONMessage

+		var jm jsonmessage.JSONMessage

 		if err := dec.Decode(&jm); err != nil {

 			if err == io.EOF {

 				break

@@ -138,8 +138,8 @@ func TestEventsCountJob(t *testing.T) {

 	if err := e.Install(eng); err != nil {

 		t.Fatal(err)

 	}

-	l1 := make(chan *utils.JSONMessage)

-	l2 := make(chan *utils.JSONMessage)

+	l1 := make(chan *jsonmessage.JSONMessage)

+	l2 := make(chan *jsonmessage.JSONMessage)

 	e.subscribe(l1)

 	e.subscribe(l2)

 	job := eng.Job("subscribers_count")

@@ -18,6 +18,7 @@ import (

 	"github.com/docker/docker/image"

 	"github.com/docker/docker/pkg/archive"

 	"github.com/docker/docker/pkg/progressreader"

+	"github.com/docker/docker/pkg/streamformatter"

 	"github.com/docker/docker/pkg/stringid"

 	"github.com/docker/docker/pkg/truncindex"

 	"github.com/docker/docker/runconfig"

@@ -198,7 +199,7 @@ func (graph *Graph) Register(img *image.Image, layerData archive.ArchiveReader)

 //   The archive is stored on disk and will be automatically deleted as soon as has been read.

 //   If output is not nil, a human-readable progress bar will be written to it.

 //   FIXME: does this belong in Graph? How about MktempFile, let the caller use it for archives?

-func (graph *Graph) TempLayerArchive(id string, sf *utils.StreamFormatter, output io.Writer) (*archive.TempArchive, error) {

+func (graph *Graph) TempLayerArchive(id string, sf *streamformatter.StreamFormatter, output io.Writer) (*archive.TempArchive, error) {

 	image, err := graph.Get(id)

 	if err != nil {

 		return nil, err

@@ -11,6 +11,7 @@ import (

 	"github.com/docker/docker/engine"

 	"github.com/docker/docker/pkg/archive"

 	"github.com/docker/docker/pkg/progressreader"

+	"github.com/docker/docker/pkg/streamformatter"

 	"github.com/docker/docker/runconfig"

 	"github.com/docker/docker/utils"

 )

@@ -23,7 +24,7 @@ func (s *TagStore) CmdImport(job *engine.Job) error {

 		src          = job.Args[0]

 		repo         = job.Args[1]

 		tag          string

-		sf           = utils.NewStreamFormatter(job.GetenvBool("json"))

+		sf           = streamformatter.NewStreamFormatter(job.GetenvBool("json"))

 		archive      archive.ArchiveReader

 		resp         *http.Response

 		stdoutBuffer = bytes.NewBuffer(nil)

@@ -15,6 +15,7 @@ import (

 	"github.com/docker/docker/engine"

 	"github.com/docker/docker/image"

 	"github.com/docker/docker/pkg/progressreader"

+	"github.com/docker/docker/pkg/streamformatter"

 	"github.com/docker/docker/pkg/stringid"

 	"github.com/docker/docker/registry"

 	"github.com/docker/docker/utils"

@@ -28,7 +29,7 @@ func (s *TagStore) CmdPull(job *engine.Job) error {

 	var (

 		localName   = job.Args[0]

 		tag         string

-		sf          = utils.NewStreamFormatter(job.GetenvBool("json"))

+		sf          = streamformatter.NewStreamFormatter(job.GetenvBool("json"))

 		authConfig  = &registry.AuthConfig{}

 		metaHeaders map[string][]string

 	)

@@ -107,7 +108,7 @@ func (s *TagStore) CmdPull(job *engine.Job) error {

 	return nil

 }

-func (s *TagStore) pullRepository(r *registry.Session, out io.Writer, repoInfo *registry.RepositoryInfo, askedTag string, sf *utils.StreamFormatter, parallel bool) error {

+func (s *TagStore) pullRepository(r *registry.Session, out io.Writer, repoInfo *registry.RepositoryInfo, askedTag string, sf *streamformatter.StreamFormatter, parallel bool) error {

 	out.Write(sf.FormatStatus("", "Pulling repository %s", repoInfo.CanonicalName))

 	repoData, err := r.GetRepositoryData(repoInfo.RemoteName)

@@ -265,7 +266,7 @@ func (s *TagStore) pullRepository(r *registry.Session, out io.Writer, repoInfo *

 	return nil

 }

-func (s *TagStore) pullImage(r *registry.Session, out io.Writer, imgID, endpoint string, token []string, sf *utils.StreamFormatter) (bool, error) {

+func (s *TagStore) pullImage(r *registry.Session, out io.Writer, imgID, endpoint string, token []string, sf *streamformatter.StreamFormatter) (bool, error) {

 	history, err := r.GetRemoteHistory(imgID, endpoint, token)

 	if err != nil {

 		return false, err

@@ -363,7 +364,7 @@ func (s *TagStore) pullImage(r *registry.Session, out io.Writer, imgID, endpoint

 	return layers_downloaded, nil

 }

-func WriteStatus(requestedTag string, out io.Writer, sf *utils.StreamFormatter, layers_downloaded bool) {

+func WriteStatus(requestedTag string, out io.Writer, sf *streamformatter.StreamFormatter, layers_downloaded bool) {

 	if layers_downloaded {

 		out.Write(sf.FormatStatus("", "Status: Downloaded newer image for %s", requestedTag))

 	} else {

@@ -382,7 +383,7 @@ type downloadInfo struct {

 	err        chan error

 }

-func (s *TagStore) pullV2Repository(eng *engine.Engine, r *registry.Session, out io.Writer, repoInfo *registry.RepositoryInfo, tag string, sf *utils.StreamFormatter, parallel bool) error {

+func (s *TagStore) pullV2Repository(eng *engine.Engine, r *registry.Session, out io.Writer, repoInfo *registry.RepositoryInfo, tag string, sf *streamformatter.StreamFormatter, parallel bool) error {

 	endpoint, err := r.V2RegistryEndpoint(repoInfo.Index)

 	if err != nil {

 		if repoInfo.Index.Official {

@@ -428,7 +429,7 @@ func (s *TagStore) pullV2Repository(eng *engine.Engine, r *registry.Session, out

 	return nil

 }

-func (s *TagStore) pullV2Tag(eng *engine.Engine, r *registry.Session, out io.Writer, endpoint *registry.Endpoint, repoInfo *registry.RepositoryInfo, tag string, sf *utils.StreamFormatter, parallel bool, auth *registry.RequestAuthorization) (bool, error) {

+func (s *TagStore) pullV2Tag(eng *engine.Engine, r *registry.Session, out io.Writer, endpoint *registry.Endpoint, repoInfo *registry.RepositoryInfo, tag string, sf *streamformatter.StreamFormatter, parallel bool, auth *registry.RequestAuthorization) (bool, error) {

 	log.Debugf("Pulling tag from V2 registry: %q", tag)

 	manifestBytes, manifestDigest, err := r.GetV2ImageManifest(endpoint, repoInfo.RemoteName, tag, auth)

@@ -17,6 +17,7 @@ import (

 	"github.com/docker/docker/engine"

 	"github.com/docker/docker/image"

 	"github.com/docker/docker/pkg/progressreader"

+	"github.com/docker/docker/pkg/streamformatter"

 	"github.com/docker/docker/pkg/stringid"

 	"github.com/docker/docker/registry"

 	"github.com/docker/docker/runconfig"

@@ -130,7 +131,7 @@ type imagePushData struct {

 // lookupImageOnEndpoint checks the specified endpoint to see if an image exists

 // and if it is absent then it sends the image id to the channel to be pushed.

-func lookupImageOnEndpoint(wg *sync.WaitGroup, r *registry.Session, out io.Writer, sf *utils.StreamFormatter,

+func lookupImageOnEndpoint(wg *sync.WaitGroup, r *registry.Session, out io.Writer, sf *streamformatter.StreamFormatter,

 	images chan imagePushData, imagesToPush chan string) {

 	defer wg.Done()

 	for image := range images {

@@ -144,7 +145,7 @@ func lookupImageOnEndpoint(wg *sync.WaitGroup, r *registry.Session, out io.Write

 }

 func (s *TagStore) pushImageToEndpoint(endpoint string, out io.Writer, remoteName string, imageIDs []string,

-	tags map[string][]string, repo *registry.RepositoryData, sf *utils.StreamFormatter, r *registry.Session) error {

+	tags map[string][]string, repo *registry.RepositoryData, sf *streamformatter.StreamFormatter, r *registry.Session) error {

 	workerCount := len(imageIDs)

 	// start a maximum of 5 workers to check if images exist on the specified endpoint.

 	if workerCount > 5 {

@@ -203,7 +204,7 @@ func (s *TagStore) pushImageToEndpoint(endpoint string, out io.Writer, remoteNam

 // pushRepository pushes layers that do not already exist on the registry.

 func (s *TagStore) pushRepository(r *registry.Session, out io.Writer,

 	repoInfo *registry.RepositoryInfo, localRepo map[string]string,

-	tag string, sf *utils.StreamFormatter) error {

+	tag string, sf *streamformatter.StreamFormatter) error {

 	log.Debugf("Local repo: %s", localRepo)

 	out = utils.NewWriteFlusher(out)

 	imgList, tags, err := s.getImageList(localRepo, tag)

@@ -238,7 +239,7 @@ func (s *TagStore) pushRepository(r *registry.Session, out io.Writer,

 	return err

 }

-func (s *TagStore) pushImage(r *registry.Session, out io.Writer, imgID, ep string, token []string, sf *utils.StreamFormatter) (checksum string, err error) {

+func (s *TagStore) pushImage(r *registry.Session, out io.Writer, imgID, ep string, token []string, sf *streamformatter.StreamFormatter) (checksum string, err error) {

 	out = utils.NewWriteFlusher(out)

 	jsonRaw, err := ioutil.ReadFile(path.Join(s.graph.Root, imgID, "json"))

 	if err != nil {

@@ -292,7 +293,7 @@ func (s *TagStore) pushImage(r *registry.Session, out io.Writer, imgID, ep strin

 	return imgData.Checksum, nil

 }

-func (s *TagStore) pushV2Repository(r *registry.Session, localRepo Repository, out io.Writer, repoInfo *registry.RepositoryInfo, tag string, sf *utils.StreamFormatter) error {

+func (s *TagStore) pushV2Repository(r *registry.Session, localRepo Repository, out io.Writer, repoInfo *registry.RepositoryInfo, tag string, sf *streamformatter.StreamFormatter) error {

 	endpoint, err := r.V2RegistryEndpoint(repoInfo.Index)

 	if err != nil {

 		if repoInfo.Index.Official {

@@ -442,7 +443,7 @@ func (s *TagStore) pushV2Repository(r *registry.Session, localRepo Repository, o

 }

 // PushV2Image pushes the image content to the v2 registry, first buffering the contents to disk

-func (s *TagStore) pushV2Image(r *registry.Session, img *image.Image, endpoint *registry.Endpoint, imageName string, sf *utils.StreamFormatter, out io.Writer, auth *registry.RequestAuthorization) (string, error) {

+func (s *TagStore) pushV2Image(r *registry.Session, img *image.Image, endpoint *registry.Endpoint, imageName string, sf *streamformatter.StreamFormatter, out io.Writer, auth *registry.RequestAuthorization) (string, error) {

 	out.Write(sf.FormatProgress(stringid.TruncateID(img.ID), "Buffering to Disk", nil))

 	image, err := s.graph.Get(img.ID)

@@ -498,7 +499,7 @@ func (s *TagStore) CmdPush(job *engine.Job) error {

 	}

 	var (

 		localName   = job.Args[0]

-		sf          = utils.NewStreamFormatter(job.GetenvBool("json"))

+		sf          = streamformatter.NewStreamFormatter(job.GetenvBool("json"))

 		authConfig  = &registry.AuthConfig{}

 		metaHeaders map[string][]string

 	)

new file mode 100644

@@ -0,0 +1,172 @@

+package jsonmessage

+

+import (

+	"encoding/json"

+	"fmt"

+	"io"

+	"strings"

+	"time"

+

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

+	"github.com/docker/docker/pkg/timeutils"

+	"github.com/docker/docker/pkg/units"

+)

+

+type JSONError struct {

+	Code    int    `json:"code,omitempty"`

+	Message string `json:"message,omitempty"`

+}

+

+func (e *JSONError) Error() string {

+	return e.Message

+}

+

+type JSONProgress struct {

+	terminalFd uintptr

+	Current    int   `json:"current,omitempty"`

+	Total      int   `json:"total,omitempty"`

+	Start      int64 `json:"start,omitempty"`

+}

+

+func (p *JSONProgress) String() string {

+	var (

+		width       = 200

+		pbBox       string

+		numbersBox  string

+		timeLeftBox string

+	)

+

+	ws, err := term.GetWinsize(p.terminalFd)

+	if err == nil {

+		width = int(ws.Width)

+	}

+

+	if p.Current <= 0 && p.Total <= 0 {

+		return ""

+	}

+	current := units.HumanSize(float64(p.Current))

+	if p.Total <= 0 {

+		return fmt.Sprintf("%8v", current)

+	}

+	total := units.HumanSize(float64(p.Total))

+	percentage := int(float64(p.Current)/float64(p.Total)*100) / 2

+	if percentage > 50 {

+		percentage = 50

+	}

+	if width > 110 {

+		// this number can't be negetive gh#7136

+		numSpaces := 0

+		if 50-percentage > 0 {

+			numSpaces = 50 - percentage

+		}

+		pbBox = fmt.Sprintf("[%s>%s] ", strings.Repeat("=", percentage), strings.Repeat(" ", numSpaces))

+	}

+	numbersBox = fmt.Sprintf("%8v/%v", current, total)

+

+	if p.Current > 0 && p.Start > 0 && percentage < 50 {

+		fromStart := time.Now().UTC().Sub(time.Unix(int64(p.Start), 0))

+		perEntry := fromStart / time.Duration(p.Current)

+		left := time.Duration(p.Total-p.Current) * perEntry

+		left = (left / time.Second) * time.Second

+

+		if width > 50 {

+			timeLeftBox = " " + left.String()

+		}

+	}

+	return pbBox + numbersBox + timeLeftBox

+}

+

+type JSONMessage struct {

+	Stream          string        `json:"stream,omitempty"`

+	Status          string        `json:"status,omitempty"`

+	Progress        *JSONProgress `json:"progressDetail,omitempty"`

+	ProgressMessage string        `json:"progress,omitempty"` //deprecated

+	ID              string        `json:"id,omitempty"`

+	From            string        `json:"from,omitempty"`

+	Time            int64         `json:"time,omitempty"`

+	Error           *JSONError    `json:"errorDetail,omitempty"`

+	ErrorMessage    string        `json:"error,omitempty"` //deprecated

+}

+

+func (jm *JSONMessage) Display(out io.Writer, isTerminal bool) error {

+	if jm.Error != nil {

+		if jm.Error.Code == 401 {

+			return fmt.Errorf("Authentication is required.")

+		}

+		return jm.Error

+	}

+	var endl string

+	if isTerminal && jm.Stream == "" && jm.Progress != nil {

+		// <ESC>[2K = erase entire current line

+		fmt.Fprintf(out, "%c[2K\r", 27)

+		endl = "\r"

+	} else if jm.Progress != nil && jm.Progress.String() != "" { //disable progressbar in non-terminal

+		return nil

+	}

+	if jm.Time != 0 {

+		fmt.Fprintf(out, "%s ", time.Unix(jm.Time, 0).Format(timeutils.RFC3339NanoFixed))

+	}

+	if jm.ID != "" {

+		fmt.Fprintf(out, "%s: ", jm.ID)

+	}

+	if jm.From != "" {

+		fmt.Fprintf(out, "(from %s) ", jm.From)

+	}

+	if jm.Progress != nil && isTerminal {

+		fmt.Fprintf(out, "%s %s%s", jm.Status, jm.Progress.String(), endl)

+	} else if jm.ProgressMessage != "" { //deprecated

+		fmt.Fprintf(out, "%s %s%s", jm.Status, jm.ProgressMessage, endl)

+	} else if jm.Stream != "" {

+		fmt.Fprintf(out, "%s%s", jm.Stream, endl)

+	} else {

+		fmt.Fprintf(out, "%s%s\n", jm.Status, endl)

+	}

+	return nil

+}

+

+func DisplayJSONMessagesStream(in io.Reader, out io.Writer, terminalFd uintptr, isTerminal bool) error {

+	var (

+		dec  = json.NewDecoder(in)

+		ids  = make(map[string]int)

+		diff = 0

+	)

+	for {

+		var jm JSONMessage

+		if err := dec.Decode(&jm); err != nil {

+			if err == io.EOF {

+				break

+			}

+			return err

+		}

+

+		if jm.Progress != nil {

+			jm.Progress.terminalFd = terminalFd

+		}

+		if jm.ID != "" && (jm.Progress != nil || jm.ProgressMessage != "") {

+			line, ok := ids[jm.ID]

+			if !ok {

+				line = len(ids)

+				ids[jm.ID] = line

+				if isTerminal {

+					fmt.Fprintf(out, "\n")

+				}

+				diff = 0

+			} else {

+				diff = len(ids) - line

+			}

+			if jm.ID != "" && isTerminal {

+				// <ESC>[{diff}A = move cursor up diff rows

+				fmt.Fprintf(out, "%c[%dA", 27, diff)

+			}

+		}

+		err := jm.Display(out, isTerminal)

+		if jm.ID != "" && isTerminal {

+			// <ESC>[{diff}B = move cursor down diff rows

+			fmt.Fprintf(out, "%c[%dB", 27, diff)

+		}

+		if err != nil {

+			return err

+		}

+	}

+	return nil

+}

new file mode 100644

@@ -0,0 +1,38 @@

+package jsonmessage

+

+import (

+	"testing"

+)

+

+func TestError(t *testing.T) {

+	je := JSONError{404, "Not found"}

+	if je.Error() != "Not found" {

+		t.Fatalf("Expected 'Not found' got '%s'", je.Error())

+	}

+}

+

+func TestProgress(t *testing.T) {

+	jp := JSONProgress{}

+	if jp.String() != "" {

+		t.Fatalf("Expected empty string, got '%s'", jp.String())

+	}

+

+	expected := "     1 B"

+	jp2 := JSONProgress{Current: 1}

+	if jp2.String() != expected {

+		t.Fatalf("Expected %q, got %q", expected, jp2.String())

+	}

+

+	expected = "[=========================>                         ]     50 B/100 B"

+	jp3 := JSONProgress{Current: 50, Total: 100}

+	if jp3.String() != expected {

+		t.Fatalf("Expected %q, got %q", expected, jp3.String())

+	}

+

+	// this number can't be negetive gh#7136

+	expected = "[==================================================>]     50 B/40 B"

+	jp4 := JSONProgress{Current: 50, Total: 40}

+	if jp4.String() != expected {

+		t.Fatalf("Expected %q, got %q", expected, jp4.String())

+	}

+}

@@ -1,37 +1,16 @@

 package progressreader

 import (

+	"github.com/docker/docker/pkg/jsonmessage"

+	"github.com/docker/docker/pkg/streamformatter"

 	"io"

 )

-type StreamFormatter interface {

-	FormatProg(string, string, interface{}) []byte

-	FormatStatus(string, string, ...interface{}) []byte

-	FormatError(error) []byte

-}

-

-type PR_JSONProgress interface {

-	GetCurrent() int

-	GetTotal() int

-}

-

-type JSONProg struct {

-	Current int

-	Total   int

-}

-

-func (j *JSONProg) GetCurrent() int {

-	return j.Current

-}

-func (j *JSONProg) GetTotal() int {

-	return j.Total

-}

-

 // Reader with progress bar

 type Config struct {

 	In         io.ReadCloser // Stream to read from

 	Out        io.Writer     // Where to send progress bar to

-	Formatter  StreamFormatter

+	Formatter  *streamformatter.StreamFormatter

 	Size       int

 	Current    int

 	LastUpdate int

@@ -54,7 +33,7 @@ func (config *Config) Read(p []byte) (n int, err error) {

 		}

 	}

 	if config.Current-config.LastUpdate > updateEvery || err != nil {

-		config.Out.Write(config.Formatter.FormatProg(config.ID, config.Action, &JSONProg{Current: config.Current, Total: config.Size}))

+		config.Out.Write(config.Formatter.FormatProgress(config.ID, config.Action, &jsonmessage.JSONProgress{Current: config.Current, Total: config.Size}))

 		config.LastUpdate = config.Current

 	}

 	// Send newline when complete

@@ -64,6 +43,6 @@ func (config *Config) Read(p []byte) (n int, err error) {

 	return read, err

 }

 func (config *Config) Close() error {

-	config.Out.Write(config.Formatter.FormatProg(config.ID, config.Action, &JSONProg{Current: config.Current, Total: config.Size}))

+	config.Out.Write(config.Formatter.FormatProgress(config.ID, config.Action, &jsonmessage.JSONProgress{Current: config.Current, Total: config.Size}))

 	return config.In.Close()

 }

new file mode 100644

@@ -0,0 +1,113 @@

+package streamformatter

+

+import (

+	"encoding/json"

+	"fmt"

+	"github.com/docker/docker/pkg/jsonmessage"

+	"io"

+)

+

+type StreamFormatter struct {

+	json bool

+}

+

+func NewStreamFormatter(json bool) *StreamFormatter {

+	return &StreamFormatter{json}

+}

+

+const streamNewline = "\r\n"

+

+var streamNewlineBytes = []byte(streamNewline)

+

+func (sf *StreamFormatter) FormatStream(str string) []byte {

+	if sf.json {

+		b, err := json.Marshal(&jsonmessage.JSONMessage{Stream: str})

+		if err != nil {

+			return sf.FormatError(err)

+		}

+		return append(b, streamNewlineBytes...)

+	}

+	return []byte(str + "\r")

+}

+

+func (sf *StreamFormatter) FormatStatus(id, format string, a ...interface{}) []byte {

+	str := fmt.Sprintf(format, a...)

+	if sf.json {

+		b, err := json.Marshal(&jsonmessage.JSONMessage{ID: id, Status: str})

+		if err != nil {

+			return sf.FormatError(err)

+		}

+		return append(b, streamNewlineBytes...)

+	}

+	return []byte(str + streamNewline)

+}

+

+func (sf *StreamFormatter) FormatError(err error) []byte {

+	if sf.json {

+		jsonError, ok := err.(*jsonmessage.JSONError)

+		if !ok {

+			jsonError = &jsonmessage.JSONError{Message: err.Error()}

+		}

+		if b, err := json.Marshal(&jsonmessage.JSONMessage{Error: jsonError, ErrorMessage: err.Error()}); err == nil {

+			return append(b, streamNewlineBytes...)

+		}

+		return []byte("{\"error\":\"format error\"}" + streamNewline)

+	}

+	return []byte("Error: " + err.Error() + streamNewline)

+}

+

+func (sf *StreamFormatter) FormatProgress(id, action string, progress *jsonmessage.JSONProgress) []byte {

+	if progress == nil {

+		progress = &jsonmessage.JSONProgress{}

+	}

+	if sf.json {

+

+		b, err := json.Marshal(&jsonmessage.JSONMessage{

+			Status:          action,

+			ProgressMessage: progress.String(),

+			Progress:        progress,

+			ID:              id,

+		})

+		if err != nil {

+			return nil

+		}

+		return b

+	}

+	endl := "\r"

+	if progress.String() == "" {

+		endl += "\n"

+	}

+	return []byte(action + " " + progress.String() + endl)

+}

+

+func (sf *StreamFormatter) Json() bool {

+	return sf.json

+}

+

+type StdoutFormater struct {

+	io.Writer

+	*StreamFormatter

+}

+

+func (sf *StdoutFormater) Write(buf []byte) (int, error) {

+	formattedBuf := sf.StreamFormatter.FormatStream(string(buf))

+	n, err := sf.Writer.Write(formattedBuf)

+	if n != len(formattedBuf) {

+		return n, io.ErrShortWrite

+	}

+	return len(buf), err

+}

+

+type StderrFormater struct {

+	io.Writer

+	*StreamFormatter

+}

+

+func (sf *StderrFormater) Write(buf []byte) (int, error) {

+	formattedBuf := sf.StreamFormatter.FormatStream("\033[91m" + string(buf) + "\033[0m")

+	n, err := sf.Writer.Write(formattedBuf)

+	if n != len(formattedBuf) {

+		return n, io.ErrShortWrite

+	}

+	return len(buf), err

+}

new file mode 100644

@@ -0,0 +1,68 @@

+package streamformatter

+

+import (

+	"encoding/json"

+	"errors"

+	"github.com/docker/docker/pkg/jsonmessage"

+	"reflect"

+	"testing"

+)

+

+func TestFormatStream(t *testing.T) {

+	sf := NewStreamFormatter(true)

+	res := sf.FormatStream("stream")

+	if string(res) != `{"stream":"stream"}`+"\r\n" {

+		t.Fatalf("%q", res)

+	}

+}

+

+func TestFormatStatus(t *testing.T) {

+	sf := NewStreamFormatter(true)

+	res := sf.FormatStatus("ID", "%s%d", "a", 1)

+	if string(res) != `{"status":"a1","id":"ID"}`+"\r\n" {

+		t.Fatalf("%q", res)

+	}

+}

+

+func TestFormatSimpleError(t *testing.T) {

+	sf := NewStreamFormatter(true)

+	res := sf.FormatError(errors.New("Error for formatter"))

+	if string(res) != `{"errorDetail":{"message":"Error for formatter"},"error":"Error for formatter"}`+"\r\n" {

+		t.Fatalf("%q", res)

+	}

+}

+

+func TestFormatJSONError(t *testing.T) {

+	sf := NewStreamFormatter(true)

+	err := &jsonmessage.JSONError{Code: 50, Message: "Json error"}

+	res := sf.FormatError(err)

+	if string(res) != `{"errorDetail":{"code":50,"message":"Json error"},"error":"Json error"}`+"\r\n" {

+		t.Fatalf("%q", res)

+	}

+}

+

+func TestFormatProgress(t *testing.T) {

+	sf := NewStreamFormatter(true)

+	progress := &jsonmessage.JSONProgress{

+		Current: 15,

+		Total:   30,

+		Start:   1,

+	}

+	res := sf.FormatProgress("id", "action", progress)

+	msg := &jsonmessage.JSONMessage{}

+	if err := json.Unmarshal(res, msg); err != nil {

+		t.Fatal(err)

+	}

+	if msg.ID != "id" {

+		t.Fatalf("ID must be 'id', got: %s", msg.ID)

+	}

+	if msg.Status != "action" {

+		t.Fatalf("Status must be 'action', got: %s", msg.Status)

+	}