Split GithubApp into it's own library, upgrade dependencies

Author: tedivm

Makefile

@@ -4,7 +4,7 @@ ROOT_DIR:=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
 
 .PHONY: all fresh fulluninstall install dependencies clean
 
-all: dependencies
+all: application
 
 fresh: clean dependencies
 
@@ -16,6 +16,11 @@ dependencies:
 	if [ ! -d $(ROOT_DIR)/venv ]; then python3 -m venv $(ROOT_DIR)/venv; fi
 	source $(ROOT_DIR)/venv/bin/activate; yes w | pip install -e .
 
+application:
+	if [ ! -d $(ROOT_DIR)/venv ]; then python3 -m venv $(ROOT_DIR)/venv; fi
+	source $(ROOT_DIR)/venv/bin/activate; yes w | pip install -r requirements.txt
+
 clean:
-	rm -rf $(ROOT_DIR)/env;
+	rm -rf $(ROOT_DIR)/venv;
 	rm -rf $(ROOT_DIR)/gitconsensusservice/*.pyc;
+	rm -rf $(ROOT_DIR)/gitconsensusservice.egg-info;

gitconsensusservice/cli.py

@@ -1,8 +1,8 @@
 import click
-import re
-from gitconsensusservice.services import github
 import yaml
-from gitconsensus.repository import Repository
+from gitconsensusservice import app
+from services.githubapp import gh
+from jobs import consensus
 
 
 @click.group()
@@ -14,50 +14,48 @@ def cli(ctx):
 
 @cli.command(short_help="List installation IDs available to this application.")
 def installs():
-    installs = github.get_installations()
+    installs = gh.get_installations()
     for install in installs:
         click.echo(install)
 
 
 @cli.command(short_help="List details about a specific installation.")
 @click.argument('install_id')
 def install(install_id):
-    dump(github.get_installation(install_id))
+    dump(get_githubapp_install(install_id).get_details())
 
 
 @cli.command(short_help="Get an authentication token for the provided installation.")
 @click.argument('install_id')
 def install_token(install_id):
-    token = github.get_installation_token(install_id)
-    click.echo(token)
+    dump(get_githubapp_install(install_id).get_auth_token())
 
 
-@cli.command(short_help="Get an authentication token for the provided installation.")
+@cli.command(short_help="List all repositories for an installation.")
 @click.argument('install_id')
 def install_repos(install_id):
-    token = github.get_installation_repositories(install_id)
-    dump(token)
+    dump(get_githubapp_install(install_id).get_repositories())
 
 
 @cli.command(short_help="List details about the current application.")
 def application():
-    dump(github.get_app())
+    dump(gh.get_app())
 
 
 @cli.command(short_help="Get JWT Authentication Token for this application.")
 def jwt():
-    click.echo(github.get_jwt())
+    click.echo(gh.get_jwt())
 
 
 @cli.command(short_help="List all open pull requests for the specific install and repository.")
 @click.argument('install_id')
 @click.argument('username')
 @click.argument('repository_name')
 def prs(install_id, username, repository_name):
-    dump(github.list_prs(install_id, username, repository_name))
+    dump(get_githubapp_install(install_id).list_prs(username, repository_name))
 
 
-@cli.command(short_help="Display detailed information about a specific pull request")
+@cli.command(short_help="Display detailed information about a specific pull request.")
 @click.argument('install_id')
 @click.argument('username')
 @click.argument('repository_name')
@@ -77,9 +75,18 @@ def pr(install_id, username, repository_name, pull_request):
     click.echo("Last Update:  %s" % (request.hoursSinceLastUpdate(),))
 
 
+@cli.command(short_help="Process pull requests for all installations.")
+@click.option('--synchronous/--no-synchronous', default=True)
+def process(synchronous):
+    consensus.process_installs(synchronous)
+
+
+def get_githubapp_install(install_id):
+    return gh.get_installation(install_id)
+
+
 def get_repository(install_id, username, repository_name):
-    client = github.get_github3_client(install_id)
-    return Repository(username, repository_name, client)
+    return get_githubapp_install(install_id).get_repository(username, repository_name)
 
 
 def dump(obj):

gitconsensusservice/services/github.py

@@ -0,0 +1,17 @@
+from github3apps import GithubApp, GithubAppInstall
+from gitconsensus.repository import Repository
+from gitconsensusservice import app
+
+
+class GithubConsensusApp(GithubApp):
+    def get_installation(self, installation_id):
+        return GithubConsensusAppInstall(self, installation_id)
+
+
+class GithubConsensusAppInstall(GithubAppInstall):
+    def get_repository(self, username, repository_name):
+        client = self.get_github3_client()
+        return Repository(username, repository_name, client)
+
+
+gh = GithubConsensusApp(app.config['GITHUB_APP_ID'], app.config['GITHUB_PRIVATE_KEY'])

gitconsensusservice/services/githubapp.py

@@ -1,13 +1,14 @@
 asn1crypto==0.24.0
+celery==4.1.0
 certifi==2018.1.18
 cffi==1.11.4
 chardet==3.0.4
 click==5.1
 cryptography==2.1.4
 Flask==0.12.2
-gitconsensus==0.4.0
--e [email protected]:tedivm/GitConsensusService.git@962d31e6154fa58964dd264038abb747e0aa1bd9#egg=gitconsensusservice
+gitconsensus=0.5.0
 github3.py==0.9.6
+github3apps.py==0.1.0
 idna==2.6
 itsdangerous==0.24
 Jinja2==2.10

requirements.txt

@@ -44,10 +44,13 @@
   ],
 
   install_requires=[
-    'cryptography>=2.1.4,<3',
+    'celery>=4.1,<5',
     'click>=5.0,<6.0',
+    'cryptography>=2.1.4,<3',
     'Flask>=0.12.2',
+    'gitconsensus>=0.5.0,<0.6'
     'github3.py>=0.9.6,<0.10',
+    'github3apps.py>=0.1.0',
     'pyjwt>=1.5.3,<2',
     'PyYAML>=3.12,<3.13',
     'requests>=2.18.0,<2.19',