Merge pull request #30 from kuangyeheng/pl

Remove gulp-util in favor of https://medium.com/gulpjs/gulp-util-ca3b1f9f9ac5
peter-vilja · Jan 10, 2018 · 1b2503e · 1b2503e
2 parents b4c1fcf + d83c56a
commit 1b2503e
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 20 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 node_modules/
 tmp/
-.DS_Store
+.DS_Store
+/.idea
diff --git a/index.js b/index.js
@@ -1,7 +1,7 @@
 'use strict';
 var rimraf = require('rimraf');
 var through2 = require('through2');
-var gutil = require('gulp-util');
+var utils = require('./utils');
 var path = require('path');
 
 module.exports = function (options) {
@@ -15,21 +15,21 @@ module.exports = function (options) {
     if (!(relative.substr(0, 2) === '..') && relative !== '' || (options ? (options.force && typeof options.force === 'boolean') : false)) {
       rimraf(filepath, function (error) {
         if (error) {
-          this.emit('error', new gutil.PluginError('gulp-clean', 'Unable to delete "' + filepath + '" file (' + error.message + ').'));
+          this.emit('error', new utils.PluginError('gulp-clean', 'Unable to delete "' + filepath + '" file (' + error.message + ').'));
         }
         this.push(file);
         cb();
       }.bind(this));
     } else if (relative === '') {
       var msgCurrent = 'Cannot delete current working directory. (' + filepath + '). Use option force.';
-      gutil.log('gulp-clean: ' + msgCurrent);
-      this.emit('error', new gutil.PluginError('gulp-clean', msgCurrent));
+      utils.log('gulp-clean: ' + msgCurrent);
+      this.emit('error', new utils.PluginError('gulp-clean', msgCurrent));
       this.push(file);
       cb();
     } else {
       var msgOutside = 'Cannot delete files outside the current working directory. (' + filepath + '). Use option force.';
-      gutil.log('gulp-clean: ' + msgOutside);
-      this.emit('error', new gutil.PluginError('gulp-clean', msgOutside));
+      utils.log('gulp-clean: ' + msgOutside);
+      this.emit('error', new utils.PluginError('gulp-clean', msgOutside));
       this.push(file);
       cb();
     }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gulp-clean",
-  "version": "0.3.2",
+  "version": "0.4.0",
   "description": "A gulp plugin for removing files and folders.",
   "keywords": [
     "gulpplugin",
@@ -23,9 +23,11 @@
     "test": "mocha test.js"
   },
   "dependencies": {
-    "rimraf": "^2.2.8",
-    "gulp-util": "^2.2.14",
-    "through2": "^0.4.2"
+    "fancy-log": "^1.3.2",
+    "plugin-error": "^0.1.2",
+    "rimraf": "^2.6.2",
+    "through2": "^2.0.3",
+    "vinyl": "^2.1.0"
   },
   "devDependencies": {
     "mocha": "^1.19.0",

diff --git a/test.js b/test.js
@@ -2,8 +2,8 @@
 'use strict';
 var fs = require('fs');
 var path = require('path');
-var gutil = require('gulp-util');
-var clean = require('./');
+var utils = require('./utils');
+var clean = require('./index');
 var expect = require('chai').expect;
 
 function noop() {}
@@ -45,7 +45,7 @@ describe('gulp-clean plugin', function () {
         });
       });
 
-      stream.write(new gutil.File({
+      stream.write(new utils.File({
         cwd: cwd,
         base: cwd + '/tmp/',
         path: cwd + '/tmp/test.js',
@@ -67,7 +67,7 @@ describe('gulp-clean plugin', function () {
         });
       });
 
-      stream.write(new gutil.File({
+      stream.write(new utils.File({
         cwd: cwd,
         base: cwd + '/tmp/',
         path: cwd + '/tmp/test/'
@@ -91,7 +91,7 @@ describe('gulp-clean plugin', function () {
         });
       });
       stream.on('data', noop);
-      stream.write(new gutil.File({
+      stream.write(new utils.File({
         cwd: cwd,
         base: cwd + '/tmp',
         path: cwd + '/tmp/tree/'
@@ -118,7 +118,7 @@ describe('gulp-clean plugin', function () {
     });
 
     stream.on('data', noop);
-    stream.write(new gutil.File({
+    stream.write(new utils.File({
       cwd: cwd,
       path: cwd
     }));
@@ -146,7 +146,7 @@ describe('gulp-clean plugin', function () {
 
     stream.on('data', noop);
 
-    stream.write(new gutil.File({
+    stream.write(new utils.File({
       cwd: path.resolve(cwd),
       path: path.resolve(cwd + '/../secrets/')
     }));
@@ -176,7 +176,7 @@ describe('gulp-clean plugin', function () {
       });
     });
 
-    stream.write(new gutil.File({
+    stream.write(new utils.File({
       cwd: path.resolve(cwd),
       path: path.resolve(cwd + '/../gulp-cleanTemp/')
     }));
@@ -196,7 +196,7 @@ describe('gulp-clean plugin', function () {
       });
     });
 
-    stream.write(new gutil.File({
+    stream.write(new utils.File({
       cwd: path.resolve(cwd),
       path: path.resolve(cwd + '/../gulp-cleanTemp/')
     }));

diff --git a/utils.js b/utils.js
@@ -0,0 +1,5 @@
+module.exports = {
+    PluginError: require('plugin-error'),
+    log: require('fancy-log'),
+    File: require('vinyl')
+};