372b7a2772
This commit represents a major refactoring of our Rhai scripting system, transforming it from a factory-based approach to a more robust system-based architecture with improved hot reloading capabilities. Key Changes: - Renamed package from rhai_factory to rhai_system to better reflect its purpose - Renamed system_factory.rs to factory.rs for consistency and clarity - Implemented support for multiple script files in hot reloading - Added cross-script function calls, allowing functions in one script to call functions in another - Improved file watching to monitor all script files for changes - Enhanced error handling for script compilation failures - Simplified the API with a cleaner create_hot_reloadable_system function - Removed unused modules (error.rs, factory.rs, hot_reload_old.rs, module_cache.rs, relative_resolver.rs) - Updated all tests to work with the new architecture The new architecture: - Uses a System struct that holds references to script paths and provides a clean API - Compiles and merges multiple Rhai script files into a single AST - Automatically detects changes to any script file and recompiles them - Maintains thread safety with proper synchronization primitives - Provides better error messages when scripts fail to compile This refactoring aligns with our BasePathModuleResolver approach for module imports, making the resolution process more predictable and consistent. The hot reload example has been updated to demonstrate the new capabilities, showing how to: 1. Load and execute multiple script files 2. Watch for changes to these files 3. Automatically reload scripts when they change 4. Call functions across different script files All tests are passing, and the example demonstrates the improved functionality.
53 lines
1.3 KiB
Rust
53 lines
1.3 KiB
Rust
//! Common utilities for integration tests.
|
|
|
|
use std::fs;
|
|
use std::path::PathBuf;
|
|
use std::time::{SystemTime, UNIX_EPOCH};
|
|
use rand;
|
|
|
|
/// Test fixture for integration tests.
|
|
pub struct TestFixture {
|
|
pub scripts_dir: PathBuf,
|
|
}
|
|
|
|
impl TestFixture {
|
|
/// Create a new test fixture.
|
|
pub fn new() -> Self {
|
|
let scripts_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR"))
|
|
.join("tests")
|
|
.join("rhai_scripts");
|
|
|
|
Self {
|
|
scripts_dir,
|
|
}
|
|
}
|
|
|
|
/// Get the path to a test script.
|
|
pub fn script_path(&self, name: &str) -> PathBuf {
|
|
self.scripts_dir.join(name)
|
|
}
|
|
}
|
|
|
|
/// Create a temporary test directory with a unique name.
|
|
pub fn setup_test_dir(prefix: &str) -> PathBuf {
|
|
let timestamp = SystemTime::now()
|
|
.duration_since(UNIX_EPOCH)
|
|
.unwrap()
|
|
.as_millis();
|
|
|
|
let test_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR"))
|
|
.join("tests")
|
|
.join("temp")
|
|
.join(format!("{}_{}_{}", prefix, timestamp, rand::random::<u16>()));
|
|
|
|
fs::create_dir_all(&test_dir).unwrap();
|
|
test_dir
|
|
}
|
|
|
|
/// Clean up a temporary test directory.
|
|
pub fn cleanup_test_dir(dir: PathBuf) {
|
|
if dir.exists() && dir.starts_with(PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("tests").join("temp")) {
|
|
let _ = fs::remove_dir_all(dir);
|
|
}
|
|
}
|