Merge pull request #27 from ModusCreateOrg/improve-pre-commit-and-pre-push

Git Hooks and Code Quality Tools Improvement

Author: GuidoBR

.husky/pre-commit

@@ -1,3 +1,18 @@
-sh ../lizard.sh
+#!/bin/sh
+project_root=$(pwd)
+cd $project_root
+sh ./lizard.sh
 
-cd frontend && npm run lint
+# Only run frontend lint if the directory exists
+if [ -d "frontend" ]; then
+  cd frontend && npm run lint
+fi
+
+cd $project_root
+
+# Add backend linting
+if [ -d "backend" ]; then
+  cd backend && npm run lint
+fi
+
+exit 0

.husky/pre-push

@@ -1,4 +1,53 @@
 #!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
 
-cd frontend && npm run lint && npm run test:ci
+# Get the range of commits being pushed
+# For the remote branch that doesn't exist yet, use the empty tree object
+RANGE="$(git rev-parse --verify HEAD)"
+
+echo "Checking commit range: $RANGE"
+
+# Check if any frontend files were modified in the commits being pushed
+FRONTEND_CHANGES=$(git diff --name-only $RANGE | grep "^frontend/" || true)
+
+# Only run frontend tests if frontend files were modified
+if [ -n "$FRONTEND_CHANGES" ]; then
+  echo "Frontend changes detected. Running frontend tests..."
+
+  # Navigate to frontend directory
+  cd frontend || exit 1
+
+  . "$(dirname -- "$0")/_/husky.sh"
+
+  cd frontend && npm run lint && npm run test:ci
+
+  # Capture the exit code
+  TEST_EXIT_CODE=$?
+
+  # Return to the original directory
+  cd ..
+
+  # If tests failed, prevent the push
+  if [ $TEST_EXIT_CODE -ne 0 ]; then
+    echo "Frontend tests failed. Push aborted."
+    exit 1
+  fi
+
+  echo "Frontend tests passed."
+else
+  echo "No frontend changes detected. Skipping frontend tests."
+fi
+
+# Check if any backend files were modified in the commits being pushed
+BACKEND_CHANGES=$(git diff --name-only $RANGE | grep "^backend/" || true)
+
+if [ -n "$BACKEND_CHANGES" ]; then
+    echo "Backend changes detected. Running backend lint..."
+
+    . "$(dirname -- "$0")/_/husky.sh"
+    cd backend && npm run lint
+else
+  echo "No backend changes detected. Skipping backend tests."
+fi
+
+# Continue with the push
+exit 0

lizard.sh

@@ -1,7 +1,15 @@
 #!/bin/bash
 
 # Check if lizard is installed
-if ! command -v lizard &> /dev/null; then
+if command -v lizard &> /dev/null; then
+    echo "✅ lizard found in PATH"
+elif [ -x ~/.local/bin/lizard ]; then
+    echo "✅ lizard found in user bin, adding to PATH"
+    export PATH="$HOME/.local/bin:$PATH"
+elif [ -x /usr/local/bin/lizard ]; then
+    echo "✅ lizard found in system bin, adding to PATH"
+    export PATH="/usr/local/bin:$PATH"
+else
     echo "❌ lizard is not installed."
     echo "To install lizard globally, run:"
     echo "  pip install lizard"
@@ -16,7 +24,7 @@ NLOC_LIMIT=250
 FILES=$(git diff --cached --name-only --diff-filter=ACM | grep -E '\.tsx$|\.ts$')
 
 # Check if there are any files to analyze
-if [[ -z "$FILES" ]]; then
+if [ -z "$FILES" ]; then
     echo "No Typescript files to check"
     exit 0  # No files to check, allow commit
 fi
@@ -32,13 +40,13 @@ for FILE in $FILES; do
     OUTPUT=$(lizard -C $COMPLEXITY_LIMIT -Tnloc=$NLOC_LIMIT -w --warning-msvs "$FILE")
     ERROR_CODE=$?
 
-    if [[ "$ERROR_CODE" -ne 0 ]]; then
+    if [ "$ERROR_CODE" -ne 0 ]; then
         ERROR_LIST+="$OUTPUT\n"
     fi
 done
 
 # Check if there were any errors
-if [[ -n "$ERROR_LIST" ]]; then
+if [ -n "$ERROR_LIST" ]; then
     echo "❌ Commit aborted due to the errors in the following files:"
     echo "$ERROR_LIST"
     echo "Limits are: Code Complexity (CCN)=$COMPLEXITY_LIMIT and Number of Lines (NLOC)=$NLOC_LIMIT"