Update AUTHORS

.mailmap

@@ -1,9 +1,15 @@
+Alexander Saprykin <[email protected]> Alexander Saprykin <[email protected]>
+Alexander Saprykin <[email protected]> Alexander Saprykin <[email protected]>
+Alexander Saprykin <[email protected]> Oleksandr Saprykin <[email protected]>
+
 Chris Houseknecht <[email protected]> <[email protected]>
 Chris Houseknecht <[email protected]> chouseknecht
 Chris Houseknecht <[email protected]> chouseknecht <[email protected]>
 Chris Houseknecht <[email protected]> vagrant <[email protected]>
 Chris Houseknecht <[email protected]> chouseknecht <[email protected]>
 Chris Houseknecht <[email protected]> Chris Houseknecht <[email protected]>
 Chris Houseknecht <[email protected]> chouseknecht <[email protected]>
-Alexander Saprykin <[email protected]> Oleksandr Saprykin <[email protected]>
+
+David Newswanger <[email protected]> David Newswanger <[email protected]>
+
 Khrystyna Bugaienko <[email protected]> Kristina Bugaenko <[email protected]>

AUTHORS

@@ -1,13 +1,17 @@
 Galaxy has been contribued to by the following authors:
 This list is automatically generated - please file an issue for corrections)
 
-Chris Houseknecht <[email protected]>
-James Cammarata <[email protected]>
+Adrian Likins <[email protected]>
 Alexander Saprykin <[email protected]>
+Brian Coca <[email protected]>
 Chris Church <[email protected]>
-Khrystyna Bugaienko <[email protected]>
-Joe Fiorini <[email protected]>
+Chris Houseknecht <[email protected]>
+Christopher Chase <[email protected]>
+David Newswanger <[email protected]>
+James Cammarata <[email protected]>
 Jiri Tyr <[email protected]>
+Joe Fiorini <[email protected]>
+John Corrales <[email protected]>
 Karl Goetz <[email protected]>
-Alexander Saprykin <[email protected].com>
-Brian Coca <[email protected]>
+Khrystyna Bugaienko <kr.bugaienko@gmail.com>
+cclauss <[email protected]>

update-authors.py

@@ -3,35 +3,17 @@
 
 from __future__ import absolute_import, print_function, unicode_literals
 
-import logging
-
-logger = logging.getLogger(__name__)
-
+import re
 import subprocess
-from collections import defaultdict
 
-user_scores = defaultdict(int)
+author_re = re.compile(r'^\s*\d+\t([\w ]+ <[^>]+>)$')
 
-git_log = subprocess.check_output("git log --shortstat --no-merges --pretty='%aN <%aE>'",
-                                  shell=True)
+git_log = subprocess.check_output(['git', 'shortlog', '--summary', '--email'])
 log_entries = git_log.decode('utf-8').strip().split('\n')
-while log_entries:
-    author = log_entries.pop(0)
-    _ = log_entries.pop(0)
-    commit_line = log_entries.pop(0)
-    commit_parts = [s.strip() for s in commit_line.split(', ')]
-    for clause in commit_parts:
-        count, action = clause.split(' ', 1)
-        if action.endswith('(+)'):
-            user_scores[author] += int(count)
-        elif action.endswith('(-)'):
-            user_scores[author] += int(count)
-        else:
-            user_scores[author] += int(count)
+authors = [author_re.match(entry).group(1) for entry in log_entries]
 
-sorted_user_scores = sorted(user_scores.items(), key=lambda tpl: tpl[1], reverse=True)
 
 print("Galaxy has been contribued to by the following authors:\n"
       "This list is automatically generated - please file an issue for corrections)\n")
-for author, _ in sorted_user_scores:
+for author in authors:
     print(author)