Merge branch 'release-0.0.4'

CHANGELOG.md

@@ -0,0 +1,23 @@
+## 0.0.4 (2016-08-04)
+  - 865447cf1637fa413056c4ed0c52a6816eb5d0a4 2016-08-04 | Minor changes to make sure nothing strange happens when releasing (HEAD -> release-0.0.4, develop) [Ismo Vuorinen]
+  - f58d1c50ddc441665adc100912455f95bba21d61 2016-08-04 | Merge branch 'release-0.0.3' (tag: 0.0.3, master) [Ismo Vuorinen]
+  - 6bc0934eee3ce77a09aaa0f91528d9febc871dde 2016-08-04 | Merge branch 'release-0.0.3' into develop [Ismo Vuorinen]
+  - f25536b8a18cb4b46af53623b3ba89787ae7df7d 2016-08-04 | Merge branch 'release-0.0.2' (tag: 0.0.2) [Ismo Vuorinen]
+  - f711b92ba293b4cb6e983d0b0cd8f2a76352c428 2016-08-04 | Merge branch 'release-0.0.1' (tag: 0.0.1) [Ismo Vuorinen]
+
+## 0.0.3 (2016-08-04)
+  - c23b512b808fda4c2cc9edf9f618061a553c61a6 2016-08-04 | If our changelog is missing, create one? (HEAD -> release-0.0.3, develop) [Ismo Vuorinen]
+  - e4f313a05698acdb55ec30538eab0477b26c0063 2016-08-04 | Add missing changelog file [Ismo Vuorinen]
+  - f25536b8a18cb4b46af53623b3ba89787ae7df7d 2016-08-04 | Merge branch 'release-0.0.2' (tag: 0.0.2, master) [Ismo Vuorinen]
+  - dd0341cb923241bca5e02d4b4d1a894708cf804b 2016-08-04 | Merge branch 'release-0.0.2' into develop [Ismo Vuorinen]
+  - f711b92ba293b4cb6e983d0b0cd8f2a76352c428 2016-08-04 | Merge branch 'release-0.0.1' (tag: 0.0.1) [Ismo Vuorinen]
+
+## 0.0.2 (2016-08-04)
+  - f711b92ba293b4cb6e983d0b0cd8f2a76352c428 2016-08-04 | Merge branch 'release-0.0.1' (tag: 0.0.1, master) [Ismo Vuorinen]
+  - 997beeebb0ba05c60590ecf96cb18fc1e58a336a 2016-08-04 | Merge branch 'release-0.0.1' into develop (HEAD -> release-0.0.2, develop) [Ismo Vuorinen]
+
+## 0.0.1 (Elokuu 04, 2016)
+  - Uncomment rest of the script
+  - Remove "-f" force option, keeping it simple
+  - Add our empty VERSION file to generate another commit
+  - First commit to get things rolling

VERSION

@@ -1 +1 @@
-0.0.1
+0.0.4

release.sh

@@ -12,7 +12,7 @@
 FILE_VERSION="VERSION"
 FILE_CHANGELOG="CHANGELOG.md"
 
-NOW="$(date +'%B %d, %Y')"
+NOW="$(date +'%Y-%m-%d')"
 RED="\033[1;31m"
 GREEN="\033[0;32m"
 YELLOW="\033[1;33m"
@@ -58,6 +58,18 @@ if [ ! -f $FILE_VERSION ]; then
     fi
 fi
 
+# Do we have a file with our changes?
+if [ ! -f $FILE_CHANGELOG ]; then
+    echo -ne "${QUESTION_FLAG} ${CYAN}Can't find changelog file (${FILE_CHANGELOG}), create one?"
+
+    read RESPONSE
+    if [[ $RESPONSE =~ [yY](es)* ]] || [ "$RESPONSE" = "" ]; then
+        echo "" > $FILE_CHANGELOG
+    else
+        exit 1
+    fi
+fi
+
 # Continue to guess new value for our version
 BASE_STRING=`cat $FILE_VERSION`
 
@@ -99,7 +111,7 @@ echo $NEW_VERSION > $FILE_VERSION
 
 # Create our changelog
 echo "## $NEW_VERSION ($NOW)" > tmpfile
-git log --pretty=format:"  - %s" "$BASE_STRING"...HEAD >> tmpfile
+git log --pretty=format:"  - %H %ad | %s%d [%an]" --date=short "$BASE_STRING"...HEAD >> tmpfile
 echo "" >> tmpfile
 echo "" >> tmpfile
 cat $FILE_CHANGELOG >> tmpfile
@@ -109,6 +121,9 @@ echo -e "$ADJUSTMENTS_MSG"
 read
 echo -e "$PUSHING_MSG"
 
+# Make sure changes have been added
+git add $FILE_VERSION $FILE_CHANGELOG
+
 # Commit version number increment
 git commit -am "Incrementing version number to $NEW_VERSION"
 
@@ -117,7 +132,7 @@ git checkout $BRANCH_MASTER
 git merge --no-ff $BRANCH_RELEASE
 
 # Create tag for new version from -master
-git tag $NEW_VERSION
+git tag -am "Tag version ${NEW_VERSION}." "$NEW_VERSION"
 
 # Merge release branch with the new version number back into develop
 git checkout $BRANCH_DEV