From 72867e684381c82c690915cfda487e3c4f6db8fd Mon Sep 17 00:00:00 2001
From: Berend Weel <b.weel@esciencecenter.nl>
Date: Mon, 3 Apr 2017 17:20:43 +0200
Subject: [PATCH] Fixed unicode progress indicator for python2

---
 boatswain/boatswain.py | 22 +++++++++-------------
 setup.cfg              |  2 +-
 setup.py               |  4 ++--
 3 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/boatswain/boatswain.py b/boatswain/boatswain.py
index c8d9436..b96828f 100644
--- a/boatswain/boatswain.py
+++ b/boatswain/boatswain.py
@@ -256,8 +256,7 @@ def build_list(self, names, images, dryrun=False, force=False,
                         self.progress_bar.update(self.step, imagename=name)
                     built.append(name)
 
-        if verbose == 1:
-            self._stop_progress()
+        self._stop_progress()
         return built
 
     def clean_list(self, names, images, dryrun=False, verbose=1):
@@ -282,8 +281,7 @@ def clean_list(self, names, images, dryrun=False, verbose=1):
                         self.step += 1
                         self.progress_bar.update(self.step, imagename=name)
                     cleaned.append(name)
-        if verbose == 1:
-            self._stop_progress()
+        self._stop_progress()
         return cleaned
 
     def push_list(self, names, images, dryrun=False, verbose=1):
@@ -309,8 +307,7 @@ def push_list(self, names, images, dryrun=False, verbose=1):
                         self.step += 1
                         self.progress_bar.update(self.step, imagename=name)
                     pushed.append(name)
-        if verbose == 1:
-            self._stop_progress()
+        self._stop_progress()
         return pushed
 
     def before_command(self, definition, verbose=1, dryrun=False):
@@ -474,8 +471,6 @@ def _docker_progress(self, name, generator, has_step=True, verbose=1):
         # are on (e.g. the layer)
         # and whether it was successfully built, although if it does not
         # build successfully we will get an Exception
-        if verbose > 1:
-            print(bcolors.blue(name))
         if verbose > 2:
             print(bcolors.warning(name + ": "), end="")
 
@@ -517,7 +512,7 @@ def _docker_progress(self, name, generator, has_step=True, verbose=1):
 
                 if verbose > 1:
                     self.create_progress_bar(self.step, self.total, name)
-                    self.progress_bar.update(self.step)
+                    self.progress_bar.update(self.step, name)
 
                 if line.startswith('Successfully built'):
                     ident = extract_id(line)
@@ -545,12 +540,13 @@ def create_progress_bar(self, start, total, name):
             self.total = total + 1
             if self.total is None:
                 self.total = progressbar.UnknownLength
-                widgets = [Counter(), ' ', BouncingBar(marker=u'\u2588',
-                           left=u'\u2502', right=u'\u2502'), ' ', Timer()]
+                widgets = [DynamicStringMessage('imagename'), ' ', Counter(), ' ',
+                           BouncingBar(marker=u'\u2588', left=u'\u2502', right=u'\u2502'),
+                           ' ', Timer()]
             else:
                 widgets = [DynamicStringMessage('imagename'), ' ', Percentage(), ' (', SimpleProgress(), ')',
-                           ' ', Bar(marker=u'\u2588',
-                                    left=u'\u2502', right=u'\u2502'), ' ', Timer()]
+                           ' ', Bar(marker=u'\u2588', left=u'\u2502', right=u'\u2502'),
+                           ' ', Timer()]
 
             self.progress_bar = progressbar.ProgressBar(
                 max_value=self.total, redirect_stdout=True,
diff --git a/setup.cfg b/setup.cfg
index 602477d..a6630dc 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.6.0
+current_version = 0.7.0
 
 [bdist_wheel]
 universal = 1
diff --git a/setup.py b/setup.py
index de7c874..914131b 100644
--- a/setup.py
+++ b/setup.py
@@ -19,7 +19,7 @@ def read(*names, **kwargs):
 
 setup(
     name='boatswain',
-    version='0.6.0',
+    version='0.7.0',
     url='https://github.com/nlesc-sherlock/boatswain',
     license='Apache Software License',
     author='Berend Weel',
@@ -27,7 +27,7 @@ def read(*names, **kwargs):
     install_requires=[
         'docker>=2.0.0, <3.0.0',
         'PyYAML>=3.12, <4.0',
-        'progressbar2>=3.12.0, <4.0.0'
+        'progressbar2>=3.16.0, <4.0.0'
     ],
     extras_require={
         'registry': ['docker-registry-client>=0.5.1'],