erik/kobalt
erik/kobalt
1
0
Fork 0
mirror of https://github.com/ethauvin/kobalt.git synced 2025-04-27 00:38:11 -07:00
Code Releases Activity

added kobalt.version.last_checked to kobalt-wrapper.properties

Browse source
This commit is contained in:
voddan 2016-01-29 11:52:52 +03:00
parent 73b751f43f
commit 934db829dc
2 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/KobaltWrapperProperties.kt
View file

@ -4,6 +4,7 @@ import com.beust.kobalt.api.Kobalt
import com.google.inject.Inject import com.google.inject.Inject
import java.io.File import java.io.File
import java.io.FileReader import java.io.FileReader
import java.sql.Timestamp
import java.util.* import java.util.*
/** /**
@ -13,12 +14,14 @@ class KobaltWrapperProperties @Inject constructor() {
private val WRAPPER_DIR = KFiles.KOBALT_DIR + "/wrapper" private val WRAPPER_DIR = KFiles.KOBALT_DIR + "/wrapper"
private val KOBALT_WRAPPER_PROPERTIES = "kobalt-wrapper.properties" private val KOBALT_WRAPPER_PROPERTIES = "kobalt-wrapper.properties"
private val PROPERTY_VERSION = "kobalt.version" private val PROPERTY_VERSION = "kobalt.version"
private val PROPERTY_VERSION_LAST_CHECKED = "kobalt.version.last_checked"
private val PROPERTY_DOWNLOAD_URL = "kobalt.downloadUrl" private val PROPERTY_DOWNLOAD_URL = "kobalt.downloadUrl"
fun create(version: String) { fun create(version: String, versionLastChecked: Timestamp) {
log(2, "Creating $file with $version and ${defaultUrlFor(version)}") log(2, "Creating $file with $version and ${defaultUrlFor(version)}")
KFiles.saveFile(file, listOf( KFiles.saveFile(file, listOf(
"$PROPERTY_VERSION=$version" "$PROPERTY_VERSION=$version",
"$PROPERTY_VERSION_LAST_CHECKED=$versionLastChecked"
// "$PROPERTY_DOWNLOAD_URL=${defaultUrlFor(version)}" // "$PROPERTY_DOWNLOAD_URL=${defaultUrlFor(version)}"
).joinToString("\n")) ).joinToString("\n"))
} }
@ -33,7 +36,7 @@ class KobaltWrapperProperties @Inject constructor() {
get() { get() {
val config = file val config = file
if (!config.exists()) { if (!config.exists()) {
create(Kobalt.version) create(Kobalt.version, Timestamp(0))
} }
val result = Properties() val result = Properties()
@ -44,6 +47,9 @@ class KobaltWrapperProperties @Inject constructor() {
val version : String val version : String
get() = properties.getProperty(PROPERTY_VERSION) get() = properties.getProperty(PROPERTY_VERSION)
val versionLastChecked: Timestamp
get() = Timestamp.valueOf(properties.getProperty(PROPERTY_VERSION_LAST_CHECKED))
val downloadUrl : String val downloadUrl : String
get() = properties.getProperty(PROPERTY_DOWNLOAD_URL) get() = properties.getProperty(PROPERTY_DOWNLOAD_URL)
} }

4
src/main/kotlin/com/beust/kobalt/app/UpdateKobalt.kt
View file

@ -4,6 +4,7 @@ import com.beust.kobalt.api.Kobalt
import com.beust.kobalt.misc.* import com.beust.kobalt.misc.*
import com.beust.kobalt.wrapper.Main import com.beust.kobalt.wrapper.Main
import java.io.File import java.io.File
import java.sql.Timestamp
import java.util.concurrent.TimeoutException import java.util.concurrent.TimeoutException
import javax.inject.Inject import javax.inject.Inject
@ -13,7 +14,7 @@ import javax.inject.Inject
public class UpdateKobalt @Inject constructor(val github: GithubApi, val wrapperProperties: KobaltWrapperProperties) { public class UpdateKobalt @Inject constructor(val github: GithubApi, val wrapperProperties: KobaltWrapperProperties) {
fun updateKobalt() { fun updateKobalt() {
val newVersion = github.latestKobaltVersion val newVersion = github.latestKobaltVersion
wrapperProperties.create(newVersion.get()) wrapperProperties.create(newVersion.get(), Timestamp(System.currentTimeMillis()))
Main.main(arrayOf()) Main.main(arrayOf())
} }
@ -39,6 +40,7 @@ public class UpdateKobalt @Inject constructor(val github: GithubApi, val wrapper
} }
} }
} }
wrapperProperties.create(wrapperProperties.version, Timestamp(System.currentTimeMillis()))
} catch(ex: TimeoutException) { } catch(ex: TimeoutException) {
log(2, "Didn't get the new version in time, skipping it") log(2, "Didn't get the new version in time, skipping it")
} }