4 files changed
+61
-52
crates/cli/src/cli/mod.rs
+6
-4
@@ -1,7 +1,9 @@
1
-use crate::{account, project};
2
-use clap::{Parser, Subcommand};
3
-use smbcloud_network::environment::Environment;
4
-use spinners::Spinner;
1
+use {
2
+ crate::{account, project},
3
+ clap::{Parser, Subcommand},
4
+ smbcloud_network::environment::Environment,
5
+ spinners::Spinner,
6
+};
7
8
pub struct CommandResult {
9
pub spinner: Spinner,
crates/cli/src/deploy/config.rs
+16
-14
@@ -1,18 +1,20 @@
1
-use crate::{
2
- deploy::setup::setup_project,
3
- ui::{fail_message, fail_symbol, succeed_message, succeed_symbol},
1
+use {
2
+ crate::{
3
+ deploy::setup::setup_project,
4
+ ui::{fail_message, fail_symbol, succeed_message, succeed_symbol},
5
+ },
6
+ git2::{Cred, CredentialType, Error},
7
+ serde::{Deserialize, Serialize},
8
+ smbcloud_model::{
9
+ account::User,
10
+ error_codes::{ErrorCode, ErrorResponse},
11
+ project::Project,
12
+ },
13
+ smbcloud_network::environment::Environment,
14
+ smbcloud_networking_project::crud_project_read::get_project,
15
+ spinners::Spinner,
16
+ std::{fs, path::Path},
17
};
5
-use git2::{Cred, CredentialType, Error};
6
-use serde::{Deserialize, Serialize};
7
-use smbcloud_model::{
8
- account::User,
9
- error_codes::{ErrorCode, ErrorResponse},
10
- project::Project,
11
-};
12
-use smbcloud_network::environment::Environment;
13
-use smbcloud_networking_project::crud_project_read::get_project;
14
-use spinners::Spinner;
15
-use std::{fs, path::Path};
18
19
pub(crate) async fn check_config(env: Environment) -> Result<Config, ErrorResponse> {
20
let mut spinner: Spinner = Spinner::new(
crates/cli/src/deploy/mod.rs
+25
-22
@@ -4,29 +4,32 @@ mod git;
4
mod remote_messages;
5
mod setup;
6
7
-use crate::deploy::detect_runner::detect_runner;
8
-use crate::token::get_smb_token;
9
-use crate::{
10
- account::{lib::is_logged_in, login::process_login},
11
- cli::CommandResult,
12
- deploy::config::check_project,
13
- ui::{fail_message, succeed_message, succeed_symbol},
7
+use {
8
+ crate::{
9
+ account::{lib::is_logged_in, login::process_login},
10
+ cli::CommandResult,
11
+ deploy::config::check_project,
12
+ deploy::detect_runner::detect_runner,
13
+ token::get_smb_token,
14
+ ui::{fail_message, succeed_message, succeed_symbol},
15
+ },
16
+ anyhow::{anyhow, Result},
17
+ config::check_config,
18
+ git::remote_deployment_setup,
19
+ git2::{PushOptions, RemoteCallbacks, Repository},
20
+ remote_messages::{build_next_app, start_server},
21
+ smbcloud_model::project::{DeploymentPayload, DeploymentStatus},
22
+ smbcloud_network::environment::Environment,
23
+ smbcloud_networking_account::me::me,
24
+ smbcloud_networking_project::{
25
+ crud_project_deployment_create::create_deployment, crud_project_deployment_update::update,
26
+ },
27
+ spinners::Spinner,
28
+ std::sync::{
29
+ atomic::{AtomicBool, Ordering},
30
+ Arc,
31
+ },
32
};
15
-use anyhow::{anyhow, Result};
16
-use config::check_config;
17
-use git::remote_deployment_setup;
18
-use git2::{PushOptions, RemoteCallbacks, Repository};
19
-use remote_messages::{build_next_app, start_server};
20
-use smbcloud_model::project::{DeploymentPayload, DeploymentStatus};
21
-use smbcloud_network::environment::Environment;
22
-use smbcloud_networking_account::me::me;
23
-use smbcloud_networking_project::{
24
- crud_project_deployment_create::create_deployment, crud_project_deployment_update::update,
25
-};
26
-use spinners::Spinner;
27
-use std::sync::atomic::AtomicBool;
28
-use std::sync::atomic::Ordering;
29
-use std::sync::Arc;
33
34
pub async fn process_deploy(env: Environment) -> Result<CommandResult> {
35
// Check credentials.
crates/cli/src/deploy/setup.rs
+14
-12
@@ -1,16 +1,18 @@
1
-use crate::token::get_smb_token;
2
-use crate::{deploy::config::Config, ui::highlight};
3
-use dialoguer::{theme::ColorfulTheme, Confirm, Input, Select};
4
-use regex::Regex;
5
-use smbcloud_model::{
6
- error_codes::{ErrorCode, ErrorResponse},
7
- project::{Project, ProjectCreate},
1
+use {
2
+ crate::token::get_smb_token,
3
+ crate::{deploy::config::Config, ui::highlight},
4
+ dialoguer::{theme::ColorfulTheme, Confirm, Input, Select},
5
+ regex::Regex,
6
+ smbcloud_model::{
7
+ error_codes::{ErrorCode, ErrorResponse},
8
+ project::{Project, ProjectCreate},
9
+ },
10
+ smbcloud_network::environment::Environment,
11
+ smbcloud_networking_project::{
12
+ crud_project_create::create_project, crud_project_read::get_projects,
13
+ },
14
+ std::{env, fs, path::Path},
15
};
9
-use smbcloud_network::environment::Environment;
10
-use smbcloud_networking_project::{
11
- crud_project_create::create_project, crud_project_read::get_projects,
12
-};
13
-use std::{env, fs, path::Path};
16
17
pub async fn setup_project(env: Environment) -> Result<Config, ErrorResponse> {
18
let path = env::current_dir().ok();