Visual fixes, added help, added message with changes to new tag, changes length for url

Author: Nikita Chernyi

bin

@@ -1,18 +1,55 @@
 #!/bin/bash
+#    _                                _
+#   | |                              | |
+#   | |__  _   _ _ __ ___  _ __   ___| |__
+#   | '_ \| | | | '_ ` _ \| '_ \ / __| '_ \
+#   | |_) | |_| | | | | | | |_) |\__ \ | | |
+#   |_.__/ \__,_|_| |_| |_| .__(_)___/_| |_|
+#                         | |
+#                         |_|
+#   by @rakshazi
+PREFIX="\033[0;32m[bump.sh]\033[0m"
 
+# help
+if [[ "$1" == "-h" ]] || [[ "$1" == "--help" ]]; then
+    echo -e "$PREFIX Release, changelog and merge request generator for GitLab. Usefull magic in one string :)
+
+Usage: `basename $0` [branch_from] [branch_to]
+
+Example: `basename $0` develop master"
+    exit 0
+fi
+
+# Define vars
 BRANCH_CURRENT=$(git rev-parse --abbrev-ref HEAD)
 BRANCH_1="${1:-$BRANCH_CURRENT}"
 BRANCH_2="${2:-master}"
 CHANGES=$(git log --oneline --no-merges --full-history $BRANCH_1...$BRANCH_2 | sed -u 's/^/\* /g')
-DESCRIPTION=$([ ${#CHANGES} -ge 250 ] && echo "See CHANGELOG.md for list of changes" || echo $CHANGES)
-PREVIOUS_VERSION=$(git describe --tags $(git rev-list --tags --max-count=1))
+DESCRIPTION="${CHANGES:0:1500}...\n\nMore in CHANGELOG.md"
 REPO_URL=$(git remote get-url origin | sed -u 's/git@//g; s/:/\//g; s/.git//g')
+
+# Fetch origin headers (to avoid duplicates and outdated versions)
+echo -e "$PREFIX Fetching tags..."
+git fetch --tags --force -q
+PREVIOUS_VERSION=$(git describe --tags $(git rev-list --tags --max-count=1))
+
+# Work with user input
 printf "CHANGES:\n$CHANGES\n\n"
 echo -n "Enter new version (Current branch: $BRANCH_CURRENT | Previous version: $PREVIOUS_VERSION): "
 read NEW_VERSION
-echo -e "# Release v$NEW_VERSION\n\n$CHANGES\n\n$(cat CHANGELOG.md)" > CHANGELOG.md
+
+# Update changelog
+echo -e "# Release v[$NEW_VERSION]($REPO_URL/tags/$NEW_VERSION)\n\n$CHANGES\n\n$(cat CHANGELOG.md)" > CHANGELOG.md
 git add CHANGELOG.md
-git commit -m "Release v$NEW_VERSION"
-git tag $NEW_VERSION
-git push origin --tags
+git commit -m -q "Release v$NEW_VERSION"
+
+# Create new tag with changes
+git tag $NEW_VERSION -q -m $"$CHANGES"
+echo -e "$PREFIX Pushing..."
+
+# Push changes with new tag
+git push origin --follow-tags
+
+# Open merge request url with preset changes
 xdg-open "$REPO_URL/merge_requests/new?utf8=✓&merge_request[source_branch]=$BRANCH_1&merge_request[target_branch]=$BRANCH_2&merge_request[title]=$NEW_VERSION&merge_request[description]=$DESCRIPTION"
+echo -e "$PREFIX Don't forget to notify your teammates about new release!"