Merge branch 'feature/sigit-deployment' into development

Author: setoelkahfi

Cargo.lock

@@ -1,10 +1,11 @@
 use {
     crate::token::get_smb_token::get_smb_token,
-    dialoguer::{theme::ColorfulTheme, Input},
+    dialoguer::{console::Term, theme::ColorfulTheme, Input, Select},
     regex::Regex,
     smbcloud_model::{
         error_codes::{ErrorCode, ErrorResponse},
         project::{Project, ProjectCreate},
+        runner::Runner,
     },
     smbcloud_network::environment::Environment,
     smbcloud_networking_project::crud_project_create::create_project,
@@ -73,6 +74,14 @@ pub(crate) async fn create_new_project(
         }
     };
 
+    let runners = vec![Runner::NodeJs, Runner::Swift, Runner::Ruby];
+    let runner = Select::with_theme(&ColorfulTheme::default())
+        .items(&runners)
+        .default(0)
+        .interact_on_opt(&Term::stderr())
+        .map(|i| runners[i.unwrap()])
+        .unwrap();
+
     let access_token = match get_smb_token(env) {
         Ok(token) => token,
         Err(_) => {
@@ -88,6 +97,7 @@ pub(crate) async fn create_new_project(
         access_token,
         ProjectCreate {
             name,
+            runner,
             repository,
             description,
         },

crates/cli/src/deploy/setup_create_new_project.rs

@@ -7,8 +7,11 @@ use crate::{
 use anyhow::{anyhow, Result};
 use chrono::Utc;
 use console::style;
+use dialoguer::console::Term;
+use dialoguer::Select;
 use dialoguer::{theme::ColorfulTheme, Input};
 use smbcloud_model::project::ProjectCreate;
+use smbcloud_model::runner::Runner;
 use smbcloud_network::environment::Environment;
 use smbcloud_networking_project::crud_project_create::create_project;
 use spinners::Spinner;
@@ -31,6 +34,15 @@ pub async fn process_project_init(
             return Err(anyhow!(fail_message("Invalid project name.")));
         }
     };
+
+    let runners = vec![Runner::NodeJs, Runner::Swift, Runner::Ruby];
+    let runner = Select::with_theme(&ColorfulTheme::default())
+        .items(&runners)
+        .default(0)
+        .interact_on_opt(&Term::stderr())
+        .map(|i| runners[i.unwrap()])
+        .unwrap();
+
     let repository = match Input::<String>::with_theme(&ColorfulTheme::default())
         .with_prompt("Repository name")
         .interact()
@@ -65,6 +77,7 @@ pub async fn process_project_init(
         access_token,
         ProjectCreate {
             name: project_name.clone(),
+            runner,
             repository,
             description: description.clone(),
         },

crates/cli/src/project/crud_create.rs

@@ -19,6 +19,8 @@ struct ProjectRow {
     id: i32,
     #[tabled(rename = "Name")]
     name: String,
+    #[tabled(rename = "Runner")]
+    runner: String,
     #[tabled(rename = "Repository")]
     repository: String,
     #[tabled(rename = "Description")]
@@ -112,6 +114,7 @@ pub(crate) fn show_projects(projects: Vec<Project>) {
         .map(|p| ProjectRow {
             id: p.id,
             name: p.name,
+            runner: p.runner.to_string(),
             repository: p.repository.unwrap_or("-".to_string()),
             description: p.description.unwrap_or("-".to_owned()),
         })

crates/cli/src/project/crud_read.rs

@@ -1,5 +1,5 @@
 use {
-    crate::{app_auth::AuthApp, ar_date_format},
+    crate::{app_auth::AuthApp, ar_date_format, runner::Runner},
     chrono::{DateTime, Utc},
     serde::{Deserialize, Serialize},
     serde_repr::{Deserialize_repr, Serialize_repr},
@@ -18,6 +18,7 @@ pub struct Config {
 pub struct Project {
     pub id: i32,
     pub name: String,
+    pub runner: Runner,
     pub repository: Option<String>,
     pub description: Option<String>,
     pub created_at: DateTime<Utc>,
@@ -29,11 +30,13 @@ impl Display for Project {
         write!(f, "ID: {}, Name: {}", self.id, self.name,)
     }
 }
-#[derive(Serialize, Debug)]
+#[derive(Serialize, Debug, Deserialize, Clone)]
+#[tsync]
 pub struct ProjectCreate {
     pub name: String,
     pub repository: String,
     pub description: String,
+    pub runner: Runner,
 }
 
 #[derive(Deserialize, Serialize, Debug)]
@@ -84,11 +87,13 @@ mod tests {
             name: "test".to_owned(),
             repository: "test".to_owned(),
             description: "test".to_owned(),
+            runner: Runner::NodeJs,
         };
         let json = json!({
             "name": "test",
             "repository": "test", // Corrected: repository should be included as per struct
             "description": "test",
+            "runner": 0
         });
         assert_eq!(serde_json::to_value(project_create).unwrap(), json);
     }

crates/smbcloud-model/src/project.rs

@@ -1,14 +1,16 @@
 use {
     crate::error_codes::{ErrorCode::UnsupportedRunner, ErrorResponse},
     serde::{Deserialize, Serialize},
+    serde_repr::{Deserialize_repr, Serialize_repr},
     std::{
         fmt::{self, Display, Formatter},
         fs,
         path::PathBuf,
     },
 };
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, Deserialize_repr, Serialize_repr, Clone, Copy)]
+#[repr(u8)]
 #[tsync::tsync]
 pub enum Runner {
     NodeJs,

crates/smbcloud-model/src/runner.rs

@@ -1,3 +1,4 @@
+use crate::url_builder::build_project_url;
 use anyhow::Result;
 use reqwest::Client;
 use smbcloud_model::{
@@ -7,8 +8,6 @@ use smbcloud_model::{
 use smbcloud_network::{environment::Environment, network::request};
 use smbcloud_networking::constants::SMB_USER_AGENT;
 
-use crate::url_builder::build_project_url;
-
 pub async fn create_project(
     env: Environment,
     access_token: String,

crates/smbcloud-networking-project/src/crud_project_create.rs

@@ -26,3 +26,4 @@ regex = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
 smbcloud-model = { workspace = true }
+toml = { workspace = true }

crates/smbcloud-utils/Cargo.toml

@@ -7,6 +7,7 @@ use {
 };
 
 pub mod config;
+pub mod write_config;
 
 pub fn email_validation(input: &str) -> Result<(), &'static str> {
     let email_regex = Regex::new(

crates/smbcloud-utils/src/lib.rs

@@ -0,0 +1,29 @@
+use {
+    crate::config::Config,
+    smbcloud_model::error_codes::{ErrorCode, ErrorResponse},
+    std::{fs, path::Path},
+};
+
+pub fn write_config(repo_path: &str, config: Config) -> Result<(), ErrorResponse> {
+    // Ensure .smb directory exists
+    let smb_dir = Path::new(&repo_path).join(".smb");
+    if !smb_dir.exists() {
+        fs::create_dir(smb_dir).map_err(|_| ErrorResponse::Error {
+            error_code: ErrorCode::MissingConfig,
+            message: ErrorCode::MissingConfig.message(None).to_string(),
+        })?;
+    }
+
+    // Write config to .smb/config.toml
+    let config_toml = toml::to_string(&config).map_err(|_| ErrorResponse::Error {
+        error_code: ErrorCode::MissingConfig,
+        message: ErrorCode::MissingConfig.message(None).to_string(),
+    })?;
+
+    fs::write(".smb/config.toml", config_toml).map_err(|_| ErrorResponse::Error {
+        error_code: ErrorCode::MissingConfig,
+        message: ErrorCode::MissingConfig.message(None).to_string(),
+    })?;
+
+    Ok(())
+}