Skip to content

Commit

Permalink
Merge "Update parser to be more user friendly." into studio-main
Browse files Browse the repository at this point in the history
  • Loading branch information
@ducrohet
ducrohet authored and Android (Google) Code Review committed Dec 7, 2023
2 parents 6e6e259 + 3e5a78b commit 6a169e8
Show file tree
Hide file tree
Showing 5 changed files with 84 additions and 61 deletions.
1 change: 1 addition & 0 deletions convert-tool/app/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ dependencies {
application {
// Define the main class for the application.
mainClass.set("com.google.android.gradle_recipe.converter.ConvertToolKt")
applicationName = "convert-tool"
}

base {
Expand Down
137 changes: 79 additions & 58 deletions convert-tool/app/src/main/kotlin/com/google/android/gradle_recipe/converter/ConvertTool.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
* limitations under the License.
*/

@file:OptIn(ExperimentalCli::class)

package com.google.android.gradle_recipe.converter

import com.google.android.gradle_recipe.converter.converters.RecipeConverter
Expand All @@ -22,21 +24,23 @@ import com.google.android.gradle_recipe.converter.converters.convertStringToMode
import com.google.android.gradle_recipe.converter.validators.GithubPresubmitValidator
import com.google.android.gradle_recipe.converter.validators.InternalCIValidator
import com.google.android.gradle_recipe.converter.validators.WorkingCopyValidator
import java.nio.file.Path
import kotlin.system.exitProcess
import kotlinx.cli.ArgParser
import kotlinx.cli.ArgType
import kotlinx.cli.ExperimentalCli
import kotlinx.cli.Subcommand
import kotlinx.cli.default
import java.nio.file.Path


/**
* The main entry to the Converter, parser the command line arguments, and calls
* the relevant classes to perform the work
*/
fun main(args: Array<String>) {
val parser = ArgParser("Gradle Recipe Converter")
val toolName = "convert-tool"

val action by parser.option(
ArgType.Choice(listOf("convert", "validate"), { it }), shortName = "al", description = "Recipe action"
).default("convert")
val parser = ArgParser(programName = toolName, useDefaultHelpShortName = true)

val overwrite by parser.option(ArgType.Boolean, shortName = "o", description = "Overwrite").default(false)
val source by parser.option(ArgType.String, shortName = "s", description = "Recipe source")
Expand All @@ -49,61 +53,78 @@ fun main(args: Array<String>) {
val gradlePath by parser.option(ArgType.String, shortName = "gp", description = "Gradle path")
val mode by parser.option(ArgType.String, shortName = "m", description = "Mode")

parser.parse(args)

if (action == "convert") {
if (source != null) {
RecipeConverter(
agpVersion = agpVersion,
repoLocation = repoLocation,
gradleVersion = gradleVersion,
gradlePath = gradlePath,
mode = convertStringToMode(mode),
overwrite = overwrite
).convert(
source = Path.of(source ?: error("source must be specified")),
destination = Path.of(destination ?: error("destination must be specified"))
)
} else {
RecursiveConverter(
agpVersion = agpVersion,
repoLocation = repoLocation,
gradleVersion = gradleVersion,
gradlePath = gradlePath,
overwrite = overwrite
).convertAllRecipes(
sourceAll = Path.of(sourceAll ?: error("sourceAll must be specified")),
destination = Path.of(destination ?: error("destination must be specified"))
)
}
} else if (action == "validate") {
if (agpVersion == null) {
if (mode != null) {
val cliMode = convertStringToMode(mode)
if (cliMode != RecipeConverter.Mode.WORKINGCOPY) {
error("The mode value should be either \"workingcopy\" or nothing")
parser.subcommands(
object : Subcommand("convert", "Convert a recipe from one state to the other") {
override fun execute() {
if (source != null) {
RecipeConverter(
agpVersion = agpVersion,
repoLocation = repoLocation,
gradleVersion = gradleVersion,
gradlePath = gradlePath,
mode = convertStringToMode(mode),
overwrite = overwrite
).convert(
source = Path.of(source ?: printErrorAndTerminate("source must be specified")),
destination = Path.of(destination ?: printErrorAndTerminate("destination must be specified"))
)
} else {
RecursiveConverter(
agpVersion = agpVersion,
repoLocation = repoLocation,
gradleVersion = gradleVersion,
gradlePath = gradlePath,
overwrite = overwrite
).convertAllRecipes(
sourceAll = Path.of(sourceAll ?: printErrorAndTerminate("sourceAll must be specified")),
destination = Path.of(destination ?: printErrorAndTerminate("destination must be specified"))
)
}
}
},
object : Subcommand("validate", "Validate a recipe") {
override fun execute() {
if (agpVersion == null) {
if (mode != null) {
val cliMode = convertStringToMode(mode)
if (cliMode != RecipeConverter.Mode.WORKINGCOPY) {
error("The mode value should be either \"workingcopy\" or nothing")
}

val validator = WorkingCopyValidator()
validator.validate(
Path.of(source ?: error("Source can't be null"))
)
} else {
val validator = GithubPresubmitValidator()
validator.validateAll(
Path.of(sourceAll ?: error("SourceAll can't be null"))
)
val validator = WorkingCopyValidator()
validator.validate(
Path.of(source ?: error("Source must not be null"))
)
} else {
val validator = GithubPresubmitValidator()
validator.validateAll(
Path.of(sourceAll ?: error("SourceAll must not be null"))
)
}
} else {
val validator = InternalCIValidator(
agpVersion = agpVersion ?: error("agpVersion must not be null"),
repoLocation = repoLocation ?: error("repoLocation must not be null"),
gradlePath = gradlePath ?: error("gradlePath must not be null")
)
validator.validate(
sourceAll = Path.of(sourceAll ?: error("sourceAll must not be null")),
tmpFolder = if (tmpFolder != null) Path.of(tmpFolder) else null
)
}
}
} else {
val validator = InternalCIValidator(
agpVersion = agpVersion ?: error("agpVersion can't be null"),
repoLocation = repoLocation ?: error("repoLocation can't be null"),
gradlePath = gradlePath ?: error("gradlePath can't be null")
)
validator.validate(
sourceAll = Path.of(sourceAll ?: error("sourceAll can't be null")),
tmpFolder = if (tmpFolder != null) Path.of(tmpFolder) else null
)
}
},
)

val result = parser.parse(args)

if (result.commandName == toolName) {
println("Missing subcommand. Use $toolName -h to see usage")
exitProcess(1)
}
}

fun printErrorAndTerminate(msg: String): Nothing {
System.err.println(msg)
exitProcess(1)
}
4 changes: 2 additions & 2 deletions convert-tool/gradle/libs.versions.toml
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[versions]
kotlin = "1.7.10"
kotlin = "1.9.21"
guava = "30.1.1-jre"
kotlinx-cli = "0.3.4"
tomlj = "1.0.0"
semver = "0.3.1"
gradle-api = "7.3-20210825160000+0000"
gradle-api = "8.4"
slf4j = "1.7.10"
truth = "1.1.3"

Expand Down
2 changes: 1 addition & 1 deletion convert-tool/gradle/wrapper/gradle-wrapper.properties
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
1 change: 1 addition & 0 deletions convert-tool/settings.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ dependencyResolutionManagement {
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
repositories {
mavenCentral()
maven { url = uri("https://repo.gradle.org/gradle/libs-releases") }
}
}

Expand Down

0 comments on commit 6a169e8

Please sign in to comment.