Merge pull request #8 from jason-c-daniels/bugfix/bump-commands-not-working

jason-c-daniels · web-flow · commit ae3504767d05 · 2022-08-03T21:27:03.000-05:00
Fixed numerous issues...
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,4 +1,4 @@
- ---
+---
 name: Bug report
 about: Create a bug report to help drive improvements
 
diff --git a/src/.git-ver/VERSION b/src/.git-ver/VERSION
@@ -1 +1 @@
-v0.1.2-alpha
+v0.1.3-alpha
diff --git a/src/.git-ver/VERSION.REPO b/src/.git-ver/VERSION.REPO
@@ -1 +1 @@
-0.1.2
+0.1.3
diff --git a/src/.git-ver/git-ver-get-major b/src/.git-ver/git-ver-get-major
@@ -1,3 +1,6 @@
 #!/bin/bash
 set -e
-get_major "$@"
+# Intentional shellcheck suppressions. I found that they goofed up the execution of the code
+# shellcheck disable=SC2086
+# shellcheck disable=SC2048
+get_major $*
diff --git a/src/.git-ver/git-ver-get-minor b/src/.git-ver/git-ver-get-minor
@@ -1,3 +1,6 @@
 #!/bin/bash
 set -e
-get_minor "$@"
+# Intentional shellcheck suppressions. I found that they goofed up the execution of the code
+# shellcheck disable=SC2086
+# shellcheck disable=SC2048
+get_minor $*
diff --git a/src/.git-ver/git-ver-get-patch b/src/.git-ver/git-ver-get-patch
@@ -1,3 +1,6 @@
 #!/bin/bash
 set -e
-get_patch "$@"
+# Intentional shellcheck suppressions. I found that they goofed up the execution of the code
+# shellcheck disable=SC2086
+# shellcheck disable=SC2048
+get_patch $*
diff --git a/src/.git-ver/git-ver-get-prefix b/src/.git-ver/git-ver-get-prefix
@@ -1,3 +1,6 @@
 #!/bin/bash
 set -e
-get_prefix "$@"
+# Intentional shellcheck suppressions. I found that they goofed up the execution of the code
+# shellcheck disable=SC2086
+# shellcheck disable=SC2048
+get_prefix $*
diff --git a/src/.git-ver/git-ver-get-repo-root b/src/.git-ver/git-ver-get-repo-root
@@ -1,3 +1,6 @@
 #!/bin/bash
 set -e
-get_repo_root "$@"
+# Intentional shellcheck suppressions. I found that they goofed up the execution of the code
+# shellcheck disable=SC2086
+# shellcheck disable=SC2048
+get_repo_root $*
diff --git a/src/.git-ver/git-ver-get-semver b/src/.git-ver/git-ver-get-semver
@@ -1,3 +1,6 @@
 #!/bin/bash
 set -e
-get_semver "$@"
+# Intentional shellcheck suppressions. I found that they goofed up the execution of the code
+# shellcheck disable=SC2086
+# shellcheck disable=SC2048
+get_semver $*
diff --git a/src/.git-ver/git-ver-get-suffix b/src/.git-ver/git-ver-get-suffix
@@ -1,3 +1,6 @@
 #!/bin/bash
 set -e
-get_suffix "$@"
+# Intentional shellcheck suppressions. I found that they goofed up the execution of the code
+# shellcheck disable=SC2086
+# shellcheck disable=SC2048
+get_suffix $*
diff --git a/src/.git-ver/git-ver-get-version b/src/.git-ver/git-ver-get-version
@@ -1,3 +1,6 @@
 #!/bin/bash
 set -e
-get_version "$@"
+# Intentional shellcheck suppressions. I found that they goofed up the execution of the code
+# shellcheck disable=SC2086
+# shellcheck disable=SC2048
+get_version $*
diff --git a/src/.git-ver/git-ver.bashlib b/src/.git-ver/git-ver.bashlib
@@ -57,15 +57,17 @@ get_tag_suffix() {
     echo "$( get_tag | sed -e 's/\(.*\)\([-]\)\(.*\)/\3/')"
 }
 
+count_tags() {
+  git tag -l | grep -c -E 'v[0-9]+[.][0-9]+[.][0-9]+([-]*)'
+}
+
 get_tag() {
     local tag=""
     if [[ "$GIT_VER_REPO_LATEST_TAG" == "" ]]; then
         local my_branch
-        my_branch="$(get_branch_name)"
-        local my_suffix
-        # TODO: figure out if this is needed.
-        my_suffix="$(get_suffix_from_branch_name "$my_branch")"
-        tag="$(git describe --abbrev=0 --tags --match v*alpha* | sed -s 's/fatal\: No names found, cannot describe anything\.//g')"
+        if [[ $(count_tags) -gt 0 ]]; then
+          tag="$(git describe --tags --match v* $(git rev-list --tags --max-count=1) | sed -s 's/fatal\: No names found, cannot describe anything\.//g')"
+        fi
     else
         tag=$GIT_VER_REPO_LATEST_TAG
     fi
@@ -110,7 +112,6 @@ get_version() {
             ver="$(get_major).$(get_minor).$(get_patch bump)";
         fi
     fi
-
     echo "$ver"
 }
 
@@ -157,7 +158,7 @@ get_rev() {
             local rev_from_tag
             rev_from_tag=$(echo "$last_tag" | sed -e 's/\(.*[-].*\)\([r][0-9]\)/\2/' | sed -e 's/[^0-9]//g')
             if [[ "$rev_from_tag" == "" ]]; then rev_from_tag=0; fi
-            rev=$((10#"$rev_count_since_last_tag" + 10#"$rev_from_tag"))
+            rev=$(($rev_count_since_last_tag + $rev_from_tag))
         fi
     fi
     echo "$rev"
@@ -167,28 +168,28 @@ get_major() {
     local major
     major=$( echo "$GIT_VER_REPO_VERSION" | sed 's/\./ /g' | awk '{print $1}' )
     if [[ "$major" == "" ]]; then major=0; fi
-    if [[ "$1" == bump ]]; then major=$((10#"$major" + 1)); fi
+    if [[ "$1" == bump ]]; then major=$(($major + 1)); fi
     echo "$major"
 }
 
 get_minor() {
     local minor
     minor=$( echo "$GIT_VER_REPO_VERSION" | sed 's/\./ /g' | awk '{print $2}' )
     if [[ "$minor" == "" ]]; then minor=0; fi
-    if [[ "$1" == bump ]]; then minor=$((10#"$minor" + 1)); fi
+    if [[ "$1" == bump ]]; then minor=$(($minor + 1)); fi
     echo "$minor"
 }
 
 get_patch() {
     local patch
     patch=$( echo "$GIT_VER_REPO_VERSION" | sed 's/\./ /g' | awk '{print $3}' )
     if [[ "$patch" == "" ]]; then patch=0; fi
-    if [[ "$1" == bump ]]; then patch=$((10#"$patch" + 1)); fi
+    if [[ "$1" == bump ]]; then patch=$(($patch + 1)); fi
     echo "$patch"
 }
 
 get_prefix() {
-    echo "v$(get_version "$@")"
+    echo "v$(get_version $*)"
 }
 
 get_semver() {
@@ -203,14 +204,14 @@ get_semver() {
 
     if [[ $2 == "-r" || $2 == "--rev" ]]; then 
         suffix_params="$suffix_params -r"
-        prefix_params="${*:3}"
-    elif [[ $2 == "-d" || $2 == "--date" ]]; then 
+        prefix_params="${@:3}"
+    elif [[ $2 == "-d" || $2 == "--date" ]]; then
         suffix_params="$suffix_params -d"
-        prefix_params="${*:3}"
+        prefix_params="${@:3}"
     elif [[ $suffix_params == "" ]]; then
-        prefix_params="$*"        
+        prefix_params=$*
     else
-        prefix_params="${*:2}"
+        prefix_params="${@:2}"
     fi
 
     local suffix
@@ -245,4 +246,5 @@ export -f get_rev
 export -f get_tag
 export -f get_semver
 export -f is_in_git_repo
-export -f get_repo_root
+export -f get_repo_root
+export -f count_tags

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`- ---`
	`1`	`+---`
`2`	`2`	`name: Bug report`
`3`	`3`	`about: Create a bug report to help drive improvements`
`4`	`4`