execute pre-push hook

Author: lazer-dev

plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenRunner.java

@@ -56,6 +56,11 @@ public MavenRunner withArguments(String... args) {
 		return this;
 	}
 
+	public MavenRunner withEnvironment(String key, String value) {
+		environment.put(key, value);
+		return this;
+	}
+
 	public MavenRunner withRunner(ProcessRunner runner) {
 		this.runner = runner;
 		return this;

plugin-maven/src/test/java/com/diffplug/spotless/maven/SpotlessInstallPrePushHookMojoTest.java

@@ -19,24 +19,26 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.util.List;
 import java.util.Locale;
+import java.util.Map;
+import java.util.Optional;
 
 import org.junit.jupiter.api.Test;
 
+import com.diffplug.spotless.ProcessRunner;
+
 class SpotlessInstallPrePushHookMojoTest extends MavenIntegrationHarness {
 
 	@Test
 	public void should_create_pre_hook_file_when_hook_file_does_not_exists() throws Exception {
 		// given
 		setFile(".git/config").toContent("");
-		setFile("license.txt").toResource("license/TestLicense");
+		setFile("license.txt").toResource("git_pre_hook/TestLicense.txt");
 		writePomWithJavaLicenseHeaderStep();
 
 		// when
-		final var output = mavenRunner()
-				.withArguments("spotless:install-git-pre-push-hook")
-				.runNoError()
-				.stdOutUtf8();
+		final var output = runMaven("spotless:install-git-pre-push-hook");
 
 		// then
 		assertThat(output).contains("Installing git pre-push hook");
@@ -51,16 +53,13 @@ public void should_create_pre_hook_file_when_hook_file_does_not_exists() throws
 	public void should_append_to_existing_pre_hook_file_when_hook_file_exists() throws Exception {
 		// given
 		setFile(".git/config").toContent("");
-		setFile("license.txt").toResource("license/TestLicense");
+		setFile("license.txt").toResource("git_pre_hook/TestLicense.txt");
 		setFile(".git/hooks/pre-push").toResource("git_pre_hook/pre-push.existing");
 
 		writePomWithJavaLicenseHeaderStep();
 
 		// when
-		final var output = mavenRunner()
-				.withArguments("spotless:install-git-pre-push-hook")
-				.runNoError()
-				.stdOutUtf8();
+		final var output = runMaven("spotless:install-git-pre-push-hook");
 
 		// then
 		assertThat(output).contains("Installing git pre-push hook");
@@ -70,6 +69,30 @@ public void should_append_to_existing_pre_hook_file_when_hook_file_exists() thro
 		assertFile(".git/hooks/pre-push").hasContent(hookContent);
 	}
 
+	@Test
+	public void should_execute_pre_push_script() throws Exception {
+		// given
+		setFile("license.txt").toResource("git_pre_hook/TestLicense.txt");
+		setFile(".git/config").toContent("");
+		setFile("src/main/java/com.github.youribonnaffe.gradle.format/Java8Test.java").toResource("git_pre_hook/MissingLicense.test");
+		writePomWithJavaLicenseHeaderStep();
+
+		// when
+		// install pre-hook
+		final var output = runMaven("spotless:install-git-pre-push-hook");
+
+		final var result = executeHookScript(".git/hooks/pre-push");
+
+		// then
+		assertThat(output).contains("Git pre-push hook installed successfully to the file " + newFile(".git/hooks/pre-push"));
+
+		assertThat(result.stdErrUtf8()).startsWith("spotless found problems, running spotless:apply; commit the result and re-push");
+		assertThat(result.exitCode()).isEqualTo(1);
+
+		final var fileContent = read("src/main/java/com.github.youribonnaffe.gradle.format/Java8Test.java");
+		assertThat(fileContent).startsWith("this is a test license!\n");
+	}
+
 	private void writePomWithJavaLicenseHeaderStep() throws IOException {
 		writePomWithJavaSteps(
 				"<licenseHeader>",
@@ -86,8 +109,12 @@ private String getHookContent(String resourceFile) {
 				.replace("${applyCommand}", "spotless:apply");
 	}
 
+	private boolean isWindows() {
+		return System.getProperty("os.name").toLowerCase(Locale.ROOT).startsWith("win");
+	}
+
 	private File executorWrapperFile() {
-		if (System.getProperty("os.name").toLowerCase(Locale.ROOT).startsWith("win")) {
+		if (isWindows()) {
 			final var bat = newFile("mvnw.bat");
 			if (bat.exists()) {
 				return bat;
@@ -98,4 +125,57 @@ private File executorWrapperFile() {
 
 		return newFile("mvnw");
 	}
+
+	private String runMaven(String command) throws Exception {
+		return mavenRunner()
+				.withArguments(command)
+				.withEnvironment("JAVA_HOME", System.getProperty("java.home"))
+				.runNoError()
+				.stdOutUtf8();
+	}
+
+	private ProcessRunner.Result executeHookScript(String hookFile) throws Exception {
+		try (final var runner = new ProcessRunner()) {
+			String executor = "sh";
+			if (isWindows()) {
+				final var bashPath = findGitBashExecutable();
+				if (bashPath.isEmpty()) {
+					throw new RuntimeException("Could not find git bash executable");
+				}
+
+				executor = bashPath.get();
+			}
+
+			return runner.exec(rootFolder(), Map.of("JAVA_HOME", System.getProperty("java.home")), null, List.of(executor, hookFile));
+		}
+	}
+
+	private Optional<String> findGitBashExecutable() {
+		// 1. Check environment variable
+		final var envPath = System.getenv("GIT_BASH");
+		if (envPath != null && new File(envPath).exists()) {
+			return Optional.of(envPath);
+		}
+
+		// 2. Check common install paths
+		final var commonPaths = List.of(
+				"C:\\Program Files\\Git\\bin\\bash.exe",
+				"C:\\Program Files (x86)\\Git\\bin\\bash.exe",
+				"C:\\Program Files\\Git\\usr\\bin\\bash.exe");
+
+		for (var path : commonPaths) {
+			if (new File(path).exists()) {
+				return Optional.of(path);
+			}
+		}
+
+		// 3. Try bash from PATH
+		try {
+			Process process = new ProcessBuilder("bash", "--version").start();
+			process.waitFor();
+			return Optional.of("bash"); // just use "bash"
+		} catch (Exception e) {
+			return Optional.empty();
+		}
+	}
 }

testlib/src/main/resources/git_pre_hook/MissingLicense.test

@@ -0,0 +1,28 @@
+package com.github.youribonnaffe.gradle.format;
+
+import java.util.function.Function;
+
+
+public class Java8Test {
+    public void doStuff() throws Exception {
+        Function<String, Integer> example = Integer::parseInt;
+        example.andThen(val -> {
+            return val + 2;
+        } );
+        SimpleEnum val = SimpleEnum.A;
+        switch (val) {
+            case A:
+                break;
+            case B:
+                break;
+            case C:
+                break;
+            default:
+                throw new Exception();
+        }
+    }
+
+    public enum SimpleEnum {
+        A, B, C;
+    }
+}

testlib/src/main/resources/git_pre_hook/TestLicense.txt

@@ -0,0 +1 @@
+this is a test license!