Added scales writer.

Author: sksamuel

src/main/scala/scales/Instrumenter.scala

@@ -1,19 +1,17 @@
 package scales
 
 import java.util.concurrent.atomic.AtomicInteger
-import scala.collection.mutable.ListBuffer
 import scala.reflect.internal.util.SourceFile
-import scala.collection.mutable
 
 /** @author Stephen Samuel */
 object Instrumentation {
 
     val ids = new AtomicInteger(0)
     val coverage = new Coverage
 
-    def add(source: SourceFile, _package: String, _class: String, _method: String, start: Int, line: Int) = {
+    def add(source: SourceFile, _package: String, _class: String, _method: String, start: Int, line: Int, desc: String) = {
         val id = ids.incrementAndGet()
-        val stmt = MeasuredStatement(source, _package, _class, _method: String, id, start, line)
+        val stmt = MeasuredStatement(source, _package, _class, _method: String, id, start, line, desc)
         coverage.add(stmt)
         stmt
     }

src/main/scala/scales/coverage.scala

@@ -3,8 +3,6 @@ package scales
 import scala.collection.mutable.ListBuffer
 import scala.reflect.internal.util.SourceFile
 import scala.collection.mutable
-import java.lang.String
-import scala.Predef.String
 
 /** @author Stephen Samuel */
 class Coverage extends StatementCoverage {
@@ -15,8 +13,10 @@ class Coverage extends StatementCoverage {
     val classNames = new ListBuffer[String]()
     val methodNames = new ListBuffer[String]()
 
-    def loc = sources.map(src => new String(src.content).replaceAll("^\\s.*$", "").split("\n").size).sum
-    def ncloc = sources.map(src => new String(src.content).replaceAll("/\\*.*?\\*/", "").replace("//.*$", "").count(_ == '\n')).sum
+    def loc = sources.map(src => new String(src.content).replaceAll("^\\s.*$", "").split("\n").length).sum
+    def ncloc =
+        sources
+          .map(src => new String(src.content).replaceAll("/\\*.*?\\*/", "").replace("//.*$", "").split("\n").count(_ == '\n')).sum
     def packageCount = packageNames.size
     def classCount = classNames.size
     def methodCount = methodNames.size
@@ -57,7 +57,7 @@ case class MeasuredStatement(source: SourceFile,
                              id: Int,
                              start: Int,
                              line: Int,
-                             var end: Int = -1) {
+                             desc: String) {
     val fqn = (_package + ".").replace("<empty>.", "") + _class
     var count = 0
     def invoked: Unit = count = count + 1

src/main/scala/scales/plugin.scala

@@ -4,7 +4,7 @@ import scala.tools.nsc.plugins.{PluginComponent, Plugin}
 import scala.tools.nsc.Global
 import scala.tools.nsc.transform.{Transform, TypingTransformers}
 import scala.tools.nsc.ast.TreeDSL
-import scales.report.ScalesHtmlWriter
+import scales.report.{ScalesXmlWriter, ScalesHtmlWriter}
 import scala.reflect.internal.util.SourceFile
 
 /** @author Stephen Samuel */
@@ -30,6 +30,7 @@ class ScalesComponent(val global: Global) extends PluginComponent with TypingTra
             println("Statements=" + Instrumentation.coverage.statements)
             val writer = ScalesHtmlWriter
             writer.write(Instrumentation.coverage)
+            ScalesXmlWriter.write(Instrumentation.coverage)
         }
     }
 
@@ -63,7 +64,8 @@ class ScalesComponent(val global: Global) extends PluginComponent with TypingTra
             _safeSource(tree) match {
                 case None => tree
                 case Some(source) =>
-                    val instruction = Instrumentation.add(source, _package, _class, _method, _safeStart(tree), _safeLine(tree))
+                    val instruction =
+                        Instrumentation.add(source, _package, _class, _method, _safeStart(tree), _safeLine(tree), tree.toString())
                     val apply = invokeCall(instruction.id)
                     localTyper.typed(atPos(tree.pos)(apply))
             }

src/main/scala/scales/report/CoberturaXmlWriter.scala

@@ -1,6 +1,8 @@
 package scales.report
 
-/** @author Stephen Samuel */
-class CoberturaXmlWriter {
+import scales.Coverage
 
+/** @author Stephen Samuel */
+class CoberturaXmlWriter extends ScalesWriter {
+    def write(coverage: Coverage) {}
 }

src/main/scala/scales/report/ScalesXmlWriter.scala

@@ -1,11 +1,31 @@
 package scales.report
 
-import scales.Coverage
+import scales.{MeasuredStatement, Coverage}
+import java.io.{FileWriter, BufferedWriter, File}
 
 /** @author Stephen Samuel */
-class ScalesXmlWriter extends ScalesWriter {
+object ScalesXmlWriter extends ScalesWriter {
 
     def write(coverage: Coverage) = {
+        val statements = statements2xml(coverage.statements)
+        val xml = <scales timestamp={System.currentTimeMillis.toString}>
+            {statements}
+        </scales>
+        write("scales.xml", xml.toString())
+    }
 
+    def write(path: String, data: AnyRef) {
+        println(s"Writing to path $path")
+        val file = new File(path)
+        val writer = new BufferedWriter(new FileWriter(file))
+        writer.write(data.toString)
+        writer.close()
     }
+
+    def statements2xml(statements: Iterable[MeasuredStatement]) = statements.map(arg => statement2xml(arg))
+    def statement2xml(statement: MeasuredStatement) =
+        <statement source={statement.source.path} package={statement._package} class={statement._class} method={statement._method}
+                   start={statement.start.toString} line={statement.line.toString} count={statement.count.toString}>
+            {statement.desc}
+        </statement>
 }