Merge pull request #134 from RafaelJohn9/feat/saving-with-different-name

Feat/saving with different name

Author: RafaelJohn9

src/commands/gitignore/add.rs

@@ -127,13 +127,6 @@ fn download_all_templates(
 
             let section = format!("# ===== {} =====\n{}\n\n", remote_filename, content);
             file::save_file(&section, &dest_path, force)?;
-
-            println!(
-                "{} Downloaded gitignore template: {} to {}",
-                "✓".green(),
-                remote_filename,
-                dest_path.display()
-            );
         }
     } else {
         // Merge all templates into a single .gitignore file
@@ -212,13 +205,6 @@ fn download_templates(
             } else {
                 file::save_file(&section, &dest_path, force)?;
             }
-
-            println!(
-                "{} Added gitignore template: {} to {}",
-                "✓".green(),
-                template_name,
-                dest_path.display()
-            );
         }
     } else if output.len() == templates.len() {
         // Save each template to its own file as specified in output
@@ -252,41 +238,57 @@ fn download_templates(
             );
         }
     } else if output.len() == 1 {
-        // Merge all templates into one file
+        // Merge all templates into one file, but skip invalid templates and collect errors
         let mut merged_content = String::new();
+        let mut errors = Vec::new();
 
         for template_name in templates {
-            let template_path = find_template_in_cache(template_name, cache)?;
-            let url = format!("{}/{}", GITHUB_RAW_BASE, template_path);
-
-            let msg = format!("Downloading gitignore template: {}", template_name);
-            let pb = progress::spinner(&msg);
-            let content = fetcher.fetch_content(&url)?;
-            pb.set_message("Download Complete");
-            pb.finish_and_clear();
-
-            merged_content.push_str(&format!(
-                "# ===== {}.gitignore =====\n{}\n\n",
-                template_name, content
-            ));
+            match find_template_in_cache(template_name, cache) {
+                Ok(template_path) => {
+                    let url = format!("{}/{}", GITHUB_RAW_BASE, template_path);
+
+                    let msg = format!("Downloading gitignore template: {}", template_name);
+                    let pb = progress::spinner(&msg);
+                    match fetcher.fetch_content(&url) {
+                        Ok(content) => {
+                            pb.set_message("Download Complete");
+                            pb.finish_and_clear();
+                            merged_content.push_str(&format!(
+                                "# ===== {}.gitignore =====\n{}\n\n",
+                                template_name, content
+                            ));
+                        }
+                        Err(e) => {
+                            pb.finish_and_clear();
+                            errors.push(format!(
+                                "Failed to fetch template '{}': {}",
+                                template_name, e
+                            ));
+                        }
+                    }
+                }
+                Err(e) => {
+                    errors.push(format!("Template '{}' not found: {}", template_name, e));
+                }
+            }
         }
 
         let dest_path = dir_path
             .map(|p| p.join(&output[0]))
             .unwrap_or_else(|| Path::new(OUTPUT_BASE_PATH).join(OUTPUT).join(&output[0]));
 
-        if append {
-            file::append_file(&merged_content, &dest_path, None)?;
-        } else {
-            file::save_file(&merged_content, &dest_path, force)?;
+        if !merged_content.is_empty() {
+            if append {
+                file::append_file(&merged_content, &dest_path, None)?;
+            } else {
+                file::save_file(&merged_content, &dest_path, force)?;
+            }
         }
 
-        println!(
-            "{} Added gitignore templates: {} to {}",
-            "✓".green(),
-            templates.join(", "),
-            dest_path.display()
-        );
+        // Print errors for invalid templates
+        for error in errors {
+            eprintln!("{}", error.red());
+        }
     } else {
         return Err(anyhow::anyhow!(
             "Number of output files must be either 1 or match the number of templates when not using --use-remote-name"

src/commands/issue/add.rs

@@ -151,12 +151,5 @@ fn download_single_template(
 
     file::save_file(&content, &dest_path, force)?;
 
-    println!(
-        "{} Added template: {} to {}",
-        "✓".green(),
-        template_name,
-        dest_path.display()
-    );
-
     Ok(())
 }

src/commands/license/add.rs

@@ -195,12 +195,6 @@ fn download_single_license(
 
     file::save_file(&processed_text, &dest_path, config.force)?;
 
-    println!(
-        "{} Downloaded and added license: {}",
-        "✓".green(),
-        dest_path.display()
-    );
-
     Ok(())
 }
 

src/commands/pr/add.rs

@@ -165,7 +165,5 @@ fn download_single_template(
 
     file::save_file(&content, &dest_path, force)?;
 
-    println!("{} {} - has been added.", "✓".green(), dest_path.display());
-
     Ok(())
 }

src/utils/file.rs

@@ -1,9 +1,10 @@
-use anyhow::Result;
 use std::fs;
-use std::fs::OpenOptions;
 use std::io::Write;
 use std::path::{Path, PathBuf};
 
+use anyhow::Result;
+use colored::*;
+
 /// Save content to a file with path resolution middleware
 pub fn save_file(content: &str, filepath: &Path, force: bool) -> Result<()> {
     let resolved_path = resolve_output_path(filepath)?;
@@ -48,6 +49,8 @@ pub fn save_file(content: &str, filepath: &Path, force: bool) -> Result<()> {
     }
 
     fs::write(resolved_path, content)?;
+
+    println!("{} {} - has been added.", "✓".green(), display_path);
     Ok(())
 }
 
@@ -79,7 +82,7 @@ pub fn append_file(content: &str, filepath: &Path, line_position: Option<usize>)
     match line_position {
         None => {
             // Simple append at the end
-            let mut file = OpenOptions::new()
+            let mut file = fs::OpenOptions::new()
                 .create(true)
                 .append(true)
                 .open(&resolved_path)?;

tests/integration/gitignore_tests.rs

@@ -241,8 +241,6 @@ fn test_gitignore_add_update_cache() {
 }
 
 #[test]
-#[ignore]
-// TODO we should support this case forcing a clear separation of adding templates
 fn test_gitignore_add_valid_and_invalid_template() {
     let temp_dir = setup_test_env();
     let temp_path = temp_dir.path().to_path_buf();

tests/integration/license_tests.rs

@@ -53,7 +53,7 @@ fn test_license_add_with_params() {
     ])
     .assert()
     .success()
-    .stdout(predicate::str::contains("added license"))
+    .stdout(predicate::str::contains("has been added."))
     .stdout(predicate::str::contains("Filled"));
 
     let content = fs::read_to_string(temp_path.join("LICENSE")).unwrap();
@@ -145,7 +145,7 @@ fn test_license_add_multiple_licenses_with_output_files() {
     ])
     .assert()
     .success()
-    .stdout(predicate::str::contains("added license"))
+    .stdout(predicate::str::contains("has been added."))
     .stdout(predicate::str::contains("MIT"))
     .stdout(predicate::str::contains("APACHE2-0"));
 
@@ -208,7 +208,7 @@ fn test_license_add_multiple_licenses_with_params_and_output_files() {
     ])
     .assert()
     .success()
-    .stdout(predicate::str::contains("added license"));
+    .stdout(predicate::str::contains("has been added."));
 
     let mit_content = fs::read_to_string(&mit_path).unwrap();
     let apache_content = fs::read_to_string(&apache_path).unwrap();