Rewrite __release blocking condition system

New "functional-like" design makes it simpler to understand, extend,
re-order and re-use blocking conditions.

Also, the "old looks newer" condition was dropped as it's not really
necessary under such simplistic conditions.

src/include/release.sh

@@ -1,5 +1,75 @@
 #!/bin/bash
 
+__die_if() {
+    #
+    # Die if blocking condition $1 is detected
+    #
+    local condition="$1"
+    local x
+    case "$condition" in
+        nogit)
+            git rev-parse HEAD >&/dev/null\
+             || die "cannot do this outside git repo"
+            ;;
+        norelbr)
+            __git_info curbranch \
+              | grep -qFx "$RELSRC" \
+             || die "you are not on RELSRC branch: $RELSRC"
+            ;;
+        dirty)
+            git diff --shortstat 2>/dev/null \
+              | grep -q . \
+             && die "tree is dirty: $dirt"
+            ;;
+        novertag)
+            __git_info lasttag \
+              | grep -q . \
+             || die "cannot find last tag"
+            ;;
+        nobump)
+            git diff-tree --no-commit-id --name-only -r HEAD \
+              | grep -qFx config.mk \
+             || die "last change must be version bump in config.mk"
+            ;;
+        wip)
+            __git_info reldiff \
+              | grep '^....... WIP ' \
+             && die "WIP commit since $(__git_info lasttag)"
+            ;;
+        old_c)
+            x=$(__ver_info nextver_g)
+            __ver_info currver_c \
+              | grep -qFx "$x" config.mk \
+             || die "new version not in config.mk: $x"
+            ;;
+    esac
+}
+
+__git_info() {
+    #
+    # Get git info $1
+    #
+    local info="$1"
+    case "$info" in
+        lasttag)    git tag | grep ^v | sort -V | tail -n1  ;;
+        curbranch)  git rev-parse --abbrev-ref HEAD         ;;
+        reldiff)    git log --oneline "$(__git_info lasttag)..HEAD" ;;
+    esac
+}
+
+__ver_info() {
+    #
+    # Get git info $1
+    #
+    local info="$1"
+    case "$info" in
+        lastver_g)  __git_info lasttag | sed s/v$// ;;
+        nextver_g)  __make_ver "$level" "$(__ver_info lastver_g)" ;;
+        currver_c)  grep -m 1 -w VERSION config.mk | cut -d = -f 2 | xargs echo ;;
+        nextver_c)  __make_ver "$level" "$(__ver_info currver_c)" ;;
+    esac
+}
+
 __make_ver() {
     local level=$1
     local old=$2
@@ -27,41 +97,22 @@ __release() {
     #        compatible with this release strategy
     #
     local level=$1
-    git rev-parse HEAD >&/dev/null || die "cannot release outside git repo"
-    local lastfile=$(git diff-tree --no-commit-id --name-only -r HEAD)
-    local lasttag=$(git tag | grep ^v | sort -V | tail -n1)
-    local changelog="$(git log --oneline "$lasttag..HEAD")"
-    local curbranch=$(git rev-parse --abbrev-ref HEAD)
-    local dirt="$(git diff --shortstat 2>/dev/null)"
-
-    local newver=$(__make_ver "$level" "${lasttag#v}")
-    local newtag=v$newver
-    local higher=$(echo -e "$oldtag\n$newtag" | sort -V | tail -n1)
-
-    test "$lastfile" = config.mk \
-     || die "last change must be version bump in config.mk"
-
-    test -n "$lasttag" \
-     || die "cannot find last tag"
-
-    test "$newtag" = "$higher" \
-     || die "generated tag looks older: $oldtag<$newtag"
-
-    grep -qw "$newver" config.mk \
-     || die "new version not in config.mk: $newver"
-
-    grep '^....... WIP ' <<<"$changelog" \
-     && die "WIP commit since $lasttag"
-
-    grep -qw "$curbranch" <<<"$RELSRC" \
-     || die "you are not on RELSRC branch: $RELSRC"
+    local newtag
 
-    test -z "$dirt" \
-     || die "tree is dirty: $dirt"
+    __die_if nogit
+    __die_if norelbr
+    __die_if dirty
+    __die_if novertag
+    __die_if nobump
+    __die_if wip
+    __die_if old_c
 
     # FIXME: Have user prepare proper message with changelog
 
+    newtag=v$(__ver_info nextver_g)
     set -e
+    debug_var newtag
+    $MKIT_DRY && return
     git tag -m "$MKIT_PROJNAME $newtag - $CODENAME" "$newtag"
     git branch -f "$RELDST" "$newtag"
 }