From: Jude N Date: Mon, 12 Feb 2018 05:46:22 +0000 (-0500) Subject: Merge branch 'master' of ssh://pwan.org/var/www/git/projects/margebot X-Git-Url: https://pwan.org/git/?p=margebot.git;a=commitdiff_plain;h=c33554b8412941e605b4606fb640350db4d9aec8;hp=-c Merge branch 'master' of ssh://pwan.org/var/www/git/projects/margebot --- c33554b8412941e605b4606fb640350db4d9aec8 diff --combined plugins/marge.py index 9343bb9,227e16a..0cbe525 --- a/plugins/marge.py +++ b/plugins/marge.py @@@ -1,18 -1,18 +1,18 @@@ """ Margebot: A Errbot Plugin for Gitlab MR reminders """ +import re from datetime import datetime, timezone from time import sleep from dateutil import parser from dateutil.tz import tzutc from dateutil.relativedelta import relativedelta - from errbot import BotPlugin, botcmd, arg_botcmd, re_botcmd, webhook + from errbot import BotPlugin, arg_botcmd, botcmd, re_botcmd, webhook from errbot.templating import tenv from errcron.bot import CrontabMixin import gitlab import requests - class MargeGitlab(gitlab.Gitlab): """ Subclass gitlab.Gitlab so extra_data args can be added @@@ -104,6 -104,7 +104,7 @@@ class Marge(BotPlugin, CrontabMixin) self.chatroom_host = None self.gitlab = None self.soak_delta = None + self.webhook_url = None super().__init__(*args, **kwargs) def get_configuration_template(self): @@@ -142,6 -143,7 +143,6 @@@ Marge.CRONTAB = ['{} .crontab_hook'.format(self.config['CRONTAB'])] gitlab_auth_token = self.config['GITLAB_ADMIN_TOKEN'] verify_ssl = self.config['VERIFY_SSL'] - # self.gitlab = gitlab.Gitlab(self.git_host, gitlab_auth_token, verify_ssl=verify_ssl) self.gitlab = MargeGitlab(self.git_host, gitlab_auth_token, verify_ssl=verify_ssl) self.activate_crontab() @@@ -164,7 -166,7 +165,7 @@@ """ self.log.info("webhook: request: {}, rooms: {}".format(request, rooms)) - self.log.info("state: {}".format(request['object_attributes']['state'])) + # self.log.info("state: {}".format(request['object_attributes']['state'])) # verify it's a merge request if request['object_kind'] != 'merge_request': @@@ -328,8 -330,6 +329,6 @@@ for a_room in notify_rooms.split(','): reminder_msg[a_room].append(msg_dict) - self['OPEN_MRS'] = open_mrs - # Remind each of the rooms about open MRs for a_room, room_msg_list in reminder_msg.items(): if room_msg_list != []: @@@ -410,11 -410,16 +409,11 @@@ return {'sender': sender, 'msg_list': msg_list} - # ----------------------------------------------------------- - # webhook maintenance commands - - @arg_botcmd('rooms', type=str) - @arg_botcmd('repo', type=str) + @arg_botcmd('rooms', type=str, help="Comma-separated room list without @conference-room suffix") + @arg_botcmd('repo', type=str, help="repo to start watching for MRs in NAMESPACE/PROJECT_NAME format") def watchrepo(self, msg, repo, rooms): """ Add the margebot webhook to a repo, and prepopulate any open MRs in the repo with margebot - args: repo: gitlab repo name in the 'NAMESPACE/PROJECT_NAME' format - rooms: comma separates list of rooms to notify when the webhook triggers """ self.log.info("msg={}".format(msg)) self.log.info("repo={}".format(repo)) @@@ -435,8 -440,7 +434,8 @@@ # If no hooks, will it return False or [] ? marge_hook = None hooks = self.gitlab.getprojecthooks(target_project_id) - if not hooks: + self.log.error("hooks = {}".format(hooks)) + if hooks is False: msg = "Couldn't find {} hooks".format(repo) self.log.error("watchrepo: {}".format(msg)) return msg @@@ -491,7 -495,7 +490,7 @@@ for state in ['opened', 'reopened']: page = 1 mr_list = self.gitlab.getmergerequests(target_project_id, page=page, per_page=100, state=state) - while not mr_list and mr_list != []: + while (mr_list is not False) and (mr_list != []): for an_mr in mr_list: mr_count += 1 self.log.info('watchrepo: an_mr WATS THE ID\n{}'.format(an_mr)) @@@ -513,6 -517,12 +512,6 @@@ return "{}\n{}".format(s_watch_msg, mr_msg) # pragma pylint: disable=unused-argument - @botcmd() - def hello(self, msg, args): - """ - A simple command to check if the bot is responding - """ - return "Hi there" @botcmd() def xyzzy(self, msg, args): @@@ -523,40 -533,18 +522,40 @@@ sleep(5) yield "(just kidding)" - @re_botcmd(pattern=r"I blame [Mm]arge([Bb]ot)?") + @re_botcmd(pattern=r"I blame marge(bot)?", prefixed=False, flags=re.IGNORECASE) def dont_blame_margebot(self, msg, match): """ margebot is innocent. """ - yield "(」ﾟﾛﾟ)｣NOOOooooo say it ain't so." + yield u"(\u300D\uFF9F\uFF9B\uFF9F)\uFF63NOOOooooo say it ain't so." - @re_botcmd(pattern=r"good bot") + @re_botcmd(pattern=r"good bot", prefixed=False, flags=re.IGNORECASE) def best_bot(self, msg, match): """ margebot is the best. """ yield "Best bot" + @re_botcmd(pattern=r"magfest", prefixed=False, flags=re.IGNORECASE) + def margefest(self, msg, args): + """ + margefest4ever + """ + return "More like MargeFest, amirite ?" + + @re_botcmd(pattern=r"margebot sucks", prefixed=False, flags=re.IGNORECASE) + def bring_it_up_with_the_steering_committee(self, msg, args): + """ + Bring it up with the committee + """ + return "Bring it up with the Margebot steering committee." + + @re_botcmd(pattern=r".*", prefixed=True) + def catchall(self, msg,args): + """ + Don't have the bot complain about unknown commands if the first word in a msg is its name + """ + return + + # pragma pylint: enable=unused-argument