Migrating to Retrofit2.

2025-04-26 00:17:11 -07:00 · 2016-03-11 22:53:49 +04:00 · 2016-03-11 22:53:49 +04:00 · 31d25a80c4
commit 31d25a80c4
parent 238a4df95b
13 changed files with 166 additions and 27 deletions
--- a/.idea/libraries/kobalt__Compile_.xml
+++ b/.idea/libraries/kobalt__Compile_.xml
@ -12,9 +12,9 @@
      <root url="jar://$USER_HOME$/.kobalt/repository/com/google/code/findbugs/jsr305/3.0.1/jsr305-3.0.1.jar!/" />
      <root url="jar://$USER_HOME$/.kobalt/repository/com/github/spullara/mustache/java/compiler/0.9.1/compiler-0.9.1.jar!/" />
      <root url="jar://$USER_HOME$/.kobalt/repository/org/jetbrains/kotlin/kotlin-compiler-embeddable/1.0.0/kotlin-compiler-embeddable-1.0.0.jar!/" />
-      <root url="jar://$USER_HOME$/.kobalt/repository/com/google/code/gson/gson/2.4/gson-2.4.jar!/" />
      <root url="jar://$USER_HOME$/.kobalt/repository/com/squareup/okhttp/okhttp/2.5.0/okhttp-2.5.0.jar!/" />
-      <root url="jar://$USER_HOME$/.kobalt/repository/com/google/guava/guava/19.0-rc2/guava-19.0-rc2.jar!/" />
+      <root url="jar://$USER_HOME$/.kobalt/repository/com/google/code/gson/gson/2.6.2/gson-2.6.2.jar!/" />
+      <root url="jar://$USER_HOME$/.kobalt/repository/com/google/guava/guava/20.0-SNAPSHOT/guava-20.0-SNAPSHOT.jar!/" />
      <root url="jar://$USER_HOME$/.kobalt/repository/com/google/inject/guice/4.0/guice-4.0.jar!/" />
    </CLASSES>
    <JAVADOC />
--- a/.idea/libraries/kobalt__Test_.xml
+++ b/.idea/libraries/kobalt__Test_.xml
@ -1,14 +1,9 @@
 <component name="libraryTable">
  <library name="kobalt (Test)">
    <CLASSES>
-      <root url="jar://$USER_HOME$/.kobalt/repository/junit/junit/4.10/junit-4.10.jar!/" />
-      <root url="jar://$USER_HOME$/.kobalt/repository/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar!/" />
-      <root url="jar://$USER_HOME$/.kobalt/repository/org/apache/ant/ant/1.7.0/ant-1.7.0.jar!/" />
      <root url="jar://$USER_HOME$/.kobalt/repository/com/beust/jcommander/1.48/jcommander-1.48.jar!/" />
      <root url="jar://$USER_HOME$/.kobalt/repository/org/beanshell/bsh/2.0b4/bsh-2.0b4.jar!/" />
-      <root url="jar://$USER_HOME$/.kobalt/repository/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar!/" />
-      <root url="jar://$USER_HOME$/.kobalt/repository/org/yaml/snakeyaml/1.15/snakeyaml-1.15.jar!/" />
-      <root url="jar://$USER_HOME$/.kobalt/repository/org/testng/testng/6.9.9/testng-6.9.9.jar!/" />
+      <root url="jar://$USER_HOME$/.kobalt/repository/org/testng/testng/6.9.11-SNAPSHOT/testng-6.9.11-SNAPSHOT.jar!/" />
    </CLASSES>
    <JAVADOC />
    <SOURCES />
--- a/.idea/libraries/kobalt_jar.xml
+++ b/.idea/libraries/kobalt_jar.xml
@ -1,7 +1,7 @@
 <component name="libraryTable">
  <library name="kobalt.jar">
    <CLASSES>
-      <root url="jar://$USER_HOME$/.kobalt/wrapper/dist/0.636/kobalt/wrapper/kobalt-0.636.jar!/" />
+      <root url="jar://$USER_HOME$/.kobalt/wrapper/dist/kobalt-0.666/kobalt/wrapper/kobalt-0.666.jar!/" />
    </CLASSES>
    <JAVADOC />
    <SOURCES />
--- a/.idea/libraries/kobalt_plugin_api__Compile_.xml
+++ b/.idea/libraries/kobalt_plugin_api__Compile_.xml
@ -3,18 +3,21 @@
    <CLASSES>
      <root url="jar://$USER_HOME$/.kobalt/repository/org/codehaus/plexus/plexus-utils/3.0.22/plexus-utils-3.0.22.jar!/" />
      <root url="jar://$USER_HOME$/.kobalt/repository/aopalliance/aopalliance/1.0/aopalliance-1.0.jar!/" />
-      <root url="jar://$USER_HOME$/.kobalt/repository/com/google/inject/extensions/guice-assistedinject/4.0/guice-assistedinject-4.0.jar!/" />
      <root url="jar://$USER_HOME$/.kobalt/repository/org/jetbrains/kotlinx/kotlinx.dom/0.0.9/kotlinx.dom-0.0.9.jar!/" />
+      <root url="jar://$USER_HOME$/.kobalt/repository/com/google/inject/extensions/guice-assistedinject/4.0/guice-assistedinject-4.0.jar!/" />
+      <root url="jar://$USER_HOME$/.kobalt/repository/com/squareup/retrofit2/retrofit/2.0.0-beta4/retrofit-2.0.0-beta4.jar!/" />
      <root url="jar://$USER_HOME$/.kobalt/repository/com/beust/jcommander/1.48/jcommander-1.48.jar!/" />
      <root url="jar://$USER_HOME$/.kobalt/repository/com/squareup/retrofit/retrofit/1.9.0/retrofit-1.9.0.jar!/" />
      <root url="jar://$USER_HOME$/.kobalt/repository/com/squareup/okio/okio/1.6.0/okio-1.6.0.jar!/" />
      <root url="jar://$USER_HOME$/.kobalt/repository/javax/inject/javax.inject/1/javax.inject-1.jar!/" />
      <root url="jar://$USER_HOME$/.kobalt/repository/org/apache/maven/maven-model/3.3.3/maven-model-3.3.3.jar!/" />
      <root url="jar://$USER_HOME$/.kobalt/repository/io/reactivex/rxjava/1.0.16/rxjava-1.0.16.jar!/" />
-      <root url="jar://$USER_HOME$/.kobalt/repository/com/google/code/gson/gson/2.4/gson-2.4.jar!/" />
+      <root url="jar://$USER_HOME$/.kobalt/repository/com/google/code/gson/gson/2.6.2/gson-2.6.2.jar!/" />
+      <root url="jar://$USER_HOME$/.kobalt/repository/com/squareup/retrofit2/converter-gson/2.0.0-beta4/converter-gson-2.0.0-beta4.jar!/" />
      <root url="jar://$USER_HOME$/.kobalt/repository/com/squareup/okhttp/okhttp/2.5.0/okhttp-2.5.0.jar!/" />
-      <root url="jar://$USER_HOME$/.kobalt/repository/com/google/guava/guava/19.0-rc2/guava-19.0-rc2.jar!/" />
+      <root url="jar://$USER_HOME$/.kobalt/repository/com/google/guava/guava/20.0-SNAPSHOT/guava-20.0-SNAPSHOT.jar!/" />
      <root url="jar://$USER_HOME$/.kobalt/repository/com/google/inject/guice/4.0/guice-4.0.jar!/" />
+      <root url="jar://$USER_HOME$/.kobalt/repository/com/squareup/okhttp3/okhttp/3.2.0/okhttp-3.2.0.jar!/" />
    </CLASSES>
    <JAVADOC />
    <SOURCES />
--- a/.idea/libraries/kobalt_plugin_api__Test_.xml
+++ b/.idea/libraries/kobalt_plugin_api__Test_.xml
@ -1,15 +1,6 @@
 <component name="libraryTable">
  <library name="kobalt-plugin-api (Test)">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.kobalt/repository/junit/junit/4.10/junit-4.10.jar!/" />
-      <root url="jar://$USER_HOME$/.kobalt/repository/org/apache/ant/ant/1.7.0/ant-1.7.0.jar!/" />
-      <root url="jar://$USER_HOME$/.kobalt/repository/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar!/" />
-      <root url="jar://$USER_HOME$/.kobalt/repository/com/beust/jcommander/1.48/jcommander-1.48.jar!/" />
-      <root url="jar://$USER_HOME$/.kobalt/repository/org/beanshell/bsh/2.0b4/bsh-2.0b4.jar!/" />
-      <root url="jar://$USER_HOME$/.kobalt/repository/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar!/" />
-      <root url="jar://$USER_HOME$/.kobalt/repository/org/yaml/snakeyaml/1.15/snakeyaml-1.15.jar!/" />
-      <root url="jar://$USER_HOME$/.kobalt/repository/org/testng/testng/6.9.9/testng-6.9.9.jar!/" />
-    </CLASSES>
+    <CLASSES />
    <JAVADOC />
    <SOURCES />
  </library>
--- a/kobalt.iml
+++ b/kobalt.iml
@ -7,6 +7,7 @@
      <sourceFolder url="file://$MODULE_DIR$/src/main/kotlin" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/src/test/kotlin" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
--- a/kobalt/src/Build.kt
+++ b/kobalt/src/Build.kt
@ -71,7 +71,10 @@ val kobaltPluginApi = project {
                "org.apache.maven:maven-model:3.3.3",
                "io.reactivex:rxjava:1.0.16",
                "com.google.code.gson:gson:2.4",
+                "com.squareup.okhttp3:okhttp:3.2.0",
                "com.squareup.retrofit:retrofit:1.9.0",
+                "com.squareup.retrofit2:retrofit:2.0.0-beta4",
+                "com.squareup.retrofit2:converter-gson:2.0.0-beta4",
                "com.beust:jcommander:1.48"
                )
    }
--- a/kobalt/wrapper/kobalt-wrapper.properties
+++ b/kobalt/wrapper/kobalt-wrapper.properties
@ -1 +1 @@
-kobalt.version=0.666
+kobalt.version=0.667
--- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/GithubApi2.kt
+++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/GithubApi2.kt
@ -0,0 +1,146 @@
+package com.beust.kobalt.misc
+
+import com.beust.kobalt.KobaltException
+import com.beust.kobalt.internal.DocUrl
+import com.beust.kobalt.maven.Http
+import com.google.gson.annotations.SerializedName
+import com.google.inject.Inject
+import com.squareup.okhttp.Headers
+import retrofit.RetrofitError
+import retrofit.mime.TypedFile
+import retrofit2.Call
+import retrofit2.Retrofit
+import retrofit2.converter.gson.GsonConverterFactory
+import retrofit2.http.*
+import rx.Observable
+import java.io.File
+import java.util.*
+import java.util.concurrent.Callable
+import java.util.concurrent.Future
+
+class GithubApi2 @Inject constructor(
+        val executors: KobaltExecutors, val localProperties: LocalProperties, val http: Http) {
+
+    companion object {
+        const val PROPERTY_ACCESS_TOKEN = "github.accessToken"
+        const val PROPERTY_USERNAME = "github.username"
+    }
+
+    private val DOC_URL = DocUrl.PUBLISH_PLUGIN_URL
+
+    //
+    // JSON mapped classes that get sent up and down
+    //
+    class CreateRelease(@SerializedName("tag_name") var tagName: String? = null,
+            var name: String? = tagName)
+    class CreateReleaseResponse(var id: String? = null, @SerializedName("upload_url") var uploadUrl: String?)
+    class UploadAssetResponse(var id: String? = null, val name: String? = null)
+    class ReleasesResponse(@SerializedName("tag_name") var tagName: String? = null,
+            var name: String? = tagName)
+
+    interface Api {
+        @POST("/repos/{owner}/{repo}/releases")
+        fun createRelease(@Path("owner") owner: String,
+                @Path("repo") repo: String,
+                @Query("access_token") accessToken: String,
+                @Body createRelease: CreateRelease): Call<CreateReleaseResponse>
+
+        @GET("/repos/{owner}/{repo}/releases")
+        fun getReleases(@Path("owner") owner: String,
+                @Path("repo") repo: String,
+                @Query("access_token") accessToken: String): Call<List<ReleasesResponse>>
+
+        @GET("/repos/{owner}/{repo}/releases")
+        fun getReleasesNoAuth(@Path("owner") owner: String,
+                @Path("repo") repo: String): Call<List<ReleasesResponse>>
+    }
+
+    //
+    // Read only Api
+    //
+    private val service = Retrofit.Builder()
+            .baseUrl("https://api.github.com")
+            .addConverterFactory(GsonConverterFactory.create())
+            .build()
+            .create(Api::class.java)
+
+    fun uploadRelease(packageName: String, tagName: String, zipFile: File) {
+        log(1, "Uploading release ${zipFile.name}")
+
+        val username = localProperties.get(PROPERTY_USERNAME, DOC_URL)
+        val accessToken = localProperties.get(PROPERTY_ACCESS_TOKEN, DOC_URL)
+        try {
+            val response = service.createRelease(username, packageName, accessToken, CreateRelease(tagName))
+                    .execute()
+                    .body()
+
+            uploadAsset(accessToken, response.uploadUrl!!, TypedFile("application/zip", zipFile),
+                    tagName)
+                .toBlocking()
+                .forEach { action ->
+                    log(1, "\n${zipFile.name} successfully uploaded")
+                }
+        } catch(e: RetrofitError) {
+            throw KobaltException("Couldn't upload release: " + e.message, e)
+//            val error = parseRetrofitError(e)
+//            throw KobaltException("Couldn't upload release, ${error.message}: "
+//                    + error.errors[0].code + " field: " + error.errors[0].field)
+        }
+    }
+
+    private fun uploadAsset(token: String, uploadUrl: String, typedFile: TypedFile, tagName: String)
+            : Observable<UploadAssetResponse> {
+        val strippedUrl = uploadUrl.substring(0, uploadUrl.indexOf("{"))
+        val fileName = typedFile.file().name
+        val url = "$strippedUrl?name=$fileName&label=$fileName"
+        val headers = Headers.of("Authorization", "token $token")
+        val totalSize = typedFile.file().length()
+        http.uploadFile(url = url, file = typedFile, headers = headers, post = true, // Github requires POST
+                progressCallback = http.percentProgressCallback(totalSize))
+
+        return Observable.just(UploadAssetResponse(tagName, tagName))
+    }
+
+    val latestKobaltVersion: Future<String>
+        get() {
+            val callable = Callable<String> {
+                var result = "0"
+
+                val username = localProperties.getNoThrows(GithubApiOld.PROPERTY_USERNAME, DOC_URL)
+                val accessToken = localProperties.getNoThrows(GithubApiOld.PROPERTY_ACCESS_TOKEN, DOC_URL)
+                try {
+                    val req =
+                            if (username != null && accessToken != null) {
+                                service.getReleases(username, "kobalt", accessToken)
+                            } else {
+                                service.getReleasesNoAuth("cbeust", "kobalt")
+                            }
+                    val releases = req.execute()
+                        .body()
+                    releases.firstOrNull()?.let {
+                        try {
+                            result = listOf(it.name, it.tagName).filterNotNull().first { !it.isBlank() }
+                        } catch(ex: NoSuchElementException) {
+                            throw KobaltException("Couldn't find the latest release")
+                        }
+                    }
+                } catch(e: RetrofitError) {
+                    log(1, "Couldn't retrieve releases from github: " + e.message)
+                    e.printStackTrace()
+//                    val error = parseRetrofitError(e)
+//                    val details = if (error.errors != null) {
+//                        error.errors[0]
+//                    } else {
+//                        null
+//                    }
+//                    // TODO: If the credentials didn't work ("bad credentials"), should start again
+//                    // using cbeust/kobalt, like above. Right now, just bailing.
+//                    log(2, "Couldn't retrieve releases from github, ${error.message ?: e}: "
+//                            + details?.code + " field: " + details?.field)
+                }
+                result
+            }
+
+            return executors.miscExecutor.submit(callable)
+        }
+}
--- a/src/main/kotlin/com/beust/kobalt/Main.kt
+++ b/src/main/kotlin/com/beust/kobalt/Main.kt
@ -58,7 +58,7 @@ private class Main @Inject constructor(
        val files: KFiles,
        val executors: KobaltExecutors,
        val checkVersions: CheckVersions,
-        val github: GithubApi,
+        val github: GithubApi2,
        val updateKobalt: UpdateKobalt,
        val client: KobaltClient,
        val server: KobaltServer,
--- a/src/main/kotlin/com/beust/kobalt/app/UpdateKobalt.kt
+++ b/src/main/kotlin/com/beust/kobalt/app/UpdateKobalt.kt
@ -14,7 +14,7 @@ import javax.inject.Inject
 /**
 * Update Kobalt to the latest version.
 */
-class UpdateKobalt @Inject constructor(val github: GithubApi, val wrapperProperties: KobaltWrapperProperties) {
+class UpdateKobalt @Inject constructor(val github: GithubApi2, val wrapperProperties: KobaltWrapperProperties) {
    fun updateKobalt() {
        val newVersion = github.latestKobaltVersion
        wrapperProperties.create(newVersion.get())
--- a/src/main/kotlin/com/beust/kobalt/plugin/publish/PublishPlugin.kt
+++ b/src/main/kotlin/com/beust/kobalt/plugin/publish/PublishPlugin.kt
@ -16,7 +16,7 @@ import javax.inject.Singleton
@Suppress("VARIABLE_WITH_REDUNDANT_INITIALIZER")
@Singleton
 public class PublishPlugin @Inject constructor(val files: KFiles, val factory: PomGenerator.IFactory,
-            val bintrayFactory: BintrayApi.IFactory, val github: GithubApi, val localProperties: LocalProperties)
+            val bintrayFactory: BintrayApi.IFactory, val github: GithubApi2, val localProperties: LocalProperties)
        : BasePlugin() {

    override val name = PLUGIN_NAME
--- a/src/main/resources/kobalt.properties
+++ b/src/main/resources/kobalt.properties
@ -1 +1 @@
-kobalt.version=0.666
+kobalt.version=0.667