refactor: move services to commands

Author: edfloreshz

cli/src/cli.rs

@@ -1,7 +1,7 @@
 use crate::Error;
 use clap::{Parser, Subcommand};
 use colored::*;
-use devmode::{services, CliError};
+use devmode::commands;
 
 #[derive(Parser, Debug)]
 #[clap(name = "Devmode")]
@@ -27,7 +27,7 @@ pub enum Commands {
 impl Cli {
     pub fn run(&self) -> Result<(), Error> {
         match &self.commands {
-            Commands::Clone { url } => match services::clone(&url) {
+            Commands::Clone { url } => match commands::clone::run(&url) {
                 Ok(_) => {
                     println!(
                         "{} {}",
@@ -36,7 +36,7 @@ impl Cli {
                     );
                     Ok(())
                 }
-                Err(services::Error::Clone(services::CloneError::PathExists(path))) => {
+                Err(commands::Error::Clone(commands::CloneError::PathExists(path))) => {
                     if overwrite() {
                         std::fs::remove_dir_all(&path)?;
                         println!(
@@ -49,15 +49,15 @@ impl Cli {
                             "info:".cyan().bold(),
                             format!("Cloning {}...", url).cyan()
                         );
-                        services::clone(&url)?;
+                        commands::clone::run(&url)?;
                         println!(
                             "{} {}",
                             "success:".green().bold(),
                             format!("Repository cloned to {}", path.display()).green()
                         );
                         Ok(())
                     } else {
-                        Err(CliError::RepositoryExists.into())
+                        Err(devmode::CliError::RepositoryExists.into())
                     }
                 }
                 Err(e) => Err(e.into()),

cli/src/services/clone.rs cli/src/commands/clone.rscli/src/services/clone.rs renamed to cli/src/commands/clone.rs

@@ -1,11 +1,11 @@
+// Command module for 'clone'
 use git2_credentials::CredentialHandler;
 use git_url_parse::GitUrl;
 
 use super::{CloneError, Error};
 
-pub fn clone(url: &str) -> Result<(), Error> {
+pub fn run(url: &str) -> Result<(), Error> {
     let url = GitUrl::parse(url)?;
-
     let path = match (&url.host, &url.owner, &url.name) {
         (Some(host), Some(owner), name) if !owner.is_empty() => dirs::home_dir()
             .unwrap()
@@ -15,26 +15,19 @@ pub fn clone(url: &str) -> Result<(), Error> {
             .join(name),
         _ => return Err(CloneError::InvalidUrl.into()),
     };
-
     if path.exists() {
         return Err(CloneError::PathExists(path).into());
     }
-
     let mut cb = git2::RemoteCallbacks::new();
     let config = git2::Config::open_default()?;
     let mut credential_handler = CredentialHandler::new(config);
-
     cb.credentials(move |url, username, allowed| {
         credential_handler.try_next_credential(url, username, allowed)
     });
-
     let mut fetch_options = git2::FetchOptions::new();
     fetch_options.remote_callbacks(cb);
-
     let mut builder = git2::build::RepoBuilder::new();
     builder.fetch_options(fetch_options);
-
     builder.clone(url.to_string().as_str(), &path)?;
-
     Ok(())
 }

cli/src/services/error.rs cli/src/commands/error.rscli/src/services/error.rs renamed to cli/src/commands/error.rs

@@ -0,0 +1,3 @@
+pub mod clone;
+mod error;
+pub use error::*;

cli/src/commands/mod.rs

@@ -3,7 +3,7 @@ use thiserror::Error;
 #[derive(Error, Debug)]
 pub enum Error {
     #[error("{0}")]
-    Services(#[from] crate::services::Error),
+    Commands(#[from] crate::commands::Error),
     #[error("{0}")]
     Parse(#[from] clap::Error),
     #[error("{0}")]

cli/src/error.rs

@@ -1,4 +1,4 @@
 mod error;
 pub use error::*;
 
-pub mod services;
+pub mod commands;