Re-organize the package using lib.rs

.github/workflows/tests.yml

@@ -5,8 +5,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: dtolnay/rust-toolchain@stable
-      - run: cargo fmt --check
+      - uses: dtolnay/rust-toolchain@nightly
+      - run: cargo +nightly fmt --check
   clippy:
     runs-on: ubuntu-latest
     steps:

.rustfmt.toml

@@ -0,0 +1,2 @@
+reorder_imports = true
+group_imports = "StdExternalCrate"

Cargo.toml

@@ -1,10 +1,8 @@
 [package]
 name = "createnv"
-version = "0.1.0"
+version = "0.0.3"
 edition = "2021"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
 [dependencies]
 anyhow = "1.0.71"
 rand = "0.8.5"

src/lib.rs

@@ -0,0 +1,63 @@
+mod model;
+mod parser;
+mod reader;
+mod tokenizer;
+
+use std::path::PathBuf;
+
+use anyhow::Result;
+
+use crate::parser::Parser;
+use crate::{
+    model::{
+        AutoGeneratedVariable, Block, Comment, SimpleVariable, VariableType,
+        VariableWithRandomValue,
+    },
+    tokenizer::Tokenizer,
+};
+
+pub fn tokenize(path: &String) -> Result<()> {
+    let mut tokenizer = Tokenizer::new(PathBuf::from(path))?;
+    for token in tokenizer.tokenize()? {
+        println!("{}: {:?}", token.error_prefix(path), token);
+    }
+
+    Ok(())
+}
+
+pub fn parse(path: &String) -> Result<()> {
+    let mut parser = Parser::new(PathBuf::from(path))?;
+    for block in parser.parse()? {
+        println!("{block}");
+    }
+
+    Ok(())
+}
+
+pub fn model_to_text() -> Result<()> {
+    let title = Comment::new("42");
+    let description = Some(Comment::new("Fourty-two"));
+
+    let mut variable1 = SimpleVariable::new("ANSWER", None, None);
+    variable1.user_input("42");
+    let mut variable2 = SimpleVariable::new("AS_TEXT", None, None);
+    variable2.user_input("fourty two");
+    let variable3 = SimpleVariable::new("DEFAULT_VALUE_ONE", Some("default value"), None);
+    let mut variable4 = SimpleVariable::new("DEFAULT_VALUE_TWO", Some("default"), None);
+    variable4.user_input("custom");
+    let variable5 = VariableWithRandomValue::new("SECRET_KEY", None);
+    let variable6 = AutoGeneratedVariable::new("AUTO_GENERATED", "{ANSWER}-{DEFAULT_VALUE_ONE}");
+
+    let variables = vec![
+        VariableType::Input(variable1),
+        VariableType::Input(variable2),
+        VariableType::Input(variable3),
+        VariableType::Input(variable4),
+        VariableType::Random(variable5),
+        VariableType::AutoGenerated(variable6),
+    ];
+    let block = Block::new(title, description, variables);
+    println!("{block}");
+
+    Ok(())
+}

src/main.rs

@@ -1,56 +1,15 @@
 use std::env::args;
-use std::path::PathBuf;
 
 use anyhow::Result;
-
-use crate::model::{
-    AutoGeneratedVariable, Block, Comment, SimpleVariable, VariableType, VariableWithRandomValue,
-};
-use crate::parser::Parser;
-use crate::tokenizer::Tokenizer;
-
-mod model;
-mod parser;
-mod reader;
-mod tokenizer;
+use createnv::{model_to_text, parse, tokenize};
 
 fn main() -> Result<()> {
     if let Some(path) = args().nth(1) {
-        let mut parser = Parser::new(PathBuf::from(&path))?;
-        for block in parser.parse()? {
-            println!("{block}");
-        }
+        parse(&path)?;
+        tokenize(&path)?;
 
-        let mut tokenizer = Tokenizer::new(PathBuf::from(&path))?;
-        let tokens = tokenizer.tokenize()?;
-        for token in &tokens {
-            println!("{}: {:?}", token.error_prefix(&path), token);
-        }
         return Ok(());
     }
 
-    let title = Comment::new("42");
-    let description = Some(Comment::new("Fourty-two"));
-
-    let mut variable1 = SimpleVariable::new("ANSWER", None, None);
-    variable1.user_input("42");
-    let mut variable2 = SimpleVariable::new("AS_TEXT", None, None);
-    variable2.user_input("fourty two");
-    let variable3 = SimpleVariable::new("DEFAULT_VALUE_ONE", Some("default value"), None);
-    let mut variable4 = SimpleVariable::new("DEFAULT_VALUE_TWO", Some("default"), None);
-    variable4.user_input("custom");
-    let variable5 = VariableWithRandomValue::new("SECRET_KEY", None);
-    let variable6 = AutoGeneratedVariable::new("AUTO_GENERATED", "{ANSWER}-{DEFAULT_VALUE_ONE}");
-
-    let variables = vec![
-        VariableType::Input(variable1),
-        VariableType::Input(variable2),
-        VariableType::Input(variable3),
-        VariableType::Input(variable4),
-        VariableType::Random(variable5),
-        VariableType::AutoGenerated(variable6),
-    ];
-    let block = Block::new(title, description, variables);
-    println!("{block}");
-    Ok(())
+    model_to_text()
 }

src/model.rs

@@ -1,7 +1,8 @@
-use rand::{thread_rng, Rng};
 use std::collections::HashMap;
 use std::fmt;
 
+use rand::{thread_rng, Rng};
+
 const DEFAULT_RANDOM_CHARS: &str =
     "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*(-_=+)";
 

src/tokenizer.rs

@@ -112,7 +112,6 @@ impl Tokenizer {
     }
 }
 
-// TODO: move to tests/ as integration test?
 #[cfg(test)]
 mod tests {
     use super::*;