New: Support configuration with .gulp.* files (closes #69) (#90)

Includes implementation for description configuration (closes #70)

Author: sttk

README.md

@@ -83,6 +83,18 @@ You can find a list of supported languages at https://github.com/js-cli/js-inter
 
 The CLI adds process.env.INIT_CWD which is the original cwd it was launched from.
 
+## Configuration
+
+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/js-cli/js-interpret.
+
+Configuration from the home directory (`~`) and current working directory (`cwd`) are merged with `cwd` taking precedence.
+
+Supported configurations properties:
+
+| Property    | Description |
+|-------------|-------------|
+| description | Top-level description of the project/gulpfile (Replaces "Tasks for ~/path/of/gulpfile.js") |
+
 ## Flags
 
 gulp has very few flags to know about. All other flags are for tasks to use if needed.

index.js

@@ -9,6 +9,8 @@ var Liftoff = require('liftoff');
 var tildify = require('tildify');
 var interpret = require('interpret');
 var v8flags = require('v8flags');
+var merge = require('lodash.merge');
+var isString = require('lodash.isstring');
 var findRange = require('semver-greatest-satisfied-range');
 var exit = require('./lib/shared/exit');
 var cliOptions = require('./lib/shared/cliOptions');
@@ -34,6 +36,18 @@ var cli = new Liftoff({
   completions: completion,
   extensions: interpret.jsVariants,
   v8flags: v8flags,
+  configFiles: {
+    '.gulp': {
+      home: {
+        path: '~',
+        extensions: interpret.extensions,
+      },
+      cwd: {
+        path: '.',
+        extensions: interpret.extensions,
+      },
+    },
+  },
 });
 
 var usage =
@@ -82,6 +96,15 @@ module.exports = run;
 
 // The actual logic
 function handleArguments(env) {
+
+  // Map an array of keys to preserve order
+  var configFilePaths = ['home', 'cwd'].map(function(key) {
+    return env.configFiles['.gulp'][key];
+  });
+  configFilePaths.filter(isString).forEach(function(filePath) {
+    merge(opts, require(filePath));
+  });
+
   if (opts.help) {
     console.log(parser.help());
     exit(0);

lib/versioned/^3.7.0/index.js

@@ -4,6 +4,7 @@ var chalk = require('chalk');
 var log = require('gulplog');
 var stdout = require('mute-stdout');
 var tildify = require('tildify');
+var isString = require('lodash.isstring');
 
 var taskTree = require('./taskTree');
 var logTasks = require('../../shared/log/tasks');
@@ -38,7 +39,11 @@ function execute(opts, env) {
     }
     if (opts.tasks) {
       var tree = taskTree(gulpInst.tasks);
-      tree.label = 'Tasks for ' + chalk.magenta(tildify(env.configPath));
+      if (opts.description && isString(opts.description)) {
+        tree.label = opts.description;
+      } else {
+        tree.label = 'Tasks for ' + chalk.magenta(tildify(env.configPath));
+      }
       return logTasks(tree, opts.depth, function(task) {
         return gulpInst.tasks[task].fn;
       });

lib/versioned/^4.0.0-alpha.1/index.js

@@ -6,6 +6,7 @@ var log = require('gulplog');
 var chalk = require('chalk');
 var stdout = require('mute-stdout');
 var tildify = require('tildify');
+var isString = require('lodash.isstring');
 
 var exit = require('../../shared/exit');
 
@@ -42,10 +43,13 @@ function execute(opts, env) {
       return logTasksSimple(gulpInst.tree());
     }
     if (opts.tasks) {
-      var tree = {
-        label: 'Tasks for ' + chalk.magenta(tildify(env.configPath)),
-        nodes: gulpInst.tree({ deep: true }),
-      };
+      var tree = {};
+      if (opts.description && isString(opts.description)) {
+        tree.label = opts.description;
+      } else {
+        tree.label = 'Tasks for ' + chalk.magenta(tildify(env.configPath));
+      }
+      tree.nodes = gulpInst.tree({ deep: true });
       return logTasks(tree, opts.depth, function(taskname) {
         return gulpInst.task(taskname);
       });

lib/versioned/^4.0.0-alpha.2/index.js

@@ -6,6 +6,7 @@ var log = require('gulplog');
 var chalk = require('chalk');
 var stdout = require('mute-stdout');
 var tildify = require('tildify');
+var isString = require('lodash.isstring');
 
 var exit = require('../../shared/exit');
 
@@ -48,13 +49,21 @@ function execute(opts, env) {
     }
     if (opts.tasks) {
       tree = gulpInst.tree({ deep: true });
-      tree.label = 'Tasks for ' + chalk.magenta(tildify(env.configPath));
+      if (opts.description && isString(opts.description)) {
+        tree.label = opts.description;
+      } else {
+        tree.label = 'Tasks for ' + chalk.magenta(tildify(env.configPath));
+      }
 
       return logTasks(tree, opts.depth, getTask(gulpInst));
     }
     if (opts.tasksJson) {
       tree = gulpInst.tree({ deep: true });
-      tree.label = 'Tasks for ' + tildify(env.configPath);
+      if (opts.description && isString(opts.description)) {
+        tree.label = opts.description;
+      } else {
+        tree.label = 'Tasks for ' + tildify(env.configPath);
+      }
 
       var output = JSON.stringify(tree);
 

lib/versioned/^4.0.0/index.js

@@ -6,6 +6,7 @@ var log = require('gulplog');
 var chalk = require('chalk');
 var stdout = require('mute-stdout');
 var tildify = require('tildify');
+var isString = require('lodash.isstring');
 
 var exit = require('../../shared/exit');
 
@@ -48,13 +49,21 @@ function execute(opts, env) {
     }
     if (opts.tasks) {
       tree = gulpInst.tree({ deep: true });
-      tree.label = 'Tasks for ' + chalk.magenta(tildify(env.configPath));
+      if (opts.description && isString(opts.description)) {
+        tree.label = opts.description;
+      } else {
+        tree.label = 'Tasks for ' + chalk.magenta(tildify(env.configPath));
+      }
 
       return logTasks(tree, opts.depth, getTask(gulpInst));
     }
     if (opts.tasksJson) {
       tree = gulpInst.tree({ deep: true });
-      tree.label = 'Tasks for ' + tildify(env.configPath);
+      if (opts.description && isString(opts.description)) {
+        tree.label = opts.description;
+      } else {
+        tree.label = 'Tasks for ' + tildify(env.configPath);
+      }
 
       var output = JSON.stringify(tree);
 

package.json

@@ -36,10 +36,11 @@
     "fancy-log": "^1.1.0",
     "gulplog": "^1.0.0",
     "interpret": "^1.0.0",
-    "liftoff": "^2.1.0",
+    "liftoff": "^2.3.0",
     "lodash.isfunction": "^3.0.8",
     "lodash.isplainobject": "^4.0.4",
     "lodash.isstring": "^4.0.1",
+    "lodash.merge": "^4.5.1",
     "lodash.sortby": "^4.5.0",
     "matchdep": "^1.0.0",
     "mute-stdout": "^1.0.0",

test/config.js

@@ -0,0 +1,67 @@
+'use strict';
+
+var lab = exports.lab = require('lab').script();
+var expect = require('code').expect;
+var path = require('path');
+var fs = require('fs');
+
+var skipLines = require('./tools/skip-lines');
+var eraseTime = require('./tools/erase-time');
+var runner = require('./tools/run-gulp');
+
+var fixturesDir = path.join(__dirname, 'fixtures', 'config');
+var expectedDir = path.join(__dirname, 'expected', 'config');
+
+lab.experiment('gulp configuration', function() {
+
+  lab.test('Should configure with a .gulp.* file in cwd',
+  function(done) {
+    runner({ verbose: false })
+      .basedir(fixturesDir)
+      .chdir('foo/bar')
+      .gulp('--tasks')
+      .run(cb);
+
+    function cb(err, stdout) {
+      var expected = fs.readFileSync(path.join(expectedDir, 'output0.txt'),
+        'utf-8');
+      stdout = eraseTime(stdout);
+      expect(stdout).to.equal(expected);
+      done(err);
+    }
+  });
+
+  lab.test('Should configure with a .gulp.* file in cwd found up',
+  function(done) {
+    runner({ verbose: false })
+      .basedir(fixturesDir)
+      .chdir('foo/bar/baz')
+      .gulp('--tasks')
+      .run(cb);
+
+    function cb(err, stdout) {
+      var expected = fs.readFileSync(path.join(expectedDir, 'output0.txt'),
+        'utf-8');
+      stdout = eraseTime(skipLines(stdout, 1));
+      expect(stdout).to.equal(expected);
+      done(err);
+    }
+  });
+
+  lab.test('Should configure with a .gulp.* file in cwd by --cwd',
+  function(done) {
+    runner({ verbose: false })
+      .basedir(fixturesDir)
+      .chdir('qux')
+      .gulp('--tasks', '--gulpfile ../foo/bar/gulpfile.js', '--cwd .')
+      .run(cb);
+
+    function cb(err, stdout) {
+      var expected = fs.readFileSync(path.join(expectedDir, 'output1.txt'),
+        'utf-8');
+      stdout = eraseTime(stdout);
+      expect(stdout).to.equal(expected);
+      done(err);
+    }
+  });
+});

test/expected/flags-tasks/by-unwrap-and-not-by-unwrap.txt renamed to test/expected/by-unwrap-and-not-by-unwrap.txt

@@ -1,4 +1,4 @@
-gulp-cli/test
+gulp-cli/test/fixtures
 ├─┬ default
 │ └─┬ <series>
 │   ├── task1

test/expected/config/output0.txt

@@ -0,0 +1,2 @@
+Description by .gulp.json in directory foo/bar
+└── default