Merge branch 'dev'

Author: viktoradavid

MANIFEST.in

@@ -0,0 +1,4 @@
+include LICENSE
+include README.rst
+include rules.cfg.sample
+include token.cfg.sample

README.rst

@@ -7,6 +7,12 @@ Sample webhook is running at https://labelbot-api.herokuapp.com/ and
 it's functionality can be tested in
 https://github.com/Fanarim/github\_labelbot\_testrepo repository.
 
+Package can be installed from testpypi using:
+
+::
+
+    $ python -m pip install --extra-index-url https://testpypi.python.org/pypi github-labelbot
+
 Configuration
 -------------
 

labelbot/__init__.py

@@ -0,0 +1,3 @@
+from .run import main
+
+main()

labelbot/__main__.py

@@ -2,15 +2,20 @@
 
 from posixpath import join as urljoin
 
+import appdirs
 import click
 import json
+import os
 import re
 import requests
 import sched
+import shutil
 import sys
 import time
 import validators
 
+module_path = os.path.dirname(__file__)
+
 
 class LabelBot(object):
     """Class taking care of whole GitHub labeling bot's functionality. """
@@ -24,24 +29,56 @@ class LabelBot(object):
 
     def __init__(self, token_file, github_token, rules_file, default_label,
                  check_comments, skip_labeled):
+        config_dir = appdirs.user_config_dir('labelbot')
+        # create config dir
+        if not os.path.exists(config_dir):
+            os.mkdir(config_dir)
+
+        # create/copy config files
+        source_file = os.path.join(module_path, 'token.cfg.sample')
+        sample_token_file = os.path.join(config_dir,
+                                         'token.cfg.sample')
+        if not os.path.exists(sample_token_file):
+            shutil.copyfile(source_file, sample_token_file)
+
+        source_file = os.path.join(module_path, 'rules.cfg.sample')
+        sample_rules_file = os.path.join(config_dir,
+                                         'rules.cfg.sample')
+        if not os.path.exists(sample_rules_file):
+            shutil.copyfile(source_file, sample_rules_file)
+
+        # set default config files path if not set, get github token
+        if token_file:
+            self.token_file = token_file
+        elif github_token:
+            self.token = github_token
+        else:
+            print("Warning: You didn't set a GitHub token using -t or -u . "
+                  "Using default config file at " + sample_token_file + ". ",
+                  file=sys.stderr)
+            self.token_file = sample_token_file
+            self.token = self._get_token(self.token_file)
+
+        if rules_file:
+            self.rules_file = rules_file
+        else:
+            print("Warning: You didn't set a rules config file. Using default "
+                  "file at " + sample_rules_file + ". ",
+                  file=sys.stderr)
+            self.rules_file = sample_rules_file
+
         self.last_issue_checked = 0
         self.iterval = 0
         self.scheduler = sched.scheduler(time.time, time.sleep)
         self.default_label = default_label
         self.check_comments = check_comments
         self.skip_labeled = skip_labeled
 
-        # get GitHub token
-        if github_token:
-            self.token = github_token
-        else:
-            self.token = self._get_token(token_file)
-
         # get request session and validate token
         self.session = self._get_requests_session(self.token)
 
         # load and validate rules
-        self.rules = self._get_rules(rules_file)
+        self.rules = self._get_rules(self.rules_file)
 
         self._update_accessible_repos()
 
@@ -95,7 +132,7 @@ def run_scheduled(self):
         self.scheduler.run()
 
     def _label_repo(self, repo, reschedule=True):
-        """Iterates through all issues in given repo and runs _label_issue() on
+        """Iterates through all issues in given repo and runs label_issue() on
         each of them.
 
         Args:
@@ -120,7 +157,7 @@ def _label_repo(self, repo, reschedule=True):
 
         # iterate through all isues
         for issue in issues:
-            self._label_issue(repo, issue)
+            self.label_issue(repo, issue)
 
         # run this again after given interval
         if reschedule:
@@ -235,7 +272,8 @@ def _get_requests_session(self, token):
                   file=sys.stderr)
 
             if response.status_code == 401:
-                print('Did you provide a valid token? ',
+                print('Did you provide a valid token? You can specifiy it',
+                      'using --github-token option. ',
                       file=sys.stderr)
 
             sys.exit(1)

labelbot/labelbot.py

@@ -1,11 +1,27 @@
 #!/usr/bin/env python3
 
+import appdirs
 import click
-import console as labelbot_console
 import os
+import shutil
+import sys
 
-from labelbot import LabelBot, UrlParam
-from web import app
+from .console import run
+from .labelbot import LabelBot, UrlParam
+from .web import app
+
+module_path = os.path.dirname(__file__)
+
+
+class DummyLabelBot(object):
+    def __init__(self, token_file, github_token, rules_file,
+                 default_label, check_comments, skip_labeled):
+        self.token_file = token_file
+        self.rules_file = rules_file
+        self.github_token = github_token
+        self.default_label = default_label
+        self.check_comments = check_comments
+        self.skip_labeled = skip_labeled
 
 
 @click.group()
@@ -14,14 +30,12 @@
               type=click.Path(exists=True,
                               file_okay=True,
                               readable=True),
-              default='token.cfg.sample',
               help='file containing GitHub token information')
 @click.option('--rules-file',
               '-u',
               type=click.Path(exists=True,
                               file_okay=True,
                               readable=True),
-              default='rules.cfg.sample',
               help='file containing issues labeling rules')
 @click.option('--github-token',
               '-g',
@@ -41,8 +55,9 @@
 @click.pass_context
 def cli(ctx, token_file, github_token, rules_file, default_label,
         check_comments, skip_labeled):
-    ctx.obj = LabelBot(token_file, github_token, rules_file, default_label,
-                       check_comments, skip_labeled)
+    # pass click context
+    ctx.obj = DummyLabelBot(token_file, github_token, rules_file,
+                            default_label, check_comments, skip_labeled)
 
 
 @cli.command(short_help='Run console daemon periodically checking issues')
@@ -57,15 +72,29 @@ def cli(ctx, token_file, github_token, rules_file, default_label,
                 type=UrlParam())
 @click.pass_obj
 def console(labelbot, interval, repo_urls):
-    labelbot_console.run(labelbot, interval, repo_urls)
+    labelbot = LabelBot(labelbot.token_file,
+                        labelbot.github_token,
+                        labelbot.rules_file,
+                        labelbot.default_label,
+                        labelbot.check_comments,
+                        labelbot.skip_labeled,)
+    run(labelbot, interval, repo_urls)
 
 
 @cli.command(short_help='Run web API listening for issue updates')
 @click.pass_obj
 def web(labelbot):
-    port = int(os.environ.get('PORT', 80))
-    app.config['labelbot'] = labelbot
-    app.run(host='0.0.0.0', port=port, debug=True)
+    port = int(os.environ.get('PORT', 8080))
+    app.config['labelbot'] = LabelBot(labelbot.token_file,
+                                      labelbot.github_token,
+                                      labelbot.rules_file,
+                                      labelbot.default_label,
+                                      labelbot.check_comments,
+                                      labelbot.skip_labeled,)
+    app.run(host='0.0.0.0', port=port)
+
+cli(prog_name='labelbot')
+
 
-if __name__ == '__main__':
+def main():
     cli()

rules.cfg.sample labelbot/rules.cfg.samplerules.cfg.sample renamed to labelbot/rules.cfg.sample

@@ -3,7 +3,7 @@
 from flask import render_template
 from flask import request
 from hashlib import sha1
-from labelbot import LabelBot
+from .labelbot import LabelBot
 
 import hmac
 import os

labelbot/run.py

@@ -0,0 +1,52 @@
+#!/usr/bin/env python3.5
+
+from setuptools import setup, find_packages
+
+with open('README.rst') as readme:
+    long_description = ''.join(readme.readlines())
+
+setup(
+    name='github-labelbot',
+    version='0.3.0.20',
+    description='Simple bot labeling GitHub issues based on it\'s configuration. ',
+    long_description=long_description,
+    author='David Viktora',
+    author_email='viktoda2@fit.cvut.cz',
+    keywords='github, bot, issues',
+    license='MIT License',
+    url='https://github.com/fanarim/github_labelbot',
+    packages=find_packages(),
+    classifiers=[
+        'Intended Audience :: Developers',
+        'License :: OSI Approved :: MIT License',
+        'Operating System :: POSIX :: Linux',
+        'Programming Language :: Python',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.5',
+        'Topic :: Software Development :: Libraries',
+    ],
+    install_requires=['click==6.6',
+                      'decorator==4.0.10',
+                      'Flask==0.11.1',
+                      'itsdangerous==0.24',
+                      'Jinja2==2.8',
+                      'MarkupSafe==0.23',
+                      'requests==2.11.1',
+                      'six==1.10.0',
+                      'validators==0.11.0',
+                      'Werkzeug==0.11.11',
+                      'appdirs==1.4.0'],
+    entry_points={
+        'console_scripts': [
+            'labelbot = labelbot.run:main',
+        ],
+    },
+    package_data={
+        'labelbot': [
+            'static/custom.css',
+            'templates/index.html',
+            'rules.cfg.sample',
+            'token.cfg.sample',
+        ]
+    },
+)