Added time build took to the message

Bumped version number to 2.1.1
Tapadoo · Mar 28, 2014 · 0536eb5 · 0536eb5
1 parent c62c636
commit 0536eb5
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 3 deletions.
diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ apply plugin: 'java'
 
 
 sourceCompatibility = 1.5
-version = '2.0.0'
+version = '2.1.1'
 
 configurations {
     deploy
@@ -17,7 +17,9 @@ dependencies {
     compile files('libs/openapi.jar', 'libs/server-api.jar' , 'libs/common-api.jar' , 'libs/servlet-api.jar')
     compile 'com.google.code.gson:gson:2.+'
     compile 'org.jdom:jdom:1+'
+    compile 'joda-time:joda-time:2.3'
     deploy 'com.google.code.gson:gson:2.+'
+    deploy 'joda-time:joda-time:2.3'
 
 }
 

diff --git a/src/main/java/com/tapadoo/slacknotifier/SlackServerAdapter.java b/src/main/java/com/tapadoo/slacknotifier/SlackServerAdapter.java
@@ -9,6 +9,10 @@
 import jetbrains.buildServer.users.SUser;
 import jetbrains.buildServer.users.UserSet;
 import jetbrains.buildServer.vcs.SelectPrevBuildPolicy;
+import org.joda.time.Duration;
+import org.joda.time.Period;
+import org.joda.time.format.PeriodFormatter;
+import org.joda.time.format.PeriodFormatterBuilder;
 
 import java.io.BufferedOutputStream;
 import java.io.IOException;
@@ -124,10 +128,25 @@ else if( projectSettings != null && projectSettings.getChannel() != null && proj
 
             String message = "";
 
+            PeriodFormatter durationFormatter = new PeriodFormatterBuilder()
+                    .printZeroRarelyFirst()
+                    .appendHours()
+                    .appendSuffix(" hour", " hours")
+                    .appendSeparator(" ")
+                    .printZeroRarelyLast()
+                    .appendMinutes()
+                    .appendSuffix(" minute", "minutes")
+                    .appendSeparator(" and ")
+                    .appendSeconds()
+                    .appendSuffix(" second", " seconds")
+                    .toFormatter();
+
+            Duration buildDuration = new Duration(1000*build.getDuration());
+
             JsonObject payloadObj = new JsonObject();
             payloadObj.addProperty("channel" , channel);
             payloadObj.addProperty("username" , "TeamCity");
-            payloadObj.addProperty("text", String.format("Project '%s' built successfully." , build.getFullName()));
+            payloadObj.addProperty("text", String.format("Project '%s' built successfully in %s." , build.getFullName() , durationFormatter.print(buildDuration.toPeriod())));
             payloadObj.addProperty("icon_url",slackConfig.getLogoUrl());
 
             if( commitMsg.length() > 0 )

diff --git a/teamcity-plugin.xml b/teamcity-plugin.xml
@@ -4,7 +4,7 @@
     <info>
         <name>slackNotifier</name> <!-- the name of plugin used in teamcity -->
         <display-name>Slack Notifier</display-name>
-        <version>2.0.0</version>
+        <version>2.1.1</version>
         <description>Post build success notifications to Slack</description>
         <vendor>
             <name>Tapadoo</name>