Completed the cucumber-jvm version of the plugin

Support different cucumber-jvm versions for scala 2.9 and 2.10
Updated the single module test project

Author: skipoleschris

build.sbt

@@ -10,10 +10,5 @@ sbtPlugin := true
 
 resolvers += "sonatype-snapshots" at "https://oss.sonatype.org/content/repositories/snapshots"
 
-libraryDependencies ++= Seq(
-    "info.cukes" % "cucumber-scala" % "1.0.9" % "test",
-    "org.scalatest" %% "scalatest" % "1.7.2" % "test"
-)
-
 publishTo := Some(Resolver.file("Local Repo", file((Path.userHome / ".m2" / "repository").toString)))
 

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

@@ -18,10 +18,10 @@ case class Cucumber(classpath: List[File],
   private val jvmArgs = "-classpath" :: makeClasspath(classpath) ::
                         ("-Xmx%s" format maxMemory) :: ("-XX:MaxPermSize=%s" format maxPermGen) :: Nil
 
-  def cuke(featuresDir: File, requirePath: File, options: List[String] = List(),
+  def cuke(featuresDir: File, basePackage: String, options: List[String] = List(),
            tags: List[String] = List(), names: List[String] = List()): Int = {
 
-    val cucumberParams = ("--glue" :: requirePath.getPath :: Nil) ++
+    val cucumberParams = ("--glue" :: basePackage :: Nil) ++
                          options ++ makeOptionsList(tags, "--tags") ++ makeOptionsList(names, "--name") ++
                          (featuresDir.getPath :: Nil)
 

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

@@ -50,7 +50,7 @@ trait CucumberIntegration {
     cucumberOptions.beforeFunc()
     val cucumber = Cucumber(cucumberSettings.classpath, cucumberSettings.outputStrategy,
                             Some(cucumberSettings.maxMemory), Some(cucumberSettings.maxPermGen))
-    val result = cucumber.cuke(cucumberOptions.featuresDir, cucumberOptions.requiredPath,
+    val result = cucumber.cuke(cucumberOptions.featuresDir, cucumberOptions.basePackage,
                                cucumberOptions.options, tagsFromArgs(args), namesFromArgs(args))
     cucumberOptions.afterFunc()
     result

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

@@ -6,7 +6,7 @@ import java.io.File
  * @author Chris Turner
  */
 case class CucumberOptions(featuresDir: File,
-                           requiredPath: File,
+                           basePackage: String,
                            options: List[String],
                            beforeFunc: () => Unit,
                            afterFunc: () => Unit) {

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

@@ -7,19 +7,22 @@ import Project.Initialize
 /**
  * @author Chris Turner
  */
-object CucumberPlugin extends Plugin with CucumberIntegration with CucumberDependencies {
+object CucumberPlugin extends Plugin with CucumberIntegration {
+
+  private val CucumberVersionForScala2_9 = "1.0.9"
+  private val CucumberVersionForScala2_10 = "1.0.10"
 
   type LifecycleCallback = () => Unit
 
   val cucumber = InputKey[Int]("cucumber")
   val cucumberTestSettings = TaskKey[CucumberSettings]("cucumber-settings")
   val cucumberOptions = TaskKey[CucumberOptions]("cucumber-options")
 
-  val cucumberVersion = SettingKey[String]("cucumber-version")
   val cucumberMaxMemory = SettingKey[String]("cucumber-max-memory")
   val cucumberMaxPermGen = SettingKey[String]("cucumber-max-perm-gen")
 
   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")
@@ -30,25 +33,30 @@ object CucumberPlugin extends Plugin with CucumberIntegration with CucumberDepen
     (argTask, cucumberTestSettings, cucumberOptions, streams) map(testWithCucumber)
 
   protected def cucumberSettingsTask: Initialize[Task[CucumberSettings]] =
-    (cucumberVersion, cucumberMaxMemory, cucumberMaxPermGen, fullClasspath in Test, streams) map {
-      (v, mm, mpg, cp, s) => {
-        CucumberSettings(v, mm, mpg, cp.toList.map(_.data), LoggedOutput(s.log))
+    (cucumberMaxMemory, cucumberMaxPermGen, fullClasspath in Test, streams) map {
+      (mm, mpg, cp, s) => {
+        CucumberSettings(mm, mpg, cp.toList.map(_.data), LoggedOutput(s.log))
       }
     }
 
   protected def cucumberOptionsTask: Initialize[Task[CucumberOptions]] =
-    (cucumberFeaturesDir, classDirectory in Test, cucumberExtraOptions,
+    (cucumberFeaturesDir, cucumberStepsBasePackage, cucumberExtraOptions,
      cucumberMode, cucumberHtmlReportFile, cucumberBefore, cucumberAfter) map {
-      (fd, cd, o, m, htmlRF, bf, af) => {
-        CucumberOptions(fd, cd, optionsForMode(m, htmlRF) ++ o, bf, af)
+      (fd, bp, o, m, htmlRF, bf, af) => {
+        CucumberOptions(fd, bp, optionsForMode(m, htmlRF) ++ o, bf, af)
       }
     }
 
   private def defaultBefore() = {}
   private def defaultAfter() = {}
 
+  private def cucumberVersion(scalaVersion: String) = 
+    if ( scalaVersion.startsWith("2.10") ) CucumberVersionForScala2_10 else CucumberVersionForScala2_9
+
   val cucumberSettings = Seq(
-    libraryDependencies ++= cucumberDependencies,
+    libraryDependencies <+= scalaVersion { sv =>
+      "info.cukes" % "cucumber-scala" % cucumberVersion(sv) % "test"      
+    },
 
     cucumber <<= inputTask(cucumberTask),
     cucumberTestSettings <<= cucumberSettingsTask,
@@ -58,9 +66,9 @@ object CucumberPlugin extends Plugin with CucumberIntegration with CucumberDepen
 
     cucumberMaxMemory := "256M",
     cucumberMaxPermGen := "64M",
-    cucumberVersion := "1.0.9",
 
-    cucumberFeaturesDir <<= (baseDirectory) { _ / "features" },
+    cucumberFeaturesDir <<= (baseDirectory) { _ / "src" / "test" / "features" },
+    cucumberStepsBasePackage := "",
     cucumberHtmlReportFile <<= (target) { _ / "cucumber-report" / "cucumber.html" },
     cucumberExtraOptions := List[String](),
 

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

@@ -6,8 +6,7 @@ import sbt.OutputStrategy
 /**
  * @author Chris Turner
  */
-case class CucumberSettings(cucumberVersion: String,
-                            maxMemory: String,
+case class CucumberSettings(maxMemory: String,
                             maxPermGen: String,
                             classpath: List[File],
                             outputStrategy: OutputStrategy)

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

@@ -11,3 +11,5 @@ libraryDependencies ++= Seq(
 )
 
 seq(cucumberSettings : _*)
+
+cucumberStepsBasePackage := "test"