feat: Added support for script dependencies

itests/dependencies.feature

@@ -3,6 +3,6 @@ Feature: dependency fetching
 Scenario: fetch dependencies
 * command('jbang --verbose version')
 When command('jbang classpath_log.java', { JBANG_REPO: scratch + "/newrepo"})
-Then match err == '[jbang] Resolving dependencies...\n[jbang]    log4j:log4j:1.2.17\n[jbang] Dependencies resolved\n[jbang] Building jar...\n'
+Then match err == '[jbang] Resolving dependencies...\n[jbang]    log4j:log4j:1.2.17\n[jbang] Dependencies resolved\n[jbang] Building jar for classpath_log.java...\n'
 And fileexist(scratch + "/newrepo")
 And match exit == 0

itests/init.feature

@@ -8,7 +8,7 @@ When command('jbang init ' + scratch + '/test.java')
 * def contents = read(scratch + '/test.java')
 * match contents contains "class test"
 * command('jbang ' + scratch + '/test.java')
-* match err == "[jbang] Building jar...\n"
+* match err == "[jbang] Building jar for test.java...\n"
 * command('jbang ' + scratch + '/test.java')
 * match err !contains "[jbang] Building jar"
 
@@ -20,7 +20,7 @@ When command('jbang init ' + scratch + '/newfolder/test.java')
   * def contents = read(scratch + '/newfolder/test.java')
   * match contents contains "class test"
   * command('jbang ' + scratch + '/newfolder/test.java')
-  * match err == "[jbang] Building jar...\n"
+  * match err == "[jbang] Building jar for test.java...\n"
   * command('jbang ' + scratch + '/newfolder/test.java')
   * match err !contains "[jbang] Building jar"
 

itests/onedep.java

@@ -0,0 +1,8 @@
+///usr/bin/env jbang "$0" "$@" ; exit $?
+//DEPS Two.java
+
+public class onedep {
+    public static void main(String... args) {
+        Two.main();
+    }
+}

itests/run-nix.feature

@@ -5,10 +5,10 @@ Background:
 
 Scenario: as code option 2
   * command('jbang --code "$(cat helloworld.java)" jbangtest')
-  * match err == "[jbang] Building jar...\n"
+  * match err == "[jbang] Building jar for helloworld.java...\n"
   * match out == "Hello jbangtest\n"
 
 Scenario: as code option 3
   * command('jbang "--code=$(cat helloworld.java)" jbangtest')
-  * match err == "[jbang] Building jar...\n"
+  * match err == "[jbang] Building jar for helloworld.java...\n"
   * match out == "Hello jbangtest\n"

itests/run.feature

@@ -7,12 +7,12 @@ Scenario: should fail on missing file
 
 Scenario: parameter passing
 * command('jbang helloworld.java jbangtest')
-* match err == "[jbang] Building jar...\n"
+* match err == "[jbang] Building jar for helloworld.java...\n"
 * match out == "Hello jbangtest\n"
 
 Scenario: std in
 * command('cat helloworld.java | jbang - jbangtest')
-* match err == "[jbang] Building jar...\n"
+* match err == "[jbang] Building jar for helloworld.java...\n"
 * match out == "Hello jbangtest\n"
 
 Scenario: java launch helloworld with jfr

itests/selfdep.java

@@ -0,0 +1,8 @@
+//DEPS selfdep.java
+
+class selfdep {
+    public static void main(String... args) {
+        System.out.println("Hello, world!");
+    }
+}
+

src/main/java/dev/jbang/cli/Build.java

@@ -18,7 +18,7 @@ public Integer doCall() throws IOException {
 
 		ProjectBuilder pb = createProjectBuilderForBuild();
 		Project prj = pb.build(scriptMixin.scriptOrFile);
-		prj.codeBuilder(BuildContext.forProject(prj, buildDir)).build();
+		Project.codeBuilder(BuildContext.forProject(prj, buildDir)).build();
 
 		return EXIT_OK;
 	}

src/main/java/dev/jbang/cli/Edit.java

@@ -168,9 +168,7 @@ public Integer doCall() throws IOException {
 				throw new ExitException(EXIT_INVALID_INPUT, "You can only edit source files");
 			}
 
-			Path project = createProjectForLinkedEdit(prj, Collections
-																		.emptyList(),
-					false);
+			Path project = createProjectForLinkedEdit(prj, Collections.emptyList(), false);
 			String projectPathString = pathToString(project.toAbsolutePath());
 			// err.println(project.getAbsolutePath());
 
@@ -394,7 +392,7 @@ Path createProjectForLinkedEdit(Project prj, List<String> arguments, boolean rel
 		Path originalFile = prj.getResourceRef().getFile();
 
 		List<String> dependencies = prj.getMainSourceSet().getDependencies();
-		String cp = prj.resolveClassPath().getClassPath();
+		String cp = BuildContext.forProject(prj).resolveClassPath().getClassPath();
 		List<String> resolvedDependencies = Arrays.asList(cp.split(CP_SEPARATOR));
 
 		Path baseDir = Settings.getCacheDir(Cache.CacheClass.projects);

src/main/java/dev/jbang/cli/Export.java

@@ -65,17 +65,17 @@ public Integer doCall() throws IOException {
 		ProjectBuilder pb = createProjectBuilder(exportMixin);
 		Project prj = pb.build(exportMixin.scriptMixin.scriptOrFile);
 		BuildContext ctx = BuildContext.forProject(prj);
-		prj.codeBuilder(ctx).build();
+		Project.codeBuilder(ctx).build();
 		if (prj.getResourceRef() instanceof AliasResourceResolver.AliasedResourceRef) {
 			Alias alias = ((AliasResourceResolver.AliasedResourceRef) prj.getResourceRef()).getAlias();
 			if (prj.getMainClass() == null) {
 				prj.setMainClass(alias.mainClass);
 			}
 		}
-		return apply(prj, ctx);
+		return apply(ctx);
 	}
 
-	abstract int apply(Project prj, BuildContext ctx) throws IOException;
+	abstract int apply(BuildContext ctx) throws IOException;
 
 	protected ProjectBuilder createProjectBuilder(ExportMixin exportMixin) {
 		return Project
@@ -108,7 +108,7 @@ Path getJarOutputPath() {
 class ExportLocal extends BaseExportCommand {
 
 	@Override
-	int apply(Project prj, BuildContext ctx) throws IOException {
+	int apply(BuildContext ctx) throws IOException {
 		// Copy the JAR
 		Path source = ctx.getJarFile();
 		Path outputPath = getJarOutputPath();
@@ -126,7 +126,8 @@ int apply(Project prj, BuildContext ctx) throws IOException {
 
 		// Update the JAR's MANIFEST.MF Class-Path to point to
 		// its dependencies
-		String newPath = prj.resolveClassPath().getManifestPath();
+		Project prj = ctx.getProject();
+		String newPath = ctx.resolveClassPath().getManifestPath();
 		if (!newPath.isEmpty()) {
 			Util.infoMsg("Updating jar...");
 			String javaVersion = exportMixin.buildMixin.javaVersion != null
@@ -146,7 +147,7 @@ class ExportPortable extends BaseExportCommand {
 	public static final String LIB = "lib";
 
 	@Override
-	int apply(Project prj, BuildContext ctx) throws IOException {
+	int apply(BuildContext ctx) throws IOException {
 		// Copy the JAR
 		Path source = ctx.getJarFile();
 		Path outputPath = getJarOutputPath();
@@ -162,7 +163,8 @@ int apply(Project prj, BuildContext ctx) throws IOException {
 		}
 
 		Files.copy(source, outputPath);
-		List<ArtifactInfo> deps = prj.resolveClassPath().getArtifacts();
+		Project prj = ctx.getProject();
+		List<ArtifactInfo> deps = ctx.resolveClassPath().getArtifacts();
 		if (!deps.isEmpty()) {
 			// Copy dependencies to "./lib" dir
 			Path libDir = outputPath.getParent().resolve(LIB);
@@ -197,7 +199,7 @@ class ExportMavenPublish extends BaseExportCommand {
 	String version;
 
 	@Override
-	int apply(Project prj, BuildContext ctx) throws IOException {
+	int apply(BuildContext ctx) throws IOException {
 		Path outputPath = exportMixin.outputFile;
 
 		if (outputPath == null) {
@@ -219,6 +221,7 @@ int apply(Project prj, BuildContext ctx) throws IOException {
 			}
 		}
 
+		Project prj = ctx.getProject();
 		if (prj.getGav().isPresent()) {
 			MavenCoordinate coord = MavenCoordinate.fromString(prj.getGav().get()).withVersion();
 			if (group == null) {
@@ -283,7 +286,7 @@ int apply(Project prj, BuildContext ctx) throws IOException {
 										.data("artifact", artifact)
 										.data("version", version)
 										.data("description", prj.getDescription().orElse(""))
-										.data("dependencies", prj.resolveClassPath().getArtifacts())
+										.data("dependencies", ctx.resolveClassPath().getArtifacts())
 										.render();
 			Util.infoMsg("Writing " + pomPath);
 			Util.writeString(pomPath, pomfile);
@@ -299,7 +302,7 @@ int apply(Project prj, BuildContext ctx) throws IOException {
 class ExportNative extends BaseExportCommand {
 
 	@Override
-	int apply(Project prj, BuildContext ctx) throws IOException {
+	int apply(BuildContext ctx) throws IOException {
 		// Copy the native binary
 		Path source = ctx.getNativeImageFile();
 		Path outputPath = getNativeOutputPath();
@@ -340,7 +343,7 @@ Path getNativeOutputPath() {
 class ExportFatjar extends BaseExportCommand {
 
 	@Override
-	int apply(Project prj, BuildContext ctx) throws IOException {
+	int apply(BuildContext ctx) throws IOException {
 		// Copy the native binary
 		Path source = ctx.getJarFile();
 		Path outputPath = getFatjarOutputPath();
@@ -355,7 +358,8 @@ int apply(Project prj, BuildContext ctx) throws IOException {
 			Util.mkdirs(outputPath.getParent());
 		}
 
-		List<ArtifactInfo> deps = prj.resolveClassPath().getArtifacts();
+		Project prj = ctx.getProject();
+		List<ArtifactInfo> deps = ctx.resolveClassPath().getArtifacts();
 		if (!deps.isEmpty()) {
 			// Extract main jar and all dependencies to a temp dir
 			Path tmpDir = Files.createTempDirectory("fatjar");
@@ -417,8 +421,9 @@ protected ProjectBuilder createProjectBuilder(ExportMixin exportMixin) {
 	}
 
 	@Override
-	int apply(Project prj, BuildContext ctx) throws IOException {
-		List<ArtifactInfo> artifacts = prj.resolveClassPath().getArtifacts();
+	int apply(BuildContext ctx) throws IOException {
+		Project prj = ctx.getProject();
+		List<ArtifactInfo> artifacts = ctx.resolveClassPath().getArtifacts();
 		List<ArtifactInfo> nonMods = artifacts
 												.stream()
 												.filter(a -> !ModuleUtil.isModule(a.getFile()))

src/main/java/dev/jbang/cli/Info.java

@@ -95,13 +95,14 @@ static class ScriptInfo {
 		String gav;
 		String module;
 
-		public ScriptInfo(Project prj, BuildContext ctx, boolean assureJdkInstalled) {
+		public ScriptInfo(BuildContext ctx, boolean assureJdkInstalled) {
+			Project prj = ctx.getProject();
 			originalResource = prj.getResourceRef().getOriginalResource();
 
 			if (scripts.add(originalResource)) {
 				backingResource = prj.getResourceRef().getFile().toString();
 
-				init(prj);
+				init(ctx);
 
 				applicationJar = ctx.getJarFile() == null ? null
 						: ctx.getJarFile().toAbsolutePath().toString();
@@ -125,7 +126,7 @@ public ScriptInfo(Project prj, BuildContext ctx, boolean assureJdkInstalled) {
 					// Ignore
 				}
 
-				List<ArtifactInfo> artifacts = prj.resolveClassPath().getArtifacts();
+				List<ArtifactInfo> artifacts = ctx.resolveClassPath().getArtifacts();
 				if (artifacts.isEmpty()) {
 					resolvedDependencies = Collections.emptyList();
 				} else {
@@ -153,8 +154,9 @@ public ScriptInfo(Project prj, BuildContext ctx, boolean assureJdkInstalled) {
 			}
 		}
 
-		private void init(Project prj) {
-			List<String> deps = prj.resolveClassPath().getClassPaths();
+		private void init(BuildContext ctx) {
+			Project prj = ctx.getProject();
+			List<String> deps = ctx.resolveClassPath().getClassPaths();
 			if (!deps.isEmpty()) {
 				dependencies = deps;
 			}
@@ -213,7 +215,7 @@ ScriptInfo getInfo(boolean assureJdkInstalled) {
 
 		scripts = new HashSet<>();
 
-		return new ScriptInfo(prj, BuildContext.forProject(prj, buildDir), assureJdkInstalled);
+		return new ScriptInfo(BuildContext.forProject(prj, buildDir), assureJdkInstalled);
 	}
 
 	ProjectBuilder createProjectBuilder() {

src/main/java/dev/jbang/cli/Run.java

@@ -92,9 +92,9 @@ public Integer doCall() throws IOException {
 		}
 
 		BuildContext ctx = BuildContext.forProject(prj, buildDir);
-		CmdGeneratorBuilder genb = prj.codeBuilder(ctx).build();
+		CmdGeneratorBuilder genb = Project.codeBuilder(ctx).build();
 
-		buildAgents(prj, ctx);
+		buildAgents(ctx);
 
 		String cmdline = updateGeneratorForRun(genb).build().generate();
 
@@ -104,7 +104,8 @@ public Integer doCall() throws IOException {
 		return EXIT_EXECUTE;
 	}
 
-	void buildAgents(Project prj, BuildContext ctx) throws IOException {
+	void buildAgents(BuildContext ctx) throws IOException {
+		Project prj = ctx.getProject();
 		Map<String, String> agents = runMixin.javaAgentSlots;
 		if (agents == null && prj.getResourceRef() instanceof AliasResourceResolver.AliasedResourceRef) {
 			AliasResourceResolver.AliasedResourceRef aref = (AliasResourceResolver.AliasedResourceRef) prj.getResourceRef();
@@ -125,7 +126,7 @@ void buildAgents(Project prj, BuildContext ctx) throws IOException {
 				ProjectBuilder apb = createBaseProjectBuilder();
 				Project aprj = apb.build(javaAgent);
 				BuildContext actx = BuildContext.forProject(aprj);
-				aprj.codeBuilder(actx).build();
+				Project.codeBuilder(actx).build();
 				runMixin.javaRuntimeOptions.addAll(javaAgentOptions(actx, javaAgentOptions));
 			}
 		}

src/main/java/dev/jbang/dependencies/DependencyCache.java

@@ -9,11 +9,9 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
@@ -111,16 +109,6 @@ public static List<ArtifactInfo> findDependenciesByHash(String depsHash) {
 		return null;
 	}
 
-	public static ArtifactInfo findArtifactByPath(Path artifactPath) {
-		Map<String, List<ArtifactInfo>> cache = getCache();
-		Optional<ArtifactInfo> result = cache	.values()
-												.stream()
-												.flatMap(Collection::stream)
-												.filter(art -> art.getFile().equals(artifactPath))
-												.findFirst();
-		return result.orElseGet(() -> new ArtifactInfo(null, artifactPath));
-	}
-
 	public static void clear() {
 		depCache = null;
 	}

src/main/java/dev/jbang/dependencies/DependencyResolver.java

@@ -10,12 +10,12 @@
 public class DependencyResolver {
 	private final Set<MavenRepo> repositories;
 	private final Set<String> dependencies;
-	private final Set<ArtifactInfo> artifacts;
+	private final Set<String> classPaths;
 
 	public DependencyResolver() {
 		repositories = new LinkedHashSet<>();
 		dependencies = new LinkedHashSet<>();
-		artifacts = new LinkedHashSet<>();
+		classPaths = new LinkedHashSet<>();
 	}
 
 	public DependencyResolver addRepository(MavenRepo repository) {
@@ -50,19 +50,9 @@ public DependencyResolver addDependencies(List<String> dependencies) {
 		return this;
 	}
 
-	public DependencyResolver addArtifact(ArtifactInfo artifact) {
-		artifacts.add(artifact);
-		return this;
-	}
-
-	public DependencyResolver addArtifacts(List<ArtifactInfo> artifacts) {
-		this.artifacts.addAll(artifacts);
-		return this;
-	}
-
 	public DependencyResolver addClassPath(String classPath) {
-		// WARN need File here because it's more lenient about paths than Path!
-		return addArtifact(DependencyCache.findArtifactByPath(new File(classPath).toPath()));
+		classPaths.add(classPath);
+		return this;
 	}
 
 	public DependencyResolver addClassPaths(List<String> classPaths) {
@@ -72,18 +62,18 @@ public DependencyResolver addClassPaths(List<String> classPaths) {
 		return this;
 	}
 
-	public DependencyResolver addClassPaths(String classPaths) {
-		return addClassPaths(Arrays.asList(classPaths.split(" ")));
-	}
-
 	public ModularClassPath resolve() {
 		ModularClassPath mcp = DependencyUtil.resolveDependencies(
 				new ArrayList<>(dependencies), new ArrayList<>(repositories),
 				Util.isOffline(), Util.isFresh(), !Util.isQuiet(), Util.downloadSources());
-		if (artifacts.isEmpty()) {
+		if (classPaths.isEmpty()) {
 			return mcp;
 		} else {
-			List<ArtifactInfo> arts = Stream.concat(mcp.getArtifacts().stream(), artifacts.stream())
+			// WARN need File here because it's more lenient about paths than Path!
+			Stream<ArtifactInfo> cpas = classPaths
+													.stream()
+													.map(p -> new ArtifactInfo(null, new File(p).toPath()));
+			List<ArtifactInfo> arts = Stream.concat(mcp.getArtifacts().stream(), cpas)
 											.collect(Collectors.toList());
 			return new ModularClassPath(arts);
 		}