Release tag automation redux

Author: Sam Briesemeister

.gitignore

@@ -1,5 +1,6 @@
 *.pyc
-RELEASE_VERSION
+release-tag
+commit-tag
 dist/
 build/
 scratch/

Makefile

@@ -1,10 +1,13 @@
 
-.PHONY: install clean remove build upload test RELEASE_VERSION release-tag
+.PHONY: install clean remove build upload test release-tag commit-tag git-status-clean push-release release-checkout
 
 GIT_COMMIT = $(shell git log -1 "--pretty=format:%H")
 GIT_BRANCH = $(shell git describe --contains --all HEAD)
 GIT_STATUS = $(shell git status -sb --untracked=no | wc -l | awk '{ if($$1 == 1){ print "clean" } else { print "pending" } }')
 
+VERSION_PATTERN = "^[0-9]+\.[0-9]+\.[0-9]+$$"
+
+
 install:
 	python setup.py install
 
@@ -15,16 +18,34 @@ clean:
 build: test 
 	python setup.py build 
 
-upload: build test RELEASE_VERSION
+upload: git-status-clean test commit-tag
 	python setup.py sdist upload
 
-release-tag: RELEASE_VERSION
-	test "${GIT_STATUS}" == "clean" || echo "GIT STATUS NOT CLEAN" >&2
-	git tag `tail -n 1 RELEASE_VERSION` 
+
+push-release: release upload
+
+
+git-status-clean:
+	test "${GIT_STATUS}" == "clean" || (echo "GIT STATUS NOT CLEAN"; exit 1) >&2
+
+
+release: release-tag
+	echo "## Tagging release " `cat release-tag`
+	git tag `cat release-tag`
+
+release-checkout:
+	git checkout release
+
+
+release-tag: git-status-clean release-checkout test
+	(echo "0.0.0"; git tag --list) | egrep "${VERSION_PATTERN}" | \
+		sort -n | tail -n 1 | \
+		awk -F '.' '{ printf("%d.%d.%d\n", ($$1), ($$2), ($$3) + 1 ) }' > $@
 
 
-RELEASE_VERSION:
-	(echo "0.0.0"; git tag --list) | sort -n | egrep "^[0-9]+\.[0-9]+\.[0-9]+$$" | awk -F '.' '{ printf("%d.%d.%d\n", ($$1), ($$2), ($$3) + 1 ) }' > $@
+commit-tag: git-status-clean
+	git tag --list --points-at=${GIT_COMMIT} | egrep "${VERSION_PATTERN}" | \
+		sort -n | tail -n 1 > $@
 
 
 test:

setup.py

@@ -1,6 +1,9 @@
 from setuptools import setup
+import sys
+
+VERSION=open('commit-tag').read().strip()
+print >>sys.stderr, "Preparing version {0}\n".format(VERSION or "NOTFOUND")
 
-VERSION=open('RELEASE_VERSION').read().strip().split('\n')[-1]
 
 try:
     long_description=open('DESCRIPTION.rst', 'rt').read()