Merge branch 'feature/monorepo' into development

Author: setoelkahfi

crates/cli/src/deploy/config.rs

@@ -49,7 +49,7 @@ pub(crate) async fn get_config(
     let config: Config = match toml::from_str(&config_content) {
         Ok(value) => value,
         Err(e) => {
-            println!("{}", e);
+            println!("Error parsing config: {}", e);
             spinner.stop_and_persist(&fail_symbol(), fail_message("Config unsync."));
             handle_config_error()?
         }

crates/cli/src/deploy/detect_runner.rs

@@ -2,11 +2,12 @@ use {
     crate::ui::{fail_message, fail_symbol, succeed_message, succeed_symbol},
     anyhow::Result,
     smbcloud_model::runner::Runner,
+    smbcloud_utils::config::Config,
     spinners::Spinner,
     std::{env::current_dir, path::Path},
 };
 
-pub(crate) async fn detect_runner() -> Result<Runner> {
+pub(crate) async fn detect_runner(config: &Config) -> Result<Runner> {
     let mut spinner: Spinner = Spinner::new(
         spinners::Spinners::SimpleDotsScrolling,
         succeed_message("Checking runner"),
@@ -24,6 +25,11 @@ pub(crate) async fn detect_runner() -> Result<Runner> {
             );
         }
     };
+
+    // See if we have a monorepo setup.
+    if config.project.runner == Runner::Monorepo && config.projects.is_some() {
+        return Ok(Runner::Monorepo);
+    }
     let runner = match Runner::from(&path) {
         Ok(runner) => runner,
         Err(_) => {

crates/cli/src/deploy/process_deploy.rs

@@ -42,7 +42,7 @@ pub async fn process_deploy(env: Environment) -> Result<CommandResult> {
     let config = get_config(env, Some(&access_token)).await?;
 
     // Check runner.
-    let runner = detect_runner().await?;
+    let runner = detect_runner(&config).await?;
 
     // Validate config with project.
     check_project(env, &access_token, config.project.id).await?;

crates/cli/src/deploy/setup_project.rs

@@ -72,6 +72,7 @@ pub(crate) async fn setup_project(
         project,
         name,
         description,
+        projects: None,
     };
 
     // Ensure .smb directory exists

crates/smbcloud-model/src/project.rs

@@ -19,6 +19,7 @@ pub struct Project {
     pub id: i32,
     pub name: String,
     pub runner: Runner,
+    pub path: Option<String>,
     pub repository: Option<String>,
     pub description: Option<String>,
     pub created_at: DateTime<Utc>,

crates/smbcloud-model/src/runner.rs

@@ -9,7 +9,7 @@ use {
     },
 };
 
-#[derive(Debug, Deserialize_repr, Serialize_repr, Clone, Copy)]
+#[derive(Debug, Deserialize_repr, Serialize_repr, Clone, Copy, PartialEq)]
 #[repr(u8)]
 #[tsync::tsync]
 pub enum Runner {

crates/smbcloud-utils/src/config.rs

@@ -9,6 +9,7 @@ pub struct Config {
     pub name: String,
     pub description: Option<String>,
     pub project: Project,
+    pub projects: Option<Vec<Project>>,
 }
 
 impl Config {