Add exclude_task decorator in os_type

[snf-image-creator] / image_creator / util.py

diff --git a/image_creator/util.py b/image_creator/util.py
index bb57b5f..588d2b0 100644 (file)
--- a/image_creator/util.py
+++ b/image_creator/util.py
@@ -31,8 +31,11 @@
 # interpreted as representing official policies, either expressed
 # or implied, of GRNET S.A.
 
+import sys
 import pbs
-from clint.textui import puts, puts_err, colored, progress
+from clint.textui import colored, progress as uiprogress
+
+silent = False
 
 
 def get_command(command):
@@ -49,25 +52,46 @@ def get_command(command):
         return find_sbin_command(command, e)
 
 
-def error(msg):
-    puts_err(colored.red("Error: %s\n" % msg))
+def error(msg, new_line=True):
+    nl = "\n" if new_line else ''
+    sys.stderr.write('Error: %s' % msg + nl)
+
+
+def warn(msg, new_line=True):
+    if not silent:
+        nl = "\n" if new_line else ''
+        sys.stderr.write(colored.yellow("Warning: %s" % msg) + nl)
+
 
+def success(msg, new_line=True):
+    if not silent:
+        nl = "\n" if new_line else ''
+        sys.stdout.write(colored.green(msg) + nl)
+        if not nl:
+            sys.stdout.flush()
 
-def warn(msg):
-    puts_err(colored.yellow("Warning: %s" % msg))
 
+def output(msg="", new_line=True):
+    if not silent:
+        nl = "\n" if new_line else ''
+        sys.stdout.write(msg + nl)
+        if not nl:
+            sys.stdout.flush()
 
-def success(msg):
-    puts(colored.green(msg))
 
+def progress(label='', n=100):
 
-def progress_generator(label='', n=100):
-    position = 0
-    for i in progress.bar(range(n), label):
-        if i < position:
-            continue
-        position = yield
-    yield  # suppress the StopIteration exception
+    PROGRESS_LENGTH = 32
+    MESSAGE_LENGTH = 32
 
+    def progress_generator(label, n):
+        position = 0
+        for i in uiprogress.bar(range(n), label.ljust(MESSAGE_LENGTH), \
+                                                    PROGRESS_LENGTH, silent):
+            if i < position:
+                continue
+            position = yield
+        yield  # suppress the StopIteration exception
+    return progress_generator(label, n)
 
 # vim: set sta sts=4 shiftwidth=4 sw=4 et ai :