add update command

DaemonicLabs · Jan 24, 2021 · 182434d · 182434d
1 parent 42b332d
commit 182434d
Show file tree

Hide file tree

Showing 11 changed files with 65 additions and 27 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -159,7 +159,7 @@ subprojects {
                         className = "GeneratedConstants"
                     ) {
                         field("BUILD") value versionSuffix
-                        field("VERSION") value fullVersion
+                        field("VERSION") value fullVersion.substringBefore('-')
                         field("FULL_VERSION") value fullVersion
                         field("MAVEN_URL") value "https://nikky.moe/maven"
                         field("MAVEN_GROUP") value group.toString()

diff --git a/core/src/main/kotlin/voodoo/data/flat/FlatModPack.kt b/core/src/main/kotlin/voodoo/data/flat/FlatModPack.kt
@@ -73,10 +73,6 @@ data class FlatModPack(
             this@FlatModPack
         )
 
-        resolvedEntries.forEach { entry ->
-            logger.info { "RESOLVED: ${entry.id} $entry" }
-        }
-
         "validate".watch {
             resolvedEntries.forEach { lockEntry ->
                 val provider = Providers[lockEntry.providerType]

diff --git a/core/src/main/kotlin/voodoo/provider/JenkinsProvider.kt b/core/src/main/kotlin/voodoo/provider/JenkinsProvider.kt
@@ -5,7 +5,7 @@ import kotlinx.coroutines.channels.SendChannel
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.FlowCollector
 import kotlinx.coroutines.runBlocking
-import voodoo.core.GeneratedConstants.VERSION
+import voodoo.core.GeneratedConstants
 import voodoo.data.EntryReportData
 import voodoo.data.Quadruple
 import voodoo.data.flat.FlatEntry
@@ -26,7 +26,7 @@ import java.util.*
  */
 
 object JenkinsProvider : ProviderBase("Jenkins Provider") {
-    const val useragent = "voodoo/$VERSION (https://github.com/DaemonicLabs/Voodoo)"
+    const val useragent = "voodoo/${GeneratedConstants.FULL_VERSION} (https://github.com/DaemonicLabs/Voodoo)"
 
     override suspend fun resolve(
         entry: FlatEntry,

diff --git a/samples/fabricpack/lock/0.0.3/lock.pack.json b/samples/fabricpack/lock/0.0.3/lock.pack.json
@@ -94,6 +94,14 @@
             "projectID": 317514,
             "fileID": 3174695
         },
+        {
+            "type": "jenkins",
+            "id": "opencomputers",
+            "path": "mods",
+            "jenkinsUrl": "https://ci.cil.li/",
+            "job": "OpenComputers-MC1.12",
+            "buildNumber": 213
+        },
         {
             "type": "curse",
             "id": "roughly-enough-items",

diff --git a/util/download/src/main/kotlin/voodoo.util/Client.kt b/util/download/src/main/kotlin/voodoo.util/Client.kt
@@ -8,7 +8,7 @@ import io.ktor.client.features.json.serializer.KotlinxSerializer
 import io.ktor.util.KtorExperimentalAPI
 import voodoo.util.download.GeneratedConstants
 
-const val useragent = "voodoo/${GeneratedConstants.VERSION} (https://github.com/DaemonicLabs/Voodoo)"
+const val useragent = "voodoo/${GeneratedConstants.FULL_VERSION} (https://github.com/DaemonicLabs/Voodoo)"
 // "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/69.0.3497.100 Safari/537.36" // ""voodoo/$VERSION (https://github.com/elytra/Voodoo)"
 
 inline fun <T> useClient(createClient: () -> HttpClient = {

diff --git a/voodoo/src/main/kotlin/voodoo/cli/CompileCommand.kt b/voodoo/src/main/kotlin/voodoo/cli/CompileCommand.kt
@@ -53,7 +53,7 @@ class CompileCommand() : CliktCommand(
                 val config = Configuration.parse(rootDir = rootDir)
 
                 val packs: Map<Pair<String, MetaPack>, List<VersionPack>> = packFiles.map { packFile ->
-                    val baseDir = packFile.absoluteFile.parentFile
+                    val baseDir = rootDir.resolve(packFile.absoluteFile.parentFile)
                     val id = baseDir.name
                     val metaPackFile = baseDir.resolve(MetaPack.FILENAME)
                     val versionPack = VersionPack.parse(packFile = packFile)

diff --git a/voodoo/src/main/kotlin/voodoo/cli/UpdateCommand.kt b/voodoo/src/main/kotlin/voodoo/cli/UpdateCommand.kt
@@ -0,0 +1,50 @@
+package voodoo.cli
+
+import com.github.ajalt.clikt.core.CliktCommand
+import com.github.ajalt.clikt.core.requireObject
+import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.slf4j.MDCContext
+import mu.KotlinLogging
+import mu.withLoggingContext
+import voodoo.util.maven.MavenUtil
+import voodoo.voodoo.GeneratedConstants
+import java.io.StringWriter
+import java.util.*
+
+class UpdateCommand : CliktCommand(
+    name = "update",
+    help = "updates the version of voodoo"
+) {
+    private val logger = KotlinLogging.logger {}
+    val cliContext by requireObject<CLIContext>()
+
+    override fun run(): Unit = withLoggingContext("command" to commandName) {
+        val rootDir = cliContext.rootDir
+
+        runBlocking(MDCContext()) {
+            val propertiesFile = rootDir.resolve("wrapper/wrapper.properties")
+            propertiesFile.absoluteFile.parentFile.mkdirs()
+
+            val properties = Properties().also { prop ->
+                propertiesFile.bufferedReader().use {
+                    prop.load(it)
+                }
+            }
+
+            val version = MavenUtil.getLatestVersionFromMavenMetadata(
+                GeneratedConstants.MAVEN_URL,
+                GeneratedConstants.MAVEN_GROUP,
+                "voodoo"
+            )
+            val groupPath = GeneratedConstants.MAVEN_GROUP.replace('.', '/')
+            properties["distributionUrl"] =
+                "${GeneratedConstants.MAVEN_URL}/$groupPath/voodoo/$version/voodoo-$version-${GeneratedConstants.MAVEN_SHADOW_CLASSIFIER}.jar"
+//            prop["distributionPath"] = "wrapper/bin"
+
+            StringWriter().use {
+                properties.store(it, "generated by: voodoo generateWrapper")
+                propertiesFile.writeText(it.toString())
+            }
+        }
+    }
+}
diff --git a/voodoo/src/main/kotlin/voodoo/cli/VoodooCommand.kt b/voodoo/src/main/kotlin/voodoo/cli/VoodooCommand.kt
@@ -34,6 +34,7 @@ class VoodooCommand(invocation: String = "voodoo") : CliktCommand(
             PackageCommand(),
             LaunchCommand(),
             GenerateSchemaCommand(),
+            UpdateCommand()
         )
     }
 

diff --git a/voodoo/src/main/kotlin/voodoo/cli/launch/LaunchMultiMCCommand.kt b/voodoo/src/main/kotlin/voodoo/cli/launch/LaunchMultiMCCommand.kt
@@ -49,7 +49,7 @@ class LaunchMultiMCCommand(): CliktCommand(
             //TODO: look up rootDir based on lockpack input file
             val rootDir = cliContext.rootDir
 
-            val baseDir = packFile.absoluteFile.parentFile
+            val baseDir = rootDir.resolve(packFile.absoluteFile.parentFile)
             val id = baseDir.name
             stopwatch {
                 val metaPackFile = baseDir.resolve(MetaPack.FILENAME)

diff --git a/wrapper/multimc-installer/build.gradle.kts b/wrapper/multimc-installer/build.gradle.kts
diff --git a/wrapper/multimc-installer/src/main/resources/maven.properties b/wrapper/multimc-installer/src/main/resources/maven.properties