split into lib and cmd

Author: lamb

.github/workflows/build.yaml

@@ -67,23 +67,23 @@ jobs:
       #   APPLE_CODESIGN_KEY: '${{ secrets.APPLE_CODESIGN_KEY }}'
       #   APPLE_CODESIGN_PASSWORD: '${{ secrets.APPLE_CODESIGN_PASSWORD }}'
       # echo Key is $(echo $APPLE_CODESIGN_KEY | base64 -d | wc -c) bytes
-      # rcodesign sign target/release/am --code-signature-flags=runtime --p12-password=$APPLE_CODESIGN_PASSWORD --p12-file=<(echo $APPLE_CODESIGN_KEY | base64 -d) --entitlements-xml-file=cli/entitlements.plist
+      # rcodesign sign target/release/fan --code-signature-flags=runtime --p12-password=$APPLE_CODESIGN_PASSWORD --p12-file=<(echo $APPLE_CODESIGN_KEY | base64 -d) --entitlements-xml-file=cli/entitlements.plist
       - name: Compress Archive (darwin or linux)
         if: contains(matrix.target, 'darwin') || contains(matrix.target, 'linux')
-        run: zip -rj target/${{ matrix.target }}/release/am-${{ matrix.target }}.zip target/${{ matrix.target }}/release/am
+        run: zip -rj target/${{ matrix.target }}/release/fan-${{ matrix.target }}.zip target/${{ matrix.target }}/release/fan
       - name: Compress Archive (windows)
         if: contains(matrix.target, 'windows')
-        run: Compress-Archive -CompressionLevel Optimal -Force -Path target/${{ matrix.target }}/release/am.exe -DestinationPath target/${{ matrix.target }}/release/am-${{ matrix.target }}.zip
+        run: Compress-Archive -CompressionLevel Optimal -Force -Path target/${{ matrix.target }}/release/fan.exe -DestinationPath target/${{ matrix.target }}/release/fan-${{ matrix.target }}.zip
       - name: Upload Artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: am-${{ matrix.target }}
-          path: target/${{ matrix.target }}/release/am${{ contains(matrix.target, 'windows') && '.exe' || '' }}
+          name: fan-${{ matrix.target }}
+          path: target/${{ matrix.target }}/release/fan${{ contains(matrix.target, 'windows') && '.exe' || '' }}
       - name: Release Version
         uses: softprops/action-gh-release@v2
         if: startsWith(github.ref, 'refs/tags/')
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          files: target/${{ matrix.target }}/release/am-${{ matrix.target }}.zip
+          files: target/${{ matrix.target }}/release/fan-${{ matrix.target }}.zip
           draft: true

.github/workflows/image.yaml

@@ -27,7 +27,7 @@ jobs:
           tags: ${{ github.repository }}:test
       - name: Test Image
         run: |
-          docker run --rm ${{ github.repository }}:test am eval 'println("🍀 Hello Am!");'
+          docker run --rm ${{ github.repository }}:test fan eval 'println("🍀 Hello Basjoofan!");'
       - name: Echo Tag
         run: |
           tag=${{ startsWith(github.ref, 'refs/tags/')  && github.ref_name || github.sha }}

Cargo.toml

@@ -1,41 +1,6 @@
-[package]
-name = "am"
-version = "0.0.1"
-description = "Continuous Test"
-repository = "https://github.com/basjoofan/am"
-license = "MIT OR Apache-2.0"
-authors = ["Lamb <lamb@basjoo.fan>"]
-keywords = ["test", "continuous"]
-edition = "2021"
-
-[lib]
-name = "am"
-path = "src/lib.rs"
-crate-type = ["lib"]
-
-[[bin]]
-name = "am"
-path = "src/main.rs"
-
-[features]
-default = ["command", "http"]
-http = ["rustls", "webpki-roots", "form_urlencoded", "multipart"]
-command = ["clap", "ctrlc"]
-
-[dependencies]
-form_urlencoded = { version = "1.2.1", optional = true }
-multipart = { version = "0.18.0", optional = true, default-features = false, features = ["client"]  }
-#uuid = { version = "1.8.0", features = ["v7"] }
-regex = "1.11.1"
-
-[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-clap = { version = "4.5.23", optional = true, features = ["derive"] }
-ctrlc = { version = "3.4.5", optional = true }
-rustls = { version = "0.23.20", optional = true, default-features = false, features = ["tls12", "std", "ring"]  }
-webpki-roots = { version = "0.26.7", optional = true }
-
-[dev-dependencies]
-assert_cmd = "2.0"
-assert_fs = "1.0"
-predicates = "3.0"
-avro = { version = "0.16", package = "apache-avro" }
+[workspace]
+resolver = "2"
+members = [
+  "lib",
+  "cmd",
+]

Dockerfile

@@ -6,4 +6,4 @@ RUN cargo build --release
 # runtime stage use alpine as base image
 FROM alpine:3.20.2
 # copy compiled file from build stage
-COPY --from=builder ./target/release/am /usr/bin
+COPY --from=builder ./target/release/fan /usr/bin

README.md

@@ -1,2 +1,2 @@
-# Am
+# Basjoofan
 Continuous Test

cmd/Cargo.toml

@@ -0,0 +1,23 @@
+[package]
+name = "cmd"
+version = "0.0.1"
+description = "basjoofan command"
+repository = "https://github.com/basjoofan/lib"
+license = "MIT OR Apache-2.0"
+authors = ["Lamb <lamb@basjoo.fan>"]
+keywords = ["continuous", "test", "http"]
+edition = "2021"
+
+[[bin]]
+name = "fan"
+path = "src/main.rs"
+
+[dependencies]
+lib = { path = "../lib" }
+clap = { version = "4.5.23", features = ["derive"] }
+ctrlc = { version = "3.4.5"}
+
+[dev-dependencies]
+assert_cmd = "2.0"
+assert_fs = "1.0"
+predicates = "3.0"

src/command.rs cmd/src/command.rssrc/command.rs renamed to cmd/src/command.rs

@@ -1,9 +1,9 @@
-use crate::eval_block;
-use crate::Context;
-use crate::Parser;
-use crate::Source;
-use crate::Stats;
-use crate::Writer;
+use lib::eval_block;
+use lib::Context;
+use lib::Parser;
+use lib::Source;
+use lib::Stats;
+use lib::Writer;
 use std::fs::File;
 use std::io::stdin;
 use std::io::BufRead;
@@ -13,8 +13,6 @@ use std::sync::atomic::Ordering;
 use std::sync::Arc;
 use std::time::Duration;
 
-pub const NAME: &str = env!("CARGO_PKG_NAME");
-
 pub fn repl() {
     let mut lines = stdin().lock().lines();
     let mut context = Context::new();
@@ -177,7 +175,7 @@ fn read(path: PathBuf, text: &mut String) -> std::io::Result<()> {
         for entry in entries {
             read(entry, text)?;
         }
-    } else if path.is_file() && path.extension() == Some(std::ffi::OsStr::new(NAME)) {
+    } else if path.is_file() && path.extension() == Some(std::ffi::OsStr::new("fan")) {
         text.push_str(&std::fs::read_to_string(path)?)
     }
     Ok(())

src/main.rs cmd/src/main.rssrc/main.rs renamed to cmd/src/main.rs

@@ -1,23 +1,23 @@
-use am::command;
+mod command;
 use clap::{Parser, Subcommand};
 use std::{path::PathBuf, time::Duration};
 
 #[derive(Parser)]
-#[command(name = command::NAME, version, about, long_about = None)]
+#[command(name = env!("CARGO_PKG_DESCRIPTION"), version, about, long_about = None)]
 struct Interface {
     #[command(subcommand)]
     command: Option<Commands>,
 }
 
 #[derive(Subcommand)]
 enum Commands {
-    /// Evaluate source code
+    /// Evaluate codes
     Eval {
         /// Source code
         #[command()]
         text: String,
     },
-    /// Run the tests
+    /// Run tests
     Test {
         /// Test name
         #[command()]

tests/command.rs cmd/tests/command.rstests/command.rs renamed to cmd/tests/command.rs

@@ -1,4 +1,3 @@
-use am::command::NAME;
 use assert_cmd::prelude::*;
 use assert_fs::prelude::*;
 use predicates::prelude::*;
@@ -8,7 +7,7 @@ use std::process::{Command, Stdio};
 #[test]
 #[allow(clippy::zombie_processes)]
 fn test_command_repl() -> Result<(), Box<dyn std::error::Error>> {
-    let mut child = Command::cargo_bin(NAME)?
+    let mut child = Command::cargo_bin("fan")?
         .stdin(Stdio::piped())
         .stdout(Stdio::piped())
         .spawn()
@@ -27,22 +26,22 @@ fn test_command_repl() -> Result<(), Box<dyn std::error::Error>> {
 
 #[test]
 fn test_command_eval() -> Result<(), Box<dyn std::error::Error>> {
-    let mut cmd = Command::cargo_bin(NAME)?;
+    let mut cmd = Command::cargo_bin("fan")?;
     cmd.arg("eval").arg(r#"print("{integer}", 1 + 1 )"#);
     cmd.assert().success().stdout(predicate::str::diff("2null\n"));
-    let mut cmd = Command::cargo_bin(NAME)?;
+    let mut cmd = Command::cargo_bin("fan")?;
     cmd.arg("eval").arg(r#"let x = 1 + 1; print("{integer}", x);"#);
     cmd.assert().success().stdout(predicate::str::diff("2null\n"));
-    let mut cmd = Command::cargo_bin(NAME)?;
-    cmd.arg("eval").arg(r#"println("{string}", "Hello Am!")"#);
-    cmd.assert().success().stdout(predicate::str::diff("Hello Am!\nnull\n"));
+    let mut cmd = Command::cargo_bin("fan")?;
+    cmd.arg("eval").arg(r#"println("{string}", "Hello Basjoofan!")"#);
+    cmd.assert().success().stdout(predicate::str::diff("Hello Basjoofan!\nnull\n"));
     Ok(())
 }
 
 #[test]
 fn test_command_test() -> Result<(), Box<dyn std::error::Error>> {
     let temp = assert_fs::TempDir::new().unwrap();
-    let file = temp.child("request.am");
+    let file = temp.child(format!("request.{}", "fan"));
     let text = r#"
     let host = "httpbin.org";
     request get`
@@ -58,17 +57,17 @@ fn test_command_test() -> Result<(), Box<dyn std::error::Error>> {
     "#;
     file.write_str(text)?;
     // command test
-    let mut command = Command::cargo_bin(NAME)?;
+    let mut command = Command::cargo_bin("fan")?;
     command.current_dir(&temp);
     command.arg("test");
     command.assert().success().stdout(predicate::str::contains("--- PASS  get ("));
     // command test call
-    let mut command = Command::cargo_bin(NAME)?;
+    let mut command = Command::cargo_bin("fan")?;
     command.current_dir(&temp);
     command.arg("test").arg("call");
     command.assert().success().stdout(predicate::str::contains("--- PASS  get ("));
     // command test blank
-    let mut command = Command::cargo_bin(NAME)?;
+    let mut command = Command::cargo_bin("fan")?;
     command.current_dir(&temp);
     command.arg("test").arg("blank");
     command.assert().success().stdout(predicate::str::diff("Test not found: blank\n"));

lib/Cargo.toml

@@ -0,0 +1,31 @@
+[package]
+name = "lib"
+version = "0.0.1"
+description = "basjoofan library"
+repository = "https://github.com/basjoofan/lib"
+license = "MIT OR Apache-2.0"
+authors = ["Lamb <lamb@basjoo.fan>"]
+keywords = ["continuous", "test", "http"]
+edition = "2021"
+
+[features]
+default = ["http"]
+http = ["rustls", "webpki-roots", "form_urlencoded", "multipart"]
+
+[dependencies]
+form_urlencoded = { version = "1.2.1", optional = true }
+multipart = { version = "0.18.0", optional = true, default-features = false, features = ["client"]  }
+#uuid = { version = "1.8.0", features = ["v7"] }
+regex = "1.11.1"
+
+[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
+rustls = { version = "0.23.20", optional = true, default-features = false, features = ["tls12", "std", "ring"]  }
+webpki-roots = { version = "0.26.7", optional = true }
+
+[target.'cfg(target_arch = "wasm32")'.dependencies]
+js-sys = "0.3.77"
+wasm-bindgen = "0.2.100"
+wasm-bindgen-futures = "0.4.50"
+
+[dev-dependencies]
+avro = { version = "0.16", package = "apache-avro" }