quackage 1.0.63 → 1.0.65

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "quackage",
-    "version": "1.0.63",
+    "version": "1.0.65",
     "description": "Building.  Testing.  Quacking.  Reloading.",
     "main": "source/Quackage-CLIProgram.js",
     "scripts": {

package/source/commands/Quackage-Command-RunMochaTests.js

@@ -19,7 +19,7 @@ class QuackageCommandBuild extends libCommandLineCommand
 	onRunAsync(fCallback)
 	{
 		// See if the user passed in a filter for tests
-		let tmpTestGrepExpression = (typeof(this.CommandOptions.search_expression) === 'undefined') ? false : this.CommandOptions.search_expression;
+		let tmpTestGrepExpression = (typeof(this.CommandOptions.grep) === 'undefined') ? false : this.CommandOptions.grep;
 
 		let tmpCWDMochaLocation = `${this.fable.AppData.CWD}/node_modules/.bin/mocha`;
 		let tmpRelativePackageMochaLocation = `${__dirname}/../../../.bin/mocha`;

package/source/services/Quackage-ExampleService.js

@@ -336,39 +336,67 @@ ${tmpExampleListItems}		</ul>
 				}
 
 				let tmpNpxLocation = this.resolveExecutable('npx');
+				let tmpNpmLocation = this.resolveExecutable('npm');
 
-				this.fable.QuackageProcess.execute(
-					tmpNpxLocation,
-					['quack', 'build'],
-					{ cwd: pExample.Path },
-					(pBuildError) =>
-					{
-						if (pBuildError)
-						{
-							this.log.error(`Build error in [${pExample.Name}]: ${pBuildError.message}`);
-						}
-
-						if (tmpPackage.copyFiles || tmpPackage.copyFilesSettings)
+				// Install dependencies if node_modules does not exist
+				let tmpNodeModulesPath = libPath.join(pExample.Path, 'node_modules');
+				let tmpRunBuild = () =>
+				{
+					this.fable.QuackageProcess.execute(
+						tmpNpxLocation,
+						['quack', 'build'],
+						{ cwd: pExample.Path },
+						(pBuildError) =>
 						{
-							this.log.info(`Copying files for [${pExample.Name}] ...`);
-							this.fable.QuackageProcess.execute(
-								tmpNpxLocation,
-								['quack', 'copy'],
-								{ cwd: pExample.Path },
-								(pCopyError) =>
-								{
-									if (pCopyError)
+							if (pBuildError)
+							{
+								this.log.error(`Build error in [${pExample.Name}]: ${pBuildError.message}`);
+							}
+
+							if (tmpPackage.copyFiles || tmpPackage.copyFilesSettings)
+							{
+								this.log.info(`Copying files for [${pExample.Name}] ...`);
+								this.fable.QuackageProcess.execute(
+									tmpNpxLocation,
+									['quack', 'copy'],
+									{ cwd: pExample.Path },
+									(pCopyError) =>
 									{
-										this.log.error(`Copy error in [${pExample.Name}]: ${pCopyError.message}`);
-									}
-									return fExampleCallback();
-								});
-						}
-						else
+										if (pCopyError)
+										{
+											this.log.error(`Copy error in [${pExample.Name}]: ${pCopyError.message}`);
+										}
+										return fExampleCallback();
+									});
+							}
+							else
+							{
+								return fExampleCallback();
+							}
+						});
+				};
+
+				if (!libFS.existsSync(tmpNodeModulesPath))
+				{
+					this.log.info(`Installing dependencies for [${pExample.Name}] ...`);
+					this.fable.QuackageProcess.execute(
+						tmpNpmLocation,
+						['install'],
+						{ cwd: pExample.Path },
+						(pInstallError) =>
 						{
-							return fExampleCallback();
-						}
-					});
+							if (pInstallError)
+							{
+								this.log.error(`Install error in [${pExample.Name}]: ${pInstallError.message}`);
+								return fExampleCallback();
+							}
+							tmpRunBuild();
+						});
+				}
+				else
+				{
+					tmpRunBuild();
+				}
 			},
 			(pError) =>
 			{

package/test/Quackage_tests.js

@@ -210,6 +210,38 @@ suite
 						Expect(tmpClass.prototype.onRunAsync).to.be.a('function');
 					}
 				);
+
+				test
+				(
+					'RunMochaTests command should have a --grep option registered.',
+					function()
+					{
+						let tmpCommand = getCommand('run-mocha-tests');
+						Expect(tmpCommand).to.be.an('object');
+
+						// Verify the --grep option is registered on the commander command
+						let tmpGrepOption = tmpCommand.options.find((pOpt) => pOpt.long === '--grep');
+						Expect(tmpGrepOption).to.be.an('object', 'Expected --grep option to be registered on run-mocha-tests command');
+						Expect(tmpGrepOption.short).to.equal('-g');
+						Expect(tmpGrepOption.optional).to.equal(true, 'grep should accept an optional value');
+					}
+				);
+
+				test
+				(
+					'RunMochaTests --grep option property name should match what onRunAsync reads.',
+					function()
+					{
+						let tmpCommand = getCommand('run-mocha-tests');
+						let tmpGrepOption = tmpCommand.options.find((pOpt) => pOpt.long === '--grep');
+
+						// Commander derives the property name from the long flag (--grep => "grep").
+						// onRunAsync reads this.CommandOptions.grep to get the expression.
+						// This test ensures the two stay in sync — the bug was that onRunAsync
+						// previously read "search_expression" (the placeholder name) instead of "grep".
+						Expect(tmpGrepOption.attributeName()).to.equal('grep');
+					}
+				);
 			}
 		);