feat: add basic plan support

crates/forest/src/cli.rs

@@ -1,10 +1,10 @@
 use std::{net::SocketAddr, path::PathBuf};
 
 use clap::{Parser, Subcommand};
-use kdl::{KdlDocument, KdlNode, KdlValue};
+use kdl::KdlDocument;
 use rusty_s3::{Bucket, Credentials, S3Action};
 
-use crate::state::SharedState;
+use crate::{model::Project, plan_reconciler::PlanReconciler, state::SharedState};
 
 #[derive(Parser)]
 #[command(author, version, about, long_about = None, subcommand_required = true)]
@@ -45,80 +45,6 @@ enum Commands {
     },
 }
 
-#[derive(Debug, Clone)]
-pub enum ProjectPlan {
-    Local { path: PathBuf },
-    NoPlan,
-}
-
-impl TryFrom<&KdlNode> for ProjectPlan {
-    type Error = anyhow::Error;
-
-    fn try_from(value: &KdlNode) -> Result<Self, Self::Error> {
-        let Some(children) = value.children() else {
-            return Ok(Self::NoPlan);
-        };
-
-        if let Some(local) = children.get_arg("local") {
-            return Ok(Self::Local {
-                path: local
-                    .as_string()
-                    .map(|l| l.to_string())
-                    .ok_or(anyhow::anyhow!("local must have an arg with a valid path"))?
-                    .into(),
-            });
-        }
-
-        Ok(Self::NoPlan)
-    }
-}
-
-#[derive(Debug, Clone)]
-pub struct Project {
-    name: String,
-    description: Option<String>,
-    plan: Option<ProjectPlan>,
-}
-
-impl TryFrom<KdlDocument> for Project {
-    type Error = anyhow::Error;
-
-    fn try_from(value: KdlDocument) -> Result<Self, Self::Error> {
-        let project_section = value.get("project").ok_or(anyhow::anyhow!(
-            "forest.kdl project file must have a project object"
-        ))?;
-
-        let project_children = project_section
-            .children()
-            .ok_or(anyhow::anyhow!("a forest project must have children"))?;
-
-        let project_plan: Option<ProjectPlan> = if let Some(project) = project_children.get("plan")
-        {
-            Some(project.try_into()?)
-        } else {
-            None
-        };
-
-        Ok(Self {
-            name: project_children
-                .get_arg("name")
-                .and_then(|n| match n {
-                    KdlValue::String(s) => Some(s),
-                    _ => None,
-                })
-                .cloned()
-                .ok_or(anyhow::anyhow!("a forest kuddle project must have a name"))?,
-            description: project_children
-                .get_arg("description")
-                .and_then(|n| match n {
-                    KdlValue::String(s) => Some(s.trim().to_string()),
-                    _ => None,
-                }),
-            plan: project_plan,
-        })
-    }
-}
-
 pub async fn execute() -> anyhow::Result<()> {
     let cli = Command::parse();
 
@@ -134,12 +60,15 @@ pub async fn execute() -> anyhow::Result<()> {
                 );
             }
 
-            let project_file = tokio::fs::read_to_string(project_file_path).await?;
+            let project_file = tokio::fs::read_to_string(&project_file_path).await?;
             let project_doc: KdlDocument = project_file.parse()?;
 
             let project: Project = project_doc.try_into()?;
-
             tracing::trace!("found a project name: {}, {:?}", project.name, project);
+
+            PlanReconciler::new()
+                .reconcile(&project, &project_path)
+                .await?;
         }
 
         Commands::Serve {
@@ -162,7 +91,6 @@ pub async fn execute() -> anyhow::Result<()> {
             let _url = put_object.sign(std::time::Duration::from_secs(30));
             let _state = SharedState::new().await?;
         }
-        _ => (),
     }
 
     Ok(())