taskfile 0.3.76__tar.gz → 0.3.78__tar.gz

taskfile-0.3.78/LICENSE

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

{taskfile-0.3.76/src/taskfile.egg-info → taskfile-0.3.78}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: taskfile
-Version: 0.3.76
+Version: 0.3.78
 Summary: Universal Taskfile runner with multi-environment deploy support. CI/CD agnostic — run locally or from any pipeline.
 Author-email: Tom Sapletta <tom@sapletta.com>
 License-Expression: Apache-2.0

{taskfile-0.3.76 → taskfile-0.3.78}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "taskfile"
-version = "0.3.76"
+version = "0.3.78"
 description = "Universal Taskfile runner with multi-environment deploy support. CI/CD agnostic — run locally or from any pipeline."
 readme = "README.md"
 license = "Apache-2.0"

{taskfile-0.3.76 → taskfile-0.3.78}/src/taskfile/__init__.py

@@ -12,7 +12,7 @@ Features:
     - @remote SSH command execution
 """
 
-__version__ = "0.3.76"
+__version__ = "0.3.78"
 __author__ = "Softreck"
 
 from taskfile.runner import TaskfileRunner

{taskfile-0.3.76 → taskfile-0.3.78}/src/taskfile/api/app.py

@@ -568,25 +568,7 @@ def _run_doctor(
 
     diagnostics = ProjectDiagnostics()
 
-    # Layer 1: Preflight
-    diagnostics.check_preflight()
-    # Layer 2: Validation
-    diagnostics.check_taskfile()
-    # Layer 3: Diagnostics
-    diagnostics.check_env_files()
-    diagnostics.validate_taskfile_variables()
-    diagnostics.check_placeholder_values()
-    diagnostics.check_dependent_files()
-    diagnostics.check_ports()
-    diagnostics.check_docker()
-    diagnostics.check_registry_access()
-    diagnostics.check_ssh_keys()
-    diagnostics.check_git()
-    # Layer 3+: verbose checks
-    if verbose:
-        diagnostics.check_task_commands()
-        diagnostics.check_ssh_connectivity()
-        diagnostics.check_remote_health()
+    diagnostics.run_all_checks(verbose=verbose)
 
     # Layer 4: Auto-fix
     fixed_count = 0

{taskfile-0.3.76 → taskfile-0.3.78}/src/taskfile/cli/interactive/wizards.py

@@ -264,25 +264,7 @@ curl -X POST http://localhost:8000/doctor -H "Content-Type: application/json" \
         ))
 
     with console.status("[bold green]Checking project...[/]" if not remote else "[bold green]Checking remote server...[/]") if not report else _nullcontext():
-        # Layer 1: Preflight
-        diagnostics.check_preflight()
-        # Layer 2: Validation
-        diagnostics.check_taskfile()
-        # Layer 3: Diagnostics
-        diagnostics.check_env_files()
-        diagnostics.validate_taskfile_variables()
-        diagnostics.check_placeholder_values()
-        diagnostics.check_dependent_files()
-        diagnostics.check_ports()
-        diagnostics.check_docker()
-        diagnostics.check_registry_access()
-        diagnostics.check_ssh_keys()
-        diagnostics.check_git()
-        # Layer 3+: Task command checks and remote health (if verbose or remote)
-        if verbose or remote:
-            diagnostics.check_task_commands()
-            diagnostics.check_ssh_connectivity()
-            diagnostics.check_remote_health()
+        diagnostics.run_all_checks(verbose=verbose, remote=remote)
         # Remote-only: extended remote diagnostics
         if remote:
             _run_remote_diagnostics(diagnostics)

{taskfile-0.3.76 → taskfile-0.3.78}/src/taskfile/deploy_recipes.py

@@ -41,6 +41,7 @@ def expand_deploy_recipe(deploy_section: dict[str, Any], variables: dict[str, st
     health_retries = deploy_section.get("health_retries", 5)
     health_delay = deploy_section.get("health_delay", 5)
     rollback_mode = deploy_section.get("rollback", "manual")  # auto | manual
+    restart_delay = deploy_section.get("restart_delay", 3)  # seconds between stop→start
     tag_var = "${TAG}"
 
     tasks: dict[str, dict] = {}
@@ -86,16 +87,34 @@ def expand_deploy_recipe(deploy_section: dict[str, Any], variables: dict[str, st
             "cmds": [f"echo 'All images pushed to {registry}'"],
         }
 
+    # ── Validate deploy artifacts (pre-deploy gate) ──
+    tasks["validate-deploy"] = {
+        "desc": "Validate deploy artifacts — check for unresolved variables and placeholders",
+        "tags": ["ci", "validate"],
+        "silent": True,
+        "cmds": [
+            '@python from taskfile.diagnostics.checks import check_deploy_artifacts; '
+            'from taskfile.parser import find_taskfile, load_taskfile; '
+            'cfg = load_taskfile(find_taskfile()); '
+            'issues = check_deploy_artifacts(cfg); '
+            '[print(f"ERROR: {i.message}") for i in issues if i.severity == "error"]; '
+            '[print(f"WARN: {i.message}") for i in issues]; '
+            'exit(1) if any(i.severity == "error" for i in issues) else None',
+        ],
+    }
+
     # ── Deploy task (strategy-specific) ──
     push_dep = "push-all" if len(images) > 1 else f"push-{list(images)[0]}" if images else None
-    deploy_deps = [push_dep] if push_dep else []
+    deploy_deps = ["validate-deploy"]
+    if push_dep:
+        deploy_deps.insert(0, push_dep)
 
     if strategy == "compose":
         tasks["deploy"] = _compose_deploy(deploy_deps)
     elif strategy == "quadlet":
-        tasks["deploy"] = _quadlet_deploy(deploy_deps, images, registry, tag_var)
+        tasks["deploy"] = _quadlet_deploy(deploy_deps, images, registry, tag_var, restart_delay)
     elif strategy == "ssh-push":
-        tasks["deploy"] = _ssh_push_deploy(deploy_deps, images, registry, tag_var)
+        tasks["deploy"] = _ssh_push_deploy(deploy_deps, images, registry, tag_var, restart_delay)
     else:
         tasks["deploy"] = _compose_deploy(deploy_deps)
 
@@ -111,6 +130,16 @@ def expand_deploy_recipe(deploy_section: dict[str, Any], variables: dict[str, st
         ],
     }
 
+    # ── Post-deploy health gate ──
+    tasks["post-deploy"] = {
+        "desc": "Post-deploy health gate — verify all services are healthy after deploy",
+        "tags": ["deploy", "health"],
+        "silent": True,
+        "retries": health_retries,
+        "retry_delay": health_delay,
+        "cmds": _post_deploy_health_cmds(images, health_check, registry, tag_var),
+    }
+
     # ── Rollback ──
     if images:
         rollback_cmds = []
@@ -118,7 +147,9 @@ def expand_deploy_recipe(deploy_section: dict[str, Any], variables: dict[str, st
             image_var = f"{registry}/{svc_name}:{tag_var}"
             rollback_cmds.append(f"@remote podman pull {image_var}")
         for svc_name in images:
-            rollback_cmds.append(f"@remote systemctl --user restart ${{APP_NAME}}-{svc_name}")
+            rollback_cmds.extend(
+                _graceful_restart_cmds(svc_name, restart_delay)
+            )
         tasks["rollback"] = {
             "desc": "Rollback to specified version (--var TAG=<prev>)",
             "tags": ["deploy", "rollback"],
@@ -128,6 +159,38 @@ def expand_deploy_recipe(deploy_section: dict[str, Any], variables: dict[str, st
     return tasks
 
 
+def _graceful_restart_cmds(svc_name: str, restart_delay: int = 3) -> list[str]:
+    """Generate graceful restart commands for a single service.
+
+    Pattern: stop → sleep(delay) → start
+    This avoids the hard restart that causes dropped connections.
+    The delay allows in-flight requests to complete.
+    """
+    return [
+        f"@remote systemctl --user stop ${{APP_NAME}}-{svc_name}",
+        f"sleep {restart_delay}",
+        f"@remote systemctl --user start ${{APP_NAME}}-{svc_name}",
+    ]
+
+
+def _post_deploy_health_cmds(
+    images: dict, health_check: str, registry: str, tag_var: str,
+) -> list[str]:
+    """Generate post-deploy health verification commands."""
+    cmds: list[str] = []
+    # Check each service container is running
+    for svc_name in images:
+        cmds.append(
+            f"@remote systemctl --user is-active --quiet ${{APP_NAME}}-{svc_name} "
+            f"&& echo '{svc_name}: running' || (echo '{svc_name}: NOT RUNNING' && exit 1)"
+        )
+    # Check HTTP health endpoint
+    cmds.append(
+        f"curl -sf https://${{DOMAIN}}{health_check} && echo 'Health: OK' || exit 1"
+    )
+    return cmds
+
+
 def _compose_deploy(deps: list[str]) -> dict:
     """Generate compose-based deploy task."""
     return {
@@ -143,8 +206,11 @@ def _compose_deploy(deps: list[str]) -> dict:
     }
 
 
-def _quadlet_deploy(deps: list[str], images: dict, registry: str, tag_var: str) -> dict:
-    """Generate Quadlet-based deploy task."""
+def _quadlet_deploy(
+    deps: list[str], images: dict, registry: str, tag_var: str,
+    restart_delay: int = 3,
+) -> dict:
+    """Generate Quadlet-based deploy task with graceful restart."""
     cmds = [
         "taskfile quadlet generate",
         "taskfile quadlet upload",
@@ -153,12 +219,13 @@ def _quadlet_deploy(deps: list[str], images: dict, registry: str, tag_var: str)
     for svc_name in images:
         image_var = f"{registry}/{svc_name}:{tag_var}"
         cmds.append(f"@remote podman pull {image_var}")
+    # Graceful restart: stop → delay → start (one service at a time)
     for svc_name in images:
-        cmds.append(f"@remote systemctl --user restart ${{APP_NAME}}-{svc_name}")
+        cmds.extend(_graceful_restart_cmds(svc_name, restart_delay))
     cmds.append("@remote podman image prune -f")
 
     return {
-        "desc": "Deploy via Podman Quadlet (generate → upload → pull → restart)",
+        "desc": "Deploy via Podman Quadlet (generate → upload → pull → graceful restart)",
         "deps": deps,
         "tags": ["ci", "deploy"],
         "retries": 2,
@@ -168,18 +235,22 @@ def _quadlet_deploy(deps: list[str], images: dict, registry: str, tag_var: str)
     }
 
 
-def _ssh_push_deploy(deps: list[str], images: dict, registry: str, tag_var: str) -> dict:
-    """Generate simple SSH pull+restart deploy task."""
+def _ssh_push_deploy(
+    deps: list[str], images: dict, registry: str, tag_var: str,
+    restart_delay: int = 3,
+) -> dict:
+    """Generate simple SSH pull+graceful restart deploy task."""
     cmds = []
     for svc_name in images:
         image_var = f"{registry}/{svc_name}:{tag_var}"
         cmds.append(f"@remote podman pull {image_var}")
+    # Graceful restart: stop → delay → start (one service at a time)
     for svc_name in images:
-        cmds.append(f"@remote systemctl --user restart ${{APP_NAME}}-{svc_name}")
+        cmds.extend(_graceful_restart_cmds(svc_name, restart_delay))
     cmds.append("@remote podman image prune -f")
 
     return {
-        "desc": "Deploy via SSH (pull + restart)",
+        "desc": "Deploy via SSH (pull + graceful restart)",
         "deps": deps,
         "tags": ["ci", "deploy"],
         "retries": 1,

{taskfile-0.3.76 → taskfile-0.3.78}/src/taskfile/diagnostics/__init__.py

@@ -31,6 +31,9 @@ from taskfile.diagnostics.checks import (
     check_task_commands,
     check_examples,
     check_placeholder_values,
+    check_deploy_artifacts,
+    _check_ufw_forward_policy,
+    _check_container_dns,
     validate_before_run,
 )
 from taskfile.diagnostics.fixes import apply_fixes, apply_single_fix
@@ -168,10 +171,60 @@ class ProjectDiagnostics:
         if config:
             self._add_issues(check_remote_health(config))
 
+    def check_deploy_artifacts(self) -> None:
+        """Scan deploy/ directory for unresolved variables and placeholders."""
+        config = self._load_config()
+        if config:
+            self._add_issues(check_deploy_artifacts(config))
+
+    def check_ufw_forward_policy(self) -> None:
+        """Check if UFW default FORWARD policy is set to ACCEPT (needed for containers)."""
+        self._add_issues(_check_ufw_forward_policy())
+
+    def check_container_dns(self) -> None:
+        """Check if Podman bridge network DNS resolves external domains."""
+        self._add_issues(_check_container_dns())
+
+    # ─── Composite pipelines ───
+
+    def run_all_checks(self, *, verbose: bool = False, remote: bool = False) -> None:
+        """Run Layers 1-3 checks — single entry point for doctor pipeline.
+
+        This replaces the duplicated check sequences in wizards.py and api/app.py.
+
+        Args:
+            verbose: Include expensive checks (task commands, SSH connectivity, remote health)
+            remote: Include container infrastructure checks (UFW, DNS)
+        """
+        # Layer 1: Preflight
+        self.check_preflight()
+        # Layer 2: Validation
+        self.check_taskfile()
+        # Layer 3: Diagnostics
+        self.check_env_files()
+        self.validate_taskfile_variables()
+        self.check_placeholder_values()
+        self.check_dependent_files()
+        self.check_ports()
+        self.check_docker()
+        self.check_registry_access()
+        self.check_ssh_keys()
+        self.check_git()
+        self.check_deploy_artifacts()
+        # Layer 3+: expensive checks (verbose or remote)
+        if verbose or remote:
+            self.check_task_commands()
+            self.check_ssh_connectivity()
+            self.check_remote_health()
+        # Infra checks for container deployments
+        if remote or verbose:
+            self.check_ufw_forward_policy()
+            self.check_container_dns()
+
     # ─── Layer 4: Algorithmic fix ───
 
-    def auto_fix(self) -> int:
-        fixed_count = apply_fixes(self._issues)
+    def auto_fix(self, *, interactive: bool = False) -> int:
+        fixed_count = apply_fixes(self._issues, interactive=interactive)
         # Remove fixed issues from legacy list
         fixed_msgs = {i.message for i in self._issues if i.context and i.context.get("_fixed")}
         self.issues = [(m, s, f) for m, s, f in self.issues if m not in fixed_msgs]
@@ -257,6 +310,7 @@ __all__ = [
     "check_task_commands",
     "check_examples",
     "check_placeholder_values",
+    "check_deploy_artifacts",
     "apply_fixes",
     "apply_single_fix",
     "print_report",