Skip to content

Commit a18c3bb

Browse files
Merge pull request #565 from pattern-lab/pretty-engine-loading
grab chalk and use it to make the build and engine loading process pr…
2 parents c168ccc + b4a07cb commit a18c3bb

File tree

3 files changed

+17
-8
lines changed

3 files changed

+17
-8
lines changed

core/lib/pattern_engines.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
var path = require('path');
55
var diveSync = require('diveSync');
6+
const chalk = require('chalk');
67
var engineMatcher = /^patternengine-node-(.*)$/;
78
var enginesDirectories = [
89
{
@@ -53,17 +54,15 @@ function findEngineModulesInDirectory(dir) {
5354
// Try to load engines! We scan for engines at each path specified above. This
5455
// function is kind of a big deal.
5556
function loadAllEngines(enginesObject) {
56-
console.log('\nLoading engines...');
57-
5857
enginesDirectories.forEach(function (engineDirectory) {
5958
var enginesInThisDir = findEngineModulesInDirectory(engineDirectory.path);
60-
console.log("...scanning for engines in", engineDirectory.displayName + "...");
59+
console.log(chalk.bold(`Loading engines from ${engineDirectory.displayName}...\n`));
6160

6261
// find all engine-named things in this directory and try to load them,
6362
// unless it's already been loaded.
6463
enginesInThisDir.forEach(function (engineDiscovery) {
6564
var errorMessage;
66-
var successMessage = "good to go";
65+
var successMessage = chalk.green("good to go");
6766

6867
try {
6968
// give it a try! load 'er up. But not if we already have, of course.
@@ -75,16 +74,17 @@ function loadAllEngines(enginesObject) {
7574
errorMessage = err.message;
7675
} finally {
7776
// report on the status of the engine, one way or another!
78-
console.log('-', engineDiscovery.name, 'engine:', errorMessage ? errorMessage : successMessage);
77+
console.log(` ${engineDiscovery.name}:`, errorMessage ? chalk.red(errorMessage) : successMessage);
7978
}
8079
});
80+
console.log('');
8181
});
8282

8383
// Complain if for some reason we haven't loaded any engines.
8484
if (Object.keys(enginesObject).length === 0) {
8585
throw new Error('No engines loaded! Something is seriously wrong.');
8686
}
87-
console.log('...done loading engines.\n');
87+
console.log(chalk.bold('Done loading engines.\n'));
8888
}
8989

9090

core/lib/patternlab.js

+10-2
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,21 @@ var diveSync = require('diveSync'),
1414
glob = require('glob'),
1515
_ = require('lodash'),
1616
path = require('path'),
17+
chalk = require('chalk'),
1718
cleanHtml = require('js-beautify').html,
1819
inherits = require('util').inherits,
1920
pm = require('./plugin_manager'),
2021
fs = require('fs-extra'),
21-
plutils = require('./utilities'),
22-
patternEngines = require('./pattern_engines');
22+
packageInfo = require('../../package.json'),
23+
plutils = require('./utilities');
2324

25+
console.log(
26+
chalk.bold('\n====[ Pattern Lab / Node'),
27+
`- v${packageInfo.version}`,
28+
chalk.bold(']====\n')
29+
);
30+
31+
var patternEngines = require('./pattern_engines');
2432
var EventEmitter = require('events').EventEmitter;
2533

2634
function buildPatternData(dataFilesPath, fsDep) {

package.json

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
"patternengine-node-mustache": "^1.0.0"
1717
},
1818
"devDependencies": {
19+
"chalk": "^1.1.3",
1920
"eslint": "^3.5.0",
2021
"rewire": "^2.5.2",
2122
"tap": "^7.1.2"

0 commit comments

Comments
 (0)