Put samples in features/samples when initialising new project

CHANGELOG

@@ -1,14 +1,15 @@
 4.0.0
 =====
-28 October 2024
+30 October 2024
 - Introduce Gwen processes to support multiple launch configurations
   - `-p|--process` option
 - Require Java 17+ instead of Java 11+
 - Use logback instead of log4j for logging
 - Support `empty` literal in DSLs wherever `blank` is accepted
 - Replace internal stack of data caches with a single data cache (internal enhancement)
 - Make all input data read only by default
-- Added `--repl` option to force open REPL even if batch was specified
+- Add `--repl` option to open REPL regardless of batch and feature options
+- Put samples in features/samples when initialising new project
 - Internal engine enhancements
   - Replace internal stack of data caches with a single data cache
   - Manage settings internally without exposing them as system properties

src/main/resources/init/conf/process/README.md

@@ -1,6 +1,6 @@
-Environments
-============
+Processes
+=========
 
 Maintain your process settings here.
 
-For help, see the [Gwen documentation](https://gweninterpreter.org/docs).
+For help, see [Gwen processes](https://gweninterpreter.org/docs/processes)

src/main/resources/init/conf/process/samples.conf

@@ -13,9 +13,9 @@
 
 gwen {
   launch {                        # Samples launch options
-    options {                     # See: https://gweninterpreter.org/docs/settings#launch-settings
+    options {                     # See: https://gweninterpreter.org/docs/processes
       features = [
-        "${gwen.baseDir}/samples"
+        "${gwen.baseDir}/features/samples"
       ]
       inputData = ""
       meta = [

src/main/resources/init/features/samples/README.md

@@ -0,0 +1,4 @@
+Samples
+=======
+
+This folder containes examples bundled with Gwen. Delete it and the conf/process/samples.conf file if you don't want to keep them.

src/main/scala/gwen/web/init/WebProjectInitialiser.scala

@@ -73,24 +73,23 @@ trait WebProjectInitialiser extends ProjectInitialiser {
 
       new File(dir, "features") tap { dir =>
         FileIO.copyClasspathTextResourceToFile("/init/features/README.md", dir, allowReplace = force)
+        new File(dir, "samples") tap { dir =>
+          FileIO.copyClasspathTextResourceToFile("/init/features/samples/README.md", dir, allowReplace = force)
+          new File(dir, "google") tap { dir =>
+            FileIO.copyClasspathTextResourceToFile("/init/features/samples/google/Google.feature", dir, allowReplace = force)
+            FileIO.copyClasspathTextResourceToFile("/init/features/samples/google/Google.meta", dir, allowReplace = force)
+          }
+          new File(dir, "todo") tap { dir =>
+            FileIO.copyClasspathTextResourceToFile("/init/features/samples/todo/Todo.feature", dir, allowReplace = force)
+            FileIO.copyClasspathTextResourceToFile("/init/features/samples/todo/Todo.meta", dir, allowReplace = force)
+          }
+        }
       }
 
       new File(dir, "meta") tap { dir =>
         FileIO.copyClasspathTextResourceToFile("/init/meta/README.md", dir, allowReplace = force)
       }
 
-      new File(dir, "samples/google") tap { dir =>
-        FileIO.copyClasspathTextResourceToFile("/init/samples/google/Google.feature", dir, allowReplace = force)
-        FileIO.copyClasspathTextResourceToFile("/init/samples/google/Google.meta", dir, allowReplace = force)
-      }
-      new File(dir, "samples/todo") tap { dir =>
-        FileIO.copyClasspathTextResourceToFile("/init/samples/todo/Todo.feature", dir, allowReplace = force)
-        FileIO.copyClasspathTextResourceToFile("/init/samples/todo/Todo.meta", dir, allowReplace = force)
-      }
-      new File(dir, "samples") tap { dir =>
-        FileIO.copyClasspathTextResourceToFile("/init/samples/README.md", dir, allowReplace = force)
-      }
-
       if(copyRootReadme) {
         FileIO.copyClasspathTextResourceToFile("/init/README.md", new File("."), allowReplace = false)
       }
@@ -132,10 +131,10 @@ trait WebProjectInitialiser extends ProjectInitialiser {
             |$filler│      ├── README.md
             |$filler│      └── samples.conf
             |$filler├── /features              # Features (and associative meta)
-            |$filler│   └── README.md
-            |$filler├── /meta                  # Common meta
-            |$filler│   └── README.md
-            |$filler└── /samples               # Sample features and meta
+            |$filler│   ├── README.md
+            |$filler│   └── /samples           # Samples
+            |$filler└── /meta                  # Common meta
+            |$filler    └── README.md
             |
             |""".stripMargin
       )

test.sh

@@ -1,3 +1,5 @@
+#!/bin/sh
+
 sbt universal:stage
 cd target
 rm -rf project
@@ -6,8 +8,11 @@ cd project
 ../universal/stage/bin/gwen init --docker --jenkins
 ../universal/stage/bin/gwen -p samples --parallel -b
 ../universal/stage/bin/gwen --process samples --dry-run --batch
-../universal/stage/bin/gwen gwen/samples --parallel --dry-run
+../universal/stage/bin/gwen gwen/features/samples --parallel --dry-run
 GWEN_PROCESS=samples ../universal/stage/bin/gwen -bn
 cd ..
-rm -rf project
+if [ $# -eq 0 ]
+  then
+    rm -rf project
+fi
 cd ..