code formatting

Author: Alexander Weber

Cargo.toml

@@ -4,7 +4,7 @@ version = "0.0.0"
 authors = ["Alexander Weber <[email protected]>"]
 edition = "2018"
 license = "MIT"
-description = "Standardizing messages the right way."
+description = "A powerful text templating tool."
 homepage = "https://replicadse.github.io/complate"
 repository = "https://github.com/replicadse/complate"
 keywords = ["cli", "template", "replace", "standardizing"]

examples/helm/render.sh

@@ -6,8 +6,8 @@ echo ""
 complate -e render -t chart -v "version=0.1.0"
 echo ">>> values dev <<<"
 echo ""
-MY_SECRET_PASS="pass:superpass" complate -e render -t dev --helpers --shell-trust=ultimate
+MY_SECRET_PASS="pass:superpass" complate -e render -t dev --trust
 echo ""
 echo ">>> values prod <<<"
 echo ""
-MY_SECRET_PASS="pass:superpass" complate -e render -t prod --helpers --shell-trust=ultimate
+MY_SECRET_PASS="pass:superpass" complate -e render -t prod --trust

src/args.rs

@@ -45,7 +45,7 @@ pub enum Command {
 pub struct RenderArguments {
     pub configuration: String,
     pub template: Option<String>,
-    pub value_overrides: std::collections::HashMap<String, String>,
+    pub value_overrides: HashMap<String, String>,
     pub shell_trust: ShellTrust,
     pub loose: bool,
     pub backend: Backend,
@@ -147,7 +147,7 @@ impl ClapArgumentLoader {
                     .help("Overrides a certain value definition with a string.")))
     }
 
-    pub async fn load_from_cli() -> std::result::Result<CallArgs, Box<dyn std::error::Error>> {
+    pub async fn load() -> Result<CallArgs, Box<dyn std::error::Error>> {
         let root_command = Self::root_command();
         let command_matches = root_command.get_matches();
 

src/config.rs

@@ -1,18 +1,20 @@
+use std::collections::BTreeMap;
+
 #[derive(Debug, serde::Serialize, serde::Deserialize)]
 pub struct Config {
     pub version: String,
     #[serde(default)]
-    pub templates: std::collections::BTreeMap<String, Template>,
+    pub templates: BTreeMap<String, Template>,
 }
 
 #[derive(Debug, serde::Serialize, serde::Deserialize)]
 #[serde(rename_all = "snake_case", deny_unknown_fields)]
 pub struct Template {
     pub content: Content,
     #[serde(default)]
-    pub values: std::collections::BTreeMap<String, VariableDefinition>,
+    pub values: BTreeMap<String, VariableDefinition>,
     #[serde(default)]
-    pub helpers: std::collections::BTreeMap<String, Helper>,
+    pub helpers: BTreeMap<String, Helper>,
 }
 
 #[derive(Debug, serde::Serialize, serde::Deserialize)]
@@ -51,12 +53,12 @@ pub enum VariableDefinition {
     Shell(String),
     Select {
         text: String,
-        options: std::collections::BTreeMap<String, Option>,
+        options: BTreeMap<String, Option>,
     },
     Check {
         text: String,
         separator: String,
-        options: std::collections::BTreeMap<String, Option>,
+        options: BTreeMap<String, Option>,
     },
 }
 

src/main.rs

@@ -12,11 +12,11 @@ pub mod render;
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
-    let cmd = crate::args::ClapArgumentLoader::load_from_cli().await?;
+    let cmd = args::ClapArgumentLoader::load().await?;
     cmd.validate().await?;
 
     match cmd.command {
-        | crate::args::Command::Manual { path, format } => {
+        | args::Command::Manual { path, format } => {
             let out_path = PathBuf::from(path);
             std::fs::create_dir_all(&out_path)?;
             match format {
@@ -29,19 +29,19 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
             }
             Ok(())
         },
-        | crate::args::Command::Autocomplete { path, shell } => {
+        | args::Command::Autocomplete { path, shell } => {
             let out_path = PathBuf::from(path);
             std::fs::create_dir_all(&out_path)?;
             reference::build_shell_completion(&out_path, &shell)?;
             Ok(())
         },
-        | crate::args::Command::Init => {
+        | args::Command::Init => {
             std::fs::create_dir_all("./.complate")?;
-            std::fs::write("./.complate/config.yaml", crate::config::default_config().await)?;
+            std::fs::write("./.complate/config.yaml", config::default_config().await)?;
             Ok(())
         },
-        | crate::args::Command::Render(x) => {
-            let res = crate::render::select_and_render(x).await?;
+        | args::Command::Render(x) => {
+            let res = render::select_and_render(x).await?;
             std::io::stdout().write_all(res.as_bytes())?;
             Ok(())
         },

src/render/cli.rs

@@ -2,7 +2,10 @@ use crate::error::Error;
 
 use super::UserInput;
 use async_trait::async_trait;
-use std::{collections::HashMap, result::Result};
+use std::{
+    collections::{BTreeMap, HashMap},
+    result::Result,
+};
 
 pub struct CLIBackend<'a> {
     shell_trust: &'a super::ShellTrust,
@@ -26,7 +29,7 @@ impl<'a> UserInput for CLIBackend<'a> {
     async fn select(
         &self,
         prompt: &str,
-        options: &std::collections::BTreeMap<String, super::Option>,
+        options: &BTreeMap<String, super::Option>,
     ) -> Result<String, Box<dyn std::error::Error>> {
         let keys = options.keys().cloned().collect::<Vec<String>>();
         let display_vals = options.values().map(|x| x.display.to_owned()).collect::<Vec<String>>();
@@ -47,7 +50,7 @@ impl<'a> UserInput for CLIBackend<'a> {
         &self,
         prompt: &str,
         separator: &str,
-        options: &std::collections::BTreeMap<String, super::Option>,
+        options: &BTreeMap<String, super::Option>,
     ) -> Result<String, Box<dyn std::error::Error>> {
         let keys = options.keys().cloned().collect::<Vec<String>>();
         let display_vals = options.values().map(|x| x.display.to_owned()).collect::<Vec<String>>();

src/render/ui.rs

@@ -4,7 +4,7 @@ use super::UserInput;
 use async_trait::async_trait;
 use cursive::traits::*;
 use cursive::views::Dialog;
-use std::collections::{HashMap, HashSet};
+use std::collections::{BTreeMap, HashMap, HashSet};
 use std::ops::Deref;
 use std::result::Result;
 
@@ -45,7 +45,7 @@ impl<'a> UserInput for UIBackend<'a> {
     async fn select(
         &self,
         prompt: &str,
-        options: &std::collections::BTreeMap<String, super::Option>,
+        options: &BTreeMap<String, super::Option>,
     ) -> Result<String, Box<dyn std::error::Error>> {
         let keys = options.keys().cloned().collect::<Vec<String>>();
         let mut index_display = 0usize;
@@ -94,7 +94,7 @@ impl<'a> UserInput for UIBackend<'a> {
         &self,
         _: &str,
         separator: &str,
-        options: &std::collections::BTreeMap<String, super::Option>,
+        options: &BTreeMap<String, super::Option>,
     ) -> Result<String, Box<dyn std::error::Error>> {
         let mut opts = Vec::new();
         {