Expand our own enums.

scripts/neohub_cli.py

@@ -13,7 +13,7 @@ from functools import partial
 from neohubapi.neohub import NeoHub
 from neohubapi.neohub import NeoHubUsageError
 from neohubapi.neostat import NeoStat
-from neohubapi.enums import ScheduleFormat
+from neohubapi.enums import ScheduleFormat, Weekday
 
 
 class Error(Exception):
@@ -210,18 +210,32 @@ class NeoHubCLI(object):
             return f'{raw_result}'
 
         if type(raw_result) != types.SimpleNamespace:
-            raise NeoHubCLIInternalError(
+            if type(raw_result) == dict:
-                    f'Unexpected type {type(raw_result)} in output()')
+                raw_result = types.SimpleNamespace(**raw_result)
+            else:
+                raise NeoHubCLIInternalError(
+                        f'Unexpected type {type(raw_result)} in output()')
 
         return self._output_simplenamespace(raw_result, output_format)
 
+    def _resolve_output_val(self, val):
+        """Return a readable str version of a value.
+           This is mainly so our own enums and objects look readable.
+        """
+        if type(val) in (ScheduleFormat, Weekday):
+            return val.value
+        elif type(val) == NeoStat:
+            return f'[NeoStat: {val.name}]'
+        else:
+            return val
+
     def _output_simplenamespace(self, obj, output_format):
         """Output a types.Simplenamespace object."""
         if output_format == 'list':
             attrs = dict(
                 [(a, getattr(obj, a)) for a in dir(obj)
                     if not a.startswith('_')])
-            return '\n'.join([f'{a}: {attrs[a]}' for a in attrs])
+            return '\n'.join([f'{a}: {self._resolve_output_val(attrs[a])}' for a in attrs])
         else:
             raise NeoHubCLIUsageError(f'Unknown output format {output_format}')