Merge from Dev

.vscode/settings.json

@@ -0,0 +1,8 @@
+{
+    "rust-analyzer.linkedProjects": [
+        "./cli/Cargo.toml",
+        "./pta-ledger/Cargo.toml",
+        "./pta-parser/Cargo.toml",
+        "./pta-types/Cargo.toml"
+    ]
+}

Cargo.toml

@@ -0,0 +1,19 @@
+# Copyright (C) 2023, AltaModa Technologies, LLC. All rights reserved.
+#
+# This project is licensed under the terms of the MIT license (cf. LICENSE file in root).
+
+[workspace]
+resolver = "2"
+members = [
+    "cli"
+    ,"pta-ledger"
+    ,"pta-parser"
+    ,'pta-types',
+]
+
+# Default values for workspace projects
+[workspace.package]
+edition = "2021"
+version = "0.2.0"
+authors = ["AltaModa Technologies"]
+# respository = "https://github.com/altamodatech/pta-parser"

README.md

@@ -1,6 +1,6 @@
 # pta-parser
 
-A Plain Text Accounting parser built in [Rust](https://www.rust-lang.org/) with [Pest](https://pest.rs/)
+A [Plain Text Accounting](https://plaintextaccounting.org/) parser built in [Rust](https://www.rust-lang.org/) with [Pest](https://pest.rs/)
 
 ## Copyright Notice
 

cli/Cargo.toml

@@ -0,0 +1,19 @@
+# Copyright (C) 2023, AltaModa Technologies, LLC. All rights reserved.
+#
+# This project is licensed under the terms of the MIT license (cf. LICENSE file in root).
+
+[package]
+name = "cli"
+version.workspace = true
+authors.workspace = true
+# respository.workspace = true
+edition.workspace = true
+
+
+[dependencies]
+log = "0.4.21"
+pest = "2.7.3"
+pretty_env_logger = "0.5.0"
+pta-ledger = { path = "../pta-ledger" }
+pta-parser = { path = "../pta-parser" }
+pta-types = { path = "../pta-types" }

cli/src/main.rs

@@ -0,0 +1,67 @@
+// Copyright (C) 2023, AltaModa Technologies, LLC. All rights reserved.
+//
+// This project is licensed under the terms of the MIT license (cf. LICENSE file in root).
+//
+
+extern crate pta_ledger;
+extern crate pta_parser;
+
+
+use log::{info, warn, error};
+
+// TODO: how to isolate pest so clients can just use lib (w/o requiring pest as here)
+use pta_ledger::ledger_builder::LedgerBuilder;
+
+
+
+fn main() -> Result<(), Box<dyn std::error::Error>> {
+    // TODO: CLI improvements 
+    //  - exec with path of file to parse
+    //  - optionally output parse results (should be equivalent to input file)
+
+    // TODO: consider flag to use init_timed to include time per line
+    pretty_env_logger::init();
+
+    let pb = std::env::current_dir()?;
+    let p = pb.join("testdata/basic-ledger");
+
+    info!("Input file: {:?}", p);
+
+    let mut bldr = LedgerBuilder::default();
+    match std::fs::read_to_string(p) {
+        Ok(ledger) => {
+            info!("String length from input: {}", ledger.len());
+            match bldr.from_string(&ledger) {
+                Ok(_parsed) => {
+                    info!("Successfully parsed into ParsedLedger");
+                    return Ok(());
+                },
+
+                Err(e) => {
+                    error!("LedgerBuilder failed with {:}", e);
+                    return Err(e);
+                }
+            }
+        }
+
+        Err(e) => {
+            warn!("failed to read file as string; {e}");
+            return Err(Box::new(e));
+        }
+    }
+
+}
+
+
+
+#[cfg(test)]
+mod cli_tests {
+
+    use pta_parser::parsers::generic::Parser;
+
+    #[test]
+    fn can_create_parser() {
+        // simply verifies that the parser can be instantiated, ensuring accessibility
+        let _ = Parser{};
+    }
+}

journal.md

@@ -0,0 +1,7 @@
+# Plain-Text Accounting Parser
+
+## History
+
+### 10/18/2023
+
+Abandonded effort to integrate [pest_consume](https://lib.rs/crates/pest_consume) since the author is no longer maintaining it.

pta-ledger/Cargo.toml

@@ -0,0 +1,24 @@
+# Copyright (C) 2023, AltaModa Technologies, LLC. All rights reserved.
+#
+# This project is licensed under the terms of the MIT license (cf. LICENSE file in root).
+
+[package]
+name = "pta-ledger"
+version.workspace = true
+authors.workspace = true
+# respository.workspace = true
+edition.workspace = true
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+[lib]
+bench = false
+
+[dependencies]
+log = { version = "0.4.20", features = ["kv_unstable", "kv_unstable_serde"] }
+pest = "2.7.3"
+pest_derive = "2.7.3"
+pta-parser = { path = "../pta-parser" }
+pta-types ={ path = "../pta-types" }
+
+[dev-dependencies]
+rstest = "0.19.0"