Merge pull request #21 from AmineZouitine/integration_test

Integration test

Cargo.toml

@@ -8,6 +8,9 @@ repository = "https://github.com/AmineZouitine/rmt.rs"
 version = "0.1.4"
 edition = "2021"
 
+[lib]
+name = "rmt_lib"
+
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
@@ -22,4 +25,6 @@ shellexpand = "2.1.2"
 rustyline = "10.0.0"
 colored = "2.0.0"
 termion = "1.5.6"
-clap = { version = "4.0.13", features = ["derive"] }
+clap = { version = "4.0.13", features = ["derive"] }
+assert_cmd = "2.0"
+predicates = "2.1"

src/argument_errors.rs

@@ -16,7 +16,7 @@ pub enum RmtArgumentErrors {
     InvalidEmptyFolderFlags {
         folder_name: String,
     },
-    InvalidPath {
+    InvalidPathWithoutForceFlags {
         element_name: String,
     },
 }
@@ -31,7 +31,7 @@ impl RmtArgumentErrors {
             RmtArgumentErrors::InvalidDirFlags { folder_name, element_in_folder } => format!("You cannot delete {} folder with the {} flags because there is {} elements inside, you should use {} flags instead.", folder_name.red().bold(), "-d".red().bold().green(), element_in_folder.to_string().red().bold(), "-r".green().bold()),
             RmtArgumentErrors::InvalidEmptyFolderFlags { folder_name } => format!("You cannot delete {} folder without using {} or {} flags.", folder_name.red().bold(), "-r".green().bold(), "-d".green().bold()),
             RmtArgumentErrors::InvalidFillFolderFlags { folder_name } => format!("You cannot delete {} folder without using {} flags (do no use {} flags because your directory isn't empty).", folder_name.red().bold(), "-r".green().bold(), "-d".green().bold()),
-            RmtArgumentErrors::InvalidPath { element_name} => format!("you cannot destroy your {} because it doesn't exist (use the {} option to stop getting this warning).",  element_name.red().bold(), "-f".green().bold())
+            RmtArgumentErrors::InvalidPathWithoutForceFlags { element_name} => format!("you cannot destroy your {} because it doesn't exist (use the {} option to stop getting this warning).",  element_name.red().bold(), "-f".green().bold()),
         }
     }
 

src/arguments_manager.rs

@@ -50,20 +50,27 @@ pub struct ArgumentsManager {
 }
 
 impl ArgumentsManager {
-    pub fn filter_all_errors(&mut self) {
+    pub fn filter_all_errors(&mut self) -> i32 {
+        let mut exit_code = 0;
         let mut result: Vec<String> = Vec::new();
         self.elements
             .iter()
             .for_each(|path| match self.filter_error(path) {
-                Ok(absolute_path) => result.push(absolute_path),
+                Ok(absolute_path_opt) => {
+                    if let Some(absolute_path) = absolute_path_opt {
+                        result.push(absolute_path);
+                    }
+                }
                 Err(arg_error) => {
                     println!("{}", arg_error);
+                    exit_code = 1;
                 }
             });
         self.elements = result;
+        exit_code
     }
 
-    fn filter_error(&self, path: &str) -> Result<String, RmtArgumentErrors> {
+    fn filter_error(&self, path: &str) -> Result<Option<String>, RmtArgumentErrors> {
         match relative_path_to_absolute(path) {
             Ok(path) => {
                 if Path::new(&path).is_dir() {
@@ -83,9 +90,15 @@ impl ArgumentsManager {
                         });
                     }
                 }
-                Ok(path)
+                Ok(Some(path))
+            }
+            Err(invalid_path) => {
+                if self.is_force {
+                    Ok(None)
+                } else {
+                    Err(invalid_path)
+                }
             }
-            Err(invalid_path) => Err(invalid_path),
         }
     }
 }

src/lib.rs

@@ -0,0 +1,11 @@
+pub mod argument_errors;
+pub mod arguments_manager;
+pub mod config;
+pub mod config_manager;
+pub mod data_manager;
+pub mod database_errors;
+pub mod display_manager;
+pub mod input_manager;
+pub mod structure_manager;
+pub mod trash_item;
+pub mod trash_manager;

src/main.rs

@@ -1,14 +1,5 @@
-pub mod argument_errors;
-pub mod arguments_manager;
-pub mod config;
-pub mod config_manager;
-pub mod data_manager;
-pub mod database_errors;
-pub mod display_manager;
-pub mod input_manager;
-pub mod structure_manager;
-pub mod trash_item;
-pub mod trash_manager;
+use rmt_lib::*;
+
 use arguments_manager::ArgumentsManager;
 use clap::Parser;
 use colored::Colorize;
@@ -17,6 +8,7 @@ use crate::argument_errors::RmtArgumentErrors;
 
 const IS_TEST: bool = false;
 fn main() {
+    std::env::set_var("CLICOLOR_FORCE", "true");
     let mut arguments_manager = ArgumentsManager::parse();
     let (config, connection) = structure_manager::setup_structure(IS_TEST);
 
@@ -26,10 +18,10 @@ fn main() {
         && !arguments_manager.is_trash_info
     {
         println!("{}", RmtArgumentErrors::InvalidNumberOfArguments(0));
-        return;
+        std::process::exit(1);
     }
 
-    arguments_manager.filter_all_errors();
+    let exit_code = arguments_manager.filter_all_errors();
 
     if arguments_manager.is_trash_display {
         input_manager::start_display(&connection, IS_TEST);
@@ -52,4 +44,6 @@ fn main() {
             &arguments_manager,
         );
     }
+
+    std::process::exit(exit_code)
 }

src/structure_manager.rs

@@ -162,7 +162,7 @@ pub fn relative_path_to_absolute(relative_path: &str) -> Result<String, RmtArgum
             Ok(absolute_path)
         }
     } else {
-        Err(RmtArgumentErrors::InvalidPath {
+        Err(RmtArgumentErrors::InvalidPathWithoutForceFlags {
             element_name: original_path.to_string(),
         })
     }