Cargo.toml

@@ -1,15 +1,15 @@
 [package]
 name = "oink"
-version = "0.1.1"
+version = "0.0.2"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+#copy_dir = "0.1.3"
 pico-args = "0.5.0"
-termion = "2.0.1"
+tera = "1.19.0"
 toml = "0.7.6"
-upon = "0.7.1"
 
 [profile.release]
 opt-level = "s"

README.md

@@ -41,6 +41,6 @@ path = "/home/test/.config/oink/oink.toml"
 ## Libraries
 
 - [pico-args](https://crates.io/crates/pico-args) — argument parsing
-- [termion](https://crates.io/crates/termion) — ANSI formatting
+- [tera](https://crates.io/crates/tera) — template engine
 - [toml](https://crates.io/crates/toml) — configuration parsing
-- [upon](https://crates.io/crates/upon) — template engine
+

rust-toolchain.toml

@@ -0,0 +1,4 @@
+
+[toolchain]
+channel = "nightly"
+

src/config.rs

@@ -1,7 +1,7 @@
 //!	configuration struct and implementations
 
 use std::{
-	collections::{ BTreeMap, HashMap },
+	collections::HashMap,
 	env::var,
 	fs::{ create_dir, read_to_string, File },
 	io::Error,
@@ -9,7 +9,7 @@ use std::{
 	process::exit
 };
 
-use upon::Value as ContextValue;
+use tera::Context;
 use toml::{
 	map::Map,
 	Value
@@ -17,8 +17,6 @@ use toml::{
 
 use crate::error;
 
-pub type Context = BTreeMap<String, ContextValue>;
-
 ///	configuration struct
 pub struct Config {
 	pub dir: String,
@@ -63,17 +61,17 @@ impl Config {
 		if vars.is_some() {
 			let vars = vars.unwrap().as_table().unwrap();
 			for (key, value) in vars.iter() {
-				output.insert(key.to_owned(), value.as_str().into());
+				output.insert(key, value.as_str().unwrap());
 			}
 		}
 		let colors = self.inner.get("colors");
 		if colors.is_some() {
 			let colors = colors.unwrap().as_table().unwrap();
-			let mut map = Context::new();
+			let mut map = HashMap::<&str, &str>::new();
 			for (key, value) in colors.iter() {
-				map.insert(key.to_owned(), value.as_str().unwrap().into());
+				map.insert(key, value.as_str().unwrap());
 			}
-			output.insert("colors".to_owned(), map.into());
+			output.insert("colors", &map);
 		}
 
 		output

src/main.rs

@@ -1,11 +1,12 @@
+#![feature(error_in_core)]
 use std::process::exit;
 
 use pico_args::Arguments;
+use tera::Tera;
 
 mod config;
 mod error;
 mod operation;
-
 use crate::config::Config;
 
 fn main() {
@@ -19,8 +20,10 @@ fn main() {
 	//	init configuration
 	let config = Config::new();
 
-	//	build template dir
-	let template_dir = format!("{}/templates/", &(config.dir));
+	//	tera init
+	let context = config.context();
+	let template_dir = format!("{}/templates/*", &(config.dir));
+	let mut tera = Tera::new(&template_dir).unwrap();
 
 	let targets = config.targets();
 	if targets.len() == 0 { error::no_targets(); }
@@ -32,11 +35,11 @@ fn main() {
 			},
 		Some("build")
 			=> {
-				operation::build(&targets, template_dir, &config);
+				operation::build(&targets, &mut tera, &context);
 			},
 		Some("full")
 			=> {
-				operation::build(&targets, template_dir, &config);
+				operation::build(&targets, &mut tera, &context);
 				operation::apply(&targets);
 			},
 		_

src/operation.rs

@@ -1,27 +1,14 @@
 //!	higher-level operation functions
 use std::{
 	env::var,
-	fs::{self, read_to_string, File },
+	fs::{ self, File },
 	io::Write,
-	path::{ Path, PathBuf }
+	path::Path
 };
+use core::error::Error;
 
-use termion::{
-	color::{ self, Fg },
-	style::{
-		Bold as BOLD,
-		Italic as ITALIC,
-		Reset as RESET
-	}
-};
 use toml::{ map::Map, Value };
-use upon::Engine;
-
-use crate::config::Config;
-
-static SUCCESS: Fg<color::Green>	= Fg(color::Green);
-static WARNING: Fg<color::Yellow>	= Fg(color::Yellow);
-static FAILURE: Fg<color::Red>		= Fg(color::Red);
+use tera::{ Context, Tera };
 
 pub fn apply(targets: &Vec<Map<String, Value>>) {
 	let home = var("HOME").unwrap();
@@ -35,12 +22,12 @@ pub fn apply(targets: &Vec<Map<String, Value>>) {
 		if path.is_none() {
 			if i_name.is_some() {
 				let name = i_name.unwrap().as_str().unwrap();
-				println!("  {WARNING}\"{name}\" is missing its path property; skipping{RESET}");
-			} else { println!("  {WARNING}skipping empty target{RESET}"); }
+				println!("  \"{name}\" is missing its path property; skipping");
+			} else { println!("  skipping empty target"); }
 			continue;
 		}
 		if i_name.is_none() {
-			println!("  {WARNING}target missing name; skipping{RESET}");
+			println!("  target missing name; skipping");
 			continue;
 		}
 
@@ -55,28 +42,20 @@ pub fn apply(targets: &Vec<Map<String, Value>>) {
 
 		//	copy and print
 		let result = fs::copy(source, destination);
-		if result.is_err() {
-			println!("    {BOLD}{FAILURE}failed to copy{RESET}");
-		}
-		else {
-			println!("    {BOLD}{SUCCESS}completed{RESET}");
-		}
+		if result.is_err() { println!("    failed to copy!"); }
+		else { println!("    completed successfully"); }
 	}
 }
 
-pub fn build(targets: &Vec<Map<String, Value>>, template_dir: String, config: &Config) {
+pub fn build(targets: &Vec<Map<String, Value>>, tera: &mut Tera, context: &Context) {
 	let home = var("HOME").unwrap();
 	println!("running build:");
-
-	let engine = Engine::new();
-	let context = config.context();
-
 	for target in targets {
 		//	get name property
 		let i_name = target.get("name");
 		//	handle empty names gracefully
 		if i_name.is_none() {
-			println!("  {WARNING}target missing name; skipping{RESET}");
+			println!("  target missing name; skipping");
 			continue;
 		}
 
@@ -84,24 +63,14 @@ pub fn build(targets: &Vec<Map<String, Value>>, template_dir: String, config: &C
 		let name = i_name.unwrap().as_str().unwrap();
 		println!("  building \"{name}\":");
 
-		//	compile
-		println!("    {ITALIC}compiling{RESET}");
-		let mut path = PathBuf::from(&template_dir);
-		path.push(name);
-		let content = read_to_string(path).unwrap();
-		let template = engine.compile(&content);
-		if template.is_err() {
-			let error = template.err().unwrap();
-			println!("      {BOLD}{FAILURE}failed to compile template:{RESET}\n        {FAILURE}{error}\n        {BOLD}skipping{RESET}");
-			continue;
-		}
-
-		//	render
-		println!("    {ITALIC}rendering{RESET}");
-		let render = template.unwrap().render(&context).to_string();
+		//	render template
+		let render = tera.render(name, context);
+		//	handle rendering errors gracefully
 		if render.is_err() {
 			let error = render.err().unwrap();
-			println!("      {BOLD}{FAILURE}failed to render template:{RESET}\n        {FAILURE}{error}\n      {BOLD}skipping{RESET}");
+			let message = error.source().unwrap();
+
+			println!("   failed to render template:\n      {message}");
 			continue;
 		}
 
@@ -111,14 +80,14 @@ pub fn build(targets: &Vec<Map<String, Value>>, template_dir: String, config: &C
 		let path = Path::new(&destination);
 		let i_file = File::create(path);
 		if i_file.is_err() {
-			println!("    {BOLD}{FAILURE}failed to create destination file at {path:?}{RESET}");
+			println!("    failed to create destination file at {path:?}");
 			continue;
 		}
 		let mut file = i_file.unwrap();
 		//	write to destination file
 		let written = write!(&mut file, "{output}");
-		if written.is_err() { println!("    {FAILURE}failed to write to destination file at {path:?}{RESET}"); }
-		else { println!("    {BOLD}{SUCCESS}completed{RESET}"); }
+		if written.is_err() { println!("    failed to write to destination file at {path:?}"); }
+		else { println!("    completed successfully"); }
 	}
 }