Fix validation errors when creating objects with the API

[icinga2] / changelog.py

diff --git a/changelog.py b/changelog.py
index 100acebbb53fb608b232d867aad29fc0faa76c6f..e44b06808fe64845f0b509ec838e7b6a946358ff 100755 (executable)
--- a/changelog.py
+++ b/changelog.py
@@ -18,15 +18,49 @@
 # * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
 # ******************************************************************************/
 
-import urllib2, json, sys
+import urllib2, json, sys, string
+from argparse import ArgumentParser
 
-if len(sys.argv) < 2:
-    print "Usage:", sys.argv[0], "<VERSION>"
-    sys.exit(0)
+DESCRIPTION="update release changes"
+VERSION="1.0.0"
+ISSUE_URL= "https://dev.icinga.org/issues/"
+ISSUE_PROJECT="i2"
 
-version_name = sys.argv[1]
+arg_parser = ArgumentParser(description= "%s (Version: %s)" % (DESCRIPTION, VERSION))
+arg_parser.add_argument('-V', '--version', required=True, type=str, help="define version to query")
+arg_parser.add_argument('-p', '--project', type=str, help="add urls to issues")
+arg_parser.add_argument('-l', '--links', action='store_true', help="add urls to issues")
+arg_parser.add_argument('-H', '--html', action='store_true', help="print html output (defaults to markdown)")
 
-rsp = urllib2.urlopen("https://dev.icinga.org/projects/i2/versions.json")
+args = arg_parser.parse_args(sys.argv[1:])
+
+ftype = "md" if not args.html else "html"
+
+def format_header(text, lvl, ftype = ftype):
+   if ftype == "html":
+       return "<h%s>%s</h%s>" % (lvl, text, lvl)
+   if ftype == "md":
+       return "#" * lvl + " " + text
+
+def format_logentry(log_entry, args = args, issue_url = ISSUE_URL):
+   if args.links:
+       if args.html:
+           return "<li> {0} <a href=\"{3}{1}\">{1}</a>: {2}</li>".format(log_entry[0], log_entry[1], log_entry[2], issue_url)
+       else:
+           return "* {0} [{1}]({3}{1} \"{0} {1}\"): {2}".format(log_entry[0], log_entry[1], log_entry[2], issue_url)
+   else:
+       if args.html:
+           return "<li>%s %d: %s</li>" % log_entry
+       else:
+           return "* %s %d: %s" % log_entry
+
+
+version_name = args.version
+
+if args.project:
+    ISSUE_PROJECT=args.project
+
+rsp = urllib2.urlopen("https://dev.icinga.org/projects/%s/versions.json" % (ISSUE_PROJECT))
 versions_data = json.loads(rsp.read())
 
 version_id = None
@@ -42,20 +76,23 @@ if version_id == None:
 
 changes = ""
 
-for field in version["custom_fields"]:
-    if field["id"] == 14:
-        changes = field["value"]
-        break
+if "custom_fields" in version:
+    for field in version["custom_fields"]:
+        if field["id"] == 14:
+            changes = field["value"]
+            break
 
-print "### What's New in Version %s" % (version_name)
-print ""
-print "#### Changes"
-print ""
-print changes
-print ""
-print "#### Issues"
+    changes = string.join(string.split(changes, "\r\n"), "\n")
+
+print format_header("What's New in Version %s" % (version_name), 3)
 print ""
 
+if changes:
+    print format_header("Changes", 4)
+    print ""
+    print changes
+    print ""
+
 offset = 0
 
 log_entries = []
@@ -63,7 +100,7 @@ log_entries = []
 while True:
     # We could filter using &cf_13=1, however this doesn't currently work because the custom field isn't set
     # for some of the older tickets:
-    rsp = urllib2.urlopen("https://dev.icinga.org/projects/i2/issues.json?offset=%d&status_id=closed&fixed_version_id=%d" % (offset, version_id))
+    rsp = urllib2.urlopen("https://dev.icinga.org/projects/%s/issues.json?offset=%d&status_id=closed&fixed_version_id=%d" % (ISSUE_PROJECT, offset, version_id))
     issues_data = json.loads(rsp.read())
     issues_count = len(issues_data["issues"])
     offset = offset + issues_count
@@ -74,25 +111,38 @@ while True:
     for issue in issues_data["issues"]:
         ignore_issue = False
 
-        for field in issue["custom_fields"]:
-            if field["id"] == 13 and "value" in field and field["value"] == "0":
-                ignore_issue = True
-                break
+        if "custom_fields" in issue:
+            for field in issue["custom_fields"]:
+                if field["id"] == 13 and "value" in field and field["value"] == "0":
+                    ignore_issue = True
+                    break
 
-        if ignore_issue:
-            continue
+            if ignore_issue:
+                continue
 
-        log_entries.append((issue["tracker"]["name"], issue["id"], issue["subject"]))
+        log_entries.append((issue["tracker"]["name"], issue["id"], issue["subject"].strip()))
 
 for p in range(2):
     not_empty = False
 
-    for log_entry in sorted(log_entries):
+    for log_entry in log_entries:
         if (p == 0 and log_entry[0] == "Feature") or (p == 1 and log_entry[0] != "Feature"):
-            print "* %s %d: %s" % log_entry
             not_empty = True
 
     if not_empty:
+        print format_header("Features", 4) if p == 0 else format_header("Bugfixes", 4)
+        print ""
+       if args.html:
+            print "<ul>"
+
+    for log_entry in sorted(log_entries):
+        if (p == 0 and log_entry[0] == "Feature") or (p == 1 and log_entry[0] != "Feature"):
+            print format_logentry(log_entry)
+
+    if not_empty:
+       if args.html:
+            print "</ul>"
+
         print ""
 
 sys.exit(0)