- Fix tests and add xcode install message

- Make installation messages clearer
- Add apple install url (but automation is gated to login)

Author: FrederickEngelhardt

configs/README.md

@@ -53,6 +53,16 @@ Complete backend/polyglot environment:
 ./osa-cli.zsh --config-file configs/backend-dev.json
 ```
 
+### `macos.json`
+General macOS development environment (no mobile platforms):
+- **Components**: Symlinks, oh-my-zsh, zsh-plugins, homebrew, mise, git, iTerm2, VSCode
+- **Runtimes**: Node.js 22, Python 3.13, Ruby 3.4.0, Java OpenJDK 21, Go 1.23
+- **Best for**: macOS-only development, avoiding iOS/CocoaPods, web/backend development
+
+```bash
+./osa-cli.zsh --config-file configs/macos.json
+```
+
 ### `react-native.json` ⭐
 Complete React Native mobile development environment:
 - **Components**: All (symlinks, oh-my-zsh, zsh-plugins, homebrew, mise, git, iTerm2, VSCode, CocoaPods, Android tools)

configs/macos.json

@@ -0,0 +1,54 @@
+{
+  "version": "1.0",
+  "description": "macOS Development Setup - General purpose macOS development",
+  "profile": "macos",
+  "components": {
+    "symlinks": true,
+    "oh_my_zsh": true,
+    "zsh_plugins": true,
+    "homebrew": true,
+    "mise": true,
+    "osa_snippets": true,
+    "git": true,
+    "iterm2": true,
+    "vscode": true
+  },
+  "runtimes": {
+    "node": {
+      "enabled": true,
+      "version": "22"
+    },
+    "python": {
+      "enabled": true,
+      "version": "3.13"
+    },
+    "ruby": {
+      "enabled": true,
+      "version": "3.4.0"
+    },
+    "java": {
+      "enabled": true,
+      "version": "openjdk-21"
+    },
+    "rust": {
+      "enabled": false,
+      "version": "stable"
+    },
+    "go": {
+      "enabled": true,
+      "version": "1.23"
+    },
+    "deno": {
+      "enabled": false,
+      "version": "latest"
+    },
+    "elixir": {
+      "enabled": false,
+      "version": "latest"
+    },
+    "erlang": {
+      "enabled": false,
+      "version": "latest"
+    }
+  }
+}

osa-cli.zsh

@@ -38,6 +38,9 @@ export OSA_SKIP_SNIPPETS=false
 # Git configuration flag (can be disabled with --disable-git)
 export OSA_SKIP_GIT_CONFIG=false
 
+# CocoaPods flag (can be disabled with --skip-cocoapods for testing)
+export OSA_SKIP_COCOAPODS=false
+
 # Setup profile name (tracks which preset was used: minimal, react-native, etc.)
 export OSA_SETUP_PROFILE="everything"
 
@@ -120,19 +123,29 @@ load_json_config() {
 
   # Load components
   local -a component_keys=(symlinks oh_my_zsh zsh_plugins homebrew mise osa_snippets git android iterm2 vscode cocoapods)
+  local -a undefined_components
 
   for key in "${component_keys[@]}"; do
     local enabled=$(jq -r ".components.${key} // false" "$resolved_path" 2>/dev/null)
+    local var_name="OSA_SETUP_$(normalize_key "$key")"
+    
     if [[ "$enabled" == "true" ]]; then
-      local var_name="OSA_SETUP_$(normalize_key "$key")"
-      # Safe assignment without eval - use typeset/declare
       typeset -g "$var_name=true"
     else
-      local var_name="OSA_SETUP_$(normalize_key "$key")"
       typeset -g "$var_name=false"
+      # Track undefined components (not explicitly set in config)
+      local component_exists=$(jq -r ".components | has(\"${key}\")" "$resolved_path" 2>/dev/null)
+      if [[ "$component_exists" != "true" ]]; then
+        undefined_components+=("$key")
+      fi
     fi
   done
 
+  # Log undefined components that will be skipped (optional, can be removed if too verbose)
+  if [[ ${#undefined_components[@]} -gt 0 ]] && [[ "$OSA_VERBOSE" == "true" ]]; then
+    echo -e "${COLOR_CYAN}Skipping undefined components: ${undefined_components[*]}${COLOR_RESET}"
+  fi
+  
   # Load runtimes
   local -a runtime_keys=(node python ruby java rust go deno elixir erlang)
 
@@ -560,26 +573,18 @@ interactive_setup() {
 
   # macOS pre-flight check: Xcode Command Line Tools
   if [[ "$OSA_IS_MACOS" == "true" ]]; then
-    if ! command -v xcode-select &>/dev/null || ! xcode-select -p &>/dev/null; then
+    # Check if xcode-select returns a valid path (CLT is installed)
+    # xcode-select -p returns the path to CLT, or fails if not installed
+    local xcode_path=$(xcode-select -p 2>/dev/null)
+    if [[ -z "$xcode_path" ]] || [[ ! -d "$xcode_path" ]]; then
       echo -e "${COLOR_YELLOW}⚠️  Xcode Command Line Tools not found${COLOR_RESET}"
       echo ""
       echo "Homebrew and many development tools require Xcode CLT."
+      echo "Install from Apple Developer:"
+      echo "  ${COLOR_BOLD}https://developer.apple.com/download/more/${COLOR_RESET}"
       echo ""
-      echo "Two ways to install:"
+      echo "Or try: ${COLOR_BOLD}xcode-select --install${COLOR_RESET}"
       echo ""
-      echo "  Option 1 (Easiest):"
-      echo "    ${COLOR_BOLD}xcode-select --install${COLOR_RESET}"
-      echo ""
-      echo "  Option 2 (From Apple Developer):"
-      echo "    Visit: https://developer.apple.com/download/more/"
-      echo "    Search for 'Command Line Tools'"
-      echo "    Download and install (Apple login required)"
-      echo ""
-      
-      if ! ask_yes_no "Continue anyway?" "n"; then
-        echo -e "${COLOR_RED}Setup cancelled.${COLOR_RESET}"
-        return 1
-      fi
     fi
   fi
 
@@ -647,8 +652,12 @@ interactive_setup() {
       continue
     fi
 
-    # Special handling for CocoaPods - ask with version selection
+    # Special handling for CocoaPods - ask with version selection (unless --skip-cocoapods)
     if [[ "$key" == "cocoapods" ]]; then
+      if [[ "$OSA_SKIP_COCOAPODS" == "true" ]]; then
+        echo -e "${COLOR_YELLOW}⊘${COLOR_RESET} Skipping CocoaPods (--skip-cocoapods flag set)"
+        continue
+      fi
       if is_component_available "$key"; then
         # Source the interactive CocoaPods setup
         if source "$OSA_CLI_DIR/src/setup/install-cocoapods-interactive.zsh"; then
@@ -723,10 +732,27 @@ interactive_setup() {
 
 # Automated setup using saved config
 automated_setup() {
-  echo -e "${COLOR_BOLD}Running automated setup from saved configuration...${COLOR_RESET}\n"
+  echo -e "${COLOR_BOLD}${COLOR_CYAN}▶ OSA Setup in progress...${COLOR_RESET}\n"
 
   print_platform_info
 
+  # macOS pre-flight check: Xcode Command Line Tools
+  if [[ "$OSA_IS_MACOS" == "true" ]]; then
+    # Check if xcode-select returns a valid path (CLT is installed)
+    # xcode-select -p returns the path to CLT, or fails if not installed
+    local xcode_path=$(xcode-select -p 2>/dev/null)
+    if [[ -z "$xcode_path" ]] || [[ ! -d "$xcode_path" ]]; then
+      echo -e "${COLOR_YELLOW}⚠️  Xcode Command Line Tools not found${COLOR_RESET}"
+      echo ""
+      echo "Homebrew and many development tools require Xcode CLT."
+      echo "Install from Apple Developer:"
+      echo "  ${COLOR_BOLD}https://developer.apple.com/download/more/${COLOR_RESET}"
+      echo ""
+      echo "Or try: ${COLOR_BOLD}xcode-select --install${COLOR_RESET}"
+      echo ""
+    fi
+  fi
+  
   # Build components in the REQUIRED ORDER (array order matters!)
   local -a selected_components
 
@@ -759,7 +785,7 @@ automated_setup() {
     selected_components+=("git")
   fi
 
-  if [[ "$OSA_SETUP_COCOAPODS" == "true" ]] && is_component_available "cocoapods"; then
+  if [[ "$OSA_SETUP_COCOAPODS" == "true" ]] && [[ "$OSA_SKIP_COCOAPODS" != "true" ]] && is_component_available "cocoapods"; then
     selected_components+=("cocoapods")
   fi
 
@@ -802,6 +828,9 @@ automated_setup() {
   echo "  1. Try it out: ${COLOR_BOLD}mise --version${COLOR_RESET}"
   echo "  2. Test in a new terminal (recommended): ${COLOR_BOLD}zsh${COLOR_RESET}"
   echo "  3. Happy coding! 🚀"
+  
+  echo ""
+  echo -e "${COLOR_BOLD}${COLOR_GREEN}✓ OSA setup completed successfully${COLOR_RESET}"
 }
 
 # Show help
@@ -835,6 +864,7 @@ ${COLOR_BOLD}OPTIONS:${COLOR_RESET}
   --local                 Skip global mise setup (only setup local configs)
   --disable-osa-snippets  Skip osa-snippets installation (enabled by default)
   --disable-git           Skip Git configuration (default: configure git)
+  --skip-cocoapods        Skip CocoaPods installation (useful for testing)
   --doctor                Validate installation and suggest fixes (no changes made)
   --report                Generate system report for bug reporting
   --report-json           Generate system report in JSON format
@@ -1003,6 +1033,14 @@ enable_minimal() {
   OSA_SETUP_ZSH_PLUGINS=true
   OSA_SETUP_MISE=true
 
+  # Disable all optional components
+  OSA_SETUP_GIT=false
+  OSA_SETUP_ANDROID=false
+  OSA_SETUP_COCOAPODS=false
+  OSA_SETUP_ITERM2=false
+  OSA_SETUP_VSCODE=false
+  OSA_SETUP_OSA_SNIPPETS=false
+  
   # Enable homebrew on macOS
   if [[ "$OSA_IS_MACOS" == "true" ]]; then
     OSA_SETUP_HOMEBREW=true
@@ -1449,7 +1487,6 @@ HOOK_EOF
 # Main CLI logic
 main() {
   init_components
-  load_config
 
   # Parse arguments
   if [[ $# -eq 0 ]]; then
@@ -1536,6 +1573,10 @@ main() {
         export OSA_SKIP_GIT_CONFIG=true
         shift
         ;;
+      --skip-cocoapods)
+        export OSA_SKIP_COCOAPODS=true
+        shift
+        ;;
       # Options that take arguments
       --config|--config-file|--config-json|--config-url|--enable|--disable)
         if [[ -z "$primary_action" ]]; then
@@ -1634,6 +1675,8 @@ main() {
       exit $?
       ;;
     -a|--auto)
+      # Load saved config for auto mode
+      load_config
       automated_setup
       exit $?
       ;;

src/setup/git.zsh

@@ -12,9 +12,15 @@
 
 # Ensure git is installed (always, regardless of OSA_SKIP_GIT_CONFIG)
 # This is needed for basic OSA operations like cloning repos
-if [[ "$OSA_IS_MACOS" == "true" ]] && [[ $(command -v git) != "/usr/local/bin/git" ]]; then 
-  echo "Installing latest git with brew..."
-  brew install git
+if [[ "$OSA_IS_MACOS" == "true" ]]; then
+  # Check if git needs updating
+  local installed_version=$(git --version 2>/dev/null | grep -oE '[0-9]+\.[0-9]+\.[0-9]+' | head -1)
+  local upstream_version=$(brew info git 2>/dev/null | grep -oE '[0-9]+\.[0-9]+\.[0-9]+' | head -1)
+  
+  # Only install if not installed or version is different
+  if [[ -z "$installed_version" ]] || [[ "$installed_version" != "$upstream_version" ]]; then
+    brew install git >/dev/null
+  fi
 fi
 
 # Skip git configuration if disabled