separate loading text as script into a separate library

Author: Reinier Lamers

aws-lambda/src/main/scala/chargepoint/docile/Lambda.scala

@@ -2,7 +2,7 @@ package chargepoint.docile
 
 import java.net.URI
 
-import chargepoint.docile.test.{ResultSummary, RunOnce, Runner, RunnerConfig}
+import chargepoint.docile.test.{Loader, ResultSummary, RunOnce, Runner, RunnerConfig}
 import com.amazonaws.auth.DefaultAWSCredentialsProviderChain
 import com.amazonaws.services.lambda.runtime.Context
 import com.amazonaws.services.lambda.runtime.events.S3Event
@@ -62,7 +62,7 @@ object Lambda extends App {
     )
 
     println(s"executing ${script.name} as $cpId on $cpUri")
-    val runner: Runner[V1X.type] = Runner.forBytes(V1X, script.name, script.content)
+    val runner: Runner[V1X.type] = Loader.runnerFor(V1X, script.name, script.content)
 
     Try(runner.run(runnerCfg)) match {
       case Success(testsPassed) =>

build.sbt

@@ -1,18 +1,15 @@
-
-scalacOptions ++= Seq("-Xlint:-nullary-unit")
-
-enablePlugins(OssLibPlugin)
-
 lazy val commonSettings = Seq(
   organization := "com.newmotion",
   scalaVersion := "2.12.8",
   crossScalaVersions := Seq(tnm.ScalaVersion.aged, "2.12.8"),
+  scalacOptions ++= Seq("-Xlint:-nullary-unit"),
   javacOptions ++= Seq("-source", "1.8", "-target", "1.8", "-Xlint")
 )
 
 lazy val commandLine = (project in file("cmd"))
   .dependsOn(core)
   .dependsOn(loader)
+  .enablePlugins(OssLibPlugin)
   .settings(
     commonSettings,
     name := "docile-charge-point-command-line",
@@ -22,45 +19,46 @@ lazy val commandLine = (project in file("cmd"))
     connectInput in run := true
   )
 
-lazy val core = (project in file("core")).
-  settings(
+lazy val core = (project in file("core"))
+  .enablePlugins(OssLibPlugin)
+  .settings(
     commonSettings,
     name := "docile-charge-point",
-    libraryDependencies ++= coreDeps(scalaVersion.value)
+    libraryDependencies ++= coreDeps
   )
 
 lazy val loader = (project in file("loader"))
   .dependsOn(core)
+  .enablePlugins(OssLibPlugin)
   .settings(
     commonSettings,
+    libraryDependencies ++= loaderDeps(scalaVersion.value),
     name := "docile-charge-point-loader"
   )
 
 lazy val lambda = (project in file("aws-lambda"))
   .dependsOn(core)
   .dependsOn(loader)
-  .settings(
+  .enablePlugins(OssLibPlugin) .settings(
     commonSettings,
-    name := "lambda-docile-charge-point",
+    name := "docile-charge-point-lambda",
     retrieveManaged := true,
     libraryDependencies ++= awsDeps,
     mainClass := Some("chargepoint.docile.Lambda"),
     assemblyJarName in assembly := "docile-lambda.jar"
   )
 
-assemblyJarName in assembly := "docile.jar"
-
-connectInput in run := true
-
-def coreDeps(scalaVersion: String) = Seq(
+lazy val coreDeps = Seq(
   "com.thenewmotion.ocpp"       %% "ocpp-j-api"       % "9.1.0",
-  "org.scala-lang"               % "scala-compiler"   % scalaVersion,
-  "org.slf4j"                    % "slf4j-api"        % "1.7.25",
   "com.typesafe.scala-logging"  %% "scala-logging"    % "3.9.0",
 
   "org.specs2"                  %% "specs2-core"      % "4.3.4"    % "test"
 )
 
+def loaderDeps(scalaVersion: String) = Seq(
+  "org.scala-lang"               % "scala-compiler"   % scalaVersion,
+)
+
 lazy val commandLineDeps = Seq(
   "com.lihaoyi"                  % "ammonite"         % "1.6.5"    cross CrossVersion.full,
   "org.rogach"                  %% "scallop"          % "3.1.3",

core/src/main/resources/logback.xml renamed to cmd/src/main/resources/logback.xml

@@ -7,7 +7,7 @@ import chargepoint.docile.test._
 import ResultSummary.summarizeResults
 import ch.qos.logback.classic.{Level, Logger}
 import com.thenewmotion.ocpp.{Version, VersionFamily}
-import com.typesafe.scalalogging.{StrictLogging}
+import com.typesafe.scalalogging.StrictLogging
 import javax.net.ssl.SSLContext
 import org.rogach.scallop._
 import org.slf4j.LoggerFactory
@@ -179,7 +179,7 @@ object Main extends App with StrictLogging {
     if (conf.interactive())
       interactiveRunner(conf.version().family)
     else
-      Runner.forFiles(conf.version().family, conf.files())
+      Loader.runnerFor(conf.version().family, conf.files())
 
   Try(runner.run(runnerCfg)) match {
     case Success(testsPassed) =>

cmd/src/main/scala/chargepoint/docile/Main.scala

@@ -1,11 +1,8 @@
 package chargepoint.docile
 package test
 
-import java.io.File
 import java.net.URI
-import java.nio.charset.StandardCharsets
 
-import scala.tools.reflect.ToolBox
 import scala.util.{Failure, Success, Try}
 import scala.collection.mutable
 import scala.concurrent.{Await, Future, Promise, duration}
@@ -14,7 +11,6 @@ import scala.concurrent.ExecutionContext.Implicits.global
 import chargepoint.docile.dsl._
 import com.thenewmotion.ocpp
 import com.thenewmotion.ocpp.VersionFamily
-import com.thenewmotion.ocpp.VersionFamily.{V1X, V20}
 import com.typesafe.scalalogging.Logger
 import javax.net.ssl.SSLContext
 import org.slf4j.LoggerFactory
@@ -152,92 +148,3 @@ class Runner[VFam <: VersionFamily](testCases: Seq[TestCase[VFam]]) {
 }
 
 
-object Runner {
-
-  private val logger = LoggerFactory.getLogger("runner")
-
-  def forFiles(vfam: VersionFamily, files: Seq[String]): Runner[vfam.type] =
-    new Runner(files.map(loadFile(vfam, _)))
-
-  private def loadFile(vfam: VersionFamily, f: String): TestCase[vfam.type] = {
-    val file = new File(f)
-    val testNameRegex = "(?:.*/)?([^/]+?)(?:\\.[^.]*)?$".r
-    val testName = f match {
-      case testNameRegex(n) => n
-      case _ => f
-    }
-    val fileContents = scala.io.Source.fromFile(file).getLines.mkString("\n")
-
-    loadString(vfam, testName, fileContents)
-  }
-
-  def forBytes(vfam: VersionFamily, name:String, bytes:Array[Byte]): Runner[vfam.type] =
-    new Runner(Seq(loadString(vfam, name, new String(bytes, StandardCharsets.UTF_8))))
-
-
-  private def loadString(vfam: VersionFamily, name:String, txt: String): TestCase[vfam.type] = {
-    import reflect.runtime.currentMirror
-    val toolbox = currentMirror.mkToolBox()
-
-    val appendix = ";\n  }\n}"
-
-    logger.info(s"Parsing and compiling script '$name'")
-
-    val preamble = preambleForVersionFamily(vfam)
-
-    val fileAst = toolbox.parse(preamble + txt + appendix)
-
-    logger.info(s"Parsed '$name'")
-
-    val compiledCode = toolbox.compile(fileAst)
-
-    logger.info(s"Compiled '$name'")
-
-    TestCase(name, () => compiledCode().asInstanceOf[OcppTest[vfam.type]])
-  }
-
-  private def preambleForVersionFamily(vfam: VersionFamily): String = {
-    val (messagesPackage, instantiatedType, csmsMessagesWitness, csMessagesWitness) = vfam match {
-      case V1X => (
-        "v1x",
-        "chargepoint.docile.dsl.Ocpp1XTest with chargepoint.docile.dsl.Ocpp1XTest.V1XOps",
-        "com.thenewmotion.ocpp.VersionFamily.V1XCentralSystemMessages",
-        "com.thenewmotion.ocpp.VersionFamily.V1XChargePointMessages"
-      )
-      case V20 => (
-        "v20",
-        "chargepoint.docile.dsl.Ocpp20Test with chargepoint.docile.dsl.Ocpp20Test.V20Ops",
-        "com.thenewmotion.ocpp.VersionFamily.V20CsmsMessages",
-        "com.thenewmotion.ocpp.VersionFamily.V20CsMessages"
-      )
-    }
-
-    s"""
-       |import com.thenewmotion.ocpp.messages.$messagesPackage._
-       |
-       |import scala.language.postfixOps
-       |import scala.concurrent.duration._
-       |import scala.concurrent.ExecutionContext
-       |import scala.util.Random
-       |import java.time._
-       |import com.typesafe.scalalogging.Logger
-       |import org.slf4j.LoggerFactory
-       |
-       |import chargepoint.docile.dsl.AwaitTimeout
-       |import chargepoint.docile.dsl.Randomized._
-       |
-       |new $instantiatedType {
-       |
-       |  implicit val executionContext: ExecutionContext = ExecutionContext.global
-       |  implicit val csmsMessageTypes = $csmsMessagesWitness
-       |  implicit val csMessageTypes = $csMessagesWitness
-       |
-       |  private implicit val rand: Random = new Random()
-       |
-       |  def run(defaultAwaitTimeout: AwaitTimeout) {
-       |    implicit val awaitTimeout: AwaitTimeout = defaultAwaitTimeout;
-       |
-     """.stripMargin
-  }
-}
-

core/src/main/scala/chargepoint/docile/test/Runner.scala

@@ -0,0 +1,106 @@
+package chargepoint.docile.test
+
+import java.io.File
+import java.nio.charset.StandardCharsets
+
+import scala.tools.reflect.ToolBox
+
+import chargepoint.docile.dsl.OcppTest
+import com.thenewmotion.ocpp.VersionFamily
+import com.thenewmotion.ocpp.VersionFamily.{V1X, V20}
+import org.slf4j.LoggerFactory
+
+object Loader {
+
+  private val logger = LoggerFactory.getLogger("loader")
+
+  def runnerFor(vfam: VersionFamily, filenames: Seq[String]): Runner[vfam.type] =
+    new Runner(filenames.map(loadFile(vfam, _)))
+
+  private def loadFile(vfam: VersionFamily, f: String): TestCase[vfam.type] = {
+    val file = new File(f)
+    val testNameRegex = "(?:.*/)?([^/]+?)(?:\\.[^.]*)?$".r
+    val testName = f match {
+      case testNameRegex(n) => n
+      case _ => f
+    }
+    val fileSource = scala.io.Source.fromFile(file)
+    var fileContents = ""
+    try {
+      fileContents = fileSource.getLines.mkString("\n")
+    } finally {
+      fileSource.close()
+    }
+
+    runnerFor(vfam, testName, fileContents)
+  }
+
+  def runnerFor(vfam: VersionFamily, name:String, fileContent: Array[Byte]): Runner[vfam.type] =
+    new Runner(Seq(runnerFor(vfam, name, new String(fileContent, StandardCharsets.UTF_8))))
+
+
+  def runnerFor(vfam: VersionFamily, name:String, fileContent: String): TestCase[vfam.type] = {
+    import reflect.runtime.currentMirror
+    val toolbox = currentMirror.mkToolBox()
+
+    val appendix = ";\n  }\n}"
+
+    logger.info(s"Parsing and compiling script '$name'")
+
+    val preamble = preambleForVersionFamily(vfam)
+
+    val fileAst = toolbox.parse(preamble + fileContent + appendix)
+
+    logger.info(s"Parsed '$name'")
+
+    val compiledCode = toolbox.compile(fileAst)
+
+    logger.info(s"Compiled '$name'")
+
+    TestCase(name, () => compiledCode().asInstanceOf[OcppTest[vfam.type]])
+  }
+
+  private def preambleForVersionFamily(vfam: VersionFamily): String = {
+    val (messagesPackage, instantiatedType, csmsMessagesWitness, csMessagesWitness) = vfam match {
+      case V1X => (
+        "v1x",
+        "chargepoint.docile.dsl.Ocpp1XTest with chargepoint.docile.dsl.Ocpp1XTest.V1XOps",
+        "com.thenewmotion.ocpp.VersionFamily.V1XCentralSystemMessages",
+        "com.thenewmotion.ocpp.VersionFamily.V1XChargePointMessages"
+      )
+      case V20 => (
+        "v20",
+        "chargepoint.docile.dsl.Ocpp20Test with chargepoint.docile.dsl.Ocpp20Test.V20Ops",
+        "com.thenewmotion.ocpp.VersionFamily.V20CsmsMessages",
+        "com.thenewmotion.ocpp.VersionFamily.V20CsMessages"
+      )
+    }
+
+    s"""
+       |import com.thenewmotion.ocpp.messages.$messagesPackage._
+       |
+       |import scala.language.postfixOps
+       |import scala.concurrent.duration._
+       |import scala.concurrent.ExecutionContext
+       |import scala.util.Random
+       |import java.time._
+       |import com.typesafe.scalalogging.Logger
+       |import org.slf4j.LoggerFactory
+       |
+       |import chargepoint.docile.dsl.AwaitTimeout
+       |import chargepoint.docile.dsl.Randomized._
+       |
+       |new $instantiatedType {
+       |
+       |  implicit val executionContext: ExecutionContext = ExecutionContext.global
+       |  implicit val csmsMessageTypes = $csmsMessagesWitness
+       |  implicit val csMessageTypes = $csMessagesWitness
+       |
+       |  private implicit val rand: Random = new Random()
+       |
+       |  def run(defaultAwaitTimeout: AwaitTimeout) {
+       |    implicit val awaitTimeout: AwaitTimeout = defaultAwaitTimeout;
+       |
+   """.stripMargin
+  }
+}