fix: stop tools info .jsh failing (#1172)

jbangdev · Dec 30, 2021 · b667e55 · b667e55
1 parent 7743693
commit b667e55
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/src/main/java/dev/jbang/cli/Info.java b/src/main/java/dev/jbang/cli/Info.java
@@ -110,7 +110,7 @@ public ScriptInfo(Source src, RunContext ctx) {
 				description = ss.getDescription().orElse(null);
 
 				if (ctx != null) {
-					applicationJar = src.getJarFile().getAbsolutePath();
+					applicationJar = src.getJarFile() == null ? null : src.getJarFile().getAbsolutePath();
 					mainClass = ctx.getMainClassOr(src);
 					requestedJavaVersion = src.getJavaVersion();
 					availableJdkPath = Objects.toString(JdkManager.getCurrentJdk(requestedJavaVersion), null);

diff --git a/src/test/java/dev/jbang/cli/TestInfo.java b/src/test/java/dev/jbang/cli/TestInfo.java
@@ -126,4 +126,21 @@ void testInfoClasspathNested() {
 				hasSize(equalTo(1)),
 				everyItem(containsString("picocli"))));
 	}
+
+	@Test
+	void testInfoJShell() {
+		String src = examplesTestFolder.resolve("basic.jsh").toString();
+		JBang jbang = new JBang();
+		CommandLine.ParseResult pr = new CommandLine(jbang).parseArgs("info", "tools", src);
+		Tools tools = (Tools) pr.subcommand().subcommand().commandSpec().userObject();
+		BaseInfoCommand.ScriptInfo info = tools.getInfo();
+		assertThat(info.originalResource, equalTo(src));
+		assertThat(info.applicationJar, equalTo(null));
+		assertThat(info.backingResource, equalTo(src));
+		assertThat(info.javaVersion, is(nullValue()));
+		assertThat(info.mainClass, is(nullValue()));
+		assertThat(info.resolvedDependencies, Matchers.<Collection<String>>allOf(
+				hasSize(equalTo(1)),
+				everyItem(containsString("commons-lang3"))));
+	}
 }