feature: Scripts to easily apply and remove github Pull Requests

Scripts to easily apply and remove github Pull Requests

.github/PULL_REQUEST_TEMPLATE.md

@@ -6,3 +6,7 @@ DO NOT DELETE THIS TEXT
 
 - [ ] Have you signed the [Contributors agreement](http://docs.librenms.org/General/Contributing/) - please do NOT submit a pull request unless you have (signing the agreement in the same pull request is fine). Your commit message for signing the agreement must appear as per the docs.
 - [ ] Have you followed our [code guidelines?](http://docs.librenms.org/Developing/Code-Guidelines/)
+
+#### Testers
+
+If you would like to test this pull request then please run: `./scripts/github-apply <pr_id>`, i.e `./scripts/github-apply 5926`

scripts/github-apply

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+LIBRENMS_DIR=`dirname "$(readlink -f "$0/..")"`
+cd $LIBRENMS_DIR
+
+case $1 in
+    ''|*[!0-9]*) echo "You must specify a PR number to apply a patch" ;;
+    *) curl -s https://patch-diff.githubusercontent.com/raw/librenms/librenms/pull/${1}.patch | git apply -v ${2} ;;
+esac

scripts/github-remove

@@ -0,0 +1,55 @@
+#! /usr/bin/env python
+import argparse, datetime, sys
+from subprocess import call, check_output
+from os.path import dirname, abspath
+
+raw_input = getattr(__builtins__, 'raw_input', input)
+
+def confirm(question):
+    valid = {"yes":True, "y":True, "ye":True, "no":False, "n":False}
+    while 1:
+        sys.stdout.write(question + " [y/N] ")
+        choice = raw_input().lower()
+        if choice == '':
+            return False
+        elif choice in valid.keys():
+            return valid[choice]
+        else:
+            sys.stdout.write("Please respond with 'yes' or 'no'  (or 'y' or 'n').\n")
+
+
+librenms_dir = dirname(dirname(abspath(__file__)))
+
+parser = argparse.ArgumentParser()
+group = parser.add_mutually_exclusive_group(required=True)
+group.add_argument("-d", "--discard", action="store_true", help="Discard all changes clean extra files")
+group.add_argument("-s", "--save", action="store_true", help="Save and remove changes by stashing them. (git stash)")
+group.add_argument("-r", "--restore", action="store_true", help="Attempt to restore saved changes (git stash pop)")
+parser.add_argument("-v", "--vendor", action="store_true", help="Also discard changes to ./vendor (requires --discard)")
+args = parser.parse_args()
+
+
+if args.discard:
+    if confirm("Are you sure you want to delete all modified and untracked files?"):
+        dirs = ["contrib/", "doc/", "html/", "includes/", "lib/", "LibreNMS/",
+        "licenses/", "mibs/", "misc/", "scripts/", "sql-schema/", "tests/"]
+
+        call(["git", "reset", "-q"], cwd=librenms_dir)
+        call(["git", "checkout", "."], cwd=librenms_dir)
+        call(["git", "clean", "-d", "-f"] + dirs, cwd=librenms_dir)
+
+        if args.vendor:
+            call(["git", "clean",  "-x",  "-d",  "-f",  "vendor/"], cwd=librenms_dir)
+
+elif args.save:
+    msg = "github-remove saved on "+str(datetime.datetime.now())
+    call(["git", "stash", "save", msg], cwd=librenms_dir)
+
+elif args.restore:
+    list = check_output(["git", "stash", "list"])
+    last = list.decode("utf-8") .split('\n', 1)[0]
+
+    if "github-remove" in last:
+        call(["git", "stash", "pop"], cwd=librenms_dir)
+    else:
+        print("Last stash was not created by " + __file__ + ". Aborting.")