Merge pull request #25 from smbcloudXYZ/feature/swift-runner

feat: add `Swift` runner

Author: setoelkahfi

Cargo.lock

@@ -1,10 +1,12 @@
+use crate::project::runner::Runner;
 use crate::ui::{fail_message, fail_symbol, succeed_message, succeed_symbol};
 use anyhow::{anyhow, Result};
 use console::style;
 use git2::{Remote, Repository};
 use spinners::Spinner;
 
 pub async fn remote_deployment_setup<'a>(
+    runner: &Runner,
     repo: &'a Repository,
     repo_name: &'a str,
 ) -> Result<Remote<'a>> {
@@ -36,11 +38,11 @@ pub async fn remote_deployment_setup<'a>(
                     .bold()
                     .to_string(),
             );
-            let remote_format = format!("{}.git", repo_name);
+            let repo_name_format = format!("{}.git", repo_name);
             let remote = repo
                 .remote(
                     "smbcloud",
-                    &format!("[email protected]:{}", remote_format),
+                    &format!("{}:{}", runner.git_host(), repo_name_format),
                 )
                 .map_err(|e: git2::Error| {
                     spinner.stop_and_persist(&fail_symbol(), e.to_string());

crates/cli/src/deploy/git.rs

@@ -38,7 +38,7 @@ pub async fn process_deploy(env: Environment) -> Result<CommandResult> {
     let config = check_config(env).await?;
 
     // Check runner.
-    detect_runner().await?;
+    let runner = detect_runner().await?;
 
     // Validate config with project.
     check_project(env, &access_token, config.project.id).await?;
@@ -62,7 +62,7 @@ pub async fn process_deploy(env: Environment) -> Result<CommandResult> {
         }
     };
 
-    let mut origin = remote_deployment_setup(&repo, &config.project.repository).await?;
+    let mut origin = remote_deployment_setup(&runner, &repo, &config.project.repository).await?;
 
     let commit_hash = match main_branch.resolve() {
         Ok(result) => match result.target() {

crates/cli/src/deploy/mod.rs

@@ -9,6 +9,19 @@ pub(crate) enum Runner {
     Swift,
 }
 
+impl Runner {
+    pub fn git_host(&self) -> String {
+        format!("git@{}.smbcloud.xyz", self.api())
+    }
+
+    fn api(&self) -> &str {
+        match self {
+            Runner::NodeJs => "api",
+            Runner::Ruby | Runner::Swift => "api-1",
+        }
+    }
+}
+
 pub(crate) async fn detect_runner() -> Result<Runner> {
     let mut spinner: Spinner = Spinner::new(
         spinners::Spinners::SimpleDotsScrolling,