fix: info tools now downloads JDKs again

Fixes jbangdev#1569
quintesse · Feb 20, 2023 · d1b7694 · d1b7694
1 parent b96e296
commit d1b7694
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 14 deletions.
diff --git a/src/main/java/dev/jbang/cli/Info.java b/src/main/java/dev/jbang/cli/Info.java
@@ -87,7 +87,7 @@ static class ScriptInfo {
  String description;
  String gav;
 
- public ScriptInfo(Project prj, BuildContext ctx) {
+ public ScriptInfo(Project prj, BuildContext ctx, boolean assureJdkInstalled) {
  originalResource = prj.getResourceRef().getOriginalResource();
 
  if (scripts.add(originalResource)) {
@@ -104,7 +104,8 @@ public ScriptInfo(Project prj, BuildContext ctx) {
  requestedJavaVersion = prj.getJavaVersion();
 
  try {
- JdkProvider.Jdk jdk = JdkManager.getJdk(requestedJavaVersion, false);
+ JdkProvider.Jdk jdk = assureJdkInstalled ? JdkManager.getOrInstallJdk(requestedJavaVersion)
+ : JdkManager.getJdk(requestedJavaVersion, false);
  if (jdk != null && jdk.isInstalled()) {
  availableJdkPath = jdk.getHome().toString();
  }
@@ -187,15 +188,15 @@ private void init(SourceSet ss) {
 
  private static Set<String> scripts;
 
- ScriptInfo getInfo() {
+ ScriptInfo getInfo(boolean assureJdkInstalled) {
  scriptMixin.validate();
 
  ProjectBuilder pb = createProjectBuilder();
  Project prj = pb.build(scriptMixin.scriptOrFile);
 
  scripts = new HashSet<>();
 
- return new ScriptInfo(prj, BuildContext.forProject(prj, buildDir));
+ return new ScriptInfo(prj, BuildContext.forProject(prj, buildDir), assureJdkInstalled);
  }
 
  ProjectBuilder createProjectBuilder() {
@@ -219,7 +220,7 @@ class Tools extends BaseInfoCommand {
  public Integer doCall() throws IOException {
 
  Gson parser = new GsonBuilder().disableHtmlEscaping().setPrettyPrinting().create();
- parser.toJson(getInfo(), System.out);
+ parser.toJson(getInfo(true), System.out);
 
  return EXIT_OK;
  }
@@ -231,7 +232,7 @@ class ClassPath extends BaseInfoCommand {
  @Override
  public Integer doCall() throws IOException {
 
- ScriptInfo info = getInfo();
+ ScriptInfo info = getInfo(false);
  List<String> cp = new ArrayList<>(info.resolvedDependencies.size() + 1);
  if (info.applicationJar != null && !info.resolvedDependencies.contains(info.applicationJar)) {
  cp.add(info.applicationJar);

diff --git a/src/test/java/dev/jbang/cli/TestInfo.java b/src/test/java/dev/jbang/cli/TestInfo.java
@@ -21,7 +21,7 @@ void testInfoToolsSimple() {
  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();
+ BaseInfoCommand.ScriptInfo info = tools.getInfo(false);
  assertThat(info.originalResource, equalTo(src));
  assertThat(info.applicationJar, allOf(
  containsString("quote.java."),
@@ -43,7 +43,7 @@ void testInfoToolsBuilt() {
  new CommandLine(jbang).execute("build", src);
  CommandLine.ParseResult pr = new CommandLine(jbang).parseArgs("info", "tools", src);
  Tools tools = (Tools) pr.subcommand().subcommand().commandSpec().userObject();
- BaseInfoCommand.ScriptInfo info = tools.getInfo();
+ BaseInfoCommand.ScriptInfo info = tools.getInfo(false);
  assertThat(info.originalResource, equalTo(src));
  assertThat(info.applicationJar, allOf(
  containsString("quote.java."),
@@ -63,7 +63,7 @@ void testInfoToolsWithDeps() {
  "--deps", "org.apache.commons:commons-lang3:3.12.0",
  src);
  Tools tools = (Tools) pr.subcommand().subcommand().commandSpec().userObject();
- BaseInfoCommand.ScriptInfo info = tools.getInfo();
+ BaseInfoCommand.ScriptInfo info = tools.getInfo(false);
  assertThat(info.originalResource, equalTo(src));
  assertThat(info.applicationJar, allOf(
  containsString("helloworld.java."),
@@ -85,7 +85,7 @@ void testInfoToolsWithClasspath() {
  JBang jbang = new JBang();
  CommandLine.ParseResult pr = new CommandLine(jbang).parseArgs("info", "tools", "--cp", jar, src);
  Tools tools = (Tools) pr.subcommand().subcommand().commandSpec().userObject();
- BaseInfoCommand.ScriptInfo info = tools.getInfo();
+ BaseInfoCommand.ScriptInfo info = tools.getInfo(false);
  assertThat(info.originalResource, equalTo(src));
  assertThat(info.applicationJar, allOf(
  containsString("helloworld.java."),
@@ -105,7 +105,7 @@ void testInfoClasspathNested() {
  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();
+ BaseInfoCommand.ScriptInfo info = tools.getInfo(false);
  assertThat(info.originalResource, equalTo(src));
  assertThat(info.applicationJar, allOf(
  containsString("sources.java."),
@@ -129,7 +129,7 @@ void testInfoJShell() {
  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();
+ BaseInfoCommand.ScriptInfo info = tools.getInfo(false);
  assertThat(info.originalResource, equalTo(src));
  assertThat(info.applicationJar, equalTo(null));
  assertThat(info.backingResource, equalTo(src));
@@ -145,7 +145,7 @@ void testInfoHelloJar() {
  String jar = examplesTestFolder.resolve("hellojar.jar").toString();
  CommandLine.ParseResult pr = JBang.getCommandLine().parseArgs("info", "tools", jar);
  Tools tools = (Tools) pr.subcommand().subcommand().commandSpec().userObject();
- BaseInfoCommand.ScriptInfo info = tools.getInfo();
+ BaseInfoCommand.ScriptInfo info = tools.getInfo(false);
  assertThat(info.originalResource, equalTo(jar));
  assertThat(info.applicationJar, equalTo(jar));
  assertThat(info.backingResource, equalTo(jar));
@@ -159,7 +159,7 @@ void testInfoStarSources() {
  String src = examplesTestFolder.resolve("sources/ying.java").toString();
  CommandLine.ParseResult pr = JBang.getCommandLine().parseArgs("info", "tools", src);
  Tools tools = (Tools) pr.subcommand().subcommand().commandSpec().userObject();
- BaseInfoCommand.ScriptInfo info = tools.getInfo();
+ BaseInfoCommand.ScriptInfo info = tools.getInfo(false);
  assertThat(info.originalResource, equalTo(src));
  // assertThat(info.applicationJar, equalTo(src));
  assertThat(info.backingResource, equalTo(src));