From d35748d6c04f3acab12bad9ec181c7ea55fb0adb Mon Sep 17 00:00:00 2001
From: "S.nishio" <nishio@densan-labs.net>
Date: Wed, 16 Apr 2014 01:06:19 +0900
Subject: resource: fix indent

---
 .../bitbucketpullrequestbuilder/BitbucketBuildTrigger/config.jelly      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger/config.jelly b/src/main/resources/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger/config.jelly
index 964cc85..5373391 100644
--- a/src/main/resources/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger/config.jelly
+++ b/src/main/resources/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger/config.jelly
@@ -11,7 +11,7 @@
   <f:entry title="RepositoryOwner" field="repositoryOwner">
     <f:textbox />
   </f:entry>
-    <f:entry title="RespositoryName" field="repositoryName">
+  <f:entry title="RespositoryName" field="repositoryName">
     <f:textbox />
   </f:entry>
 </j:jelly>
\ No newline at end of file
-- 
cgit v1.2.3


From a9b036d131d390402de1897a5ac5cfa8868410d5 Mon Sep 17 00:00:00 2001
From: "S.nishio" <nishio@densan-labs.net>
Date: Wed, 16 Apr 2014 01:15:01 +0900
Subject: pom: fix version & add description & remove invalid group id

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5131ef8..8b7a82e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,9 +6,9 @@
     <version>1.509.4</version><!-- which version of Jenkins is this plugin built against? -->
   </parent>
 
-  <groupId>bitbucket-pullrequest-builder</groupId>
   <artifactId>bitbucket-pullrequest-builder</artifactId>
-  <version>1.0-SNAPSHOT</version>
+  <version>1.1-SNAPSHOT</version>
+  <description>This Jenkins plugin builds pull requests from Bitbucket.org and will report the test results.</description>
   <packaging>hpi</packaging>
 
   <!-- get every artifact through repo.jenkins-ci.org, which proxies all the artifacts that we need -->
-- 
cgit v1.2.3


From d30d2ef02bbe7e5a451465c7b1bfcd7a469ec8f9 Mon Sep 17 00:00:00 2001
From: "S.nishio" <nishio@densan-labs.net>
Date: Wed, 16 Apr 2014 01:34:32 +0900
Subject: view: add ci skip phrases textbox

---
 .../bitbucketpullrequestbuilder/BitbucketBuildTrigger/config.jelly     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/resources/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger/config.jelly b/src/main/resources/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger/config.jelly
index 5373391..59d2cf9 100644
--- a/src/main/resources/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger/config.jelly
+++ b/src/main/resources/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger/config.jelly
@@ -14,4 +14,7 @@
   <f:entry title="RespositoryName" field="repositoryName">
     <f:textbox />
   </f:entry>
+  <f:entry title="CI Skip Phrases" field="ciSkipPhrase">
+    <f:textbox />
+  </f:entry>
 </j:jelly>
\ No newline at end of file
-- 
cgit v1.2.3


From 871700c5b51587fa154f4a8dfefa34b0e9b5e69d Mon Sep 17 00:00:00 2001
From: "S.nishio" <nishio@densan-labs.net>
Date: Wed, 16 Apr 2014 01:35:32 +0900
Subject: set ci skip phrase trigger

---
 .../bitbucketpullrequestbuilder/BitbucketBuildTrigger.java       | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger.java b/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger.java
index 47d94dc..65777a3 100644
--- a/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger.java
+++ b/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger.java
@@ -27,6 +27,7 @@ public class BitbucketBuildTrigger extends Trigger<AbstractProject<?, ?>> {
     private final String password;
     private final String repositoryOwner;
     private final String repositoryName;
+    private final String ciSkipPhrases;
     transient private BitbucketPullRequestsBuilder bitbucketPullRequestsBuilder;
 
     @Extension
@@ -39,7 +40,8 @@ public class BitbucketBuildTrigger extends Trigger<AbstractProject<?, ?>> {
             String username,
             String password,
             String repositoryOwner,
-            String repositoryName) throws ANTLRException {
+            String repositoryName,
+            String ciSkipPhrases) throws ANTLRException {
         super(cron);
         this.projectPath = projectPath;
         this.cron = cron;
@@ -47,6 +49,7 @@ public class BitbucketBuildTrigger extends Trigger<AbstractProject<?, ?>> {
         this.password = password;
         this.repositoryOwner = repositoryOwner;
         this.repositoryName = repositoryName;
+        this.ciSkipPhrases = ciSkipPhrases;
     }
 
     public String getProjectPath() {
@@ -73,6 +76,10 @@ public class BitbucketBuildTrigger extends Trigger<AbstractProject<?, ?>> {
         return repositoryName;
     }
 
+    public String getCiSkipPhrases() {
+        return ciSkipPhrases;
+    }
+
     @Override
     public void start(AbstractProject<?, ?> project, boolean newInstance) {
         try {
-- 
cgit v1.2.3


From 29b265fae640e9aa3de273feadacc764cc7f39fb Mon Sep 17 00:00:00 2001
From: "S.nishio" <nishio@densan-labs.net>
Date: Wed, 16 Apr 2014 01:50:47 +0900
Subject: fix typo

---
 .../bitbucketpullrequestbuilder/BitbucketBuildTrigger/config.jelly      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger/config.jelly b/src/main/resources/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger/config.jelly
index 59d2cf9..5117011 100644
--- a/src/main/resources/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger/config.jelly
+++ b/src/main/resources/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger/config.jelly
@@ -14,7 +14,7 @@
   <f:entry title="RespositoryName" field="repositoryName">
     <f:textbox />
   </f:entry>
-  <f:entry title="CI Skip Phrases" field="ciSkipPhrase">
+  <f:entry title="CI Skip Phrases" field="ciSkipPhrases">
     <f:textbox />
   </f:entry>
 </j:jelly>
\ No newline at end of file
-- 
cgit v1.2.3


From 66c0756daf276f214061667ce2b47d036eb3fa8a Mon Sep 17 00:00:00 2001
From: "S.nishio" <nishio@densan-labs.net>
Date: Wed, 16 Apr 2014 01:51:07 +0900
Subject: repository: add ci skip function

---
 .../bitbucketpullrequestbuilder/BitbucketRepository.java | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketRepository.java b/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketRepository.java
index ec13f38..4889dcf 100644
--- a/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketRepository.java
+++ b/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketRepository.java
@@ -89,6 +89,9 @@ public class BitbucketRepository {
     private boolean isBuildTarget(BitbucketPullRequestResponseValue pullRequest) {
         boolean shouldBuild = true;
         if (pullRequest.getState() != null && pullRequest.getState().equals("OPEN")) {
+            if (isSkipBuild(pullRequest.getTitle())) {
+                return false;
+            }
             BitbucketPullRequestResponseValueRepository destination = pullRequest.getDestination();
             String owner = destination.getRepository().getOwnerName();
             String repositoryName = destination.getRepository().getRepositoryName();
@@ -116,4 +119,17 @@ public class BitbucketRepository {
         }
         return shouldBuild;
     }
+
+    private boolean isSkipBuild(String pullRequestTitle) {
+        String skipPhrases = this.trigger.getCiSkipPhrases();
+        if (skipPhrases != null) {
+            String[] phrases = skipPhrases.split(",");
+            for(String phrase : phrases) {
+                if (pullRequestTitle.toLowerCase().contains(phrase.trim().toLowerCase())) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
 }
-- 
cgit v1.2.3