slight changes to template handling

these are kinda lame but oh well

Author: joshrotenberg

src/cmd/config.rs

@@ -1,3 +1,5 @@
+use std::path::PathBuf;
+
 use anyhow::Result;
 use clap::Args;
 
@@ -11,10 +13,26 @@ pub(crate) fn run(_args: &ConfigArgs) -> Result<()> {
         "adrs_bin_dir={}",
         std::env::current_exe().unwrap().parent().unwrap().display()
     );
-    println!("adrs_template_dir=embedded");
+
+    // find the template directory. if ADRS_TEMPLATE is set, use that. otherwise, check
+    // to see if there is an adr dir, and if it has a templates directory, use that.
+    // otherwise use embedded
+    if let Ok(template_file) = std::env::var("ADRS_TEMPLATE") {
+        let mut path = PathBuf::from(template_file);
+        path.pop();
+        println!("adrs_template_dir={}", path.display());
+    } else if let Ok(adr_dir) = read_adr_dir_file() {
+        if adr_dir.join("templates").exists() {
+            println!("adrs_template_dir={}", adr_dir.join("templates").display());
+        } else {
+            println!("adrs_template_dir=embedded");
+        }
+    } else {
+        println!("adrs_template_dir=embedded");
+    }
+
     if let Ok(adr_dir) = read_adr_dir_file() {
         println!("adrs_dir={}", adr_dir.display());
-        return Ok(());
     }
     Ok(())
 }

src/cmd/new.rs

@@ -12,7 +12,8 @@ use crate::adr::{
     remove_status,
 };
 
-static NEW_TEMPLATE: &str = include_str!("../../templates/nygard/new.md");
+static DEFAULT_NEW_TEMPLATE: &str = include_str!("../../templates/nygard/new.md");
+static DEFAULT_CUSTOM_TEMPLATE_FILENAME: &str = "templates/template.md";
 
 #[derive(Debug, Args)]
 #[command(version, about, long_about = None)]
@@ -28,13 +29,8 @@ pub(crate) struct NewArgs {
     title: Vec<String>,
     /// Use a custom template when generating the new Architectural Decision Record.
     /// Relative paths are resolved with respect to the directory specified in `.adr-dir`.
-    #[arg(
-        default_value = "templates/template.md",
-        env = "ADRS_TEMPLATE_DIR",
-        short = 'T',
-        long
-    )]
-    template: PathBuf,
+    #[arg(env = "ADRS_TEMPLATE", short, long)]
+    template: Option<PathBuf>,
 }
 
 #[derive(Debug, Serialize)]
@@ -48,9 +44,22 @@ struct NewAdrContext {
 
 pub(crate) fn run(args: &NewArgs) -> Result<()> {
     let adr_dir = find_adr_dir().context("No ADR directory found")?;
-    let number = next_adr_number(&adr_dir)?;
+    let raw_template = if let Some(template) = &args.template {
+        if !template.exists() {
+            return Err(anyhow::anyhow!(
+                "Template file not found: {}",
+                template.display()
+            ));
+        }
+        read_to_string(template)?
+    } else if let Ok(template) = read_to_string(adr_dir.join(DEFAULT_CUSTOM_TEMPLATE_FILENAME)) {
+        template
+    } else {
+        DEFAULT_NEW_TEMPLATE.to_string()
+    };
 
     let title = args.title.join(" ");
+    let number = next_adr_number(&adr_dir)?;
 
     let superseded = args
         .superseded
@@ -102,12 +111,6 @@ pub(crate) fn run(args: &NewArgs) -> Result<()> {
         linked,
     };
 
-    let template_file = adr_dir.join(&args.template);
-    let raw_template = if template_file.exists() {
-        read_to_string(template_file)?
-    } else {
-        NEW_TEMPLATE.to_string()
-    };
     let mut registry = Handlebars::new();
     registry.register_template_string("new_adr", raw_template)?;
     let rendered = registry.render("new_adr", &new_context)?;

tests/test_config.rs

@@ -17,3 +17,37 @@ fn test_config() {
                 .and(predicate::str::contains("adrs_template_dir=embedded")),
         );
 }
+
+#[test]
+#[serial_test::serial]
+fn test_config_with_embedded_template() {
+    let temp = TempDir::new().unwrap();
+    std::env::set_current_dir(temp.path()).unwrap();
+    // std::env::set_var(
+    //     "ADRS_TEMPLATE",
+    //     temp.path().join("templates").to_str().unwrap(),
+    // );
+    std::env::set_var("EDITOR", "cat");
+
+    Command::cargo_bin("adrs")
+        .unwrap()
+        .arg("init")
+        .assert()
+        .success();
+
+    Command::cargo_bin("adrs")
+        .unwrap()
+        .arg("new")
+        .arg("Test new")
+        .assert()
+        .success();
+
+    Command::cargo_bin("adrs")
+        .unwrap()
+        .arg("config")
+        .assert()
+        .stdout(
+            predicate::str::contains("adrs_template_dir=embedded")
+                .and(predicate::str::contains("adrs_dir=doc/adr")),
+        );
+}

tests/test_new.rs

@@ -209,7 +209,7 @@ fn test_new_template() {
     Command::cargo_bin("adrs")
         .unwrap()
         .arg("new")
-        .arg("-T")
+        .arg("-t")
         .arg(custom_location_template_path)
         .arg("Test template custom location")
         .assert()