From 3f00f8feed5b2db00d25aa92eced16e21f0118cd Mon Sep 17 00:00:00 2001
From: checktheroads <matt@allroads.io>
Date: Sun, 16 Feb 2020 00:51:31 -0700
Subject: [PATCH] add more cli fanciness

---
 hyperglass/cli/commands.py | 28 ++++++++++++++++++++++++++--
 hyperglass/cli/static.py   |  2 ++
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/hyperglass/cli/commands.py b/hyperglass/cli/commands.py
index 4fd1541..7aadc1d 100644
--- a/hyperglass/cli/commands.py
+++ b/hyperglass/cli/commands.py
@@ -7,7 +7,7 @@ from pathlib import Path
 
 # Third Party
 import inquirer
-from click import group, option, confirm
+from click import group, option, confirm, help_option
 
 # Project
 from hyperglass.cli.echo import error, label, cmd_help
@@ -21,13 +21,36 @@ WORKING_DIR = Path(__file__).parent
 supports_color = "utf" in sys.getfilesystemencoding().lower()
 
 
+def _print_version(ctx, param, value):
+    from hyperglass import __version__
+
+    if not value or ctx.resilient_parsing:
+        return
+    label("hyperglass version: {v}", v=__version__)
+    ctx.exit()
+
+
 @group(
     cls=HelpColorsGroup,
     help=CLI_HELP,
-    context_settings={"color": supports_color},
+    context_settings={"help_option_names": ["-h", "--help"], "color": supports_color},
     help_headers_color=LABEL,
     help_options_custom_colors=random_colors("build-ui", "start", "secret", "setup"),
 )
+@option(
+    "-v",
+    "--version",
+    is_flag=True,
+    callback=_print_version,
+    expose_value=False,
+    is_eager=True,
+    help=cmd_help(E.NUMBERS, "hyperglass version", supports_color),
+)
+@help_option(
+    "-h",
+    "--help",
+    help=cmd_help(E.FOLDED_HANDS, "Show this help message", supports_color),
+)
 def hg():
     """Initialize Click Command Group."""
     pass
@@ -57,6 +80,7 @@ def start(build):
     try:
         from hyperglass.api import start, ASGI_PARAMS
     except ImportError as e:
+        raise Exception(str(e))
         error("Error importing hyperglass: {e}", e=e)
 
     if build:
diff --git a/hyperglass/cli/static.py b/hyperglass/cli/static.py
index 406dd7d..0e0b0ab 100644
--- a/hyperglass/cli/static.py
+++ b/hyperglass/cli/static.py
@@ -36,6 +36,8 @@ class Emoji:
     ERROR = "\U0000274C "
     WARNING = "\U000026A0\U0000FE0F  "
     TOOLBOX = "\U0001F9F0 "
+    NUMBERS = "\U0001F522 "
+    FOLDED_HANDS = "\U0001F64F "
     ROCKET = "\U0001F680 "
     SPARKLES = "\U00002728 "
     PAPERCLIP = "\U0001F4CE "