feat: add --no-integrations option

jbangdev · Dec 2, 2024 · b3abe6e · b3abe6e
1 parent ae55c05
commit b3abe6e
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 2 deletions.
diff --git a/src/main/java/dev/jbang/cli/BuildMixin.java b/src/main/java/dev/jbang/cli/BuildMixin.java
@@ -4,7 +4,10 @@
 import java.util.List;
 import java.util.Map;
 
+import dev.jbang.util.Util;
+
 import picocli.CommandLine;
+import picocli.CommandLine.Option;
 
 public class BuildMixin {
 	public String javaVersion;
@@ -33,6 +36,12 @@ void setJavaVersion(String javaVersion) {
 	@CommandLine.Option(names = { "--manifest" }, parameterConsumer = KeyValueConsumer.class)
 	public Map<String, String> manifestOptions;
 
+	@Option(names = {
+			"--integrations" }, description = "Enable integration execution (default: true)", negatable = true)
+	void setIntegrations(boolean enabled) {
+		Util.setIntegrationsEnabled(enabled);
+	}
+
 	public List<String> opts() {
 		List<String> opts = new ArrayList<>();
 		if (javaVersion != null) {

diff --git a/src/main/java/dev/jbang/source/AppBuilder.java b/src/main/java/dev/jbang/source/AppBuilder.java
@@ -95,7 +95,11 @@ public CmdGeneratorBuilder build() throws IOException {
 			// do the actual building
 			try {
 				getCompileBuildStep().build();
-				integrationResult = getIntegrationBuildStep().build();
+
+				if (!Util.isIntegrationsEnabled()) {
+					integrationResult = getIntegrationBuildStep().build();
+				}
+
 				getJarBuildStep().build();
 			} finally {
 				if (!keepClasses()) {

diff --git a/src/main/java/dev/jbang/util/Util.java b/src/main/java/dev/jbang/util/Util.java
@@ -77,7 +77,7 @@ public class Util {
 			Pattern.MULTILINE);
 
 	public static final Pattern mainClassMethod = Pattern.compile(
-			"(?<=\\n|\\A)(?:public\\s)\\s*(class)\\s*([^\\n\\s]*)");
+			"(?<=\n|\\A)(?:public\\s)\\s*(class)\\s*([^\\n\\s]*)");
 
 	public static final Pattern patternFQCN = Pattern.compile(
 			"^([a-z][a-z0-9]*\\.)*[a-zA-Z][a-zA-Z0-9_]*$");
@@ -99,6 +99,8 @@ public class Util {
 	private static Boolean downloadSources;
 	private static Instant startTime = Instant.now();
 
+	private static boolean integrationsEnabled = true;
+
 	public static void setVerbose(boolean verbose) {
 		Util.verbose = verbose;
 		if (verbose) {
@@ -1954,4 +1956,12 @@ public static String substituteRemote(String arg) {
 	public static <K, V> Entry<K, V> entry(K k, V v) {
 		return new AbstractMap.SimpleEntry<K, V>(k, v);
 	}
+
+	public static void setIntegrationsEnabled(boolean enabled) {
+		Util.integrationsEnabled = enabled;
+	}
+
+	public static boolean isIntegrationsEnabled() {
+		return integrationsEnabled;
+	}
 }