From b8b4c84573ec7d20524b7d2715d956fcc9f897a8 Mon Sep 17 00:00:00 2001
From: Yves Peter <ypdraw@gmail.com>
Date: Wed, 4 Nov 2015 23:40:57 +0100
Subject: [PATCH 1/2] Fixes #1490 progress_stream would print a lot of new
 lines on "docker-compose pull" if there's no tty.

Signed-off-by: Yves Peter <ypdraw@gmail.com>
---
 compose/progress_stream.py         | 23 +++++++++++++---------
 tests/unit/progress_stream_test.py | 31 ++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 9 deletions(-)

diff --git a/compose/progress_stream.py b/compose/progress_stream.py
index ac8e4b410..c729a6df0 100644
--- a/compose/progress_stream.py
+++ b/compose/progress_stream.py
@@ -14,8 +14,14 @@ def stream_output(output, stream):
 
     for event in utils.json_stream(output):
         all_events.append(event)
+        is_progress_event = 'progress' in event or 'progressDetail' in event
 
-        if 'progress' in event or 'progressDetail' in event:
+        if not is_progress_event:
+            print_output_event(event, stream, is_terminal)
+            stream.flush()
+
+        # if it's a progress event and we have a terminal, then display the progress bars
+        elif is_terminal:
             image_id = event.get('id')
             if not image_id:
                 continue
@@ -27,17 +33,16 @@ def stream_output(output, stream):
                 stream.write("\n")
                 diff = 0
 
-            if is_terminal:
-                # move cursor up `diff` rows
-                stream.write("%c[%dA" % (27, diff))
+            # move cursor up `diff` rows
+            stream.write("%c[%dA" % (27, diff))
 
-        print_output_event(event, stream, is_terminal)
+            print_output_event(event, stream, is_terminal)
 
-        if 'id' in event and is_terminal:
-            # move cursor back down
-            stream.write("%c[%dB" % (27, diff))
+            if 'id' in event:
+                # move cursor back down
+                stream.write("%c[%dB" % (27, diff))
 
-        stream.flush()
+            stream.flush()
 
     return all_events
 
diff --git a/tests/unit/progress_stream_test.py b/tests/unit/progress_stream_test.py
index d8f7ec836..b01be11a8 100644
--- a/tests/unit/progress_stream_test.py
+++ b/tests/unit/progress_stream_test.py
@@ -34,3 +34,34 @@ class ProgressStreamTestCase(unittest.TestCase):
         ]
         events = progress_stream.stream_output(output, StringIO())
         self.assertEqual(len(events), 1)
+
+    def test_stream_output_progress_event_tty(self):
+        events = [
+            b'{"status": "Already exists", "progressDetail": {}, "id": "8d05e3af52b0"}'
+        ]
+
+        class TTYStringIO(StringIO):
+            def isatty(self):
+                return True
+
+        output = TTYStringIO()
+        events = progress_stream.stream_output(events, output)
+        self.assertTrue(len(output.getvalue()) > 0)
+
+    def test_stream_output_progress_event_no_tty(self):
+        events = [
+            b'{"status": "Already exists", "progressDetail": {}, "id": "8d05e3af52b0"}'
+        ]
+        output = StringIO()
+
+        events = progress_stream.stream_output(events, output)
+        self.assertEqual(len(output.getvalue()), 0)
+
+    def test_stream_output_no_progress_event_no_tty(self):
+        events = [
+            b'{"status": "Pulling from library/xy", "id": "latest"}'
+        ]
+        output = StringIO()
+
+        events = progress_stream.stream_output(events, output)
+        self.assertTrue(len(output.getvalue()) > 0)

From c573fcc70a297dbc8d971ad13a81bbaa88262dec Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Wed, 11 Nov 2015 11:21:24 -0800
Subject: [PATCH 2/2] Reorganize conditional branches to improve readability

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/progress_stream.py | 37 ++++++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/compose/progress_stream.py b/compose/progress_stream.py
index c729a6df0..a6c8e0a26 100644
--- a/compose/progress_stream.py
+++ b/compose/progress_stream.py
@@ -19,30 +19,33 @@ def stream_output(output, stream):
         if not is_progress_event:
             print_output_event(event, stream, is_terminal)
             stream.flush()
+            continue
+
+        if not is_terminal:
+            continue
 
         # if it's a progress event and we have a terminal, then display the progress bars
-        elif is_terminal:
-            image_id = event.get('id')
-            if not image_id:
-                continue
+        image_id = event.get('id')
+        if not image_id:
+            continue
 
-            if image_id in lines:
-                diff = len(lines) - lines[image_id]
-            else:
-                lines[image_id] = len(lines)
-                stream.write("\n")
-                diff = 0
+        if image_id in lines:
+            diff = len(lines) - lines[image_id]
+        else:
+            lines[image_id] = len(lines)
+            stream.write("\n")
+            diff = 0
 
-            # move cursor up `diff` rows
-            stream.write("%c[%dA" % (27, diff))
+        # move cursor up `diff` rows
+        stream.write("%c[%dA" % (27, diff))
 
-            print_output_event(event, stream, is_terminal)
+        print_output_event(event, stream, is_terminal)
 
-            if 'id' in event:
-                # move cursor back down
-                stream.write("%c[%dB" % (27, diff))
+        if 'id' in event:
+            # move cursor back down
+            stream.write("%c[%dB" % (27, diff))
 
-            stream.flush()
+        stream.flush()
 
     return all_events