Post-Local sync at 2025-06-06 01:30:02

This commit is contained in:
Mark Randall Havens 2025-06-06 01:30:03 -05:00
parent d868674cfa
commit 4301358a81
9 changed files with 276 additions and 407 deletions

View file

@ -4,226 +4,304 @@ IFS=$'\n\t'
# ╭─────────────────────────────────────╮
# │ gitfield-local │
# ╰─────────────────────────────────────
# ╰─────────────────────────────────────
# Manages a local bare Git repository as a sacred push target for redundancy.
# Commands: configure, status, push
# Creates and maintains a bare repository in ~/git-local-repos/git-sigil.git
# Generates metadata in .gitfield/local.sigil.md and updates .gitfield/push_log.json
# Generates rich metadata in .gitfield/local.sigil.md and updates .gitfield/push_log.json
# Commands: configure, status, push
# ╭─────────────────────────────────────╮
# │ CONFIGURATION │
# ╰─────────────────────────────────────╮
REPO_PATH=$(git rev-parse --show-toplevel 2>/dev/null) || { echo -e "\e[1;31m[ERROR]\e[0m Not inside a Git repository" >&2; exit 1; }
# ╰─────────────────────────────────────╯
GIT_REMOTE_NAME="local"
REPO_NAME=$(basename "$(pwd)") || REPO_NAME="Unknown"
DEFAULT_NAME="Mark Randall Havens"
DEFAULT_EMAIL="mark.r.havens@gmail.com"
LOCAL_REPO="$HOME/git-local-repos/git-sigil.git"
METADATA_DIR="$REPO_PATH/.gitfield"
METADATA_FILE="$METADATA_DIR/local.sigil.md"
PUSH_LOG="$METADATA_DIR/push_log.json"
TIMESTAMP=$(date '+%Y-%m-%d %H:%M:%S')
REPO_PATH=$(git rev-parse --show-toplevel 2>/dev/null) || { echo -e "\e[1;31m[ERROR]\e[0m Not inside a Git repository" >&2; exit 1; }
MARKDOWN_FILE="$REPO_PATH/.gitfield/local.sigil.md"
PUSH_LOG="$REPO_PATH/.gitfield/push_log.json"
SCRIPT_VERSION="1.0"
# ╭─────────────────────────────────────╮
# │ LOGGING UTILS │
# ╰─────────────────────────────────────
info() { echo -e "\e[1;34m[INFO]\e[0m $*" >&2; }
warn() { echo -e "\e[1;33m[WARN]\e[0m $*" >&2; }
# ╰─────────────────────────────────────
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; }
# ╭─────────────────────────────────────╮
# │ SELF-HEALING CHECKS │
# ╰─────────────────────────────────────╮
self_heal() {
info "Running self-healing checks..."
# │ TOOLCHAIN SETUP │
# ╰─────────────────────────────────────╯
info "Checking for required tools..."
if ! command -v git &>/dev/null; then
info "Installing Git..."
sudo apt update -qq 2>/dev/null || warn "apt update failed, continuing..."
sudo apt install -y git 2>/dev/null || error "Git install failed"
fi
# Check if Git is installed
if ! command -v git >/dev/null 2>&1; then
error "Git is not installed. Please install Git and try again."
fi
# Ensure working repository is valid
if ! git -C "$REPO_PATH" rev-parse --git-dir >/dev/null 2>&1; then
error "Invalid Git repository at $REPO_PATH"
fi
# Create metadata directory if missing
if [[ ! -d "$METADATA_DIR" ]]; then
info "Creating metadata directory: $METADATA_DIR"
mkdir -p "$METADATA_DIR" || error "Failed to create $METADATA_DIR"
fi
# Create push log if missing
if [[ ! -f "$PUSH_LOG" ]]; then
info "Creating push log: $PUSH_LOG"
echo "{}" > "$PUSH_LOG" || error "Failed to create $PUSH_LOG"
fi
# Ensure local bare repository exists
if [[ ! -d "$LOCAL_REPO" ]]; then
info "Creating local bare repository: $LOCAL_REPO"
mkdir -p "$LOCAL_REPO" || error "Failed to create $LOCAL_REPO"
git init --bare "$LOCAL_REPO" || error "Failed to initialize bare repository"
fi
# Verify local repository is a valid bare repo
if ! git -C "$LOCAL_REPO" rev-parse --is-bare-repository >/dev/null 2>&1; then
warn "Local repository $LOCAL_REPO is not a valid bare repository. Reinitializing..."
rm -rf "$LOCAL_REPO" || error "Failed to remove invalid $LOCAL_REPO"
mkdir -p "$LOCAL_REPO" || error "Failed to create $LOCAL_REPO"
git init --bare "$LOCAL_REPO" || error "Failed to reinitialize bare repository"
fi
# Ensure permissions are correct
chmod -R u+rwX "$LOCAL_REPO" || warn "Failed to set permissions on $LOCAL_REPO"
}
if ! command -v jq &>/dev/null; then
info "Installing jq for JSON processing..."
sudo apt install -y jq 2>/dev/null || warn "jq install failed, push_log.json updates may fail"
fi
# ╭─────────────────────────────────────╮
# │ CONFIGURE REMOTE │
# ╰─────────────────────────────────────╮
# │ AUTH + IDENTITY │
# ╰─────────────────────────────────────╯
info "Setting Git identity..."
git config --global user.name "$DEFAULT_NAME" 2>/dev/null || warn "Failed to set git user name"
git config --global user.email "$DEFAULT_EMAIL" 2>/dev/null || warn "Failed to set git user email"
info "Git identity set to: $DEFAULT_NAME <$DEFAULT_EMAIL>"
# ╭─────────────────────────────────────╮
# │ GIT INIT (IF NEEDED) │
# ╰─────────────────────────────────────╯
if [ ! -d "$REPO_PATH/.git" ]; then
info "Initializing Git repository..."
git -C "$REPO_PATH" init 2>/dev/null || warn "Git init failed, continuing..."
git -C "$REPO_PATH" add . 2>/dev/null || warn "Nothing to add"
git -C "$REPO_PATH" commit -m "Initial commit" 2>/dev/null || warn "Nothing to commit"
fi
# ╭─────────────────────────────────────╮
# │ LOCAL REPO CONFIGURATION │
# ╰─────────────────────────────────────╯
configure() {
info "Configuring local remote..."
info "Configuring local bare repository..."
# Check if 'local' remote exists
if git -C "$REPO_PATH" remote | grep -q '^local$'; then
info "Local remote already exists. Verifying URL..."
current_url=$(git -C "$REPO_PATH" remote get-url local)
if [[ "$current_url" != "file://$LOCAL_REPO" ]]; then
warn "Local remote URL is incorrect ($current_url). Updating to file://$LOCAL_REPO"
git -C "$REPO_PATH" remote set-url local "file://$LOCAL_REPO" || error "Failed to update local remote URL"
fi
else
info "Adding local remote: file://$LOCAL_REPO"
git -C "$REPO_PATH" remote add local "file://$LOCAL_REPO" || error "Failed to add local remote"
# Create and verify local bare repository
if [[ ! -d "$LOCAL_REPO" ]]; then
info "Creating local bare repository: $LOCAL_REPO"
mkdir -p "$LOCAL_REPO" || error "Failed to create $LOCAL_REPO"
git -C "$LOCAL_REPO" init --bare 2>/dev/null || error "Failed to initialize bare repository"
fi
if ! git -C "$LOCAL_REPO" rev-parse --is-bare-repository >/dev/null 2>&1; then
warn "Local repository $LOCAL_REPO is not a valid bare repository. Reinitializing..."
rm -rf "$LOCAL_REPO" || error "Failed to remove invalid $LOCAL_REPO"
mkdir -p "$LOCAL_REPO" || error "Failed to create $LOCAL_REPO"
git -C "$LOCAL_REPO" init --bare 2>/dev/null || error "Failed to reinitialize bare repository"
fi
# Set permissions
chmod -R u+rwX "$LOCAL_REPO" 2>/dev/null || warn "Failed to set permissions on $LOCAL_REPO"
# Configure local remote
REMOTE_URL="file://$LOCAL_REPO"
if ! git -C "$REPO_PATH" remote get-url "$GIT_REMOTE_NAME" &>/dev/null; then
info "Adding local remote: $REMOTE_URL"
git -C "$REPO_PATH" remote add "$GIT_REMOTE_NAME" "$REMOTE_URL" 2>/dev/null || error "Failed to add local remote"
else
current_url=$(git -C "$REPO_PATH" remote get-url "$GIT_REMOTE_NAME")
if [[ "$current_url" != "$REMOTE_URL" ]]; then
warn "Local remote URL is incorrect ($current_url). Updating to $REMOTE_URL"
git -C "$REPO_PATH" remote set-url "$GIT_REMOTE_NAME" "$REMOTE_URL" 2>/dev/null || error "Failed to update local remote URL"
fi
fi
# Set upstream for current branch if not set
current_branch=$(git -C "$REPO_PATH" rev-parse --abbrev-ref HEAD)
if ! git -C "$REPO_PATH" rev-parse --abbrev-ref --symbolic-full-name "@{u}" >/dev/null 2>&1; then
info "Setting upstream for $current_branch to local/$current_branch"
git -C "$REPO_PATH" push --set-upstream local "$current_branch" || error "Failed to set upstream"
fi
# Set upstream for current branch
DEFAULT_BRANCH=$(git -C "$REPO_PATH" symbolic-ref --short HEAD 2>/dev/null || echo "main")
if ! git -C "$REPO_PATH" rev-parse --abbrev-ref --symbolic-full-name "@{u}" >/dev/null 2>&1; then
info "Setting upstream for $DEFAULT_BRANCH to $GIT_REMOTE_NAME/$DEFAULT_BRANCH"
git -C "$REPO_PATH" push --set-upstream "$GIT_REMOTE_NAME" "$DEFAULT_BRANCH" 2>/dev/null || error "Failed to set upstream"
fi
info "Local remote configured successfully."
info "Local bare repository configured successfully."
}
# ╭─────────────────────────────────────╮
# │ STATUS CHECK │
# ╰─────────────────────────────────────╮
# ╰─────────────────────────────────────
status() {
info "Checking local repository status..."
info "Checking local repository status..."
# Verify local bare repository
if [[ -d "$LOCAL_REPO" && $(git -C "$LOCAL_REPO" rev-parse --is-bare-repository) == "true" ]]; then
info "Local bare repository: $LOCAL_REPO"
latest_commit=$(git -C "$LOCAL_REPO" log -1 --format="%h %s (%cr)" 2>/dev/null || echo "No commits")
info "Latest commit: $latest_commit"
else
warn "Local bare repository not found or invalid: $LOCAL_REPO"
fi
# Verify local bare repository
if [[ -d "$LOCAL_REPO" && $(git -C "$LOCAL_REPO" rev-parse --is-bare-repository 2>/dev/null) == "true" ]]; then
info "Local bare repository: $LOCAL_REPO"
latest_commit=$(git -C "$LOCAL_REPO" log -1 --format="%h %s (%cr)" 2>/dev/null || echo "No commits")
info "Latest commit: $latest_commit"
else
warn "Local bare repository not found or invalid: $LOCAL_REPO"
fi
# Check remote configuration
if git -C "$REPO_PATH" remote | grep -q '^local$'; then
remote_url=$(git -C "$REPO_PATH" remote get-url local)
info "Local remote URL: $remote_url"
else
warn "Local remote not configured."
fi
# Check remote configuration
if git -C "$REPO_PATH" remote | grep -q "^$GIT_REMOTE_NAME$"; then
remote_url=$(git -C "$REPO_PATH" remote get-url "$GIT_REMOTE_NAME")
info "Local remote URL: $remote_url"
else
warn "Local remote not configured."
fi
# Check working repository status
info "Working repository: $REPO_PATH"
git -C "$REPO_PATH" status --short
# Check working repository status
info "Working repository: $REPO_PATH"
git -C "$REPO_PATH" status --short 2>/dev/null || warn "Failed to get repository status"
}
# ╭─────────────────────────────────────╮
# │ GIT METADATA SNAPSHOT │
# ╰─────────────────────────────────────╯
generate_metadata() {
info "Generating metadata: $MARKDOWN_FILE"
mkdir -p "$(dirname "$MARKDOWN_FILE")" 2>/dev/null || warn "Failed to create .gitfield directory"
TIMESTAMP=$(date '+%Y-%m-%d %H:%M:%S' 2>/dev/null || echo "Unknown")
DEFAULT_BRANCH=$(git -C "$REPO_PATH" symbolic-ref --short HEAD 2>/dev/null || echo "Unknown")
LATEST_SHA=$(git -C "$REPO_PATH" rev-parse HEAD 2>/dev/null || echo "Unknown")
LAST_COMMIT_MSG=$(git -C "$REPO_PATH" log -1 --pretty=format:"%s" 2>/dev/null || echo "Unknown")
LAST_COMMIT_DATE=$(git -C "$REPO_PATH" log -1 --pretty=format:"%ad" 2>/dev/null || echo "Unknown")
LAST_COMMIT_AUTHOR=$(git -C "$REPO_PATH" log -1 --pretty=format:"%an <%ae>" 2>/dev/null || echo "Unknown")
TOTAL_COMMITS=$(git -C "$REPO_PATH" rev-list --count HEAD 2>/dev/null || echo "Unknown")
TRACKED_FILES=$(git -C "$REPO_PATH" ls-files 2>/dev/null | wc -l 2>/dev/null || echo "Unknown")
UNCOMMITTED=$(if ! git -C "$REPO_PATH" diff --quiet 2>/dev/null || ! git -C "$REPO_PATH" diff --cached --quiet 2>/dev/null; then echo "Yes"; else echo "No"; fi)
LATEST_TAG=$(git -C "$REPO_PATH" describe --tags --abbrev=0 2>/dev/null || echo "None")
HOSTNAME=$(hostname 2>/dev/null || echo "Unknown")
CURRENT_USER=$(whoami 2>/dev/null || echo "Unknown")
TIMEZONE=$(date +%Z 2>/dev/null || echo "Unknown")
OS_NAME=$(uname -s 2>/dev/null || echo "Unknown")
KERNEL_VERSION=$(uname -r 2>/dev/null || echo "Unknown")
ARCHITECTURE=$(uname -m 2>/dev/null || echo "Unknown")
OS_PRETTY_NAME=$(grep PRETTY_NAME /etc/os-release 2>/dev/null | cut -d= -f2 | tr -d '"' || echo "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 2>/dev/null | awk '/ether/ {print $2}' | head -n 1 2>/dev/null || echo "Unknown")
LOCAL_IP=$(hostname -I 2>/dev/null | awk '{print $1}' 2>/dev/null || echo "Unknown")
CPU_MODEL=$(grep -m1 'model name' /proc/cpuinfo 2>/dev/null | cut -d: -f2 | sed 's/^ //' 2>/dev/null || echo "Unknown")
RAM_GB=$(awk '/MemTotal/ {printf "%.2f", $2/1024/1024}' /proc/meminfo 2>/dev/null || echo "Unknown")
WEB_LINK="file://$LOCAL_REPO"
cat > "$MARKDOWN_FILE" <<EOF
# 🔗 Local Repository Link
- **Repo Name**: \`$REPO_NAME\`
- **Local User**: \`$CURRENT_USER\`
- **Remote URL**: \`$WEB_LINK\`
- **Local Repo Path**: \`$REPO_PATH\`
- **Remote Label**: \`$GIT_REMOTE_NAME\`
- **Default Branch**: \`$DEFAULT_BRANCH\`
- **Repo Created**: \`$TIMESTAMP\`
---
## 📦 Commit Info
- **This Commit Timestamp**: \`$TIMESTAMP\`
- **Last Commit SHA**: \`$LATEST_SHA\`
- **Last Commit Message**: \`$LAST_COMMIT_MSG\`
- **Last Commit Author**: \`$LAST_COMMIT_AUTHOR\`
- **Last Commit Date**: \`$LAST_COMMIT_DATE\`
- **This Commit URL**: \`$WEB_LINK\`
---
## 📊 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\`
---
_Auto-generated by \`gitfield-local\` push script._
EOF
# Update push_log.json
if command -v jq >/dev/null 2>&1; then
jq --arg ts "$TIMESTAMP" \
--arg branch "$DEFAULT_BRANCH" \
--arg commit "$LATEST_SHA" \
--arg msg "$LAST_COMMIT_MSG" \
'.local += [{"timestamp": $ts, "branch": $branch, "commit": $commit, "message": $msg}]' \
"$PUSH_LOG" > "$PUSH_LOG.tmp" && mv "$PUSH_LOG.tmp" "$PUSH_LOG" 2>/dev/null || warn "Failed to update $PUSH_LOG"
info "Updated push log: $PUSH_LOG"
else
warn "jq not installed. Skipping $PUSH_LOG update."
fi
}
# ╭─────────────────────────────────────╮
# │ PUSH TO LOCAL │
# ╰─────────────────────────────────────╮
# ╰─────────────────────────────────────
push() {
info "Pushing to local bare repository..."
info "Pushing to local bare repository..."
# Ensure remote is configured
if ! git -C "$REPO_PATH" remote | grep -q '^local$'; then
warn "Local remote not configured. Running configure..."
configure
fi
# Ensure remote is configured
if ! git -C "$REPO_PATH" remote | grep -q "^$GIT_REMOTE_NAME$"; then
warn "Local remote not configured. Running configure..."
configure
fi
# Get current branch
current_branch=$(git -C "$REPO_PATH" rev-parse --abbrev-ref HEAD)
# Generate metadata
generate_metadata
# Push to local remote
if git -C "$REPO_PATH" push local "$current_branch"; then
info "Successfully pushed to local/$current_branch"
else
warn "Push failed. Attempting to recover..."
configure
git -C "$REPO_PATH" push local "$current_branch" || error "Failed to push to local/$current_branch after recovery"
fi
# Commit metadata
set +e
info "Committing metadata file..."
git -C "$REPO_PATH" add "$MARKDOWN_FILE" 2>/dev/null || warn "Failed to add metadata file"
git -C "$REPO_PATH" commit -m "Local metadata link commit at $TIMESTAMP — $WEB_LINK" 2>/dev/null || warn "No changes to commit"
set -e
# Update metadata
update_metadata
}
# Push to local remote
DEFAULT_BRANCH=$(git -C "$REPO_PATH" symbolic-ref --short HEAD 2>/dev/null || echo "main")
set +e
info "Pushing to $GIT_REMOTE_NAME/$DEFAULT_BRANCH..."
if ! git -C "$REPO_PATH" push "$GIT_REMOTE_NAME" "$DEFAULT_BRANCH" 2>/dev/null; then
warn "Push failed. Attempting to recover..."
configure
git -C "$REPO_PATH" push "$GIT_REMOTE_NAME" "$DEFAULT_BRANCH" 2>/dev/null || error "Failed to push to $GIT_REMOTE_NAME/$DEFAULT_BRANCH after recovery"
fi
set -e
# ╭─────────────────────────────────────╮
# │ UPDATE METADATA │
# ╰─────────────────────────────────────╮
update_metadata() {
info "Updating metadata in $METADATA_FILE and $PUSH_LOG..."
# Get repository details
current_branch=$(git -C "$REPO_PATH" rev-parse --abbrev-ref HEAD)
latest_commit=$(git -C "$REPO_PATH" log -1 --format="%h" 2>/dev/null || echo "Unknown")
commit_message=$(git -C "$REPO_PATH" log -1 --format="%s" 2>/dev/null || echo "Unknown")
repo_name=$(basename "$REPO_PATH")
# Generate .gitfield/local.sigil.md
cat << EOF > "$METADATA_FILE"
# Local Repository Metadata
- **Repository**: $repo_name
- **Local Remote Path**: file://$LOCAL_REPO
- **Branch**: $current_branch
- **Latest Commit**: $latest_commit
- **Commit Message**: $commit_message
- **Last Updated**: $TIMESTAMP
- **Script Version**: $SCRIPT_VERSION
EOF
if [[ -f "$METADATA_FILE" ]]; then
info "Generated metadata: $METADATA_FILE"
else
warn "Failed to generate $METADATA_FILE"
fi
# Update push_log.json
if command -v jq >/dev/null 2>&1; then
jq --arg ts "$TIMESTAMP" \
--arg branch "$current_branch" \
--arg commit "$latest_commit" \
--arg msg "$commit_message" \
'.local += [{"timestamp": $ts, "branch": $branch, "commit": $commit, "message": $msg}]' \
"$PUSH_LOG" > "$PUSH_LOG.tmp" && mv "$PUSH_LOG.tmp" "$PUSH_LOG" || warn "Failed to update $PUSH_LOG"
info "Updated push log: $PUSH_LOG"
else
warn "jq not installed. Skipping $PUSH_LOG update."
fi
info "✅ Local push complete."
echo -e "\n🔗 Local repository: $WEB_LINK\n"
}
# ╭─────────────────────────────────────╮
# │ MAIN EXECUTION │
# ╰─────────────────────────────────────╮
# ╰─────────────────────────────────────╯
main() {
self_heal
case "${1:-status}" in
configure)
configure
;;
status)
status
;;
push)
push
;;
*)
error "Usage: $0 {configure|status|push}"
;;
esac
case "${1:-push}" in
configure)
configure
;;
status)
status
;;
push)
push
;;
*)
error "Usage: $0 {configure|status|push}"
;;
esac
}
main "$@"