Merge pull request #1 from ags131/master

Change days to hours

Author: tedivm

README.md

@@ -34,11 +34,11 @@ whitelist:
   - bob
   - carol
 
-# Number of days after last action (commit or opening the pull request) before issue can be merged
-mergedelay: 3
+# Number of hours after last action (commit or opening the pull request) before issue can be merged
+mergedelay: 24
 
-# Number of days after last action (commit or opening the pull request) before issue is autoclosed
-timeout: 30
+# Number of hours after last action (commit or opening the pull request) before issue is autoclosed
+timeout: 720
 ```
 
 ## Voting

gitconsensus/repository.py

@@ -145,7 +145,7 @@ def __init__(self, repository, number):
             if user['login'] not in self.users:
                 self.users.append(user['login'])
 
-    def daysSinceLastCommit(self):
+    def hoursSinceLastCommit(self):
         commits = self.pr.iter_commits()
 
         for commit in commits:
@@ -155,20 +155,20 @@ def daysSinceLastCommit(self):
         commit_date = datetime.datetime.strptime(commit_date_string, '%Y-%m-%dT%H:%M:%SZ')
         now = datetime.datetime.now()
         delta = now - commit_date
-        return delta.days
+        return delta.seconds / 360
 
-    def daysSincePullOpened(self):
+    def hoursSincePullOpened(self):
         now = datetime.datetime.now()
         delta = now - self.pr.created_at.replace(tzinfo=None)
-        return delta.days
+        return delta.seconds / 360
 
-    def daysSinceLastUpdate(self):
-        daysOpen = self.daysSincePullOpened()
-        daysSinceCommit = self.daysSinceLastCommit()
+    def hoursSinceLastUpdate(self):
+        hoursOpen = self.hoursSincePullOpened()
+        hoursSinceCommit = self.hoursSinceLastCommit()
 
-        if daysOpen < daysSinceCommit:
-            return daysOpen
-        return daysSinceCommit
+        if hoursOpen < hoursSinceCommit:
+            return hoursOpen
+        return hoursSinceCommit
 
     def getIssue(self):
         return self.repository.repository.issue(self.number)
@@ -181,7 +181,7 @@ def validate(self):
 
     def shouldClose(self):
         if 'timeout' in self.repository.rules:
-            if self.daysSinceLastCommit() >= self.repository.rules['timeout']:
+            if self.hoursSinceLastCommit() >= self.repository.rules['timeout']:
                 return True
         return False
 
@@ -199,7 +199,7 @@ def vote_merge(self):
             'gc-voters %s' % (len(self.users),),
             'gc-yes %s' % (len(self.yes),),
             'gc-no %s' % (len(self.no),),
-            'gc-age %s' % (self.daysSinceLastUpdate(),)
+            'gc-age %s' % (self.hoursSinceLastUpdate(),)
             ])
         self.commentAction('merged')
 
@@ -310,7 +310,7 @@ def hasVotes(self, pr):
 
     def hasAged(self, pr):
         if 'mergedelay' in self.rules:
-            days = pr.daysSinceLastUpdate()
-            if days < self.rules['mergedelay']:
+            hours = pr.hoursSinceLastUpdate()
+            if hours < self.rules['mergedelay']:
                 return False
         return True