Upgraded to work with sbt 0.12.0 and Scala 2.9.2

skipoleschris · skipoleschris · commit 2cf0da04ed46 · 2012-10-04T21:32:46.000+01:00
diff --git a/README.markdown b/README.markdown
@@ -1,15 +1,16 @@
 xsbt-cucumber-plugin
 ====================
 
-An [sbt 0.11.x](https://github.com/harrah/xsbt/wiki) plugin for running [Cucumber](http://cukes.info) features.
+An [sbt 0.12.x](https://github.com/harrah/xsbt/wiki) plugin for running [Cucumber](http://cukes.info) features.
 
-IMPORTANT: The current release is a major update that switches from running the ruby version of cucumber (using JRuby) to running cucumber-jvm. This provides a significant improvement in speed and reliability. It also significantly changes the configuration options for the plugin. If you are using an older version of this plugin, please read below and update your project configurations to match the new options.
+IMPORTANT: Release 0.5.0 onwards are a major update that switches from running the ruby version of cucumber (using JRuby) to running cucumber-jvm. This provides a significant improvement in speed and reliability. It also significantly changes the configuration options for the plugin. If you are using a version of this plugin before 0.5.0, please read below and update your project configurations to match the new options.
 
 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.11.3 (probably works with other 0.11.x versions, but I haven't tested this)
-* Works with cucumber-jvm (1.0.9 for scala 2.9 and 1.0.10 for scala 2.10)
-* Allows projects compiled and running against Scala 2.9.1, 2.9.2 and 2.10.0-M4
+* 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
 
 ## 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:
@@ -76,7 +77,7 @@ To install the cucumber plugin, add entries to the build plugins file (project/p
 
     resolvers += "Templemore Repository" at "http://templemore.co.uk/repo"
 
-    addSbtPlugin("templemore" % "xsbt-cucumber-plugin" % "0.5.0")
+    addSbtPlugin("templemore" % "xsbt-cucumber-plugin" % "0.6.0")
 
 ### Basic Configuration ###
 To add the cucumber plugin settings to a basic project, just add the following to the build.sbt file:
@@ -140,6 +141,9 @@ Requests for features can be posted to the issues list or emailed to the author.
 
 ## Release History ##
 
+### 0.6.0 ###
+Updated to work the SBT 0.12.0, Scala 2.9.2 and the latest Cucumber-jvm 1.0.14 versions.
+
 ### 0.5.0 ###
 Moved from ruby implementation of Cucumber to Cucumber-jvm. This changes many of the plugin settings and options. In particular, output options are significantly improved.
 
diff --git a/build.sbt b/build.sbt
@@ -1,14 +1,14 @@
 name := "xsbt-cucumber-plugin"
 
-version := "0.5.0"
+version := "0.6.0"
 
 organization := "templemore"
 
-scalaVersion := "2.9.1"
+scalaVersion := "2.9.2"
 
 sbtPlugin := true
 
 resolvers += "sonatype-snapshots" at "https://oss.sonatype.org/content/repositories/snapshots"
 
-publishTo := Some(Resolver.file("Local Repo", file((Path.userHome / ".m2" / "repository").toString)))
+publishTo := Some(Resolver.file("publishTo", file((Path.userHome / ".m2" / "repository").toString)))
 
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.11.3
+sbt.version=0.12.0
diff --git a/src/main/scala/templemore/xsbt/cucumber/CucumberPlugin.scala b/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.10"
+  private val CucumberVersionForScala2_10 = "1.0.14"
 
   type LifecycleCallback = () => Unit
 
diff --git a/testProjects/multiModuleTestProject/project/Build.scala b/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.5.0"
+  val buildVersion      = "0.6.0"
 
   val buildSettings = Defaults.defaultSettings ++
                       Seq (organization := buildOrganization,
diff --git a/testProjects/multiModuleTestProject/project/build.properties b/testProjects/multiModuleTestProject/project/build.properties
@@ -1,2 +1,2 @@
-sbt.version=0.11.3
+sbt.version=0.12.0
 
diff --git a/testProjects/multiModuleTestProject/project/plugins.sbt b/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.5.0")
+addSbtPlugin("templemore" % "xsbt-cucumber-plugin" % "0.6.0")
diff --git a/testProjects/testProject/build.sbt b/testProjects/testProject/build.sbt
@@ -1,6 +1,6 @@
 name := "test-project"
 
-version := "0.5.0"
+version := "0.6.0"
 
 organization := "templemore"
 
diff --git a/testProjects/testProject/project/build.properties b/testProjects/testProject/project/build.properties
@@ -1 +1 @@
-sbt.version=0.11.3
+sbt.version=0.12.0
diff --git a/testProjects/testProject/project/plugin.sbt b/testProjects/testProject/project/plugin.sbt
@@ -1,3 +1,3 @@
 resolvers += Resolver.file("Local Repo", file((Path.userHome / ".m2" / "repository").toString))
 
-addSbtPlugin("templemore" % "xsbt-cucumber-plugin" % "0.5.0")
+addSbtPlugin("templemore" % "xsbt-cucumber-plugin" % "0.6.0")
diff --git a/testProjects/testProject2_10/.gitignore b/testProjects/testProject2_10/.gitignore
@@ -0,0 +1,6 @@
+.DS_Store
+target
+project/boot
+project/target
+project/plugins/target
+project/plugins/project
diff --git a/testProjects/testProject2_10/build.sbt b/testProjects/testProject2_10/build.sbt
@@ -0,0 +1,21 @@
+name := "test-project"
+
+version := "0.6.0"
+
+organization := "templemore"
+
+scalaVersion := "2.10.0-M6"
+
+libraryDependencies ++= Seq(
+	"org.scalatest" % "scalatest_2.10.0-M6" % "1.9-2.10.0-M6-B2" % "test"
+)
+
+seq(cucumberSettings : _*)
+
+cucumberStepsBasePackage := "test"
+
+cucumberHtmlReport := true
+
+cucumberJunitReport := true 
+
+cucumberJsonReport := true
diff --git a/testProjects/testProject2_10/project/build.properties b/testProjects/testProject2_10/project/build.properties
@@ -0,0 +1 @@
+sbt.version=0.12.0
diff --git a/testProjects/testProject2_10/project/plugin.sbt b/testProjects/testProject2_10/project/plugin.sbt
@@ -0,0 +1,3 @@
+resolvers += Resolver.file("Local Repo", file((Path.userHome / ".m2" / "repository").toString))
+
+addSbtPlugin("templemore" % "xsbt-cucumber-plugin" % "0.6.0")
diff --git a/testProjects/testProject2_10/src/test/features/CucumberJar.feature b/testProjects/testProject2_10/src/test/features/CucumberJar.feature
@@ -0,0 +1,10 @@
+@example-jar
+Feature: Cucumber in Jar Project
+  In order to implement BDD in my Scala project
+  As a developer
+  I want to be able to run Cucumber from with SBT
+
+  Scenario: Execute feature in a Jar Project
+    Given an SBT project
+    When the cucumber task is called
+    Then Cucumber is executed against the features and step definitions
diff --git a/testProjects/testProject2_10/src/test/scala/test/CucumberJarStepDefinitions.scala b/testProjects/testProject2_10/src/test/scala/test/CucumberJarStepDefinitions.scala
@@ -0,0 +1,23 @@
+package test
+
+import cucumber.runtime.{EN, ScalaDsl}
+import org.scalatest.matchers.ShouldMatchers
+
+class CucumberJarStepDefinitions extends ScalaDsl with EN with ShouldMatchers {
+
+  private var givenCalled = false
+  private var whenCalled = false
+
+  Given("""^an SBT project$""") { () =>
+    givenCalled = true
+  }
+
+  When("""^the cucumber task is called$""") { () =>
+    whenCalled = true
+  }
+
+  Then("""^Cucumber is executed against the features and step definitions$""") { () =>
+    givenCalled should be (true)
+    whenCalled should be (true)
+  }
+}

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-sbt.version=0.11.3`
	`1`	`+sbt.version=0.12.0`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-sbt.version=0.11.3`
	`1`	`+sbt.version=0.12.0`
`2`	`2`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`resolvers += Resolver.file("Local Repo", file((Path.userHome / ".m2" / "repository").toString))`
`2`	`2`
`3`		`-addSbtPlugin("templemore" % "xsbt-cucumber-plugin" % "0.5.0")`
	`3`	`+addSbtPlugin("templemore" % "xsbt-cucumber-plugin" % "0.6.0")`