Merge branch 'release/v3.6.12'

Author: szaghi

docs/guide/changelog.md

@@ -4,6 +4,11 @@ All notable changes to FoBiS.py are documented here.
 Versions follow [Semantic Versioning](https://semver.org/).
 Format follows [Keep a Changelog](https://keepachangelog.com/).
 
+## [3.6.12] — 2026-03-16
+### Changed
+- **cli**: Split monolithic cli_parser.py into per-command subpackage
+
+
 ## [3.6.11] — 2026-03-16
 ### Fixed
 - **cliff**: Fix regex and catch-all parser silencing all git-cliff warnings

fobis/__init__.py

@@ -1,6 +1,6 @@
 """FoBiS.py main package"""
 
-__version__ = "3.6.11"
+__version__ = "3.6.12"
 # Copyright (C) 2015  Stefano Zaghi
 #
 # This file is part of FoBiS.py.

fobis/cli/__init__.py

@@ -0,0 +1,46 @@
+"""
+fobis.cli — FoBiS.py CLI sub-package.
+
+This package owns the Typer application and all subcommand definitions.
+Symbols re-exported here preserve the public API that the rest of
+FoBiS.py (and user code) previously imported from ``fobis.cli_parser``.
+"""
+
+# Copyright (C) 2015  Stefano Zaghi
+#
+# This file is part of FoBiS.py.
+#
+# FoBiS.py is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# FoBiS.py is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with FoBiS.py. If not, see <http://www.gnu.org/licenses/>.
+
+from ._app import _normalize_args, app  # noqa: F401
+from ._constants import (  # noqa: F401
+    __compiler_supported__,
+    __extensions_inc__,
+    __extensions_modern__,
+    __extensions_old__,
+    __extensions_parsed__,
+)
+
+# Import command modules to register their @app.command decorators
+from . import build, clean, doctests, fetch, install, rule  # noqa: F401
+
+__all__ = [
+    "app",
+    "_normalize_args",
+    "__extensions_inc__",
+    "__extensions_old__",
+    "__extensions_modern__",
+    "__extensions_parsed__",
+    "__compiler_supported__",
+]

fobis/cli/_app.py

@@ -0,0 +1,106 @@
+"""
+_app.py — Typer application instance, arg normaliser, and namespace factory.
+"""
+
+# Copyright (C) 2015  Stefano Zaghi
+#
+# This file is part of FoBiS.py.
+#
+# FoBiS.py is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# FoBiS.py is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with FoBiS.py. If not, see <http://www.gnu.org/licenses/>.
+
+import argparse
+import re
+
+import typer
+from typing_extensions import Annotated
+
+# ---------------------------------------------------------------------------
+# Argument normaliser — preserves backward compat with argparse-style options
+# ---------------------------------------------------------------------------
+_MULTI_CHAR_OPT = re.compile(r"^-[A-Za-z][A-Za-z0-9_-]+$")
+
+
+def _normalize_args(args):
+    """
+    Normalise FoBiS legacy single-dash long options for Click/Typer.
+
+    Rules applied to each token:
+    - Single-dash multi-char option (-compiler, -mode, -get_output_name)
+      → double-dash with underscores turned to hyphens (--compiler, --mode, --get-output-name)
+    - Double-dash option with underscores (--build_dir, --cflags_heritage)
+      → double-dash with hyphens (--build-dir, --cflags-heritage)
+    - Single-char short options (-f, -m, -q), values, and negative numbers
+      are left unchanged.
+    """
+    result = []
+    for arg in args:
+        if _MULTI_CHAR_OPT.match(arg):
+            result.append("--" + arg[1:].replace("_", "-"))
+        elif arg.startswith("--") and len(arg) > 2:
+            if "=" in arg:
+                opt, val = arg[2:].split("=", 1)
+                result.append("--" + opt.replace("_", "-") + "=" + val)
+            else:
+                result.append("--" + arg[2:].replace("_", "-"))
+        else:
+            result.append(arg)
+    return result
+
+
+# ---------------------------------------------------------------------------
+# Typer application
+# ---------------------------------------------------------------------------
+app = typer.Typer(
+    name="FoBiS.py",
+    help="a Fortran Building System",
+    no_args_is_help=True,
+    add_completion=True,
+    rich_markup_mode=None,
+)
+
+
+def _version_callback(value: bool):
+    if value:
+        from .. import __version__
+        from ..FoBiSConfig import __appname__
+
+        typer.echo(f"{__appname__} {__version__}")
+        raise typer.Exit()
+
+
+@app.callback()
+def _app_callback(
+    ctx: typer.Context,
+    version: Annotated[
+        bool,
+        typer.Option(
+            "--version",
+            "-v",
+            help="Show version and exit.",
+            callback=_version_callback,
+            is_eager=True,
+        ),
+    ] = False,
+):
+    ctx.ensure_object(dict)
+
+
+# ---------------------------------------------------------------------------
+# Namespace factory
+# ---------------------------------------------------------------------------
+
+
+def _ns(**kwargs) -> argparse.Namespace:
+    """Build an argparse.Namespace — preserves the duck-type expected by all downstream code."""
+    return argparse.Namespace(**kwargs)

fobis/cli/_completions.py

@@ -0,0 +1,57 @@
+"""
+_completions.py — Typer autocompletion callbacks for FoBiS.py CLI.
+"""
+
+# Copyright (C) 2015  Stefano Zaghi
+#
+# This file is part of FoBiS.py.
+#
+# FoBiS.py is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# FoBiS.py is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with FoBiS.py. If not, see <http://www.gnu.org/licenses/>.
+
+import typer
+
+from ._constants import __compiler_supported__, __extensions_parsed__
+
+
+def _complete_compiler(incomplete: str):
+    return [c for c in __compiler_supported__ if c.startswith(incomplete.lower())]
+
+
+def _complete_mklib(incomplete: str):
+    return [m for m in ("static", "shared") if m.startswith(incomplete)]
+
+
+def _complete_extensions(incomplete: str):
+    return [e for e in __extensions_parsed__ if e.startswith(incomplete)]
+
+
+def _complete_doctests_preprocessor(incomplete: str):
+    return [p for p in ("cpp", "fpp") if p.startswith(incomplete)]
+
+
+def _complete_fobos_mode(ctx: typer.Context, incomplete: str):
+    import configparser
+    import os
+
+    fobos_path = ctx.params.get("fobos") or "fobos"
+    if not os.path.exists(fobos_path):
+        return []
+    cp = configparser.RawConfigParser()
+    cp.read(fobos_path)
+    if cp.has_option("modes", "modes"):
+        modes = [m.strip() for m in cp.get("modes", "modes").split()]
+        return [m for m in modes if m.startswith(incomplete)]
+    return [
+        s for s in cp.sections() if s.startswith(incomplete) and s not in ("modes", "rules", "dependencies", "project")
+    ]

fobis/cli/_constants.py

@@ -0,0 +1,41 @@
+"""
+_constants.py — file extension and compiler constants for FoBiS.py CLI.
+
+These constants are re-exported from the top-level cli_parser module for
+backward compatibility.
+"""
+
+# Copyright (C) 2015  Stefano Zaghi
+#
+# This file is part of FoBiS.py.
+#
+# FoBiS.py is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# FoBiS.py is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with FoBiS.py. If not, see <http://www.gnu.org/licenses/>.
+
+__extensions_inc__ = [".inc", ".INC", ".h", ".H"]
+__extensions_old__ = [".f", ".F", ".for", ".FOR", ".fpp", ".FPP", ".fortran", ".f77", ".F77"]
+__extensions_modern__ = [".f90", ".F90", ".f95", ".F95", ".f03", ".F03", ".f08", ".F08", ".f2k", ".F2K"]
+__extensions_parsed__ = __extensions_inc__ + __extensions_old__ + __extensions_modern__
+__compiler_supported__ = (
+    "gnu",
+    "intel",
+    "intel_nextgen",
+    "g95",
+    "opencoarrays-gnu",
+    "pgi",
+    "ibm",
+    "nag",
+    "nvfortran",
+    "amd",
+    "custom",
+)