Move authentication token to make Repository a reusable library

Now `Repository` requires a `token` parameter for authentication
instead of using the `config` module to get it directly. This means the
cli program itself is now passing the token in. The benefit of this is
that the `Repository` library can be reused in other applications.

Author: tedivm

gitconsensus/gitconsensus.py

@@ -2,6 +2,7 @@
 import github3
 import os
 import random
+from gitconsensus import config
 from gitconsensus.repository import Repository
 import string
 
@@ -34,7 +35,7 @@ def twofacallback(*args):
 @click.argument('username')
 @click.argument('repository_name')
 def list(username, repository_name):
-    repo = Repository(username, repository_name)
+    repo = get_repository(username, repository_name)
     requests = repo.getPullRequests()
     for request in requests:
         click.echo("PR#%s: %s" % (request.number, request.validate()))
@@ -45,7 +46,7 @@ def list(username, repository_name):
 @click.argument('repository_name')
 @click.argument('pull_request')
 def info(username, repository_name, pull_request):
-    repo = Repository(username, repository_name)
+    repo = get_repository(username, repository_name)
     request = repo.getPullRequest(pull_request)
     click.echo("PR#%s: %s" % (request.number, request.pr.title))
     consensus = repo.getConsensus()
@@ -64,7 +65,7 @@ def info(username, repository_name, pull_request):
 @click.argument('repository_name')
 @click.argument('pull_request')
 def forcemerge(username, repository_name, pull_request):
-    repo = Repository(username, repository_name)
+    repo = get_repository(username, repository_name)
     request = repo.getPullRequest(pull_request)
     click.echo("PR#%s: %s" % (request.number, request.pr.title))
     request.vote_merge()
@@ -75,7 +76,7 @@ def forcemerge(username, repository_name, pull_request):
 @click.argument('repository_name')
 @click.argument('pull_request')
 def forceclose(username, repository_name, pull_request):
-    repo = Repository(username, repository_name)
+    repo = get_repository(username, repository_name)
     request = repo.getPullRequest(pull_request)
     click.echo("PR#%s: %s" % (request.number, request.pr.title))
     request.close()
@@ -85,7 +86,7 @@ def forceclose(username, repository_name, pull_request):
 @click.argument('username')
 @click.argument('repository_name')
 def merge(username, repository_name):
-    repo = Repository(username, repository_name)
+    repo = get_repository(username, repository_name)
     requests = repo.getPullRequests()
     for request in requests:
         if request.validate():
@@ -99,7 +100,7 @@ def merge(username, repository_name):
 @click.argument('username')
 @click.argument('repository_name')
 def close(username, repository_name):
-    repo = Repository(username, repository_name)
+    repo = get_repository(username, repository_name)
     requests = repo.getPullRequests()
     for request in requests:
         if request.isBlocked():
@@ -117,7 +118,7 @@ def close(username, repository_name):
 @click.option('--color-positive', default='#0052cc')
 @click.option('--color-notice', default='#fbf904')
 def createlabels(username, repository_name, color_negative, color_positive, color_notice):
-    repo = Repository(username, repository_name)
+    repo = get_repository(username, repository_name)
     repo.setLabelColor('License Change', color_notice)
     repo.setLabelColor('Consensus Change', color_notice)
     repo.setLabelColor('Has Quorum', color_positive)
@@ -128,5 +129,9 @@ def createlabels(username, repository_name, color_negative, color_positive, colo
     repo.setLabelColor('gc-closed', color_negative)
 
 
+def get_repository(username, repository_name):
+    credentials = config.getGitToken()
+    return Repository(username, repository_name, credentials['token'])
+
 if __name__ == '__main__':
     cli()

gitconsensus/repository.py

@@ -1,4 +1,3 @@
-from gitconsensus import config
 import datetime
 import github3
 import json
@@ -29,30 +28,31 @@
 
 """
 
+consensus_url_template = "https://raw.githubusercontent.com/%s/%s/master/.gitconsensus.yaml"
 
-def githubApiRequest(url):
-    auth = config.getGitToken()
+
+def githubApiRequest(url, token):
     headers = {
         'Accept': 'application/vnd.github.squirrel-girl-preview',
         'user-agent': 'gitconsensus',
-        'Authorization': "token %s" % (auth['token'],)
+        'Authorization': "token %s" % (token,)
     }
     return requests.get(url, headers=headers)
 
 
 class Repository:
 
-    def __init__(self, user, repository):
+    def __init__(self, user, repository, token=False):
         self.user = user
         self.name = repository
         self.contributors = False
         self.collaborators = {}
-        auth = config.getGitToken()
-        self.client = github3.login(token=auth['token'])
+        self.token = token
+        self.client = github3.login(token=token)
         self.client.set_user_agent('gitconsensus')
         self.repository = self.client.repository(self.user, self.name)
-        consensusurl = "https://raw.githubusercontent.com/%s/%s/master/.gitconsensus.yaml" % (self.user, self.name)
-        res = githubApiRequest(consensusurl)
+        consensusurl = consensus_url_template % (self.user, self.name)
+        res = githubApiRequest(consensusurl, self.token)
         self.rules = False
         if res.status_code == 200:
             self.rules = yaml.load(res.text)
@@ -81,7 +81,7 @@ def isContributor(self, username):
             self.contributors = [str(contributor) for contributor in contributor_list]
         return username in self.contributors
 
-    def isCollaborator(username):
+    def isCollaborator(self, username):
         if username not in self.collaborators:
             self.collaborators[username] = self.repository.is_collaborator(username)
         return self.repository.is_collaborator(username)
@@ -106,7 +106,7 @@ def __init__(self, repository, number):
 
         # https://api.github.com/repos/OWNER/REPO/issues/1/reactions
         reacturl = "https://api.github.com/repos/%s/%s/issues/%s/reactions" % (self.repository.user, self.repository.name, self.number)
-        res = githubApiRequest(reacturl)
+        res = githubApiRequest(reacturl, self.repository.token)
         reactions = json.loads(res.text)
 
         self.yes = []