time: refactor, add notion of days a PR has been sitting

validate.py

@@ -47,9 +47,8 @@ def base_pr_url():
   return 'https://www.jefftk.com/nomic-github/repos/%s/pulls/%s' % (
     get_repo(), get_pr())
 
-def get_author():
-  response = request(base_pr_url())
-  return response.json()['user']['login']
+def get_author(pr_json):
+  return pr_json['user']['login']
 
 def get_reviews():
   target_commit = get_commit()
@@ -85,6 +84,19 @@ def get_reviews():
 def get_users():
   return list(sorted(os.listdir('players/')))
 
+def iso8601_to_ts(iso8601):
+  return int(time.mktime(time.strptime(iso8601, "%Y-%m-%dT%H:%M:%SZ")))
+
+def pr_created_at_ts(pr_json):
+  return iso8601_to_ts(pr_json['created_at'])
+
+def pr_pushed_at_ts(pr_json):
+  return iso8601_to_ts(pr_json['head']['repo']['pushed_at'])
+
+def pr_last_changed_ts(pr_json):
+  return max(pr_created_at_ts(pr_json),
+             pr_pushed_at_ts(pr_json))
+
 def last_commit_ts():
   # When was the last commit on master?
   cmd = ['git', 'log', 'master', '-1', '--format=%ct']
@@ -94,19 +106,20 @@ def last_commit_ts():
 
   return int(completed_process.stdout)
 
-def seconds_since_last_commit():
-  return int(time.time() - last_commit_ts())
+def seconds_since(ts):
+  return int(time.time() - ts)
 
-def days_since_last_commit():
-  return int(seconds_since_last_commit() / 60 / 60 / 24)
+def seconds_to_days(seconds):
+  return int(seconds / 60 / 60 / 24)
 
 def determine_if_mergeable():
   users = get_users()
   print('Users:')
   for user in users:
     print('  %s' % user)
 
-  author = get_author()
+  pr_json = request(base_pr_url()).json()
+  author = get_author(pr_json)
   print('\nAuthor: %s' % author)
 
   reviews = get_reviews()
@@ -130,11 +143,17 @@ def determine_if_mergeable():
   if rejections:
     raise Exception('Rejected by: %s' % (' '.join(rejections)))
 
+  days_since_last_changed = seconds_to_days(
+    seconds_since(pr_last_changed_ts(pr_json)))
+
+  print('FYI: this PR has been sitting for %s days' % (
+      days_since_last_changed))
+
   required_approvals = len(users)
 
   # Allow three days to go by with no commits, but if longer happens then start
   # lowering the threshold for allowing a commit.
-  approvals_to_skip = days_since_last_commit() - 3
+  approvals_to_skip = seconds_to_days(seconds_since(last_commit_ts())) - 3
   if approvals_to_skip > 0:
     print("Skipping up to %s approvals, because it's been %s days"
           " since the last commit." % (approvals_to_skip,