Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop dependency on deprecated gulp-util #62

Merged
merged 1 commit into from
Nov 4, 2018
+18 −18
Merged

Drop dependency on deprecated gulp-util #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions bin/slush.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env node

'use strict';
var gutil = require('gulp-util');
var fancyLog = require('fancy-log');
var prettyTime = require('pretty-hrtime');
var glob = require('glob');
var path = require('path');
Expand Down Expand Up @@ -47,11 +47,11 @@ var cli = new Liftoff({
});

cli.on('require', function(name) {
gutil.log('Requiring external module', chalk.magenta(name));
fancyLog('Requiring external module', chalk.magenta(name));
});

cli.on('requireFail', function(name) {
gutil.log(chalk.red('Failed to load external module'), chalk.magenta(name));
fancyLog(chalk.red('Failed to load external module'), chalk.magenta(name));
});

cli.launch(handleArguments, argv);
Expand All @@ -67,7 +67,7 @@ function handleArguments(env) {
if (versionFlag) {
log(slushPackage.version);
if (env.modulePackage) {
gutil.log(env.modulePackage.version);
fancyLog(env.modulePackage.version);
}
if (generator.pkg.version) {
console.log('[' + chalk.green('slush-' + generator.name) + '] ' + generator.pkg.version);
Expand All @@ -76,7 +76,7 @@ function handleArguments(env) {
}

if (!env.modulePath) {
gutil.log(chalk.red('No local gulp install found in'), chalk.magenta(generator.path));
fancyLog(chalk.red('No local gulp install found in'), chalk.magenta(generator.path));
log(chalk.red('This is an issue with the `slush-' + generator.name + '` generator'));
process.exit(1);
}
Expand All @@ -96,7 +96,7 @@ function handleArguments(env) {

if (process.cwd() !== env.cwd) {
process.chdir(env.cwd);
gutil.log('Working directory changed to', chalk.magenta(env.cwd));
fancyLog('Working directory changed to', chalk.magenta(env.cwd));
}

process.nextTick(function() {
Expand Down Expand Up @@ -125,7 +125,7 @@ function logTasks(name, localGulp) {
tree.label = 'Tasks for generator ' + chalk.magenta(name);
archy(tree).split('\n').forEach(function(v) {
if (v.trim().length === 0) return;
gutil.log(v);
fancyLog(v);
});
}

Expand All @@ -139,18 +139,18 @@ function formatError(e) {
// wire up logging events
function logEvents(name, gulpInst) {
gulpInst.on('task_start', function(e) {
gutil.log('Starting', "'" + chalk.cyan(name + ':' + e.task) + "'...");
fancyLog('Starting', "'" + chalk.cyan(name + ':' + e.task) + "'...");
});

gulpInst.on('task_stop', function(e) {
var time = prettyTime(e.hrDuration);
gutil.log('Finished', "'" + chalk.cyan(name + ':' + e.task) + "'", 'after', chalk.magenta(time));
fancyLog('Finished', "'" + chalk.cyan(name + ':' + e.task) + "'", 'after', chalk.magenta(time));
});

gulpInst.on('task_err', function(e) {
var msg = formatError(e);
var time = prettyTime(e.hrDuration);
gutil.log("'" + chalk.cyan(name + ':' + e.task) + "'", 'errored after', chalk.magenta(time), chalk.red(msg));
fancyLog("'" + chalk.cyan(name + ':' + e.task) + "'", 'errored after', chalk.magenta(time), chalk.red(msg));
});

gulpInst.on('task_not_found', function(err) {
Expand Down
6 changes: 3 additions & 3 deletions gulpfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
'use strict';

var gulp = require('gulp');
var log = require('gulp-util').log;
var fancyLog = require('fancy-log');

var jshint = require('gulp-jshint');

var codeFiles = ['**/*.js', '!node_modules/**'];

gulp.task('lint', function() {
log('Linting Files');
fancyLog('Linting Files');
return gulp.src(codeFiles)
.pipe(jshint('.jshintrc'))
.pipe(jshint.reporter());
});

gulp.task('watch', function() {
log('Watching Files');
fancyLog('Watching Files');
gulp.watch(codeFiles, ['lint']);
});

Expand Down
10 changes: 5 additions & 5 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@
"slush": "./bin/slush.js"
},
"dependencies": {
"glob": "~4.0.0",
"minimist": "~0.1.0",
"gulp-util": "^2.2.0",
"pretty-hrtime": "^0.2.0",
"archy": "^0.0.2",
"chalk": "^0.4.0",
"fancy-log": "^1.3.2",
"glob": "~4.0.0",
"liftoff": "~0.10.0",
"chalk": "^0.4.0"
"minimist": "~0.1.0",
"pretty-hrtime": "^0.2.0"
},
"devDependencies": {
"mocha": "^1.17.0",
Expand Down