python-dmon 0.2.1__py3-none-any.whl → 0.2.2__py3-none-any.whl

dmon/config.py

@@ -10,79 +10,45 @@ else:
 from .types import CmdType, DmonTaskConfig
 
 
-def find_pyproject_toml(start: Optional[Path] = None):
-    """
-    Search for pyproject.toml from the current directory (or specified directory) upwards.
-    Return a Path object if found.
-    """
-    start = start or Path.cwd()
-    current = start.resolve()
-
-    for parent in [current, *current.parents]:
-        candidate = parent / "pyproject.toml"
-        if candidate.is_file():
-            return candidate
-
-    # raise FileNotFoundError(f"No pyproject.toml found from {start} upwards.")
-
-
-def find_dmon_yaml(start: Optional[Path] = None):
-    """
-    Search for dmon.yaml / dmon.yml from the current directory (or specified directory) upwards.
-    Return a Path object if found.
-    """
-    start = start or Path.cwd()
-    current = start.resolve()
-
-    for parent in [current, *current.parents]:
-        for filename in ["dmon.yaml", "dmon.yml"]:
-            candidate = parent / filename
-            if candidate.is_file():
-                return candidate
-
-    # raise FileNotFoundError(f"No dmon.yaml or dmon.yml found from {start} upwards.")
-
-
 def load_config(cfg_path: Optional[str] = None):
     """
-    Load configuration from the given path, or search for dmon.yaml or pyproject.toml.
+    Load configuration from the given path, or search it from the current working directory upwards.
     """
 
-    # Load configuration from the given path
     if cfg_path:
+        # Load configuration from the given path
         path = Path(cfg_path).resolve()
         if not path.exists():
             raise FileNotFoundError(f"Config file '{path}' does not exist.")
-        if path.suffix in [".yaml", ".yml"]:
-            import yaml
-
-            with path.open("r", encoding="utf-8") as f:
-                cfg = yaml.safe_load(f)
-        elif path.suffix == ".toml":
-            with path.open("rb") as f:
-                cfg = tomllib.load(f)
-            cfg = cfg.get("tool", {}).get("dmon", {})
-        else:
-            raise ValueError("Config file must be YAML (.yaml/.yml) or TOML (.toml)")
-        return cfg, path
-
-    # No path provided, search for dmon.yaml first, then pyproject.toml
-    path = find_dmon_yaml()
-    if path:
-        import yaml
-
-        with path.open("r", encoding="utf-8") as f:
-            cfg = yaml.safe_load(f)
     else:
-        path = find_pyproject_toml()
+        # No path provided, search for config files
+        # starting from the current working directory upwards
+        current = Path.cwd().resolve()
+        path = None
+        for parent in [current, *current.parents]:
+            for filename in ["dmon.yaml", "dmon.yml", "pyproject.toml"]:
+                path = parent / filename
+                if path.is_file():
+                    break
+            else:
+                continue  # Only break out of the inner loop if a file was found
+            break  # Break out of the outer loop if a file was found
         if not path:
             raise FileNotFoundError(
                 "No dmon.yaml or pyproject.toml found in current or any parent directory."
             )
 
+    if path.suffix in [".yaml", ".yml"]:
+        import yaml
+
+        with path.open("r", encoding="utf-8") as f:
+            cfg = yaml.safe_load(f)
+    elif path.suffix == ".toml":
         with path.open("rb") as f:
             cfg = tomllib.load(f)
         cfg = cfg.get("tool", {}).get("dmon", {})
+    else:
+        raise ValueError("Config file must be YAML (.yaml/.yml) or TOML (.toml)")
     return cfg, path
 
 

dmon/control.py

@@ -525,14 +525,14 @@ def print_process_table(metas: List[DmonMeta], full_width: bool = False):
 
 def list_processes(dir: PathType, full_width: bool):
     target_dmon_dir = Path(dir).resolve()
-    metas = []
+    metas: List[DmonMeta] = []
     if target_dmon_dir.exists() and target_dmon_dir.is_dir():
         for meta_file in target_dmon_dir.glob(f"*{META_SUFFIX}"):
             meta = DmonMeta.load(meta_file)
             if meta is not None:
                 metas.append(meta)
     # sort by name (case-insensitive)
-    metas.sort(key=lambda m: m.name.lower())
+    metas.sort(key=lambda m: m.task.lower())
     n_task = len(metas)
     processes = print_process_table(metas, full_width)
     n_proc = len(processes)
@@ -557,6 +557,9 @@ def execute(cfg: DmonTaskConfig):
         env = {**os.environ, **cfg.env}
 
     shell = isinstance(cfg.cmd, str)
+    if ON_WINDOWS and isinstance(cfg.cmd, list) and len(cfg.cmd) > 0:
+        # On Windows, use full path for the executable when shell=False
+        cfg.cmd[0] = shutil.which(cfg.cmd[0]) or cfg.cmd[0]
 
     def signal_handler(signum: int, frame) -> None:
         if ON_WINDOWS and signum == signal.SIGINT:

{python_dmon-0.2.1.dist-info → python_dmon-0.2.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: python-dmon
-Version: 0.2.1
+Version: 0.2.2
 Summary: A lightweight, cross-platform daemon manager that runs any command as a background process.
 Keywords: python-dmon,dmon,daemon,background,detach,process management
 Author: Atomie CHEN
@@ -86,6 +86,9 @@ dmon stop app
 
 # Check task status
 dmon status app
+
+# Execute a task in the foreground (useful for debugging)
+dmon exec app
 ```
 
 If only one task is defined in the config file, you can omit the task name:
@@ -94,6 +97,26 @@ If only one task is defined in the config file, you can omit the task name:
 dmon start
 dmon stop
 dmon status
+dmon exec
+```
+
+You can use `--config` to specify a custom config file:
+
+```sh
+dmon start --config /path/to/dmon.yaml app  # YAML
+dmon start --config /path/to/pyproject.toml app  # or TOML
+```
+
+And yes, you can use `dmon` to run in a nested manner:
+
+```yaml
+tasks:
+  app: ["python", "-u", "server.py"]
+  nested: pwd && dmon exec app  # nest `dmon exec`
+  subdir_task1:
+    cwd: /path/to/dir
+    cmd: ["dmon", "exec", "app"]  # run task defined in another folder
+  subdir_task2: dmon exec app --config /path/to/dir/dmon.yaml  # like above
 ```
 
 

{python_dmon-0.2.1.dist-info → python_dmon-0.2.2.dist-info}/RECORD

@@ -1,14 +1,14 @@
 dmon/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dmon/__main__.py,sha256=wu5N2wk8mvBgyvr2ghmQf4prezAe0_i-p123VVreyYc,62
 dmon/cli.py,sha256=Dqu43_hcsx8iCJXAL1YXqBpp1jFt0Y7qBEr9mYzkAn8,8764
-dmon/config.py,sha256=a7YM4U_iMB1wQ03NpWGAjbX-N-8Rdt9n6XTzKzeGZq4,7566
+dmon/config.py,sha256=Q8TvcYDwUTlL_8bcjxVsA-lLE_AlcSmxYpbnMaCkFrw,6650
 dmon/constants.py,sha256=uJPI66IJvT6vhamqEDeqHjZQS12RxCPe3DD5yCU0UR8,407
-dmon/control.py,sha256=u1sz2MtxHHDqsaFyc7QaG7HFPLnAkser_8riTYxFK1A,17276
+dmon/control.py,sha256=KpGNPPsuAsDNX3FTJxnGNnt9f4Q18omvG42zO1CwTy4,17494
 dmon/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dmon/runner.py,sha256=iyotNIrbO6I_u02EcqwO7R7N3BEBP6b_8eL8yb3zeJQ,6082
 dmon/types.py,sha256=tTVoJzWk-Z8XiZCUt0VE8Z7-URpXMoS54HfVYXhW-0Q,1795
 dmon/utils.py,sha256=zVQC9YNhMQu4hrAp9k2ds2egnbWZZv7S5w8i2oVIPJg,808
-python_dmon-0.2.1.dist-info/WHEEL,sha256=eh7sammvW2TypMMMGKgsM83HyA_3qQ5Lgg3ynoecH3M,79
-python_dmon-0.2.1.dist-info/entry_points.txt,sha256=rad5ugz4K_IyNXS_IrFPu0tS-UXlBCSJRhJv-OWd_yk,45
-python_dmon-0.2.1.dist-info/METADATA,sha256=gIMrWHILmOEnjtU-gZAoYdz8JAOxFYibkos4DYs_ba0,4496
-python_dmon-0.2.1.dist-info/RECORD,,
+python_dmon-0.2.2.dist-info/WHEEL,sha256=eh7sammvW2TypMMMGKgsM83HyA_3qQ5Lgg3ynoecH3M,79
+python_dmon-0.2.2.dist-info/entry_points.txt,sha256=rad5ugz4K_IyNXS_IrFPu0tS-UXlBCSJRhJv-OWd_yk,45
+python_dmon-0.2.2.dist-info/METADATA,sha256=tncJt5ouNhwjFYaGHEKEQgxas34QDLW6IRY1Qd2bO6g,5106
+python_dmon-0.2.2.dist-info/RECORD,,