From f6d63731ef8e30111f286ad3d4c27c1d9f109fef Mon Sep 17 00:00:00 2001
From: Joe Robinson <joe@lc8n.com>
Date: Thu, 10 Dec 2015 18:08:58 +0000
Subject: Add commit messages to push output

---
 .../uk/co/blatech/blaears/controllers/GitRelayController.java | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'src/main/java/uk')

diff --git a/src/main/java/uk/co/blatech/blaears/controllers/GitRelayController.java b/src/main/java/uk/co/blatech/blaears/controllers/GitRelayController.java
index f5d240e..4727c59 100644
--- a/src/main/java/uk/co/blatech/blaears/controllers/GitRelayController.java
+++ b/src/main/java/uk/co/blatech/blaears/controllers/GitRelayController.java
@@ -1,11 +1,13 @@
 package uk.co.blatech.blaears.controllers;
 
+import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
+import uk.co.blatech.blaears.models.gitlab.Commit;
 import uk.co.blatech.blaears.models.gitlab.Push;
 
 import java.io.IOException;
@@ -20,8 +22,15 @@ public class GitRelayController {
     @RequestMapping(value = "/gitlab", method = RequestMethod.POST)
     String relay(@RequestBody Push pushMsg, Model model){
         try {
+            String commitMsg = "";
+            for (Commit commit: pushMsg.getCommits()) {
+                if (StringUtils.isNotEmpty(commitMsg)) {
+                    commitMsg += ", ";
+                }
+                commitMsg += "\"" + commit.getMessage() + "\"";
+            }
             //DANGER
-            Runtime.getRuntime().exec(new String[]{"/bin/bash", "-c", "echo theblueroom " + pushMsg.getUserName() + " pushed to " + pushMsg.getRepository().getName() + " | bash /home/smsd/msgrelay.bash "});
+            Runtime.getRuntime().exec(new String[]{"/bin/bash", "-c", "echo theblueroom " + pushMsg.getUserName() + " pushed to " + pushMsg.getRepository().getName() + ": "+ commitMsg + " | bash /home/smsd/msgrelay.bash "});
             model.addAttribute("result", "OK");
         } catch (IOException e) {
             System.out.println("Failed to run command");
-- 
cgit v1.2.3