Updated plugin to support correct output for html, junit and json

Modified multi-module test project to use new plugin version

Author: skipoleschris

src/main/scala/templemore/xsbt/cucumber/CucumberIntegration.scala

@@ -8,14 +8,19 @@ import std.TaskStreams
  */
 trait CucumberIntegration {
 
-  protected def optionsForMode(mode: CucumberMode,
-                               htmlReportFile: File) = {
-    htmlReportFile.getParentFile.mkdirs()
-    mode match {
-      case Developer => List[String]("--format", "pretty")
-      case HtmlReport => List[String]("--format", "html", "--out", htmlReportFile.getPath)
-      case _ => List[String]("--format", "pretty")
-    }
+  protected def optionsForReporting(htmlReportDir: Option[File],
+                                    jsonReportFile: Option[File],
+                                    junitReportFile: Option[File]): List[String] = {
+    (Some("--format" :: "pretty" :: Nil) ::
+     (htmlReportDir map { dir => 
+       dir.mkdirs()
+       "--format" :: "html:%s".format(dir.getPath) :: Nil }) ::
+     (jsonReportFile map { file => 
+       file.getParentFile.mkdirs()
+       "--format" :: "json-pretty:%s".format(file.getPath) :: Nil }) ::
+     (junitReportFile map { file => 
+       file.getParentFile.mkdirs()
+       "--format" :: "junit:%s".format(file.getPath) :: Nil }) :: Nil).flatten.flatten
   }
 
   protected def testWithCucumber(args: Seq[String],

src/main/scala/templemore/xsbt/cucumber/CucumberMode.scala

@@ -24,8 +24,11 @@ object CucumberPlugin extends Plugin with CucumberIntegration {
   val cucumberFeaturesDir = SettingKey[File]("cucumber-features-directory")
   val cucumberStepsBasePackage = SettingKey[String]("cucumber-steps-base-package")
   val cucumberExtraOptions = SettingKey[Seq[String]]("cucumber-extra-options")
-  val cucumberMode = SettingKey[CucumberMode]("cucumber-mode")
-  val cucumberHtmlReportFile = SettingKey[File]("cucumber-html-report")
+
+  val cucumberHtmlReportDir = SettingKey[Option[File]]("cucumber-html-report")
+  val cucumberJsonReportFile = SettingKey[Option[File]]("cucumber-json-report")
+  val cucumberJunitReportFile = SettingKey[Option[File]]("cucumber-junit-report")
+
   val cucumberBefore = SettingKey[LifecycleCallback]("cucumber-before")
   val cucumberAfter = SettingKey[LifecycleCallback]("cucumber-after")
 
@@ -41,9 +44,10 @@ object CucumberPlugin extends Plugin with CucumberIntegration {
 
   protected def cucumberOptionsTask: Initialize[Task[CucumberOptions]] =
     (cucumberFeaturesDir, cucumberStepsBasePackage, cucumberExtraOptions,
-     cucumberMode, cucumberHtmlReportFile, cucumberBefore, cucumberAfter) map {
-      (fd, bp, o, m, htmlRF, bf, af) => {
-        CucumberOptions(fd, bp, optionsForMode(m, htmlRF) ++ o, bf, af)
+     cucumberHtmlReportDir, cucumberJsonReportFile, cucumberJunitReportFile,
+     cucumberBefore, cucumberAfter) map {
+      (fd, bp, o, htmlRD, jsonRF, junitRF, bf, af) => {
+        CucumberOptions(fd, bp, optionsForReporting(htmlRD, jsonRF, junitRF) ++ o, bf, af)
       }
     }
 
@@ -62,16 +66,17 @@ object CucumberPlugin extends Plugin with CucumberIntegration {
     cucumberTestSettings <<= cucumberSettingsTask,
     cucumberOptions <<= cucumberOptionsTask,
 
-    cucumberMode := Normal,
-
     cucumberMaxMemory := "256M",
     cucumberMaxPermGen := "64M",
 
     cucumberFeaturesDir <<= (baseDirectory) { _ / "src" / "test" / "features" },
     cucumberStepsBasePackage := "",
-    cucumberHtmlReportFile <<= (target) { _ / "cucumber-report" / "cucumber.html" },
     cucumberExtraOptions := List[String](),
 
+    cucumberHtmlReportDir := None,
+    cucumberJsonReportFile := None,
+    cucumberJunitReportFile := None,
+
     cucumberBefore := defaultBefore,
     cucumberAfter := defaultAfter
   )

src/main/scala/templemore/xsbt/cucumber/CucumberPlugin.scala

@@ -1,6 +1,6 @@
 package test
 
-import cuke4duke.{EN, ScalaDsl}
+import cucumber.runtime.{EN, ScalaDsl}
 import org.scalatest.matchers.ShouldMatchers
 
 class CucumberJarSteps extends ScalaDsl with EN with ShouldMatchers {

testProjects/multiModuleTestProject/jar-project/features/CucumberInJarProject.feature testProjects/multiModuleTestProject/jar-project/src/test/features/CucumberInJarProject.feature

@@ -4,8 +4,8 @@ import templemore.xsbt.cucumber.CucumberPlugin
 
 object BuildSettings {
   val buildOrganization = "templemore"
-  val buildScalaVersion = "2.9.1"
-  val buildVersion      = "0.4.1"
+  val buildScalaVersion = "2.9.2"
+  val buildVersion      = "0.5.0"
 
   val buildSettings = Defaults.defaultSettings ++
                       Seq (organization := buildOrganization,
@@ -16,7 +16,7 @@ object BuildSettings {
 
 object Dependencies {
 
-  val scalaTest = 	"org.scalatest" %% "scalatest" % "1.6.1" % "test"
+  val scalaTest = 	"org.scalatest" %% "scalatest" % "1.7.2" % "test"
 
   val testDeps = Seq(scalaTest)
 }

testProjects/multiModuleTestProject/jar-project/src/test/scala/test/CucumberJarSteps.scala

@@ -1,2 +1,2 @@
-sbt.version=0.11.2
+sbt.version=0.11.3
 

testProjects/multiModuleTestProject/project/Build.scala

@@ -1,3 +1,3 @@
 resolvers += Resolver.file("Local Repo", file((Path.userHome / ".m2" / "repository").toString))
 
-addSbtPlugin("templemore" % "xsbt-cucumber-plugin" % "0.4.1")
+addSbtPlugin("templemore" % "xsbt-cucumber-plugin" % "0.5.0")

testProjects/multiModuleTestProject/project/build.properties

@@ -1,6 +1,6 @@
 package test
 
-import cuke4duke.{EN, ScalaDsl}
+import cucumber.runtime.{EN, ScalaDsl}
 import org.scalatest.matchers.ShouldMatchers
 
 class CucumberWarSteps extends ScalaDsl with EN with ShouldMatchers {

testProjects/multiModuleTestProject/project/plugins.sbt

@@ -13,3 +13,9 @@ libraryDependencies ++= Seq(
 seq(cucumberSettings : _*)
 
 cucumberStepsBasePackage := "test"
+
+cucumberHtmlReportDir <<= (target) { d => Some(d / "cucumber-report") }
+
+cucumberJsonReportFile <<= (target) { f => Some(f / "cucumber.json") }
+
+cucumberJunitReportFile <<= (target) { f => Some(f / "cucumber-junit.xml") }