Merge remote-tracking branch 'origin/master' into phated/translations

Author: phated

README.md

@@ -101,22 +101,21 @@ The CLI adds `process.env.INIT_CWD` which is the original cwd it was launched fr
 
 Configuration is supported through the use of a `.gulp.*` file (e.g. `.gulp.json`, `.gulp.yml`). You can find a list of supported languages at https://github.com/gulpjs/interpret.
 
-Configuration from the home directory (`~`) and current working directory (`cwd`) are merged with `cwd` taking precedence.
+A configuration file from the current working directory (`cwd`) or above are selected before a configuration file from the home directory (`~`).
 
 Supported configurations properties:
 
 | Property           | Description |
 |--------------------|-------------|
+| description        | Top-level description of the project/gulpfile (Replaces "Tasks for ~/path/of/gulpfile.js") |
+| gulpfile           | Set a default gulpfile |
+| preload            | An array of modules to preload before running the gulpfile. Any relative paths will be resolved against the `--cwd` directory (if you don't want that behavior, use absolute paths) |
+| nodeFlags          | An array of flags used to forcibly respawn the process upon startup. For example, if you always want your gulpfiles to run in node's harmony mode, you can set `--harmony` here |
 | flags.continue     | Continue execution of tasks upon failure by default. |
 | flags.compactTasks | Reduce the output of task dependency tree by default. |
 | flags.tasksDepth   | Set default depth of task dependency tree. |
-| flags.gulpfile     | Set a default gulpfile |
 | flags.silent       | Silence logging by default |
 | flags.series       | Run tasks given on the CLI in series (the default is parallel) |
-| flags.preload      | An array of modules to preload before running the gulpfile. Any relative paths will be resolved against the `--cwd` directory (if you don't want that behavior, use absolute paths) |
-| flags.nodeFlags    | An array of flags used to forcibly respawn the process upon startup. For example, if you always want your gulpfiles to run in node's harmony mode, you can set `--harmony` here |
-| log.msgs.*         | Configure log messages. |
-| log.theme.*        | Configure log theme. |
 
 ## Flags
 

index.js

@@ -12,15 +12,15 @@ var findRange = require('semver-greatest-satisfied-range');
 
 var exit = require('./lib/shared/exit');
 var tildify = require('./lib/shared/tildify');
+var arrayFind = require('./lib/shared/array-find');
 var makeTitle = require('./lib/shared/make-title');
 var makeHelp = require('./lib/shared/options/make-help');
 var cliOptions = require('./lib/shared/options/cli-options');
 var completion = require('./lib/shared/completion');
 var cliVersion = require('./package.json').version;
 var toConsole = require('./lib/shared/log/to-console');
+var mergeCliOpts = require('./lib/shared/config/cli-flags');
 
-var mergeProjectAndUserHomeConfigs = require('./lib/shared/config/merge-configs');
-var overrideEnvByConfigAndCliOpts = require('./lib/shared/config/env-config');
 var messages = require('./messages');
 
 // Get supported ranges
@@ -36,23 +36,19 @@ var cli = new Liftoff({
   completions: completion,
   extensions: interpret.jsVariants,
   v8flags: v8flags,
-  configFiles: {
-    project: [
-      {
-        name: '.gulp',
-        path: '.',
-        extensions: interpret.extensions,
-        findUp: true,
-      },
-    ],
-    userHome: [
-      {
-        name: '.gulp',
-        path: '~',
-        extensions: interpret.extensions,
-      },
-    ],
-  },
+  configFiles: [
+    {
+      name: '.gulp',
+      path: '.',
+      extensions: interpret.extensions,
+      findUp: true,
+    },
+    {
+      name: '.gulp',
+      path: '~',
+      extensions: interpret.extensions,
+    },
+  ],
 });
 
 // var opts = {};
@@ -77,6 +73,9 @@ var parser = yargs
 
 var opts = parser.parse();
 
+// Set up event listeners for logging temporarily.
+toConsole(log, opts);
+
 cli.on('preload:before', function(name) {
   log.info(messages.PRELOAD_BEFORE, name);
 });
@@ -125,23 +124,31 @@ function run() {
 
 module.exports = run;
 
+function isDefined(cfg) {
+  return cfg != null;
+}
+
 function onPrepare(env) {
-  var cfg = mergeProjectAndUserHomeConfigs(env);
-  env = overrideEnvByConfigAndCliOpts(env, cfg, opts);
+  // We only use the first config found, which is a departure from
+  // the previous implementation that merged with the home
+  var cfg = arrayFind(env.config, isDefined);
+  var flags = mergeCliOpts(opts, cfg);
 
-  // Set up event listeners for logging after configuring.
-  toConsole(log, env.config.flags);
+  // Set up event listeners for again logging after configuring.
+  toConsole(log, flags);
 
-  cli.execute(env, env.nodeFlags, onExecute);
+  cli.execute(env, cfg.nodeFlags, function (env) {
+    onExecute(env, cfg, flags);
+  });
 }
 
 // The actual logic
-function onExecute(env) {
+function onExecute(env, cfg, flags) {
   // This translates the --continue flag in gulp
   // To the settle env variable for undertaker
   // We use the process.env so the user's gulpfile
   // Can know about the flag
-  if (env.config.flags.continue) {
+  if (flags.continue) {
     process.env.UNDERTAKER_SETTLE = 'true';
   }
 
@@ -154,9 +161,13 @@ function onExecute(env) {
   //   makeHelp(parser).showHelp(console.log);
   //   exit(0);
   // }
+  if (flags.help) {
+    parser.showHelp(console.log);
+    exit(0);
+  }
 
   // Anything that needs to print outside of the logging mechanism should use console.log
-  if (env.config.flags.version) {
+  if (flags.version) {
     console.log('CLI version:', cliVersion);
     console.log('Local version:', env.modulePackage.version || 'Unknown');
     exit(0);
@@ -208,5 +219,5 @@ function onExecute(env) {
 
   // Load and execute the CLI version
   var versionedDir = path.join(__dirname, '/lib/versioned/', range, '/');
-  require(versionedDir)(env);
+  require(versionedDir)(env, cfg, flags);
 }

lib/shared/array-find.js

@@ -0,0 +1,19 @@
+'use strict';
+
+function arrayFind(arr, fn) {
+  if (!Array.isArray(arr)) {
+    return;
+  }
+
+  var idx = 0;
+  while (idx < arr.length) {
+    var result = fn(arr[idx]);
+    if (result) {
+      // TODO: This is wrong in Liftoff
+      return arr[idx];
+    }
+    idx++;
+  }
+}
+
+module.exports = arrayFind;

lib/versioned/^3.7.0/index.js

@@ -17,9 +17,7 @@ var registerExports = require('../../shared/register-exports');
 var requireOrImport = require('../../shared/require-or-import');
 var messages = require('../../../messages');
 
-function execute(env) {
-  var opts = env.config.flags;
-
+function execute(env, cfg, opts) {
   var tasks = opts._;
   var toRun = tasks.length ? tasks : ['default'];
 

lib/versioned/^4.0.0/index.js

@@ -20,9 +20,7 @@ var getTask = require('./log/get-task');
 var requireOrImport = require('../../shared/require-or-import');
 var messages = require('../../../messages');
 
-function execute(env) {
-  var opts = env.config.flags;
-
+function execute(env, cfg, opts) {
   var tasks = opts._;
   var toRun = tasks.length ? tasks : ['default'];
 

package.json

@@ -34,7 +34,7 @@
     "fancy-log": "^2.0.0",
     "gulplog": "^2.1.0",
     "interpret": "^3.1.1",
-    "liftoff": "^4.0.0",
+    "liftoff": "^5.0.0",
     "mute-stdout": "^2.0.0",
     "replace-homedir": "^2.0.0",
     "semver-greatest-satisfied-range": "^2.0.0",

test/config-flags-compact-tasks.js

@@ -20,8 +20,8 @@ describe('config: flags.compactTasks', function() {
     function cb(err, stdout, stderr) {
       var filepath = path.join(expectedDir, 'flags-tasks-compact.txt');
       var expected = fs.readFileSync(filepath, 'utf-8');
-      expected = sliceLines(expected, 1);
-      stdout = sliceLines(stdout, 1);
+      expected = sliceLines(expected, 2);
+      stdout = sliceLines(stdout, 2);
       expect(stdout).toEqual(expected);
       expect(stderr).toEqual('');
       done(err);
@@ -35,8 +35,8 @@ describe('config: flags.compactTasks', function() {
     function cb(err, stdout, stderr) {
       var filepath = path.join(expectedDir, 'flags-tasks-unsorted.txt');
       var expected = fs.readFileSync(filepath, 'utf-8');
-      expected = sliceLines(expected, 1);
-      stdout = sliceLines(stdout, 1);
+      expected = sliceLines(expected, 2);
+      stdout = sliceLines(stdout, 2);
       expect(stdout).toEqual(expected);
       expect(stderr).toEqual('');
       done(err);
@@ -50,8 +50,8 @@ describe('config: flags.compactTasks', function() {
     function cb(err, stdout, stderr) {
       var filepath = path.join(expectedDir, 'flags-tasks-compact.txt');
       var expected = fs.readFileSync(filepath, 'utf-8');
-      expected = sliceLines(expected, 1);
-      stdout = sliceLines(stdout, 1);
+      expected = sliceLines(expected, 2);
+      stdout = sliceLines(stdout, 2);
       expect(stdout).toEqual(expected);
       expect(stderr).toEqual('');
       done(err);
@@ -65,8 +65,8 @@ describe('config: flags.compactTasks', function() {
     function cb(err, stdout, stderr) {
       var filepath = path.join(expectedDir, 'flags-tasks-unsorted.txt');
       var expected = fs.readFileSync(filepath, 'utf-8');
-      expected = sliceLines(expected, 1);
-      stdout = sliceLines(stdout, 1);
+      expected = sliceLines(expected, 2);
+      stdout = sliceLines(stdout, 2);
       expect(stdout).toEqual(expected);
       expect(stderr).toEqual('');
       done(err);

test/config-flags-gulpfile.js

@@ -10,7 +10,7 @@ var gulp = require('./tool/gulp-cmd');
 var baseDir = path.join(__dirname, 'fixtures/config/flags/gulpfile');
 var prjDir = path.join(baseDir, 'prj');
 
-describe('config: flags.gulpfile', function() {
+describe('config: gulpfile', function() {
 
   it('Should configure with a .gulp.* file', function(done) {
     var opts = { cwd: prjDir };
@@ -19,9 +19,9 @@ describe('config: flags.gulpfile', function() {
     function cb(err, stdout, stderr) {
       expect(err).toBeNull();
       expect(stderr).toEqual('');
-      expect(sliceLines(stdout, 2, 4)).toEqual(
+      expect(sliceLines(stdout, 3, 5)).toEqual(
         'This gulpfile : ' + path.join(baseDir, 'is/here/gulpfile-by-prj-cfg.js') + '\n' +
-        'The current directory : ' + prjDir
+        'The current directory : ' + path.join(baseDir, 'is/here')
       );
       done(err);
     }
@@ -49,9 +49,9 @@ describe('config: flags.gulpfile', function() {
     function cb(err, stdout, stderr) {
       expect(err).toBeNull();
       expect(stderr).toEqual('');
-      expect(sliceLines(stdout, 2, 4)).toEqual(
+      expect(sliceLines(stdout, 3, 5)).toEqual(
         'This gulpfile : ' + path.join(baseDir, 'is/here/gulpfile-by-prj-cfg.js') + '\n' +
-        'The current directory : ' + path.join(prjDir, 'findup')
+        'The current directory : ' + path.join(baseDir, 'is/here')
       );
       done(err);
     }
@@ -126,8 +126,8 @@ describe('config: flags.gulpfile', function() {
       expect(err).toBeNull();
       expect(stderr).toEqual('');
       expect(sliceLines(stdout, 0, 1)).toEqual('Loaded external module: @babel/register');
-      expect(sliceLines(stdout, 4, 5)).toEqual('clean!');
-      expect(sliceLines(stdout, 7, 8)).toEqual('build!');
+      expect(sliceLines(stdout, 5, 6)).toEqual('clean!');
+      expect(sliceLines(stdout, 8, 9)).toEqual('build!');
       done(err);
     }
   });
@@ -152,7 +152,7 @@ describe('config: flags.gulpfile', function() {
     function cb(err, stdout, stderr) {
       expect(err).toBeNull();
       expect(stderr).toEqual('');
-      expect(sliceLines(stdout, 3, 4)).toEqual(path.join(opts.cwd, 'gulpfile-2.js'));
+      expect(sliceLines(stdout, 2, 3)).toEqual(path.join(opts.cwd, 'gulpfile-2.js'));
       done(err);
     }
   });

test/config-flags-preload.js

@@ -9,7 +9,7 @@ var gulp = require('./tool/gulp-cmd');
 
 var baseDir = path.join(__dirname, 'fixtures/config/flags/preload');
 
-describe('config: flags.preload', function() {
+describe('config: preload', function() {
 
   it('Should configure with an array in a .gulp.* file', function(done) {
     var opts = { cwd: path.join(baseDir, 'array') };

test/config-flags-sort-tasks.js

@@ -20,7 +20,7 @@ describe('config: flags.sortTasks', function() {
     function cb(err, stdout, stderr) {
       var filepath = path.join(expectedDir, 'flags-tasks-sorted.txt');
       var expected = fs.readFileSync(filepath, 'utf-8');
-      expect(sliceLines(stdout, 1)).toEqual(sliceLines(expected, 1));
+      expect(sliceLines(stdout, 2)).toEqual(sliceLines(expected, 2));
       expect(stderr).toEqual('');
       done(err);
     }
@@ -33,7 +33,7 @@ describe('config: flags.sortTasks', function() {
     function cb(err, stdout, stderr) {
       var filepath = path.join(expectedDir, 'flags-tasks-unsorted.txt');
       var expected = fs.readFileSync(filepath, 'utf-8');
-      expect(sliceLines(stdout, 1)).toEqual(sliceLines(expected, 1));
+      expect(sliceLines(stdout, 2)).toEqual(sliceLines(expected, 2));
       expect(stderr).toEqual('');
       done(err);
     }
@@ -46,7 +46,7 @@ describe('config: flags.sortTasks', function() {
     function cb(err, stdout, stderr) {
       var filepath = path.join(expectedDir, 'flags-tasks-sorted.txt');
       var expected = fs.readFileSync(filepath, 'utf-8');
-      expect(sliceLines(stdout, 1)).toEqual(sliceLines(expected, 1));
+      expect(sliceLines(stdout, 2)).toEqual(sliceLines(expected, 2));
       expect(stderr).toEqual('');
       done(err);
     }
@@ -59,7 +59,7 @@ describe('config: flags.sortTasks', function() {
     function cb(err, stdout, stderr) {
       var filepath = path.join(expectedDir, 'flags-tasks-unsorted.txt');
       var expected = fs.readFileSync(filepath, 'utf-8');
-      expect(sliceLines(stdout, 1)).toEqual(sliceLines(expected, 1));
+      expect(sliceLines(stdout, 2)).toEqual(sliceLines(expected, 2));
       expect(stderr).toEqual('');
       done(err);
     }

test/config-flags-tasks-depth.js

@@ -20,7 +20,7 @@ describe('config: flags.tasksDepth', function() {
     function cb(err, stdout, stderr) {
       var filepath = path.join(expectedDir, 'flags-tasks-depth4.txt');
       var expected = fs.readFileSync(filepath, 'utf-8');
-      expect(sliceLines(stdout, 1)).toEqual(sliceLines(expected, 1));
+      expect(sliceLines(stdout, 2)).toEqual(sliceLines(expected, 2));
       expect(stderr).toEqual('');
       done(err);
     }
@@ -33,7 +33,7 @@ describe('config: flags.tasksDepth', function() {
     function cb(err, stdout, stderr) {
       var filepath = path.join(expectedDir, 'flags-tasks-depth2.txt');
       var expected = fs.readFileSync(filepath, 'utf-8');
-      expect(sliceLines(stdout, 1)).toEqual(sliceLines(expected, 1));
+      expect(sliceLines(stdout, 2)).toEqual(sliceLines(expected, 2));
       expect(stderr).toEqual('');
       done(err);
     }

test/expected/flags-tasks-compact.txt

@@ -1,3 +1,4 @@
+Working directory changed to gulp-cli/test/fixtures/gulpfiles
 gulp-cli/test/fixtures/gulpfiles
 ├─┬ taskC
 │ └─┬ <series>

test/expected/flags-tasks-depth2.txt

@@ -1,3 +1,4 @@
+Working directory changed to gulp-cli/test/fixtures/gulpfiles
 gulp-cli/test/fixtures/gulpfiles
 ├─┬ taskC
 │ └── <series>

test/expected/flags-tasks-depth4.txt

@@ -1,3 +1,4 @@
+Working directory changed to gulp-cli/test/fixtures/gulpfiles
 gulp-cli/test/fixtures/gulpfiles
 ├─┬ taskC
 │ └─┬ <series>

test/expected/flags-tasks-sorted.txt

@@ -1,3 +1,4 @@
+Working directory changed to gulp-cli/test/fixtures/gulpfiles
 gulp-cli/test/fixtures/gulpfiles
 ├─┬ default
 │ └─┬ <parallel>

test/expected/flags-tasks-unsorted.txt

@@ -1,3 +1,4 @@
+Working directory changed to gulp-cli/test/fixtures/gulpfiles
 gulp-cli/test/fixtures/gulpfiles
 ├─┬ taskC
 │ └─┬ <series>

test/fixtures/config/flags/compactTasks/f/.gulp.js

@@ -1,8 +1,8 @@
 'use strict';
 
 module.exports = {
+  gulpfile: '../../../../gulpfiles/gulpfile-4.js',
   flags: {
     compactTasks: false,
-    gulpfile: '../../../../gulpfiles/gulpfile-4.js',
   },
 };