From fe6acbc1e3fc11e43605a0cc4b19024d91091870 Mon Sep 17 00:00:00 2001 From: Lucien Greathouse Date: Sat, 4 May 2019 21:01:10 -0700 Subject: [PATCH] Clean up repo cruft --- Cargo.lock | 4 -- Cargo.toml | 1 - generate-docs => bin/generate-docs | 0 .../test-scratch-project | 0 design.gv | 39 ------------------- rojo-e2e/Cargo.toml | 6 --- rojo-e2e/README.md | 2 - rojo-e2e/src/lib.rs | 32 --------------- 8 files changed, 84 deletions(-) rename generate-docs => bin/generate-docs (100%) rename test-scratch-project => bin/test-scratch-project (100%) delete mode 100644 design.gv delete mode 100644 rojo-e2e/Cargo.toml delete mode 100644 rojo-e2e/README.md delete mode 100644 rojo-e2e/src/lib.rs diff --git a/Cargo.lock b/Cargo.lock index 96c99ba0..f3cb776a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1300,10 +1300,6 @@ dependencies = [ "walkdir 2.2.7 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "rojo-e2e" -version = "0.1.0" - [[package]] name = "rustc-demangle" version = "0.1.14" diff --git a/Cargo.toml b/Cargo.toml index 27dc248a..90f1b5a4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,4 @@ [workspace] members = [ "server", - "rojo-e2e", ] \ No newline at end of file diff --git a/generate-docs b/bin/generate-docs similarity index 100% rename from generate-docs rename to bin/generate-docs diff --git a/test-scratch-project b/bin/test-scratch-project similarity index 100% rename from test-scratch-project rename to bin/test-scratch-project diff --git a/design.gv b/design.gv deleted file mode 100644 index 479ab71c..00000000 --- a/design.gv +++ /dev/null @@ -1,39 +0,0 @@ -digraph G { - graph [ - ranksep = "0.7", - nodesep = "1.0", - ]; - node [ - fontname = "Hack", - shape = "record", - ]; - - roblox_studio -> plugin [dir = "both"]; - plugin -> web_server [style = "dashed", dir = "both"]; - - web_server -> session; - - session -> rbx_session; - session -> fs_watcher; - session -> message_queue; - - fs_watcher -> imfs [weight = "10"]; - fs_watcher -> rbx_session [constraint = "false"]; - - imfs -> fs; - - rbx_session -> imfs; - rbx_session -> middlewares [weight = "10"]; - rbx_session -> message_queue [constraint = "false"]; - - plugin [label = "Studio Plugin"]; - roblox_studio [label = "Roblox Studio"]; - fs [label = "Filesystem"]; - fs_watcher [label = "Filesystem Watcher"]; - session [label = "Session"]; - web_server [label = "Web API"]; - imfs [label = "In-Memory Filesystem"]; - rbx_session [label = "RbxSession"]; - message_queue [label = "MessageQueue"]; - middlewares [label = "Middlewares"]; -} \ No newline at end of file diff --git a/rojo-e2e/Cargo.toml b/rojo-e2e/Cargo.toml deleted file mode 100644 index 8afc532d..00000000 --- a/rojo-e2e/Cargo.toml +++ /dev/null @@ -1,6 +0,0 @@ -[package] -name = "rojo-e2e" -version = "0.1.0" -authors = ["Lucien Greathouse "] - -[dependencies] diff --git a/rojo-e2e/README.md b/rojo-e2e/README.md deleted file mode 100644 index 6dbb1cca..00000000 --- a/rojo-e2e/README.md +++ /dev/null @@ -1,2 +0,0 @@ -# Rojo End-to-End -This is a WIP test runner designed for Rojo. It will eventually start up the Rojo server and plugin and test functionality end-to-end. \ No newline at end of file diff --git a/rojo-e2e/src/lib.rs b/rojo-e2e/src/lib.rs deleted file mode 100644 index 4e4883b1..00000000 --- a/rojo-e2e/src/lib.rs +++ /dev/null @@ -1,32 +0,0 @@ -use std::{ - path::Path, - process::Command, - thread, - time::Duration, -}; - -fn main() { - let plugin_path = Path::new("../plugin"); - let server_path = Path::new("../server"); - let tests_path = Path::new("../tests"); - - let server = Command::new("cargo") - .args(&["run", "--", "serve", "../test-projects/empty"]) - .current_dir(server_path) - .spawn(); - - thread::sleep(Duration::from_millis(1000)); - - // TODO: Wait for server to start responding on the right port - - let test_client = Command::new("lua") - .args(&["runTest.lua", "tests/empty.lua"]) - .current_dir(plugin_path) - .spawn(); - - thread::sleep(Duration::from_millis(300)); - - // TODO: Collect output from the client for success/failure? - - println!("Dying!"); -}