wip

docs/cli/commands.json

@@ -363,14 +363,14 @@
         "full_cmd": [
           "start"
         ],
-        "usage": "start [NAME]...",
+        "usage": "start [ID]...",
         "subcommands": {},
         "args": [
           {
-            "name": "NAME",
-            "usage": "[NAME]...",
-            "help": "Name of the daemon(s) in pitchfork.toml to start",
-            "help_first_line": "Name of the daemon(s) in pitchfork.toml to start",
+            "name": "ID",
+            "usage": "[ID]...",
+            "help": "ID of the daemon(s) in pitchfork.toml to start",
+            "help_first_line": "ID of the daemon(s) in pitchfork.toml to start",
             "required": false,
             "var": true,
             "hide": false

docs/cli/index.md

@@ -17,7 +17,7 @@
 - [`pitchfork list [--hide-header]`](/cli/list.md)
 - [`pitchfork logs [-n <N>] [-t --tail] [ID]...`](/cli/logs.md)
 - [`pitchfork run [-f --force] <ID> [CMD]...`](/cli/run.md)
-- [`pitchfork start [NAME]...`](/cli/start.md)
+- [`pitchfork start [ID]...`](/cli/start.md)
 - [`pitchfork status <ID>`](/cli/status.md)
 - [`pitchfork stop <ID>`](/cli/stop.md)
 - [`pitchfork supervisor <SUBCOMMAND>`](/cli/supervisor.md)

docs/cli/start.md

@@ -1,12 +1,12 @@
 # `pitchfork start`
 
-- **Usage**: `pitchfork start [NAME]...`
+- **Usage**: `pitchfork start [ID]...`
 - **Aliases**: `s`
 
 Starts a daemon from a pitchfork.toml file
 
 ## Arguments
 
-### `[NAME]...`
+### `[ID]...`
 
-Name of the daemon(s) in pitchfork.toml to start
+ID of the daemon(s) in pitchfork.toml to start

pitchfork.usage.kdl

@@ -59,7 +59,7 @@ cmd "run" help="Runs a one-off daemon" {
 }
 cmd "start" help="Starts a daemon from a pitchfork.toml file" {
     alias "s"
-    arg "[NAME]..." help="Name of the daemon(s) in pitchfork.toml to start" var=true
+    arg "[ID]..." help="ID of the daemon(s) in pitchfork.toml to start" var=true
 }
 cmd "status" help="Display the status of a daemon" {
     alias "stat"

src/cli/clean.rs

@@ -1,4 +1,5 @@
-use crate::state_file::{DaemonStatus, StateFile};
+use crate::daemon_status::DaemonStatus;
+use crate::state_file::StateFile;
 use crate::Result;
 
 /// Removes stopped/failed daemons from `pitchfork list`

src/cli/start.rs

@@ -6,8 +6,8 @@ use crate::Result;
 #[derive(Debug, clap::Args)]
 #[clap(visible_alias = "s", verbatim_doc_comment)]
 pub struct Start {
-    /// Name of the daemon(s) in pitchfork.toml to start
-    name: Vec<String>,
+    /// ID of the daemon(s) in pitchfork.toml to start
+    id: Vec<String>,
 }
 
 impl Start {

src/daemon.rs

@@ -1,4 +1,16 @@
-#[derive(Debug, serde::Serialize, serde::Deserialize)]
+use crate::daemon_status::DaemonStatus;
+use std::fmt::Display;
+
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
 pub struct Daemon {
-    pub run: String,
+    pub id: String,
+    pub title: Option<String>,
+    pub pid: Option<u32>,
+    pub status: DaemonStatus,
+}
+
+impl Display for Daemon {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}", self.id)
+    }
 }

src/daemon_status.rs

@@ -0,0 +1,23 @@
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, strum::Display, strum::EnumIs)]
+#[strum(serialize_all = "snake_case")]
+#[serde(rename_all = "snake_case")]
+pub enum DaemonStatus {
+    Failed(String),
+    Waiting,
+    Running,
+    Errored(Option<i32>),
+    Stopped,
+}
+
+impl DaemonStatus {
+    pub fn style(&self) -> String {
+        let s = self.to_string();
+        match self {
+            DaemonStatus::Failed(_) => console::style(s).red().to_string(),
+            DaemonStatus::Waiting => console::style(s).yellow().to_string(),
+            DaemonStatus::Running => console::style(s).green().to_string(),
+            DaemonStatus::Stopped => console::style(s).dim().to_string(),
+            DaemonStatus::Errored(_) => console::style(s).red().to_string(),
+        }
+    }
+}

src/ipc/mod.rs

@@ -1,5 +1,5 @@
+use crate::daemon::Daemon;
 use crate::env;
-use crate::state_file::StateFileDaemon;
 use crate::Result;
 use interprocess::local_socket::{GenericFilePath, Name, ToFsName};
 use miette::IntoDiagnostic;
@@ -15,7 +15,7 @@ pub enum IpcMessage {
     Stop(String),
     DaemonAlreadyRunning(String),
     DaemonAlreadyStopped(String),
-    DaemonStart(StateFileDaemon),
+    DaemonStart(Daemon),
     DaemonStop { name: String },
     DaemonFailed { name: String, error: String },
     Response(String),
@@ -34,7 +34,7 @@ pub enum IpcResponse {
     Error(String),
     DaemonAlreadyStopped,
     DaemonAlreadyRunning,
-    DaemonStart { daemon: StateFileDaemon },
+    DaemonStart { daemon: Daemon },
     DaemonFailed { error: String },
 }
 

src/main.rs

@@ -3,6 +3,7 @@ extern crate log;
 
 mod cli;
 mod daemon;
+mod daemon_status;
 mod env;
 mod ipc;
 mod logger;

src/pitchfork_toml.rs

@@ -1,12 +1,10 @@
-use crate::daemon::Daemon;
 use crate::{env, Result};
 use indexmap::IndexMap;
 use miette::IntoDiagnostic;
 use std::path::{Path, PathBuf};
-
 #[derive(Debug, serde::Serialize, serde::Deserialize)]
 pub struct PitchforkToml {
-    pub daemons: IndexMap<String, Daemon>,
+    pub daemons: IndexMap<String, PitchforkTomlDaemon>,
     #[serde(skip)]
     pub path: PathBuf,
 }
@@ -44,3 +42,8 @@ impl PitchforkToml {
         Ok(())
     }
 }
+
+#[derive(Debug, serde::Serialize, serde::Deserialize)]
+pub struct PitchforkTomlDaemon {
+    pub run: String,
+}

src/state_file.rs

@@ -1,56 +1,19 @@
+use crate::daemon::Daemon;
 use crate::{env, Result};
 use miette::IntoDiagnostic;
 use once_cell::sync::Lazy;
 use std::collections::{BTreeMap, BTreeSet};
-use std::fmt::{Debug, Display};
+use std::fmt::Debug;
 use std::path::{Path, PathBuf};
 
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
 pub struct StateFile {
-    pub daemons: BTreeMap<String, StateFileDaemon>,
+    pub daemons: BTreeMap<String, Daemon>,
     pub disabled: BTreeSet<String>,
     #[serde(skip)]
     pub(crate) path: PathBuf,
 }
 
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
-pub struct StateFileDaemon {
-    pub id: String,
-    pub title: Option<String>,
-    pub pid: Option<u32>,
-    pub status: DaemonStatus,
-}
-
-impl Display for StateFileDaemon {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}", self.id)
-    }
-}
-
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, strum::Display, strum::EnumIs)]
-#[strum(serialize_all = "snake_case")]
-#[serde(rename_all = "snake_case")]
-pub enum DaemonStatus {
-    Failed(String),
-    Waiting,
-    Running,
-    Errored(Option<i32>),
-    Stopped,
-}
-
-impl DaemonStatus {
-    pub fn style(&self) -> String {
-        let s = self.to_string();
-        match self {
-            DaemonStatus::Failed(_) => console::style(s).red().to_string(),
-            DaemonStatus::Waiting => console::style(s).yellow().to_string(),
-            DaemonStatus::Running => console::style(s).green().to_string(),
-            DaemonStatus::Stopped => console::style(s).dim().to_string(),
-            DaemonStatus::Errored(_) => console::style(s).red().to_string(),
-        }
-    }
-}
-
 impl StateFile {
     pub fn new(path: PathBuf) -> Self {
         Self {

src/supervisor.rs

@@ -1,7 +1,9 @@
+use crate::daemon::Daemon;
+use crate::daemon_status::DaemonStatus;
 use crate::ipc::server::IpcServer;
 use crate::ipc::{IpcRequest, IpcResponse};
 use crate::procs::PROCS;
-use crate::state_file::{DaemonStatus, StateFile, StateFileDaemon};
+use crate::state_file::StateFile;
 use crate::watch_files::WatchFiles;
 use crate::{env, Result};
 use itertools::Itertools;
@@ -306,7 +308,7 @@ impl Supervisor {
         // TODO: cleanly stop ipc server
     }
 
-    async fn active_daemons(&self) -> Vec<StateFileDaemon> {
+    async fn active_daemons(&self) -> Vec<Daemon> {
         self.state_file
             .lock()
             .await
@@ -330,9 +332,9 @@ impl Supervisor {
         id: &str,
         pid: Option<u32>,
         status: DaemonStatus,
-    ) -> Result<StateFileDaemon> {
+    ) -> Result<Daemon> {
         info!("upserting daemon: {id} pid: {pid:?} status: {status}");
-        let daemon = StateFileDaemon {
+        let daemon = Daemon {
             id: id.to_string(),
             title: pid.and_then(|pid| PROCS.title(pid)),
             pid,
@@ -349,7 +351,7 @@ impl Supervisor {
         Ok(daemon)
     }
 
-    async fn get_daemon(&self, id: &str) -> Option<StateFileDaemon> {
+    async fn get_daemon(&self, id: &str) -> Option<Daemon> {
         self.state_file.lock().await.daemons.get(id).cloned()
     }
 }