src/slobs_cli/__about__.py

@@ -1,3 +1,3 @@
 """module for package metadata."""
 
-__version__ = '0.11.3'
+__version__ = '0.11.0'

src/slobs_cli/cli.py

@@ -8,15 +8,6 @@ from . import styles
 from .__about__ import __version__ as version
 
 
-def validate_style(ctx: click.Context, param: click.Parameter, value: str) -> str:
-    """Validate the style option."""
-    if value not in styles.registry:
-        raise click.BadParameter(
-            f"Invalid style '{value}'. Available styles: {', '.join(styles.registry.keys())}"
-        )
-    return value
-
-
 @click.group()
 @click.option(
     '-d',
@@ -52,7 +43,6 @@ def validate_style(ctx: click.Context, param: click.Parameter, value: str) -> st
     show_default=True,
     show_envvar=True,
     help='The style to use for output.',
-    callback=validate_style,
 )
 @click.option(
     '-b',

src/slobs_cli/console.py

@@ -9,9 +9,13 @@ err = Console(stderr=True, style='bold red')
 
 def highlight(ctx: click.Context, text: str) -> str:
     """Highlight text for console output."""
+    if ctx.obj['style'].name == 'no_colour':
+        return text
     return f'[{ctx.obj["style"].highlight}]{text}[/{ctx.obj["style"].highlight}]'
 
 
 def warning(ctx: click.Context, text: str) -> str:
     """Format warning text for console output."""
-    return f'[{ctx.obj["style"].warning}]{text}[/{ctx.obj["style"].warning}]'
+    if ctx.obj['style'].name == 'no_colour':
+        return text
+    return f'[magenta]{text}[/magenta]'

src/slobs_cli/styles.py

@@ -3,15 +3,15 @@
 import os
 from dataclasses import dataclass
 
-registry = {}
+_registry = {}
 
 
 def register_style(cls):
     """Register a style class."""
     key = cls.__name__.lower()
-    if key in registry:
+    if key in _registry:
         raise ValueError(f'Style {key} is already registered.')
-    registry[key] = cls
+    _registry[key] = cls
     return cls
 
 
@@ -19,12 +19,11 @@ def register_style(cls):
 class Style:
     """Base class for styles."""
 
-    name: str
-    border: str
-    header: str
-    cell: str
-    highlight: str
-    warning: str
+    name: str = 'no_colour'
+    border: str | None = None
+    header: str | None = None
+    cell: str | None = None
+    highlight: str | None = None
     no_border: bool = False
 
     def __post_init__(self):
@@ -34,24 +33,6 @@ class Style:
             self.border = None
 
 
-@register_style
-@dataclass
-class Disabled(Style):
-    """Disabled style."""
-
-    name: str = 'disabled'
-    header: str = ''
-    border: str = 'none'
-    cell: str = 'none'
-    highlight: str = 'none'
-    warning: str = 'none'
-
-    def __post__init__(self):
-        """Post-initialization to set default values."""
-        super().__post_init__()
-        os.environ['NO_COLOR'] = '1'
-
-
 @register_style
 @dataclass
 class Red(Style):
@@ -62,7 +43,6 @@ class Red(Style):
     border: str = 'dark_red'
     cell: str = 'red'
     highlight: str = 'red3'
-    warning: str = 'magenta'
 
 
 @register_style
@@ -75,7 +55,6 @@ class Magenta(Style):
     border: str = 'dark_magenta'
     cell: str = 'magenta'
     highlight: str = 'magenta3'
-    warning: str = 'magenta'
 
 
 @register_style
@@ -88,7 +67,6 @@ class Purple(Style):
     border: str = 'purple'
     cell: str = 'medium_orchid'
     highlight: str = 'medium_orchid'
-    warning: str = 'magenta'
 
 
 @register_style
@@ -101,7 +79,6 @@ class Blue(Style):
     border: str = 'dark_blue'
     cell: str = 'blue'
     highlight: str = 'blue3'
-    warning: str = 'magenta'
 
 
 @register_style
@@ -114,7 +91,6 @@ class Cyan(Style):
     border: str = 'dark_cyan'
     cell: str = 'cyan'
     highlight: str = 'cyan3'
-    warning: str = 'magenta'
 
 
 @register_style
@@ -127,7 +103,6 @@ class Green(Style):
     border: str = 'dark_green'
     cell: str = 'green'
     highlight: str = 'green3'
-    warning: str = 'magenta'
 
 
 @register_style
@@ -140,7 +115,6 @@ class Yellow(Style):
     border: str = 'yellow3'
     cell: str = 'wheat1'
     highlight: str = 'yellow3'
-    warning: str = 'magenta'
 
 
 @register_style
@@ -153,7 +127,6 @@ class Orange(Style):
     border: str = 'dark_orange'
     cell: str = 'orange'
     highlight: str = 'orange3'
-    warning: str = 'magenta'
 
 
 @register_style
@@ -166,7 +139,6 @@ class White(Style):
     border: str = 'white'
     cell: str = 'white'
     highlight: str = 'white'
-    warning: str = 'magenta'
 
 
 @register_style
@@ -179,7 +151,6 @@ class Grey(Style):
     border: str = 'grey50'
     cell: str = 'grey70'
     highlight: str = 'grey90'
-    warning: str = 'magenta'
 
 
 @register_style
@@ -192,7 +163,6 @@ class Navy(Style):
     border: str = 'deep_sky_blue4'
     cell: str = 'light_sky_blue3'
     highlight: str = 'light_sky_blue3'
-    warning: str = 'magenta'
 
 
 @register_style
@@ -205,9 +175,12 @@ class Black(Style):
     border: str = 'black'
     cell: str = 'grey30'
     highlight: str = 'grey30'
-    warning: str = 'magenta'
 
 
 def request_style_obj(style_name: str, no_border: bool) -> Style:
     """Request a style object by name."""
-    return registry[style_name.lower()](no_border=no_border)
+    key = style_name.lower()
+    if key not in _registry:
+        os.environ['NO_COLOR'] = '1'  # Disable colour output
+        return Style(no_border=no_border)
+    return _registry[key](no_border=no_border)

src/slobs_cli/util.py

@@ -10,10 +10,6 @@ def check_mark(ctx: click.Context, value: bool, empty_if_false: bool = False) ->
     if empty_if_false and not value:
         return ''
 
-    # rich gracefully handles the absence of colour throughout the rest of the application,
-    # but here we must handle it manually.
-    # If NO_COLOR is set, we return plain text symbols.
-    # Otherwise, we return coloured symbols.
-    if os.getenv('NO_COLOR', '') != '':
+    if os.getenv('NO_COLOR', '') != '' or ctx.obj['style'].name == 'no_colour':
         return '✓' if value else '✗'
     return '✅' if value else '❌'