feat: treat empty catalog as jbangapp/jbang-catalog aliases

jbangdev · Jan 23, 2024 · 74777f1 · 74777f1
1 parent cdbf260
commit 74777f1
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 2 deletions.
diff --git a/src/main/java/dev/jbang/catalog/CatalogRef.java b/src/main/java/dev/jbang/catalog/CatalogRef.java
@@ -54,7 +54,7 @@ static CatalogRef get(String catalogName) {
 		}
 		if (catalogRef == null && Util.isValidPath(catalogName)) {
 			Path p = Util.getCwd().resolve(catalogName);
-			if (!p.getFileName().toString().equals(Catalog.JBANG_CATALOG_JSON)) {
+			if (p.getFileName() != null && !p.getFileName().toString().equals(Catalog.JBANG_CATALOG_JSON)) {
 				p = p.resolve(Catalog.JBANG_CATALOG_JSON);
 			}
 			if (Files.isRegularFile(p)) {

diff --git a/src/main/java/dev/jbang/catalog/ImplicitCatalogRef.java b/src/main/java/dev/jbang/catalog/ImplicitCatalogRef.java
@@ -52,7 +52,11 @@ public static ImplicitCatalogRef parse(String name) {
 		if (names.length > 3) {
 			return null;
 		}
-		String org = names[0];
+		String org = null;
+		if (names.length > 2) {
+			org = names[0];
+		}
+		org = "jbangapp"; // TODO: should global default be controllable by config?
 		String repo;
 		if (names.length >= 2 && !names[1].isEmpty()) {
 			repo = names[1];

diff --git a/src/test/java/dev/jbang/TestImplicitAlias.java b/src/test/java/dev/jbang/TestImplicitAlias.java
@@ -1,6 +1,7 @@
 package dev.jbang;
 
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -10,6 +11,7 @@
 
 import dev.jbang.catalog.Alias;
 import dev.jbang.catalog.ImplicitCatalogRef;
+import dev.jbang.cli.ExitException;
 
 /**
  * TODO: use mock to handle https lookups instead of jbang.dev
@@ -24,6 +26,25 @@ public void testGitImplicitCatalog() {
 				Matchers.equalTo("https://github.com/jbangdev/jbang-examples/blob/HEAD/jbang-catalog.json"));
 	}
 
+	@Test
+	public void testDefaultImplicitCatalog() {
+		assertThat(ImplicitCatalogRef.getImplicitCatalogUrl("/").get(),
+				Matchers.equalTo("https://github.com/jbangapp/jbang-catalog/blob/HEAD/jbang-catalog.json"));
+		assertThat(ImplicitCatalogRef.getImplicitCatalogUrl("/sqlline").get(),
+				Matchers.equalTo("https://github.com/jbangapp/sqlline/blob/HEAD/jbang-catalog.json"));
+	}
+
+	@Test
+	public void testDefaultCatalogGet() {
+		dev.jbang.catalog.Catalog catalog = dev.jbang.catalog.Catalog.getByName("/sqlline");
+		assertThat(catalog, Matchers.notNullValue());
+		catalog = dev.jbang.catalog.Catalog.getByName("/");
+		assertThat(catalog, Matchers.notNullValue());
+
+		assertThrows(ExitException.class, () -> dev.jbang.catalog.Catalog.getByName("/shouldneverexist"));
+
+	}
+
 	@Test
 	public void testImplictURLAlias() {