Add merging rules

README.MD

@@ -78,6 +78,9 @@ Rules are the checks that will be made on the repository each time the applicati
 | `file-tracked-in-branch` | Checks if a file exists in the given branch | `path`, `branch` | - |
 | `file-contains-in-branch` | Checks if a file exists with given contents in the given branch | `path`, `branch`, `contents` | `ignore-case` |
 | `branch-exists` | Checks if a given branch exists | `branch` | - |
+| `commit-with-message-was-made-on-branch` | Check if a certain commit was made on the given branch| `branch`, `content` | `ignore-case` |
+| `commit-with-message-was-merged-into-branch` | Check if a certain commit merged into a branch| `branch`, `content` | `ignore-case` |
+
 
 #### Common Rule Options
 

src/main/java/gitruler/GitFunctions.java

@@ -379,8 +379,7 @@ boolean isChildOfCommitOnBranch(String branch, String commitMessageContents, boo
         RevCommit commitWithMessage = getCommitWithMessageContaining(commitMessageContents, ignoreMessageCase);
         Git git = new Git(repo);
 
-
-        if (commitMessageContents == null){
+        if (commitWithMessage == null){
             return false;
         }
 
@@ -401,4 +400,31 @@ boolean isChildOfCommitOnBranch(String branch, String commitMessageContents, boo
 
         return false;
     }
+
+    /**
+     * Check whether the commits underneath a branch reference include a commit with a given message
+     * @param branch the branch name
+     * @param commitMessage The text within the message
+     * @param ignoreCase Whether to ignore the case when checking the commit message
+     * @return True of the commit with that message was under the branch ref
+     * @throws BranchNotFoundException Git exception
+     * @throws IOException Git exception
+     */
+    boolean wasCommitWithMessageMadeOnBranch(String branch, String commitMessage, boolean ignoreCase) throws BranchNotFoundException, IOException {
+
+        RevCommit commitWithMessage = getCommitWithMessageContaining(commitMessage, ignoreCase);
+
+        // Get a walker for the branch
+        RevWalk revWalk = new RevWalk(repo);
+        revWalk.markStart( revWalk.parseCommit(getBranchCommit(branch).getId()));
+
+        // Look at each commit in the branch
+        for( RevCommit commit : revWalk ) {
+            if (commit.getId().equals(commitWithMessage.getId())){
+                return true;
+            }
+        }
+        return false;
+    }
+
 }

src/main/java/gitruler/GitInteractor.java

@@ -77,9 +77,10 @@ RuleResult checkRule(Rule r) {
                 return checkFileContainsInBranch(r);
             case "branch-exists":
                 return checkBranchExists(r);
-            case "branch-received-commit-with-message":
+            case "commit-with-message-was-merged-into-branch":
                 return checkBranchReceivedCommitWithMessage(r);
-
+            case "commit-with-message-was-made-on-branch":
+                return getCommitWithMessageWasMadeOnBranch(r);
             default:
                 RuleResult result = new RuleResult();
                 result.setPassed(false);
@@ -88,6 +89,26 @@ RuleResult checkRule(Rule r) {
         }
     }
 
+    /**
+     * Check whether a commit was made on a specific branch
+     * @param r The rule details
+     * @return The RuleResult
+     */
+    private RuleResult getCommitWithMessageWasMadeOnBranch(Rule r) {
+
+        RuleResult result = new RuleResult();
+        try {
+            result.setPassed(gitFunctions.wasCommitWithMessageMadeOnBranch(r.getBranch(), r.getContents(), r.getIgnoreCase()));
+        } catch (IOException e) {
+            return createResultFromException(e);
+        } catch (BranchNotFoundException e) {
+            result.setPassed(false);
+            result.setMessage("The branch with that name doesn't exist");
+        }
+
+        return result;
+    }
+
     /**
      * Is there a commit on the given branch that has a parent commit that contains a given message?
      * This lets us check whether a merge occurred that merged a commit into another branch.

src/main/java/gitruler/Rule.java

@@ -13,7 +13,6 @@ public class Rule {
      * Add the checkrule in the GitInterator
      * Add the documentation
      */
-
     Map<String, Object> details;
 
     Rule(Map<String, Object> details){
@@ -57,8 +56,10 @@ String getTitle() {
                 return "A branch called '" + this.getBranch() + "' exists";
             case "file-contains-in-branch":
                 return "The file " + getPath() + " contains the text '" + getContents() + "' in the branch '" + getBranch() + "'";
-            case "branch-received-commit-with-message":
+            case "commit-with-message-was-merged-into-branch":
                 return "The branch '" + getBranch() + "' received a commit with the message containing '" + getContents() + "'";
+            case "commit-with-message-was-made-on-branch":
+                return "The commit whose message contained '" + getContents() + "' was made on the branch '" + getBranch() + "'";
             default:
                 return "Unknown rule";
         }