feat: ✨ made cli preserve relative paths in development

This makes updating and testing the CLI *much* easier.

Author: arctic-hen7

bonnie.toml

@@ -4,7 +4,6 @@ version="0.3.2"
 dev.subcommands.cli.cmd = [
 	"cd packages/perseus-cli",
     # We need to copy in the directory where we actually work on the subcrate
-    "cd ../perseus-cli",
     "rm -rf ./.perseus",
     "cp -r ../../examples/cli/.perseus/ .perseus/",
     "mv .perseus/Cargo.toml .perseus/Cargo.toml.old",
@@ -13,11 +12,17 @@ dev.subcommands.cli.cmd = [
 ]
 dev.subcommands.cli.desc = "runs the cli in its own directory (which should test `examples/basic`)"
 dev.subcommands.example.cmd = [
-    "cd examples/%example",
-    "find . -not -path \"./.perseus/*\" -not -path \"./target/*\" | entr -s \"perseus serve\""
+    "cd packages/perseus-cli",
+    # We need to copy in the directory where we actually work on the subcrate
+    "rm -rf ./.perseus",
+    "cp -r ../../examples/cli/.perseus/ .perseus/",
+    "mv .perseus/Cargo.toml .perseus/Cargo.toml.old",
+    "mv .perseus/server/Cargo.toml .perseus/server/Cargo.toml.old",
+    # Now point this live version of the CLI at the given example
+    "TEST_EXAMPLE=../../examples/%example cargo run -- %%"
 ]
 dev.subcommands.example.args = [ "example" ]
-dev.subcommands.example.desc = "serves the given example, watching for file changes (uses cli)"
+dev.subcommands.example.desc = "serves the given example using a live version of the cli"
 
 build = "cargo build"
 test = "cargo watch -x \"test\""

packages/perseus-cli/src/bin/main.rs

@@ -8,7 +8,8 @@ use std::path::PathBuf;
 fn main() {
     // In development, we'll test in the `basic` example
     if cfg!(debug_assertions) {
-        env::set_current_dir("../../examples/basic").unwrap();
+        let example_to_test = env::var("TEST_EXAMPLE").unwrap_or_else(|_| "../../examples/basic".to_string());
+        env::set_current_dir(example_to_test).unwrap();
     }
     let exit_code = real_main();
     std::process::exit(exit_code)

packages/perseus-cli/src/prepare.rs

@@ -75,23 +75,27 @@ pub fn prepare(dir: PathBuf) -> Result<()> {
                 "no '[package]' section in manifest".to_string()
             )),
         };
-        // Replace the relative path references to Perseus packages
-        // Also update the name of the user's crate (Cargo needs more than just a path and an alias)
+        // Update the name of the user's crate (Cargo needs more than just a path and an alias)
         // Also add an empty `[workspace]` key so we exclude from any of the user's workspace settings
         let updated_root_manifest = root_manifest_contents
-            .replace(
-                "{ path = \"../../../packages/perseus\" }",
-                &format!("\"{}\"", PERSEUS_VERSION),
-            )
             .replace("perseus-example-cli", &user_crate_name)
             + "\n[workspace]";
         let updated_server_manifest = server_manifest_contents
-            .replace(
-                "{ path = \"../../../../packages/perseus-actix-web\" }",
-                &format!("\"{}\"", PERSEUS_VERSION),
-            )
             .replace("perseus-example-cli", &user_crate_name)
             + "\n[workspace]";
+
+        // If we're not in development, also update relative path references
+        #[cfg(not(debug_assertions))]
+        let updated_root_manifest = updated_root_manifest.replace(
+            "{ path = \"../../../packages/perseus\" }",
+            &format!("\"{}\"", PERSEUS_VERSION),
+        );
+        #[cfg(not(debug_assertions))]
+        let updated_server_manifest = updated_server_manifest.replace(
+            "{ path = \"../../../../packages/perseus-actix-web\" }",
+            &format!("\"{}\"", PERSEUS_VERSION),
+        );
+
         // Write the updated manifests back
         if let Err(err) = fs::write(&root_manifest, updated_root_manifest) {
             bail!(ErrorKind::ManifestUpdateFailed(