refactor: organize tools in separate mods

src/config.rs

@@ -1,8 +1,7 @@
-use crate::version_manager::VersionInfo;
 use serde::Deserialize;
 use shuru::{
     error::{ConfigValidationError, Error},
-    version_manager::{deserialize_versions, VersionedCommand},
+    tools::version_manager::{deserialize_versions, VersionInfo, VersionedCommand},
 };
 use std::collections::HashMap;
 

src/error.rs

@@ -2,9 +2,6 @@ use thiserror::Error;
 
 #[derive(Debug, Error)]
 pub enum ConfigValidationError {
-    #[error("Invalid command name: '{0}'. Reason: {1}")]
-    CommandNameValidationError(String, String),
-
     #[error("Command cannot be empty for task: '{0}'.")]
     EmptyCommandError(String),
 
@@ -15,7 +12,7 @@ pub enum ConfigValidationError {
 #[derive(Debug, Error)]
 pub enum VersionManagerError {
     #[error("Unable to find home directory")]
-    UnableHomeDirectory {},
+    UnableHomeDirectory,
 
     #[error("Failed to download version from '{url}' | {source}")]
     DownloadError {
@@ -100,9 +97,6 @@ pub enum Error {
     #[error("IO error: {0}")]
     IoError(#[from] std::io::Error),
 
-    #[error("HTTP error: {0}")]
-    HttpError(#[from] reqwest::Error),
-
     #[error("Unable to find home directory.")]
     HomeDirectoryNotFound,
 

src/lib.rs

@@ -4,6 +4,6 @@ pub mod commands;
 pub mod error;
 pub mod util;
 
-pub mod command_runner;
+pub mod tools;
+
 pub mod config;
-pub mod version_manager;

src/main.rs

@@ -1,5 +1,5 @@
 use clap::Parser;
-use shuru::{command_runner::CommandRunner, commands, config::Config, error::Error};
+use shuru::{commands, config::Config, error::Error, tools::task_runner::TaskRunner};
 
 #[derive(Parser)]
 #[clap(version, about = "Shuru task runner", long_about = None)]
@@ -61,7 +61,7 @@ fn run() -> Result<std::process::ExitStatus, Error> {
         return commands::clear_cache();
     }
 
-    let runner = CommandRunner::new(config);
+    let runner = TaskRunner::new(config);
 
     match cli.command {
         Some(command_name) => runner.run_command(&command_name),

src/tools/mod.rs

@@ -0,0 +1,2 @@
+pub mod task_runner;
+pub mod version_manager;

src/command_runner.rs → src/tools/task_runner/mod.rs

@@ -6,13 +6,13 @@ use shuru::{
     error::Error,
 };
 
-pub struct CommandRunner {
+pub struct TaskRunner {
     config: Config,
 }
 
-impl CommandRunner {
+impl TaskRunner {
     pub fn new(config: Config) -> Self {
-        CommandRunner { config }
+        TaskRunner { config }
     }
 
     fn find_task(&self, name: &str) -> Result<&TaskConfig, Error> {

src/version_manager/node_version_manager.rs → src/tools/version_manager/node_version_manager.rs

@@ -1,6 +1,6 @@
 use shuru::{
     error::{Error, VersionManagerError},
-    version_manager::{VersionInfo, VersionManager},
+    tools::version_manager::{VersionInfo, VersionManager},
 };
 
 #[derive(Debug)]

src/version_manager/python_version_manager.rs → src/tools/version_manager/python_version_manager.rs

@@ -3,7 +3,7 @@ use std::process::{Command, Stdio};
 
 use shuru::{
     error::{Error, VersionManagerError},
-    version_manager::{VersionInfo, VersionManager},
+    tools::version_manager::{VersionInfo, VersionManager},
 };
 
 #[derive(Debug)]

src/version_manager/versioned_command.rs → src/tools/version_manager/versioned_command.rs

@@ -1,5 +1,7 @@
 use serde::Deserialize;
-use shuru::version_manager::{NodeVersionManager, PythonVersionManager, ShuruVersionManager};
+use shuru::tools::version_manager::{
+    NodeVersionManager, PythonVersionManager, ShuruVersionManager,
+};
 use std::collections::HashMap;
 
 #[derive(Debug, Hash, Eq, PartialEq, Deserialize)]