From fb88b1d8e9dc47a99b8146de573a2cb775145957 Mon Sep 17 00:00:00 2001 From: Jenkins bot Date: Wed, 14 Sep 2016 20:51:25 +0000 Subject: [PATCH 1/3] Add support for regex style trigger --- setup.py | 3 +++ src/jenkinsgithublander/github.py | 8 +++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index fd0f6a0..506214f 100644 --- a/setup.py +++ b/setup.py @@ -52,8 +52,11 @@ 'console_scripts': [ ('lander-check-pulls=' 'jenkinsgithublander.scripts.check_pulls:main'), + ('lander-check-pull-mergable=' + 'jenkinsgithublander.scripts.check_pull_mergable:main'), ('lander-merge-result=' 'jenkinsgithublander.scripts.merge_result:main'), ], }, ) + diff --git a/src/jenkinsgithublander/github.py b/src/jenkinsgithublander/github.py index 44a3e0e..baaff8c 100644 --- a/src/jenkinsgithublander/github.py +++ b/src/jenkinsgithublander/github.py @@ -1,6 +1,7 @@ """Helpers for interacting with Github api requests.""" from collections import namedtuple import json +import re import requests from textwrap import dedent @@ -60,7 +61,7 @@ def _is_mergeable(comments, owner, trigger, request_info): user = comment['user']['login'] # Determine if a valid user has requested a merge. - if trigger in comment['body']: + if trigger.search(comment['body']): if user_is_in_org(user, org, request_info): request_merge = True @@ -151,6 +152,7 @@ def mergeable_pull_requests(trigger_word, request_info): log = logger.getLogger() prs = get_open_pull_requests(request_info) mergable_prs = [] + trigger_re = re.compile(trigger_word) if prs: for pr in prs: @@ -166,8 +168,7 @@ def mergeable_pull_requests(trigger_word, request_info): if comments: owner = pr_info.base_user - if _is_mergeable( - comments, owner, trigger_word, request_info): + if _is_mergeable(comments, owner, trigger_re, request_info): mergable_prs.append(pr_info) else: log.debug(" No comments") @@ -255,3 +256,4 @@ def user_is_in_org(user, org, request_info): log.debug(" Ensure {}'s membership in {} is public".format( user, org)) return False + From b36b9292b83375c5b9ddb3ddf1e8dc9acfe5a700 Mon Sep 17 00:00:00 2001 From: nskaggs Date: Wed, 14 Sep 2016 17:21:06 -0400 Subject: [PATCH 2/3] Update github.py Remove extra lines --- src/jenkinsgithublander/github.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/jenkinsgithublander/github.py b/src/jenkinsgithublander/github.py index baaff8c..7958848 100644 --- a/src/jenkinsgithublander/github.py +++ b/src/jenkinsgithublander/github.py @@ -256,4 +256,3 @@ def user_is_in_org(user, org, request_info): log.debug(" Ensure {}'s membership in {} is public".format( user, org)) return False - From c98a72ed69c462b702d6b3362e58956c6b75f742 Mon Sep 17 00:00:00 2001 From: nskaggs Date: Wed, 14 Sep 2016 17:21:22 -0400 Subject: [PATCH 3/3] Update setup.py Remove extra lines --- setup.py | 1 - 1 file changed, 1 deletion(-) diff --git a/setup.py b/setup.py index 506214f..70af331 100644 --- a/setup.py +++ b/setup.py @@ -59,4 +59,3 @@ ], }, ) -