Merge pull request #13 from codacy/allow-unknown-languages

Allow unknown languages

Author: DReigada

project/Dependencies.scala

@@ -2,7 +2,7 @@ import sbt._
 
 object Dependencies {
 
-  lazy val codacyScalaApi = "com.codacy" %% "codacy-api-scala" % "2.0.4"
+  lazy val codacyScalaApi = "com.codacy" %% "codacy-api-scala" % "3.0.1"
   lazy val scalaTest = "org.scalatest" %% "scalatest" % "2.2.4" % "test"
 
 }

src/main/scala/com/codacy/parsers/implementation/CoberturaParser.scala

@@ -1,20 +1,23 @@
 package com.codacy.parsers.implementation
 
 import java.io.File
-import java.util.Locale
 import java.text.NumberFormat
+import java.util.Locale
 
 import com.codacy.api.{CoverageFileReport, CoverageReport, Language}
 import com.codacy.parsers.XMLCoverageParser
 import com.codacy.parsers.util.LanguageUtils
 
-import scala.xml.Node
 import scala.util.Try
+import scala.xml.Node
 
 class CoberturaParser(val language: Language.Value, val rootProject: File, val coverageReport: File) extends XMLCoverageParser {
 
   val rootProjectDir = sanitiseFilename(rootProject.getAbsolutePath + File.separator)
-  lazy val allFiles = recursiveListFiles(rootProject)(f => f.getName.endsWith(LanguageUtils.getExtension(language)))
+
+  lazy val allFiles = recursiveListFiles(rootProject) { file =>
+    LanguageUtils.getExtension(language).fold(true)(file.getName.endsWith(_))
+  }.map(file => sanitiseFilename(file.getAbsolutePath))
 
   private[this] def convertToFloat(str: String): Try[Float] = {
     Try(str.toFloat).recoverWith {
@@ -51,7 +54,7 @@ class CoberturaParser(val language: Language.Value, val rootProject: File, val c
         lineCoverage(file)
     }
 
-    CoverageReport(language, total, filesCoverage.toSeq)
+    CoverageReport(total, filesCoverage.toSeq)
   }
 
   private def lineCoverage(sourceFilename: String): Option[CoverageFileReport] = {
@@ -79,7 +82,7 @@ class CoberturaParser(val language: Language.Value, val rootProject: File, val c
         key -> value
     }
 
-    allFiles.map(f => sanitiseFilename(f.getAbsolutePath)).find(f => f.endsWith(sourceFilename)).map {
+    allFiles.find(f => f.endsWith(sourceFilename)).map {
       filename =>
         CoverageFileReport(stripRoot(filename), fileHit, lineHitMap)
     }

src/main/scala/com/codacy/parsers/implementation/JacocoParser.scala

@@ -33,7 +33,7 @@ class JacocoParser(val language: Language.Value, val rootProject: File, val cove
         }
     }
 
-    CoverageReport(language, total, filesCoverage)
+    CoverageReport(total, filesCoverage)
   }
 
   private def lineCoverage(sourceFilename: String, file: Node): CoverageFileReport = {
@@ -44,7 +44,7 @@ class JacocoParser(val language: Language.Value, val rootProject: File, val cove
         ((covered / (covered + missed)) * 100).toInt
     }
 
-    val fileHit = classHit.sum / classHit.length
+    val fileHit = if (classHit.sum > 0) classHit.sum / classHit.length else 0
 
     val lineHitMap = (file \\ "line").map {
       line =>

src/main/scala/com/codacy/parsers/util/LanguageUtils.scala

@@ -4,8 +4,8 @@ import com.codacy.api.Language
 
 object LanguageUtils {
 
-  def getExtension(language: Language.Value): String = {
-    language match {
+  def getExtension(language: Language.Value): Option[String] = {
+    Option(language).collect {
       case Language.Java => ".java"
       case Language.Python => ".py"
       case Language.Scala => ".scala"

src/test/scala/com/codacy/parsers/CoberturaParserTest.scala

@@ -25,7 +25,7 @@ class CoberturaParserTest extends WordSpec with BeforeAndAfterAll with Matchers
     "return a valid report" in {
       val reader = new CoberturaParser(Language.Scala, new File("."), new File("src/test/resources/test_cobertura.xml"))
 
-      val testReport = CoverageReport(Language.Scala, 87, List(
+      val testReport = CoverageReport(87, List(
         CoverageFileReport("src/test/resources/TestSourceFile.scala", 87,
           Map(5 -> 1, 10 -> 1, 6 -> 2, 9 -> 1, 4 -> 1)),
         CoverageFileReport("src/test/resources/TestSourceFile2.scala", 87,
@@ -37,7 +37,7 @@ class CoberturaParserTest extends WordSpec with BeforeAndAfterAll with Matchers
     "no crash on thousands separators" in {
       val reader = new CoberturaParser(Language.Scala, new File("."), new File("src/test/resources/thousand_sep_cobertura.xml"))
 
-      val testReport = CoverageReport(Language.Scala, 87, List(
+      val testReport = CoverageReport(87, List(
         CoverageFileReport("src/test/resources/TestSourceFile.scala", 87,
           Map(5 -> 1, 10 -> 1, 6 -> 2, 9 -> 1, 4 -> 1)),
         CoverageFileReport("src/test/resources/TestSourceFile2.scala", 87,

src/test/scala/com/codacy/parsers/JacocoParserTest.scala

@@ -25,7 +25,7 @@ class JacocoParserTest extends WordSpec with BeforeAndAfterAll with Matchers {
     "return a valid report" in {
       val reader = new JacocoParser(Language.Java, new File("."), new File("src/test/resources/test_jacoco.xml"))
 
-      val testReport = CoverageReport(Language.Java, 73, List(
+      val testReport = CoverageReport(73, List(
         CoverageFileReport("org/eluder/coverage/sample/InnerClassCoverage.java", 81,
           Map(10 -> 1, 6 -> 1, 9 -> 1, 13 -> 1, 22 -> 1, 12 -> 1, 3 -> 1, 16 -> 1, 19 -> 1)),
         CoverageFileReport("org/eluder/coverage/sample/SimpleCoverage.java", 50,