new install script

library/compose/homer/template.yaml

@@ -7,10 +7,7 @@ metadata:
   author: Christian Lempa
   date: '2025-09-28'
   tags:
-  - homer
-  - docker
-  - compose
-  draft: true
+    - dashboard
 spec:
   ports:
     vars:
@@ -18,9 +15,3 @@ spec:
         description: "Host port for HTTP (8080)"
         type: int
         default: 8080
-  general:
-    vars:
-      homer_version:
-        type: string
-        description: Homer version
-        default: latest

scripts/install.sh

@@ -15,515 +15,126 @@ Install the boilerplates CLI from GitHub releases.
 Options:
   --path DIR        Installation directory (default: "$HOME/boilerplates")
   --version VER     Version to install (default: "latest")
-                    Examples: latest, v1.0.0, v0.0.1
   -h, --help        Show this message
 
 Examples:
-  # Install latest version
   curl -fsSL https://raw.githubusercontent.com/christianlempa/boilerplates/main/scripts/install.sh | bash
-
-  # Install specific version
   curl -fsSL https://raw.githubusercontent.com/christianlempa/boilerplates/main/scripts/install.sh | bash -s -- --version v1.0.0
-
-  # Install to custom directory
-  curl -fsSL https://raw.githubusercontent.com/christianlempa/boilerplates/main/scripts/install.sh | bash -s -- --path ~/my-boilerplates
 USAGE
 }
 
-log() {
-  printf '[boilerplates] %s\n' "$*" >&2
-}
-
-error() {
-  printf '[boilerplates][error] %s\n' "$*" >&2
-  exit 1
-}
-
-warn() {
-  printf '[boilerplates][warn] %s\n' "$*" >&2
-}
-
-detect_os() {
-  if [[ "$OSTYPE" == "linux-gnu"* ]]; then
-    if command -v apt-get >/dev/null 2>&1; then
-      echo "debian"
-    elif command -v dnf >/dev/null 2>&1; then
-      echo "fedora"
-    elif command -v yum >/dev/null 2>&1; then
-      echo "rhel"
-    elif command -v pacman >/dev/null 2>&1; then
-      echo "arch"
-    else
-      echo "linux"
-    fi
-  elif [[ "$OSTYPE" == "darwin"* ]]; then
-    echo "macos"
-  else
-    echo "unknown"
-  fi
-}
+log() { printf '[boilerplates] %s\n' "$*" >&2; }
+error() { printf '[boilerplates][error] %s\n' "$*" >&2; exit 1; }
 
-ensure_python3() {
-  if command -v python3 >/dev/null 2>&1; then
-    log "✓ Python3 is already installed"
-    return 0
-  fi
-  
-  log "Python3 not found. Attempting to install..."
-  local os_type
-  os_type=$(detect_os)
-  
-  case "$os_type" in
-    debian)
-      log "Detected Debian/Ubuntu. Installing python3..."
-      sudo apt-get update && sudo apt-get install -y python3 python3-pip python3-venv
-      ;;
-    fedora)
-      log "Detected Fedora. Installing python3..."
-      sudo dnf install -y python3 python3-pip
-      ;;
-    rhel)
-      log "Detected RHEL/CentOS. Installing python3..."
-      sudo yum install -y python3 python3-pip
-      ;;
-    arch)
-      log "Detected Arch Linux. Installing python3..."
-      sudo pacman -S --noconfirm python python-pip
-      ;;
-    macos)
-      if command -v brew >/dev/null 2>&1; then
-        log "Detected macOS with Homebrew. Installing python3..."
-        brew install python3
-      else
-        error "Python3 not found and Homebrew is not installed. Please install Python3 manually from https://www.python.org/downloads/"
-      fi
-      ;;
-    *)
-      error "Could not automatically install Python3 on this system. Please install Python3 manually."
-      ;;
-  esac
-  
-  # Verify installation
-  if ! command -v python3 >/dev/null 2>&1; then
-    error "Failed to install Python3. Please install it manually."
-  fi
-  
-  log "✓ Python3 installed successfully"
-}
-
-ensure_pip() {
-  if python3 -m pip --version >/dev/null 2>&1; then
-    log "✓ pip is already installed"
-    return 0
-  fi
-  
-  log "pip not found. Attempting to install..."
-  
-  # Detect OS and install pip using system package manager (preferred for modern Python)
-  local os_type
-  os_type=$(detect_os)
-  
-  case "$os_type" in
-    debian)
-      log "Installing pip via apt..."
-      if sudo apt-get update && sudo apt-get install -y python3-pip python3-venv; then
-        log "✓ pip installed via apt"
-      else
-        error "Failed to install pip via apt. Please run: sudo apt-get install python3-pip python3-venv"
-      fi
-      ;;
-    fedora)
-      log "Installing pip via dnf..."
-      if sudo dnf install -y python3-pip; then
-        log "✓ pip installed via dnf"
-      else
-        error "Failed to install pip via dnf. Please run: sudo dnf install python3-pip"
-      fi
-      ;;
-    rhel)
-      log "Installing pip via yum..."
-      if sudo yum install -y python3-pip; then
-        log "✓ pip installed via yum"
-      else
-        error "Failed to install pip via yum. Please run: sudo yum install python3-pip"
-      fi
-      ;;
-    arch)
-      log "Installing pip via pacman..."
-      if sudo pacman -S --noconfirm python-pip; then
-        log "✓ pip installed via pacman"
-      else
-        error "Failed to install pip via pacman. Please run: sudo pacman -S python-pip"
-      fi
-      ;;
-    macos)
-      # On macOS, pip usually comes with Python from Homebrew
-      log "pip should be included with Python. Verifying..."
-      python3 -m ensurepip --default-pip 2>/dev/null || true
-      ;;
-    *)
-      error "Could not detect your OS or package manager. Please install pip manually: sudo apt install python3-pip (Debian/Ubuntu) or equivalent for your system."
-      ;;
-  esac
+check_dependencies() {
+  command -v tar >/dev/null 2>&1 || error "tar is required but not found"
+  command -v python3 >/dev/null 2>&1 || error "Python 3 is required. Install: sudo apt install python3 python3-pip"
+  python3 -m pip --version >/dev/null 2>&1 || error "pip is required. Install: sudo apt install python3-pip"
   
-  # Verify installation
-  if ! python3 -m pip --version >/dev/null 2>&1; then
-    error "Failed to install pip. Please install it manually using your system package manager."
+  if command -v pipx >/dev/null 2>&1; then
+    PIPX_CMD="pipx"
+  elif [[ -x "$(python3 -m site --user-base 2>/dev/null)/bin/pipx" ]]; then
+    PIPX_CMD="$(python3 -m site --user-base)/bin/pipx"
+  else
+    error "pipx is required. Install: pip install --user pipx"
   fi
   
-  log "✓ pip installed successfully"
-}
-
-require_command() {
-  command -v "$1" >/dev/null 2>&1 || error "Required command '$1' not found in PATH"
+  log "✓ All dependencies available"
 }
 
 parse_args() {
   while [[ $# -gt 0 ]]; do
     case "$1" in
-      --path)
-        [[ $# -lt 2 ]] && error "--path requires a value"
-        TARGET_DIR="$2"
-        shift 2
-        ;;
-      --version)
-        [[ $# -lt 2 ]] && error "--version requires a value"
-        VERSION="$2"
-        shift 2
-        ;;
-      -h|--help)
-        usage
-        exit 0
-        ;;
-      *)
-        error "Unknown option: $1"
-        ;;
+      --path) TARGET_DIR="$2"; shift 2 ;;
+      --version) VERSION="$2"; shift 2 ;;
+      -h|--help) usage; exit 0 ;;
+      *) error "Unknown option: $1" ;;
     esac
   done
 }
 
-make_absolute_path() {
-  python3 - <<'PY' "$TARGET_DIR"
-import os, sys
-print(os.path.abspath(os.path.expanduser(sys.argv[1])))
-PY
-}
-
 get_latest_release() {
   local api_url="https://api.github.com/repos/$REPO_OWNER/$REPO_NAME/releases/latest"
-  local release_tag
-  
-  # Note: Don't use log() here as this function's output is captured
-  # The calling function will log the result
   
   if command -v curl >/dev/null 2>&1; then
-    release_tag=$(curl -fsSL "$api_url" | grep '"tag_name":' | sed -E 's/.*"tag_name": "([^"]+)".*/\1/')
+    curl -fsSL "$api_url" | grep '"tag_name":' | sed -E 's/.*"tag_name": "([^"]+)".*/\1/'
   elif command -v wget >/dev/null 2>&1; then
-    release_tag=$(wget -qO- "$api_url" | grep '"tag_name":' | sed -E 's/.*"tag_name": "([^"]+)".*/\1/')
+    wget -qO- "$api_url" | grep '"tag_name":' | sed -E 's/.*"tag_name": "([^"]+)".*/\1/'
   else
-    echo "error: Neither curl nor wget found" >&2
-    return 1
-  fi
-  
-  if [[ -z "$release_tag" ]]; then
-    echo "error: Failed to fetch latest release tag" >&2
-    return 1
+    echo "error" >&2; return 1
   fi
-  
-  echo "$release_tag"
 }
 
 download_release() {
   local version="$1"
-  local download_url
   
-  # If version is "latest", resolve it to the actual version tag
+  # Resolve "latest" to actual version
   if [[ "$version" == "latest" ]]; then
-    log "Fetching latest release information..."
+    log "Fetching latest release..."
     version=$(get_latest_release)
-    local exit_code=$?
-    if [[ $exit_code -ne 0 ]] || [[ -z "$version" ]] || [[ "$version" == error:* ]]; then
-      error "Failed to fetch latest release information"
-    fi
-    log "Latest version is $version"
+    [[ "$version" =~ ^error ]] && error "Failed to fetch latest release"
+    log "Latest version: $version"
   fi
   
-  # Ensure version has 'v' prefix for GitHub releases
-  if [[ ! "$version" =~ ^v ]]; then
-    version="v$version"
-  fi
+  # Ensure 'v' prefix
+  [[ "$version" =~ ^v ]] || version="v$version"
   
-  download_url="https://github.com/$REPO_OWNER/$REPO_NAME/archive/refs/tags/$version.tar.gz"
+  local url="https://github.com/$REPO_OWNER/$REPO_NAME/archive/refs/tags/$version.tar.gz"
+  local temp_dir=$(mktemp -d)
+  local archive="$temp_dir/release.tar.gz"
   
-  log "Downloading release $version..."
-  log "URL: $download_url"
-  
-  local temp_dir
-  temp_dir=$(mktemp -d)
-  
-  local archive_file="$temp_dir/boilerplates.tar.gz"
+  log "Downloading $version..."
   
   if command -v curl >/dev/null 2>&1; then
-    curl -fsSL -o "$archive_file" "$download_url" || {
-      rm -rf "$temp_dir"
-      error "Failed to download release"
-    }
+    curl -fsSL -o "$archive" "$url" || { rm -rf "$temp_dir"; error "Download failed"; }
   elif command -v wget >/dev/null 2>&1; then
-    wget -qO "$archive_file" "$download_url" || {
-      rm -rf "$temp_dir"
-      error "Failed to download release"
-    }
-  else
-    rm -rf "$temp_dir"
-    error "Neither curl nor wget found. Please install one of them."
+    wget -qO "$archive" "$url" || { rm -rf "$temp_dir"; error "Download failed"; }
   fi
   
-  log "Extracting release..."
+  log "Extracting to $TARGET_DIR..."
   
-  # Remove existing installation if present
-  if [[ -d "$TARGET_DIR" ]]; then
-    log "Removing existing installation at $TARGET_DIR"
-    rm -rf "$TARGET_DIR"
-  fi
-  
-  # Create parent directory
+  [[ -d "$TARGET_DIR" ]] && rm -rf "$TARGET_DIR"
   mkdir -p "$(dirname "$TARGET_DIR")"
   
-  # Extract with strip-components to remove the top-level directory
-  tar -xzf "$archive_file" -C "$(dirname "$TARGET_DIR")" || {
-    rm -rf "$temp_dir"
-    error "Failed to extract release"
-  }
+  tar -xzf "$archive" -C "$(dirname "$TARGET_DIR")" || { rm -rf "$temp_dir"; error "Extraction failed"; }
   
-  # Rename extracted directory to target name
-  local extracted_dir
-  extracted_dir=$(dirname "$TARGET_DIR")/"$REPO_NAME-${version#v}"
+  mv "$(dirname "$TARGET_DIR")/$REPO_NAME-${version#v}" "$TARGET_DIR" || { rm -rf "$temp_dir"; error "Installation failed"; }
   
-  if [[ ! -d "$extracted_dir" ]]; then
-    rm -rf "$temp_dir"
-    error "Extraction failed: expected directory $extracted_dir not found"
-  fi
-  
-  mv "$extracted_dir" "$TARGET_DIR" || {
-    rm -rf "$temp_dir"
-    error "Failed to move extracted files to $TARGET_DIR"
-  }
-  
-  # Clean up temp directory
   rm -rf "$temp_dir"
-  
-  log "Release extracted to $TARGET_DIR"
-  
-  # Store version info
-  echo "$version" > "$TARGET_DIR/.installed-version"
+  echo "$version" > "$TARGET_DIR/.version"
+  log "✓ Release extracted"
 }
 
-ensure_pipx() {
-  if command -v pipx >/dev/null 2>&1; then
-    log "✓ pipx is already installed"
-    PIPX_CMD="pipx"
-    return
-  fi
-
-  log "pipx not found. Installing pipx..."
-  
-  # Detect OS and try to install via package manager first (preferred for PEP 668 systems)
-  local os_type
-  os_type=$(detect_os)
-  
-  case "$os_type" in
-    debian)
-      log "Installing pipx via apt..."
-      if sudo apt-get update && sudo apt-get install -y pipx; then
-        log "✓ pipx installed via apt"
-        # Ensure pipx path is set up
-        pipx ensurepath >/dev/null 2>&1 || true
-      else
-        warn "Failed to install pipx via apt, trying pip..."
-        install_pipx_with_pip
-      fi
-      ;;
-    fedora)
-      log "Installing pipx via dnf..."
-      if sudo dnf install -y pipx; then
-        log "✓ pipx installed via dnf"
-      else
-        warn "Failed to install pipx via dnf, trying pip..."
-        install_pipx_with_pip
-      fi
-      ;;
-    arch)
-      log "Installing pipx via pacman..."
-      if sudo pacman -S --noconfirm python-pipx; then
-        log "✓ pipx installed via pacman"
-      else
-        warn "Failed to install pipx via pacman, trying pip..."
-        install_pipx_with_pip
-      fi
-      ;;
-    macos)
-      if command -v brew >/dev/null 2>&1; then
-        log "Installing pipx via Homebrew..."
-        if brew install pipx; then
-          log "✓ pipx installed via Homebrew"
-          # Ensure pipx path is set up
-          pipx ensurepath >/dev/null 2>&1 || true
-        else
-          warn "Failed to install pipx via Homebrew, trying pip..."
-          install_pipx_with_pip
-        fi
-      else
-        log "Homebrew not found, installing pipx via pip..."
-        install_pipx_with_pip
-      fi
-      ;;
-    *)
-      # Fallback to pip installation
-      install_pipx_with_pip
-      ;;
-  esac
-
-  # Try to find pipx command
-  if command -v pipx >/dev/null 2>&1; then
-    PIPX_CMD="pipx"
-    log "✓ pipx is ready to use"
-    return
-  fi
-
-  # Check in user bin directory
-  local user_bin
-  user_bin="$(python3 -m site --user-base 2>/dev/null)/bin"
-  if [[ -x "$user_bin/pipx" ]]; then
-    PIPX_CMD="$user_bin/pipx"
-    log "✓ Found pipx at $PIPX_CMD"
-    return
-  fi
-  
-  error "pipx installed but not found in PATH. Please add $(python3 -m site --user-base)/bin to your PATH or restart your shell."
-}
-
-install_pipx_with_pip() {
-  log "Installing pipx using pip..."
-  
-  # Try with --user flag first (works on most systems)
-  if python3 -m pip install --user pipx 2>/dev/null; then
-    log "✓ pipx installed via pip --user"
-    return
-  fi
-  
-  # If that fails due to externally-managed-environment, try with --break-system-packages
-  # (only as a last resort and with clear warning)
-  warn "System has PEP 668 restrictions. Attempting installation with --break-system-packages..."
-  if python3 -m pip install --user --break-system-packages pipx 2>/dev/null; then
-    log "✓ pipx installed (with --break-system-packages)"
-    return
-  fi
-  
-  error "Failed to install pipx. Please install it manually: sudo apt install pipx (Debian/Ubuntu) or pip install --user pipx"
-}
-
-pipx_install() {
-  log "Configuring pipx PATH..."
-  "${PIPX_CMD}" ensurepath 2>&1 | grep -v "^$" || true
-  log "Installing/updating boilerplates via pipx"
-  "${PIPX_CMD}" install --editable --force "$TARGET_DIR"
-}
-
-check_current_version() {
-  if [[ -f "$TARGET_DIR/.installed-version" ]]; then
-    cat "$TARGET_DIR/.installed-version"
-  else
-    echo "unknown"
-  fi
+install_cli() {
+  log "Installing CLI via pipx..."
+  "$PIPX_CMD" ensurepath 2>&1 | grep -v "^$" || true
+  "$PIPX_CMD" install --editable --force "$TARGET_DIR"
 }
 
 main() {
   parse_args "$@"
   
-  log "Checking system dependencies..."
-  
-  # Ensure required tools are available
-  require_command tar
+  log "Checking dependencies..."
+  check_dependencies
   
-  # Ensure Python3, pip, and pipx are installed
-  ensure_python3
-  ensure_pip
+  TARGET_DIR=$(python3 -c "import os, sys; print(os.path.abspath(os.path.expanduser('$TARGET_DIR')))")
   
-  TARGET_DIR="$(make_absolute_path)"
-  
-  # Check if already installed
-  local current_version
-  current_version=$(check_current_version)
-  
-  if [[ "$current_version" != "unknown" ]]; then
-    log "Currently installed version: $current_version"
-  fi
-
   download_release "$VERSION"
-  ensure_pipx
-  pipx_install
-
-  local pipx_info
-  pipx_info=$("${PIPX_CMD}" list --short 2>/dev/null | grep -E '^boilerplates' || echo "boilerplates (not detected)")
+  install_cli
   
-  local installed_version
-  installed_version=$(check_current_version)
-
-  # Check if boilerplates is in PATH
-  local path_warning=""
-  if ! command -v boilerplates >/dev/null 2>&1; then
-    local user_bin
-    user_bin="$(python3 -m site --user-base 2>/dev/null)/bin"
-    
-    # Detect shell and provide appropriate instructions
-    local shell_config
-    if [[ -n "${BASH_VERSION:-}" ]]; then
-      shell_config="~/.bashrc"
-    elif [[ -n "${ZSH_VERSION:-}" ]]; then
-      shell_config="~/.zshrc"
-    else
-      shell_config="your shell's config file"
-    fi
-    
-    path_warning=$(cat <<'PATHWARN'
-
-⚠️  PATH Configuration Required
-
-The 'boilerplates' command is not in your PATH. To use it, add this to SHELL_CONFIG:
-
-  export PATH="$PATH:USER_BIN"
-
-Then reload your shell:
-
-  source SHELL_CONFIG
-
-Or use the full path for now:
-
-  USER_BIN/boilerplates --help
-PATHWARN
-)
-    path_warning="${path_warning//SHELL_CONFIG/$shell_config}"
-    path_warning="${path_warning//USER_BIN/$user_bin}"
-  fi
-
-  cat <<EOF2
+  local version=$(cat "$TARGET_DIR/.version" 2>/dev/null || echo "unknown")
+  
+  cat <<EOF
 
 ✓ Installation complete!
 
-Version: $installed_version
+Version: $version
 Location: $TARGET_DIR
-pipx environment: $pipx_info$path_warning
 
-To use the CLI:
+Usage:
   boilerplates --help
   boilerplates compose list
+  boilerplates compose generate <template>
 
-To update to the latest version:
+Update:
   curl -fsSL https://raw.githubusercontent.com/$REPO_OWNER/$REPO_NAME/main/scripts/install.sh | bash
-
-To install a specific version:
-  curl -fsSL https://raw.githubusercontent.com/$REPO_OWNER/$REPO_NAME/main/scripts/install.sh | bash -s -- --version v1.0.0
-EOF2
-}
-
-main "$@"