use codacy scala api

Author: mrfyda

build.sbt

@@ -2,7 +2,7 @@ import Dependencies._
 
 name := "sbt-codacy-coverage"
 
-version := "1.0.4"
+version := "1.1.0"
 
 scalaVersion := "2.10.4"
 
@@ -19,9 +19,7 @@ resolvers ++= Seq(
 )
 
 libraryDependencies ++= Seq(
-  playJson,
-  playWs,
-  jGit,
+  codacyScalaApi,
   scalaTest
 )
 

project/Dependencies.scala

@@ -2,9 +2,7 @@ import sbt._
 
 object Dependencies {
 
-  lazy val playJson = "com.typesafe.play" %% "play-json" % "2.3.8"
-  lazy val playWs = "com.typesafe.play" %% "play-ws" % "2.3.8"
-  lazy val jGit = "org.eclipse.jgit" % "org.eclipse.jgit" % "3.6.2.201501210735-r"
+  lazy val codacyScalaApi = "com.codacy" %% "codacy-api-scala" % "1.0.0"
   lazy val scalaTest = "org.scalatest" %% "scalatest" % "2.2.4" % "test"
 
 }

src/main/scala/com/codacy/CodacyCoveragePlugin.scala

@@ -2,33 +2,28 @@ package com.codacy
 
 import java.io.File
 
-import com.codacy.api.CodacyAPIClient
-import com.codacy.io.FileUtils
+import com.codacy.api.client.CodacyClient
+import com.codacy.api.helpers.FileHelper
+import com.codacy.api.service.CoverageServices
 import com.codacy.parsers.CoberturaParser
-import com.codacy.vcs.GitClient
-import play.api.libs.json.Json
 import sbt.Keys._
 import sbt._
 
-import scala.util.Try
-
 object CodacyCoveragePlugin extends AutoPlugin {
 
   object autoImport {
     val codacyCoverage = taskKey[Unit]("Upload coverage reports to Codacy.")
     val codacyProjectToken = settingKey[Option[String]]("Your project token.")
-    val codacyProjectTokenFile = settingKey[Option[String]]("Path for file containing your project token.")
     val coberturaFile = settingKey[File]("Path for project Cobertura file.")
     val codacyApiBaseUrl = settingKey[Option[String]]("The base URL for the Codacy API.")
 
     lazy val baseSettings: Seq[Def.Setting[_]] = Seq(
       codacyCoverage := {
         codacyCoverageCommand(state.value, baseDirectory.value, coberturaFile.value,
           crossTarget.value / "coverage-report" / "codacy-coverage.json",
-          codacyProjectToken.value, codacyProjectTokenFile.value, codacyApiBaseUrl.value)
+          codacyProjectToken.value, codacyApiBaseUrl.value)
       },
       codacyProjectToken := None,
-      codacyProjectTokenFile := None,
       codacyApiBaseUrl := None,
       coberturaFile := crossTarget.value / ("coverage-report" + File.separator + "cobertura.xml")
     )
@@ -45,64 +40,43 @@ object CodacyCoveragePlugin extends AutoPlugin {
   private val publicApiBaseUrl = "https://www.codacy.com"
 
   private def codacyCoverageCommand(state: State, rootProjectDir: File, coberturaFile: File, codacyCoverageFile: File,
-                                    codacyToken: Option[String], codacyTokenFile: Option[String], codacyApiBaseUrl: Option[String]): Unit = {
+                                    codacyToken: Option[String], codacyApiBaseUrl: Option[String]): Unit = {
     implicit val logger: Logger = state.log
 
-    getProjectToken(codacyToken, codacyTokenFile).fold[State] {
-      logger.error("Project token not defined.")
-      state.exit(ok = false)
-    } {
-      projectToken =>
-        Try {
-          new GitClient(rootProjectDir).latestCommitUuid()
-        }.toOption.fold[State] {
-          logger.error("Could not get current commit.")
-          state.exit(ok = false)
-        } {
-          commitUuid =>
-
-            logger.info(s"Preparing coverage data for commit ${commitUuid.take(7)}...")
-
-            FileUtils.get(coberturaFile).fold[State] {
-              state.exit(ok = false)
-            } {
-              coberturaFile =>
-
-                val reader = new CoberturaParser(coberturaFile, rootProjectDir)
-                val report = reader.generateReport()
-                FileUtils.write(codacyCoverageFile, Json.toJson(report).toString())
-
-                logger.info(s"Uploading coverage data...")
-
-                new CodacyAPIClient().postCoverageFile(projectToken,
-                                                       commitUuid,
-                                                       codacyCoverageFile,
-                                                       getApiBaseUrl(codacyApiBaseUrl)).fold[State](
-                  error => {
-                    logger.error(s"Failed to upload data. Reason: $error")
-                    state.exit(ok = false)
-                  },
-                  response => {
-                    logger.success(s"Coverage data uploaded. $response")
-                    state
-                  })
-            }
+    FileHelper.withTokenAndCommit(codacyToken) {
+      case (projectToken, commitUUID) =>
+
+        val reader = new CoberturaParser(coberturaFile, rootProjectDir)
+        val report = reader.generateReport()
+
+        FileHelper.writeJsonToFile(codacyCoverageFile, report)
+
+        val codacyClient = new CodacyClient(getApiBaseUrl(codacyApiBaseUrl), Some(projectToken))
+        val coverageServices = new CoverageServices(codacyClient)
+
+        coverageServices.sendReport(commitUUID, report) match {
+          case requestResponse if requestResponse.hasError =>
+            logger.error(s"Failed to upload data. Reason: ${requestResponse.message}")
+            state.exit(ok = false)
+            Left(requestResponse.message)
+          case requestResponse =>
+            logger.success(s"Coverage data uploaded. ${requestResponse.message}")
+            Right(state)
         }
+    } match {
+      case Left(error) =>
+        logger.error(error)
+        state.exit(ok = false)
+      case _ =>
     }
   }
 
-  private def getApiBaseUrl(codacyApiBaseUrl: Option[String]): String = {
+  private def getApiBaseUrl(codacyApiBaseUrl: Option[String]): Option[String] = {
     // Check for an environment variable to override the API URL.
     // If it doesn't exist, try the build options or default to the public API.
     sys.env.get("CODACY_API_BASE_URL")
       .orElse(codacyApiBaseUrl)
-      .getOrElse(publicApiBaseUrl)
-  }
-
-  private def getProjectToken(codacyProjectToken: Option[String], codacyProjectTokenFile: Option[String]) = {
-    sys.env.get("CODACY_PROJECT_TOKEN")
-      .orElse(codacyProjectToken)
-      .orElse(codacyProjectTokenFile.flatMap(FileUtils.read))
+      .orElse(Some(publicApiBaseUrl))
   }
 
 }

src/main/scala/com/codacy/api/CodacyAPIClient.scala

@@ -2,10 +2,10 @@ package com.codacy.parsers
 
 import java.io.File
 
-import com.codacy.api.{CodacyCoverageFileReport, CodacyCoverageReport}
+import com.codacy.api.{CoverageFileReport, CoverageReport}
 
 import scala.xml.factory.XMLLoader
-import scala.xml.{SAXParser, Elem, Node}
+import scala.xml.{Elem, Node, SAXParser}
 
 object XML extends XMLLoader[Elem] {
   override def parser: SAXParser = {
@@ -26,7 +26,7 @@ class CoberturaParser(coberturaFile: File, rootProject: File) {
 
   val rootProjectDir = rootProject.getAbsolutePath + File.separator
 
-  def generateReport(): CodacyCoverageReport = {
+  def generateReport(): CoverageReport = {
     val total = (elem \\ "coverage" \ "@line-rate").headOption.map {
       total =>
         (total.text.toFloat * 100).toInt
@@ -39,10 +39,10 @@ class CoberturaParser(coberturaFile: File, rootProject: File) {
         lineCoverage(file)
     }.toSeq
 
-    CodacyCoverageReport(total, filesCoverage)
+    CoverageReport(total, filesCoverage)
   }
 
-  private def lineCoverage(sourceFilename: String): CodacyCoverageFileReport = {
+  private def lineCoverage(sourceFilename: String): CoverageFileReport = {
     val file = (elem \\ "class").filter {
       n: Node =>
         (n \\ "@filename").text == sourceFilename
@@ -66,7 +66,7 @@ class CoberturaParser(coberturaFile: File, rootProject: File) {
         key -> value
     }
 
-    CodacyCoverageFileReport(sanitiseFilename(sourceFilename), fileHit, lineHitMap)
+    CoverageFileReport(sanitiseFilename(sourceFilename), fileHit, lineHitMap)
   }
 
   private def sanitiseFilename(filename: String): String = {