Merge branch 'develop'

Author: skipoleschris

TODO.markdown

@@ -0,0 +1,7 @@
+## To Do List ##
+
+### Testing ###
+
+* Unit test for templemore.jruby.Cucumber class
+* Component test for xsbt.cucumber.CucumberIntegration
+

build.sbt

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

project/build.properties

@@ -1 +1 @@
-sbt.version=0.10.0
+sbt.version=0.10.1

src/main/scala/templemore/jruby/GemInstaller.scala

@@ -8,11 +8,17 @@ import java.io.File
 /**
  * @author Chris Turner
  */
-case class Gem(name: String, version: Option[String], source: Option[String]) {
+case class Gem(name: String,
+               version: Option[String],
+               source: Option[String],
+               classifier: Option[String] = None) {
 
   override def toString = version match {
     case None => name
-    case Some(v) => "%s-%s" format(name, v)
+    case Some(v) => classifier match {
+      case None => "%s-%s" format(name, v)
+      case Some(c) => "%s-%s-%s" format(name, v, c)
+    }
   }
 
   def toArgs = (name :: versionArgs) ++ sourceArgs
@@ -28,11 +34,11 @@ case class Gem(name: String, version: Option[String], source: Option[String]) {
   }
 }
 
-case class GemInstaller(jRubyHome: File,
-                        gemDir: File,
-                        classpath: List[File],
-                        outputStrategy: OutputStrategy) extends JRuby {
-  gemDir.mkdirs()
+class GemInstaller(val jRubyHome: File,
+                   val gemDir: File,
+                   val classpath: List[File],
+                   val outputStrategy: OutputStrategy) extends JRuby {
+  IO.createDirectory(gemDir)
 
   protected val javaOpts = List[String]()
 

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

@@ -48,8 +48,8 @@ trait CucumberIntegration {
                           gemSettings: GemSettings,
                           log: Logger) = {
     log.info("Installing any missing Gems...")
-    val gemInstaller = GemInstaller(jRubySettings.jRubyHome, jRubySettings.gemDir,
-                                    jRubySettings.classpath, jRubySettings.outputStrategy)
+    val gemInstaller = new GemInstaller(jRubySettings.jRubyHome, jRubySettings.gemDir,
+                                        jRubySettings.classpath, jRubySettings.outputStrategy)
     gemSettings.gems.foreach(gemInstaller.installGem(_, gemSettings.forceReload))
   }
 

src/test/scala/templemore/jruby/GemInstallerSpec.scala

@@ -14,25 +14,42 @@ class GemInstallerSpec extends FlatSpec with MustMatchers with BeforeAndAfterEac
   private val jRubyHome = new File(System.getProperty("user.dir"), "target")
   private val gemDir = new File(jRubyHome, "gems")
   private val jRubyJar = new File(System.getProperty("user.home")) / ".ivy2" / "cache" / "org.jruby" / "jruby-complete" / "jars" / "jruby-complete-1.6.1.jar"
-  private val cucumberVersion = "1.0.0"
+
+  private val gemName = "json"
+  private val gemVersion = "1.5.3"
 
   override def beforeEach() {
-    if ( gemDir.exists ) deleteAllFiles(gemDir)
-    else gemDir.mkdirs()
+    IO.delete(gemDir)
+    IO.createDirectory(gemDir)
   }
 
+  "A gem installer" should "install the test gem" in {
+    installTestGem()
+    gemDirectory.exists() must be(true)
+  }
 
-  "A gem installer" should "install the cucumber gem" in {
-    val installer = new GemInstaller(jRubyHome, gemDir,
-                                     List(jRubyJar),
-                                     StdoutOutput)
-    installer.installGem(Gem("cucumber", Some(cucumberVersion), Some("http://rubygems.org/")))
+  it should "not install the test gem if it is already present" in {
+    installTestGem()
+    val timestamp = gemFile.lastModified()
+    installTestGem()
+    gemFile.lastModified() must be(timestamp)
+  }
 
-    new File(gemDir, "gems/cucumber-" + cucumberVersion).exists() must be(true)
+  it should "force install the test gem even if it is already present" in {
+    installTestGem()
+    val timestamp = gemFile.lastModified()
+    installTestGem(true)
+    gemFile.lastModified() must not be(timestamp)
   }
 
-  private def deleteAllFiles(dir: File): Unit = dir.listFiles.foreach { f =>
-    if ( f.isDirectory ) deleteAllFiles(f)
-    f.delete()
+  private def gemDirectory = gemDir / "gems" / "%s-%s-java".format(gemName, gemVersion)
+  private def gemFile = gemDirectory / "lib" / "json.rb"
+
+  private def installTestGem(force: Boolean = false) {
+    val installer = new GemInstaller(jRubyHome, gemDir,
+                                     List(jRubyJar),
+                                     StdoutOutput)
+    val gem = Gem(gemName, Some(gemVersion), Some("http://rubygems.org/"), Some("java"))
+    installer.installGem(gem, force)
   }
 }

testProjects/multiModuleTestProject/project/Build.scala

@@ -5,7 +5,7 @@ import templemore.xsbt.cucumber.CucumberPlugin
 object BuildSettings {
   val buildOrganization = "templemore"
   val buildScalaVersion = "2.9.0-1"
-  val buildVersion      = "0.1"
+  val buildVersion      = "0.2"
 
   val buildSettings = Defaults.defaultSettings ++
                       Seq (organization := buildOrganization,
@@ -34,4 +34,4 @@ object TestProjectBuild extends Build {
 
   lazy val warProject = Project ("war-project", file ("war-project"),
            settings = buildSettings ++ Seq (libraryDependencies ++= testDeps)) dependsOn (jarProject)
-}
+}

testProjects/multiModuleTestProject/project/build.properties

@@ -0,0 +1,2 @@
+sbt.version=0.10.1
+

testProjects/multiModuleTestProject/project/plugins/build.sbt

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

testProjects/testProject/build.sbt

@@ -1,6 +1,6 @@
 name := "test-project"
 
-version := "0.1"
+version := "0.2"
 
 organization := "templemore"
 

testProjects/testProject/project/build.properties

@@ -1 +1 @@
-sbt.version=0.10.0
+sbt.version=0.10.1

testProjects/testProject/project/plugins/build.sbt

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