Maven repositories + improved SKILL.md #121
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| package cellar | ||
|
|
||
| import coursierapi.{MavenRepository, Repository} | ||
|
|
||
| private[cellar] object ExtraRepositories: | ||
|
|
||
| /** Configured repository URLs first, command-line `-r` values appended. | ||
| * | ||
| * Duplicates collapse to their first occurrence, ignoring a trailing slash. The surviving URL | ||
| * reaches Coursier verbatim — no other normalization. | ||
| */ | ||
| def effective(configured: List[String], commandLine: List[String]): List[Repository] = | ||
| (configured ++ commandLine).distinctBy(_.stripSuffix("/")).map(MavenRepository.of) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| package cellar | ||
|
|
||
| import cats.effect.IO | ||
| import cats.syntax.all.* | ||
| import fs2.io.file.{Files => Fs2Files, Path} | ||
| import munit.CatsEffectSuite | ||
| import org.typelevel.otel4s.trace.Tracer.Implicits.noop | ||
|
|
||
| class ExtraRepositoriesTest extends CatsEffectSuite: | ||
|
|
||
| private def urls(configured: List[String], commandLine: List[String]): List[String] = | ||
| ExtraRepositories.effective(configured, commandLine).map { | ||
| case maven: coursierapi.MavenRepository => maven.getBase() | ||
| case other => fail(s"Expected a MavenRepository, got $other") | ||
| } | ||
|
|
||
| private def withConfigFiles(userConfig: Option[String], projectConfig: Option[String])( | ||
| test: Config => IO[Unit] | ||
| ): IO[Unit] = | ||
| Fs2Files[IO].tempDirectory.use { dir => | ||
| def write(name: String, contents: String): IO[Path] = | ||
| val file = dir.resolve(name) | ||
| fs2.Stream.emit(contents).through(Fs2Files[IO].writeUtf8(file)).compile.drain.as(file) | ||
|
|
||
| for | ||
| userPath <- userConfig.traverse(write("user.conf", _)) | ||
| projectPath <- projectConfig.traverse(write("project.conf", _)) | ||
| _ <- test(Config.loadFrom(userPath, projectPath)) | ||
| yield () | ||
| } | ||
|
|
||
| test("configured repositories come first, command-line values append"): | ||
| assertEquals( | ||
| urls(List("https://configured.example/maven"), List("https://cli.example/maven")), | ||
| List("https://configured.example/maven", "https://cli.example/maven") | ||
| ) | ||
|
|
||
| test("duplicates collapse to their first occurrence, ignoring a trailing slash"): | ||
| assertEquals( | ||
| urls(List("https://repo.example/maven"), List("https://repo.example/maven/", "https://other.example/maven")), | ||
| List("https://repo.example/maven", "https://other.example/maven") | ||
| ) | ||
|
|
||
| test("no configured repositories leaves command-line values untouched"): | ||
| assertEquals(urls(Nil, List("https://cli.example/maven")), List("https://cli.example/maven")) | ||
|
|
||
| test("default configuration has no extra repositories"): | ||
| withConfigFiles(None, None)(config => IO(assertEquals(config.maven.repositories, Nil))) | ||
|
|
||
| test("empty project list clears repositories inherited from the user config"): | ||
| withConfigFiles( | ||
| userConfig = Some("""maven.repositories = ["https://configured.example/maven"]"""), | ||
| projectConfig = Some("maven.repositories = []") | ||
| )(config => IO(assertEquals(config.maven.repositories, Nil))) | ||
|
|
||
| test("configured repository resolves a fixture artifact without a command-line repository"): | ||
| TestFixtures.assumeFixturesAvailable() | ||
| withConfigFiles( | ||
| userConfig = Some(s"""maven.repositories = ["file://${TestFixtures.localM2}"]"""), | ||
| projectConfig = None | ||
| ) { config => | ||
| CoursierFetchClient | ||
| .fetchClasspath(TestFixtures.scala3Coord, ExtraRepositories.effective(config.maven.repositories, Nil)) | ||
| .map(paths => assert(paths.nonEmpty, "Expected the fixture JAR to resolve through the configured repository")) | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Skill-creator suggested that leaving a reason will hold better and have better results