Merge pull request #253 from linode/ref/no-more-colorclass

Remove dependency on colorclass

Author: Dorthu

README.rst

@@ -389,8 +389,8 @@ added to Linode's OpenAPI spec:
 +-----------------------------+-------------+-------------------------------------------------------------------------------------------+
 |x-linode-cli-action          | method      | The action name for operations under this path. If not present, operationId is used.      |
 +-----------------------------+-------------+-------------------------------------------------------------------------------------------+
-|x-linode-cli-color           | property    | If present, defines key-value pairs of property value: color.  Colors must be understood  |
-|                             |             | by colorclass.Color.  Must include a default.                                             |
+|x-linode-cli-color           | property    | If present, defines key-value pairs of property value: color.  Colors must be one of      |
+|                             |             | "red", "green", "yellow", "white", and "black".  Must include a default.                  |
 +-----------------------------+-------------+-------------------------------------------------------------------------------------------+
 |x-linode-cli-command         | path        | The command name for operations under this path. If not present, "default" is used.       |
 +-----------------------------+-------------+-------------------------------------------------------------------------------------------+

linodecli/response.py

@@ -4,7 +4,58 @@
 """
 from __future__ import print_function
 
-from colorclass import Color
+import os
+import platform
+
+DO_COLORS = True
+# !! Windows compatibility for ANSI color codes !!
+#
+# If we're running on windows, we need to run the "color" command to enable
+# ANSI color code support.
+if platform.system() == "Windows":
+    ver = platform.version()
+
+    if '.' in ver:
+        ver = ver.split('.', 1)[0]
+
+    try:
+        verNum = int(ver)
+    except ValueError:
+        DO_COLORS = False
+
+    # windows 10+ supports ANSI color codes after running the 'color' command to
+    # properly set up the command prompt.  Older versions of windows do not, and
+    # we should not attempt to use them there.
+    if verNum >= 10:
+        os.system("color")
+    else:
+        DO_COLORS = False
+
+
+CLEAR_COLOR = "\x1b[0m"
+COLOR_CODE_MAP = {
+    "red": "\x1b[31m",
+    "green": "\x1b[32m",
+    "yellow": "\x1b[33m",
+    "black": "\x1b[30m",
+    "white": "\x1b[40m",
+}
+
+
+def colorize_string(string, color):
+    """
+    Returns the requested string, wrapped in ANSI color codes to colorize it as
+    requested.  On platforms where colors are not supported, this just returns
+    the string passed into it.
+    """
+    if not DO_COLORS:
+        return string
+
+    col = COLOR_CODE_MAP.get(color, CLEAR_COLOR)
+
+    return "{}{}{}".format(
+        col, string, CLEAR_COLOR,
+    )
 
 
 class ModelAttr:
@@ -51,7 +102,7 @@ def render_value(self, model, colorize=True):
             # apply colors
             value = str(value) # just in case
             color = self.color_map.get(value) or self.color_map['default_']
-            value = str(Color('{'+color+'}'+value+'{/'+color+'}'))
+            value = colorize_string(value, color)
 
         if value is None:
             # don't print the word "None"

requirements.txt

@@ -1,5 +1,4 @@
 terminaltables
-colorclass
 requests
 PyYAML
 enum34; python_version < '3.4'

setup.py

@@ -49,7 +49,6 @@ def get_version():
     license="BSD 3-Clause License",
     install_requires=[
         "terminaltables",
-        "colorclass",
         "requests",
         "PyYAML",
         "future; python_version <= '3.0.0'"