From 348dc926bdd098e238f136788e42de0f6106ea70 Mon Sep 17 00:00:00 2001
From: diversable <dan.mantei@outlook.com>
Date: Tue, 14 Feb 2023 16:10:11 -0800
Subject: [PATCH 1/8] feat: add ion template inspect cmd

---
 src/bin/ion/commands/template.rs | 27 ++++++++-
 src/ion/blueprints/utils.rs      | 94 +++++++++++++++++++++++++++++++-
 tests/bin/mod.rs                 |  1 +
 tests/bin/template.rs            | 22 ++++++++
 4 files changed, 141 insertions(+), 3 deletions(-)
 create mode 100644 tests/bin/template.rs

diff --git a/src/bin/ion/commands/template.rs b/src/bin/ion/commands/template.rs
index e6260d5..34feae4 100644
--- a/src/bin/ion/commands/template.rs
+++ b/src/bin/ion/commands/template.rs
@@ -1,6 +1,8 @@
 use clap::parser::ArgMatches;
-use clap::Command;
-use ion::blueprints::list_templates;
+use clap::{arg, Command};
+use ion::blueprints::{
+    ask_inspect_template, inspect_all_templates, inspect_template, list_templates,
+};
 use ion::config::Config;
 use ion::errors::CliResult;
 use ion::template::RemoteTemplate;
@@ -10,6 +12,12 @@ pub fn cli() -> Command {
         .about("template management")
         .subcommand(Command::new("list").about("list all available templates"))
         .subcommand(Command::new("update").about("update the templates from registry"))
+        .subcommand(
+            Command::new("inspect")
+                .about("inspect the contents of a template")
+                .arg(arg!([TEMPLATE] "Selects which template to print out"))
+                .arg(arg!(--"all" "Inspect all installed templates")),
+        )
         .arg_required_else_help(true)
 }
 
@@ -19,6 +27,21 @@ pub fn exec(config: &mut Config, matches: &ArgMatches) -> CliResult {
         Some(("update", _)) => {
             RemoteTemplate::new(config).download()?;
         }
+        Some(("inspect", matches)) => {
+            // Iff a template name is provided, inspect template; otherwise, check for --all flag; if no --all, ask user to select template from list
+
+            match matches.get_one::<String>("TEMPLATE") {
+                Some(template) => inspect_template(config, template.to_owned())?,
+                None => {
+                    let all_flag = matches.get_flag("all");
+                    if all_flag {
+                        inspect_all_templates(config)?;
+                    } else {
+                        ask_inspect_template(config)?;
+                    }
+                }
+            };
+        }
         _ => unreachable!(),
     }
     Ok(())
diff --git a/src/ion/blueprints/utils.rs b/src/ion/blueprints/utils.rs
index 07e9d8f..e98248b 100644
--- a/src/ion/blueprints/utils.rs
+++ b/src/ion/blueprints/utils.rs
@@ -1,7 +1,7 @@
 use crate::blueprints::*;
 use crate::spec::Author;
 use anyhow::{format_err, Error, Result};
-use dialoguer::{Confirm, Input};
+use dialoguer::{theme::ColorfulTheme, Confirm, Input, Select};
 
 pub fn git_get_user() -> Result<(String, String)> {
     let user = if let Some(name) = git_config_get("user.name") {
@@ -112,6 +112,98 @@ pub fn list_templates(config: &Config) -> Result<()> {
     Ok(())
 }
 
+pub fn inspect_template(config: &Config, template_name: String) -> Result<()> {
+    let templates = config.template_dir().read_dir()?;
+
+    for entry in templates {
+        let entry = match entry {
+            Ok(e) => e,
+            Err(e) => {
+                return Err(Error::new(e));
+            }
+        };
+
+        let path = entry.path();
+        if path.is_dir() {
+            let source = std::fs::read_to_string(path.join("template.toml"))?;
+
+            let template = match toml::from_str::<Template>(&source) {
+                Ok(t) => t,
+                Err(e) => {
+                    return Err(format_err!("Error parsing template: {}", e));
+                }
+            };
+            if template.name == template_name {
+                println!("{}", source);
+            }
+        }
+    }
+    Ok(())
+}
+
+pub fn inspect_all_templates(config: &Config) -> Result<()> {
+    let templates = config.template_dir().read_dir()?;
+
+    for entry in templates {
+        let entry = match entry {
+            Ok(e) => e,
+            Err(e) => {
+                return Err(Error::new(e));
+            }
+        };
+
+        let path = entry.path();
+        if path.is_dir() {
+            let source = std::fs::read_to_string(path.join("template.toml"))?;
+
+            println!("\n{}\n**********", source);
+        }
+    }
+    Ok(())
+}
+
+pub fn ask_inspect_template(config: &Config) -> Result<()> {
+    // Get selection options from installed templates
+    let mut selection_options = vec![];
+
+    let templates = config.template_dir().read_dir()?;
+    for entry in templates {
+        let entry = match entry {
+            Ok(e) => e,
+            Err(e) => {
+                return Err(Error::new(e));
+            }
+        };
+
+        let path = entry.path();
+        if path.is_dir() {
+            let source = std::fs::read_to_string(path.join("template.toml"))?;
+
+            let template = match toml::from_str::<Template>(&source) {
+                Ok(t) => t,
+                Err(e) => {
+                    return Err(format_err!("Error parsing template: {}", e));
+                }
+            };
+
+            selection_options.push(template.name);
+        }
+    }
+
+    // Ask for template to print to console
+    let template_name = Select::with_theme(&ColorfulTheme::default())
+        .items(&selection_options)
+        .default(1)
+        .interact_opt()
+        .unwrap();
+
+    match template_name {
+        Some(index) => inspect_template(config, selection_options[index].to_owned())?,
+        _ => unreachable!(),
+    }
+    Ok(())
+}
+
 pub fn git_config_get(key: &str) -> Option<String> {
     let output = std::process::Command::new("git")
         .arg("config")
diff --git a/tests/bin/mod.rs b/tests/bin/mod.rs
index c94f16d..ce978d3 100644
--- a/tests/bin/mod.rs
+++ b/tests/bin/mod.rs
@@ -3,6 +3,7 @@ pub mod clone;
 pub mod new;
 pub mod pkg;
 pub mod script;
+pub mod template;
 
 pub mod utils;
 pub use utils::*;
diff --git a/tests/bin/template.rs b/tests/bin/template.rs
new file mode 100644
index 0000000..3e70882
--- /dev/null
+++ b/tests/bin/template.rs
@@ -0,0 +1,22 @@
+use super::*;
+
+#[test]
+fn test_template() {
+    Ion::new().arg("template").arg("list").assert().success();
+
+    Ion::new().arg("template").arg("update").assert().success();
+
+    Ion::new()
+        .arg("template")
+        .arg("inspect")
+        .arg("--all")
+        .assert()
+        .success();
+
+    Ion::new()
+        .arg("template")
+        .arg("inspect")
+        .arg("package")
+        .assert()
+        .success();
+}

From d14287097f274fb666cbfc4a496c0be9f2937e42 Mon Sep 17 00:00:00 2001
From: diversable <dan.mantei@outlook.com>
Date: Tue, 14 Feb 2023 16:15:50 -0800
Subject: [PATCH 2/8] bump patch release

---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index b037747..ff16091 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ion"
-version = "0.1.14"
+version = "0.1.15"
 edition = "2021"
 publish = false
 authors = ["Roger Luo <rogerluo.rl18@gmail.com>"]

From be88ce308db01464aa6363af75856aed66ba99b5 Mon Sep 17 00:00:00 2001
From: diversable <dan.mantei@outlook.com>
Date: Tue, 14 Feb 2023 17:52:18 -0800
Subject: [PATCH 3/8] fix: ion template inspect; add more tests

---
 src/ion/blueprints/utils.rs | 12 ++++++++++++
 tests/bin/template.rs       |  7 +++++++
 2 files changed, 19 insertions(+)

diff --git a/src/ion/blueprints/utils.rs b/src/ion/blueprints/utils.rs
index e98248b..98dc82c 100644
--- a/src/ion/blueprints/utils.rs
+++ b/src/ion/blueprints/utils.rs
@@ -115,6 +115,8 @@ pub fn list_templates(config: &Config) -> Result<()> {
 pub fn inspect_template(config: &Config, template_name: String) -> Result<()> {
     let templates = config.template_dir().read_dir()?;
 
+    let mut template_found: bool = false;
+
     for entry in templates {
         let entry = match entry {
             Ok(e) => e,
@@ -134,10 +136,20 @@ pub fn inspect_template(config: &Config, template_name: String) -> Result<()> {
                 }
             };
             if template.name == template_name {
+                template_found = true;
                 println!("{}", source);
             }
         }
     }
+
+    // If the template the user requested is not in the list of downloaded templates, ask user to select existing template to inspect
+    if !template_found {
+        println!(
+            "The {} template was not found.\nInstalled templates are:",
+            template_name
+        );
+        ask_inspect_template(config)?
+    }
     Ok(())
 }
 
diff --git a/tests/bin/template.rs b/tests/bin/template.rs
index 3e70882..d2e17c4 100644
--- a/tests/bin/template.rs
+++ b/tests/bin/template.rs
@@ -19,4 +19,11 @@ fn test_template() {
         .arg("package")
         .assert()
         .success();
+
+    Ion::new()
+        .arg("template")
+        .arg("inspect")
+        .arg("nonce")
+        .assert()
+        .success();
 }

From 24ec3df762f63eec802c6ee4627453363874775f Mon Sep 17 00:00:00 2001
From: diversable <dan.mantei@outlook.com>
Date: Tue, 14 Feb 2023 18:20:02 -0800
Subject: [PATCH 4/8] update tests

---
 tests/bin/template.rs | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/tests/bin/template.rs b/tests/bin/template.rs
index d2e17c4..3e70882 100644
--- a/tests/bin/template.rs
+++ b/tests/bin/template.rs
@@ -19,11 +19,4 @@ fn test_template() {
         .arg("package")
         .assert()
         .success();
-
-    Ion::new()
-        .arg("template")
-        .arg("inspect")
-        .arg("nonce")
-        .assert()
-        .success();
 }

From b4f161cf7e62aaa15781fe50235ba7b37191b180 Mon Sep 17 00:00:00 2001
From: diversable <dan.mantei@outlook.com>
Date: Wed, 15 Feb 2023 13:31:55 -0800
Subject: [PATCH 5/8] fix: inspect template implementation

---
 src/ion/blueprints/utils.rs | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/ion/blueprints/utils.rs b/src/ion/blueprints/utils.rs
index 98dc82c..12a2fbc 100644
--- a/src/ion/blueprints/utils.rs
+++ b/src/ion/blueprints/utils.rs
@@ -206,13 +206,12 @@ pub fn ask_inspect_template(config: &Config) -> Result<()> {
     let template_name = Select::with_theme(&ColorfulTheme::default())
         .items(&selection_options)
         .default(1)
-        .interact_opt()
-        .unwrap();
+        .interact_opt()?;
+
+    if let Some(template_name) = template_name {
+        inspect_template(config, selection_options[template_name].to_owned())?
+    };
 
-    match template_name {
-        Some(index) => inspect_template(config, selection_options[index].to_owned())?,
-        _ => unreachable!(),
-    }
     Ok(())
 }
 

From 7ecda5a8121580fe1f78fbb789be16c9f27da41c Mon Sep 17 00:00:00 2001
From: diversable <dan.mantei@outlook.com>
Date: Wed, 15 Feb 2023 13:32:17 -0800
Subject: [PATCH 6/8] reverse bump version

---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index ff16091..b037747 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ion"
-version = "0.1.15"
+version = "0.1.14"
 edition = "2021"
 publish = false
 authors = ["Roger Luo <rogerluo.rl18@gmail.com>"]

From 64280dad48e9c234ab3c76d0dd0fcfa44bcc12a4 Mon Sep 17 00:00:00 2001
From: diversable <dan.mantei@outlook.com>
Date: Wed, 15 Feb 2023 16:28:08 -0800
Subject: [PATCH 7/8] test: update template tests

---
 tests/bin/template.rs | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/tests/bin/template.rs b/tests/bin/template.rs
index 3e70882..dbc060f 100644
--- a/tests/bin/template.rs
+++ b/tests/bin/template.rs
@@ -1,7 +1,8 @@
 use super::*;
+use anyhow::{Ok, Result};
 
 #[test]
-fn test_template() {
+fn test_template() -> Result<()> {
     Ion::new().arg("template").arg("list").assert().success();
 
     Ion::new().arg("template").arg("update").assert().success();
@@ -19,4 +20,27 @@ fn test_template() {
         .arg("package")
         .assert()
         .success();
+
+    // Test escape from input / Ctrl+C behaviour with `ion template inspect` (cf. ask_inspect_input fn)
+    let mut p = Ion::new()
+        .arg("template")
+        .arg("inspect")
+        .arg("nonce")
+        .spawn(Some(30_000))?;
+
+    p.send_control('c')?;
+    p.exp_eof()?;
+
+    Ok(())?;
+
+    // Test nonce input
+    let mut ps = Ion::new()
+        .arg("template")
+        .arg("inspect")
+        .arg("nonce")
+        .spawn(Some(5_000))?;
+
+    ps.exp_string("Installed templates are:")?;
+
+    Ok(())
 }

From cf02c96c2680ff6b1c05dcef52f67e49042af8d0 Mon Sep 17 00:00:00 2001
From: diversable <dan.mantei@outlook.com>
Date: Thu, 16 Feb 2023 00:22:54 -0800
Subject: [PATCH 8/8] Fix test: template

---
 tests/bin/template.rs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/bin/template.rs b/tests/bin/template.rs
index dbc060f..87a8036 100644
--- a/tests/bin/template.rs
+++ b/tests/bin/template.rs
@@ -42,5 +42,10 @@ fn test_template() -> Result<()> {
 
     ps.exp_string("Installed templates are:")?;
 
+    // Send <ENTER> keycode to pty
+    ps.send_control('j')?;
+    ps.exp_string("name")?;
+    ps.exp_eof()?;
+
     Ok(())
 }