Merge pull request #23 from revel/feature/overwrite-generated-app-files

Overwrites generated app files instead of deleting directory

harness/build.go

@@ -162,14 +162,41 @@ func getAppVersion() string {
 
 func cleanSource(dirs ...string) {
 	for _, dir := range dirs {
+		cleanDir(dir)
+	}
+}
+
+func cleanDir(dir string) {
+	revel.INFO.Println("Cleaning dir " + dir)
 	tmpPath := path.Join(revel.AppPath, dir)
-		err := os.RemoveAll(tmpPath)
+	f, err := os.Open(tmpPath)
+	if err != nil {
+		revel.ERROR.Println("Failed to clean dir:", err)
+	} else {
+		defer f.Close()
+		infos, err := f.Readdir(0)
+		if err != nil {
+			revel.ERROR.Println("Failed to clean dir:", err)
+		} else {
+			for _, info := range infos {
+				path := path.Join(tmpPath, info.Name())
+				if info.IsDir() {
+					err := os.RemoveAll(path)
 					if err != nil {
 						revel.ERROR.Println("Failed to remove dir:", err)
 					}
+				} else {
+					err := os.Remove(path)
+					if err != nil {
+						revel.ERROR.Println("Failed to remove file:", err)
+					}
+				}
+			}
+		}
 	}
 }
 
+
 // genSource renders the given template to produce source code, which it writes
 // to the given directory and file.
 func genSource(dir, filename, templateSource string, args map[string]interface{}) {
@@ -178,14 +205,11 @@ func genSource(dir, filename, templateSource string, args map[string]interface{}
 		args)
 
 	// Create a fresh dir.
+	cleanSource(dir)
 	tmpPath := path.Join(revel.AppPath, dir)
-	err := os.RemoveAll(tmpPath)
+	err := os.Mkdir(tmpPath, 0777)
-	if err != nil {
+	if err != nil && !os.IsExist(err) {
-		revel.ERROR.Println("Failed to remove dir:", err)
+		revel.ERROR.Fatalf("Failed to make '%v' directory: %v", dir, err)
-	}
-	err = os.Mkdir(tmpPath, 0777)
-	if err != nil {
-		revel.ERROR.Fatalf("Failed to make tmp directory: %v", err)
 	}
 
 	// Create the file