diff --git a/.radicle-push-state b/.radicle-push-state index 1e7e3bd..4758b76 100644 --- a/.radicle-push-state +++ b/.radicle-push-state @@ -1 +1 @@ -5721262240b0ae31a9a0740be5d9b0e0caa0109a +9ca959ba0bce6c6b5c03b39871dd90d3476b8b8e diff --git a/gitfield-radicle b/gitfield-radicle index b8f2be4..0553fd7 100755 --- a/gitfield-radicle +++ b/gitfield-radicle @@ -8,58 +8,83 @@ IFS=$'\n\t' PROJECT_NAME=$(basename "$(pwd)") DEFAULT_NAME="Mark Randall Havens" DEFAULT_EMAIL="mark.r.havens@gmail.com" -MARKDOWN_FILE=".radicle-link.md" -SCRIPT_VERSION="1.2" RAD_HOME="$HOME/.radicle" RAD_BIN="$RAD_HOME/bin/rad" RAD_KEYS="$RAD_HOME/keys.json" RAD_BACKUP=".radicle-backup/keys.json" -RAD_PATH_LINE='export PATH="$HOME/.radicle/bin:$PATH"' +RAD_CONFIG="$RAD_HOME/config.json" PROFILE_FILE="$HOME/.bashrc" PUSH_STATE_FILE=".radicle-push-state" -RAD_CONFIG="$RAD_HOME/config.json" SEED_DOMAIN="kairos-seed.thefoldwithin.earth" +# ╭───────────────────────────────╮ +# │ Logging Utils │ +# ╰───────────────────────────────╯ info() { echo -e "\e[1;34m[INFO]\e[0m $*"; } warn() { echo -e "\e[1;33m[WARN]\e[0m $*"; } error() { echo -e "\e[1;31m[ERROR]\e[0m $*" >&2; exit 1; } +# ╭───────────────────────────────╮ +# │ Git + Tools Precheck │ +# ╰───────────────────────────────╯ +info "Checking Git..." command -v git >/dev/null || { + info "Installing Git..." sudo apt update && sudo apt install -y git || error "Failed to install Git" } +info "Git version: $(git --version)" NAME=$(git config --global user.name || true) EMAIL=$(git config --global user.email || true) [[ -z "$NAME" || -z "$EMAIL" ]] && { + info "Setting Git identity..." git config --global user.name "$DEFAULT_NAME" git config --global user.email "$DEFAULT_EMAIL" } +info "Git identity: $(git config --global user.name) <$(git config --global user.email)>" +# ╭───────────────────────────────╮ +# │ Radicle CLI Setup │ +# ╰───────────────────────────────╯ if [ ! -x "$RAD_BIN" ]; then + info "Installing Radicle CLI..." sudo apt install -y curl jq unzip || error "Missing dependencies" curl -sSf https://radicle.xyz/install | sh || error "Radicle install failed" fi export PATH="$HOME/.radicle/bin:$PATH" -if ! grep -Fxq "$RAD_PATH_LINE" "$PROFILE_FILE"; then - echo "$RAD_PATH_LINE" >> "$PROFILE_FILE" +if ! grep -Fxq "export PATH=\"$HOME/.radicle/bin:\$PATH\"" "$PROFILE_FILE"; then + echo "export PATH=\"$HOME/.radicle/bin:\$PATH\"" >> "$PROFILE_FILE" + info "→ Added PATH to $PROFILE_FILE" + warn "→ Run 'source $PROFILE_FILE' to make Radicle CLI persistent" fi -command -v rad >/dev/null || error "Radicle CLI unavailable" +command -v rad >/dev/null || error "Radicle CLI still unavailable. Try restarting terminal." +info "Radicle CLI ready: $(rad --version)" +# ╭────────────────────────────────────────────────────╮ +# │ Restore or Create Radicle Identity & Backup │ +# ╰────────────────────────────────────────────────────╯ mkdir -p "$(dirname "$RAD_BACKUP")" if [ ! -f "$RAD_KEYS" ]; then if [ -f "$RAD_BACKUP" ]; then - cp "$RAD_BACKUP" "$RAD_KEYS" + info "Restoring Radicle identity from backup..." + cp "$RAD_BACKUP" "$RAD_KEYS" || error "Failed to restore identity" else + info "Creating new Radicle identity..." rad auth || error "Identity creation failed" cp "$RAD_KEYS" "$RAD_BACKUP" || warn "Backup of identity failed" fi +else + info "Radicle identity already exists." fi -# Start node if not running +# ╭───────────────────────────────╮ +# │ Start Rad Node │ +# ╰───────────────────────────────╯ pgrep -f "rad node start" >/dev/null || { + info "Starting Radicle node..." nohup rad node start > /dev/null 2>&1 & sleep 3 } @@ -87,141 +112,77 @@ else fi # ╭───────────────────────────────╮ -# │ Init & Push Radicle Repo │ +# │ Git Repo Initialization │ # ╰───────────────────────────────╯ if [ ! -d .git ]; then git init - git add . - git commit -m "Initial commit" + git add . || warn "Nothing to add" + git commit -m "Initial commit" || warn "Nothing to commit" +else + info "Git repo already initialized." fi +# ╭───────────────────────────────╮ +# │ Radicle Project Registration│ +# ╰───────────────────────────────╯ if ! rad projects | grep -q "$PROJECT_NAME"; then + info "Registering Radicle project '$PROJECT_NAME'..." rad init --name "$PROJECT_NAME" --description "Radicle sovereign repo for $PROJECT_NAME" || warn "Repo may already exist" +else + info "Project '$PROJECT_NAME' already registered." fi +# ╭───────────────────────────────╮ +# │ Push Current Commit Logic │ +# ╰───────────────────────────────╯ CURRENT_BRANCH=$(git symbolic-ref --short HEAD) CURRENT_COMMIT=$(git rev-parse HEAD) LAST_PUSHED_COMMIT=$(cat "$PUSH_STATE_FILE" 2>/dev/null || echo "none") -if [[ "$CURRENT_COMMIT" != "$LAST_PUSHED_COMMIT" ]]; then +if [[ "$CURRENT_COMMIT" == "$LAST_PUSHED_COMMIT" ]]; then + info "✓ Already pushed commit: $CURRENT_COMMIT" +else + info "Pushing commit '$CURRENT_COMMIT' on branch '$CURRENT_BRANCH'..." if git push rad "$CURRENT_BRANCH"; then echo "$CURRENT_COMMIT" > "$PUSH_STATE_FILE" + info "✓ Pushed to Radicle successfully" else - warn "Push may have failed" + warn "Push may have failed — check 'rad sync status'" fi fi -PROJECT_ID=$(rad self | awk -F': ' '/Project ID/ {print $2}') -PEER_ID=$(rad self | awk -F': ' '/Peer ID/ {print $2}') -REMOTE_SERVERS=$(rad node status | grep 'connected to' || echo "Unavailable") -PROJECT_SLUG="${PROJECT_ID#rad:}" -RAD_GATEWAY_URL="https://app.radicle.network/$PROJECT_SLUG" - # ╭───────────────────────────────╮ -# │ Generate Metadata File │ +# │ Final Output Block │ # ╰───────────────────────────────╯ -TIMESTAMP=$(date '+%Y-%m-%d %H:%M:%S') -DEFAULT_BRANCH=$(git symbolic-ref --short HEAD) -REPO_PATH=$(pwd) -LATEST_SHA=$(git rev-parse HEAD) -LAST_COMMIT_MSG=$(git log -1 --pretty=format:"%s") -LAST_COMMIT_DATE=$(git log -1 --pretty=format:"%ad") -LAST_COMMIT_AUTHOR=$(git log -1 --pretty=format:"%an <%ae>") -TOTAL_COMMITS=$(git rev-list --count HEAD) -TRACKED_FILES=$(git ls-files | wc -l) -UNCOMMITTED=$(if ! git diff --quiet || ! git diff --cached --quiet; then echo "Yes"; else echo "No"; fi) -LATEST_TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo "None") -HOSTNAME=$(hostname) -CURRENT_USER=$(whoami) -TIMEZONE=$(date +%Z) -OS_NAME=$(uname -s) -KERNEL_VERSION=$(uname -r) -ARCHITECTURE=$(uname -m) -OS_PRETTY_NAME=$(grep PRETTY_NAME /etc/os-release 2>/dev/null | cut -d= -f2 | tr -d '"') || OS_PRETTY_NAME="Unknown" -DOCKER_CHECK=$(grep -qE '/docker|/lxc' /proc/1/cgroup 2>/dev/null && echo "Yes" || echo "No") -WSL_CHECK=$(grep -qi microsoft /proc/version 2>/dev/null && echo "Yes" || echo "No") -VM_CHECK=$(systemd-detect-virt 2>/dev/null || echo "Unknown") -UPTIME=$(uptime -p 2>/dev/null || echo "Unknown") -MAC_ADDR=$(ip link | awk '/ether/ {print $2}' | head -n 1) -LOCAL_IP=$(hostname -I | awk '{print $1}') -CPU_MODEL=$(grep -m1 'model name' /proc/cpuinfo | cut -d: -f2 | sed 's/^ //') -RAM_GB=$(awk '/MemTotal/ {printf "%.2f", $2/1024/1024}' /proc/meminfo) +RAD_SELF=$(rad self --json 2>/dev/null || echo '{}') +if echo "$RAD_SELF" | jq empty >/dev/null 2>&1; then + PROJECT_ID=$(echo "$RAD_SELF" | jq -r '.projectId // empty') + PEER_ID=$(echo "$RAD_SELF" | jq -r '.peerId // empty') +else + warn "rad self returned non-JSON output." + PROJECT_ID="" + PEER_ID="" +fi -cat > "$MARKDOWN_FILE" < .radicle-link.md + echo "# 🌱 Sovereign Radicle Project Metadata" >> .radicle-link.md + echo "**Project Name:** $PROJECT_NAME" >> .radicle-link.md + echo "**Commit:** $CURRENT_COMMIT" >> .radicle-link.md + echo "**Branch:** $CURRENT_BRANCH" >> .radicle-link.md + echo "**Project ID:** \\`rad:$PROJECT_ID\\`" >> .radicle-link.md + echo "**Peer ID:** \\`$PEER_ID\\`" >> .radicle-link.md + echo "**Generated:** $(date --iso-8601=seconds)" >> .radicle-link.md + echo "**Platform:** $(uname -a)" >> .radicle-link.md + echo "**User:** $(whoami)@$(hostname)" >> .radicle-link.md ---- + echo -e "\n## 🌐 Public Gateway URLs" >> .radicle-link.md + echo "- [Radicle Garden](https://app.radicle.xyz/nodes/seed.radicle.garden/rad:$PROJECT_ID)" >> .radicle-link.md + echo "- [Kairos Seed](https://app.radicle.xyz/nodes/kairos-seed.thefoldwithin.earth/rad:$PROJECT_ID)" >> .radicle-link.md + echo "- [Direct Access](https://app.radicle.network/rad:$PROJECT_ID)" >> .radicle-link.md -## 📦 Commit Info - -- **Last Commit SHA**: \`$LATEST_SHA\` -- **Commit Message**: \`$LAST_COMMIT_MSG\` -- **Commit Author**: \`$LAST_COMMIT_AUTHOR\` -- **Commit Date**: \`$LAST_COMMIT_DATE\` - ---- - -## 📊 Repo Status - -- **Total Commits**: \`$TOTAL_COMMITS\` -- **Tracked Files**: \`$TRACKED_FILES\` -- **Uncommitted Changes**: \`$UNCOMMITTED\` -- **Latest Tag**: \`$LATEST_TAG\` - ---- - -## 🧽 Environment - -- **Host Machine**: \`$HOSTNAME\` -- **Current User**: \`$CURRENT_USER\` -- **Time Zone**: \`$TIMEZONE\` -- **Script Version**: \`v$SCRIPT_VERSION\` - ---- - -## 🧬 Hardware & OS Fingerprint - -- **OS Name**: \`$OS_NAME\` -- **OS Version**: \`$OS_PRETTY_NAME\` -- **Kernel Version**: \`$KERNEL_VERSION\` -- **Architecture**: \`$ARCHITECTURE\` -- **Running in Docker**: \`$DOCKER_CHECK\` -- **Running in WSL**: \`$WSL_CHECK\` -- **Virtual Machine**: \`$VM_CHECK\` -- **System Uptime**: \`$UPTIME\` -- **MAC Address**: \`$MAC_ADDR\` -- **Local IP**: \`$LOCAL_IP\` -- **CPU Model**: \`$CPU_MODEL\` -- **Total RAM (GB)**: \`$RAM_GB\` - ---- - -## 🌐 Radicle Network Info - -- **Connected Servers**: -\`\`\` -$REMOTE_SERVERS -\`\`\` -- **Public Gateway URL**: [$RAD_GATEWAY_URL]($RAD_GATEWAY_URL) - ---- - -_Auto-generated by \`gitfield-radicle\` push script._ -EOF - -git add "$MARKDOWN_FILE" -git commit -m "Radicle metadata link commit at $TIMESTAMP" || warn "No changes to commit" - -echo -e "\n✅ Radicle metadata written." -echo -e "→ Project ID: $PROJECT_ID" -echo -e "→ Peer ID: $PEER_ID" -echo -e "🔗 View in Radicle Gateway: $RAD_GATEWAY_URL" + info "→ Metadata written to .radicle-link.md" +}