primitive 0.2.12__tar.gz → 0.2.14__tar.gz

{primitive-0.2.12 → primitive-0.2.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: primitive
-Version: 0.2.12
+Version: 0.2.14
 Project-URL: Documentation, https://github.com//primitivecorp/primitive-cli#readme
 Project-URL: Issues, https://github.com//primitivecorp/primitive-cli/issues
 Project-URL: Source, https://github.com//primitivecorp/primitive-cli

{primitive-0.2.12 → primitive-0.2.14}/src/primitive/__about__.py

@@ -1,4 +1,4 @@
 # SPDX-FileCopyrightText: 2024-present Dylan Stein <dylan@primitive.tech>
 #
 # SPDX-License-Identifier: MIT
-__version__ = "0.2.12"
+__version__ = "0.2.14"

{primitive-0.2.12 → primitive-0.2.14}/src/primitive/daemons/actions.py

@@ -1,13 +1,18 @@
 import platform
+import subprocess
 import typing
-from typing import Dict, Optional, List
+from pathlib import Path
+from typing import Dict, List, Optional
 
 if typing.TYPE_CHECKING:
     from ..client import Primitive
 
+from ..utils.daemons import Daemon
 from .launch_agents import LaunchAgent
 from .launch_service import LaunchService
-from ..utils.daemons import Daemon
+
+HOME_DIRECTORY = Path.home()
+PRIMITIVE_BINARY_PATH = Path(HOME_DIRECTORY / ".pyenv" / "shims" / "primitive")
 
 
 class Daemons:
@@ -15,16 +20,40 @@ class Daemons:
         self.primitive: Primitive = primitive
         self.os_family = platform.system()
 
+        found_primitive_binary_path = PRIMITIVE_BINARY_PATH
+        if not PRIMITIVE_BINARY_PATH.exists():
+            result = subprocess.run(["which", "primitive"], capture_output=True)
+            if result.returncode == 0:
+                found_primitive_binary_path = result.stdout.decode().rstrip("\n")
+            else:
+                raise Exception(
+                    f"primitive binary not found at {PRIMITIVE_BINARY_PATH}"
+                )
+
         match self.os_family:
             case "Darwin":
                 self.daemons: Dict[str, Daemon] = {
-                    "agent": LaunchAgent("tech.primitive.agent"),
-                    "monitor": LaunchAgent("tech.primitive.monitor"),
+                    "agent": LaunchAgent(
+                        "tech.primitive.agent",
+                        executable=str(found_primitive_binary_path),
+                        command="agent --debug",
+                    ),
+                    "monitor": LaunchAgent(
+                        "tech.primitive.monitor",
+                        executable=str(found_primitive_binary_path),
+                        command="monitor --debug",
+                    ),
                 }
             case "Linux":
                 self.daemons: Dict[str, Daemon] = {
-                    "agent": LaunchService("tech.primitive.agent"),
-                    "monitor": LaunchService("tech.primitive.monitor"),
+                    "agent": LaunchService(
+                        "tech.primitive.agent",
+                        command=f'/bin/sh -lc "{found_primitive_binary_path} agent --debug"',
+                    ),
+                    "monitor": LaunchService(
+                        "tech.primitive.monitor",
+                        command=f'/bin/sh -lc "{found_primitive_binary_path} monitor --debug"',
+                    ),
                 }
             case _:
                 raise NotImplementedError(f"{self.os_family} is not supported.")

{primitive-0.2.12 → primitive-0.2.14}/src/primitive/daemons/launch_agents.py

@@ -1,18 +1,21 @@
 import os
-from pathlib import Path
 import subprocess
+from pathlib import Path
+
 from loguru import logger
+
 from ..utils.daemons import Daemon
 
 HOME_DIRECTORY = Path.home()
 CURRENT_USER = str(HOME_DIRECTORY.expanduser()).lstrip("/Users/")
-PRIMITIVE_BINARY_PATH = Path(HOME_DIRECTORY / ".pyenv" / "shims" / "primitive")
 
 
 class LaunchAgent(Daemon):
-    def __init__(self, label: str):
+    def __init__(self, label: str, executable: str, command: str):
         self.label = label
         self.name = label.split(".")[-1]
+        self.executable = executable
+        self.command = command
 
     @property
     def file_path(self) -> Path:
@@ -22,10 +25,6 @@ class LaunchAgent(Daemon):
     def logs(self) -> Path:
         return Path(HOME_DIRECTORY / "Library" / "Logs" / f"{self.label}.log")
 
-    @property
-    def cmd(self) -> str:
-        return self.label.split(".")[-1]
-
     def stop(self, unload: bool = True) -> bool:
         try:
             stop_existing_process = f"launchctl stop {self.label}"
@@ -107,15 +106,6 @@ class LaunchAgent(Daemon):
         self.file_path.parent.mkdir(parents=True, exist_ok=True)
         self.file_path.touch()
 
-        found_primitive_binary_path = PRIMITIVE_BINARY_PATH
-        if not PRIMITIVE_BINARY_PATH.exists():
-            result = subprocess.run(["which", "primitive"], capture_output=True)
-            if result.returncode == 0:
-                found_primitive_binary_path = result.stdout.decode().rstrip("\n")
-            else:
-                logger.error("primitive binary not found")
-                return False
-
         self.file_path.write_text(
             f"""<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
@@ -134,8 +124,8 @@ class LaunchAgent(Daemon):
 	</array>
     <key>ProgramArguments</key>
     <array>
-        <string>{found_primitive_binary_path}</string>
-        <string>{self.cmd}</string>
+        <string>{self.executable}</string>
+        <string>{self.command}</string>
     </array>
     <key>RunAtLoad</key>
     <true/>

{primitive-0.2.12 → primitive-0.2.14}/src/primitive/daemons/launch_service.py

@@ -1,18 +1,20 @@
-import os
 import configparser
+import os
 import subprocess
 from pathlib import Path
+
 from loguru import logger
+
 from ..utils.daemons import Daemon
 
 HOME_DIRECTORY = Path.home()
-PRIMITIVE_BINARY_PATH = Path(HOME_DIRECTORY / ".pyenv" / "shims" / "primitive")
 
 
 class LaunchService(Daemon):
-    def __init__(self, label: str):
+    def __init__(self, label: str, command: str):
         self.label = label
         self.name = label.split(".")[-1]
+        self.command = command
 
     @property
     def service_name(self) -> str:
@@ -119,17 +121,8 @@ class LaunchService(Daemon):
             "After": "network.target",
         }
 
-        found_primitive_binary_path = PRIMITIVE_BINARY_PATH
-        if not PRIMITIVE_BINARY_PATH.exists():
-            result = subprocess.run(["which", "primitive"], capture_output=True)
-            if result.returncode == 0:
-                found_primitive_binary_path = result.stdout.decode().rstrip("\n")
-            else:
-                print("primitive binary not found")
-                return False
-
         config["Service"] = {
-            "ExecStart": f'/bin/sh -lc "{found_primitive_binary_path} agent"',
+            "ExecStart": self.command,
             "Restart": "always",
             "StandardError": f"append:{self.logs}",
             "StandardOutput": f"append:{self.logs}",

{primitive-0.2.12 → primitive-0.2.14}/src/primitive/utils/daemons.py

@@ -1,5 +1,5 @@
-from pathlib import Path
 from abc import ABC, abstractmethod
+from pathlib import Path
 
 
 class Daemon(ABC):