fix: quarkusioGH-374 Default alias name when creating a new alias (qu…

…arkusio#409)
maxandersen · Oct 10, 2020 · 5be01bc · 5be01bc
1 parent 5fd1613
commit 5be01bc
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 0 deletions.
diff --git a/src/main/java/dev/jbang/cli/Alias.java b/src/main/java/dev/jbang/cli/Alias.java
@@ -1,7 +1,9 @@
 package dev.jbang.cli;
 
 import java.io.PrintStream;
+import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -29,6 +31,9 @@ protected Path getCatalog() {
 		if (global) {
 			return Settings.getAliasesFile();
 		} else {
+			if (Files.isDirectory(catalogFile)) {
+				return Paths.get(catalogFile.toString(), AliasUtil.JBANG_CATALOG_JSON);
+			}
 			return catalogFile;
 		}
 	}

diff --git a/src/test/java/dev/jbang/cli/TestAlias.java b/src/test/java/dev/jbang/cli/TestAlias.java
@@ -7,6 +7,7 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.Collections;
 
 import org.junit.Assert;
@@ -18,6 +19,8 @@
 
 import dev.jbang.AliasUtil;
 
+import picocli.CommandLine;
+
 public class TestAlias {
 
 	static final String aliases = "{\n" +
@@ -84,6 +87,31 @@ void testReadFromFile() throws IOException {
 		assertThat(AliasUtil.getAlias(cwd, "one"), notNullValue());
 	}
 
+	@Test
+	void testAddWithDefaultCatalogFile() throws IOException {
+		TemporaryFolder tmp = new TemporaryFolder();
+		tmp.create();
+		Path tmpPath = tmp.getRoot().toPath();
+		assertThat(Files.isRegularFile(Paths.get(tmpPath.toString(), AliasUtil.JBANG_CATALOG_JSON)), is(false));
+		Jbang jbang = new Jbang();
+		new CommandLine(jbang).execute("alias", "add", "-f", tmpPath.toString(), "name", "scriptOrFile");
+		assertThat(Files.isRegularFile(Paths.get(tmp.getRoot().toPath().toString(), AliasUtil.JBANG_CATALOG_JSON)),
+				is(true));
+		AliasUtil.Alias name = AliasUtil.getAlias(tmpPath, "name");
+		assertThat(name.scriptRef, is("scriptOrFile"));
+	}
+
+	@Test
+	void testAddPreservesExistingCatalog() throws IOException {
+		final Path jbangPath = jbangTempDir.getRoot().toPath();
+		Jbang jbang = new Jbang();
+		new CommandLine(jbang).execute("alias", "add", "-f", jbangPath.toString(), "name", "scriptOrFile");
+		AliasUtil.Alias one = AliasUtil.getAlias(jbangPath, "one");
+		AliasUtil.Alias name = AliasUtil.getAlias(jbangPath, "name");
+		assertThat(one.scriptRef, is("http://dummy"));
+		assertThat(name.scriptRef, is("scriptOrFile"));
+	}
+
 	@Test
 	void testGetAliasNone() throws IOException {
 		AliasUtil.Alias alias = AliasUtil.getAlias(cwd, "dummy-alias!", null, null);