feat: add cli

Signed-off-by: kjuulh <contact@kjuulh.io>

crates/cuddle/src/cuddle_state.rs

@@ -0,0 +1,68 @@
+use crate::plan::{ClonedPlan, Plan};
+use crate::project::ProjectPlan;
+use crate::state::{self, ValidatedState};
+
+pub struct Start {}
+pub struct PrepareProject {
+    project: Option<ProjectPlan>,
+}
+
+pub struct PreparePlan {
+    project: Option<ProjectPlan>,
+    plan: Option<ClonedPlan>,
+}
+
+pub struct Cuddle<S = Start> {
+    pub state: S,
+}
+
+// Cuddle maintains the context for cuddle to use
+// Stage 1 figure out which state to display
+// Stage 2 prepare plan
+// Stage 3 validate settings, build actions, prepare
+
+impl Cuddle<Start> {
+    pub fn default() -> Self {
+        Self { state: Start {} }
+    }
+
+    pub async fn prepare_project(&self) -> anyhow::Result<Cuddle<PrepareProject>> {
+        let project = ProjectPlan::from_current_path().await?;
+
+        Ok(Cuddle {
+            state: PrepareProject { project },
+        })
+    }
+}
+
+impl Cuddle<PrepareProject> {
+    pub async fn prepare_plan(&self) -> anyhow::Result<Cuddle<PreparePlan>> {
+        let plan = if let Some(project) = &self.state.project {
+            Plan::new().clone_from_project(project).await?
+        } else {
+            None
+        };
+
+        Ok(Cuddle {
+            state: PreparePlan {
+                project: self.state.project.clone(),
+                plan,
+            },
+        })
+    }
+}
+
+impl Cuddle<PreparePlan> {
+    pub async fn build_state(&self) -> anyhow::Result<Cuddle<ValidatedState>> {
+        let state = if let Some(project) = &self.state.project {
+            let state = state::State::new();
+            let raw_state = state.build_state(project, &self.state.plan).await?;
+
+            state.validate_state(&raw_state).await?
+        } else {
+            ValidatedState::default()
+        };
+
+        Ok(Cuddle { state })
+    }
+}

crates/cuddle/src/main.rs

@@ -1,7 +1,7 @@
-use plan::{ClonedPlan, Plan};
+use cuddle_state::Cuddle;
-use project::ProjectPlan;
+use state::{validated_project::Project, ValidatedState};
-use state::ValidatedState;
 
+mod cuddle_state;
 mod plan;
 mod project;
 mod schema_validator;
@@ -12,7 +12,7 @@ async fn main() -> anyhow::Result<()> {
     dotenv::dotenv().ok();
     tracing_subscriber::fmt::init();
 
-    let _cuddle = Cuddle::default()
+    let cuddle = Cuddle::default()
         .prepare_project()
         .await?
         .prepare_plan()
@@ -20,71 +20,76 @@ async fn main() -> anyhow::Result<()> {
         .build_state()
         .await?;
 
+    Cli::new(cuddle).setup().await?.execute().await?;
+
     Ok(())
 }
 
-struct Start {}
+pub struct Cli {
-struct PrepareProject {
+    cli: clap::Command,
-    project: Option<ProjectPlan>,
+    cuddle: Cuddle<ValidatedState>,
 }
 
-struct PreparePlan {
+impl Cli {
-    project: Option<ProjectPlan>,
+    pub fn new(cuddle: Cuddle<ValidatedState>) -> Self {
-    plan: Option<ClonedPlan>,
+        let cli = clap::Command::new("cuddle").subcommand_required(true);
+
+        Self { cli, cuddle }
     }
 
-struct Cuddle<S = Start> {
+    pub async fn setup(mut self) -> anyhow::Result<Self> {
-    state: S,
+        let s = self
+            .add_default()
+            .await?
+            .add_project_commands()
+            .await?
+            .add_plan_commands()
+            .await?;
+
+        // TODO: Add global
+        // TODO: Add components
+
+        Ok(s)
     }
 
-// Cuddle maintains the context for cuddle to use
+    pub async fn execute(mut self) -> anyhow::Result<()> {
-// Stage 1 figure out which state to display
+        match self
-// Stage 2 prepare plan
+            .cli
-// Stage 3 validate settings, build actions, prepare
+            .get_matches_from(std::env::args())
-impl Cuddle {}
+            .subcommand()
-
+            .ok_or(anyhow::anyhow!("failed to find subcommand"))?
-impl Cuddle<Start> {
+        {
-    pub fn default() -> Self {
+            ("do", args) => {
-        Self { state: Start {} }
+                tracing::debug!("executing do");
+            }
+            _ => {}
         }
 
-    pub async fn prepare_project(&self) -> anyhow::Result<Cuddle<PrepareProject>> {
+        Ok(())
-        let project = ProjectPlan::from_current_path().await?;
-
-        Ok(Cuddle {
-            state: PrepareProject { project },
-        })
-    }
     }
 
-impl Cuddle<PrepareProject> {
+    async fn add_default(mut self) -> anyhow::Result<Self> {
-    pub async fn prepare_plan(&self) -> anyhow::Result<Cuddle<PreparePlan>> {
+        self.cli = self
-        let plan = if let Some(project) = &self.state.project {
+            .cli
-            Plan::new().clone_from_project(project).await?
+            .subcommand(clap::Command::new("do").alias("x"))
-        } else {
+            .subcommand(clap::Command::new("get"));
-            None
-        };
 
-        Ok(Cuddle {
+        Ok(self)
-            state: PreparePlan {
-                project: self.state.project.clone(),
-                plan,
-            },
-        })
-    }
     }
 
-impl Cuddle<PreparePlan> {
+    async fn add_project_commands(mut self) -> anyhow::Result<Self> {
-    pub async fn build_state(&self) -> anyhow::Result<Cuddle<ValidatedState>> {
+        if let Some(project) = self.cuddle.state.project.as_ref() {
-        let state = if let Some(project) = &self.state.project {
+            // Add project level commands
-            let state = state::State::new();
+        }
-            let raw_state = state.build_state(project, &self.state.plan).await?;
 
-            state.validate_state(&raw_state).await?
+        Ok(self)
-        } else {
+    }
-            ValidatedState::default()
-        };
 
-        Ok(Cuddle { state })
+    async fn add_plan_commands(mut self) -> anyhow::Result<Self> {
+        if let Some(plan) = self.cuddle.state.plan.as_ref() {
+            // Add plan level commands
+        }
+
+        Ok(self)
     }
 }

crates/cuddle/src/state.rs

@@ -6,6 +6,8 @@ use crate::{
     schema_validator::SchemaValidator,
 };
 
+pub mod validated_project;
+
 pub struct State {}
 impl State {
     pub fn new() -> Self {
@@ -51,87 +53,8 @@ pub struct RawState {
 
 #[derive(Default)]
 pub struct ValidatedState {
-    project: Option<Project>,
+    pub project: Option<Project>,
-    plan: Option<Plan>,
+    pub plan: Option<Plan>,
-}
-
-mod validated_project {
-    use std::{
-        collections::BTreeMap,
-        path::{Path, PathBuf},
-    };
-
-    use anyhow::anyhow;
-    use toml::Table;
-
-    use crate::project::CUDDLE_PROJECT_FILE;
-
-    pub struct Project {
-        value: Value,
-        pub root: PathBuf,
-    }
-
-    impl Project {
-        pub fn new(value: Value, root: &Path) -> Self {
-            Self {
-                value,
-                root: root.to_path_buf(),
-            }
-        }
-
-        pub fn from_file(content: &str, root: &Path) -> anyhow::Result<Self> {
-            let table: Table = toml::from_str(content)?;
-            let config = Config::default();
-
-            let project = table
-                .get("project")
-                .ok_or(anyhow!("cuddle.toml doesn't provide a [project] table"))?;
-
-            let value: Value = project.into();
-
-            Ok(Self::new(value, root))
-        }
-
-        pub async fn from_path(path: &Path) -> anyhow::Result<Self> {
-            let cuddle_file = path.join(CUDDLE_PROJECT_FILE);
-
-            if !cuddle_file.exists() {
-                anyhow::bail!("no cuddle.toml project file found");
-            }
-
-            let cuddle_project_file = tokio::fs::read_to_string(cuddle_file).await?;
-
-            Self::from_file(&cuddle_project_file, path)
-        }
-    }
-
-    #[derive(Default)]
-    struct Config {
-        project: BTreeMap<String, Value>,
-    }
-
-    pub enum Value {
-        String(String),
-        Bool(bool),
-        Array(Vec<Value>),
-        Map(BTreeMap<String, Value>),
-    }
-
-    impl From<&toml::Value> for Value {
-        fn from(value: &toml::Value) -> Self {
-            match value {
-                toml::Value::String(s) => Self::String(s.clone()),
-                toml::Value::Integer(i) => Self::String(i.to_string()),
-                toml::Value::Float(f) => Self::String(f.to_string()),
-                toml::Value::Boolean(b) => Self::Bool(*b),
-                toml::Value::Datetime(dt) => Self::String(dt.to_string()),
-                toml::Value::Array(array) => Self::Array(array.iter().map(|i| i.into()).collect()),
-                toml::Value::Table(tbl) => {
-                    Self::Map(tbl.iter().map(|(k, v)| (k.clone(), v.into())).collect())
-                }
-            }
-        }
-    }
 }
 
 pub struct Plan {}

crates/cuddle/src/state/validated_project.rs

@@ -0,0 +1,76 @@
+use std::{
+    collections::BTreeMap,
+    path::{Path, PathBuf},
+};
+
+use anyhow::anyhow;
+use toml::Table;
+
+use crate::project::CUDDLE_PROJECT_FILE;
+
+pub struct Project {
+    value: Value,
+    pub root: PathBuf,
+}
+
+impl Project {
+    pub fn new(value: Value, root: &Path) -> Self {
+        Self {
+            value,
+            root: root.to_path_buf(),
+        }
+    }
+
+    pub fn from_file(content: &str, root: &Path) -> anyhow::Result<Self> {
+        let table: Table = toml::from_str(content)?;
+        let config = Config::default();
+
+        let project = table
+            .get("project")
+            .ok_or(anyhow!("cuddle.toml doesn't provide a [project] table"))?;
+
+        let value: Value = project.into();
+
+        Ok(Self::new(value, root))
+    }
+
+    pub async fn from_path(path: &Path) -> anyhow::Result<Self> {
+        let cuddle_file = path.join(CUDDLE_PROJECT_FILE);
+
+        if !cuddle_file.exists() {
+            anyhow::bail!("no cuddle.toml project file found");
+        }
+
+        let cuddle_project_file = tokio::fs::read_to_string(cuddle_file).await?;
+
+        Self::from_file(&cuddle_project_file, path)
+    }
+}
+
+#[derive(Default)]
+struct Config {
+    project: BTreeMap<String, Value>,
+}
+
+pub enum Value {
+    String(String),
+    Bool(bool),
+    Array(Vec<Value>),
+    Map(BTreeMap<String, Value>),
+}
+
+impl From<&toml::Value> for Value {
+    fn from(value: &toml::Value) -> Self {
+        match value {
+            toml::Value::String(s) => Self::String(s.clone()),
+            toml::Value::Integer(i) => Self::String(i.to_string()),
+            toml::Value::Float(f) => Self::String(f.to_string()),
+            toml::Value::Boolean(b) => Self::Bool(*b),
+            toml::Value::Datetime(dt) => Self::String(dt.to_string()),
+            toml::Value::Array(array) => Self::Array(array.iter().map(|i| i.into()).collect()),
+            toml::Value::Table(tbl) => {
+                Self::Map(tbl.iter().map(|(k, v)| (k.clone(), v.into())).collect())
+            }
+        }
+    }
+}