embarklabs
/
embark
mirror of https://github.com/embarklabs/embark.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

move grunt methods to utils module

This commit is contained in:
Iuri Matias 2017-02-18 14:37:07 -05:00
parent 833102d175
commit 58b1f504d5
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/config.js
View File

@ -1,5 +1,4 @@
var fs = require('fs');
var grunt = require('grunt');
var merge = require('merge');
var Plugins = require('./plugins.js');
var utils = require('./utils.js');
@ -149,7 +148,7 @@ Config.prototype.loadChainTrackerFile = function() {
Config.prototype.loadFiles = function(files) {
var self = this;
var originalFiles = grunt.file.expand({nonull: true}, files);
var originalFiles = utils.filesMatchinPattern(files);
var readFiles = [];
// get embark.js object first
@ -187,7 +186,7 @@ Config.prototype.loadFiles = function(files) {
}
filesFromPlugins.filter(function(file) {
if (grunt.file.isMatch(files, file.intendedPath)) {
if (utils.fileMatchesPattern(files, file.intendedPath)) {
readFiles.push(file);
}
});

3
lib/plugin.js
View File

@ -1,5 +1,4 @@
/*jshint esversion: 6, loopfunc: true */
var grunt = require('grunt');
var fs = require('fs');
var utils = require('./utils.js');
@ -146,7 +145,7 @@ Plugin.prototype.runFilePipeline = function() {
Plugin.prototype.runPipeline = function(args) {
// TODO: should iterate the pipelines
var pipeline = this.pipeline[0];
var shouldRunPipeline = grunt.file.isMatch(pipeline.matcthingFiles, args.targetFile);
var shouldRunPipeline = utils.fileMatchesPattern(pipeline.matcthingFiles, args.targetFile);
if (shouldRunPipeline) {
return pipeline.cb.call(this, args);
} else {

9
lib/utils.js
View File

@ -1,9 +1,18 @@
var path = require('path');
var grunt = require('grunt');
function joinPath() {
return path.join.apply(path.join, arguments);
}
function filesMatchinPattern(files) {
return grunt.file.expand({nonull: true}, files);
}
function fileMatchesPattern(patterns, intendedPath) {
return grunt.file.isMatch(patterns, intendedPath);
}
module.exports = {
joinPath: joinPath
};