Merge branch 'release-0.1.4'

CHANGELOG.md

@@ -1,3 +1,31 @@
+## 0.1.4 (2016-08-11)
+  - Fix changelog url generation
+
+[Full changelog](https://github.com/superhelio/tools/compare/0.1.3...0.1.4)
+
+
+## 0.1.3 (2016-08-11)
+  - Fix ssh remote url, convert to https
+  - Take account diffs in bitbucket and github changelog urls
+  - Reverse commit message list
+
+[Full changelog](https://github.com/superhelio/tools/compare/0.1.2...0.1.3)
+
+
+## 0.1.2 (2016-08-10)
+  - Explicitly push tags
+  - Better wording to push question
+  - Fix changelog url
+
+[Full changelog](https://github.com/superhelio/tools/compare/0.1.1...0.1.2)
+
+
+## 0.1.1 (2016-08-10)
+  - Echo into the temp file, not to the screen
+
+[Full changelog](https://github.com/superhelio/tools/compare/0.1.0...0.1.1)
+
+
 ## 0.1.0 (2016-08-10)
   - Remove paging from git log, works better for automation
   - Change changelog formatting to simple message

VERSION

@@ -1 +1 @@
-0.1.0
+0.1.4

release.sh

@@ -25,9 +25,9 @@ RESET="\033[0m"
 
 LATEST_HASH=$(git log --pretty=format:'%h' -n 1)
 
-# Guess our remote url from remote.origin.url (minus .git from the end),
+# Guess our remote url from remote.origin.url. Used to create Changelog link.
-# change to your github project url. used to create Full changelog link
+# You can change this to your project url, but detection should cover 99%.
-PROJECT_URL=$(git config --get remote.origin.url | sed 's/^\.git*//')
+PROJECT_URL=$(git config --get remote.origin.url | sed 's/\.git//' | sed 's/\:/\//' | sed 's/git@/https\:\/\//' | sed 's/\/\/\//\:\/\//')
 
 # current Git branch
 BRANCH_CURRENT=$(git symbolic-ref HEAD | sed -e 's,.*/\(.*\),\1,')
@@ -114,11 +114,25 @@ git checkout -b "$BRANCH_RELEASE" "$BRANCH_DEV"
 # Set our new version to our version file
 echo "$NEW_VERSION" > "$FILE_VERSION"
 
+# Fix compare url based on BitBucket or Github, default to GitHub
+if [[ "$PROJECT_URL" == *bitbucket.org* ]]; then
+    # https://bitbucket.org/vendor/project/branches/compare/_NEW_%0D_OLD_
+    VER_COMP_STR='branches/compare'
+    VER_COMP_SEP='%0D'
+    VER_COMP_TAG="$NEW_VERSION$VER_COMP_SEP$BASE_STRING"
+else
+    # https://github.com/vendor/project/compare/_OLD_..._NEW_
+    VER_COMP_STR='compare'
+    VER_COMP_SEP='...'
+    VER_COMP_TAG="$BASE_STRING$VER_COMP_SEP$NEW_VERSION"
+fi
+
 # Create our changelog
 echo "## $NEW_VERSION ($NOW)" > tmpfile
-git --no-pager log --pretty=format:"  - %s" --date=short --no-merges "$BASE_STRING"...HEAD >> tmpfile
+git --no-pager log --pretty=format:"  - %s" --date=short --no-merges "$BASE_STRING"...HEAD | sed -n '1!G;h;$p' >> tmpfile
 echo "" >> tmpfile
-echo "[Full changelog]($PROJECT_URL/compare/$BASE_STRING...$NEW_VERSION)"
+echo "" >> tmpfile
+echo "[Full changelog]($PROJECT_URL/$VER_COMP_STR/$VER_COMP_TAG)" >> tmpfile
 echo "" >> tmpfile
 echo "" >> tmpfile
 cat "$FILE_CHANGELOG" >> tmpfile
@@ -148,11 +162,12 @@ git merge --no-ff "$BRANCH_RELEASE"
 # Remove release branch
 git branch -d "$BRANCH_RELEASE"
 
-echo -ne "${QUESTION_FLAG} ${CYAN}Push?"
+echo -ne "${QUESTION_FLAG} ${CYAN}Push everything to origin?"
 
 read -r PUSH
 if [[ $PUSH =~ [yY](es)* ]] || [ "$PUSH" = "" ]; then
     git push --all origin
+    git push --tags origin
 fi
 
 echo -e "${NOTICE_FLAG} Done!"