Merge pull request #18 from basho/features/lrb/add-publish-script-gh-17

Add generic publish script

Author: lukebakken

Makefile

@@ -0,0 +1,13 @@
+.PHONY: release
+
+release:
+ifeq ($(VERSION),)
+	$(error VERSION must be set to deploy this code)
+endif
+ifeq ($(RELEASE_GPG_KEYNAME),)
+	$(error RELEASE_GPG_KEYNAME must be set to deploy this code)
+endif
+	./build/publish $(VERSION) master validate
+	git tag --sign -a "$(VERSION)" -m "riak-client-tools $(VERSION)" --local-user "$(RELEASE_GPG_KEYNAME)"
+	git push --tags
+	./build/publish $(VERSION) master 'Riak Client Tools' 'riak-client-tools'

RELNOTES.md

@@ -1,5 +1,8 @@
 Release Notes
 =============
 
+* [1.1.0](https://github.com/basho/riak-client-tools/issues?q=milestone%3Ariak-client-tools-1.1.0)
+* [1.0.3](https://github.com/basho/riak-client-tools/issues?q=milestone%3Ariak-client-tools-1.0.3)
+* [1.0.2](https://github.com/basho/riak-client-tools/issues?q=milestone%3Ariak-client-tools-1.0.2)
 * [1.0.1](https://github.com/basho/riak-client-tools/issues?q=milestone%3Ariak-client-tools-1.0.1)
 * [1.0.0](https://github.com/basho/riak-client-tools/issues?q=milestone%3Ariak-client-tools-1.0.0)

build/publish

@@ -65,8 +65,7 @@ function onexit
     fi
 }
 
-function gh_publish
-{
+function gh_publish {
     if [[ -z $version_string ]]
     then
         errexit 'gh_publish: version_string required'
@@ -75,8 +74,8 @@ function gh_publish
     # NB: we use a X.Y.Z tag
     local -r release_json="{
         \"tag_name\" : \"$version_string\",
-        \"name\" : \"Riak Client Tools  $version_string\",
-        \"body\" : \"riak-client-tools $version_string\nhttps://github.com/basho/riak-client-tools/blob/master/RELNOTES.md\",
+        \"name\" : \"$client_name  $version_string\",
+        \"body\" : \"$client_slug $version_string\nhttps://github.com/basho/$client_slug/blob/$client_default_branch/RELNOTES.md\",
         \"draft\" : false,
         \"prerelease\" : $is_prerelease
     }"
@@ -89,7 +88,7 @@ function gh_publish
 
     curl -4so $curl_content_file -w '%{http_code}' -XPOST \
         -H "Authorization: token $(< $github_api_key_file)" -H 'Content-type: application/json' \
-        'https://api.github.com/repos/basho/riak-client-tools/releases' -d "$release_json" 1> "$curl_stdout_file" 2> "$curl_stderr_file"
+        "https://api.github.com/repos/basho/$client_slug/releases" -d "$release_json" 1> "$curl_stdout_file" 2> "$curl_stderr_file"
     if [[ $? != 0 ]]
     then
         errexit "curl error exited with code: '$?' see '$curl_stderr_file'"
@@ -101,7 +100,7 @@ function gh_publish
         pwarn "Release in GitHub already exists! (http code: '$curl_rslt')"
         curl -4so $curl_content_file -w '%{http_code}' -XGET \
             -H "Authorization: token $(< $github_api_key_file)" -H 'Content-type: application/json' \
-            "https://api.github.com/repos/basho/riak-client-tools/releases/tags/$version_string" 1> "$curl_stdout_file" 2> "$curl_stderr_file"
+            "https://api.github.com/repos/basho/$client_slug/releases/tags/$version_string" 1> "$curl_stdout_file" 2> "$curl_stderr_file"
         if [[ $? != 0 ]]
         then
             errexit "curl error exited with code: '$?' see '$curl_stderr_file'"
@@ -110,12 +109,59 @@ function gh_publish
     then
         errexit "Creating release in GitHub failed with http code '$curl_rslt'"
     fi
+
+    if [[ -z $client_package_file ]]
+    then
+        pinfo 'No release assets to upload, exiting.'
+        exit 0
+    fi
+
+    if [[ -s $client_package_file ]]
+    then
+        pinfo "Uploading release assets file: $client_package_file"
+    else
+        exit 0
+    fi
+
+    if [[ ! -s $curl_content_file ]]
+    then
+        errexit 'no release info to parse for asset uploads'
+    fi
+
+    # "upload_url": "https://uploads.github.com/repos/basho/$client_slug/releases/1115734/assets{?name,label}"
+    # https://uploads.github.com/repos/basho/$client_slug/releases/1115734/assets{?name,label}
+    local -r upload_url_with_name=$(perl -ne 'print qq($1\n) and exit if /"upload_url"[ :]+"(https:\/\/[^"]+)"/' "$curl_content_file")
+    local -r upload_url="${upload_url_with_name/\{?name,label\}/?name=$client_package_name}"
+
+    curl_content_file="$(make_temp_file)"
+    curl_stdout_file="$(make_temp_file)"
+    curl_stderr_file="$(make_temp_file)"
+
+    curl -4so $curl_content_file -w '%{http_code}' -XPOST \
+        -H "Authorization: token $(< $github_api_key_file)" -H 'Content-type: application/x-compressed, application/x-tar' \
+        "$upload_url" --data-binary "@$client_package_file" 1> "$curl_stdout_file" 2> "$curl_stderr_file"
+    if [[ $? != 0 ]]
+    then
+        errexit "curl error exited with code: '$?' see '$curl_stderr_file'"
+    fi
+
+    curl_rslt="$(< $curl_stdout_file)"
+    if (( curl_rslt != 201 ))
+    then
+        errexit "Uploading release assets to GitHub failed with http code '$curl_rslt'"
+    fi
 }
 
 trap onexit EXIT
 
 declare -r version_string="${1:-unknown}"
 
+declare -r client_default_branch="${2:-''}"
+if [[ -z $client_default_branch ]]
+then
+    errexit 'second argument must be default git branch ("master")'
+fi
+
 if [[ ! $version_string =~ ^[0-9].[0-9].[0-9](-[a-z]+[0-9]+)?$ ]]
 then
     errexit 'first argument must be valid version string in X.Y.Z format'
@@ -130,40 +176,43 @@ else
     pinfo "publishing version $version_string"
 fi
 
-declare -r current_branch="$(git rev-parse --abbrev-ref HEAD)"
-
-if [[ $debug == 'false' && $is_prerelease == 'false' && $current_branch != 'master' ]]
-then
-    errexit 'publish must be run on master branch'
-fi
-
 declare -r github_api_key_file="$HOME/.ghapi"
 if [[ ! -s $github_api_key_file ]]
 then
     errexit "please save your GitHub API token in $github_api_key_file"
 fi
 
+declare -r current_branch="$(git rev-parse --abbrev-ref HEAD)"
+if [[ $debug == 'false' && $is_prerelease == 'false' && $current_branch != $client_default_branch ]]
+then
+    errexit "publish must be run on $client_default_branch branch"
+fi
+
 # Validate commands
 if ! hash curl 2>/dev/null
 then
     errexit "'curl' must be in your PATH"
 fi
 
-validate=${2:-''}
+validate=${3:-''}
 if [[ $validate == 'validate' ]]
 then
     exit 0
 fi
 
-set +o nounset
-release_gpg_name="${RELEASE_GPG_NAME:-$2}"
-if [[ -z $release_gpg_name ]]
+declare -r client_name="${3:-''}"
+if [[ -z $client_name ]]
 then
-    errexit '$RELEASE_GPG_NAME must be set, or key name passed as second arg'
+    errexit 'third argument must be client name ("Riak Java Client")'
 fi
-set -o nounset
 
-git tag --sign -a "$version_string" -m "riak-client-tools $version_string" --local-user "$release_gpg_name"
-git push --tags
-sleep 5
+declare -r client_slug="${4:-''}"
+if [[ -z $client_slug ]]
+then
+    errexit 'fourth argument must be client slug ("riak-java-client")'
+fi
+
+declare -r client_package_file="${5:-''}"
+declare -r client_package_name="${6:-''}"
+
 gh_publish