From 46e592c3a4df9e8e3e10c0f818cbbb3fe3df2f9d Mon Sep 17 00:00:00 2001 From: grabbit Date: Wed, 18 Feb 2026 11:25:15 +0800 Subject: [PATCH] Flatten project structure: move warpgate/ contents to repo root Single-crate project doesn't need a subdirectory. Moves Cargo.toml, src/, templates/ to root for standard Rust project layout. Updates .gitignore and test harness binary paths accordingly. Co-Authored-By: Claude Opus 4.6 --- .gitignore | 2 +- warpgate/Cargo.lock => Cargo.lock | 0 warpgate/Cargo.toml => Cargo.toml | 0 {warpgate/src => src}/cli/bwlimit.rs | 0 {warpgate/src => src}/cli/cache.rs | 0 {warpgate/src => src}/cli/config_init.rs | 0 {warpgate/src => src}/cli/log.rs | 0 {warpgate/src => src}/cli/mod.rs | 0 {warpgate/src => src}/cli/speed_test.rs | 0 {warpgate/src => src}/cli/status.rs | 0 {warpgate/src => src}/cli/warmup.rs | 0 {warpgate/src => src}/config.rs | 0 {warpgate/src => src}/deploy/deps.rs | 0 {warpgate/src => src}/deploy/fs_check.rs | 0 {warpgate/src => src}/deploy/mod.rs | 0 {warpgate/src => src}/deploy/setup.rs | 0 {warpgate/src => src}/main.rs | 0 {warpgate/src => src}/rclone/config.rs | 0 {warpgate/src => src}/rclone/mod.rs | 0 {warpgate/src => src}/rclone/mount.rs | 0 {warpgate/src => src}/rclone/rc.rs | 0 {warpgate/src => src}/services/mod.rs | 0 {warpgate/src => src}/services/nfs.rs | 0 {warpgate/src => src}/services/samba.rs | 0 {warpgate/src => src}/services/systemd.rs | 0 {warpgate/src => src}/services/webdav.rs | 0 {warpgate/src => src}/supervisor.rs | 0 {warpgate/templates => templates}/config.toml.default | 0 tests/harness/helpers.sh | 2 +- tests/run-all.sh | 8 ++++---- 30 files changed, 6 insertions(+), 6 deletions(-) rename warpgate/Cargo.lock => Cargo.lock (100%) rename warpgate/Cargo.toml => Cargo.toml (100%) rename {warpgate/src => src}/cli/bwlimit.rs (100%) rename {warpgate/src => src}/cli/cache.rs (100%) rename {warpgate/src => src}/cli/config_init.rs (100%) rename {warpgate/src => src}/cli/log.rs (100%) rename {warpgate/src => src}/cli/mod.rs (100%) rename {warpgate/src => src}/cli/speed_test.rs (100%) rename {warpgate/src => src}/cli/status.rs (100%) rename {warpgate/src => src}/cli/warmup.rs (100%) rename {warpgate/src => src}/config.rs (100%) rename {warpgate/src => src}/deploy/deps.rs (100%) rename {warpgate/src => src}/deploy/fs_check.rs (100%) rename {warpgate/src => src}/deploy/mod.rs (100%) rename {warpgate/src => src}/deploy/setup.rs (100%) rename {warpgate/src => src}/main.rs (100%) rename {warpgate/src => src}/rclone/config.rs (100%) rename {warpgate/src => src}/rclone/mod.rs (100%) rename {warpgate/src => src}/rclone/mount.rs (100%) rename {warpgate/src => src}/rclone/rc.rs (100%) rename {warpgate/src => src}/services/mod.rs (100%) rename {warpgate/src => src}/services/nfs.rs (100%) rename {warpgate/src => src}/services/samba.rs (100%) rename {warpgate/src => src}/services/systemd.rs (100%) rename {warpgate/src => src}/services/webdav.rs (100%) rename {warpgate/src => src}/supervisor.rs (100%) rename {warpgate/templates => templates}/config.toml.default (100%) diff --git a/.gitignore b/.gitignore index 4e7c53b..b83d222 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/warpgate/target/ +/target/ diff --git a/warpgate/Cargo.lock b/Cargo.lock similarity index 100% rename from warpgate/Cargo.lock rename to Cargo.lock diff --git a/warpgate/Cargo.toml b/Cargo.toml similarity index 100% rename from warpgate/Cargo.toml rename to Cargo.toml diff --git a/warpgate/src/cli/bwlimit.rs b/src/cli/bwlimit.rs similarity index 100% rename from warpgate/src/cli/bwlimit.rs rename to src/cli/bwlimit.rs diff --git a/warpgate/src/cli/cache.rs b/src/cli/cache.rs similarity index 100% rename from warpgate/src/cli/cache.rs rename to src/cli/cache.rs diff --git a/warpgate/src/cli/config_init.rs b/src/cli/config_init.rs similarity index 100% rename from warpgate/src/cli/config_init.rs rename to src/cli/config_init.rs diff --git a/warpgate/src/cli/log.rs b/src/cli/log.rs similarity index 100% rename from warpgate/src/cli/log.rs rename to src/cli/log.rs diff --git a/warpgate/src/cli/mod.rs b/src/cli/mod.rs similarity index 100% rename from warpgate/src/cli/mod.rs rename to src/cli/mod.rs diff --git a/warpgate/src/cli/speed_test.rs b/src/cli/speed_test.rs similarity index 100% rename from warpgate/src/cli/speed_test.rs rename to src/cli/speed_test.rs diff --git a/warpgate/src/cli/status.rs b/src/cli/status.rs similarity index 100% rename from warpgate/src/cli/status.rs rename to src/cli/status.rs diff --git a/warpgate/src/cli/warmup.rs b/src/cli/warmup.rs similarity index 100% rename from warpgate/src/cli/warmup.rs rename to src/cli/warmup.rs diff --git a/warpgate/src/config.rs b/src/config.rs similarity index 100% rename from warpgate/src/config.rs rename to src/config.rs diff --git a/warpgate/src/deploy/deps.rs b/src/deploy/deps.rs similarity index 100% rename from warpgate/src/deploy/deps.rs rename to src/deploy/deps.rs diff --git a/warpgate/src/deploy/fs_check.rs b/src/deploy/fs_check.rs similarity index 100% rename from warpgate/src/deploy/fs_check.rs rename to src/deploy/fs_check.rs diff --git a/warpgate/src/deploy/mod.rs b/src/deploy/mod.rs similarity index 100% rename from warpgate/src/deploy/mod.rs rename to src/deploy/mod.rs diff --git a/warpgate/src/deploy/setup.rs b/src/deploy/setup.rs similarity index 100% rename from warpgate/src/deploy/setup.rs rename to src/deploy/setup.rs diff --git a/warpgate/src/main.rs b/src/main.rs similarity index 100% rename from warpgate/src/main.rs rename to src/main.rs diff --git a/warpgate/src/rclone/config.rs b/src/rclone/config.rs similarity index 100% rename from warpgate/src/rclone/config.rs rename to src/rclone/config.rs diff --git a/warpgate/src/rclone/mod.rs b/src/rclone/mod.rs similarity index 100% rename from warpgate/src/rclone/mod.rs rename to src/rclone/mod.rs diff --git a/warpgate/src/rclone/mount.rs b/src/rclone/mount.rs similarity index 100% rename from warpgate/src/rclone/mount.rs rename to src/rclone/mount.rs diff --git a/warpgate/src/rclone/rc.rs b/src/rclone/rc.rs similarity index 100% rename from warpgate/src/rclone/rc.rs rename to src/rclone/rc.rs diff --git a/warpgate/src/services/mod.rs b/src/services/mod.rs similarity index 100% rename from warpgate/src/services/mod.rs rename to src/services/mod.rs diff --git a/warpgate/src/services/nfs.rs b/src/services/nfs.rs similarity index 100% rename from warpgate/src/services/nfs.rs rename to src/services/nfs.rs diff --git a/warpgate/src/services/samba.rs b/src/services/samba.rs similarity index 100% rename from warpgate/src/services/samba.rs rename to src/services/samba.rs diff --git a/warpgate/src/services/systemd.rs b/src/services/systemd.rs similarity index 100% rename from warpgate/src/services/systemd.rs rename to src/services/systemd.rs diff --git a/warpgate/src/services/webdav.rs b/src/services/webdav.rs similarity index 100% rename from warpgate/src/services/webdav.rs rename to src/services/webdav.rs diff --git a/warpgate/src/supervisor.rs b/src/supervisor.rs similarity index 100% rename from warpgate/src/supervisor.rs rename to src/supervisor.rs diff --git a/warpgate/templates/config.toml.default b/templates/config.toml.default similarity index 100% rename from warpgate/templates/config.toml.default rename to templates/config.toml.default diff --git a/tests/harness/helpers.sh b/tests/harness/helpers.sh index c2d87ce..ad7cee2 100755 --- a/tests/harness/helpers.sh +++ b/tests/harness/helpers.sh @@ -11,7 +11,7 @@ set -euo pipefail # Environment & paths # --------------------------------------------------------------------------- -WARPGATE_BIN="${WARPGATE_BIN:-$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)/warpgate/target/release/warpgate}" +WARPGATE_BIN="${WARPGATE_BIN:-$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)/target/release/warpgate}" WARPGATE_TEST_DIR="${WARPGATE_TEST_DIR:-/tmp/warpgate-test}" WARPGATE_TEST_LONG="${WARPGATE_TEST_LONG:-0}" WARPGATE_TEST_BTRFS="${WARPGATE_TEST_BTRFS:-}" diff --git a/tests/run-all.sh b/tests/run-all.sh index 54a28fc..8a7faa8 100755 --- a/tests/run-all.sh +++ b/tests/run-all.sh @@ -21,10 +21,10 @@ PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)" # Auto-detect warpgate binary if [[ -z "${WARPGATE_BIN:-}" ]]; then - if [[ -x "$PROJECT_ROOT/warpgate/target/release/warpgate" ]]; then - export WARPGATE_BIN="$PROJECT_ROOT/warpgate/target/release/warpgate" - elif [[ -x "$PROJECT_ROOT/warpgate/target/debug/warpgate" ]]; then - export WARPGATE_BIN="$PROJECT_ROOT/warpgate/target/debug/warpgate" + if [[ -x "$PROJECT_ROOT/target/release/warpgate" ]]; then + export WARPGATE_BIN="$PROJECT_ROOT/target/release/warpgate" + elif [[ -x "$PROJECT_ROOT/target/debug/warpgate" ]]; then + export WARPGATE_BIN="$PROJECT_ROOT/target/debug/warpgate" else echo "ERROR: warpgate binary not found. Build with: cargo build --release" >&2 echo " Or set WARPGATE_BIN=/path/to/warpgate" >&2