1.0.8

WellRedPandit · Apr 14, 2017 · 86a5619 · 86a5619
1 parent 4c73118
commit 86a5619
Show file tree

Hide file tree

Showing 10 changed files with 1,163 additions and 25 deletions.
diff --git a/docs/scala-xml-related/scala-xquery.pdf b/docs/scala-xml-related/scala-xquery.pdf
diff --git a/docs/scala-xml-related/scalaxbook.docbk.html b/docs/scala-xml-related/scalaxbook.docbk.html
diff --git a/docs/scala-xml-related/xml-processing-in-scala.pdf b/docs/scala-xml-related/xml-processing-in-scala.pdf
diff --git a/project/Deps.scala b/project/Deps.scala
@@ -14,7 +14,7 @@ object V {
   val scalaXml = "1.0.6"
   val scopt = "3.5.0"
   val slf4j = "1.7.25"
-  val tron = "1.0.7"
+  val tron = "1.0.8"
 }
 
 object Deps {

diff --git a/sbt b/sbt
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
-SBT_OPTS="-Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=256M"
-java $SBT_OPTS -jar sbt-launch.jar "$@"
+SBT_OPTS="-Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled"
+java $SBT_OPTS -jar sbt-launch-0.13.15.jar "$@"
diff --git a/sbt-launch.jar → sbt-launch-0.13.15.jar b/sbt-launch.jar → sbt-launch-0.13.15.jar
diff --git a/sbt.bat b/sbt.bat
@@ -1,2 +1,2 @@
 @set SCRIPT_DIR=%~dp0
-@java -Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled -jar "%SCRIPT_DIR%sbt-launch.jar" %*
+@java -Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled -jar "%SCRIPT_DIR%sbt-launch-0.13.15.jar" %*
diff --git a/src/main/scala/wrp/smehotron/Smehotron.scala b/src/main/scala/wrp/smehotron/Smehotron.scala
@@ -25,21 +25,22 @@ class Smehotron(val theRoot: Option[Path], cfg: Elem = <smehotron/>) extends Laz
   lazy val saxonDir = jarDir / "saxon"
   lazy val saxonClasspath = s"${saxonDir}${File.separator}saxon.he.9.7.0.7.jar${File.pathSeparator}${saxonDir}${File.separator}resolver.jar"
   lazy val cats = (cfg \ "catalogs" \ "catalog").map(_.text)
-  val gashish = new org.hashids.Hashids("smehotron");
+  val gashish = new org.hashids.Hashids("smehotron")
 
   def processModules() = {
-    val go = processGoModules()
-    val nogo = processNogoModules()
+    val goms = processGoModules()
+    val nogoms = processNogoModules()
+    val go = if( goms.nonEmpty ) <go>{goms}</go> else NodeSeq.Empty
+    val nogo = if( nogoms.nonEmpty ) <nogo>{nogoms}</nogo> else NodeSeq.Empty
     <smehotron-results>
-      {go}
-      {nogo}
+      {go ++ nogo}
     </smehotron-results>
   }
 
-  def processGoModules() = {
-    val go = (cfg \ "go" \ "module").flatMap { m =>
+  def processGoModules() =
+    (cfg \ "go" \ "module").flatMap { m =>
       val mod = log((m \ "@name").head.text)
-      val drvs =log((m \ "sch-drivers" \ "sch-driver"))
+      val drvs = log((m \ "sch-drivers" \ "sch-driver") ++ (m \ "sch-driver"))
       drvs.map { drv =>
         val sch = drv.text
         compile(sch) match {
@@ -67,13 +68,11 @@ class Smehotron(val theRoot: Option[Path], cfg: Elem = <smehotron/>) extends Laz
         }
       }
     }
-    <go>{go}</go>
-  }
 
-  def processNogoModules() = {
-    val nogo = (cfg \ "nogo" \ "module").flatMap { m =>
+  def processNogoModules() =
+    (cfg \ "nogo" \ "module").flatMap { m =>
       val mod = log((m \ "@name").head.text)
-      val drvs =log((m \ "sch-drivers" \ "sch-driver"))
+      val drvs =log((m \ "sch-drivers" \ "sch-driver") ++ (m \ "sch-driver"))
       drvs.map { drv =>
         val sch = drv.text
         compile(sch) match {
@@ -101,13 +100,11 @@ class Smehotron(val theRoot: Option[Path], cfg: Elem = <smehotron/>) extends Laz
         }
       }
     }
-    <nogo>{nogo}</nogo>
-  }
 
   def generateNogoExpectedSvrls() = {
     val outcomes = (cfg \ "nogo" \ "module").flatMap { m =>
       val mod = log((m \ "@name").head.text)
-      val drvs =log((m \ "sch-drivers" \ "sch-driver"))
+      val drvs =log((m \ "sch-drivers" \ "sch-driver") ++ (m \ "sch-driver"))
       drvs.map { drv =>
         val sch = drv.text
         compile(sch) match {

diff --git a/src/test/scala/wrp/smehotron/BasicGoTest.scala b/src/test/scala/wrp/smehotron/BasicGoTest.scala
@@ -11,15 +11,14 @@ class BasicGoTest extends FunSuite {
 
   test("GO: basic-ok.xml should pass") {
     val cfg = XML.loadFile(s"$localPath/basic-ok.smehotron.config.xml")
-    val res = Smehotron(".", cfg).processGoModules()
-    val foo = res.toString()
+    val res = <go>{Smehotron(".", cfg).processGoModules()}</go>
     val status = (res \ "test" \ "@status").text
     assertResult("success")(status)
   }
 
   test("GO: basic-report.xml should fail with a message") {
     val cfg = XML.loadFile(s"$localPath/basic-report.smehotron.config.xml")
-    val res = Smehotron(".", cfg).processGoModules()
+    val res = <go>{Smehotron(".", cfg).processGoModules()}</go>
     val status = (res \ "test" \ "@status").text
     assertResult("failure")(status)
     val msg = (res \ "test" \ "reports" \ "successful-report" \ "text").text
@@ -28,7 +27,7 @@ class BasicGoTest extends FunSuite {
 
   test("GO: basic-assert.xml should fail with a message") {
     val cfg = XML.loadFile(s"$localPath/basic-assert.smehotron.config.xml")
-    val res = Smehotron(".", cfg).processGoModules()
+    val res = <go>{Smehotron(".", cfg).processGoModules()}</go>
     val status = (res \ "test" \ "@status").text
     assertResult("failure")(status)
     val msg = (res \ "test" \ "asserts" \ "failed-assert" \ "text").text

diff --git a/src/test/scala/wrp/smehotron/BasicNogoTest.scala b/src/test/scala/wrp/smehotron/BasicNogoTest.scala
@@ -18,7 +18,7 @@ class BasicNogoTest extends FunSuite {
     val resgen = Smehotron(".", cfg).generateNogoExpectedSvrls()
     val stgen = (resgen \ "outcome" \ "@type").text
     assertResult("success")(stgen)
-    val resprc = Smehotron(".", cfg).processNogoModules()
+    val resprc = <nogo>{Smehotron(".", cfg).processNogoModules()}</nogo>
     val stprc = (resprc \ "test" \ "@status").text
     assertResult("success")(stprc)
     // last, clean up...