Merge pull request #11 from ColdBox/development

Version Release

Author: lmajano

box.json

@@ -1,6 +1,6 @@
 {
     "name":"ColdBox CLI",
-    "version":"7.4.0",
+    "version":"7.5.0",
     "location":"https://downloads.ortussolutions.com/ortussolutions/commandbox-modules/coldbox-cli/@build.version@/coldbox-cli-@build.version@.zip",
     "slug":"coldbox-cli",
     "author":"Ortus Solutions, Corp",

changelog.md

@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- watch reinit issues with `coldbox watch` command
 - key [TEMPLATEPATH] doesn't exist when doing orm operations. This was a typo, it should have been `templatesPath`
 
 ## [7.4.0] - 2024-03-20

commands/coldbox/create/orm-crud.cfc

@@ -26,7 +26,6 @@ component extends="coldbox-cli.models.BaseCommand" {
 		boolean tests     = true,
 		testsDirectory    = "tests/specs/integration"
 	){
-
 		// This will make each directory canonical and absolute
 		arguments.handlersDirectory = resolvePath( arguments.handlersDirectory );
 		arguments.viewsDirectory    = resolvePath( arguments.viewsDirectory );

commands/coldbox/watch-reinit.cfc

@@ -17,7 +17,8 @@
  *
  * {code}
  * package set reinitWatchDelay=1000
- * package set reinitWatchPaths= "config/**.cfc,handlers/**.cfc,models/**.cfc,ModuleConfig.cfc"
+ * package set reinitWatchPaths="config/**.cfc,handlers/**.cfc,models/**.cfc,ModuleConfig.cfc"
+ * package set reinitWatchDirectory="../"
  * {code}
  *
  * This command will run in the foreground until you stop it.  When you are ready to shut down the watcher, press Ctrl+C.
@@ -33,14 +34,16 @@ component {
 	variables.PATHS       = "/config/**.cfc,/handlers/**.cfc,/models/**.cfc,/modules_app/**/*.cfc";
 
 	/**
-	 * @paths    Command delimited list of file globbing paths to watch relative to the working directory, defaults to **.cfc
-	 * @delay    How may milliseconds to wait before polling for changes, defaults to 500 ms
+	 * @paths Command delimited list of file globbing paths to watch relative to the working directory, defaults to **.cfc
+	 * @delay How may milliseconds to wait before polling for changes, defaults to 500 ms
 	 * @password Reinit password
+	 * @directory Working directory to start watcher in
 	 **/
 	function run(
 		string paths,
 		number delay,
-		string password = "1"
+		string password = "1",
+		string directory
 	){
 		// Get watch options from package descriptor
 		var boxOptions   = packageService.readPackageDescriptor( getCWD() );
@@ -59,10 +62,14 @@ component {
 
 		// Determine watching patterns, either from arguments or boxoptions or defaults
 		var globbingPaths = arguments.paths ?: getOptionsWatchers() ?: variables.PATHS;
-		// handle non numeric config and put a floor of 150ms
-		var delayMs       = max(
+		var globArray     = globbingPaths.listToArray();
+		var theDirectory  = arguments.directory ?: boxOptions.reinitWatchDirectory ?: getCWD();
+		theDirectory      = resolvePath( theDirectory );
+
+		// handle non numeric config
+		var delayMs = max(
 			val( arguments.delay ?: boxOptions.reinitWatchDelay ?: variables.WATCH_DELAY ),
-			150
+			variables.WATCH_DELAY
 		);
 		var statusColors = {
 			"added"   : "green",
@@ -95,15 +102,19 @@ component {
 			.greenLine( "---------------------------------------------------" )
 			.greenLine( "Watching the following files for a framework reinit" )
 			.greenLine( "---------------------------------------------------" )
-			.greenLine( " " & globbingPaths )
+			.line();
+		globArray.each( ( p ) => print.greenLine( " " & p ) );
+		print
+			.line()
+			.greenLine( " in directory: #theDirectory#" )
 			.greenLine( " Press Ctrl-C to exit " )
 			.greenLine( "---------------------------------------------------" )
 			.toConsole();
 
 		// Start watcher
 		watch()
-			.paths( globbingPaths.listToArray() )
-			.inDirectory( getCWD() )
+			.paths( globArray )
+			.inDirectory( theDirectory )
 			.withDelay( delayMs )
 			.onChange( function( changeData ){
 				// output file changes