Merge pull request #54 from abordage/feature/integrate-dk-commands

feat(tools): enhance automated tool installation during setup

Author: abordage

Makefile

@@ -17,7 +17,7 @@ endif
 
 # Declare all targets as phony (they don't create files)
 .PHONY: help status setup start stop restart reset rebuild update \
-		dk-install dk-uninstall project dump lint tmp-clean
+		project dump lint
 
 # Colors for output
 RED := \033[0;31m
@@ -97,16 +97,6 @@ rebuild: ## [DEPRECATED] Use 'make update' instead
 update: ## Update DockerKit, reinstall dk command, and rebuild containers (with cache)
 	@tools/update.sh
 
-# =============================================================================
-# DK COMMAND MANAGEMENT
-# =============================================================================
-
-dk-install: ## Install dk command for quick workspace access from any .localhost project
-	@tools/dk/manager.sh install
-
-dk-uninstall: ## Remove dk command from system
-	@tools/dk/manager.sh uninstall
-
 # =============================================================================
 # CLEANUP & MAINTENANCE
 # =============================================================================

README.md

@@ -48,7 +48,7 @@ DockerKit is a modern development environment enabling you to run, configure, an
 ### Prerequisites
 
 - **Docker & Docker Compose** for container orchestration
-- **[mkcert](https://github.com/FiloSottile/mkcert)** for automatic HTTPS certificate generation (recommended)
+- **[Homebrew](https://brew.sh)** (macOS only) - required for automatic mkcert installation
 
 ### Installation
 
@@ -62,13 +62,19 @@ cd dockerkit
 
 # 3. Run automatic environment setup
 make setup
+```
 
-# 4. Start all services
-make start
+### Automatic Tool Installation
 
-# 5. Install the `dk` command for instant workspace access from any project dir
-make dk-install
-```
+DockerKit automatically installs required development tools during setup:
+
+- **mkcert** - for trusted SSL certificates (installed automatically)
+  - On macOS: via Homebrew (`brew install mkcert`)
+  - On Linux/WSL2: from GitHub releases
+  - Certificate Authority is configured automatically
+- **dk command** - for quick workspace access from any project directory
+
+No manual installation required - everything is handled by `make setup`.
 
 ### Project Structure
 
@@ -124,10 +130,6 @@ git clone https://github.com/yourorg/api.git api.localhost
 # 2. Reconfigure DockerKit to detect new projects
 cd dockerkit
 make setup
-
-# 3. Your projects are now available:
-# https://myapp.localhost
-# https://api.localhost
 ```
 
 ## Configuration
@@ -197,12 +199,8 @@ make status        # Show current system status
 make project       # Create new project (Laravel/Symfony)
 make dump          # Interactive database backup/restore tool
 
-# Development Tools
-make dk-install    # Install dk command for quick workspace access
-make dk-uninstall  # Remove dk command from system
-
 # Maintenance
-make update        # Update DockerKit, reinstall dk command, and rebuild containers
+make update        # Update DockerKit and rebuild containers
 make reset         # Reset project to initial state
 make lint          # Run all quality checks (Dockerfiles, bash scripts)
 make tmp-clean     # Clean /tmp inside workspace container

tools/dk/dk.sh

@@ -5,7 +5,7 @@
 # =============================================================================
 # Quick connect to DockerKit workspace container from any .localhost project
 # Compatible: macOS, Linux, WSL2
-# Usage: dk [--help|--version]
+# Usage: dk [--help]
 # =============================================================================
 
 set -euo pipefail
@@ -14,7 +14,6 @@ set -euo pipefail
 # SCRIPT METADATA
 # =============================================================================
 
-readonly DK_VERSION="1.5.1"
 
 # Update check constants
 readonly LAST_CHECK_FILE="$HOME/.dockerkit/last-update-check"
@@ -201,7 +200,7 @@ perform_daily_update_check() {
 # Show help message
 show_help() {
     cat << EOF
-DockerKit Quick Connect v${DK_VERSION}
+DockerKit Quick Connect
 
 USAGE:
     dk [OPTIONS]
@@ -212,20 +211,18 @@ DESCRIPTION:
 
 OPTIONS:
     --help          Show this help message
-    --version       Show version information
 
 EXAMPLES:
     dk                      # Connect to workspace or show available options
-    dk --version            # Show version number
 
 REQUIREMENTS:
     • Must be run from a .localhost project directory
     • At least one DockerKit instance must be available
     • Docker and docker compose must be installed
 
 INSTALLATION:
-    Install:            make dk-install (from DockerKit directory)
-    Uninstall:          make dk-uninstall (from DockerKit directory)
+    dk command is automatically installed during 'make setup'
+    and removed during 'make reset' from DockerKit directory.
     Compatible:         macOS, Linux, WSL2
 
 MORE INFO:
@@ -235,13 +232,6 @@ MORE INFO:
 EOF
 }
 
-# Show version information
-show_version() {
-    echo "${DK_VERSION}"
-}
-
-
-
 # Detect current project name from directory
 detect_current_project() {
     local current_dir project_name
@@ -365,10 +355,6 @@ parse_arguments() {
                 show_help
                 exit "${EXIT_SUCCESS}"
                 ;;
-            --version|-v)
-                show_version
-                exit "${EXIT_SUCCESS}"
-                ;;
             -*)
                 print_error "Unknown option: $1"
                 show_help

tools/dk/manager.sh

@@ -121,7 +121,7 @@ dk() {
         "\$HOME/.dockerkit/bin/dk" "\$@"
     else
         echo "dk command not installed."
-        echo "Run 'make dk-install' in your DockerKit directory."
+        echo "Run 'make setup' in your DockerKit directory (auto-installs dk)."
         return 1
     fi
 }
@@ -313,7 +313,7 @@ install_dk_command() {
     if cp "$DK_SOURCE_SCRIPT" "$DK_INSTALL_PATH"; then
         chmod +x "$DK_INSTALL_PATH"
         print_success "dk command installed successfully"
-        print_success "Location: $(purple "$DK_INSTALL_PATH")"
+        print_success "Location: $(gray "$DK_INSTALL_PATH")"
     else
         print_error "Failed to install dk command"
         return "$EXIT_GENERAL_ERROR"

tools/lib/core/utils.sh

@@ -62,20 +62,6 @@ detect_os() {
     esac
 }
 
-get_project_version() {
-    local dk_script_path="$DOCKERKIT_DIR/tools/dk/dk.sh"
-
-    if [ -f "$dk_script_path" ]; then
-        local version
-        version=$(grep "readonly DK_VERSION=" "$dk_script_path" 2>/dev/null | \
-        sed 's/.*DK_VERSION="\([^"]*\)".*/\1/' | \
-        head -n 1)
-        echo "${version#v}"
-    else
-        echo "unknown"
-    fi
-}
-
 command_exists() {
     local command_name="$1"
 

tools/lib/services/packages.sh

@@ -1,10 +1,10 @@
 #!/bin/bash
 
 # =============================================================================
-# PACKAGE MANAGER
+# REQUIRED TOOLS INSTALLER
 # =============================================================================
-# Functions for managing system packages and dependencies
-# Usage: source this file and call package management functions
+# Functions for installing essential tools required for DockerKit functionality
+# Usage: source this file and call install_required_tools()
 # =============================================================================
 
 set -euo pipefail
@@ -20,13 +20,13 @@ PKG_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 source "$PKG_SCRIPT_DIR/../core/utils.sh"
 source "$PKG_SCRIPT_DIR/../core/config.sh"
 
-check_system_dependencies() {
+install_required_tools() {
     local os_type
     os_type=$(detect_os)
 
     case "$os_type" in
         macos|linux|wsl2)
-            check_required_tools
+            install_required_dependencies
             ;;
         *)
             print_warning "Unsupported operating system: $os_type"
@@ -35,21 +35,21 @@ check_system_dependencies() {
     esac
 }
 
-check_required_tools() {
+install_required_dependencies() {
     local required_tools=("mkcert")
     local all_ok=true
 
     for tool in "${required_tools[@]}"; do
         if ! command_exists "$tool"; then
-            print_info "$tool: Not found, installing..."
+            print_info "$tool: not found, installing..."
             if ! install_missing_tool "$tool"; then
-                print_error "$tool: Installation failed"
+                print_error "$tool: installation failed"
                 all_ok=false
             else
-                print_success "$tool: Installed successfully"
+                print_success "$tool: installed successfully"
             fi
         else
-            print_success "$tool: Already installed"
+            print_success "$tool: already installed"
         fi
     done
 
@@ -85,7 +85,7 @@ install_mkcert_for_platform() {
             install_mkcert_linux
             ;;
         macos)
-            install_mkcert_macos_stub
+            install_mkcert_macos
             ;;
         *)
             print_error "Unsupported platform for mkcert installation: $os_type"
@@ -136,18 +136,54 @@ install_mkcert_linux() {
         return "$EXIT_GENERAL_ERROR"
     fi
 
+    # Initialize CA after fresh installation
+    print_info "Setting up local Certificate Authority..."
+    if mkcert -install >/dev/null 2>&1; then
+        print_success "Certificate Authority installed successfully"
+    elif sudo mkcert -install >/dev/null 2>&1; then
+        print_success "Certificate Authority installed successfully"
+    else
+        print_warning "Certificate Authority setup failed (you may need to run 'mkcert -install' manually)"
+    fi
+
     # Clean up temporary files
     rm -rf "$temp_dir" 2>/dev/null || true
 
     return "$EXIT_SUCCESS"
 }
 
-install_mkcert_macos_stub() {
-    print_warning "Automatic mkcert installation for macOS not implemented yet"
-    print_tip "Please install mkcert manually:"
-    print_tip "  brew install mkcert"
+install_mkcert_macos() {
+    # Check if Homebrew is installed
+    if ! command_exists "brew"; then
+        print_error "mkcert installation requires Homebrew"
+        print_info "Homebrew is not installed. Please install it first:"
+        print_tip "Run this command in Terminal:"
+        print_tip "  /bin/bash -c \"\$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)\""
+        print_tip ""
+        print_tip "After Homebrew installation, run setup again:"
+        print_tip "  make setup"
+
+        return "$EXIT_MISSING_DEPENDENCY"
+    fi
 
-    return "$EXIT_MISSING_DEPENDENCY"
+    # Homebrew is available, check if mkcert is already installed
+    if command_exists "mkcert"; then
+        return "$EXIT_SUCCESS"
+    fi
+
+    # Install mkcert via Homebrew (suppress verbose output)
+    if brew install --quiet mkcert >/dev/null 2>&1; then
+        # Initialize CA after fresh installation
+        print_info "Setting up local Certificate Authority..."
+        if mkcert -install >/dev/null 2>&1; then
+            print_success "Certificate Authority installed successfully"
+        else
+            print_warning "Certificate Authority setup failed (you may need to run 'mkcert -install' manually)"
+        fi
+        return "$EXIT_SUCCESS"
+    else
+        return "$EXIT_GENERAL_ERROR"
+    fi
 }
 
 check_sudo_access() {