feat: normalize crate names, new shared test utils (#3)

* feat: normalize crate names, new shared test utils

* chore: remove residule

Author: pluveto

.versionrc.js

@@ -1,20 +1,23 @@
-module.exports = {
-    bumpFiles: [
-        {
-            filename: './rulog-cli/Cargo.toml',
-            updater: './scripts/cargo-updater'
-        },
-        {
-            filename: './rulog-core/Cargo.toml',
+const fs = require('fs');
+const path = require('path');
+
+function createEntries() {
+    const entries = fs.readdirSync('./')
+        .filter(name => name.startsWith('rulog_') && fs.lstatSync(name).isDirectory())
+        .map(name => ({
+            filename: `./${name}/Cargo.toml`,
             updater: './scripts/cargo-updater'
-        },
-        {
-            filename: './rulog-vm/Cargo.toml',
-            updater: './scripts/cargo-updater'
-        },
-        {
-            filename: './package.json',
-            type: 'json'
-        }
-    ],
+        }));
+
+    // Add the entry for package.json
+    entries.push({
+        filename: './package.json',
+        type: 'json'
+    });
+
+    return entries;
+}
+
+module.exports = {
+    bumpFiles: createEntries(),
 };

Cargo.lock

@@ -1,7 +1,8 @@
 [workspace]
 
 members = [
-    "rulog-core",
-    "rulog-cli",
-    "rulog-vm",
+    "rulog_core",
+    "rulog_cli",
+    "rulog_vm",
+    "rulog_test_util",
 ]

Cargo.toml

@@ -0,0 +1,10 @@
+[package]
+name = "rulog_cli"
+version = "0.1.2"
+edition = "2021"
+
+[dependencies]
+env_logger = "0.10.1"
+log = "0.4.20"
+rulog_core = { path = "../rulog_core" }
+rulog_vm = { path = "../rulog_vm" }

rulog-cli/Cargo.toml

@@ -0,0 +1,10 @@
+[package]
+name = "rulog_core"
+version = "0.1.2"
+edition = "2021"
+
+[dependencies]
+env_logger = "0.10.1"
+log = "0.4.20"
+backtrace = "0.3"
+rulog_test_util = { path = "../rulog_test_util" }

rulog-vm/Cargo.toml

@@ -184,17 +184,9 @@ impl<'a> Lexer<'a> {
 }
 #[cfg(test)]
 mod tests {
-    use crate::types::token::Token;
-
     use super::*;
-
-    fn setup_logger() {
-        use log::LevelFilter;
-        let _ = env_logger::builder()
-            .is_test(true)
-            .filter_level(LevelFilter::Trace)
-            .try_init();
-    }
+    use crate::types::token::Token;
+    use rulog_test_util::setup_logger;
 
     #[test]
     fn test_next_token() {

rulog_cli/Cargo.toml

@@ -293,14 +293,7 @@ mod tests {
     use crate::types::ast::Float;
 
     use super::*;
-
-    fn setup_logger() {
-        use log::LevelFilter;
-        let _ = env_logger::builder()
-            .is_test(true)
-            .filter_level(LevelFilter::Trace)
-            .try_init();
-    }
+    use rulog_test_util::setup_logger;
 
     //===------------------------------------------------------------------===//
     // Sub-parser tests

rulog-cli/src/main.rs rulog_cli/src/main.rs

@@ -1,9 +1,8 @@
+[package]
+name = "rulog_test_util"
+version = "0.1.2"
+edition = "2021"
+
 [dependencies]
 env_logger = "0.10.1"
 log = "0.4.20"
-backtrace = "0.3"
-
-[package]
-name = "rulog-core"
-version = "0.1.3"
-edition = "2021"

rulog_core/Cargo.toml

@@ -0,0 +1,19 @@
+use std::io::Write;
+
+pub fn setup_logger() {
+    use log::LevelFilter;
+    let _ = env_logger::builder()
+        .is_test(true)
+        .format(|buf, record| {
+            writeln!(
+                buf,
+                "[{}] {}:{} \t - {}",
+                record.level(),
+                record.file().unwrap_or("unknown"),
+                record.line().unwrap_or(0),
+                record.args()
+            )
+        })
+        .filter_level(LevelFilter::Trace)
+        .try_init();
+}

rulog-core/src/lexer.rs rulog_core/src/lexer.rs

@@ -0,0 +1,14 @@
+[package]
+name = "rulog_vm"
+version = "0.1.2"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+chrono = "0.4.31"
+env_logger = "0.10.1"
+log = "0.4.20"
+rulog_test_util = { path = "../rulog_test_util" }
+  [dependencies.rulog_core]
+  path = "../rulog_core"

rulog-core/src/lib.rs rulog_core/src/lib.rs

@@ -103,25 +103,7 @@ impl Interpreter {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use std::io::Write;
-
-    fn setup_logger() {
-        use log::LevelFilter;
-        let _ = env_logger::builder()
-            .is_test(true)
-            .format(|buf, record| {
-                writeln!(
-                    buf,
-                    "{}:{} \t[{}] - {}",
-                    record.file().unwrap_or("unknown"),
-                    record.line().unwrap_or(0),
-                    record.level(),
-                    record.args()
-                )
-            })
-            .filter_level(LevelFilter::Trace)
-            .try_init();
-    }
+    use rulog_test_util::setup_logger;
 
     #[test]
     fn test_parent_true() {