Merge pull request #202 from mkurz/giter8_force

Upgrade giter8 which now has a --force flag

README.md

@@ -29,7 +29,9 @@ sbt new playframework/play-scala-seed.g8
 
 ## Scaffolding
 
-Type `g8Scaffold form` from sbt to create the scaffold controller, template and tests needed to process a form. Be aware you then have to add new routes to the `conf/routes` file, otherwise compilation will fail. See the comments in the newly created controller class which routes need to be added.
+Type `g8Scaffold form` from sbt to create the scaffold controller, template and tests needed to process a form. Be aware you then have to:
+* Either add new routes to the `conf/routes` file, otherwise compilation will fail. See the comments in the newly created controller class which routes need to be added.
+* Or use the `--force` flag which will set up the required routes in the routes file, but overrides any changes you did in that file.
 
 You can also create your own giter8 seeds and scaffolds based off this one by forking from the <https://github.com/playframework/play-java-seed.g8> or <https://github.com/playframework/play-scala-seed.g8> github projects.
 

project/plugins.sbt

@@ -1 +1 @@
-addSbtPlugin("org.foundweekends.giter8" % "sbt-giter8" % "0.16.1")
+addSbtPlugin("org.foundweekends.giter8" % "sbt-giter8" % "0.16.2")

src/main/scaffolds/form/conf/routes

@@ -0,0 +1,12 @@
+# Routes
+# This file defines all application routes (Higher priority routes first)
+# https://www.playframework.com/documentation/latest/ScalaRouting
+# ~~~~
+
+# An example controller showing a sample home page
+GET     /                           controllers.HomeController.index()
+GET     /$model;format="camel"$     controllers.$model;format="Camel"$Controller.$model;format="camel"$Get()
+POST    /$model;format="camel"$     controllers.$model;format="Camel"$Controller.$model;format="camel"$Post()
+
+# Map static resources from the /public folder to the /assets URL path
+GET     /assets/*file               controllers.Assets.versioned(path="/public", file: Asset)

src/test/g8/giter8.test

@@ -3,12 +3,10 @@
 > compile
 > test
 
-# TODO: Switch to g8ScaffoldForce and uncomment last two lines when
-# https://github.com/foundweekends/giter8/pull/771 got merged
-> g8Scaffold form --model=user
+> g8Scaffold form --force --model=user
 
 $exists app/controllers/UserController.scala
 $exists test/controllers/UserControllerSpec.scala
 
-#> compile
-#> test
+> compile
+> test