clockify-export 0.3.0__tar.gz → 0.3.1__tar.gz

{clockify_export-0.3.0 → clockify_export-0.3.1}/CHANGELOG.md

@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.2.1]
+
+### Fixed
+- `--install-systemd` now uses the path of the running executable when writing the systemd service.
+
 ## [0.2.0]
 
 ### Added

{clockify_export-0.3.0 → clockify_export-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: clockify-export
-Version: 0.3.0
+Version: 0.3.1
 Summary: Export Clockify time entries to CSV with incremental support
 Project-URL: Homepage, https://github.com/ptandler/clockify-export
 Project-URL: Repository, https://github.com/ptandler/clockify-export
@@ -138,6 +138,7 @@ clockify-export --install-systemd
 ```
 
 This copies the bundled service/timer into `~/.config/systemd/user/` and enables the timer.
+The installed service writes the currently resolved `clockify-export` executable path, so installs in a different directory still work correctly.
 
 See below for other options.
 

{clockify_export-0.3.0 → clockify_export-0.3.1}/README.md

@@ -112,6 +112,7 @@ clockify-export --install-systemd
 ```
 
 This copies the bundled service/timer into `~/.config/systemd/user/` and enables the timer.
+The installed service writes the currently resolved `clockify-export` executable path, so installs in a different directory still work correctly.
 
 See below for other options.
 

{clockify_export-0.3.0 → clockify_export-0.3.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "clockify-export"
-version = "0.3.0"
+version = "0.3.1"
 description = "Export Clockify time entries to CSV with incremental support"
 readme = "README.md"
 requires-python = ">=3.11"

clockify_export-0.3.1/src/clockify_export/systemd_install.py

@@ -0,0 +1,55 @@
+"""Helpers for installing the daily systemd timer for clockify-export."""
+
+from __future__ import annotations
+
+import shutil
+import subprocess
+import sys
+from pathlib import Path
+
+
+def _resolve_clockify_export_binary() -> str:
+    """Return the executable path for the installed clockify-export command."""
+    executable = shutil.which("clockify-export")
+    if executable:
+        return executable
+
+    # If the tool was installed in a managed environment without a PATH entry
+    # available to systemd, try common pipx locations as a fallback.
+    for candidate in (
+        Path.home() / ".local" / "bin" / "clockify-export",
+        Path.home() / ".local" / "share" / "mise" / "installs" / "pipx-clockify-export" / "latest" / "bin" / "clockify-export",
+        Path.home() / ".local" / "share" / "pipx" / "venvs" / "clockify-export" / "bin" / "clockify-export",
+        Path.home() / ".local" / "share" / "uv" / "tools" / "clockify-export" / "bin" / "clockify-export",
+    ):
+        if candidate.exists():
+            return str(candidate)
+
+    return "clockify-export"
+
+
+def install_systemd_user_units() -> None:
+    """Install the user systemd timer and service for daily exports."""
+    target_dir = Path.home() / ".config" / "systemd" / "user"
+    target_dir.mkdir(parents=True, exist_ok=True)
+
+    bundled_dir = Path(__file__).resolve().parent / "systemd"
+    service_source = (bundled_dir / "clockify-export.service").read_text(encoding="utf-8")
+    service_source = service_source.replace("ExecStart=%h/.local/bin/clockify-export", f"ExecStart={_resolve_clockify_export_binary()}")
+    (target_dir / "clockify-export.service").write_text(service_source, encoding="utf-8")
+    (target_dir / "clockify-export.timer").write_text(
+        (bundled_dir / "clockify-export.timer").read_text(encoding="utf-8"),
+        encoding="utf-8",
+    )
+
+    for command in (
+        ["systemctl", "--user", "daemon-reload"],
+        ["systemctl", "--user", "enable", "--now", "clockify-export.timer"],
+    ):
+        try:
+            subprocess.run(command, check=True, capture_output=True, text=True)
+        except (FileNotFoundError, subprocess.CalledProcessError) as exc:
+            print(f"Warning: unable to run {' '.join(command)}: {exc}", file=sys.stderr)
+
+    print(f"Installed systemd user units in {target_dir}")
+    print("Use: systemctl --user status clockify-export.timer")

{clockify_export-0.3.0 → clockify_export-0.3.1}/tests/test_cli.py

@@ -83,6 +83,19 @@ class TestCLI:
                 assert any(f.name == "clockify-export.service" for f in installed_files)
                 assert any(f.name == "clockify-export.timer" for f in installed_files)
 
+    def test_install_systemd_uses_resolved_cli_path(self, tmp_path):
+        with isolated_env(tmp_path):
+            expected_dir = tmp_path / ".config" / "systemd" / "user"
+            resolved = tmp_path / "custom-bin" / "clockify-export"
+            resolved.parent.mkdir(parents=True)
+            with patch("clockify_export.systemd_install.shutil.which", return_value=str(resolved)):
+                with patch("clockify_export.systemd_install.subprocess.run"):
+                    run_main(["--install-systemd"])
+
+            service_file = expected_dir / "clockify-export.service"
+            content = service_file.read_text(encoding="utf-8")
+            assert f"ExecStart={resolved}" in content
+
     def test_missing_api_key_exits(self, capsys, tmp_path):
         with isolated_env(tmp_path) as config_dir:
             with patch("clockify_export.config.CONFIG_DIR", config_dir):

{clockify_export-0.3.0 → clockify_export-0.3.1}/uv.lock

@@ -4,7 +4,7 @@ requires-python = ">=3.11"
 
 [[package]]
 name = "clockify-export"
-version = "0.3.0"
+version = "0.3.1"
 source = { editable = "." }
 
 [package.optional-dependencies]

clockify_export-0.3.0/src/clockify_export/systemd_install.py

@@ -1,30 +0,0 @@
-"""Helpers for installing the daily systemd timer for clockify-export."""
-
-from __future__ import annotations
-
-import subprocess
-import sys
-from pathlib import Path
-
-
-def install_systemd_user_units() -> None:
-    """Install the user systemd timer and service for daily exports."""
-    target_dir = Path.home() / ".config" / "systemd" / "user"
-    target_dir.mkdir(parents=True, exist_ok=True)
-
-    bundled_dir = Path(__file__).resolve().parent / "systemd"
-    for target_name in ("clockify-export.service", "clockify-export.timer"):
-        source = bundled_dir / target_name
-        (target_dir / target_name).write_text(source.read_text(encoding="utf-8"), encoding="utf-8")
-
-    for command in (
-        ["systemctl", "--user", "daemon-reload"],
-        ["systemctl", "--user", "enable", "--now", "clockify-export.timer"],
-    ):
-        try:
-            subprocess.run(command, check=True, capture_output=True, text=True)
-        except (FileNotFoundError, subprocess.CalledProcessError) as exc:
-            print(f"Warning: unable to run {' '.join(command)}: {exc}", file=sys.stderr)
-
-    print(f"Installed systemd user units in {target_dir}")
-    print("Use: systemctl --user status clockify-export.timer")