[04/12] isis git commit: ISIS-1052: adding github-pr.sh

[da...@apache.org]

ISIS-1052: adding github-pr.sh


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/7e592ae9
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/7e592ae9
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/7e592ae9

Branch: refs/heads/master
Commit: 7e592ae93b630d30262ce6d4be18d74262e4b9d7
Parents: c1ef06d
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Jul 10 12:24:31 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Jul 10 12:24:31 2015 +0100

----------------------------------------------------------------------
 github-pr.sh | 130 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 130 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/7e592ae9/github-pr.sh
----------------------------------------------------------------------
diff --git a/github-pr.sh b/github-pr.sh
new file mode 100644
index 0000000..65304e5
--- /dev/null
+++ b/github-pr.sh
@@ -0,0 +1,130 @@
+#!/bin/bash
+#set -x
+#trap read debug
+set -o nounset
+set -o errexit
+
+#
+# Merges Pull Requests into 'https://github.com/apache/isis' 
+#
+# Uses 'jq' to parse JSON
+# - on Linux: aptitude install jq
+# - on Mac: brew install jq 
+# - on Windows: download exe from http://stedolan.github.io/jq/download/
+#
+# process:
+# - locate/raise JIRA ticket, eg ISIS-1162
+# - checkout branch from which PR was forked (usually just 'master')
+# - merge PR using this script
+#
+# Usage: github-pr.sh ISIS-1162 31
+#
+# where 1162 is the JIRA ticket number, and 31 is the gthub PR issue number
+#
+
+
+function die {
+	local prefix="[$(date +%Y/%m/%d\ %H:%M:%S)]: "
+	echo "${prefix} ERROR: $@" 1>&2
+	exit 10
+}
+
+
+#
+# validate script args
+#
+if [ $# -ne 2 ]; then
+    die "usage: github-pr.sh ISIS-nnn pp"
+fi
+
+jira_number=$1
+pr_number=$2
+
+echo ""
+
+
+#
+# validate JIRA ticket
+#
+jira_url="https://issues.apache.org/jira/rest/api/2/search?jql=key%20in%20($jira_number)"
+jira_json=$(curl -s "$jira_url")
+if [ $? -ne 0 ]; then
+    die "Failed to query JIRA for issue; url: $jira_url"
+fi
+
+err_message=$(echo $jira_json | jq --raw-output '.errorMessages')
+
+if [ "$err_message" != "null" ]; then
+	die "Cannot find the info about JIRA issue $jira_number" 
+fi
+
+echo ""
+echo "Found JIRA ticket"
+
+
+#
+# validate github PR
+#
+github_url="https://api.github.com/repos/apache/isis/pulls/$pr_number"
+github_json=$(curl -s $github_url)
+if [ $? -ne 0 ]; then
+    die "Failed to query github for PR; url: $github_url"
+fi
+
+err_message=$(echo $github_json | jq --raw-output '.message')
+if [ "x$err_message" = "xNot Found" ]; then
+	die "Cannot find the info about PR $pr_number" 
+fi
+
+echo "Found github PR"
+
+branch_name_local=$(git rev-parse --abbrev-ref HEAD)
+username=$(echo $github_json | jq --raw-output '.head .user .login')
+repo_full_name=$(echo $github_json | jq --raw-output '.head .repo .full_name')
+repo_clone_url=$(echo $github_json | jq --raw-output '.head .repo .clone_url')
+branch_name_fork=$(echo $github_json | jq --raw-output '.head .ref')
+
+branch_name_temp="$jira_number-pr-$pr_number"
+
+echo "branch_name_local: $branch_name_local"
+echo "username         : $username"
+echo "repo_full_name   : $repo_full_name"
+echo "repo_clone_url   : $repo_clone_url"
+echo "branch_name_fork : $branch_name_fork"
+
+echo ""
+echo "merging into: $branch_name_temp"
+echo ""
+
+
+branch_exists=$(git branch --list $branch_name_temp)
+if [ "x$branch_exists" != "x" ]; then
+	echo "Deleting branch '$branch_name_temp'"
+	git branch -D $branch_name_temp 
+fi
+
+echo "Creating the branch $branch_name_temp"
+git checkout -b $branch_name_temp $branch_name_local
+
+echo "Pulling the changes from $repo_clone_url $branch_name_fork"
+git pull --rebase $repo_clone_url $branch_name_fork
+
+echo ""
+echo "Merged the PR; hit enter to build"
+
+read 
+echo "Building..."
+echo
+
+mvn clean install -o
+
+echo "Checking out the main branch - $branch_name_local ..."
+git checkout $branch_name_local
+
+
+echo
+echo
+echo "If build successful and happy to merge, execute:"
+echo
+echo "git merge $branch_name_temp && git push origin $branch_name_local && git branch -d $branch_name_temp"
+echo