secure-husky-setup 1.0.8 → 1.0.10

package/lib/ci.js

@@ -5,19 +5,6 @@
 // File: lib/ci.js
 // Purpose: Sets up Newman API tests + Smoke Tests as a pre-push git hook
 //          and copies the GitHub Actions CI workflow into the project.
-//
-// FLEXIBILITY NOTE:
-//   Test logic lives in scripts/run-ci-checks.sh (standalone script).
-//   The pre-push hook simply calls that script.
-//   To move tests to pre-commit in future, just add one line to pre-commit hook:
-//     ./scripts/run-ci-checks.sh
-//   No logic needs to be rewritten.
-//
-// New files introduced:
-//   - lib/ci.js                    (this file)
-//   - templates/ci-tests.yml       (GitHub Actions workflow template)
-// Changes made to existing files:
-//   - bin/index.js                 (4 new lines added — see comments there)
 // ─────────────────────────────────────────────────────────────────────────────
 
 const fs = require('fs-extra');
@@ -25,14 +12,8 @@ const path = require('path');
 const { execSync } = require('child_process');
 const { logInfo, logSuccess, logError } = require('./logger');
 
-// Added by Arjun — path to the CI workflow template bundled with this package
 const TEMPLATE_PATH = path.resolve(__dirname, '../templates/ci-tests.yml');
 
-// ─────────────────────────────────────────────────────────────────────────────
-// Added by Arjun — writes scripts/run-ci-checks.sh into the project
-// This is the STANDALONE script containing all test logic.
-// It can be called from pre-push, pre-commit, or any other hook.
-// ─────────────────────────────────────────────────────────────────────────────
 exports.setupCIScript = async () => {
   const scriptsDir = path.join(process.cwd(), 'scripts');
   const scriptPath = path.join(scriptsDir, 'run-ci-checks.sh');
@@ -51,10 +32,6 @@ exports.setupCIScript = async () => {
   logInfo("To move tests to pre-commit in future: add './scripts/run-ci-checks.sh' to .husky/pre-commit.");
 };
 
-// ─────────────────────────────────────────────────────────────────────────────
-// Added by Arjun — sets up .husky/pre-push hook
-// Simply calls run-ci-checks.sh — no logic lives here.
-// ─────────────────────────────────────────────────────────────────────────────
 exports.setupPrePushHook = async () => {
   const huskyDir = path.join(process.cwd(), '.husky');
   const hookPath = path.join(huskyDir, 'pre-push');
@@ -75,9 +52,6 @@ exports.setupPrePushHook = async () => {
   logSuccess("Pre-push hook created — calls scripts/run-ci-checks.sh.");
 };
 
-// ─────────────────────────────────────────────────────────────────────────────
-// Added by Arjun — copies ci-tests.yml into .github/workflows/
-// ─────────────────────────────────────────────────────────────────────────────
 exports.setupCIWorkflow = async () => {
   const targetDir  = path.join(process.cwd(), '.github', 'workflows');
   const targetFile = path.join(targetDir, 'ci-tests.yml');
@@ -99,9 +73,6 @@ exports.setupCIWorkflow = async () => {
   logSuccess("GitHub Actions workflow copied to .github/workflows/ci-tests.yml");
 };
 
-// ─────────────────────────────────────────────────────────────────────────────
-// Added by Arjun — validates package.json has required scripts
-// ─────────────────────────────────────────────────────────────────────────────
 exports.validateProject = async () => {
   const pkgPath = path.join(process.cwd(), 'package.json');
 
@@ -128,9 +99,6 @@ exports.validateProject = async () => {
   }
 };
 
-// ─────────────────────────────────────────────────────────────────────────────
-// Added by Arjun — ensures package-lock.json exists (required by npm ci)
-// ─────────────────────────────────────────────────────────────────────────────
 exports.ensurePackageLock = async () => {
   const lockPath = path.join(process.cwd(), 'package-lock.json');
   const yarnPath = path.join(process.cwd(), 'yarn.lock');
@@ -149,39 +117,23 @@ exports.ensurePackageLock = async () => {
   }
 };
 
-// ─────────────────────────────────────────────────────────────────────────────
-// Pre-push hook — thin wrapper, just calls the standalone script
-// ─────────────────────────────────────────────────────────────────────────────
 function buildPrePushHook() {
   return `#!/bin/sh
 
 # ---------------------------------------------------------------
 # Pre-push hook — Newman + Smoke Tests
 # Delegates all logic to scripts/run-ci-checks.sh
-#
-# To move tests to pre-commit in future:
-#   Remove this file and add this line to .husky/pre-commit:
-#   ./scripts/run-ci-checks.sh
 # ---------------------------------------------------------------
 
 ./scripts/run-ci-checks.sh
 `;
 }
 
-// ─────────────────────────────────────────────────────────────────────────────
-// Standalone CI checks script — ALL test logic lives here
-// Can be called from pre-push, pre-commit, CI, or manually:
-//   sh scripts/run-ci-checks.sh
-// ─────────────────────────────────────────────────────────────────────────────
 function buildCIScript() {
   return `#!/bin/sh
 
 # ---------------------------------------------------------------
 # run-ci-checks.sh — Smoke Tests + Newman API Tests
-#
-# Called by .husky/pre-push by default.
-# To move to pre-commit: add './scripts/run-ci-checks.sh' to .husky/pre-commit
-# To run manually: sh scripts/run-ci-checks.sh
 # ---------------------------------------------------------------
 
 # ---------------------------------------------------------------
@@ -214,110 +166,125 @@ echo ""
 echo "[CI Checks] Starting checks..."
 
 # ---------------------------------------------------------------
-# Step 1: Smoke Tests
+# Check if start script exists
 # ---------------------------------------------------------------
-echo ""
-echo "[Smoke Tests] Starting server..."
+START_SCRIPT=$(node -e "const p=require('./package.json'); console.log(p.scripts&&p.scripts.start?'yes':'no')" 2>/dev/null)
+TEST_SCRIPT=$(node -e "const p=require('./package.json'); console.log(p.scripts&&p.scripts.test?'yes':'no')" 2>/dev/null)
 
-npm start &
-SERVER_PID=\$!
+if [ "$START_SCRIPT" = "no" ]; then
+  echo "[Smoke Tests] No start script in package.json — skipping smoke tests."
+else
 
-for i in \$(seq 1 30); do
-  if curl -sf http://localhost:\${PORT:-3000}/health > /dev/null 2>&1 || \\
-     curl -sf http://localhost:\${PORT:-3000} > /dev/null 2>&1; then
-    echo "[Smoke Tests] Server is up."
-    break
+  # ---------------------------------------------------------------
+  # Step 1: Smoke Tests
+  # ---------------------------------------------------------------
+  echo ""
+  echo "[Smoke Tests] Starting server..."
+
+  npm start &
+  SERVER_PID=\$!
+
+  # Auto-detect port — tries common ports
+  SERVER_UP=0
+  for i in \$(seq 1 30); do
+    for PORT_TRY in 3000 5000 8000 8080 4000 4200 3001; do
+      if curl -sf http://localhost:\$PORT_TRY > /dev/null 2>&1; then
+        PORT=\$PORT_TRY
+        SERVER_UP=1
+        echo "[Smoke Tests] Server is up on port \$PORT."
+        break 2
+      fi
+    done
+    echo "[Smoke Tests] Waiting for server... (\$i/30)"
+    sleep 1
+  done
+
+  if [ \$SERVER_UP -eq 0 ]; then
+    echo "[Smoke Tests] Server did not start in time. Aborting."
+    kill \$SERVER_PID 2>/dev/null
+    exit 1
   fi
-  echo "[Smoke Tests] Waiting for server... (\$i/30)"
-  sleep 1
-done
-
-echo "[Smoke Tests] Running npm test..."
-npm test
-SMOKE_EXIT=\$?
-
-kill \$SERVER_PID 2>/dev/null
 
-if [ \$SMOKE_EXIT -ne 0 ]; then
-  echo "[Smoke Tests] Failed. Push blocked."
-  exit 1
-fi
-
-echo "[Smoke Tests] Passed. ✔"
-
-# ---------------------------------------------------------------
-# Step 2: Newman
-# ---------------------------------------------------------------
-echo ""
-echo "[Newman] Looking for Postman collections..."
-
-COLLECTIONS=\$(find . \\
-  -not -path '*/node_modules/*' \\
-  -not -path '*/.git/*' \\
-  -not -path '*/scripts/*' \\
-  \\( -name "*.postman_collection.json" -o -name "collection.json" \\) \\
-  2>/dev/null)
-
-if [ -z "\$COLLECTIONS" ]; then
-  echo "[Newman] No Postman collection found. Skipping."
-  exit 0
-fi
-
-if ! command -v newman > /dev/null 2>&1; then
-  echo "[Newman] Installing newman globally..."
-  npm install -g newman newman-reporter-htmlextra
-fi
-
-npm start &
-SERVER_PID=\$!
-
-for i in \$(seq 1 30); do
-  if curl -sf http://localhost:\${PORT:-3000}/health > /dev/null 2>&1 || \\
-     curl -sf http://localhost:\${PORT:-3000} > /dev/null 2>&1; then
-    echo "[Newman] Server is up."
-    break
+  if [ "$TEST_SCRIPT" = "no" ]; then
+    echo "[Smoke Tests] No test script in package.json — skipping npm test."
+  else
+    echo "[Smoke Tests] Running npm test..."
+    npm test
+    SMOKE_EXIT=\$?
+
+    if [ \$SMOKE_EXIT -ne 0 ]; then
+      kill \$SERVER_PID 2>/dev/null
+      echo "[Smoke Tests] Failed. Push blocked."
+      exit 1
+    fi
+    echo "[Smoke Tests] Passed. ✔"
   fi
-  sleep 1
-done
 
-mkdir -p newman-reports
-
-ENV_FILE=\$(find . \\
-  -not -path '*/node_modules/*' \\
-  -not -path '*/.git/*' \\
-  -name "*.postman_environment.json" \\
-  2>/dev/null | head -1)
-
-NEWMAN_EXIT=0
-for COLLECTION in \$COLLECTIONS; do
-  REPORT_NAME=\$(basename "\$COLLECTION" .json)
-  echo "[Newman] Running: \$COLLECTION"
-
-  ENV_FLAG=""
-  if [ -n "\$ENV_FILE" ]; then
-    ENV_FLAG="--environment \$ENV_FILE"
+  # ---------------------------------------------------------------
+  # Step 2: Newman
+  # ---------------------------------------------------------------
+  echo ""
+  echo "[Newman] Looking for Postman collections..."
+
+  COLLECTIONS=\$(find . \\
+    -not -path '*/node_modules/*' \\
+    -not -path '*/.git/*' \\
+    -not -path '*/scripts/*' \\
+    \\( -name "*.postman_collection.json" -o -name "collection.json" \\) \\
+    2>/dev/null)
+
+  if [ -z "\$COLLECTIONS" ]; then
+    echo "[Newman] No Postman collection found. Skipping."
+    kill \$SERVER_PID 2>/dev/null
+    exit 0
   fi
 
-  newman run "\$COLLECTION" \\
-    \$ENV_FLAG \\
-    --env-var "baseUrl=http://localhost:\${PORT:-3000}" \\
-    --reporters cli,htmlextra \\
-    --reporter-htmlextra-export "newman-reports/\${REPORT_NAME}-report.html" \\
-    --bail
+  if ! command -v newman > /dev/null 2>&1; then
+    echo "[Newman] Installing newman globally..."
+    npm install -g newman newman-reporter-htmlextra
+  fi
 
-  if [ \$? -ne 0 ]; then
-    NEWMAN_EXIT=1
+  mkdir -p newman-reports
+
+  ENV_FILE=\$(find . \\
+    -not -path '*/node_modules/*' \\
+    -not -path '*/.git/*' \\
+    -name "*.postman_environment.json" \\
+    2>/dev/null | head -1)
+
+  NEWMAN_EXIT=0
+  for COLLECTION in \$COLLECTIONS; do
+    REPORT_NAME=\$(basename "\$COLLECTION" .json)
+    echo "[Newman] Running: \$COLLECTION"
+
+    ENV_FLAG=""
+    if [ -n "\$ENV_FILE" ]; then
+      ENV_FLAG="--environment \$ENV_FILE"
+    fi
+
+    newman run "\$COLLECTION" \\
+      \$ENV_FLAG \\
+      --env-var "baseUrl=http://localhost:\${PORT:-3000}" \\
+      --reporters cli,htmlextra \\
+      --reporter-htmlextra-export "newman-reports/\${REPORT_NAME}-report.html" \\
+      --bail
+
+    if [ \$? -ne 0 ]; then
+      NEWMAN_EXIT=1
+    fi
+  done
+
+  kill \$SERVER_PID 2>/dev/null
+
+  if [ \$NEWMAN_EXIT -ne 0 ]; then
+    echo "[Newman] One or more collections failed. Push blocked."
+    exit 1
   fi
-done
 
-kill \$SERVER_PID 2>/dev/null
+  echo "[Newman] All collections passed. ✔"
 
-if [ \$NEWMAN_EXIT -ne 0 ]; then
-  echo "[Newman] One or more collections failed. Push blocked."
-  exit 1
 fi
 
-echo "[Newman] All collections passed. ✔"
 exit 0
 `;
 }

package/lib/sonarqube.js

@@ -12,7 +12,7 @@ const SONAR_PROPS_FILE = 'sonar-project.properties';
 // Switch to GCP later by changing SONAR_HOST_URL and SONAR_TOKEN
 // ---------------------------------------------------------------
 const SONAR_HOST_URL = 'http://192.168.1.72:9000';
-const SONAR_TOKEN    = 'sqa_57476a8e9fe67dcdddfbe5a146a681c9373a3ab8';
+const SONAR_TOKEN    = 'sqa_4579719d9a294abff391f803ddb08ca6d32d27c5';
 // const SONAR_ORG   = 'arjunlatiwala'; // only needed for SonarCloud
 
 // Auto-create project on SonarQube via API so developer never needs to do it manually

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "secure-husky-setup",
-  "version": "1.0.8",
+  "version": "1.0.10",
   "description": "Automatic Husky + Gitleaks setup for any JS project",
   "main": "bin/index.js",
   "bin": {