Update release script

Author: oschwald

README.md

@@ -7,7 +7,7 @@ format that stores data indexed by IP address subnets (IPv4 or IPv6).
 
 ## Installation ##
 
-### Define Your Dependencies ###
+### Maven ###
 
 We recommend installing this package with [Maven](http://maven.apache.org/).
 To do this, add the dependency to your pom.xml:
@@ -20,6 +20,19 @@ To do this, add the dependency to your pom.xml:
     </dependency>
 ```
 
+### Gradle ###
+
+Add the following to your `build.gradle` file:
+
+```
+repositories {
+    mavenCentral()
+}
+dependencies {
+    compile 'ccom.maxmind.db:maxmind-db:1.2.1'
+}
+```
+
 ## Usage ##
 
 *Note:* For accessing MaxMind GeoIP2 databases, we generally recommend using

dev-bin/release.sh

@@ -1,17 +1,32 @@
 #!/bin/bash
 
-set -e
+set -eu -o pipefail
 
-VERSION=$(perl -MFile::Slurp::Tiny=read_file -MDateTime <<EOF
-use v5.16;
-my \$log = read_file(q{CHANGELOG.md});
-\$log =~ /\n(\d+\.\d+\.\d+) \((\d{4}-\d{2}-\d{2})\)\n/;
-die 'Release time is not today!' unless DateTime->now->ymd eq \$2;
-say \$1;
-EOF
-)
+changelog=$(cat CHANGELOG.md)
 
-TAG="v$VERSION"
+regex='
+([0-9]+\.[0-9]+\.[0-9]+) \(([0-9]{4}-[0-9]{2}-[0-9]{2})\)
+-*
+
+((.|
+)*)
+'
+
+if [[ ! $changelog =~ $regex ]]; then
+      echo "Could not find date line in change log!"
+      exit 1
+fi
+
+version="${BASH_REMATCH[1]}"
+date="${BASH_REMATCH[2]}"
+notes="$(echo "${BASH_REMATCH[3]}" | sed -n -e '/^[0-9]\+\.[0-9]\+\.[0-9]\+/,$!p')"
+
+if [[ "$date" -ne  $(date +"%Y-%m-%d") ]]; then
+    echo "$date is not today!"
+    exit 1
+fi
+
+tag="v$version"
 
 if [ -n "$(git status --porcelain)" ]; then
     echo ". is not clean." >&2
@@ -20,21 +35,21 @@ fi
 
 mvn versions:display-dependency-updates
 
-read -e -p "Continue given above dependencies? (y/n) " SHOULD_CONTINUE
+read -e -p "Continue given above dependencies? (y/n) " should_continue
 
-if [ "$SHOULD_CONTINUE" != "y" ]; then
+if [ "$should_continue" != "y" ]; then
     echo "Aborting"
     exit 1
 fi
 
-export VERSION
-perl -pi -e 's/(?<=<version>)[^<]*/$ENV{VERSION}/' README.md
+perl -pi -e "s/(?<=<version>)[^<]*/$version/" README.md
+perl -pi -e "s/(?<=com\.maxmind\.db\:maxmind-db\:)\d+\.\d+\.\d+([\w\-]+)?/$version/" README.md
 
 if [ -n "$(git status --porcelain)" ]; then
     git diff
 
-    read -e -p "Commit README.md changes? " SHOULD_COMMIT
-    if [ "$SHOULD_COMMIT" != "y" ]; then
+    read -e -p "Commit README.md changes? " should_commit
+    if [ "$should_commit" != "y" ]; then
         echo "Aborting"
         exit 1
     fi
@@ -45,17 +60,23 @@ fi
 
 # could be combined with the primary build
 mvn release:clean
-mvn release:prepare -DreleaseVersion="$VERSION" -Dtag="$TAG"
+mvn release:prepare -DreleaseVersion="$version" -Dtag="$tag"
 mvn release:perform
 
-read -e -p "Push to origin? " SHOULD_PUSH
+read -e -p "Push to origin? " should_push
 
-if [ "$SHOULD_PUSH" != "y" ]; then
+if [ "$should_push" != "y" ]; then
     echo "Aborting"
     exit 1
 fi
 
 git push
 git push --tags
 
+message="$version
+
+$notes"
+
+hub release create -m "$message" "$tag"
+
 echo "Remember to do the release on https://oss.sonatype.org/!"