feat(ccode_runner): refactor cpast into ccode refactor and cli

rootCircle · Oct 3, 2024 · 1b9cd0d · 1b9cd0d
1 parent 50fc7f0
commit 1b9cd0d
Show file tree

Hide file tree

Showing 17 changed files with 277 additions and 482 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -4,7 +4,7 @@ members = [
   "clex",
   "cpastord"
   # "clex_llm",
-, "cscrapper", "clex_llm"]
+, "cscrapper", "clex_llm", "ccode_runner"]
 resolver = "2"
 
 [profile.dev]

diff --git a/Makefile b/Makefile
@@ -74,13 +74,11 @@ clippy :
 #	make test
 
 test :
-	cargo test --all-features
-
+	CFLAGS="" CXXFLAGS="" cargo test --all-features
 
 # Run format clippy test and tests.
 #
 # Usage :
 #	make precommit
 
-precommit : 
-	cargo fmt --all --check && cargo clippy --all-features --all-targets -- -D warnings && cargo test --all-features
+precommit : fmt clippy test
diff --git a/ccode_runner/Cargo.toml b/ccode_runner/Cargo.toml
@@ -0,0 +1,8 @@
+[package]
+name = "ccode_runner"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+which = "6.0.3"
+
diff --git a/cpast/src/lang_runner.rs → ccode_runner/src/lang_runner.rs b/cpast/src/lang_runner.rs → ccode_runner/src/lang_runner.rs
@@ -1,3 +1,3 @@
-pub(crate) mod program_store;
+pub mod program_store;
 mod runner;
 pub(crate) mod runner_error_types;
diff --git a/cpast/src/lang_runner/program_store.rs → ...e_runner/src/lang_runner/program_store.rs b/cpast/src/lang_runner/program_store.rs → ...e_runner/src/lang_runner/program_store.rs
@@ -5,7 +5,7 @@ use std::error::Error;
 use std::path::Path;
 
 #[derive(Debug)]
-pub(crate) struct ProgramStore {
+pub struct ProgramStore {
     correct_file: Language,
     test_file: Language,
     correct_file_bin_path: String,
@@ -19,7 +19,7 @@ enum FileType {
 }
 
 impl ProgramStore {
-    pub(crate) fn new(
+    pub fn new(
         correct_file: &Path,
         test_file: &Path,
         do_force_compile: bool,
@@ -47,7 +47,7 @@ impl ProgramStore {
         correct_file.exists() && test_file.exists()
     }
 
-    pub(crate) fn run_codes_and_compare_output(
+    pub fn run_codes_and_compare_output(
         &self,
         stdin_content: &str,
     ) -> Result<(bool, String, String), &str> {

diff --git a/cpast/src/lang_runner/runner.rs → ccode_runner/src/lang_runner/runner.rs b/cpast/src/lang_runner/runner.rs → ccode_runner/src/lang_runner/runner.rs
diff --git a/cpast/src/lang_runner/runner_error_types.rs → ...ner/src/lang_runner/runner_error_types.rs b/cpast/src/lang_runner/runner_error_types.rs → ...ner/src/lang_runner/runner_error_types.rs
diff --git a/ccode_runner/src/lib.rs b/ccode_runner/src/lib.rs
@@ -0,0 +1,2 @@
+pub mod lang_runner;
+mod utils;
diff --git a/cpast/src/utils.rs → ccode_runner/src/utils.rs b/cpast/src/utils.rs → ccode_runner/src/utils.rs
diff --git a/cpast/src/utils/file_utils.rs → ccode_runner/src/utils/file_utils.rs b/cpast/src/utils/file_utils.rs → ccode_runner/src/utils/file_utils.rs
diff --git a/cpast/src/utils/program_utils.rs → ccode_runner/src/utils/program_utils.rs b/cpast/src/utils/program_utils.rs → ccode_runner/src/utils/program_utils.rs
diff --git a/cpast/Cargo.toml b/cpast/Cargo.toml
@@ -14,12 +14,12 @@ default-run = "cpast"
 [dependencies]
 clap = { version = "4.5.16", features = ["derive"] }
 cli-clipboard = { version = "0.4.0", optional = true }
-which = "6.0.3"
-tokio = { version = "1.39.3", features = ["full"] }
+tokio = { version = "1.40.0", features = ["full"] }
 futures = "0.3.30"
 colored = "2.1.0"
-clap_complete = "4.5.24"
+clap_complete = "4.5.32"
 clex = { path = "../clex" }
+ccode_runner = { path = "../ccode_runner" }
 
 [features]
 default = ["clipboard"]

diff --git a/cpast/README.md b/cpast/README.md
@@ -76,6 +76,8 @@ cpast test -c correct.cpp -t incorrect.cpp -g "(N) (?:N){\1}" --iterations 100
 * `(N) (?:N){\1}` is the language generator.
 * `100` is the number of test iterations.
 
+`CPAST_DEBUG=1 cpast test ...` can be used to debug the test cases generated.
+
 #### generate
 
 ```bash

diff --git a/cpast/src/lib.rs b/cpast/src/lib.rs
@@ -30,17 +30,14 @@
 //! For more details on usage and advanced features, refer to the README.
 //!
 
-mod lang_runner;
-mod utils;
-
 use colored::Colorize;
 use futures::future::join_all;
 use std::env;
 use std::path::Path;
 use std::process::exit;
 use std::sync::{Arc, Mutex};
 
-use crate::lang_runner::program_store::ProgramStore;
+use ccode_runner::lang_runner::program_store::ProgramStore;
 use clex::clex_language::clex_error_type::ClexErrorType;
 use clex::clex_language::parser::Parser;
 use clex::clex_language::{code_generator, lexer, parser};

diff --git a/cpastord/Cargo.toml b/cpastord/Cargo.toml
@@ -4,12 +4,11 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-anyhow = "1.0.66"
-shuttle-serenity = "0.36.0"
-shuttle-runtime = "0.36.0"
-serenity = { version = "0.11.5", default-features = false, features = ["client", "gateway", "rustls_backend", "model"] }
-shuttle-secrets = "0.36.0"
-tokio = "1.26.0"
-tracing = "0.1.37"
+anyhow = "1.0.89"
+shuttle-serenity = "0.48.0"
+shuttle-runtime = "0.48.0"
+serenity = { version = "0.12.2", default-features = false, features = ["client", "gateway", "rustls_backend", "model"] }
+tokio = "1.40.0"
+tracing = "0.1.40"
 cpast = { path = "../cpast" }
 
diff --git a/cpastord/src/main.rs b/cpastord/src/main.rs
@@ -5,7 +5,7 @@ use serenity::async_trait;
 use serenity::model::channel::Message;
 use serenity::model::gateway::Ready;
 use serenity::prelude::*;
-use shuttle_secrets::SecretStore;
+use shuttle_runtime::{SecretStore, Secrets};
 use tracing::{error, info};
 
 struct Bot;
@@ -26,9 +26,7 @@ impl EventHandler for Bot {
 }
 
 #[shuttle_runtime::main]
-async fn serenity(
-    #[shuttle_secrets::Secrets] secret_store: SecretStore,
-) -> shuttle_serenity::ShuttleSerenity {
+async fn serenity(#[Secrets] secret_store: SecretStore) -> shuttle_serenity::ShuttleSerenity {
     // Get the discord token set in `Secrets.toml`
     let token = if let Some(token) = secret_store.get("DISCORD_TOKEN") {
         token