fixup! Add list scheme system

Author: JamyGolden

Diff for: CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ## Unreleased
 
+### Added
+
+- Add support for `list`, `listbase16` and `listbase24` scheme systems
+  for use in the `templates/config.yaml` file to add a `schemes` list to
+  mustache context to be able to list scheme information in a single
+  file.
+
 ### Changed
 
 - Change `get_scheme_files` and `SchemeFile::new` type arguments from

Diff for: tinted-builder-rust/src/operations/build.rs

@@ -110,14 +110,28 @@ pub fn build(
             .clone()
             .unwrap_or(vec![SchemeSystem::default()]);
 
-        if supported_systems.contains(&SchemeSystem::List) {
+        let list_systems: Vec<&SchemeSystem> = supported_systems
+            .iter()
+            .filter(|system| {
+                matches!(
+                    system,
+                    SchemeSystem::List | SchemeSystem::ListBase16 | SchemeSystem::ListBase24
+                )
+            })
+            .collect();
+
+        for system in &list_systems {
             render_list(
                 &theme_template_path,
+                system,
                 (template_item_config_name, template_item_config_value),
                 all_scheme_files.clone(),
                 is_quiet,
             )?;
-        } else {
+        }
+
+        // Render list, otherwise generate
+        if list_systems.is_empty() {
             let template_item_scheme_files: Vec<(PathBuf, Scheme)> = all_scheme_files
                 .iter()
                 .filter_map(|(path, scheme)| {
@@ -144,14 +158,11 @@ pub fn build(
 
 fn render_list(
     template_path: impl AsRef<Path>,
+    scheme_system: &SchemeSystem,
     (config_name, config_value): (&str, &TemplateConfig),
     all_scheme_files: Vec<(PathBuf, Scheme)>,
     is_quiet: bool,
 ) -> Result<()> {
-    let supported_systems = config_value
-        .supported_systems
-        .clone()
-        .unwrap_or(vec![SchemeSystem::default()]);
     let filename = get_filename(config_value, is_quiet)?;
     let mustache_template_path = template_path
         .as_ref()
@@ -168,14 +179,18 @@ fn render_list(
             .into_iter()
             .filter_map(|(_, scheme)| match scheme {
                 Scheme::Base16(scheme) => {
-                    if supported_systems.contains(&SchemeSystem::Base16) {
+                    if *scheme_system == SchemeSystem::List
+                        || *scheme_system == SchemeSystem::ListBase16
+                    {
                         Some(scheme)
                     } else {
                         None
                     }
                 }
                 Scheme::Base24(scheme) => {
-                    if supported_systems.contains(&SchemeSystem::Base24) {
+                    if *scheme_system == SchemeSystem::List
+                        || *scheme_system == SchemeSystem::ListBase24
+                    {
                         Some(scheme)
                     } else {
                         None
@@ -187,7 +202,11 @@ fn render_list(
     );
     let data = serde_yaml::to_string(&data).unwrap_or_default();
     let output = ribboncurls::render(&template_content, &data, None)?;
-    let parsed_filename = parse_filename(&template_path, &filename)?;
+    let filepath = filename
+        .replace("{{ scheme-system }}", &scheme_system.to_string())
+        .replace("{{scheme-system}}", &scheme_system.to_string());
+
+    let parsed_filename = parse_filename(&template_path, &filepath)?;
     let output_path = parsed_filename.get_path();
 
     if !parsed_filename.directory.exists() {
@@ -199,15 +218,7 @@ fn render_list(
     if !is_quiet {
         println!(
             "Successfully generated \"{}\" list with filename \"{}\"",
-            supported_systems
-                .iter()
-                .filter_map(|item| if *item == SchemeSystem::List {
-                    None
-                } else {
-                    Some(item.as_str().to_string())
-                })
-                .collect::<Vec<String>>()
-                .join(", "),
+            scheme_system,
             template_path.as_ref().join(filename).display(),
         );
     }

Diff for: tinted-builder-rust/tests/fixtures/rendered/list.md

@@ -1 +1,2 @@
 base16-silk-light - variant: light
+base24-dracula - variant: dark

Diff for: tinted-builder-rust/tests/fixtures/rendered/listbase16.md

@@ -0,0 +1 @@
+base16-silk-light - variant: light

Diff for: tinted-builder-rust/tests/fixtures/rendered/listbase24.md

@@ -0,0 +1 @@
+base24-dracula - variant: dark

Diff for: tinted-builder-rust/tests/fixtures/templates/list-config.yaml

@@ -1,3 +1,3 @@
-list: 
-  filename: list.md
-  supported-systems: [list, base16]
+list:
+  filename: "{{ scheme-system }}-list.md"
+  supported-systems: [list, listbase16, listbase24]

Diff for: tinted-builder-rust/tests/operation_build.rs

@@ -414,15 +414,17 @@ fn test_operation_build_mixed() -> Result<()> {
 }
 
 #[test]
-fn test_operation_build_list() -> Result<()> {
+fn test_operation_build_listbase16() -> Result<()> {
     // -------
     // Arrange
     // -------
     let name = "operation_build_list";
     let template_theme_path = PathBuf::from(format!("./template-{}", name));
     let template_templates_path = template_theme_path.join("templates");
     let schemes_path = template_theme_path.join("schemes");
-    let rendered_theme_path = template_theme_path.join("list.md");
+    let rendered_list_theme_path = template_theme_path.join("list-list.md");
+    let rendered_listbase16_theme_path = template_theme_path.join("listbase16-list.md");
+    let rendered_listbase24_theme_path = template_theme_path.join("listbase24-list.md");
 
     if template_theme_path.is_dir() {
         fs::remove_dir_all(&template_theme_path)?;
@@ -447,25 +449,35 @@ fn test_operation_build_list() -> Result<()> {
         format!("--schemes-dir={}", schemes_path.display()),
     ])
     .unwrap();
-    let rendered_content = fs::read_to_string(rendered_theme_path)?;
-    let expected_content = fs::read_to_string("./tests/fixtures/rendered/list.md")?;
+    let rendered_list_content = fs::read_to_string(rendered_list_theme_path)?;
+    let rendered_listbase16_content = fs::read_to_string(rendered_listbase16_theme_path)?;
+    let rendered_listbase24_content = fs::read_to_string(rendered_listbase24_theme_path)?;
+    let expected_list_content = fs::read_to_string("./tests/fixtures/rendered/list.md")?;
+    let expected_listbase16_content =
+        fs::read_to_string("./tests/fixtures/rendered/listbase16.md")?;
+    let expected_listbase24_content =
+        fs::read_to_string("./tests/fixtures/rendered/listbase24.md")?;
 
     // ------
     // Assert
     // ------
-    assert_eq!(rendered_content, expected_content);
+    assert_eq!(rendered_list_content, expected_list_content);
+    assert_eq!(rendered_listbase16_content, expected_listbase16_content);
+    assert_eq!(rendered_listbase24_content, expected_listbase24_content);
     assert!(
         stderr.is_empty(),
         "stderr does not contain the expected output"
     );
-    assert_eq!(
-        stdout,
-        format!(
-            "Successfully generated \"base16\" list with filename \"{}\"\n",
-            template_theme_path.join("list.md").display()
-        )
+    let expected_output = format!(
+        r#"Successfully generated "list" list with filename "{0}/{{{{ scheme-system }}}}-list.md"
+Successfully generated "listbase16" list with filename "{0}/{{{{ scheme-system }}}}-list.md"
+Successfully generated "listbase24" list with filename "{0}/{{{{ scheme-system }}}}-list.md"
+"#,
+        template_theme_path.display(),
     );
 
+    assert_eq!(stdout, expected_output);
+
     Ok(())
 }
 

Diff for: tinted-builder/src/scheme.rs

@@ -80,6 +80,8 @@ pub enum SchemeSystem {
     /// Base24 scheme system.
     Base24,
     List,
+    ListBase16,
+    ListBase24,
 }
 
 impl SchemeSystem {
@@ -89,6 +91,8 @@ impl SchemeSystem {
             SchemeSystem::Base16 => "base16",
             SchemeSystem::Base24 => "base24",
             SchemeSystem::List => "list",
+            SchemeSystem::ListBase16 => "listbase16",
+            SchemeSystem::ListBase24 => "listbase24",
         }
     }
     pub fn variants() -> &'static [SchemeSystem] {

Diff for: tinted-builder/src/scheme/base16.rs

@@ -102,7 +102,7 @@ impl<'de> Deserialize<'de> for Base16Scheme {
                     )));
                 }
             }
-            SchemeSystem::List => {
+            _ => {
                 return Err(serde::de::Error::custom(format!(
                     "{} is not a valid Scheme system for a specific scheme",
                     wrapper.system