Merge pull request #408 from renatocaval/master

fixes how giter8 deals with scripted test

build.sbt

@@ -33,7 +33,6 @@ ThisBuild / scmInfo := Some(
 // posterous title needs to be giter8, so both app and root are named giter8
 lazy val root = (project in file("."))
   .enablePlugins(TravisSitePlugin, NoPublish)
-  .disablePlugins(ScriptedPlugin)
   .aggregate(app, lib, scaffold, plugin)
   .settings(
     name := "giter8",
@@ -45,7 +44,7 @@ lazy val root = (project in file("."))
   )
 
 lazy val app = (project in file("app"))
-  .disablePlugins(BintrayPlugin, ScriptedPlugin)
+  .disablePlugins(BintrayPlugin)
   .enablePlugins(ConscriptPlugin, BuildInfoPlugin, SonatypePublish)
   .dependsOn(lib)
   .settings(
@@ -131,7 +130,7 @@ lazy val plugin = (project in file("plugin"))
   )
 
 lazy val lib = (project in file("library"))
-  .disablePlugins(BintrayPlugin, ScriptedPlugin)
+  .disablePlugins(BintrayPlugin)
   .enablePlugins(SonatypePublish)
   .settings(crossSbt)
   .settings(

plugin/src/main/scala-sbt-1.0/sbt/sbtgiter8/SBTCompat.scala

@@ -21,6 +21,7 @@ package sbtgiter8
 object SBTCompat extends ScriptedCompat
 
 trait ScriptedCompat {
+  val finalScriptName      = "test.script"
   val scriptedSettings     = sbt.ScriptedPlugin.projectSettings
   val sbtLauncher          = sbt.ScriptedPlugin.autoImport.sbtLauncher
   val sbtTestDirectory     = sbt.ScriptedPlugin.autoImport.sbtTestDirectory
@@ -31,6 +32,6 @@ trait ScriptedCompat {
   val scriptedLaunchOpts   = sbt.ScriptedPlugin.autoImport.scriptedLaunchOpts
   val scriptedRun          = sbt.ScriptedPlugin.autoImport.scriptedRun
   val scriptedSbt          = sbt.ScriptedPlugin.autoImport.scriptedSbt
-  val scriptedTask         = sbt.ScriptedPlugin.scriptedTask
+  val scriptedTask         = sbt.ScriptedPlugin.autoImport.scripted
   val scriptedTests        = sbt.ScriptedPlugin.autoImport.scriptedTests
 }

plugin/src/main/scala/Giter8Plugin.scala

@@ -129,7 +129,9 @@ object Giter8Plugin extends sbt.AutoPlugin {
         } else Nil
 
         // copy test script or generate one
-        val script = new File(out, "test")
+        // the final script should always be called "test.script"
+        // no matter how it was originally called by user
+        val script = new File(out, finalScriptName)
         if (ts.exists) IO.copyFile(ts, script)
         else IO.write(script, """>test""")
 
@@ -141,15 +143,25 @@ object Giter8Plugin extends sbt.AutoPlugin {
         val dir     = (sourceDirectory in Test).value
         val metadir = (baseDirectory in LocalRootProject).value / "project"
         val file0   = dir / "g8" / "test"
-        val files = List(
-          file0,
-          dir / "g8" / "giter8.test",
-          dir / "g8" / "g8.test",
-          metadir / "test",
-          metadir / "giter8.test",
-          metadir / "g8.test"
-        )
-        files.find(_.exists).getOrElse(file0)
+
+        // we should only use file0 if its an exisiting file
+        // if it exists and is a dir we should fallback to test.script
+        val defaultTestScript =
+          if (file0.isDirectory) dir / "g8" / "test.script"
+          else file0
+
+        val files = List(file0,
+                         dir / "g8" / "test.script",
+                         dir / "g8" / "giter8.test",
+                         dir / "g8" / "g8.test",
+                         metadir / "test",
+                         metadir / "test.script",
+                         metadir / "giter8.test",
+                         metadir / "g8.test")
+
+        files
+          .find(_.isFile)
+          .getOrElse(defaultTestScript)
       },
       scriptedBufferLog in (Test, g8) := true
     )

plugin/src/sbt-test/giter8/simple/build.sbt

@@ -1,3 +1,5 @@
+enablePlugins(ScriptedPlugin)
+
 scriptedBufferLog in (Test, g8) := false
 
 TaskKey[Unit]("writeInvalidFile") := {

plugin/src/sbt-test/giter8/without-name/build.sbt

@@ -1,3 +1,6 @@
+
+enablePlugins(ScriptedPlugin)
+
 scriptedBufferLog in (Test, g8) := false
 
 val javaVmArgs: List[String] = {