Move color coding bits to module, use over rest of playbook

This commit is contained in:
Michael DeHaan 2012-07-24 19:30:02 -04:00
commit 12ff9b5b9a
4 changed files with 114 additions and 62 deletions

View file

@ -27,47 +27,10 @@ import ansible.constants as C
from ansible import errors
from ansible import callbacks
from ansible import utils
ANSIBLE_COLOR=True
if os.getenv("ANSIBLE_NOCOLOR") is not None:
ANSIBLE_COLOR=False
if not sys.stdout.isatty():
ANSIBLE_COLOR=False
# --- begin "pretty"
#
# pretty - A miniature library that provides a Python print and stdout
# wrapper that makes colored terminal text easier to use (eg. without
# having to mess around with ANSI escape sequences). This code is public
# domain - there is no license except that you must leave this header.
#
# Copyright (C) 2008 Brian Nez <thedude at bri1 dot com>
#
# http://nezzen.net/2008/06/23/colored-text-in-python-using-ansi-escape-sequences/
codeCodes = {
'black': '0;30', 'bright gray': '0;37',
'blue': '0;34', 'white': '1;37',
'green': '0;32', 'bright blue': '1;34',
'cyan': '0;36', 'bright green': '1;32',
'red': '0;31', 'bright cyan': '1;36',
'purple': '0;35', 'bright red': '1;31',
'yellow': '0;33', 'bright purple': '1;35',
'dark gray': '1;30', 'bright yellow': '1;33',
'normal': '0'
}
def stringc(text, color):
"""String in color."""
if ANSIBLE_COLOR:
return "\033["+codeCodes[color]+"m"+text+"\033[0m"
else:
return text
# --- end "pretty"
from ansible.color import ANSIBLE_COLOR, stringc
def colorize(lead, num, color):
"""Print `lead' = `num' in `color'"""
""" Print 'lead' = 'num' in 'color' """
if num == 0:
color='black';
if ANSIBLE_COLOR:
@ -75,10 +38,14 @@ def colorize(lead, num, color):
else:
return "%s=%-4s" % (lead, str(num))
def hostcolor(host, t):
def hostcolor(host, stats):
if ANSIBLE_COLOR:
if t['failures'] != 0 or t['unreachable'] != 0:
if stats['failures'] != 0 or stats['unreachable'] != 0:
return "%-41s" % stringc(host, 'red')
elif stats['changed'] != 0:
return "%-41s" % stringc(host, 'yellow')
else:
return "%-41s" % stringc(host, 'green')
return "%-30s" % host