quackage 1.0.16 → 1.0.18

package/.quackage-templates.json

@@ -51,7 +51,7 @@
             {
                 "Hash": "testQUACKAGEPROJECTNAMECAPBasictestjs",
                 "Path": "test/QUACKAGEPROJECTNAMECAP-Basic_test.js",
-                "Content": "/*\n\tUnit tests for {~PascalCaseIdentifier:AppData.Package.name~} v.${_Package.version} {~Data:Record.Scope~}\n*/\n\nconst Chai = require('chai');\nconst Expect = Chai.expect;\n\nconst lib{~PascalCaseIdentifier:AppData.Package.name~} = require(`../{~Data:AppData.Package.main~}`);\n\nsuite\n(\n\t'{~PascalCaseIdentifier:AppData.Package.name~} {~Data:Record.Scope~} Suite',\n\t() =>\n\t{\n\t\tsetup(() => { });\n\n\t\tsuite\n\t\t\t(\n\t\t\t\t'Basic ${_Package.name}.v.${_Package.version} {~Data:Record.Scope~} Tests',\n\t\t\t\t() =>\n\t\t\t\t{\n\t\t\t\t\ttest(\n\t\t\t\t\t\t\t'Object Instantiation # {~RandomNumberString:1,9~}',\n\t\t\t\t\t\t\t(fDone) =>\n\t\t\t\t\t\t\t{\n\t\t\t\t\t\t\t\tlet _{~PascalCaseIdentifier:AppData.Package.name~} = new lib{~PascalCaseIdentifier:AppData.Package.name~}();\n\t\t\t\t\t\t\t\tExpect(_{~PascalCaseIdentifier:AppData.Package.name~}).to.be.an('object');\n\t\t\t\t\t\t\t\treturn fDone();\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t);\n\t\t\t\t}\n\t\t\t);\n\t}\n);"
+                "Content": "/*\n\tUnit tests for {~PascalCaseIdentifier:AppData.Package.name~} v.{~D:AppData.Package.version~} {~Data:Record.Scope~}\n*/\n\nconst Chai = require('chai');\nconst Expect = Chai.expect;\n\nconst lib{~PascalCaseIdentifier:AppData.Package.name~} = require(`../{~Data:AppData.Package.main~}`);\n\nsuite\n(\n\t'{~PascalCaseIdentifier:AppData.Package.name~} {~Data:Record.Scope~} Suite',\n\t() =>\n\t{\n\t\tsetup(() => { });\n\n\t\tsuite\n\t\t\t(\n\t\t\t\t'Basic {~D:_Package.name~}.v.{~D:_Package.version~} {~D:Record.Scope~} Tests',\n\t\t\t\t() =>\n\t\t\t\t{\n\t\t\t\t\ttest(\n\t\t\t\t\t\t\t'Object Instantiation',\n\t\t\t\t\t\t\t(fDone) =>\n\t\t\t\t\t\t\t{\n\t\t\t\t\t\t\t\tlet _{~PascalCaseIdentifier:AppData.Package.name~} = new lib{~PascalCaseIdentifier:AppData.Package.name~}();\n\t\t\t\t\t\t\t\tExpect(_{~PascalCaseIdentifier:AppData.Package.name~}).to.be.an('object');\n\t\t\t\t\t\t\t\treturn fDone();\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t);\n\t\t\t\t}\n\t\t\t);\n\t}\n);"
             }
         ]
     },

package/.vscode/launch.json

@@ -11,7 +11,7 @@
             "skipFiles": [
                 "<node_internals>/**"
             ],
-            "program": "${workspaceFolder}/source/Quackage.js",
+            "program": "${workspaceFolder}/debug/Harness.js",
             "args":["lint", "./templates"]
         }
     ]

package/debug/Harness.js

@@ -1 +1,5 @@
 console.log('Fancy debug harness here.  Shame if it would get quacked.');
+
+let libQuackage = require('../source/Quackage-CLIProgram.js');
+
+libQuackage.run(['node', 'Harness.js', 'explain-config']);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quackage",
-  "version": "1.0.16",
+  "version": "1.0.18",
   "description": "Building.  Testing.  Quacking.",
   "main": "source/Quackage.js",
   "scripts": {
@@ -11,8 +11,8 @@
     "build": "./node_modules/.bin/gulp build"
   },
   "bin": {
-    "quack": "./cli/quack",
-    "qua": "./cli/quack"
+    "quack": "./source/Quackage-Run.js",
+    "qua": "./source/Quackage-Run.js"
   },
   "mocha": {
     "diff": true,
@@ -63,8 +63,11 @@
     "mocha": "10.2.0",
     "npm-check-updates": "^16.10.13",
     "nyc": "^15.1.0",
-    "pict": "^1.0.113",
+    "pict-service-commandlineutility": "^1.0.5",
+    "resolve-package-path": "^4.0.3",
+    "resolve-pkg": "^2.0.0",
     "vinyl-buffer": "^1.0.1",
     "vinyl-source-stream": "^2.0.0"
-  }
+  },
+  "devDependencies": {}
 }

package/source/Default-Package.json

@@ -0,0 +1,11 @@
+{
+  "name": "default_package",
+  "version": "1.0.0",
+  "description": "The default quackage package json.",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "",
+  "license": "ISC"
+}

package/source/Default-Quackage-Configuration.json

@@ -48,10 +48,10 @@
 	{
 		"start": "node {~Data:AppData.Package.main~}",
 
-		"test": "./node_modules/.bin/mocha -u tdd -R spec",
-		"tests": "./node_modules/mocha/bin/_mocha -u tdd --exit -R spec --grep",
+		"test": "npx mocha -u tdd -R spec",
+		"tests": "npx mocha -u tdd --exit -R spec --grep",
 
-		"coverage": "./node_modules/.bin/nyc --reporter=lcov --reporter=text-lcov ./node_modules/mocha/bin/_mocha -- -u tdd -R spec",
+		"coverage": "npx nyc --reporter=lcov --reporter=text-lcov ./node_modules/mocha/bin/_mocha -- -u tdd -R spec",
 
 		"build": "npx quack build",
 

package/source/Quackage-CLIProgram.js

@@ -0,0 +1,52 @@
+const libCLIProgram = require('pict-service-commandlineutility');
+
+let _Pict = new libCLIProgram(
+	{
+		Product: 'Quackage',
+		Version: '0.0.1',
+
+		Command: 'hl-record-downloader',
+		Description: 'Download an array of records from Headlight.',
+
+		DefaultProgramConfiguration: require('./Default-Quackage-Configuration.json'),
+
+		// TODO: Should this use a shared config?
+		ProgramConfigurationFileName: '.quackage.json',
+		AutoGatherProgramConfiguration: true,
+		AutoAddConfigurationExplanationCommand: true
+	},
+	[
+		require('./commands/Quackage-Command-UpdatePackage.js'),
+		require('./commands/Quackage-Command-Lint.js'),
+		require('./commands/Quackage-Command-Build.js'),
+		require('./commands/Quackage-Command-Boilerplate.js'),
+		require('./commands/Quackage-Command-BuildTemplates.js'),
+		require('./commands/Quackage-Command-ListTemplates.js')
+	]);
+
+// Instantiate the file persistence service
+_Pict.serviceManager.instantiateServiceProvider('FilePersistence');
+_Pict.serviceManager.instantiateServiceProvider('DataGeneration');
+// Add the Quackage Process Management service
+_Pict.serviceManager.addAndInstantiateServiceType('QuackageProcess', require('./services/Quackage-Execute-Process.js'));
+
+// Grab the current working directory for the quackage
+_Pict.AppData.CWD = _Pict.QuackageProcess.cwd();
+_Pict.AppData.QuackageFolder = _Pict.QuackageProcess.quackageFolder();
+
+// Check that a package.json is in the folder we are quacking from
+try
+{
+	_Pict.AppData.Package = require(`${_Pict.AppData.CWD}/package.json`);
+}
+catch (pError)
+{
+	_Pict.log.error(`No package.json found in [${_Pict.AppData.CWD}].  Please run quackage from a folder with a package.json file for maximum awesome.`);
+	_Pict.log.info(`Loading a default package.json...`);
+	_Pict.AppData.Package = require('./Default-Package.json');
+}
+finally
+{
+}
+
+module.exports = _Pict;

package/source/Quackage-Run.js

@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+let libQuackage = require('./Quackage-CLIProgram.js');
+libQuackage.run();

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

@@ -1,4 +1,4 @@
-const libCommandLineCommand = require('../services/Pict-Service-CommandLineCommand.js');
+const libCommandLineCommand = require('pict-service-commandlineutility').ServiceCommandLineCommand;
 const libOS = require('os');
 const libPath = require('path');
 
@@ -13,15 +13,11 @@ class QuackageCommandBoilerplate extends libCommandLineCommand
 
 		this.options.CommandArguments.push({ Name: '<fileset>', Description: 'The boilerplate fileset to generate.' });
 
-		this.options.CommandOptions.push({ Name: '-s, --scope [scope]', Description: 'A "scope" for the template (used for things like unit tests)', Default: 'BoilerplateScope' });
-		this.options.CommandOptions.push({ Name: '-d, --description [description]', Description: 'An extra content string used as a description', Default: '' });
-		this.options.CommandOptions.push({ Name: '-o, --outputfolder [output_folder]', Description: 'Where to write the .quackage-templates.json file', Default: '' });
+		this.options.CommandOptions.push({ Name: '-s, --scope [scope]', Description: 'A "scope" for the template (used for things like unit tests)', Default: 'Default' });
 
 		this.options.Aliases.push('boil');
 		this.options.Aliases.push('bp');
 
-		this.fable.TemplateProvider.addTemplate('PrototypePackage', JSON.stringify(this.fable.AppData.QuackagePackage, null, 4));
-
 		try
 		{
 			this.fileSet = require('../../.quackage-templates.json');
@@ -36,11 +32,12 @@ class QuackageCommandBoilerplate extends libCommandLineCommand
 		this.addCommand();
 	}
 
-	run(pFileset, pOptions, fCallback)
+	onRunAsync(fCallback)
 	{
-		let tmpScope = pOptions.scope;
+		let tmpTemplateFileSet = this.ArgumentString;
+		let tmpScope = this.CommandOptions.scope;
 		// Execute the command
-		this.log.info(`Creating boilerplate file(s) for [${pFileset}] Scoped as ${tmpScope}...`);
+		this.log.info(`Creating boilerplate file(s) for [${tmpTemplateFileSet}] Scoped as ${tmpScope}...`);
 
 		// Check if there is a .quackage-boilerplate.json in either the current directory or the user's home directory.
 		let tmpCWDFilesetPath = `${this.fable.AppData.CWD}/.quackage-templates.json`;
@@ -65,7 +62,7 @@ class QuackageCommandBoilerplate extends libCommandLineCommand
 				if (tmpCWDFileset)
 				{
 					this.log.info(`...Boilerplate fileset loaded from [${tmpCWDFilesetPath}]`);
-					this.log.info(`...Merging boilerplate fileset [${tmpCWDFilesetPath}] with [${pFileset}]`);
+					this.log.info(`...Merging boilerplate fileset [${tmpCWDFilesetPath}] with [${tmpTemplateFileSet}]`);
 					this.fileSet = this.services.Utility.extend(this.fileSet, tmpCWDFileset);
 				}
 			}
@@ -88,30 +85,26 @@ class QuackageCommandBoilerplate extends libCommandLineCommand
 				if (tmpHomeFileset)
 				{
 					this.log.info(`...Boilerplate fileset loaded from [${tmpHomeFilesetPath}]`);
-					this.log.info(`...Merging boilerplate fileset [${tmpHomeFilesetPath}] with [${pFileset}]`);
+					this.log.info(`...Merging boilerplate fileset [${tmpHomeFilesetPath}] with [${tmpTemplateFileSet}]`);
 					this.fileSet = this.services.Utility.extend(this.fileSet, tmpHomeFileset);
 				}
 			}
 		}
 
 		// Check if the fileset exists
-		if (!this.fileSet[pFileset])
+		if (!this.fileSet[tmpTemplateFileSet])
 		{
-			this.log.error(`The requested fileset [${pFileset}] does not exist!`);
-			if (typeof (fCallback) == 'function')
-			{
-				return fCallback();
-			}
-			return false;
+			this.log.error(`The requested fileset [${tmpTemplateFileSet}] does not exist!`);
+			return fCallback();
 		}
 
 		// Build the boilerplate state
-		let tmpBoilerPlateRecord = this.fileSet[pFileset];
-		tmpBoilerPlateRecord.FileSetName = pFileset;
+		let tmpBoilerPlateRecord = this.fileSet[tmpTemplateFileSet];
+		tmpBoilerPlateRecord.FileSetName = tmpTemplateFileSet;
 
 		tmpBoilerPlateRecord.Scope = tmpScope;
-		tmpBoilerPlateRecord.Content = (typeof(pOptions.content) == 'string') ? pOptions.content : '';
-		tmpBoilerPlateRecord.CommandOptions = pOptions;
+		tmpBoilerPlateRecord.Content = (typeof(this.CommandOptions.content) == 'string') ? this.CommandOptions.content : '';
+		tmpBoilerPlateRecord.CommandOptions = this.CommandOptions;
 
 		// Load each template in the fileset into the template provider
 		for (let i = 0; i < tmpBoilerPlateRecord.Files.length; i++)
@@ -130,55 +123,57 @@ class QuackageCommandBoilerplate extends libCommandLineCommand
 			}
 		}
 
-		for (let i = 0; i < tmpBoilerPlateRecord.Files.length; i++)
-		{
-			// Check if each file exists
-			let tmpFile = tmpBoilerPlateRecord.Files[i];
-			// File paths are templates too!
-			let tmpFilePath = libFilePersistence.joinPath(this.fable.parseTemplate(tmpFile.Path, tmpBoilerPlateRecord));
-
-			let tmpFileFolder = libPath.dirname(tmpFilePath);
-
-			tmpFilePath = tmpFilePath.replace('QUACKAGEPROJECTNAMECAP', this.services.DataFormat.capitalizeEachWord(this.fable.AppData.Package.name))
-										.replace('QUACKAGESCOPE', tmpScope);
-
-			libFilePersistence.makeFolderRecursive(tmpFileFolder,
-				(pError)=>
-				{
-					if (pError)
-					{
-						this.log.error(`Error creating folder [${tmpFileFolder}] for boilerplate scope [${tmpScope}]: ${pError.message}`);
-					}
+		this.fable.Utility.eachLimit(tmpBoilerPlateRecord.Files, 1, 
+			(pFile, fFolderCallback)=>
+			{
+				// Check if each file exists
+				let tmpFile = pFile;
+				// File paths are templates too!
+				let tmpFilePath = libFilePersistence.joinPath(this.fable.parseTemplate(tmpFile.Path, tmpBoilerPlateRecord));
 
-					if (tmpBoilerPlateRecord.hasOwnProperty('options'))
-					{
-						tmpBoilerPlateRecord.options = pOptions;
-					}
+				let tmpFileFolder = libPath.dirname(tmpFilePath);
 
-					// Write the file
-					if (libFilePersistence.existsSync(tmpFilePath) && !pOptions.force)
-					{
-						// It exists!  Show the user the command to back it up and/or delete it.  Don't generate it.
-						this.log.error(`The requested file [${tmpFilePath}] already exists!`);
-						this.log.info(`To back it up, run: [ mv "${tmpFilePath}" "${tmpFilePath}_QuackageBackup_${this.services.DataGeneration.randomNumericString(4, 9998)}.bak" ]`);
-						this.log.info(`To delete it, run:  [ rm "${tmpFilePath}" ]`);
-					}
-					else
-					{
-						// It doesn't exist!  Generate it.
-						this.log.info(`Writing boilerplate file [${tmpFilePath}]!`);
-						// Keep in mind the templates also have access to the package.json and the .quackage.json data in the AppData object.
-						libFilePersistence.writeFileSync(tmpFilePath, this.fable.parseTemplate(tmpFile.Content, tmpBoilerPlateRecord));
-					}
+				tmpFilePath = tmpFilePath.replace('QUACKAGEPROJECTNAMECAP', this.services.DataFormat.capitalizeEachWord(this.fable.AppData.Package.name))
+											.replace('QUACKAGESCOPE', tmpScope);
 
-					if (typeof (fCallback) == 'function')
+				libFilePersistence.makeFolderRecursive(tmpFileFolder,
+					(pError)=>
 					{
-						return fCallback();
-					}
-				});
+						if (pError)
+						{
+							this.log.error(`Error creating folder [${tmpFileFolder}] for boilerplate scope [${tmpScope}]: ${pError.message}`);
+						}
+
+						if (tmpBoilerPlateRecord.hasOwnProperty('options'))
+						{
+							tmpBoilerPlateRecord.options = this.CommandOptions;
+						}
+
+						// Write the file
+						if (libFilePersistence.existsSync(tmpFilePath) && !this.CommandOptions.force)
+						{
+							// It exists!  Show the user the command to back it up and/or delete it.  Don't generate it.
+							this.log.error(`The requested file [${tmpFilePath}] already exists!`);
+							this.log.info(`To back it up, run: [ mv "${tmpFilePath}" "${tmpFilePath}_QuackageBackup_${this.services.DataGeneration.randomNumericString(4, 9998)}.bak" ]`);
+							this.log.info(`To delete it, run:  [ rm "${tmpFilePath}" ]`);
+						}
+						else
+						{
+							// It doesn't exist!  Generate it.
+							this.log.info(`Writing boilerplate file [${tmpFilePath}]!`);
+							// Keep in mind the templates also have access to the package.json and the .quackage.json data in the AppData object.
+							libFilePersistence.writeFileSync(tmpFilePath, this.fable.parseTemplate(tmpFile.Content, tmpBoilerPlateRecord));
+						}
+
+						return fFolderCallback();
+					});
+			},(pError)=>
+			{
+				return fCallback();
+			});
 
 		}
 	};
-}
+
 
 module.exports = QuackageCommandBoilerplate;

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

@@ -1,5 +1,5 @@
+const libCommandLineCommand = require('pict-service-commandlineutility').ServiceCommandLineCommand;
 const libFS = require('fs');
-const libCommandLineCommand = require('../services/Pict-Service-CommandLineCommand.js');
 
 class QuackageCommandBuild extends libCommandLineCommand
 {
@@ -10,36 +10,28 @@ class QuackageCommandBuild extends libCommandLineCommand
 		this.options.CommandKeyword = 'build';
 		this.options.Description = 'Build your npm module into a dist folder';
 
-		this.fable.TemplateProvider.addTemplate('Gulpfile-Configuration', JSON.stringify(this.fable.AppData.QuackagePackage.GulpfileConfiguration, null, 4));
-		this.fable.TemplateProvider.addTemplate('Gulpfile-QuackageBase', this.fable.AppData.QuackagePackage.QuackageBaseGulpfile);
-
-		this.options.CommandArguments.push({ Name: '[buildactions]', Description: 'The optional build action(s) to execute; otherwise run all of them', Default: 'ALL' });
-
 		// Auto add the command on initialization
 		this.addCommand();
 	}
 
-	run(pArgumentString, pOptions, pCommand, fCallback)
+	onRunAsync(fCallback)
 	{
-		let tmpActionsToExecute = pArgumentString.toUpperCase();
-		let tmpActionSet = [];
+		this.fable.TemplateProvider.addTemplate('Gulpfile-Configuration', JSON.stringify(this.pict.ProgramConfiguration.GulpfileConfiguration, null, 4));
+		this.fable.TemplateProvider.addTemplate('Gulpfile-QuackageBase', this.pict.ProgramConfiguration.QuackageBaseGulpfile);
 
-		let tmpOptions = pOptions;
+		let tmpActionSet = [];
 
-		this.log.info(`Building browserified and minified versions of your module ...`, tmpOptions);
+		this.log.info(`Building browserified and minified versions of your module ...`);
 
 		// ##. Figure out which actions to execute
-		for (let i = 0; i < this.fable.AppData.QuackagePackage.GulpExecutions.length; i++)
+		for (let i = 0; i < this.pict.ProgramConfiguration.GulpExecutions.length; i++)
 		{
-			if (tmpActionsToExecute == 'ALL' || tmpActionsToExecute.includes(this.fable.AppData.QuackagePackage.GulpExecutions[i].Name.toUpperCase()))
-			{
-				tmpActionSet.push(this.fable.AppData.QuackagePackage.GulpExecutions[i]);
-			}
+			tmpActionSet.push(this.pict.ProgramConfiguration.GulpExecutions[i]);
 		}
 
 		if (tmpActionSet.length < 1)
 		{
-			this.log.error(`No actions to execute for the configuration hash [${pString}]`);
+			this.log.error(`No actions to execute for building -- check your quackage configuration!`);
 			return false;
 		}
 
@@ -65,7 +57,7 @@ class QuackageCommandBuild extends libCommandLineCommand
 				}
 
 				// ## .babelrc
-				if (this.fable.AppData.QuackagePackage.DefaultBabelRC)
+				if (this.pict.ProgramConfiguration.DefaultBabelRC)
 				{
 					if (libFS.existsSync(`${this.fable.AppData.CWD}/.babelrc`))
 					{
@@ -73,7 +65,7 @@ class QuackageCommandBuild extends libCommandLineCommand
 					}
 					else
 					{
-						libFS.writeFileSync(`${this.fable.AppData.CWD}/.babelrc`, JSON.stringify(this.fable.AppData.QuackagePackage.DefaultBabelRC, null, 4));
+						libFS.writeFileSync(`${this.fable.AppData.CWD}/.babelrc`, JSON.stringify(this.pict.ProgramConfiguration.DefaultBabelRC, null, 4));
 					}
 				}
 
@@ -92,19 +84,17 @@ class QuackageCommandBuild extends libCommandLineCommand
 			(pError) =>
 			{
 				// Now process the CopyAfterBuild directives
-				if (this.fable.AppData.QuackagePackage.CopyAfterBuild.length > 0)
+				if (this.pict.ProgramConfiguration.CopyAfterBuild.length > 0)
 				{
-					//this.log.info(`Copying the following files to :`, { Files: this.fable.AppData.QuackagePackage.CopyAfterBuild });
-					for (let i = 0; i < this.fable.AppData.QuackagePackage.CopyAfterBuild.length; i++)
+					//this.log.info(`Copying the following files to :`, { Files: this.pict.ProgramConfiguration.CopyAfterBuild });
+					for (let i = 0; i < this.pict.ProgramConfiguration.CopyAfterBuild.length; i++)
 					{
 						// TODO: FilePersistence needs a copy recursive with globbing.
-						//libFS.copyFileSync(`${this.fable.AppData.CWD}/${this.fable.AppData.QuackagePackage.CopyAfterBuild[i]}`, `${this.fable.AppData.CWD}/dist/${this.fable.AppData.QuackagePackage.CopyAfterBuild[i]}`);
+						//libFS.copyFileSync(`${this.fable.AppData.CWD}/${this.pict.ProgramConfiguration.CopyAfterBuild[i]}`, `${this.fable.AppData.CWD}/dist/${this.pict.ProgramConfiguration.CopyAfterBuild[i]}`);
 					}
 				}
-				if (typeof (fCallback) == 'function')
-				{
-					return fCallback(pError);
-				}
+
+				return fCallback(pError);
 			});
 	};
 }

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

@@ -1,4 +1,4 @@
-const libCommandLineCommand = require('../services/Pict-Service-CommandLineCommand.js');
+const libCommandLineCommand = require('pict-service-commandlineutility').ServiceCommandLineCommand;
 const libOS = require('os');
 const libFS = require('fs');
 const libPath = require('path');
@@ -156,14 +156,13 @@ class QuackageCommandBuildTemplates extends libCommandLineCommand
 			});
 	}
 
-	run(pPath, pOptions, fCallback)
+	onRunAsync(fCallback)
 	{
-		let tmpCallback = (typeof(fCallback) === 'function') ? fCallback : ()=>{};
-		let tmpCWDFolderPath = libPath.resolve(`${this.fable.AppData.CWD}/${pPath}`);
+		let tmpPath = this.ArgumentString;
+		let tmpCWDFolderPath = libPath.resolve(`${this.fable.AppData.CWD}/${tmpPath}`);
 		// Execute the command
 		this.log.info(`Creating template(s) for [${tmpCWDFolderPath}] into "./quackage-templates.json"...`);
-
-		return this.generateTemplatesFromFolder(tmpCWDFolderPath, tmpCallback);
+		return this.generateTemplatesFromFolder(tmpCWDFolderPath, fCallback);
 	};
 }
 

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

@@ -1,4 +1,4 @@
-const libCommandLineCommand = require('../services/Pict-Service-CommandLineCommand.js');
+const libCommandLineCommand = require('pict-service-commandlineutility').ServiceCommandLineCommand;
 
 class QuackageCommandLint extends libCommandLineCommand
 {
@@ -9,14 +9,14 @@ class QuackageCommandLint extends libCommandLineCommand
 		this.options.CommandKeyword = 'lint';
 		this.options.Description = 'Check your package.json for testing, building and luxury configurations';
 
-		this.fable.TemplateProvider.addTemplate('PrototypePackage', JSON.stringify(this.fable.AppData.QuackagePackage, null, 4));
-
 		// Auto add the command on initialization
 		this.addCommand();
 	}
 
-	run(pOptions, pCommand, fCallback)
+	onRunAsync(fCallback)
 	{
+		this.fable.TemplateProvider.addTemplate('PrototypePackage', JSON.stringify(this.pict.ProgramConfiguration, null, 4));
+
 		// Execute the command
 		this.log.info(`Linting package.json...`);
 
@@ -75,10 +75,7 @@ class QuackageCommandLint extends libCommandLineCommand
 			}
 		}
 
-		if (typeof (fCallback) == 'function')
-		{
-			return fCallback();
-		}
+		return fCallback();
 	};
 }
 

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

@@ -1,4 +1,4 @@
-const libCommandLineCommand = require('../services/Pict-Service-CommandLineCommand.js');
+const libCommandLineCommand = require('pict-service-commandlineutility').ServiceCommandLineCommand;
 const libOS = require('os');
 const libPath = require('path');
 
@@ -14,7 +14,7 @@ class QuackageCommandBoilerplate extends libCommandLineCommand
 		this.options.Aliases.push('list');
 		this.options.Aliases.push('lt');
 
-		this.fable.TemplateProvider.addTemplate('PrototypePackage', JSON.stringify(this.fable.AppData.QuackagePackage, null, 4));
+		this.fable.TemplateProvider.addTemplate('PrototypePackage', JSON.stringify(this.pict.ProgramConfiguration, null, 4));
 
 		try
 		{
@@ -30,11 +30,10 @@ class QuackageCommandBoilerplate extends libCommandLineCommand
 		this.addCommand();
 	}
 
-	run(pFileset, pOptions, fCallback)
+	onRunAsync(fCallback)
 	{
-		let tmpScope = pOptions.scope;
 		// Execute the command
-		this.log.info(`Creating boilerplate file(s) for [${pFileset}] Scoped as ${tmpScope}...`);
+		this.log.info(`Listing boilerplate file(s)...`);
 
 		// Check if there is a .quackage-boilerplate.json in either the current directory or the user's home directory.
 		let tmpCWDFilesetPath = `${this.fable.AppData.CWD}/.quackage-templates.json`;
@@ -59,7 +58,7 @@ class QuackageCommandBoilerplate extends libCommandLineCommand
 				if (tmpCWDFileset)
 				{
 					this.log.info(`...Boilerplate fileset loaded from [${tmpCWDFilesetPath}]`);
-					this.log.info(`...Merging boilerplate fileset [${tmpCWDFilesetPath}] with [${pFileset}]`);
+					this.log.info(`...Merging boilerplate fileset [${tmpCWDFilesetPath}] with the base fileset`);
 					this.fileSet = this.services.Utility.extend(this.fileSet, tmpCWDFileset);
 				}
 			}
@@ -82,7 +81,7 @@ class QuackageCommandBoilerplate extends libCommandLineCommand
 				if (tmpHomeFileset)
 				{
 					this.log.info(`...Boilerplate fileset loaded from [${tmpHomeFilesetPath}]`);
-					this.log.info(`...Merging boilerplate fileset [${tmpHomeFilesetPath}] with [${pFileset}]`);
+					this.log.info(`...Merging boilerplate fileset [${tmpHomeFilesetPath}] with the base fileset`);
 					this.fileSet = this.services.Utility.extend(this.fileSet, tmpHomeFileset);
 				}
 			}
@@ -101,10 +100,7 @@ class QuackageCommandBoilerplate extends libCommandLineCommand
 			this.log.info(`${this.fable.DataFormat.stringPadEnd(tmpFileSetKeys[i], 40, ' _')} (${tmpFileSetFileCount} templated files)`);
 		}
 
-		if (typeof(fCallback) === 'function')
-		{
-			return fCallback();
-		}
+		return fCallback();
 	};
 }
 

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

@@ -1,5 +1,5 @@
+const libCommandLineCommand = require('pict-service-commandlineutility').ServiceCommandLineCommand;
 const libFS = require('fs');
-const libCommandLineCommand = require('../services/Pict-Service-CommandLineCommand.js');
 
 class QuackageCommandUpdatePackage extends libCommandLineCommand
 {
@@ -10,7 +10,7 @@ class QuackageCommandUpdatePackage extends libCommandLineCommand
 		this.options.CommandKeyword = 'updatepackage';
 		this.options.Description = 'Update your package.json to support testing, building and luxury configurations';
 
-		this.fable.TemplateProvider.addTemplate('PrototypePackage', JSON.stringify(this.fable.AppData.QuackagePackage, null, 4));
+		this.fable.TemplateProvider.addTemplate('PrototypePackage', JSON.stringify(this.pict.ProgramConfiguration, null, 4));
 
 		this.options.CommandOptions.push({ Name: '-f, --force', Description: 'Force overwrite anything in the package.json; use at your own quacking peril' });
 
@@ -18,12 +18,12 @@ class QuackageCommandUpdatePackage extends libCommandLineCommand
 		this.addCommand();
 	}
 
-	run(pOptions, pCommand, fCallback)
+	onRunAsync(fCallback)
 	{
 		// Execute the command
 		this.log.info(`Updating package.json...`);
 
-		let tmpOptions = pOptions;
+		let tmpOptions = this.CommandOptions;
 
 		// The package.json from the project we are quackin at
 		let tmpProjectPackage = JSON.parse(JSON.stringify(this.fable.AppData.Package));
@@ -93,10 +93,7 @@ class QuackageCommandUpdatePackage extends libCommandLineCommand
 		this.log.info(`Writing ${this.fable.AppData.CWD}/package.json ...`);
 		libFS.writeFileSync(`${this.fable.AppData.CWD}/package.json`, JSON.stringify(tmpProjectPackage, null, 4));
 
-		if (typeof (fCallback) == 'function')
-		{
-			return fCallback();
-		}
+		return fCallback();
 	};
 }
 

package/source/services/Quackage-Execute-Process.js

@@ -21,11 +21,6 @@ class BaseQuackageProcessExecutionService extends libQuackageExecuteProcessBase
 		return libPath.resolve(`${__dirname}/../..`);
 	}
 
-	node_modules_folder()
-	{
-		return libPath.resolve(`${this.quackagefolder}/..`);
-	}
-
 	exitParentProcess(pCode)
 	{
 		process.exit(pCode);

package/templates/unittest/test/QUACKAGEPROJECTNAMECAP-Basic_test.js

@@ -1,5 +1,5 @@
 /*
-	Unit tests for {~PascalCaseIdentifier:AppData.Package.name~} v.${_Package.version} {~Data:Record.Scope~}
+	Unit tests for {~PascalCaseIdentifier:AppData.Package.name~} v.{~D:AppData.Package.version~} {~Data:Record.Scope~}
 */
 
 const Chai = require('chai');
@@ -16,11 +16,11 @@ suite
 
 		suite
 			(
-				'Basic ${_Package.name}.v.${_Package.version} {~Data:Record.Scope~} Tests',
+				'Basic {~D:_Package.name~}.v.{~D:_Package.version~} {~D:Record.Scope~} Tests',
 				() =>
 				{
 					test(
-							'Object Instantiation # {~RandomNumberString:1,9~}',
+							'Object Instantiation',
 							(fDone) =>
 							{
 								let _{~PascalCaseIdentifier:AppData.Package.name~} = new lib{~PascalCaseIdentifier:AppData.Package.name~}();

package/test/Quackage_tests.js

@@ -4,7 +4,7 @@
 * @author      Steven Velozo <steven@velozo.com>
 */
 
-var libQuackage = require('../source/Quackage.js');
+var libQuackage = require('../source/Quackage-CLIProgram.js');
 
 var Chai = require("chai");
 var Expect = Chai.expect;
@@ -27,8 +27,8 @@ suite
 					function()
 					{
 						// How doth the little crocodile automatically test the cli-only utility well?
-						let testQuackage = new libQuackage();
-						Expect(testQuackage.settings.Product).to.equal('ApplicationNameHere')
+						let testQuackage = libQuackage;
+						Expect(testQuackage.settings.Product).to.equal('Quackage')
 					}
 				);
 			}

package/cli/quack

@@ -1,3 +0,0 @@
-#!/usr/bin/env node
-
-const quackExecution = require('../source/Quackage.js');

package/source/Quackage.js

@@ -1,70 +0,0 @@
-const libPict = require('pict');
-
-const _QuackagePackage = require('../package.json');
-const _QuackageDefaultConfiguration = require('./Default-Quackage-Configuration.json');
-
-
-let _Pict = new libPict(
-	{
-		Product: 'Quackage',
-		ProductVersion: '1.0.0'
-	}
-);
-// Instantiate the file persistence service
-_Pict.serviceManager.instantiateServiceProvider('FilePersistence');
-_Pict.serviceManager.instantiateServiceProvider('DataGeneration');
-// Add the Quackage Process Management service
-_Pict.serviceManager.addAndInstantiateServiceType('QuackageProcess', require('./services/Quackage-Execute-Process.js'));
-// Add the Command Line Utility service
-_Pict.serviceManager.addServiceType('CommandLineUtility', require('./services/Pict-Service-CommandLineUtility.js'));
-
-// Grab the current working directory for the quackage
-_Pict.AppData.CWD = _Pict.QuackageProcess.cwd();
-_Pict.AppData.QuackageFolder = _Pict.QuackageProcess.quackageFolder();
-
-// Check that a package.json is in the folder we are quacking from
-try
-{
-	_Pict.AppData.Package = require(`${_Pict.AppData.CWD}/package.json`);
-}
-catch (pError)
-{
-	_Pict.log.error(`No package.json found in [${_Pict.AppData.CWD}].  Please run quackage from a folder with a package.json file.`);
-	_Pict.log.info(`Quack a nice day!`)
-	_Pict.QuackageProcess.exitParentProcess(1);
-}
-finally
-{
-	// Check for a quackage.json file
-	try
-	{
-		_Pict.AppData.QuackagePackage = require(`${_Pict.AppData.CWD}/.quackage.json`);
-		_Pict.AppData.QuackagePackage = _Pict.Utility.extend(_QuackageDefaultConfiguration, _Pict.AppData.QuackagePackage);
-	}
-	catch (pError)
-	{
-		_Pict.log.warn(`No ./.quackage.json found in [${_Pict.AppData.CWD}].  Using default configuration.`);
-		_Pict.AppData.QuackagePackage = _QuackageDefaultConfiguration;
-	}
-
-	// Create our command line utility service
-	_Pict.serviceManager.instantiateServiceProvider('CommandLineUtility',
-		{
-			"Command": "quackage",
-			"Description": "CLI testing and building meant to be run from a folder with a package.json and customized with a quackage.json",
-			"Version": _QuackagePackage.version
-		});
-
-	// Add our commands
-	_Pict.CommandLineUtility.addCommandFromClass(require('./commands/Quackage-Command-UpdatePackage.js'));
-	_Pict.CommandLineUtility.addCommandFromClass(require('./commands/Quackage-Command-Lint.js'));
-	_Pict.CommandLineUtility.addCommandFromClass(require('./commands/Quackage-Command-Build.js'));
-	_Pict.CommandLineUtility.addCommandFromClass(require('./commands/Quackage-Command-Boilerplate.js'));
-	_Pict.CommandLineUtility.addCommandFromClass(require('./commands/Quackage-Command-BuildTemplates.js'));
-	_Pict.CommandLineUtility.addCommandFromClass(require('./commands/Quackage-Command-ListTemplates.js'));
-
-	console.log('')
-	_Pict.CommandLineUtility.run();
-}
-
-module.exports = _Pict;

package/source/services/Pict-Service-CommandLineCommand.js

@@ -1,78 +0,0 @@
-const libPict = require('pict');
-
-const defaultCommandOptions = (
-	{
-		"CommandKeyword": "default",
-		"Description": "Default command",
-
-		"Aliases": [],
-
-		"CommandOptions": [],
-		"CommandArguments": []
-	});
-
-class CommandLineCommand extends libPict.ServiceProviderBase
-{
-	constructor(pFable, pOptions, pServiceHash)
-	{
-		// Object.assign is recursive and pollutes middle objects in some environments.  UGH
-		let tmpOptions = Object.assign({}, JSON.parse(JSON.stringify(defaultCommandOptions)), pOptions);
-		super(pFable, tmpOptions, pServiceHash);
-
-		this.serviceType = 'CommandLineCommand';
-	}
-
-	addCommand()
-	{
-		if (!this.options.CommandAdded)
-		{
-			// Find the default CommandLineUtility service, or make one if it isn't there yet
-			let tmpCommandLineUtility = this.services.CommandLineUtility
-			if (typeof (tmpCommandLineUtility) === 'undefined')
-			{
-				tmpCommandLineUtility = this.fable.ServiceManager.instantiateService('CommandLineUtility');
-			}
-
-			//_Command.command('command_keyword')
-			//  .description('The description of the command_keyword [abc] command')
-			// Now add the command
-			let tmpCommand = tmpCommandLineUtility.createCommand(this.options.CommandKeyword, this.options.Description);
-			//  .alias('conf')
-			for (let i = 0; i < this.options.Aliases.length; i++)
-			{
-				let tmpAlias = this.options.Aliases[i];
-				tmpCommand.alias(tmpAlias);
-			}
-
-
-			//  .argument('[config]', 'optional hash of the configuration you want to run -- otherwise all are built', "ALL")
-			for (let i = 0; i < this.options.CommandArguments.length; i++)
-			{
-				let tmpArgument = this.options.CommandArguments[i];
-				tmpCommand.argument(tmpArgument.Name, tmpArgument.Description, tmpArgument.Default);
-			}
-			//  .option('-f, --force', 'force')
-			//  .option('-s, --separator <char>', 'separator character', ',')
-			for (let i = 0; i < this.options.CommandOptions.length; i++)
-			{
-				let tmpOption = this.options.CommandOptions[i];
-				tmpCommand.option(tmpOption.Name, tmpOption.Description, tmpOption.Default);
-			}
-			//  .action((pString, pOptions) => { });
-			tmpCommand.action(this.run.bind(this));
-		}
-		else
-		{
-			this.log.error(`Command ${this.options.CommandKeyword} already added to the command line utility!`);
-		}
-	}
-
-	run(pArgumentString, pOptions, fCallback)
-	{
-		// Execute the command
-		return fCallback();
-	};
-
-}
-
-module.exports = CommandLineCommand;

package/source/services/Pict-Service-CommandLineUtility.js

@@ -1,72 +0,0 @@
-const libCommander = require('commander').Command;
-const libPict = require('pict');
-
-const defaultCommandLineUtilityOptions = (
-	{
-		"Command": "default",
-		"Description": "Default command",
-		"Version": "0.0.0"
-	});
-
-class CommandLineUtility extends libPict.ServiceProviderBase
-{
-	constructor(pFable, pOptions, pServiceHash)
-	{
-		let tmpOptions = Object.assign({}, JSON.parse(JSON.stringify(defaultCommandLineUtilityOptions)), pOptions);
-
-		super(pFable, tmpOptions, pServiceHash);
-
-		this.serviceType = 'CommandLineUtility';
-
-		// Add the CommandLineCommand service
-		this.fable.serviceManager.addServiceType('CommandLineCommand', require('./Pict-Service-CommandLineCommand.js'));
-
-		this._Command = new libCommander();
-
-		this._Command.name(this.options.Command);
-		this._Command.description(this.options.Description)
-		this._Command.version(this.options.Version, '-v, --version', 'output the current version');
-	}
-
-	createCommand(pCommandName, pCommandDescription)
-	{
-		return this._Command.command(pCommandName).description(pCommandDescription);
-	}
-
-	// Just passing an options will construct one for us.
-	// Passing a hash will set the hash.
-	// Passing a prototype will use that!
-	addCommand(pOptions, pHash, pPrototype)
-	{
-		let tmpOptions = (typeof(pOptions) == 'object') ? pOptions : {};
-		let tmpViewHash = (typeof(pHash) == 'string') ? pHash : this.fable.getUUID();
-
-		if (typeof(pPrototype) != 'undefined')
-		{
-			return this.fable.serviceManager.instantiateServiceProviderFromPrototype('CommandLineCommand', tmpOptions, tmpViewHash, pPrototype);
-		}
-		else
-		{
-			return this.fable.serviceManager.instantiateServiceProvider('CommandLineCommand', tmpOptions, tmpViewHash);
-		}
-	}
-
-	// Take a prototype command and just add it as a service.
-	addCommandFromClass(pPrototype, pHash)
-	{
-		let tmpHash = (typeof(pHash) == 'string') ? pHash : this.fable.getUUID();
-		return this.fable.serviceManager.instantiateServiceProviderFromPrototype('CommandLineCommand', {}, tmpHash, pPrototype);
-	}
-
-	run ()
-	{
-		return this._Command.parse();
-	}
-
-	get command()
-	{
-		return this._Command;
-	}
-}
-
-module.exports = CommandLineUtility;