pac0-cli 0.6.0__py3-none-any.whl → 0.7.0__py3-none-any.whl

pac0/cli/command/run.py

@@ -22,10 +22,12 @@ services = [
 
 
 def _run_service(
+    ctx: typer.Context,
     service: str,
+    tools: list[str],
 ):
     # TODO: check/install tools
-    setup.tool(install=True)
+    setup.tool(ctx, tools)
     # TODO: get app folder
     setup.source()
     # TODO: clone if necessary
@@ -65,30 +67,39 @@ def _call(
 
 
 @app.command(name="1", help="lance le service 01-api-gateway ...")
-def _(): _run_service("01-api-gateway")
+def _(ctx: typer.Context):
+    _run_service("01-api-gateway", ["git"])
 
 @app.command(name='2', help='lance le service 02-esb-central ...')
-def _(): _run_service("02-esb-central")
+def _(ctx: typer.Context):
+    _run_service(ctx, "02-esb-central", ["git", "nats-server"])
 
 @app.command(name='3', help='lance le service 03-controle-formats ...')
-def _(): _run_service("03-controle-formats")
+def _(ctx: typer.Context):
+    _run_service(ctx, "03-controle-formats", ["git"])
 
 @app.command(name='4', help='lance le service 04-validation-metier ...')
-def _(): _run_service("04-validation-metier")
+def _(ctx: typer.Context):
+    _run_service(ctx, "04-validation-metier", ["git"])
 
 @app.command(name='5', help='lance le service 05-conversion-formats ...')
-def _(): _run_service("05-conversion-formats")
+def _(ctx: typer.Context):
+    _run_service(ctx, "05-conversion-formats", ["git"])
 
 @app.command(name='6', help='lance le service 06-annuaire-local ...')
-def _(): _run_service("06-annuaire-local")
+def _(ctx: typer.Context):
+    _run_service(ctx, "06-annuaire-local", ["git"])
 
 @app.command(name='7', help='lance le service 07-routage") ...')
-def _(): _run_service("07-routage")
+def _(ctx: typer.Context):
+    _run_service(ctx, "07-routage", ["git"])
 
 @app.command(name='8', help='lance le service 08-transmission-fiscale ...')
-def _(): _run_service("08-transmission-fiscale")
+def _(ctx: typer.Context):
+    _run_service(ctx, "08-transmission-fiscale", ["git"])
 
 @app.command(name='9', help='lance le service 09-gestion-cycle ...')
-def _(): _run_service("09-gestion-cycle-vie")
+def _(ctx: typer.Context):
+    _run_service(ctx, "09-gestion-cycle-vie", ["git"])
 
 

pac0/cli/command/setup.py

@@ -1,25 +1,58 @@
 import subprocess
 from pathlib import Path
+from typing import Annotated
 
 import typer
 
 from .. import utils
+from ..lib import setup
+from rich.table import Table
+from rich.console import Console
 
 
 app = typer.Typer()
+console = Console()
 
 DEFAULT_REPO_URL = "https://github.com/paxpar-tech/PA_Communautaire"
 
 
 @app.command()
 def tool(
-    install: bool = False,
+    tool: Annotated[list[str], typer.Argument()],
+    install: bool = True,
+    summary: bool = True,
 ):
-    """Vérifie les versions d'outils et les installe si besoin"""
-    typer.echo("Vérification des outils...")
-    # TODO: check dependencies (some pytest)
+    installed_tools: list[setup.SetupTool] = []
+    if tool == ["all"]:
+        tool = [t.name for t in setup.tools]
+    for single_tool in tool:
+        for t in setup.tools:
+            if single_tool in (t.name, ""):
+                installed_tools.append(t)
+                if install:
+                    t.setup()
+                if single_tool != "":
+                    # return only if single tool install, stay for all
+                    break
+        else:
+            if single_tool != "":
+                # only if ask for a specific tool
+                print(f"tool {single_tool} not supported !")
 
-    # raise NotImplementedError()
+    if summary:
+        table = Table(title="installed pp tools")
+
+        table.add_column("tool", style="cyan", no_wrap=True)
+        table.add_column("required", justify="right", style="magenta")
+        table.add_column("installed", justify="right", style="green")
+
+        for t in installed_tools:
+            valid = t.check()
+            table.add_row(
+                t.name, t.version, t.checked_version, style="red" if not valid else None
+            )
+
+        console.print(table)
 
 
 @app.command()

pac0/cli/lib/setup.py

@@ -0,0 +1,202 @@
+from dataclasses import dataclass
+import subprocess
+from packaging.version import Version
+from packaging.specifiers import SpecifierSet
+import re
+
+# cf https://peps.python.org/pep-0440/#version-specifiers
+SPEC_SPECIAL_CHARS = "~=!<>"
+
+# ~=: Compatible release clause
+# ==: Version matching clause
+# !=: Version exclusion clause
+# <=, >=: Inclusive ordered comparison clause
+# <, >: Exclusive ordered comparison clause
+# ===: Arbitrary equality clause
+def _version_strip(version: str | None) -> str:
+    if version:
+        for char in SPEC_SPECIAL_CHARS:
+            version = version.replace(char, "")
+    return version or ""
+
+
+@dataclass
+class SetupTool:
+    name: str
+    version: str | None = None
+    checked_version: str | None = None
+    version_get: str | None = None
+    install: str | None = None
+
+    def _current_version_extract(
+        self,
+    ) -> str:
+        if self.version_get is None:
+            return "0.0.0"
+        try:
+            query = subprocess.run(
+                self.version_get.strip(),
+                shell=True,
+                stdout=subprocess.PIPE,
+                # cwd=cwd,
+                executable="/bin/bash",
+                check=True,
+                #on_error="print_ignore",
+                #extra_envvars=extra_envvars,
+            )
+            version_current = query.stdout.decode().strip()
+        except subprocess.CalledProcessError:
+            return "0.0.0"
+        # print('version_current====', version_current)
+        match = re.search(r"(\d+\.\d+\.\d+)", version_current)
+        self.checked_version = match.group(0) if match else "0.0.0"
+        return self.checked_version
+
+    # see https://packaging.pypa.io/en/stable/specifiers.html#usage
+    def _version_valid(
+        self,
+        version: str | None,
+    ) -> bool:
+        if self.version:
+            version = version or "0.0.0"
+            if self.version[0] in SPEC_SPECIAL_CHARS:
+                v = Version(version)
+                v_spec = SpecifierSet(self.version or "0.0.0")
+                return v in v_spec
+            else:
+                return self.version in version
+        else:
+            return True
+
+    def setup(
+        self,
+    ):
+        version_current = self._current_version_extract()
+        # if version_current is None:
+        if not self._version_valid(version_current) and self.install:
+            print(f"Installing {self.name}{self.version} ...")
+
+            subprocess.run(
+                # run install snippet from /tmp
+                f"""
+                    pushd /tmp
+                    {self.install.format(version=_version_strip(self.version))}
+                    popd
+                """.strip(),
+                shell=True,
+                executable="/bin/bash",
+            )
+            version_current = self._current_version_extract()
+
+    def check(
+        self,
+    ) -> bool:
+        version_current = self._current_version_extract()
+        valid = self._version_valid(version_current)
+        if valid:
+            print(f"{self.name}{self.version} ok (found {version_current})")
+        else:
+            print(
+                f"{self.name}{self.version} not found ! (found {version_current})"
+                )
+        return valid
+
+
+tools: list[SetupTool] = [
+    SetupTool(
+        name="build-essential",
+        version=">=12.10",
+        install="""
+            apt update
+            apt install --yes build-essential
+        """,
+        version_get="""apt show build-essential | grep Version | cut -d: -f2 | xargs""",
+    ),
+    SetupTool(
+        name="git",
+        version=">=2.43.0",
+        install="""
+            apt update
+            apt install --yes git
+        """,
+        version_get="""git -v""",
+    ),
+    SetupTool(
+        name="nats-cli",
+        version=">=0.3.0",
+        install="""
+            wget https://github.com/nats-io/natscli/releases/download/v${version}/nats-${version}-linux-amd64.zip
+            unzip nats-*-linux-amd64.zip
+            mv nats-*-linux-amd64/nats /usr/local/bin/
+            rm -Rf nats-*-linux-amd64*
+        """,
+        version_get="nats --version",
+    ),
+    SetupTool(
+        name="nats-server",
+        version=">=2.12.3",
+        install="""
+            wget https://github.com/nats-io/nats-server/releases/download/v${version}/nats-server-v${version}-linux-amd64.tar.gz
+            tar xvf nats-server-v*-linux-amd64.tar.gz
+            mv nats-server-v*-linux-amd64/nats-server /usr/local/bin/
+            rm -Rf nats-server-v*-linux-amd64*
+        """,
+        version_get="nats-server -v",
+    ),
+    SetupTool(
+        name="hx",
+        version=">=25.07.1",
+        install="""
+            curl -sLO "https://github.com/helix-editor/helix/releases/download/{version}/helix-{version}-x86_64-linux.tar.xz"
+            tar xf helix-{version}-x86_64-linux.tar.xz
+            rm helix-{version}-x86_64-linux.tar.xz
+            sudo mv helix-{version}-x86_64-linux/hx /usr/local/bin/
+            mkdir -p ~/.config/helix/runtime
+            mv helix-{version}-x86_64-linux/runtime ~/.config/helix/runtime
+            rm -Rf helix-{version}-x86_64-linux
+        """,
+        version_get="hx --version",
+    ),
+    SetupTool(
+        name="k9s",
+        version=">=0.50.4",
+        install="""
+            curl -sLO "https://github.com/derailed/k9s/releases/download/v{version}/k9s_Linux_amd64.tar.gz"
+            tar xf k9s_Linux_amd64.tar.gz
+            sudo mv k9s /usr/local/bin/
+        """,
+        version_get="k9s version",
+    ),
+    SetupTool(
+        name="kubectl",
+        # curl -L -s https://dl.k8s.io/release/stable.txt
+        version=">=1.35.0",
+        install="""
+            curl -LO "https://dl.k8s.io/release/v{version}/bin/linux/amd64/kubectl"
+            chmod a+x kubectl
+            sudo mv kubectl /usr/local/bin/
+        """,
+        version_get="""kubectl version --client""",
+    ),
+    SetupTool(
+        name="rclone",
+        version=">=1.69.2",
+        install="""
+            curl -sLO "https://github.com/rclone/rclone/releases/download/v1.69.2/rclone-v1.69.2-linux-amd64.zip"
+            unzip rclone-v1.69.2-linux-amd64.zip
+            sudo mv rclone-v1.69.2-linux-amd64/rclone  /usr/local/bin/
+        """,
+        version_get="""rclone version""",
+    ),
+    SetupTool(
+        name="typst",
+        version=">=0.13.1",
+        install="""
+            curl -LO "https://github.com/typst/typst/releases/download/v{version}/typst-x86_64-unknown-linux-musl.tar.xz"
+            tar xvf typst-x86_64-unknown-linux-musl.tar.xz
+            sudo mv typst-x86_64-unknown-linux-musl/typst /usr/local/bin/
+            rm -Rf typst-x86_64-unknown-linux-musl
+        """,
+        version_get="""typst --version""",
+    ),
+]

{pac0_cli-0.6.0.dist-info → pac0_cli-0.7.0.dist-info}/METADATA

@@ -1,12 +1,13 @@
 Metadata-Version: 2.3
 Name: pac0-cli
-Version: 0.6.0
+Version: 0.7.0
 Summary: Outil en ligne de commande (CLI) du projet PAC
 Author: Philippe ENTZMANN
 Author-email: Philippe ENTZMANN <philippe@entzmann.name>
 Requires-Dist: typer>=0.9.0
 Requires-Dist: textual>=0.70.0
 Requires-Dist: pyyaml>=6.0
+Requires-Dist: packaging>=25.0
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 

{pac0_cli-0.6.0.dist-info → pac0_cli-0.7.0.dist-info}/RECORD

@@ -5,12 +5,13 @@ pac0/cli/command/console/screens/stats.py,sha256=72en91wLKU6XXGFpvHNNvYk5ZfF2vVn
 pac0/cli/command/console/screens/tests.py,sha256=3Sz0pK7TDtA22ewhYCqefAmoHsqZe1QE9ZUrqiH-5l8,1046
 pac0/cli/command/console/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pac0/cli/command/console/widgets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pac0/cli/command/run.py,sha256=jEPQQg7lUuMzf6gbA223p7C_nx-Tbg5reWSRvHRVWVQ,2769
-pac0/cli/command/setup.py,sha256=-QsRwgJlBuApt7JvD1dJkjb1Dh_FV0FJi14ijjns7xM,1259
+pac0/cli/command/run.py,sha256=toZQEdMuirLAZNrAgibcaWIK4mdrzHNaKv7vZdHE3XQ,3147
+pac0/cli/command/setup.py,sha256=0Sdr7akcWTRlMeobxTDKS2CVIFIOCqe5GLVsTftC-BU,2385
 pac0/cli/command/test.py,sha256=J76CpfOIpLD49_0It6UG8uWzoayg8HjmfD3a4LHRihA,198
+pac0/cli/lib/setup.py,sha256=pw7lAceYkF5ex1OfdvJOhM-6fT9OGWHdyfIKwm2xXGo,6722
 pac0/cli/main.py,sha256=efutWmz90cn56p2mrnQv04RxOyQkqp8L9keD8f2s_qE,1128
 pac0/cli/utils.py,sha256=9ZBTpndp0Y8WTUyNtd3AHewYToTHGB9VkUlGTltpCvY,1035
-pac0_cli-0.6.0.dist-info/WHEEL,sha256=XV0cjMrO7zXhVAIyyc8aFf1VjZ33Fen4IiJk5zFlC3g,80
-pac0_cli-0.6.0.dist-info/entry_points.txt,sha256=G1ivGStFhWmI22qni1eUpRnPi-hQhrDGKEpMmISBmzo,126
-pac0_cli-0.6.0.dist-info/METADATA,sha256=dapXGAR5QIT-6S9tIviDDeb5TbRLjFP2Muyk8olFXdA,2133
-pac0_cli-0.6.0.dist-info/RECORD,,
+pac0_cli-0.7.0.dist-info/WHEEL,sha256=XV0cjMrO7zXhVAIyyc8aFf1VjZ33Fen4IiJk5zFlC3g,80
+pac0_cli-0.7.0.dist-info/entry_points.txt,sha256=G1ivGStFhWmI22qni1eUpRnPi-hQhrDGKEpMmISBmzo,126
+pac0_cli-0.7.0.dist-info/METADATA,sha256=mKMxSdu18jVMKXu09Odo1qvC-VHwaxVi1lbcIsjzXI4,2164
+pac0_cli-0.7.0.dist-info/RECORD,,