Merge pull request #18 from sproogen/release/0.3

Release/0.3

Author: sproogen

Diff for: .travis.yml

@@ -19,6 +19,7 @@ branches:
     - develop
 
 before_install:
+  - gem install gem-release --pre
   - ./scripts/bump-version.sh
 
 script:
@@ -29,8 +30,13 @@ after_success:
   - ./scripts/merge-downstream.sh
 
 deploy:
-  provider: rubygems
-  on:
-    branch: master
-  api_key:
-    secure: "RNKG1VHenOH/xa5Qax6nK8rEP4iS9rQ28jXOb0q3sgWbcgRoBm2B9lUl1WZ6gPcOIIlN+79FFXEzWJMM1NPxs9N5ZLHVQV35D8ApA2lFOU8C4jzgQstAIXh0Pa8HBHTnYbjHObobiuKmI4oqOQ/WV8I6281Ol+PcQizstLwiHI+soqRea94vuuOCqalaQL9zOXZHaqYyQYJSJOFWAyPO3+wjJU8lpN9Dt3n2J+XZujbdIG99otQAE+/dr+cy0ax4a8K0voEOQ9rVdSUjXMspsog7kT+qcVUehmcTfVRyWZcUPTgVgJ3vneWTtdRTVAK75TuENlPFJ0SsIYuHmIHigQpvdWBGFF43h+Ipm37Y+jRTdwxhhShmrfQ4Ljvnp/AahxHmMUSF12c0Ft0wPCsMqWbQJs9MZneTB5NXq+OvJDI2Ve8fYvrINgPdFv+tn8gE8tR8BU3nZB+gsFLzdOiJPfwCxf9xSTexWYCTSqFoo9LgML00g0BykQE9Nm4mY0/y4VqUjMCAoHnlh7hK7N2wFNBiGEcGtwmRVacCBWz42W5lX6T8KuM5nT10hOwXF+uVSUsSw7JglHOWYharegjnhnjS9fbbQCUXSuDuUunZWagTYKj4QM94BmMoEAT+RZ1LsKWR6SojjMB8Cms2J70TcqZBsO5CBGug1VWk6NzdNJI="
+  - provider: rubygems
+    on:
+      branch: master
+    api_key:
+      secure: "RNKG1VHenOH/xa5Qax6nK8rEP4iS9rQ28jXOb0q3sgWbcgRoBm2B9lUl1WZ6gPcOIIlN+79FFXEzWJMM1NPxs9N5ZLHVQV35D8ApA2lFOU8C4jzgQstAIXh0Pa8HBHTnYbjHObobiuKmI4oqOQ/WV8I6281Ol+PcQizstLwiHI+soqRea94vuuOCqalaQL9zOXZHaqYyQYJSJOFWAyPO3+wjJU8lpN9Dt3n2J+XZujbdIG99otQAE+/dr+cy0ax4a8K0voEOQ9rVdSUjXMspsog7kT+qcVUehmcTfVRyWZcUPTgVgJ3vneWTtdRTVAK75TuENlPFJ0SsIYuHmIHigQpvdWBGFF43h+Ipm37Y+jRTdwxhhShmrfQ4Ljvnp/AahxHmMUSF12c0Ft0wPCsMqWbQJs9MZneTB5NXq+OvJDI2Ve8fYvrINgPdFv+tn8gE8tR8BU3nZB+gsFLzdOiJPfwCxf9xSTexWYCTSqFoo9LgML00g0BykQE9Nm4mY0/y4VqUjMCAoHnlh7hK7N2wFNBiGEcGtwmRVacCBWz42W5lX6T8KuM5nT10hOwXF+uVSUsSw7JglHOWYharegjnhnjS9fbbQCUXSuDuUunZWagTYKj4QM94BmMoEAT+RZ1LsKWR6SojjMB8Cms2J70TcqZBsO5CBGug1VWk6NzdNJI="
+  - provider: releases
+    api_key: ${GITHUB_TOKEN}
+    file: "resume-theme-$(gem bump --pretend --no-commit | awk '{ print $3 }').gem"
+    on:
+      branch: master

Diff for: lib/resume-theme/version.rb

@@ -1,3 +1,3 @@
 module ResumeTheme
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

Diff for: scripts/bump-version.sh

@@ -1,17 +1,21 @@
 #!/bin/bash
 
-set -ev
+set -e
 
 if [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
-  gem install gem-release --pre;
-
   git config --global user.email ${EMAIL};
   git config --global user.name ${USER};
 
+  git fetch origin;
   git checkout master;
 
-  gem bump --skip-ci;
-  gem tag --no-push;
+  CURRENT_VERSION=v$(gem bump --pretend --no-commit | awk '{ print $3 }');
 
+  # Only bump the tag if the current version already has a tag, if it doesn't exist then the version has been manually updated.
+  if [ "$(git tag -l $CURRENT_VERSION)" == "$CURRENT_VERSION" ]; then
+    gem bump --skip-ci;
+  fi
+
+  gem tag --no-push;
   git push "https://${GITHUB_TOKEN}@${GITHUB_REPO}" master --tags;
-fi
+fi

Diff for: scripts/merge-downstream.sh

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-# set -v
-
 if [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
   git remote set-branches --add origin develop;
   git fetch origin develop;