Release 0.6.2

Upgraded to support projects using Scala 2.10.0-RC1 via cucumber-jvm 1.1.1

Author: skipoleschris

Diff for: README.markdown

@@ -8,9 +8,8 @@ IMPORTANT: Release 0.5.0 onwards are a major update that switches from running t
 Provides the ability to run Cucumber-jvm within the SBT environment. Originally based on the [cuke4duke-sbt-plugin](https://github.com/rubbish/cuke4duke-sbt-plugin) by rubbish and my original implementation for SBT 0.7.x. Specifics for this release:
 
 * Works with xsbt 0.12.0
-* Works with cucumber-jvm (version 1.0.9 for Scala 2.9.x and version 1.0.14 for Scala 2.10.0-M6)
-* Allows projects compiled and running against Scala 2.9.1, 2.9.2 and 2.10.0-M6 
-* NOTE: Currently doesn't work with Scala 2.10.0-M7 as this isn't supported by the latest cucumber-jvm version
+* Works with cucumber-jvm (version 1.0.9 for Scala 2.9.x and version 1.1.1 for Scala 2.10.0-RC1)
+* Allows projects compiled and running against Scala 2.9.1, 2.9.2 and 2.10.0-RC1 
 
 ## Usage ##
 Install the plugin (see later). By default features files go in a 'src/test/features' directory. Step definitions go in 'src/test/scala'. Finally from the sbt console call the task:
@@ -72,12 +71,18 @@ For example:
       }
     }
 
+NOTE: When running Scala 2.10, change the import to:
+
+    import cucumber.api.scala.{ScalaDsl, EN}
+
+This is required as the Cucumber package structure changed between the 1.0.x and 1.1.x releases
+
 ## Project Setup ##
 To install the cucumber plugin, add entries to the build plugins file (project/plugins/build.sbt) as follows:
 
     resolvers += "Templemore Repository" at "http://templemore.co.uk/repo"
 
-    addSbtPlugin("templemore" % "xsbt-cucumber-plugin" % "0.6.1")
+    addSbtPlugin("templemore" % "xsbt-cucumber-plugin" % "0.6.2")
 
 ### Basic Configuration ###
 To add the cucumber plugin settings to a basic project, just add the following to the build.sbt file:
@@ -143,6 +148,9 @@ Requests for features can be posted to the issues list or emailed to the author.
 
 ## Release History ##
 
+### 0.6.2 ###
+Upgrade to cucumber-jvm version 1.1.1 to allow compatibility with Scala 2.10.0-RC1 release.
+
 ### 0.6.1 ###
 Update to allow system properties and other JVM arguments to be passed to the JVM that runs cucumber.
 Corrections to documentation.

Diff for: build.sbt

@@ -1,6 +1,6 @@
 name := "xsbt-cucumber-plugin"
 
-version := "0.6.1"
+version := "0.6.2"
 
 organization := "templemore"
 

Diff for: src/main/scala/templemore/xsbt/cucumber/Cucumber.scala

@@ -8,6 +8,7 @@ import sbt.OutputStrategy
  * @author Chris Turner
  */
 case class Cucumber(classpath: List[File],
+                    mainClass: String,
                     outputStrategy: OutputStrategy,
                     systemProperties: Map[String, String],
                     jvmOptions: List[String],
@@ -28,7 +29,7 @@ case class Cucumber(classpath: List[File],
                          options ++ makeOptionsList(tags, "--tags") ++ makeOptionsList(names, "--name") ++
                          (featuresDir.getPath :: Nil)
 
-    val args = jvmArgs ++ ("cucumber.cli.Main" :: cucumberParams)
+    val args = jvmArgs ++ (mainClass :: cucumberParams)
     outputStrategy.asInstanceOf[LoggedOutput].logger.debug(args mkString " ")
     Fork.java(None, args, None, Map.empty[String, String], outputStrategy)
   }

Diff for: src/main/scala/templemore/xsbt/cucumber/CucumberIntegration.scala

@@ -41,7 +41,7 @@ trait CucumberIntegration {
 
     log.info("Running cucumber...")
     cucumberOptions.beforeFunc()
-    val cucumber = Cucumber(cucumberSettings.classpath, cucumberSettings.outputStrategy,
+    val cucumber = Cucumber(cucumberSettings.classpath, cucumberOptions.mainClass, cucumberSettings.outputStrategy,
                             cucumberSettings.systemProperties, cucumberSettings.jvmOptions,
                             Some(cucumberSettings.maxMemory), Some(cucumberSettings.maxPermGen))
     val result = cucumber.cuke(cucumberOptions.featuresDir, cucumberOptions.basePackage,

Diff for: src/main/scala/templemore/xsbt/cucumber/CucumberOptions.scala

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

Diff for: src/main/scala/templemore/xsbt/cucumber/CucumberPlugin.scala

@@ -10,7 +10,7 @@ import Project.Initialize
 object CucumberPlugin extends Plugin with CucumberIntegration {
 
   private val CucumberVersionForScala2_9 = "1.0.9"
-  private val CucumberVersionForScala2_10 = "1.0.14"
+  private val CucumberVersionForScala2_10 = "1.1.1"
 
   type LifecycleCallback = () => Unit
 
@@ -24,6 +24,7 @@ object CucumberPlugin extends Plugin with CucumberIntegration {
   val cucumberSystemProperties = SettingKey[Map[String, String]]("cucumber-system-properties")
   val cucumberJVMOptions = SettingKey[List[String]]("cucumber-jvm-options")
 
+  val cucumberMainClass = SettingKey[String]("cucumber-main-class")
   val cucumberFeaturesDir = SettingKey[File]("cucumber-features-directory")
   val cucumberStepsBasePackage = SettingKey[String]("cucumber-steps-base-package")
   val cucumberExtraOptions = SettingKey[List[String]]("cucumber-extra-options")
@@ -52,10 +53,10 @@ object CucumberPlugin extends Plugin with CucumberIntegration {
     }
 
   protected def cucumberOptionsTask: Initialize[Task[CucumberOptions]] =
-    (cucumberFeaturesDir, cucumberStepsBasePackage, cucumberExtraOptions,
+    (cucumberMainClass, cucumberFeaturesDir, cucumberStepsBasePackage, cucumberExtraOptions,
      cucumberBefore, cucumberAfter) map {
-      (fd, bp, o, bf, af) => {
-        CucumberOptions(fd, bp, o, bf, af)
+      (mc, fd, bp, o, bf, af) => {
+        CucumberOptions(mc, fd, bp, o, bf, af)
       }
     }
 
@@ -73,6 +74,9 @@ object CucumberPlugin extends Plugin with CucumberIntegration {
   private def cucumberVersion(scalaVersion: String) = 
     if ( scalaVersion.startsWith("2.10") ) CucumberVersionForScala2_10 else CucumberVersionForScala2_9
 
+  private def cucumberMain(scalaVersion: String) = 
+    if ( scalaVersion.startsWith("2.10") ) "cucumber.api.cli.Main" else "cucumber.cli.Main"
+
   val cucumberSettings = Seq(
     libraryDependencies <+= scalaVersion { sv =>
       "info.cukes" % "cucumber-scala" % cucumberVersion(sv) % "test"      
@@ -88,6 +92,7 @@ object CucumberPlugin extends Plugin with CucumberIntegration {
     cucumberSystemProperties := Map.empty[String, String],
     cucumberJVMOptions := Nil,
 
+    cucumberMainClass <<= (scalaVersion) { sv => cucumberMain(sv) },
     cucumberFeaturesDir <<= (baseDirectory) { _ / "src" / "test" / "features" },
     cucumberStepsBasePackage := "",
     cucumberExtraOptions := List.empty[String],

Diff for: testProjects/multiModuleTestProject/project/Build.scala

@@ -5,7 +5,7 @@ import templemore.xsbt.cucumber.CucumberPlugin
 object BuildSettings {
   val buildOrganization = "templemore"
   val buildScalaVersion = "2.9.2"
-  val buildVersion      = "0.6.1"
+  val buildVersion      = "0.6.2"
 
   val buildSettings = Defaults.defaultSettings ++
                       Seq (organization := buildOrganization,

Diff for: testProjects/multiModuleTestProject/project/plugins.sbt

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

Diff for: testProjects/testProject/build.sbt

@@ -1,6 +1,6 @@
 name := "test-project"
 
-version := "0.6.1"
+version := "0.6.2"
 
 organization := "templemore"
 

Diff for: testProjects/testProject/project/plugin.sbt

@@ -1,5 +1,5 @@
 resolvers += "Templemore Repository" at "http://templemore.co.uk/repo"
 
-addSbtPlugin("templemore" % "xsbt-cucumber-plugin" % "0.6.1")
+addSbtPlugin("templemore" % "xsbt-cucumber-plugin" % "0.6.2")
 
 

Diff for: testProjects/testProject2_10/build.sbt

@@ -1,13 +1,13 @@
 name := "test-project"
 
-version := "0.6.1"
+version := "0.6.2"
 
 organization := "templemore"
 
-scalaVersion := "2.10.0-M6"
+scalaVersion := "2.10.0-RC1"
 
 libraryDependencies ++= Seq(
-	"org.scalatest" % "scalatest_2.10.0-M6" % "1.9-2.10.0-M6-B2" % "test"
+	"org.scalatest" % "scalatest_2.10.0-RC1" % "1.8-2.10.0-RC1-B1" % "test"
 )
 
 seq(cucumberSettings : _*)

Diff for: testProjects/testProject2_10/project/plugin.sbt

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

Diff for: testProjects/testProject2_10/src/test/scala/test/CucumberJarStepDefinitions.scala

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