Merge pull request #30 from openSUSE/refactor-cmd-to-packages

Refactor: make commands a package

Author: tomschr

changelog.d/30.refactor.rst

@@ -0,0 +1 @@
+Refactor subcommands into packages

src/docbuild/cli/cmd_build.py src/docbuild/cli/cmd_build/__init__.pysrc/docbuild/cli/cmd_build.py renamed to src/docbuild/cli/cmd_build/__init__.py

@@ -36,9 +36,9 @@
 
 import click
 
-from ..models.doctype import Doctype
-from .callback import validate_doctypes
-from .context import DocBuildContext
+from ...models.doctype import Doctype
+from ..callback import validate_doctypes
+from ..context import DocBuildContext
 
 
 @click.command(

src/docbuild/cli/cmd_c14n.py src/docbuild/cli/cmd_c14n/__init__.pysrc/docbuild/cli/cmd_c14n.py renamed to src/docbuild/cli/cmd_c14n/__init__.py

@@ -2,8 +2,6 @@
 
 import click
 
-from .context import DocBuildContext
-
 
 @click.command(help=__doc__)
 @click.pass_context

src/docbuild/cli/cmd_validate.py src/docbuild/cli/cmd_validate/__init__.pysrc/docbuild/cli/cmd_validate.py renamed to src/docbuild/cli/cmd_validate/__init__.py

@@ -7,9 +7,8 @@
 
 import click
 
-from ..config.app import replace_placeholders
-from .context import DocBuildContext
-from .process_validation import process
+from ..context import DocBuildContext
+from . import process as process_mod
 
 log = logging.getLogger(__name__)
 
@@ -47,6 +46,6 @@ def validate(ctx: click.Context, xmlfiles: tuple | Iterator[Path]) -> None:
 
     log.info('Validating XML configuration files')
 
-    result = asyncio.run(process(context, xmlfiles=xml_files_to_process))
+    result = asyncio.run(process_mod.process(context, xmlfiles=xml_files_to_process))
 
     ctx.exit(result)  # Use the result as the exit code for the CLI

src/docbuild/cli/process_validation.py src/docbuild/cli/cmd_validate/process.pysrc/docbuild/cli/process_validation.py renamed to src/docbuild/cli/cmd_validate/process.py

@@ -9,12 +9,12 @@
 from lxml import etree
 from rich.console import Console
 
-from ..cli.context import DocBuildContext
-from ..config.xml.checks import CheckResult, register_check
-from ..config.xml.stitch import create_stitchfile
-from ..constants import XMLDATADIR
-from ..utils.decorators import RegistryDecorator
-from ..utils.paths import calc_max_len
+from ...config.xml.checks import CheckResult, register_check
+from ...config.xml.stitch import create_stitchfile
+from ...constants import XMLDATADIR
+from ...utils.decorators import RegistryDecorator
+from ...utils.paths import calc_max_len
+from ..context import DocBuildContext
 
 # Cast to help with type checking
 registry: RegistryDecorator = register_check  # type: ignore[assignment]