[SHIPKIT-513] Generate Prefix in GitPlugin

mockito · Mar 29, 2018 · 0abad20 · 0abad20
1 parent bbbd06b
commit 0abad20
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 19 deletions.
diff --git a/subprojects/shipkit/src/main/groovy/org/shipkit/internal/gradle/git/GitPlugin.java b/subprojects/shipkit/src/main/groovy/org/shipkit/internal/gradle/git/GitPlugin.java
@@ -16,7 +16,9 @@
 import java.io.File;
 import java.util.List;
 
+import static java.lang.System.getenv;
 import static org.shipkit.internal.gradle.exec.ExecCommandFactory.execCommand;
+import static org.shipkit.internal.gradle.travis.TravisUtils.generateCommitMessagePostfix;
 import static org.shipkit.internal.gradle.util.GitUtil.getTag;
 
 /**
@@ -56,12 +58,14 @@ public class GitPlugin implements Plugin<Project> {
     public void apply(final Project project) {
         final ShipkitConfiguration conf = project.getPlugins().apply(ShipkitConfigurationPlugin.class).getConfiguration();
 
+        String commitMessage = generateCommitMessagePostfix(conf, getenv("TRAVIS_BUILD_NUMBER"));
+
         TaskMaker.task(project, GIT_COMMIT_TASK, GitCommitTask.class, new Action<GitCommitTask>() {
             public void execute(final GitCommitTask t) {
                 t.setDescription("Commits all changed files using generic --author and aggregated commit message");
                 t.setGitUserName(conf.getGit().getUser());
                 t.setGitUserEmail(conf.getGit().getEmail());
-                t.setCommitMessagePostfix(conf.getGit().getCommitMessagePostfix());
+                t.setCommitMessagePostfix(commitMessage);
             }
         });
 

diff --git a/subprojects/shipkit/src/main/groovy/org/shipkit/internal/gradle/travis/TravisUtils.java b/subprojects/shipkit/src/main/groovy/org/shipkit/internal/gradle/travis/TravisUtils.java
@@ -6,27 +6,13 @@ public class TravisUtils {
 
     private static final String URL_PATTERN = "https://travis-ci.org/%s/builds/%s";
 
-    public static String generateCommitMessage(ShipkitConfiguration conf, String travisCommitMessage, String travisBuildNumber) {
-        if (travisCommitMessage == null) {
-            return null;
+    public static String generateCommitMessagePostfix(ShipkitConfiguration conf, String travisBuildNumber) {
+        if (travisBuildNumber == null) {
+            return conf.getGit().getCommitMessagePostfix();
         }
         String travisJobUrl = generateTravisBuildUrl(conf, travisBuildNumber);
 
-        if (travisCommitMessage.contains("[ci skip]")) {
-            return travisCommitMessage.replace(" [ci skip]", ". CI job: " + travisJobUrl + " [ci skip]");
-        } else {
-            return travisCommitMessage + ". CI job: " + travisJobUrl;
-        }
-    }
-
-    public static String generateCommitMessagePostfix(ShipkitConfiguration conf, String travisCommitMessage, String travisBuildNumber) {
-        if (travisCommitMessage == null) {
-            return null;
-        }
-        String travisJobUrl = generateTravisBuildUrl(conf, travisBuildNumber);
-
-        return "CI job: " + travisJobUrl + " [ci skip]";
-
+        return String.format("CI job: %s %s", travisJobUrl, conf.getGit().getCommitMessagePostfix());
     }
 
     private static String generateTravisBuildUrl(ShipkitConfiguration conf, String travisBuildNumber) {