Skip to content

Commit eac99b1

Browse files
sksamuelsksamuel
committed
Finished project layout refactor
1 parent d289786 commit eac99b1

33 files changed

+151
-112
lines changed

Diff for: ‎src/main/misc/logo1.png renamed to ‎misc/logo1.png

File renamed without changes.

Diff for: ‎src/main/misc/logo2.png renamed to ‎misc/logo2.png

File renamed without changes.

Diff for: ‎src/main/misc/scales.png renamed to ‎misc/scales.png

File renamed without changes.

Diff for: ‎src/main/misc/scales2.png renamed to ‎misc/scales2.png

File renamed without changes.

Diff for: ‎src/main/misc/screenshot1.png renamed to ‎misc/screenshot1.png

File renamed without changes.

Diff for: ‎src/main/misc/screenshot2.png renamed to ‎misc/screenshot2.png

File renamed without changes.

Diff for: ‎project/Scoverage.scala

+6-6
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@ import sbt._
44
object Scoverage extends Build {
55

66
val Org = "org.scoverage"
7-
val Version = "1.0.0.SNAPSHOT"
7+
val Version = "1.0.0.BETA1"
88
val Scala = "2.11.4"
99
val Slf4jVersion = "1.7.7"
10-
val ScrimageVersion = "1.4.2"
1110
val ScalatestVersion = "2.2.2"
1211

1312
lazy val LocalTest = config("local") extend Test
@@ -54,16 +53,17 @@ object Scoverage extends Build {
5453
"org.slf4j" % "slf4j-api" % Slf4jVersion,
5554
"commons-io" % "commons-io" % "2.4",
5655
"org.scala-lang" % "scala-reflect" % scalaVersion.value,
57-
"org.scala-lang" % "scala-compiler" % scalaVersion.value,
56+
"org.scala-lang" % "scala-compiler" % scalaVersion.value
57+
)).settings(libraryDependencies ++= {
5858
CrossVersion.partialVersion(scalaVersion.value) match {
5959
case Some((2, scalaMajor)) if scalaMajor == 11 =>
6060
EnvSupport.setEnv("CrossBuildScalaVersion", "2.11.4")
61-
libraryDependencies.value :+ "org.scala-lang.modules" %% "scala-xml" % "1.0.1"
61+
Seq("org.scala-lang.modules" %% "scala-xml" % "1.0.1")
6262
case _ =>
6363
EnvSupport.setEnv("CrossBuildScalaVersion", "2.10.4")
64-
libraryDependencies.value
64+
Nil
6565
}
66-
))
66+
})
6767

6868
lazy val runtime = Project("scalac-scoverage-runtime", file("scalac-scoverage-runtime"))
6969
.settings(appSettings: _*)

Diff for: ‎src/main/resources/scalac-plugin.xml renamed to ‎scalac-scoverage-plugin/src/main/resources/scalac-plugin.xml

File renamed without changes.

Diff for: ‎src/main/resources/org/scoverage/index.html renamed to ‎scalac-scoverage-plugin/src/main/resources/scoverage/index.html

File renamed without changes.

Diff for: ‎scalac-scoverage-plugin/src/main/scala/scoverage/classtypes.scala renamed to ‎scalac-scoverage-plugin/src/main/scala/scoverage/ClassType.scala

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package scoverage
22

3-
/** @author Stephen Samuel */
4-
sealed trait ClassType
53
object ClassType {
64
case object Object extends ClassType
75
case object Class extends ClassType
86
case object Trait extends ClassType
9-
}
7+
}
8+
9+
/** @author Stephen Samuel */
10+
sealed trait ClassType

Diff for: ‎scalac-scoverage-plugin/src/main/scala/scoverage/plugin.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import scala.tools.nsc.transform.{Transform, TypingTransformers}
1212
/** @author Stephen Samuel */
1313
class ScoveragePlugin(val global: Global) extends Plugin {
1414

15-
override val name: String = "scoverage"
15+
override val name: String = "scoverage/report/scoverage"
1616
override val description: String = "scoverage code coverage compiler plugin"
1717
val instrumentationComponent = new ScoverageInstrumentationComponent(global)
1818
override val components: List[PluginComponent] = List(instrumentationComponent)
@@ -118,7 +118,7 @@ class ScoverageInstrumentationComponent(val global: Global)
118118
Apply(
119119
Select(
120120
Select(
121-
Ident("scoverage"),
121+
Ident("scoverage/report/scoverage"),
122122
newTermName("Invoker")
123123
),
124124
newTermName("invoked")

Diff for: ‎scalac-scoverage-plugin/src/main/scala/scoverage/report/CoberturaXmlWriter.scala

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
package scoverage.report
22

3-
import scoverage.{MeasuredMethod, MeasuredClass, MeasuredPackage, Coverage}
4-
import scala.xml.Node
53
import java.io.File
4+
5+
import _root_.scoverage.{Coverage, MeasuredClass, MeasuredMethod, MeasuredPackage}
66
import org.apache.commons.io.FileUtils
77

8+
import scala.xml.Node
9+
810
/** @author Stephen Samuel */
911
class CoberturaXmlWriter(baseDir: File, outputDir: File) {
1012

Diff for: ‎scalac-scoverage-plugin/src/main/scala/scoverage/report/CodeGrid.scala

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
package scoverage.report
22

3-
import scoverage.{MeasuredFile, MeasuredStatement}
4-
import org.apache.commons.io.IOUtils
53
import java.io.{File, FileInputStream}
6-
import scala.xml.{Unparsed, Node}
4+
5+
import _root_.scoverage.{MeasuredFile, MeasuredStatement}
6+
import org.apache.commons.io.IOUtils
7+
8+
import scala.xml.{Node, Unparsed}
79

810
/** @author Stephen Samuel */
911
class CodeGrid(mfile: MeasuredFile) {

Diff for: ‎scalac-scoverage-plugin/src/main/scala/scoverage/report/ScoverageHtmlWriter.scala

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
package scoverage.report
22

3-
import scoverage._
4-
import scala.xml.Node
5-
import scoverage.MeasuredFile
6-
import java.util.Date
73
import java.io.File
8-
import org.apache.commons.io.{FilenameUtils, FileUtils}
4+
import java.util.Date
5+
6+
import _root_.scoverage.{Coverage, MeasuredClass, MeasuredFile, MeasuredPackage}
7+
import org.apache.commons.io.{FileUtils, FilenameUtils}
8+
9+
import scala.xml.Node
910

1011
/** @author Stephen Samuel */
1112
class ScoverageHtmlWriter(sourceDirectory: File, outputDir: File) {

Diff for: ‎scalac-scoverage-plugin/src/main/scala/scoverage/report/ScoverageXmlWriter.scala

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@ package scoverage.report
22

33
import java.io.File
44

5-
import scala.xml.{Node, PrettyPrinter}
6-
5+
import _root_.scoverage._
76
import org.apache.commons.io.FileUtils
87

9-
import scoverage._
8+
import scala.xml.{Node, PrettyPrinter}
109

1110
/** @author Stephen Samuel */
1211
class ScoverageXmlWriter(sourceDir: File, outputDir: File, debug: Boolean) {

Diff for: ‎scalac-scoverage-plugin/src/main/scala/scoverage/report/SourceHighlighter.scala

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
package scoverage.report
22

3-
import java.io.{FileInputStream, File}
4-
import scala.xml.{Unparsed, Node}
5-
import scoverage.MeasuredFile
3+
import java.io.{File, FileInputStream}
4+
5+
import _root_.scoverage.MeasuredFile
66
import org.apache.commons.io.IOUtils
77

8+
import scala.xml.{Node, Unparsed}
9+
810
/** @author Stephen Samuel */
911
class SourceHighlighter {
1012

Diff for: ‎scalac-scoverage-plugin/src/main/scala/scoverage/report/StatementWriter.scala

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package scoverage.report
22

3-
import scoverage.MeasuredFile
3+
import _root_.scoverage.MeasuredFile
4+
45
import scala.xml.Node
56

67
/** @author Stephen Samuel */

Diff for: ‎src/test/resources/cobertura.sample.xml renamed to ‎scalac-scoverage-plugin/src/test/resources/scoverage/cobertura.sample.xml

File renamed without changes.

Diff for: ‎src/test/resources/coverage-04.dtd renamed to ‎scalac-scoverage-plugin/src/test/resources/scoverage/coverage-04.dtd

File renamed without changes.

Diff for: ‎src/test/resources/report1.xml renamed to ‎scalac-scoverage-plugin/src/test/resources/scoverage/report1.xml

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
version="1.0"
66
timestamp="1400456035212">
77
<packages>
8-
<package name="com.sksamuel.scoverage.samples"
8+
<package name="com.sksamuel.scoverage.report.scoverage.samples"
99
statement-count="2"
1010
statements-invoked="2"
1111
statement-rate="100">
@@ -17,22 +17,22 @@
1717
statement-rate="100.00"
1818
branch-rate="100.00">
1919
<methods>
20-
<method name="com.sksamuel.scoverage.samples/EitherMappableFuture/&lt;none&gt;"
20+
<method name="com.sksamuel.scoverage.report.scoverage.samples/EitherMappableFuture/&lt;none&gt;"
2121
statement-count="2"
2222
statements-invoked="2"
2323
statement-rate="100.00"
2424
branch-rate="100.00">
2525
<statements>
2626
<statement
27-
package="com.sksamuel.scoverage.samples" class="EitherMappableFuture"
27+
package="com.sksamuel.scoverage.report.scoverage.samples" class="EitherMappableFuture"
2828
method="&lt;none&gt;" start="965" line="34"
2929
symbol="scala.concurrent.Future.flatMap" tree="ApplyToImplicitArgs"
3030
branch="false" invocation-count="1">
3131
</statement>
3232
<statement
33-
package="com.sksamuel.scoverage.samples" class="EitherMappableFuture"
33+
package="com.sksamuel.scoverage.report.scoverage.samples" class="EitherMappableFuture"
3434
method="&lt;none&gt;" start="1225" line="42"
35-
symbol="com.sksamuel.scoverage.samples.EitherMappableFuture.apply" tree="Apply"
35+
symbol="com.sksamuel.scoverage.report.scoverage.samples.EitherMappableFuture.apply" tree="Apply"
3636
branch="false" invocation-count="1">
3737
</statement>
3838
</statements>

Diff for: ‎src/test/resources/report2.xml renamed to ‎scalac-scoverage-plugin/src/test/resources/scoverage/report2.xml

+15-15
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
version="1.0"
66
timestamp="1400456035212">
77
<packages>
8-
<package name="com.sksamuel.scoverage.samples"
8+
<package name="com.sksamuel.scoverage.report.scoverage.samples"
99
statement-count="10"
1010
statements-invoked="9"
1111
statement-rate="90">
@@ -17,69 +17,69 @@
1717
statement-rate="90.00"
1818
branch-rate="100.00">
1919
<methods>
20-
<method name="com.sksamuel.scoverage.samples/Futures/&lt;none&gt;"
20+
<method name="com.sksamuel.scoverage.report.scoverage.samples/Futures/&lt;none&gt;"
2121
statement-count="7"
2222
statements-invoked="6"
2323
statement-rate="85.71"
2424
branch-rate="100.00">
2525
<statements>
2626
<statement
27-
package="com.sksamuel.scoverage.samples" class="Futures" method="&lt;none&gt;"
27+
package="com.sksamuel.scoverage.report.scoverage.samples" class="Futures" method="&lt;none&gt;"
2828
start="664" line="25" symbol="scala.util.Right.apply" tree="Apply"
2929
branch="false" invocation-count="1">
3030
</statement>
3131
<statement
32-
package="com.sksamuel.scoverage.samples" class="Futures" method="&lt;none&gt;"
33-
start="589" line="23" symbol="com.sksamuel.scoverage.samples.Futures.check"
32+
package="com.sksamuel.scoverage.report.scoverage.samples" class="Futures" method="&lt;none&gt;"
33+
start="589" line="23" symbol="com.sksamuel.scoverage.report.scoverage.samples.Futures.check"
3434
tree="Apply" branch="false" invocation-count="1">
3535
</statement>
3636
<statement
37-
package="com.sksamuel.scoverage.samples" class="Futures" method="&lt;none&gt;"
37+
package="com.sksamuel.scoverage.report.scoverage.samples" class="Futures" method="&lt;none&gt;"
3838
start="533" line="20" symbol="scala.util.Right.apply" tree="Apply"
3939
branch="false" invocation-count="1">
4040
</statement>
4141
<statement
42-
package="com.sksamuel.scoverage.samples" class="Futures" method="&lt;none&gt;"
42+
package="com.sksamuel.scoverage.report.scoverage.samples" class="Futures" method="&lt;none&gt;"
4343
start="632" line="24" symbol="&lt;nosymbol&gt;" tree="Block" branch="false"
4444
invocation-count="0">
4545
</statement>
4646
<statement
47-
package="com.sksamuel.scoverage.samples" class="Futures" method="&lt;none&gt;"
47+
package="com.sksamuel.scoverage.report.scoverage.samples" class="Futures" method="&lt;none&gt;"
4848
start="598" line="23" symbol="&lt;nosymbol&gt;" tree="Match" branch="false"
4949
invocation-count="1">
5050
</statement>
5151
<statement
52-
package="com.sksamuel.scoverage.samples" class="Futures" method="&lt;none&gt;"
52+
package="com.sksamuel.scoverage.report.scoverage.samples" class="Futures" method="&lt;none&gt;"
5353
start="664" line="25" symbol="&lt;nosymbol&gt;" tree="Block" branch="false"
5454
invocation-count="1">
5555
</statement>
5656
<statement
57-
package="com.sksamuel.scoverage.samples" class="Futures" method="&lt;none&gt;"
57+
package="com.sksamuel.scoverage.report.scoverage.samples" class="Futures" method="&lt;none&gt;"
5858
start="632" line="24" symbol="scala.util.Left.apply" tree="Apply" branch="false"
5959
invocation-count="1">
6060
</statement>
6161
</statements>
6262
</method>
63-
<method name="com.sksamuel.scoverage.samples/Futures/insert"
63+
<method name="com.sksamuel.scoverage.report.scoverage.samples/Futures/insert"
6464
statement-count="3"
6565
statements-invoked="3"
6666
statement-rate="100.00"
6767
branch-rate="100.00">
6868
<statements>
6969
<statement
70-
package="com.sksamuel.scoverage.samples" class="Futures" method="insert"
70+
package="com.sksamuel.scoverage.report.scoverage.samples" class="Futures" method="insert"
7171
start="366" line="14" symbol="scala.concurrent.Future.onComplete"
7272
tree="ApplyToImplicitArgs" branch="false" invocation-count="1">
7373
</statement>
7474
<statement
75-
package="com.sksamuel.scoverage.samples" class="Futures" method="insert"
75+
package="com.sksamuel.scoverage.report.scoverage.samples" class="Futures" method="insert"
7676
start="309" line="11" symbol="scala.concurrent.Promise.apply" tree="Apply"
7777
branch="false" invocation-count="1">
7878
</statement>
7979
<statement
80-
package="com.sksamuel.scoverage.samples" class="Futures" method="insert"
80+
package="com.sksamuel.scoverage.report.scoverage.samples" class="Futures" method="insert"
8181
start="453" line="17"
82-
symbol="com.sksamuel.scoverage.samples.EitherMappableFuture.mapEither"
82+
symbol="com.sksamuel.scoverage.report.scoverage.samples.EitherMappableFuture.mapEither"
8383
tree="ApplyToImplicitArgs" branch="false" invocation-count="1">
8484
</statement>
8585
</statements>

Diff for: ‎src/test/resources/scoverage/skinny/Member.scala renamed to ‎scalac-scoverage-plugin/src/test/resources/scoverage/skinny/Member.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package scoverage.skinny
1+
package scoverage.report.scoverage.skinny
22

33
import skinny.orm._
44
import scalikejdbc._, SQLInterpolation._

Diff for: ‎src/test/scala/scoverage/report/CoberturaXmlWriterTest.scala renamed to ‎scalac-scoverage-plugin/src/test/scala/scoverage/CoberturaXmlWriterTest.scala

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package scoverage.report
1+
package scoverage
22

33
import java.io.File
44
import java.util.UUID
@@ -7,7 +7,7 @@ import javax.xml.parsers.DocumentBuilderFactory
77
import org.apache.commons.io.FileUtils
88
import org.scalatest.{BeforeAndAfter, FunSuite, OneInstancePerTest}
99
import org.xml.sax.{ErrorHandler, SAXParseException}
10-
import scoverage.{ClassType, Coverage, Location, MeasuredStatement}
10+
import scoverage.report.CoberturaXmlWriter
1111

1212
import scala.xml.XML
1313

@@ -20,14 +20,14 @@ class CoberturaXmlWriterTest extends FunSuite with BeforeAndAfter with OneInstan
2020
dir.deleteOnExit()
2121
dir
2222
}
23-
23+
2424
def fileIn(dir: File) = new File(dir, "cobertura.xml")
25-
25+
2626
test("cobertura output validates") {
2727

2828
val dir = tempDir()
2929

30-
val coverage = Coverage()
30+
val coverage = scoverage.Coverage()
3131
coverage.add(MeasuredStatement("a.scala", Location("com.sksamuel.scoverage", "A", ClassType.Object, "create", ""),
3232
1, 2, 3, 12, "", "", "", false, 3))
3333
coverage.add(MeasuredStatement("a.scala", Location("com.sksamuel.scoverage", "A", ClassType.Object, "create2", ""),

Diff for: ‎src/test/scala/scoverage/CoverageMetricsTest.scala renamed to ‎scalac-scoverage-plugin/src/test/scala/scoverage/CoverageMetricsTest.scala

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package scoverage
22

33
import org.scalatest.{FreeSpec, Matchers}
4+
import scoverage.{CoverageMetrics, MeasuredStatement}
45

56
class CoverageMetricsTest extends FreeSpec with Matchers {
67

Diff for: ‎src/test/scala/scoverage/CoverageTest.scala renamed to ‎scalac-scoverage-plugin/src/test/scala/scoverage/CoverageTest.scala

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package scoverage
33
import org.scalatest.FunSuite
44
import org.scalatest.BeforeAndAfter
55
import org.scalatest.OneInstancePerTest
6+
import scoverage.{ClassType, Location, MeasuredStatement, Coverage}
67

78
/** @author Stephen Samuel */
89
class CoverageTest extends FunSuite with BeforeAndAfter with OneInstancePerTest {

Diff for: ‎src/test/scala/scoverage/IOUtilsTest.scala renamed to ‎scalac-scoverage-plugin/src/test/scala/scoverage/IOUtilsTest.scala

+2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ package scoverage
33
import org.scalatest.mock.MockitoSugar
44
import org.scalatest.{FunSuite, OneInstancePerTest}
55
import java.io.{FileWriter, File}
6+
import scoverage.{IOUtils, Location, MeasuredStatement, Coverage}
7+
68
import scala.xml.Utility
79
import org.apache.commons.io.FileUtils
810

Diff for: ‎src/test/scala/scoverage/PluginASTSupportTest.scala renamed to ‎scalac-scoverage-plugin/src/test/scala/scoverage/PluginASTSupportTest.scala

File renamed without changes.

Diff for: ‎src/test/scala/scoverage/PluginCoverageTest.scala renamed to ‎scalac-scoverage-plugin/src/test/scala/scoverage/PluginCoverageTest.scala

File renamed without changes.

Diff for: ‎src/test/scala/scoverage/PluginRunner.scala renamed to ‎scalac-scoverage-plugin/src/test/scala/scoverage/PluginRunner.scala

+2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ package scoverage
33
import java.io.{File, FileNotFoundException}
44
import java.net.URL
55

6+
import scoverage.{ScoverageInstrumentationComponent, ScoverageOptions}
7+
68
import scala.collection.mutable.ListBuffer
79
import scala.tools.nsc.Global
810
import scala.tools.nsc.plugins.PluginComponent

Diff for: ‎src/test/scala/scoverage/RegexCoverageFilterTest.scala renamed to ‎scalac-scoverage-plugin/src/test/scala/scoverage/RegexCoverageFilterTest.scala

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import java.io.{InputStream, File, OutputStream}
55
import org.mockito.Mockito
66
import org.scalatest.mock.MockitoSugar
77
import org.scalatest.{Matchers, FreeSpec}
8+
import scoverage.RegexCoverageFilter
89

910
import scala.reflect.internal.util._
1011
import scala.reflect.io.{Path, AbstractFile}

Diff for: ‎src/test/scala/scoverage/report/ScoverageXmlMergerTest.scala renamed to ‎scalac-scoverage-plugin/src/test/scala/scoverage/ScoverageXmlMergerTest.scala

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
package scoverage.report
1+
package scoverage
22

33
import org.scalatest.{FreeSpec, Matchers}
4+
import scoverage.report.ScoverageXmlMerger
45

56
/** @author Stephen Samuel */
67
class ScoverageXmlMergerTest extends FreeSpec with Matchers {

0 commit comments

Comments
 (0)