Allow unknown languages (#54)

* Remove problematic dependency

* Allow use of unkown languages

* Bump codacy-api-scala and coverage-parser

Author: DReigada

build.sbt

@@ -24,7 +24,6 @@ libraryDependencies ++= Seq(
   coverageParser,
   scopt,
   log,
-  playLog,
   raptureJsonPlay,
   scalaTest
 )

project/Dependencies.scala

@@ -2,12 +2,11 @@ import sbt._
 
 object Dependencies {
 
-  lazy val codacyScalaApi = "com.codacy" %% "codacy-api-scala" % "2.0.4"
-  lazy val coverageParser = "com.codacy" %% "coverage-parser" % "1.1.9"
+  lazy val codacyScalaApi = "com.codacy" %% "codacy-api-scala" % "3.0.1"
+  lazy val coverageParser = "com.codacy" %% "coverage-parser" % "2.0.0"
   lazy val scopt = "com.github.scopt" %% "scopt" % "3.3.0"
   lazy val log = "ch.qos.logback" % "logback-classic" % "1.2.1"
-  lazy val playLog = "com.typesafe.play" % "play-logback_2.11" % "2.5.12"
-  lazy val raptureJsonPlay = "com.propensive" %% "rapture-json-play" % "2.0.0-M7" 
+  lazy val raptureJsonPlay = "com.propensive" %% "rapture-json-play" % "2.0.0-M7"
 
   lazy val scalaTest = "org.scalatest" %% "scalatest" % "2.2.4" % "test" 
 

src/main/resources/logback-test.xml

@@ -1,7 +1,5 @@
 <configuration>
 
-    <conversionRule conversionWord="coloredLevel" converterClass="play.api.Logger$ColoredLevel"/>
-
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
             <pattern>%date %-16coloredLevel %-10.-10logger %message %n</pattern>

src/main/scala/com/codacy/CodacyCoverageReporter.scala

@@ -2,6 +2,7 @@ package com.codacy
 
 import java.io.File
 import java.net.URL
+
 import ch.qos.logback.classic.{Level, Logger}
 import com.codacy.api.client.{CodacyClient, FailedResponse, SuccessfulResponse}
 import com.codacy.api.helpers.FileHelper
@@ -10,10 +11,11 @@ import com.codacy.api.{CoverageFileReport, CoverageReport, Language}
 import com.codacy.parsers.CoverageParserFactory
 import com.codacy.transformation.PathPrefixer
 import org.slf4j.LoggerFactory
+import rapture.json.jsonBackends.play._
 import rapture.json.{Json, Serializer}
-import scopt.{OptionParser, Read}
+import scopt.OptionParser
+
 import scala.util.Try
-import rapture.json.jsonBackends.play._
 
 object CodacyCoverageReporter {
 
@@ -25,16 +27,19 @@ object CodacyCoverageReporter {
     logger
   }
 
-  case class Config(language: Language.Value = Language.Python,
+  case class Config(languageStr: String = Language.Python.toString,
+                    forceLanguage: Boolean = false,
                     projectToken: String = getProjectToken,
                     coverageReport: File = new File("coverage.xml"),
                     codacyApiBaseUrl: String = getApiBaseUrl,
                     prefix: String = "",
                     debug: Boolean = false,
-                    commitUUID: Option[String] = commitUUIDOpt)
+                    commitUUID: Option[String] = commitUUIDOpt) {
 
-  implicit def languageRead: Read[Language.Value] = Read.reads { (s: String) =>
-    Language.withName(s)
+    lazy val language: Language.Value =
+      Language.values.find(_.toString == languageStr).getOrElse(Language.NotDefined)
+
+    lazy val hasKnownLanguage: Boolean = language != Language.NotDefined
   }
 
   private def getApiBaseUrl: String = {
@@ -71,6 +76,9 @@ object CodacyCoverageReporter {
           logger.error("Maybe you forgot the http:// or https:// ?")
         }
 
+      case Some(config) if !config.hasKnownLanguage && !config.forceLanguage =>
+        logger.error(s"Invalid language ${config.languageStr}")
+
       case Some(config) if config.projectToken.trim.nonEmpty =>
         if (config.debug) {
           logger.setLevel(Level.DEBUG)
@@ -88,9 +96,12 @@ object CodacyCoverageReporter {
   def buildParser: OptionParser[Config] = {
     new scopt.OptionParser[Config]("codacy-coverage-reporter") {
       head("codacy-coverage-reporter", getClass.getPackage.getImplementationVersion)
-      opt[Language.Value]('l', "language").required().action { (x, c) =>
-        c.copy(language = x)
+      opt[String]('l', "language").required().action { (x, c) =>
+        c.copy(languageStr = x)
       }.text("your project language")
+      opt[Unit]('f', "forceLanguage").optional().hidden().action { (_, c) =>
+        c.copy(forceLanguage = true)
+      }
       opt[String]('t', "projectToken").optional().action { (x, c) =>
         c.copy(projectToken = x)
       }.text("your project API token")
@@ -127,15 +138,15 @@ object CodacyCoverageReporter {
             val codacyReportFile = new File(codacyReportFilename)
 
             logger.debug(report.toString)
-            implicit val s3 = implicitly[Serializer[CoverageFileReport,Json]]
+            implicit val s3 = implicitly[Serializer[CoverageFileReport, Json]]
             FileHelper.writeJsonToFile(codacyReportFile, report)
 
             val codacyClient = new CodacyClient(Some(config.codacyApiBaseUrl), projectToken = Some(projectToken))
             val coverageServices = new CoverageServices(codacyClient)
 
             logger.info(s"Uploading coverage data...")
 
-            coverageServices.sendReport(commitUUID, config.language, report) match {
+            coverageServices.sendReport(commitUUID, config.languageStr, report) match {
               case SuccessfulResponse(value) =>
                 Right(s"Coverage data uploaded. $value")
               case FailedResponse(message) =>

src/test/scala/com/codacy/CodacyCoverageReporterTest.scala

@@ -15,7 +15,8 @@ class CodacyCoverageReporterTest extends FlatSpec with Matchers {
 
   val args = Array("-l", "Scala", "-r", "coverage.xml")
 
-  val config = com.codacy.CodacyCoverageReporter.Config(Language.Scala,
+  val config = com.codacy.CodacyCoverageReporter.Config(Language.Scala.toString,
+                    false,
                     projToken,
                     coverageFile,
                     apiBaseUrl,

src/test/scala/com/codacy/transformation/PathPrefixerTest.scala

@@ -7,7 +7,7 @@ import scala.collection.mutable.Stack
 
 class PathPrefixerTest extends FlatSpec with Matchers {
 
-  val report = CoverageReport(Language.Scala, 83, Seq(
+  val report = CoverageReport(83, Seq(
     CoverageFileReport("Filename.scala", 24, Map()),
     CoverageFileReport("OtherFile.scala", 74, Map())
   ))