Consolidate crates

Signed-off-by: Joe Grund <[email protected]>

Author: Joe Grund

Cargo.lock

@@ -1,12 +1,13 @@
 [workspace]
-members = ["commandeer-test", "commandeer-cli", "commandeer-macros"]
+members = ["commandeer-test", "commandeer-macros"]
 resolver = "3"
 
 [workspace.package]
-version = "0.1.0"
+version = "0.1.1"
 edition = "2024"
 license = "MIT"
 keywords = ["cli", "command", "testing", "record", "replay"]
+default-run = "commandeer"
 
 [workspace.dependencies]
 anyhow = "1"

Cargo.toml

@@ -13,10 +13,9 @@ Commandeer allows you to record command-line invocations and their outputs durin
 
 ## Workspace Structure
 
-This project is organized as a Cargo workspace with three main crates:
+This project is organized as a Cargo workspace with two crates:
 
 - **`commandeer-test`** - Core library providing record/replay functionality
-- **`commandeer-cli`** - Command-line binary for standalone record/replay operations
 - **`commandeer-macros`** - Procedural macros for test setup automation
 
 ## Installation
@@ -31,7 +30,7 @@ cargo add commandeer --dev
 
 ### CLI Binary
 
-The `commandeer-cli` binary provides standalone record and replay functionality:
+The `commandeer` binary provides standalone record and replay functionality:
 
 #### Recording Commands
 
@@ -183,7 +182,7 @@ Recordings are stored in JSON format:
 cargo build --workspace
 
 # Build specific crate
-cargo build -p commandeer-cli
+cargo build -p commandeer-test
 ```
 
 ### Running Tests
@@ -200,10 +199,10 @@ cargo test -p commandeer
 
 ```bash
 # Test record functionality
-cargo run -p commandeer-cli -- record --command echo "Hello, Commandeer"
+cargo run record --command echo "Hello, Commandeer"
 
 # Test replay functionality
-cargo run -p commandeer-cli -- replay --command echo "Hello, Commandeer"
+cargo run replay --command echo "Hello, Commandeer"
 ```
 
 ## Use Cases

README.md

@@ -6,23 +6,28 @@ keywords.workspace = true
 license.workspace = true
 description = "Takes over your commands for testing with record and replay support."
 
+[[bin]]
+name = "commandeer"
+path = "src/main.rs"
+
 [lints]
 workspace = true
 
 [dependencies]
+anyhow = { workspace = true }
+clap = { workspace = true }
+commandeer-macros = { path = "../commandeer-macros", version = "0.1.0" }
+escargot = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
+tempfile = { workspace = true }
 tokio = { workspace = true, features = [
     "fs",
     "io-util",
     "macros",
     "process",
     "rt-multi-thread",
 ] }
-serde = { workspace = true }
-serde_json = { workspace = true }
-anyhow = { workspace = true }
-escargot = { workspace = true }
-tempfile = { workspace = true }
-commandeer-macros = { path = "../commandeer-macros", version = "0.1.0" }
 
 [dev-dependencies]
 serial_test.workspace = true

commandeer-cli/Cargo.toml

@@ -182,7 +182,7 @@ impl Commandeer {
 
         let mock_runner = CargoBuild::new()
             .manifest_path(PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("Cargo.toml"))
-            .package("commandeer-cli")
+            .package("commandeer-test")
             .bin("commandeer")
             .run()
             .expect("Failed to build mock binary");