additional lefthook configs

Signed-off-by: John Seekins <john.seekins@spoileralert.com>

Author: johnseekins

.config/mise.toml

@@ -4,4 +4,5 @@ lefthook = "latest"
 yamllint = "latest"
 actionlint = "latest"
 shellcheck = "latest"
-markdownlint-cli2 = 'latest'
+markdownlint-cli2 = "latest"
+jq = "latest"

.lefthook.yml

@@ -3,35 +3,62 @@
 pre-commit:
   parallel: true
   jobs:
+    - name: shell script validation
+      run: shellcheck --shell=bash -x {staged_files}
+      glob:
+        - "*.sh"
+        - "*.zsh"
+        - "*.bash"
+
+    - name: dockerfile linting
+      run: hadolint {staged_files}
+      glob:
+        - "Dockerfile"
+        - "**/Dockerfile"
+
     - name: markdown linting
       run: markdownlint-cli2 --fix --config .markdownlint.json {staged_files}
       glob:
         - "*.md"
-      exclude:
-        - .github/pull_request_template.md
       stage_fixed: true
+
     - name: yaml linting
       run: yamllint -c .yamllint-config.yaml .
       glob: "*.y*ml"
+
     - name: Github Action linting
       run: actionlint
       glob:
         - ".github/workflows/*.y*ml"
+
     - name: Ruff Formatting
       run: uv run ruff format -q .
       glob:
         - "*.py"
       stage_fixed: true
+
     - name: Ruff Syntax checking
       run: uv run ruff check --fix -q
       glob:
         - "*.py"
       stage_fixed: true
+
     - name: MyPy type validation
       run: uv run mypy .
       glob:
         - "*.py"
 
+    - name: json validation
+      run: tools/check-json.sh {staged_files}
+      glob:
+        - "*.json"
+
+    - name: check for merge conflicts
+      run: tools/check-merge-conflicts.sh {staged_files}
+
+    - name: check for file format
+      run: tools/check-file-format.sh {staged_files}
+
 output:
   - success
   - failure

tools/.library.sh

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+set -eo pipefail
+LC_ALL=C
+export LC_ALL
+
+function git_files {
+	FILES=$(git ls-files --exclude-standard)
+	FILES+=" $(git ls-files --exclude-standard --others)"
+	echo "${FILES}"
+}

tools/check-file-format.sh

@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+
+set -eou pipefail
+
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+pushd "${SCRIPT_DIR}" > /dev/null || exit 1
+pushd "$(git rev-parse --show-toplevel)" > /dev/null || exit 1
+
+. tools/.library.sh
+
+if [[ $# -eq 0 ]]; then
+	FILES=$(git_files | xargs)
+else
+	FILES=$*
+fi
+exit_code=0
+
+for fn in ${FILES}; do
+	if [[ "${fn}" == *".sh" || "${fn}" == *".zsh" || "${fn}" == *".bash" ]]; then
+		if [[ ! -x "${fn}" ]]; then
+			echo "${fn} is not executable, but probably should be"
+			exit_code=1
+		fi
+	fi
+done
+
+popd > /dev/null || exit 1
+popd > /dev/null || exit 1
+exit "${exit_code}"

tools/check-json.sh

@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+
+set -eou pipefail
+
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+pushd "${SCRIPT_DIR}" > /dev/null || exit 1
+pushd "$(git rev-parse --show-toplevel)" > /dev/null || exit 1
+
+. tools/.library.sh
+
+if [[ $# -eq 0 ]]; then
+	FILES=$(git_files | grep "json$" | xargs)
+else
+	FILES=$*
+fi
+
+exit_code=0
+for fn in ${FILES}; do
+	set +e
+	error=$(jq '.' "${fn}" 2>&1 > /dev/null)
+	set -e
+	if [[ -n "${error}" ]]; then
+		printf "Failure reading %s\n\t%s\n" "${fn}" "${error}"
+		exit_code=1
+	fi
+done
+
+popd > /dev/null || exit 1
+popd > /dev/null || exit 1
+exit "${exit_code}"

tools/check-merge-conflicts.sh

@@ -0,0 +1,47 @@
+#!/usr/bin/env bash
+
+set -eou pipefail
+
+gitdir=$(git rev-parse --git-dir)
+# if we aren't actively merging, there's no reason to check for conflict artifacts
+if [[ ! -f "${gitdir}/MERGE_MSG" && ! -f "${gitdir}/MERGE_HEAD" && ! -f "${gitdir}/rebase-apply" && ! -f "${gitdir}/rebase-merge" ]]; then
+	exit 0
+fi
+
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+pushd "${SCRIPT_DIR}" > /dev/null || exit 1
+pushd "$(git rev-parse --show-toplevel)" > /dev/null || exit 1
+
+. tools/.library.sh
+
+if [[ $# -eq 0 ]]; then
+	FILES=$(git_files | xargs)
+else
+	FILES=$*
+fi
+
+patterns=( \
+    "<<<<<<< "\
+    "======= "\
+    "=======\r\n" \
+    "=======\n" \
+    ">>>>>>> " \
+)
+
+exit_code=0
+for fn in ${FILES}; do
+	for pattern in "${patterns[@]}"; do
+		set +e
+		error=$(grep "${pattern}" "${fn}" 2>&1 > /dev/null)
+		set -e
+		if [[ -n "${error}" ]]; then
+			printf "%s may have merge conflict artifacts\n\t%s\n" "${fn}" "${error}"
+			exit_code=1
+			break
+		fi
+	done
+done
+
+popd > /dev/null || exit 1
+popd > /dev/null || exit 1
+exit "${exit_code}"