cli: move configuration files to .config/jooby.conf fixes #2599

jknack · jknack · commit d62c04c779dc · 2022-09-05T20:31:42.000-03:00
diff --git a/modules/jooby-cli/src/main/java/io/jooby/cli/Cli.java b/modules/jooby-cli/src/main/java/io/jooby/cli/Cli.java
@@ -71,8 +71,8 @@ public class Cli extends Cmd {
       } else if ("-V".equalsIgnoreCase(arg) || "--version".equals(arg)) {
         ctx.println(ctx.getVersion());
       } else {
-        ctx.println(
-            "Unknown command or option(s): " + args.stream().collect(Collectors.joining(" ")));
+        ctx.println("Unknown command or option(s): " + args.stream().collect(Collectors.joining(" ")));
+        ctx.println("  " + ctx);
         ctx.println(spec.commandLine().getUsageMessage());
       }
     } else {
diff --git a/modules/jooby-cli/src/main/java/io/jooby/cli/Version.java b/modules/jooby-cli/src/main/java/io/jooby/cli/Version.java
@@ -35,7 +35,7 @@ public class Version implements CommandLine.IVersionProvider {
   private static String doVersion() {
     try {
       URL url = URI
-          .create("http://search.maven.org/solrsearch/select?q=+g:io.jooby+a:jooby&start=0&rows=1")
+          .create("https://search.maven.org/solrsearch/select?q=+g:io.jooby+a:jooby&start=0&rows=1")
           .toURL();
       URLConnection connection = url.openConnection();
       try (Reader in = new InputStreamReader(connection.getInputStream(), StandardCharsets.UTF_8)) {
@@ -49,7 +49,7 @@ private static String doVersion() {
       return Optional.ofNullable(Version.class.getPackage())
           .map(Package::getImplementationVersion)
           .filter(Objects::nonNull)
-          .orElse("2.0.6");
+          .orElse("2.15.0");
     }
   }
 }
diff --git a/modules/jooby-cli/src/main/java/io/jooby/internal/cli/CommandContextImpl.java b/modules/jooby-cli/src/main/java/io/jooby/internal/cli/CommandContextImpl.java
@@ -9,6 +9,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.PrintWriter;
+import java.io.Reader;
 import java.io.Writer;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
@@ -46,6 +47,8 @@ public class CommandContextImpl implements Context {
 
   private Properties versions;
 
+  private Path configurationFile;
+
   public CommandContextImpl(LineReader reader, String version) throws IOException {
     this.reader = reader;
     this.out = reader.getTerminal().writer();
@@ -54,17 +57,27 @@ public CommandContextImpl(LineReader reader, String version) throws IOException
     this.templates.setPrettyPrint(true);
     this.version = version;
 
-    Path file = configurationPath();
+    // move from .jooby to .config/jooby.conf
+    configurationFile = Paths.get(System.getProperty("user.home"), ".config", "jooby.conf");
+    migrateOldConfiguration(Paths.get(System.getProperty("user.home"), ".jooby"), configurationFile);
 
-    if (Files.exists(file)) {
-      configuration = Cli.gson.fromJson(Files.newBufferedReader(file), LinkedHashMap.class);
+    if (Files.exists(configurationFile)) {
+      try (Reader in = Files.newBufferedReader(configurationFile)) {
+        configuration = Cli.gson.fromJson(in, LinkedHashMap.class);
+      }
     } else {
       configuration = new LinkedHashMap();
     }
   }
 
-  private Path configurationPath() {
-    return Paths.get(System.getProperty("user.home"), ".jooby");
+  private void migrateOldConfiguration(Path from, Path to) throws IOException {
+    if (Files.exists(from)) {
+      if (!Files.exists(to.getParent())) {
+        Files.createDirectories(to.getParent());
+      }
+      Files.copy(from, to);
+      Files.delete(from);
+    }
   }
 
   @Nonnull @Override public String getVersion() {
@@ -83,8 +96,7 @@ private Path configurationPath() {
     }
     configuration.put("workspace", workspace.toAbsolutePath().toString());
     String json = Cli.gson.toJson(configuration);
-    Files.write(configurationPath(), json.getBytes(StandardCharsets.UTF_8));
-
+    Files.write(configurationFile, json.getBytes(StandardCharsets.UTF_8));
   }
 
   @Override public void exit(int code) {
@@ -154,4 +166,8 @@ public Map<String, String> getDependencyMap() throws IOException {
     }
     return result;
   }
+
+  @Override public String toString() {
+    return "version: " + getVersion() + "; conf: " + configurationFile;
+  }
 }

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public class Version implements CommandLine.IVersionProvider {`
`35`	`35`	`private static String doVersion() {`
`36`	`36`	`try {`
`37`	`37`	`URL url = URI`
`38`		`- .create("http://search.maven.org/solrsearch/select?q=+g:io.jooby+a:jooby&start=0&rows=1")`
	`38`	`+ .create("https://search.maven.org/solrsearch/select?q=+g:io.jooby+a:jooby&start=0&rows=1")`
`39`	`39`	`.toURL();`
`40`	`40`	`URLConnection connection = url.openConnection();`
`41`	`41`	`try (Reader in = new InputStreamReader(connection.getInputStream(), StandardCharsets.UTF_8)) {`
`@@ -49,7 +49,7 @@ private static String doVersion() {`
`49`	`49`	`return Optional.ofNullable(Version.class.getPackage())`
`50`	`50`	`.map(Package::getImplementationVersion)`
`51`	`51`	`.filter(Objects::nonNull)`
`52`		`- .orElse("2.0.6");`
	`52`	`+ .orElse("2.15.0");`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`	`}`