diff --git a/gulpfile.js b/gulpfile.js index da08403ca..fb0903913 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -3,24 +3,28 @@ *******************************/ var - gulp = require('gulp-help')(require('gulp')), + gulp = require('gulp-help')(require('gulp')), // read user config to know what task to load - config = require('./tasks/config/user'), + config = require('./tasks/config/user'), // import tasks - build = require('./tasks/build'), - clean = require('./tasks/clean'), - version = require('./tasks/version'), - watch = require('./tasks/watch'), + build = require('./tasks/build'), + clean = require('./tasks/clean'), + version = require('./tasks/version'), + watch = require('./tasks/watch'), + + // install tasks + install = require('./tasks/install'), + checkInstall = require('./tasks/check-install'), // docs tasks - serveDocs = require('./tasks/docs/serve'), - buildDocs = require('./tasks/docs/build'), + serveDocs = require('./tasks/docs/serve'), + buildDocs = require('./tasks/docs/build'), // rtl - buildRTL = require('./tasks/rtl/build'), - watchRTL = require('./tasks/rtl/watch') + buildRTL = require('./tasks/rtl/build'), + watchRTL = require('./tasks/rtl/watch') ; @@ -38,6 +42,9 @@ gulp.task('build', 'Builds all files from source', build); gulp.task('clean', 'Clean dist folder', clean); gulp.task('version', 'Displays current version of Semantic', version); +gulp.task('install', 'Clean dist folder', install); +gulp.task('check install', 'Displays current version of Semantic', checkInstall); + /*-------------- Docs @@ -52,10 +59,8 @@ gulp.task('build-docs', 'Build all files and add to SUI Docs', buildDocs); ---------------*/ if(config.rtl) { - gulp.task('watch rtl', 'Build all files as RTL', watchRTL); gulp.task('build rtl', 'Watch files as RTL ', buildRTL); - } /*-------------- diff --git a/tasks/config/project/config.js b/tasks/config/project/config.js index 876868d85..e62fea898 100644 --- a/tasks/config/project/config.js +++ b/tasks/config/project/config.js @@ -25,7 +25,7 @@ module.exports = { ---------------*/ var - currentPath = process.cwd() + path.sep + '/tasks', + currentPath = process.cwd(), folder ; @@ -35,7 +35,7 @@ module.exports = { // add base path config.paths.source[folder] = path.join(config.base, config.paths.source[folder]); // resolve relative path from cwd to output folder - config.paths.source[folder] = path.resolve( path.relative(currentPath, config.paths.source[folder]) ) + path.sep; + config.paths.source[folder] = path.resolve( path.relative(currentPath, config.paths.source[folder])) + path.sep; } } @@ -45,10 +45,13 @@ module.exports = { // add base path config.paths.output[folder] = path.join(config.base, config.paths.output[folder]); // resolve relative path from cwd to output folder - config.paths.output[folder] = path.resolve( path.relative(currentPath, config.paths.output[folder]) ) + path.sep; + config.paths.output[folder] = path.resolve( path.relative(currentPath, config.paths.output[folder])) + path.sep; } } + // remove trailing slash from file + config.paths.source.config = path.resolve(config.paths.source.config); + // resolve "clean" command path config.paths.clean = path.join(config.base, config.paths.clean); diff --git a/tasks/watch.js b/tasks/watch.js index cb1c96429..a147f5d1c 100644 --- a/tasks/watch.js +++ b/tasks/watch.js @@ -57,7 +57,8 @@ module.exports = function(callback) { return; } - console.clear(); + //console.clear(); + console.log(source.definitions); console.log('Watching source files for changes'); /*--------------