starred/pkl
1
0
Fork 0
mirror of https://github.com/apple/pkl.git synced 2026-04-28 11:17:17 +02:00
Code Issues 198 Packages Projects Releases 10 Wiki Activity

Breaking: rename some CLI classes for consistency (#169)

Browse Source 
CliDownloadPackageCommand -> CliPackageDownloader (consistent with CliProjectPackager/CliProjectResolver)
CliAbstractProjectCommand -> CliProjectCommand (consistent with CliCommand)
This commit is contained in:
translatenix
2024-02-22 19:53:01 -08:00
committed by GitHub
parent a85ffd3cab
commit 2c54643037
6 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkl-cli/src/main/kotlin/org/pkl/cli/CliDownloadPackageCommand.kt → pkl-cli/src/main/kotlin/org/pkl/cli/CliPackageDownloader.kt
View File

@@ -21,7 +21,7 @@ import org.pkl.commons.cli.CliException
import org.pkl.core.packages.PackageResolver
import org.pkl.core.packages.PackageUri
class CliDownloadPackageCommand(
class CliPackageDownloader(
baseOptions: CliBaseOptions,
private val packageUris: List<PackageUri>,
private val noTransitive: Boolean

6
pkl-cli/src/main/kotlin/org/pkl/cli/CliAbstractProjectCommand.kt → pkl-cli/src/main/kotlin/org/pkl/cli/CliProjectCommand.kt
View File

@@ -23,10 +23,8 @@ import org.pkl.commons.cli.CliCommand
import org.pkl.commons.cli.CliException
import org.pkl.core.module.ProjectDependenciesManager.PKL_PROJECT_FILENAME
abstract class CliAbstractProjectCommand(
cliOptions: CliBaseOptions,
private val projectDirs: List<Path>
) : CliCommand(cliOptions) {
abstract class CliProjectCommand(cliOptions: CliBaseOptions, private val projectDirs: List<Path>) :
CliCommand(cliOptions) {
protected val normalizedProjectFiles: List<Path> by lazy {
if (projectDirs.isEmpty()) {

2
pkl-cli/src/main/kotlin/org/pkl/cli/CliProjectPackager.kt
View File

@@ -33,7 +33,7 @@ class CliProjectPackager(
private val skipPublishCheck: Boolean,
private val consoleWriter: Writer = System.out.writer(),
private val errWriter: Writer = System.err.writer()
) : CliAbstractProjectCommand(baseOptions, projectDirs) {
) : CliProjectCommand(baseOptions, projectDirs) {
private fun runApiTests(project: Project) {
val apiTests = project.`package`!!.apiTests

2
pkl-cli/src/main/kotlin/org/pkl/cli/CliProjectResolver.kt
View File

@@ -28,7 +28,7 @@ class CliProjectResolver(
projectDirs: List<Path>,
private val consoleWriter: Writer = System.out.writer(),
private val errWriter: Writer = System.err.writer()
) : CliAbstractProjectCommand(baseOptions, projectDirs) {
) : CliProjectCommand(baseOptions, projectDirs) {
override fun doRun() {
for (projectFile in normalizedProjectFiles) {
val project = loadProject(projectFile)

4
pkl-cli/src/main/kotlin/org/pkl/cli/commands/DownloadPackageCommand.kt
View File

@@ -21,7 +21,7 @@ import com.github.ajalt.clikt.parameters.arguments.multiple
import com.github.ajalt.clikt.parameters.groups.provideDelegate
import com.github.ajalt.clikt.parameters.options.flag
import com.github.ajalt.clikt.parameters.options.option
import org.pkl.cli.CliDownloadPackageCommand
import org.pkl.cli.CliPackageDownloader
import org.pkl.commons.cli.commands.BaseCommand
import org.pkl.commons.cli.commands.ProjectOptions
import org.pkl.commons.cli.commands.single
@@ -62,7 +62,7 @@ class DownloadPackageCommand(helpLink: String) :
.flag()
override fun run() {
CliDownloadPackageCommand(
CliPackageDownloader(
baseOptions.baseOptions(emptyList(), projectOptions),
packageUris,
noTransitive