cleaning now deletes the fixture db

mcfunley · Jul 16, 2010 · a92e7b1 · a92e7b1
1 parent 1368330
commit a92e7b1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/project/build.properties b/project/build.properties
@@ -1,8 +1,8 @@
 #Project properties
-#Fri Jul 09 11:11:22 UTC 2010
+#Fri Jul 16 18:50:03 EDT 2010
 project.organization=com.etsy
 project.name=sbt-sqlite-plugin
 sbt.version=0.7.4
-project.version=1.0.3
+project.version=1.0.4
 build.scala.versions=2.7.7
 project.initialize=false
diff --git a/src/com.etsy.sbt/SqliteDatabase.scala b/src/com.etsy.sbt/SqliteDatabase.scala
@@ -17,14 +17,21 @@ trait SqliteDatabase extends BasicScalaProject {
 
   def sqliteDatabaseAction = {
     if(testDBMissing || fixturesNewer || testDBTooSmall) {
-      cleanTestDB
+      cleanSqliteAction
       createTestDB
     } else {
       log.info("Test database up to date.")
     }
     None
   } 
 
+  override def cleanAction = super.cleanAction dependsOn(cleanSqlite)
+
+  lazy val cleanSqlite = task { cleanSqliteAction ; None } describedAs (
+    "Deletes the sqlite fixture database.")
+
+  def cleanSqliteAction = sqliteDatabasePath.asFile.delete
+
   override def testListeners = super.testListeners ++ Seq(new TestsListener {
     def doInit = sqliteDatabaseAction
     def doComplete(finalResult : Result.Value) = {}
@@ -61,8 +68,6 @@ trait SqliteDatabase extends BasicScalaProject {
     } else false
   }
 
-  private def cleanTestDB = sqliteDatabasePath.asFile.delete
-
   private def cp(p : Path) = p.asFile.getCanonicalPath
 
   private def createTestDB =