From 2381c52c690342f773a7cfa500387b6bfad76952 Mon Sep 17 00:00:00 2001 From: Laria Carolin Chabowski Date: Thu, 30 Apr 2020 09:38:05 +0200 Subject: Automatic code formatting Also add git hooks that checks formatting --- git-hooks/hooks/pre-commit | 52 ++++++++++++++++++++++++++++++++++++++++++++++ git-hooks/install.sh | 16 ++++++++++++++ git-hooks/loader.sh | 10 +++++++++ 3 files changed, 78 insertions(+) create mode 100755 git-hooks/hooks/pre-commit create mode 100755 git-hooks/install.sh create mode 100755 git-hooks/loader.sh (limited to 'git-hooks') diff --git a/git-hooks/hooks/pre-commit b/git-hooks/hooks/pre-commit new file mode 100755 index 0000000..5666e93 --- /dev/null +++ b/git-hooks/hooks/pre-commit @@ -0,0 +1,52 @@ +#!/bin/sh + +set -e + +gitdir="$(git rev-parse --git-dir)" + +changed_files() { + git diff --name-status --cached HEAD | tr '\011' '\012' | awk ' + /^[ADMTUXB]/ { n = 1; next } + /^[CR]/ { n = 2; next } + n > 0 { + print $0 + n-- + } + ' +} + +staged_file_hash() { + git ls-files -s "$1" | cut -d' ' -f2 +} + +lint_php() { + php -l >/dev/null +} + +lint_php_cs_fixer() { + php-cs-fixer fix --config="$gitdir/../.php_cs.dist" -v --dry-run --using-cache=no --show-progress=none - >&2 +} + +lint_changes() { + linter_name="$1" + grep_pattern="$2" + linter_func="$3" + + failcount="$(changed_files | grep "$grep_pattern" | while read -r f; do + hash="$(staged_file_hash "$f")" + if [ -n "$hash" ]; then + if ! git cat-file blob "$hash" | "$linter_func"; then + echo >&2 + echo "Linter $linter_name reported error for: $f" >&2 + echo >&2 + + echo failed + fi + fi + done | wc -l)" + + [ "$failcount" -eq 0 ] || return 1 +} + +lint_changes "php -l" '\.php$' lint_php || exit 1 +lint_changes "php_cs_fixer" '\.php$' lint_php_cs_fixer || exit 1 diff --git a/git-hooks/install.sh b/git-hooks/install.sh new file mode 100755 index 0000000..17d59bc --- /dev/null +++ b/git-hooks/install.sh @@ -0,0 +1,16 @@ +#!/bin/sh + +set -e + +githooks_dir="$(git rev-parse --git-dir)" +for hook in hooks/*; do + hook="${hook#hooks/}" + if [ -f "$githooks_dir/hooks/$hook" ]; then + mv "$githooks_dir/hooks/$hook" "$githooks_dir/hooks/own_$hook" + fi + + echo '#!/bin/sh + exec "$(git rev-parse --git-dir)/../git-hooks/loader.sh" '"$hook"' "$@" + ' > "$githooks_dir/hooks/$hook" + chmod +x "$githooks_dir/hooks/$hook" +done diff --git a/git-hooks/loader.sh b/git-hooks/loader.sh new file mode 100755 index 0000000..eadafa6 --- /dev/null +++ b/git-hooks/loader.sh @@ -0,0 +1,10 @@ +#!/bin/sh + +set -e + +hook="$1" +shift + +gitdir="$(git rev-parse --git-dir)" +[ -x "$gitdir/hooks/own_$hook" ] && "$gitdir/hooks/own_$hook" "$@" +[ -x "$gitdir/../git-hooks/hooks/$hook" ] && "$gitdir/../git-hooks/hooks/$hook" "$@" -- cgit v1.2.3-70-g09d2