fixes for some error reporting issues

plopjs · Nov 21, 2016 · fae2b4e · fae2b4e
1 parent cf4dc80
commit fae2b4e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/modules/generator-runner.js b/src/modules/generator-runner.js
@@ -117,14 +117,14 @@ export default function (plop) {
 			// handle type
 			if (action.type === 'add') {
 				if (pathExists) {
-					throw failure(`File already exists: ${fileDestPath}`);
+					throw failure('File already exists');
 				} else {
 					yield fspp.makeDir(path.dirname(fileDestPath));
 					yield fspp.writeFile(fileDestPath, plop.renderString(template, data));
 				}
 			} else if (action.type === 'modify') {
 				if (!pathExists) {
-					throw failure(`File does not exists: ${fileDestPath}`);
+					throw failure('File does not exists');
 				} else {
 					var fileData = yield fspp.readFile(fileDestPath);
 					fileData = fileData.replace(action.pattern, plop.renderString(template, data));
@@ -139,7 +139,7 @@ export default function (plop) {
 				path: fileDestPath
 			};
 		} catch(err) {
-			throw failure(JSON.stringify(err));
+			throw failure(err.error || err.message || JSON.stringify(err));
 		}
 	});
 

diff --git a/src/modules/node-plop.js b/src/modules/node-plop.js
@@ -109,7 +109,7 @@ function nodePlop(plopfilePath = '', plopCfg = {}) {
 	}
 
 	// look for a package.json file to use for the "pkg" helper
-	try { pkgJson = require(`${getDestBasePath()}/package.json`); }
+	try { pkgJson = require(path.join(getDestBasePath(), 'package.json')); }
 	catch(error) { pkgJson = {}; }
 
 	/////////