Updated writers

Author: sksamuel

pom.xml

@@ -9,10 +9,10 @@
         <version>7</version>
     </parent>
 
-    <groupId>com.sksamuel.scales</groupId>
+    <groupId>scales</groupId>
     <artifactId>scales</artifactId>
     <packaging>jar</packaging>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>0.1.0-SNAPSHOT</version>
     <name>scales</name>
     <url>https://github.com/sksamuel/scales</url>
 

src/main/scala/scales/IOUtils.scala

@@ -0,0 +1,26 @@
+package scales
+
+import java.io.{FileWriter, BufferedWriter, File}
+
+/** @author Stephen Samuel */
+object IOUtils {
+
+    def dropScalaPath(path: String) = path.split("src/main/scala").last
+
+    def toOutputPath(path: String) = "target/scales/" + dropScalaPath(path)
+    def createDirs(path: String) = new File(path).isDirectory match {
+        case false => new File(path).getParentFile.mkdirs
+        case true => new File(path).mkdirs
+    }
+
+    // write to relative path
+    def write(path: String, data: AnyRef) {
+        val outputPath = toOutputPath(path)
+        createDirs(outputPath)
+        println(s"Writing to path $outputPath")
+        val file = new File(outputPath)
+        val writer = new BufferedWriter(new FileWriter(file))
+        writer.write(data.toString)
+        writer.close()
+    }
+}

src/main/scala/scales/plugin.scala

@@ -28,8 +28,7 @@ class ScalesComponent(val global: Global) extends PluginComponent with TypingTra
               .statements
               .size + " statments")
             println("Statements=" + Instrumentation.coverage.statements)
-            val writer = ScalesHtmlWriter
-            writer.write(Instrumentation.coverage)
+            ScalesHtmlWriter.write(Instrumentation.coverage)
             ScalesXmlWriter.write(Instrumentation.coverage)
         }
     }
@@ -126,6 +125,8 @@ class ScalesComponent(val global: Global) extends PluginComponent with TypingTra
                     Instrumentation.coverage.methodNames.append(d.name.toString)
                     super.transform(tree)
 
+                case s: Select => super.transform(tree) // should only inside something we are instrumenting.
+
                 case m: ModuleDef if m.symbol.isSynthetic => tree // a generated object, such as case class companion
                 case m: ModuleDef => super.transform(tree)
 
@@ -136,9 +137,10 @@ class ScalesComponent(val global: Global) extends PluginComponent with TypingTra
                     treeCopy.ValDef(tree, v.mods, v.name, v.tpt, transform(v.rhs))
 
                 case apply: Apply => instrument(apply)
+                case tapply: TypeApply => instrument(tapply)
                 case assign: Assign => instrument(assign)
 
-                case Match(clause: Tree, cases: List[CaseDef]) => treeCopy.Match(tree, instrument(clause), transformCases(cases))
+                case Match(clause: Tree, cases: List[CaseDef]) => treeCopy.Match(tree, clause, transformCases(cases))
                 case Try(t: Tree, cases: List[CaseDef], f: Tree) => treeCopy.Try(tree, instrument(t), transformCases(cases), instrument(f))
 
                 //       println("Instrumenting apply " + apply)

src/main/scala/scales/report/html.scala renamed to src/main/scala/scales/report/ScalesHtmlWriter.scala

@@ -1,23 +1,20 @@
 package scales.report
 
 import scales._
-import java.io.{FileWriter, BufferedWriter, File}
 import scala.reflect.internal.util.SourceFile
 import scala.xml.{Unparsed, Node}
 import scales.MeasuredFile
 import java.util.Date
 
 /** @author Stephen Samuel */
 object ScalesHtmlWriter extends ScalesWriter {
-    def write(coverage: Coverage) {
 
+    def write(coverage: Coverage) {
         writeIndex(coverage)
-
         for ( file <- coverage.files ) {
             val data = html(file)
-            write(file.source.path.replace(".scala", "") + ".html", data)
+            IOUtils.write(file.source.file.path + ".html", data)
         }
-
     }
 
     def risks(coverage: Coverage) = {
@@ -111,15 +108,7 @@ object ScalesHtmlWriter extends ScalesWriter {
                 <h1>Scales Code Coverage</h1>{overview(coverage)}{risks(coverage)}{packages(coverage)}
             </body>
         </html>
-        write("index.html", data.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()
+        IOUtils.write("index.html", data.toString)
     }
 
     def lines(source: SourceFile): Seq[String] = new String(source.content).split("\n")

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

@@ -1,7 +1,6 @@
 package scales.report
 
-import scales.{MeasuredStatement, Coverage}
-import java.io.{FileWriter, BufferedWriter, File}
+import scales.{IOUtils, MeasuredStatement, Coverage}
 
 /** @author Stephen Samuel */
 object ScalesXmlWriter extends ScalesWriter {
@@ -11,15 +10,7 @@ object ScalesXmlWriter extends ScalesWriter {
         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()
+        IOUtils.write("scales.xml", xml.toString())
     }
 
     def statements2xml(statements: Iterable[MeasuredStatement]) = statements.map(arg => statement2xml(arg))