refactor: rename

gaoding-inc · Jul 20, 2017 · 854e108 · 854e108
1 parent c35119b
commit 854e108
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 33 deletions.
diff --git a/src/parse.js → src/create-tasks.js b/src/parse.js → src/create-tasks.js
diff --git a/src/index.js b/src/index.js
@@ -1,15 +1,14 @@
 const path = require('path');
 const findCacheDir = require('find-cache-dir');
-const fsp = require('./fs-promise');
 const defaultsDeep = require('lodash.defaultsdeep');
-const promiseTask = require('./promise-task');
+const fsp = require('./fs-promise');
+const queue = require('./queue');
 const Repository = require('./repository');
 const Loger = require('./loger');
 const DEFAULT = require('./config/config.default.json');
 const CACHE_DEFAULT = require('./config/cache.default.json');
 const PACKAGE = require('../package.json');
-
-const parse = require('./parse');
+const createTasks = require('./create-tasks');
 const runTasks = require('./run-tasks');
 
 
@@ -49,11 +48,11 @@ const taskRunner = (options = {}, context = process.cwd()) => {
 
     const repository = new Repository(options.cache, options.repository, 'revision');
 
-    return promiseTask.serial([
+    return queue.serial([
 
 
         // 将外部输入的配置转换成内部任务描述队列
-        parse(options, context),
+        createTasks(options, context),
 
 
         // 检查任务是否有变更

diff --git a/src/promise-task.js → src/queue.js b/src/promise-task.js → src/queue.js
diff --git a/src/run-tasks.js b/src/run-tasks.js
@@ -1,4 +1,4 @@
-const promiseTask = require('./promise-task');
+const queue = require('./queue');
 const Loger = require('./loger');
 const worker = require('./run-cmd');
 const PACKAGE = require('../package.json');
@@ -53,8 +53,8 @@ module.exports = (tasks, parallel = require('os').cpus().length) => {
     });
 
 
-    return promiseTask.serial(taskFucs.map(taskFucs => () => {
-        return promiseTask.parallel(taskFucs, parallel);
+    return queue.serial(taskFucs.map(taskFucs => () => {
+        return queue.parallel(taskFucs, parallel);
     })).then(buildResults => {
         return [].concat(...buildResults);
     });

diff --git a/test/parse.test.js → test/create-tasks.test.js b/test/parse.test.js → test/create-tasks.test.js
@@ -1,10 +1,10 @@
 const assert = require('assert');
 const path = require('path');
-const parse = require('../src/parse');
+const createTasks = require('../src/create-tasks');
 const defaultsDeep = require('lodash.defaultsdeep');
 
 
-describe('#parse', () => {
+describe('#create-tasks', () => {
 
     const programDefaults = (options, context) => {
         let p = path.resolve(context, options.path || options.name);
@@ -23,7 +23,7 @@ describe('#parse', () => {
     };
 
     it('empty', () => {
-        assert.deepEqual([], parse({
+        assert.deepEqual([], createTasks({
             tasks: []
         }, __dirname));
     });
@@ -40,7 +40,7 @@ describe('#parse', () => {
             program: programDefaults({ name: 'mod1' }, __dirname),
             order: 0,
             dirty: false
-        }], parse({
+        }], createTasks({
             tasks: ['mod1'],
             dependencies: ['lib']
         }, __dirname));
@@ -60,7 +60,7 @@ describe('#parse', () => {
             }, programDefaults({ name: 'mod1' }, __dirname)),
             order: 0,
             dirty: false
-        }], parse({
+        }], createTasks({
             tasks: ['mod1'],
             dependencies: ['lib'],
             program: 'node build.js'
@@ -79,7 +79,7 @@ describe('#parse', () => {
             program: programDefaults({ name: 'mod1' }, __dirname),
             order: 0,
             dirty: false
-        }], parse({
+        }], createTasks({
             tasks: [{
                 name: 'mod1'
             }],
@@ -104,7 +104,7 @@ describe('#parse', () => {
             }, __dirname),
             order: 0,
             dirty: false
-        }], parse({
+        }], createTasks({
             tasks: [{
                 name: 'mod1',
                 path: 'map/mod1'
@@ -139,7 +139,7 @@ describe('#parse', () => {
             program: programDefaults({ name: 'mod3' }, __dirname),
             order: 2,
             dirty: false
-        }], parse({
+        }], createTasks({
             tasks: ['mod1', 'mod2', 'mod3']
         }, __dirname));
     });
@@ -166,7 +166,7 @@ describe('#parse', () => {
             program: programDefaults({ name: 'mod3' }, __dirname),
             order: 1,
             dirty: false
-        }], parse({
+        }], createTasks({
             tasks: ['mod1', ['mod2', 'mod3']]
         }, __dirname));
     });
@@ -199,7 +199,7 @@ describe('#parse', () => {
             }, programDefaults({ name: 'mod2' }, __dirname)),
             order: 1,
             dirty: false
-        }], parse({
+        }], createTasks({
             tasks: ['mod1', {
                 name: 'mod2',
                 dependencies: ['lib2'],
@@ -232,7 +232,7 @@ describe('#parse', () => {
             }, programDefaults({ name: 'mod1' }, __dirname)),
             order: 0,
             dirty: false
-        }], parse({
+        }], createTasks({
             tasks: ['mod1'],
             dependencies: ['lib'],
             program: defaultsDeep({

diff --git a/test/promise-task.test.js → test/queue.test.js b/test/promise-task.test.js → test/queue.test.js
@@ -1,7 +1,7 @@
 const assert = require('assert');
-const promiseTask = require('../src/promise-task');
+const queue = require('../src/queue');
 
-describe('#promise-task', () => {
+describe('#queue', () => {
 
     const delay = (fuc, time) => {
         return new Promise(results => {
@@ -11,10 +11,10 @@ describe('#promise-task', () => {
         });
     }
 
-    describe('#promise-task.serial', () => {
+    describe('#queue.serial', () => {
 
         it('results', () => {
-            return promiseTask.serial([
+            return queue.serial([
                 0,
                 (result) => {
                     assert.deepEqual(0, result)
@@ -34,7 +34,7 @@ describe('#promise-task', () => {
         });
 
         it('order', () => {
-            return promiseTask.serial([
+            return queue.serial([
                 0,
                 () => {
                     return delay(() => 1, 30);
@@ -51,7 +51,7 @@ describe('#promise-task', () => {
         });
 
         it('Promise reject', () => {
-            return promiseTask.serial([
+            return queue.serial([
                 () => 0,
                 () => 1,
                 () => Promise.reject(2),
@@ -62,7 +62,7 @@ describe('#promise-task', () => {
         });
 
         it('Function error', () => {
-            return promiseTask.serial([
+            return queue.serial([
                 () => 0,
                 () => 1,
                 () => {
@@ -77,11 +77,11 @@ describe('#promise-task', () => {
     });
 
 
-    describe('#promise-task.parallel', () => {
+    describe('#queue.parallel', () => {
         const limit = 2;
 
         it('results', () => {
-            return promiseTask.parallel([
+            return queue.parallel([
                 () => 0,
                 () => 1,
                 () => 2,
@@ -92,7 +92,7 @@ describe('#promise-task', () => {
         });
 
         it('order', () => {
-            return promiseTask.parallel([
+            return queue.parallel([
                 () => {
                     return delay(() => 0, 40);
                 },
@@ -111,7 +111,7 @@ describe('#promise-task', () => {
         });
 
         it('Promise reject', () => {
-            return promiseTask.parallel([
+            return queue.parallel([
                 () => 0,
                 () => 1,
                 () => Promise.reject(2),
@@ -125,7 +125,7 @@ describe('#promise-task', () => {
 
 
         it('Function error', () => {
-            return promiseTask.parallel([
+            return queue.parallel([
                 () => 0,
                 () => 1,
                 () => {
@@ -141,7 +141,7 @@ describe('#promise-task', () => {
 
 
         it('Function error', () => {
-            return promiseTask.parallel([
+            return queue.parallel([
                 null,
                 undefined,
                 {},