jekyll-theme-zer0 0.22.21 → 0.22.22

data/scripts/lib/install/upgrade.sh

@@ -0,0 +1,184 @@
+#!/usr/bin/env bash
+# scripts/lib/install/upgrade.sh
+#
+# `install upgrade` — version-aware migration over an existing site.
+#
+# Strategy:
+#   1. Detect installed version from .zer0-installed (drop-marker) or
+#      _config.yml's `version:` field, or fall back to "unknown".
+#   2. Print a diff-summary of what will change (theme files only — never
+#      touches user content under pages/, _posts/, _drafts/).
+#   3. Re-runs the agent-files install (always safe, additive) and offers
+#      to refresh templated workflows under .github/workflows/.
+#   4. Writes a fresh .zer0-installed marker with the new version + date.
+#
+# Public API:
+#     upgrade_run <target_dir> <repo_root> [--from <version>] [--force]
+#                                          [--dry-run] [--auto-accept]
+#
+# Bash 3.2-compatible. Idempotent. Never destructive without explicit --force.
+
+# shellcheck disable=SC2034
+UPGRADE_LIB_VERSION="1.0.0"
+
+UPGRADE_MARKER=".zer0-installed"
+
+# Read theme version from lib/jekyll-theme-zer0/version.rb
+_upgrade_theme_version() {
+    local repo_root="$1"
+    local vfile="$repo_root/lib/jekyll-theme-zer0/version.rb"
+    [[ -f "$vfile" ]] || { echo "unknown"; return; }
+    grep -E 'VERSION\s*=' "$vfile" | head -n1 | sed -E 's/.*"([^"]+)".*/\1/'
+}
+
+# Detect the previously installed version (best-effort).
+_upgrade_detect_installed() {
+    local target_dir="$1"
+    if [[ -f "$target_dir/$UPGRADE_MARKER" ]]; then
+        grep -E '^version:' "$target_dir/$UPGRADE_MARKER" 2>/dev/null \
+            | head -n1 | sed -E 's/version:[[:space:]]*//'
+        return
+    fi
+    # Fallback: probe _config.yml for a `version:` line
+    if [[ -f "$target_dir/_config.yml" ]]; then
+        local v
+        v="$(grep -E '^version:' "$target_dir/_config.yml" 2>/dev/null \
+            | head -n1 | sed -E 's/version:[[:space:]]*//' \
+            | tr -d '"' | tr -d "'")"
+        [[ -n "$v" ]] && { echo "$v"; return; }
+    fi
+    echo "unknown"
+}
+
+# Write/update the install marker.
+_upgrade_write_marker() {
+    local target_dir="$1" version="$2" dry_run="$3"
+    local marker="$target_dir/$UPGRADE_MARKER"
+    local content
+    content="$(cat <<EOF
+# zer0-mistakes install marker — do not edit manually
+version: $version
+upgraded_at: $(date -u +%Y-%m-%dT%H:%M:%SZ)
+EOF
+)"
+    if [[ "$dry_run" = "1" ]]; then
+        log_info "[dry-run] Would write marker: $marker"
+        return
+    fi
+    printf '%s\n' "$content" > "$marker"
+    log_success "Wrote $UPGRADE_MARKER (version: $version)"
+}
+
+# Re-run agents install in --force mode (theme files are safe to refresh).
+_upgrade_refresh_agents() {
+    local target_dir="$1" repo_root="$2" force="$3" dry_run="$4"
+    if ! declare -F agents_install >/dev/null 2>&1; then
+        log_warning "agents.sh not loaded — skipping agent-file refresh"
+        return 0
+    fi
+    if [[ "$dry_run" = "1" ]]; then
+        log_info "[dry-run] Would refresh agent files in $target_dir"
+        return 0
+    fi
+    local force_flag=""
+    [[ "$force" = "1" ]] && force_flag="--force"
+    log_info "Refreshing AI agent files..."
+    agents_install "$target_dir" "$repo_root" $force_flag || true
+}
+
+# Compare a workflow file in target_dir vs theme template — list
+# differences so user can decide whether to merge.
+_upgrade_check_workflows() {
+    local target_dir="$1" repo_root="$2"
+    local wf_dir="$target_dir/.github/workflows"
+    [[ -d "$wf_dir" ]] || return 0
+    local f base tpl
+    log_info "Checking .github/workflows/ for theme-managed files..."
+    local found=0
+    for f in "$wf_dir"/*.yml "$wf_dir"/*.yaml; do
+        [[ -f "$f" ]] || continue
+        base="$(basename "$f")"
+        # Look for a matching template under templates/deploy/*/
+        for tpl in "$repo_root/templates/deploy"/*/"$base.template" \
+                   "$repo_root/templates/deploy"/*/"$base"; do
+            [[ -f "$tpl" ]] || continue
+            found=$((found+1))
+            if diff -q "$f" "$tpl" >/dev/null 2>&1; then
+                log_success "  $base — up to date"
+            else
+                log_warning "  $base — differs from theme template"
+                log_info "    Compare: diff $f $tpl"
+            fi
+            break
+        done
+    done
+    [[ "$found" = "0" ]] && log_info "  No theme-managed workflows detected"
+}
+
+# Public entrypoint.
+upgrade_run() {
+    local target_dir="$1" repo_root="$2"
+    shift 2 || true
+
+    local from_version="" force=0 dry_run=0 auto_accept=0
+    while [[ $# -gt 0 ]]; do
+        case "$1" in
+            --from)        from_version="${2:-}"; shift ;;
+            -f|--force)    force=1 ;;
+            -n|--dry-run)  dry_run=1 ;;
+            --auto-accept) auto_accept=1 ;;
+            *) log_warning "upgrade_run: ignoring unknown flag: $1" ;;
+        esac
+        shift
+    done
+
+    if [[ ! -d "$target_dir" ]]; then
+        log_error "Target directory does not exist: $target_dir"
+        return 1
+    fi
+
+    local installed_version theme_version
+    installed_version="${from_version:-$(_upgrade_detect_installed "$target_dir")}"
+    theme_version="$(_upgrade_theme_version "$repo_root")"
+
+    log_info "🔧 Upgrading site at: $target_dir"
+    log_info "  From version: $installed_version"
+    log_info "  To   version: $theme_version"
+    [[ "$dry_run" = "1" ]] && log_warning "  Mode: dry-run (no files will be changed)"
+    echo
+
+    if [[ "$installed_version" = "$theme_version" ]] && [[ "$force" != "1" ]]; then
+        log_success "Already on $theme_version. Use --force to re-run anyway."
+        return 0
+    fi
+
+    # Confirmation gate (skipped when --auto-accept or --dry-run)
+    if [[ "$auto_accept" != "1" ]] && [[ "$dry_run" != "1" ]]; then
+        printf "Proceed with upgrade? [y/N] "
+        local reply
+        read -r reply || reply=""
+        case "$reply" in
+            y|Y|yes|YES) ;;
+            *) log_warning "Upgrade cancelled by user."; return 0 ;;
+        esac
+    fi
+
+    # 1. Refresh agent files (always additive/safe)
+    _upgrade_refresh_agents "$target_dir" "$repo_root" "$force" "$dry_run"
+    echo
+
+    # 2. Check workflows (read-only — never auto-overwrite)
+    _upgrade_check_workflows "$target_dir" "$repo_root"
+    echo
+
+    # 3. Write/update marker (only if not dry-run)
+    _upgrade_write_marker "$target_dir" "$theme_version" "$dry_run"
+    echo
+
+    log_success "Upgrade complete."
+    log_info "Next steps:"
+    log_info "  1. Run 'install doctor' to verify environment"
+    log_info "  2. Review any workflow files flagged above"
+    log_info "  3. Check CHANGELOG.md in the theme repo for breaking changes"
+    return 0
+}

data/scripts/lib/install/wizard_interactive.sh

@@ -0,0 +1,189 @@
+#!/usr/bin/env bash
+# scripts/lib/install/wizard_interactive.sh
+#
+# Non-AI interactive wizard. Prompts the user for site config + profile,
+# then dispatches to `install init` with the chosen options.
+#
+# Complementary to ai/wizard.sh (which uses OpenAI). This one is fully
+# offline and works in any environment.
+#
+# Public API:
+#     wizard_interactive_run <target_dir> <repo_root> [--auto-accept]
+#
+# Bash 3.2-compatible.
+
+# shellcheck disable=SC2034
+WIZARD_INTERACTIVE_LIB_VERSION="1.0.0"
+
+# Prompt with a default value. Returns the user's input on stdout.
+# args: prompt default
+_wiz_prompt() {
+    local prompt="$1" default="$2" reply
+    if [[ -n "$default" ]]; then
+        printf "  %s [%s]: " "$prompt" "$default" >&2
+    else
+        printf "  %s: " "$prompt" >&2
+    fi
+    read -r reply || reply=""
+    [[ -z "$reply" ]] && reply="$default"
+    printf '%s\n' "$reply"
+}
+
+# Prompt for a yes/no answer. Returns 0 for yes, 1 for no.
+# args: prompt default(y|n)
+_wiz_confirm() {
+    local prompt="$1" default="${2:-n}" reply hint
+    case "$default" in
+        y|Y) hint="[Y/n]" ;;
+        *)   hint="[y/N]" ;;
+    esac
+    printf "  %s %s: " "$prompt" "$hint" >&2
+    read -r reply || reply=""
+    [[ -z "$reply" ]] && reply="$default"
+    case "$reply" in
+        y|Y|yes|YES) return 0 ;;
+        *) return 1 ;;
+    esac
+}
+
+# Pick from a numbered list. Returns the chosen value on stdout.
+# args: prompt default option1 option2 ...
+_wiz_choose() {
+    local prompt="$1" default="$2"
+    shift 2
+    local options=("$@")
+    local i=1 opt
+    echo "  $prompt" >&2
+    for opt in "${options[@]}"; do
+        if [[ "$opt" = "$default" ]]; then
+            printf "    %d) %s  (default)\n" "$i" "$opt" >&2
+        else
+            printf "    %d) %s\n" "$i" "$opt" >&2
+        fi
+        i=$((i+1))
+    done
+    printf "  Choice [%s]: " "$default" >&2
+    local reply
+    read -r reply || reply=""
+    [[ -z "$reply" ]] && { printf '%s\n' "$default"; return; }
+    # Numeric or by-name
+    case "$reply" in
+        ''|*[!0-9]*)
+            # by name; verify it exists
+            for opt in "${options[@]}"; do
+                [[ "$opt" = "$reply" ]] && { printf '%s\n' "$reply"; return; }
+            done
+            printf '%s\n' "$default" ;;
+        *)
+            local idx=$((reply))
+            if (( idx >= 1 && idx <= ${#options[@]} )); then
+                printf '%s\n' "${options[$((idx-1))]}"
+            else
+                printf '%s\n' "$default"
+            fi ;;
+    esac
+}
+
+# Public entrypoint.
+wizard_interactive_run() {
+    local target_dir="$1" repo_root="$2"
+    shift 2 || true
+    local auto_accept=0
+    while [[ $# -gt 0 ]]; do
+        case "$1" in
+            --auto-accept) auto_accept=1 ;;
+            *) log_warning "wizard_interactive_run: ignoring unknown flag: $1" ;;
+        esac
+        shift
+    done
+
+    log_info "🧙 Interactive wizard (non-AI)"
+    log_info "  This wizard collects site settings and runs 'install init'."
+    log_info "  Press Enter to accept defaults shown in [brackets]."
+    echo
+
+    # Discover available profiles dynamically if loader is present.
+    local default_profile="full"
+    local profiles_csv="minimal full fork github remote"
+    if declare -F list_profile_names >/dev/null 2>&1; then
+        local discovered
+        discovered="$(list_profile_names "$repo_root" 2>/dev/null | tr '\n' ' ')"
+        [[ -n "$discovered" ]] && profiles_csv="$discovered"
+    fi
+    # shellcheck disable=SC2206
+    local profile_options=( $profiles_csv )
+
+    log_info "── Site basics ──────────────────────────"
+    local site_name site_desc author email
+    site_name="$(_wiz_prompt "Site name"        "$(basename "$target_dir")")"
+    site_desc="$(_wiz_prompt "Description"      "A Jekyll site powered by zer0-mistakes")"
+    author="$(_wiz_prompt    "Author name"      "${USER:-author}")"
+    email="$(_wiz_prompt     "Author email"     "${USER:-author}@example.com")"
+    echo
+
+    log_info "── Profile ──────────────────────────────"
+    local profile
+    profile="$(_wiz_choose "Choose an install profile:" "$default_profile" "${profile_options[@]}")"
+    echo
+
+    log_info "── Optional integrations ────────────────"
+    local want_agents=0 want_docker=0
+    _wiz_confirm "Install AI agent guidance files?" "y" && want_agents=1
+    _wiz_confirm "Add docker-prod deploy target?"   "n" && want_docker=1
+    echo
+
+    log_info "── Summary ──────────────────────────────"
+    log_info "  Target dir:  $target_dir"
+    log_info "  Site name:   $site_name"
+    log_info "  Description: $site_desc"
+    log_info "  Author:      $author <$email>"
+    log_info "  Profile:     $profile"
+    log_info "  Agents:      $([ "$want_agents" = "1" ] && echo yes || echo no)"
+    log_info "  docker-prod: $([ "$want_docker" = "1" ] && echo yes || echo no)"
+    echo
+
+    if [[ "$auto_accept" != "1" ]]; then
+        if ! _wiz_confirm "Proceed with these settings?" "y"; then
+            log_warning "Wizard cancelled."
+            return 0
+        fi
+    fi
+
+    # Export for any downstream consumers (legacy install.sh reads SITE_NAME etc.)
+    export SITE_NAME="$site_name"
+    export SITE_DESCRIPTION="$site_desc"
+    export AUTHOR_NAME="$author"
+    export AUTHOR_EMAIL="$email"
+
+    # Dispatch
+    local install_bin="$repo_root/scripts/bin/install"
+    if [[ ! -x "$install_bin" ]]; then
+        log_error "Cannot find $install_bin"
+        return 1
+    fi
+
+    log_info "Running: install init --profile $profile $target_dir"
+    "$install_bin" init --profile "$profile" --skip-doctor "$target_dir" || {
+        log_error "init failed"
+        return 1
+    }
+
+    if [[ "$want_agents" = "1" ]]; then
+        echo
+        log_info "Running: install agents $target_dir"
+        "$install_bin" agents "$target_dir" || log_warning "agents install reported issues"
+    fi
+
+    if [[ "$want_docker" = "1" ]]; then
+        echo
+        log_info "Running: install deploy docker-prod $target_dir"
+        "$install_bin" deploy docker-prod "$target_dir" || log_warning "docker-prod install reported issues"
+    fi
+
+    echo
+    log_success "Wizard complete!"
+    log_info "Next steps:"
+    log_info "  cd $target_dir"
+    log_info "  docker compose up   # or: bundle exec jekyll serve"
+    return 0
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-theme-zer0
 version: !ruby/object:Gem::Version
-  version: 0.22.21
+  version: 0.22.22
 platform: ruby
 authors:
 - Amr Abdel
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-04-19 00:00:00.000000000 Z
+date: 2026-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -355,6 +355,7 @@ files:
 - scripts/README.md
 - scripts/analyze-commits.sh
 - scripts/bin/build
+- scripts/bin/install
 - scripts/bin/release
 - scripts/bin/test
 - scripts/build
@@ -378,6 +379,27 @@ files:
 - scripts/lib/frontmatter.sh
 - scripts/lib/gem.sh
 - scripts/lib/git.sh
+- scripts/lib/install/README.md
+- scripts/lib/install/agents.sh
+- scripts/lib/install/ai/diagnose.sh
+- scripts/lib/install/ai/openai.sh
+- scripts/lib/install/ai/suggest.sh
+- scripts/lib/install/ai/wizard.sh
+- scripts/lib/install/config.sh
+- scripts/lib/install/deploy/README.md
+- scripts/lib/install/deploy/azure-swa.sh
+- scripts/lib/install/deploy/docker-prod.sh
+- scripts/lib/install/deploy/github-pages.sh
+- scripts/lib/install/deploy/registry.sh
+- scripts/lib/install/doctor.sh
+- scripts/lib/install/fs.sh
+- scripts/lib/install/logging.sh
+- scripts/lib/install/pages.sh
+- scripts/lib/install/platform.sh
+- scripts/lib/install/profile.sh
+- scripts/lib/install/template.sh
+- scripts/lib/install/upgrade.sh
+- scripts/lib/install/wizard_interactive.sh
 - scripts/lib/migrate.sh
 - scripts/lib/preview_generator.py
 - scripts/lib/template.sh