From fdea9812c10c2b649684bdb715e028bcca350df1 Mon Sep 17 00:00:00 2001
From: Christopher Gallo <chrisagallo@gmail.com>
Date: Wed, 19 Jul 2023 10:19:12 -0500
Subject: [PATCH 1/2] #2046 fixed secondary options not showing up in the help
 message, colored the vs placementgroup and vs capacity commands

---
 SoftLayer/CLI/command.py                      | 24 ++++++++++++++-----
 SoftLayer/CLI/virt/capacity/__init__.py       |  7 +++++-
 SoftLayer/CLI/virt/placementgroup/__init__.py |  7 +++++-
 SoftLayer/utils.py                            |  6 ++---
 4 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/SoftLayer/CLI/command.py b/SoftLayer/CLI/command.py
index b38f89d7c..39a8aa2f2 100644
--- a/SoftLayer/CLI/command.py
+++ b/SoftLayer/CLI/command.py
@@ -28,6 +28,7 @@ class OptionHighlighter(RegexHighlighter):
         r"(?P<option>\-\-[\w\-]+)",  # long options like --verbose
         r"(?P<default_option>\[[^\]]+\])",  # anything between [], usually default options
         r"(?P<option_choices>Choices: )",
+        r"(?P<args_keyword>^[A-Z]+$)",
     ]
 
 
@@ -177,6 +178,8 @@ def format_usage(self, ctx: click.Context, formatter: click.formatting.HelpForma
                 pieces[index] = "[options][OPTIONS][/]"
             elif piece == "COMMAND [ARGS]...":
                 pieces[index] = "[command]COMMAND[/] [args][ARGS][/] ..."
+            else:
+                pieces[index] = f"[args_keyword]{piece}[/]"
 
         self.console.print(f"Usage: [path]{ctx.command_path}[/] {' '.join(pieces)}")
 
@@ -202,16 +205,23 @@ def format_epilog(self, ctx: click.Context, formatter: click.formatting.HelpForm
     def format_options(self, ctx, formatter):
         """Prints out the options in a table format"""
 
-        # NEXT support binary options --yes/--no
-        # NEXT SUPPORT color for IDENTIFIER and such
         options_table = Table(highlight=True, box=box.SQUARE, show_header=False)
 
         for param in self.get_params(ctx):
+            # useful for showing whats in a param
+            # print(param.to_info_dict())
+
+            # Set Arguments to all uppercase
+            if param.param_type_name == 'argument':
+                param.opts[0] = param.opts[0].upper()
+
+            # This option has a short (-v) and long (--verbose) options
             if len(param.opts) == 2:
                 opt1 = self.highlighter(param.opts[1])
                 opt2 = self.highlighter(param.opts[0])
             else:
                 opt2 = self.highlighter(param.opts[0])
+                # Needs to be the Text() type because rich.Text doesn't mesh with string
                 opt1 = Text("")
 
             # Ensures the short option is always in opt1.
@@ -221,19 +231,21 @@ def format_options(self, ctx, formatter):
             if param.metavar:
                 opt2 += Text(f" {param.metavar}", style="bold yellow")
 
-            options = Text(" ".join(reversed(param.opts)))
+            # secondary_opts are usually for flags --enable/--disable
+            if len(param.secondary_opts) == 1:
+                opt2 += Text(f"|") + self.highlighter(param.secondary_opts[0])
+
             help_record = param.get_help_record(ctx)
             help_message = ""
             if help_record:
-                help_message = param.get_help_record(ctx)[-1]
+                help_message = Text(param.get_help_record(ctx)[-1])
 
             # Add Click choices to help message
             if isinstance(param.type, click.Choice):
                 choices = ", ".join(param.type.choices)
                 help_message += f" Choices: {choices}"
 
-            if param.metavar:
-                options += f" {param.metavar}"
+
             options_table.add_row(opt1, opt2, self.highlighter(help_message))
 
         self.console.print(options_table)
diff --git a/SoftLayer/CLI/virt/capacity/__init__.py b/SoftLayer/CLI/virt/capacity/__init__.py
index 21ff940ad..a7ddb3162 100644
--- a/SoftLayer/CLI/virt/capacity/__init__.py
+++ b/SoftLayer/CLI/virt/capacity/__init__.py
@@ -5,12 +5,14 @@
 import os
 
 import click
+from SoftLayer.CLI.command import CommandLoader
+from SoftLayer.CLI.command import OptionHighlighter
 
 CONTEXT = {'help_option_names': ['-h', '--help'],
            'max_content_width': 999}
 
 
-class CapacityCommands(click.MultiCommand):
+class CapacityCommands(CommandLoader):
     """Loads module for capacity related commands.
 
     Will automatically replace _ with - where appropriate.
@@ -21,6 +23,9 @@ class CapacityCommands(click.MultiCommand):
     def __init__(self, **attrs):
         click.MultiCommand.__init__(self, **attrs)
         self.path = os.path.dirname(__file__)
+        self.highlighter = OptionHighlighter()
+        self.env = None
+        self.console = None
 
     def list_commands(self, ctx):
         """List all sub-commands."""
diff --git a/SoftLayer/CLI/virt/placementgroup/__init__.py b/SoftLayer/CLI/virt/placementgroup/__init__.py
index 1aa89a16e..4efffaf48 100644
--- a/SoftLayer/CLI/virt/placementgroup/__init__.py
+++ b/SoftLayer/CLI/virt/placementgroup/__init__.py
@@ -5,12 +5,14 @@
 import os
 
 import click
+from SoftLayer.CLI.command import CommandLoader
+from SoftLayer.CLI.command import OptionHighlighter
 
 CONTEXT = {'help_option_names': ['-h', '--help'],
            'max_content_width': 999}
 
 
-class PlacementGroupCommands(click.MultiCommand):
+class PlacementGroupCommands(CommandLoader):
     """Loads module for placement group related commands.
 
     Currently the base command loader only supports going two commands deep.
@@ -20,6 +22,9 @@ class PlacementGroupCommands(click.MultiCommand):
     def __init__(self, **attrs):
         click.MultiCommand.__init__(self, **attrs)
         self.path = os.path.dirname(__file__)
+        self.highlighter = OptionHighlighter()
+        self.env = None
+        self.console = None
 
     def list_commands(self, ctx):
         """List all sub-commands."""
diff --git a/SoftLayer/utils.py b/SoftLayer/utils.py
index 136decced..0c569faf4 100644
--- a/SoftLayer/utils.py
+++ b/SoftLayer/utils.py
@@ -474,7 +474,7 @@ def decode_stacked(document, pos=0, decoder=JSONDecoder()):
 
 
 def console_color_themes(theme):
-    """Colors in https://rich.readthedocs.io/en/stable/appendix/colors.html?highlight=light_pink1#standard-colors"""
+    """Colors in https://rich.readthedocs.io/en/stable/appendix/colors.html#standard-colors"""
 
     if theme == 'light':
         return Console(theme=Theme(
@@ -490,7 +490,7 @@ def console_color_themes(theme):
                 "switch": "bold green4",
                 "default_option": "light_coral",
                 "option_keyword": "bold dark_cyan",
-                "args_keyword": "bold green4",
+                "args_keyword": "underline orange4",
                 "option_choices": "gold3",
             })
         )
@@ -507,7 +507,7 @@ def console_color_themes(theme):
             "switch": "bold green",
             "default_option": "light_pink1",
             "option_keyword": "bold cyan",
-            "args_keyword": "bold green",
+            "args_keyword": "underline yellow",
             "option_choices": "gold3",
         })
     )

From fdeae2c745fea9ca55b695aa276b32f1c59de339 Mon Sep 17 00:00:00 2001
From: Christopher Gallo <chrisagallo@gmail.com>
Date: Wed, 19 Jul 2023 15:34:33 -0500
Subject: [PATCH 2/2] #2046 tox fixes

---
 SoftLayer/CLI/command.py                      | 3 +--
 SoftLayer/CLI/virt/capacity/__init__.py       | 2 +-
 SoftLayer/CLI/virt/placementgroup/__init__.py | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/SoftLayer/CLI/command.py b/SoftLayer/CLI/command.py
index 39a8aa2f2..2b4b70b22 100644
--- a/SoftLayer/CLI/command.py
+++ b/SoftLayer/CLI/command.py
@@ -233,7 +233,7 @@ def format_options(self, ctx, formatter):
 
             # secondary_opts are usually for flags --enable/--disable
             if len(param.secondary_opts) == 1:
-                opt2 += Text(f"|") + self.highlighter(param.secondary_opts[0])
+                opt2 += Text("|") + self.highlighter(param.secondary_opts[0])
 
             help_record = param.get_help_record(ctx)
             help_message = ""
@@ -245,7 +245,6 @@ def format_options(self, ctx, formatter):
                 choices = ", ".join(param.type.choices)
                 help_message += f" Choices: {choices}"
 
-
             options_table.add_row(opt1, opt2, self.highlighter(help_message))
 
         self.console.print(options_table)
diff --git a/SoftLayer/CLI/virt/capacity/__init__.py b/SoftLayer/CLI/virt/capacity/__init__.py
index a7ddb3162..a6e92ef03 100644
--- a/SoftLayer/CLI/virt/capacity/__init__.py
+++ b/SoftLayer/CLI/virt/capacity/__init__.py
@@ -21,7 +21,7 @@ class CapacityCommands(CommandLoader):
     """
 
     def __init__(self, **attrs):
-        click.MultiCommand.__init__(self, **attrs)
+        CommandLoader.__init__(self, **attrs)
         self.path = os.path.dirname(__file__)
         self.highlighter = OptionHighlighter()
         self.env = None
diff --git a/SoftLayer/CLI/virt/placementgroup/__init__.py b/SoftLayer/CLI/virt/placementgroup/__init__.py
index 4efffaf48..74270c007 100644
--- a/SoftLayer/CLI/virt/placementgroup/__init__.py
+++ b/SoftLayer/CLI/virt/placementgroup/__init__.py
@@ -20,7 +20,7 @@ class PlacementGroupCommands(CommandLoader):
     """
 
     def __init__(self, **attrs):
-        click.MultiCommand.__init__(self, **attrs)
+        CommandLoader.__init__(self, **attrs)
         self.path = os.path.dirname(__file__)
         self.highlighter = OptionHighlighter()
         self.env = None