Starting to use Uniglot for hooks standardization.

This commit is contained in:
DarkFeather 2022-04-30 23:14:56 -05:00
parent ce2e2d3863
commit f034d627a6
Signed by: DarkFeather
GPG Key ID: 1CC1E3F4ED06F296
17 changed files with 234 additions and 11 deletions

2
.gitignore vendored
View File

@ -1,3 +1,5 @@
pkg/
src/
*.tar.xz
*.tar.zst
tests/*.out

View File

@ -250,17 +250,18 @@ function getmagnetlink {
fi
}
### AniNIX Foundation help ###
### AniNIX/Foundation help ###
function findaninixcheckouts {
find /usr/local/src/ -type f -name config -exec egrep -l 'url[[:space:]]=[[:space:]]/srv/foundation|url[[:space:]]=[[:space:]]https://aninix.net|url[[:space:]]=[[:space:]]([a-zA-Z0-9])+@aninix.net' {} \; 2>/dev/null | sed 's#.git/config$##'
### Find git checkouts in $pwd that are from AniNIX/Foundation
find . -type f -name config -exec egrep -l 'url[[:space:]]=[[:space:]]/srv/foundation|url[[:space:]]=[[:space:]]https://(foundation.)aninix.net|url[[:space:]]=[[:space:]]([a-zA-Z0-9])+@(foundation.)aninix.net' {} \; 2>/dev/null | sed 's#.git/config$##'
}
function aninixgitstatus {
for i in `findaninixcheckouts`; do
infoheader BEGIN REPORT for "$i"
git -C "$i" status
infoheader END REPORT
echo
status="$(git -C "$i" status)"
if [ -n "$status" ]; then
echo "$i" has work in flight.
fi
done
}

18
Hooks/pre-commit Executable file
View File

@ -0,0 +1,18 @@
#!/bin/sh
#
# An example hook script to verify what is about to be committed.
# Called by "git commit" with no arguments. The hook should
# exit with non-zero status after issuing an appropriate message if
# it wants to stop the commit.
#
# To enable this hook, rename this file to "pre-commit".
# Run all our checking scripts.
for script in $(find `dirname "$0"`/scripts.d -type f); do
"$script"
if [ $? -ne 0 ]; then
echo "$script" failed checks.
exit 1;
fi
done
echo "Pre-commit checks passed."

17
Hooks/pre-receive Executable file
View File

@ -0,0 +1,17 @@
#!/bin/bash
# Check each commit
while read oldrev newrev refname; do
# Thanks to https://blog.developer.atlassian.com/stop-foxtrots-now/ for the inspiration
if [ "$refname" == "refs/heads/main" ]; then
match=`git log --first-parent --pretty='%H %P' $oldrev..$newrev |
grep $oldrev |
awk '{ print $2 }'`
if [ "$oldrev" != "$match" ]; then
echo "Foxtrot detected. Please `git rebase origin/main`."
exit 1
fi
fi
done

30
Hooks/scripts.d/nonascii Executable file
View File

@ -0,0 +1,30 @@
#!/bin/bash
# Sourced from https://github.com/git/git/blob/master/templates/hooks--pre-commit.sample
# If you want to allow non-ASCII filenames set this variable to true.
allownonascii=$(git config --bool hooks.allownonascii)
# Cross platform projects tend to avoid non-ASCII filenames; prevent
# them from being added to the repository. We exploit the fact that the
# printable range starts at the space character and ends with tilde.
if [ "$allownonascii" != "true" ] &&
# Note that the use of brackets around a tr range is ok here, (it's
# even required, for portability to Solaris 10's /usr/bin/tr), since
# the square bracket bytes happen to fall in the designated range.
test $(git diff --cached --name-only --diff-filter=A -z $against |
LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0
then
cat <<\EOF
Error: Attempt to add a non-ASCII file name.
This can cause problems if you want to work with people on other platforms.
To be portable it is advisable to rename the file.
If you know what you are doing you can disable this check using:
git config hooks.allownonascii true
EOF
exit 1
fi

8
Hooks/scripts.d/pytest Executable file
View File

@ -0,0 +1,8 @@
#!/bin/bash
# Run python3 tests
if [ -d venv ]; then
source venv/bin/activate
fi
python3 -m pytest

20
Hooks/scripts.d/stop-foxtrots Executable file
View File

@ -0,0 +1,20 @@
#!/bin/bash
# Borrowing from https://github.com/syncier/pre-commit-hooks-jumanjihouse/blob/master/pre_commit_hooks/protect-first-parent
# Find the correct reference, or fallback to HEAD's abbrev-ref
base="$(
git rev-parse --abbrev-ref --symbolic-full-name '@{upstream}' 2>/dev/null \
|| git branch -avv | awk '/->/ {print $NF}' 2>/dev/null \
|| :
)"
if [ -z "$base" ]; then base="$(git rev-parse --abbrev-ref HEAD)"; fi
firstParent="$(git show-ref -s "${base}")"
if git rev-list --first-parent "${base}^".. | grep -q "^${firstParent}$"; then
exit 0
else
echo Foxtrot detected -- please either rebase or '`git reset --soft`' to recreate your commit.
exit 1
fi

23
Hooks/scripts.d/whitespace Executable file
View File

@ -0,0 +1,23 @@
#!/bin/bash
# Sourced from https://github.com/git/git/blob/master/templates/hooks--pre-commit.sample
if egrep -irl '\s\+$' .; then
echo The above lines have trailing whitespace. Run "sed -i 's/\s\+$//'" on the affected files.
exit 1
fi
if git rev-parse --verify HEAD >/dev/null 2>&1
then
against=HEAD
else
# Initial commit: diff against an empty tree object
against=$(git hash-object -t tree /dev/null)
fi
# Redirect output to stderr.
exec 1>&2
# If there are whitespace errors, print the offending file names and fail.
exec git diff-index --check --cached $against --

View File

@ -1,5 +1,5 @@
installdir = ${pkgdir}/opt/aninix/Uniglot/
targets = Bash C CSharp
targets = Bash C CSharp Hooks
compile:
@echo Nothing to compile.
@ -7,6 +7,8 @@ compile:
install: compile
mkdir -p ${installdir}
for target in ${targets}; do rsync -avzzl "$$target" ${installdir}; done
mkdir -p ${pkgdir}/usr/local/bin
install -m 0755 -o root -g root bin/uniglot-clone ${pkgdir}/usr/local/bin
make checkperm
clean:
@ -16,11 +18,11 @@ uninstall:
rm -Rf ${installdir}
test:
@echo Nothing to do.
python3 -m pytest
checkperm:
chmod -R 0755 ${installdir}
chown root:root ${installdir}
chmod -R 0755 ${installdir} ${pkgdir}/usr/local/bin/uniglot-clone
chown root:root ${installdir} ${pkgdir}/usr/local/bin/uniglot-clone
diff: ${INSTALLFIR}
diff -rc . ${installdir}

View File

@ -1,5 +1,5 @@
depends=('bash>=4.4')
makedepends=('make>=4.2')
makedepends=('make>=4.2','gcc','mono')
checkdepends=()
optdepends=()
pkgname="$(git config remote.origin.url | rev | cut -f 1 -d '/' | rev | sed 's/.git$//')"

53
bin/uniglot-clone Executable file
View File

@ -0,0 +1,53 @@
#!/bin/bash
# File: uniglot-clone
#
# Description: This is a convenience script to ensure our hooks are standardized.
#
# Package: AniNIX/Uniglot
# Copyright: WTFPL
#
# Author: DarkFeather <ircs://aninix.net:6697/DarkFeather>
function uniglotClone() {
target="$1"
git-clone "$target"
clone="$(basename "$1" | sed 's/.git$//')"
cd "$clone"
}
### usage
### param retcode: what to return
function usage() {
retcode="$1"
echo "Usage: $0 # Update the current clone"
echo " $0 -t target # Clone the target and set hooks"
echo " $0 -h # Help"
echo Add -v for verbosity.
}
### Main
if [ `basename "$0"` == "uniglot-clone" ]; then
while getopts 'ht:v' OPTION; do
case "$OPTION" in
h) echo AniNIX/Uniglot git-clone standardization; usage 0 ;;
t) target="$OPTARG" ;;
v) set -x ;;
*) usage 1 ;;
esac
done
# Sanity
if [ ! -d .git ]; then
echo "This should be run from the root of the clone."
exit 2
fi
# Standardizations
if git config remote.origin.url | grep -q AniNIX/Uniglot; then
git config core.hooksPath $PWD/Hooks
else
git config core.hooksPath /opt/aninix/Uniglot/Hooks
fi
fi

15
tests/test.csharp Normal file
View File

@ -0,0 +1,15 @@
using AniNIX.Shared;
namespace AniNIX.Uniglot {
/// Test class
public class Test {
/// <summary>
/// The default function
/// </summary>
static int Main(string[] args) {
return 0;
}
}
}

8
tests/test_hooks.py Normal file
View File

@ -0,0 +1,8 @@
import os
import pytest
def test_hooks_exec():
fh = os.popen("find Hooks -type f -exec ls -l {} \\; | egrep ^-rw-")
output = fh.read()
retcode = fh.close()
assert retcode == 256 and output == ''

26
tests/test_imports.py Normal file
View File

@ -0,0 +1,26 @@
import os
import pytest
def test_bash_import():
fh = os.popen("/bin/bash -c 'source Bash/header; [ `declare -F | wc -l` -eq `egrep -c ^function\\ Bash/header` ]'", mode='r', buffering=-1)
output = fh.read()
retcode = fh.close()
assert retcode == None
def test_c_import():
fh = os.popen("gcc -o tests/c.out C/ll.h", mode='r', buffering=-1)
output = fh.read()
retcode = fh.close()
assert retcode == None and os.path.isfile('tests/c.out')
def test_csharp_import():
fh = os.popen("/bin/bash -c 'mcs -out:tests/csharp.out CSharp/*.csharp tests/test.csharp'", mode='r', buffering=-1)
output = fh.read()
retcode = fh.close()
assert retcode == None and os.path.isfile('tests/csharp.out')
def test_remove_outs():
fh = os.popen("/bin/bash -c 'rm -Rf tests/*.out'", mode='r', buffering=-1)
output = fh.read()
retcode = fh.close()
assert retcode == None