Skip to content

Commit

Permalink
New: Support flags.require config option (closes #108, closes #167)
Browse files Browse the repository at this point in the history
  • Loading branch information
phated committed Mar 13, 2019
1 parent be9d25a commit ad7c19e
Show file tree
Hide file tree
Showing 10 changed files with 92 additions and 0 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ Supported configurations properties:
| 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.require | An array of modules to require before running the gulpfile. |

## Flags

Expand Down
4 changes: 4 additions & 0 deletions lib/shared/config/env-flags.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ var copyProps = require('copy-props');
var toFrom = {
configPath: 'flags.gulpfile',
configBase: 'flags.gulpfile',
require: 'flags.require',
};

function mergeConfigToEnvFlags(env, config) {
Expand All @@ -16,6 +17,9 @@ function convert(configInfo, envInfo) {
if (envInfo.keyChain === 'configBase') {
return path.dirname(configInfo.value);
}
if (envInfo.keyChain === 'require') {
return [].concat(envInfo.value, configInfo.value);
}
return configInfo.value;
}

Expand Down
52 changes: 52 additions & 0 deletions test/config-flags-require.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
'use strict';

var expect = require('expect');

var path = require('path');
var fixturesDir = path.join(__dirname, 'fixtures/config');

var headLines = require('gulp-test-tools').headLines;
var eraseTime = require('gulp-test-tools').eraseTime;
var runner = require('gulp-test-tools').gulpRunner().basedir(fixturesDir);

describe('config: flags.require', function() {

it('Should configure with an array in a .gulp.* file', function(done) {
runner
.chdir('flags/require/array')
.gulp()
.run(cb);

function cb(err, stdout, stderr) {
expect(err).toEqual(null);
expect(stderr).toEqual('');
// stdout = headLines(stdout, 2, 2);
expect(eraseTime(stdout)).toEqual(
'Requiring external module ./preload_one\n' +
'Requiring external module ./preload_two\n' +
'preload one!\n' +
'preload two!\n' +
'');
done(err);
}
});

it('Should configure with a string in a .gulp.* file', function(done) {
runner
.chdir('flags/require/string')
.gulp()
.run(cb);

function cb(err, stdout, stderr) {
expect(err).toEqual(null);
expect(stderr).toEqual('');
// stdout = headLines(stdout, 2, 2);
expect(eraseTime(stdout)).toEqual(
'Requiring external module ./preload\n' +
'hello preload!\n' +
'');
done(err);
}
});
});

9 changes: 9 additions & 0 deletions test/fixtures/config/flags/require/array/.gulp.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"flags": {
"silent": true,
"require": [
"./preload_one",
"./preload_two"
]
}
}
9 changes: 9 additions & 0 deletions test/fixtures/config/flags/require/array/gulpfile.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
'use strict';

var gulp = require('gulp');

gulp.task('default', function(done) {
console.log(global.preload_one);
console.log(global.preload_two);
done();
});
1 change: 1 addition & 0 deletions test/fixtures/config/flags/require/array/preload_one.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
global.preload_one = 'preload one!';
1 change: 1 addition & 0 deletions test/fixtures/config/flags/require/array/preload_two.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
global.preload_two = 'preload two!';
6 changes: 6 additions & 0 deletions test/fixtures/config/flags/require/string/.gulp.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"flags": {
"silent": true,
"require": "./preload"
}
}
8 changes: 8 additions & 0 deletions test/fixtures/config/flags/require/string/gulpfile.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
'use strict';

var gulp = require('gulp');

gulp.task('default', function(done) {
console.log(global.preload);
done();
});
1 change: 1 addition & 0 deletions test/fixtures/config/flags/require/string/preload.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
global.preload = 'hello preload!';

0 comments on commit ad7c19e

Please sign in to comment.