#158 Replace gulp

.gitignore

@@ -7,9 +7,6 @@ db/disciplines activity.sql
 ~dev_rating/application/logs/*/
 ~dev_rating/application/config/
 ~dev_rating/static/*
-!~dev_rating/static/img/
-!~dev_rating/static/other/
-!~dev_rating/static/font-awesome/
 node_modules/
 /config
 

Makefile

@@ -19,7 +19,7 @@ fw_deploy: fw_migrate Tasker_deploy
 
 # copy server files
 copy_files: Tasker_deploy
-	$(GULP) --release --force
+	$(GULP) release
 	rsync -ru --info=PROGRESS2  --exclude="application/config" --exclude="news.md" --exclude="updates.md"  \
 \~dev_rating/ $(DST_PATH)
 

gulpfile.js

 'use strict';
-var minimist = require('minimist');
-var fs = require('fs');
-var lazypipe = require('lazypipe');
-var babel = require('gulp-babel');
-var apidoc = require('gulp-apidoc');
-
-// command line arguments
-var varg = minimist(process.argv.slice(2), {
-    string: 'env',
-    default: {env: process.env.NODE_ENV || 'debug'}
-});
 
 
-var options = {
-    opt: varg.env !== 'debug' || varg.release, // optimize
-    inc: !varg.force, // incremental build
-    beauty: varg.beauty || varg.rainbow,
-    dst: varg.dst
-};
-
+//=========================
+//  Модули
+//=========================
 
-// gulp
-// common
+// Основные модули
 var gulp = require('gulp');
-var changed = require('gulp-changed');
-var through = require('through');
+var fs = require('fs');
+var del = require('del');
+var console = require('console');
+var lazypipe = require('lazypipe');
 var empty = function () {
-    return through(function (data) {
+    return require('through')(function (data) {
         this.emit('data', data);
     }, function () {
         this.emit('end');
     });
 };
 
-// var plumber = require('gulp-plumber');
-// var gulpif = require('gulp-if');
-// var rename = require('gulp-rename'); //переименовывание
-// var watch = require('gulp-watch');
-// var filter = require('gulp-filter');
-
-
-// css/less
-var less = require('gulp-less');
-var prefix = require('gulp-autoprefixer'); //префиксы
-var minifyCss = require('gulp-minify-css'); //минификация
-// var concatCss = require('gulp-concat-css'); //конкатенация
-
-// js
-var uglify = require('gulp-uglify');
-var prettify = options.beauty ? require('gulp-jsbeautifier') : empty;
-
-
-var paths = new (function () {
-    var self = this;
-    self.root = '.';
-
-    var src = '.';
-    var dst = options.dst || self.root + '/~dev_rating';
-
-    var app = self.root + '/~dev_rating';
-    var media = src + '/media';
-    var stat = dst + '/static';
 
-    self.src = {
-        css: media + '/css/**/*.css',
-        less: media + '/less/**/*.less',
-        js: media + '/js/**/*.js',
-        config: src + '/deploy/phpConfig/**/*',
-        css_components: media + '/components/**/*.css',
-        js_components: media + '/components/**/*.js',
-        twig_components: media + '/components/**/*.twig'
-    };
-
-
-    self.dst = {
-        css: stat + '/css/',
-        less: stat + '/css/',
-        js: stat + '/js/',
-        config: dst + '/application/config/',
-        css_components: stat + '/components/',
-        js_components: stat + '/components/',
-        twig_components: stat + '/components/'
-    };
-})();
-
-
-// =============================
-//          pipes
-// =============================
-
-var pipes = (function () {
-    var cssPipe = lazypipe()
-        .pipe(prefix, 'last 2 versions', '> 1%', 'ie9')
-        //.pipe(rename, {suffix: '.min'})
-        .pipe(options.opt ? minifyCss : prettify);
-
-    var lessPipe = lazypipe()
-        .pipe(less)
-        .pipe(cssPipe);
-
-    var jsPipe = lazypipe()
-        .pipe(babel, { presets: ['es2015-without-strict'], ignore: /js\/lib/ })
-        .pipe(options.opt ? uglify : prettify);
-
-    var twigPipe = empty;
-
-    return {
-        css: cssPipe,
-        less: lessPipe,
-        js: jsPipe,
-        css_components: cssPipe,
-        js_components: jsPipe,
-        twig_components: twigPipe
+//=========================
+//  Настройки
+//=========================
+
+var DIR_ROOT = '.';
+var DIR_SRC = DIR_ROOT + '/media';
+var DIR_DST = DIR_ROOT + '/~dev_rating/static';
+
+// Настройки для типов файлов
+var types = {};
+types.css = {
+    path: {
+        src: DIR_SRC + '/css/**/*.css',
+        dst: DIR_DST + '/css/'
+    },
+    pipe: lazypipe()
+        .pipe(require('gulp-autoprefixer'), 'last 2 versions', '> 1%', 'ie9'),
+    minify: require('gulp-cssnano')
+};
+types.less = {
+    path: {
+        src: DIR_SRC + '/less/**/*.less',
+        dst: DIR_DST + '/css/'
+    },
+    pipe: lazypipe()
+        .pipe(require('gulp-less'))
+        .pipe(types.css.pipe),
+    minify: types.css.minify
+};
+types.js = {
+    path: {
+        src: DIR_SRC + '/js/**/*.js',
+        dst: DIR_DST + '/js/'
+    },
+    pipe: lazypipe()
+        .pipe(require('gulp-babel'), { presets: [ 'es2015-without-strict' ], ignore: /js\/lib/ }),
+    minify: require('gulp-uglify')
+};
+types.css_components = {
+    path: {
+        src: DIR_SRC + '/components/**/*.css',
+        dst: DIR_DST + '/components/'
+    },
+    pipe: types.css.pipe,
+    minify: types.css.minify
+};
+types.js_components = {
+    path: {
+        src: DIR_SRC + '/components/**/*.js',
+        dst: DIR_DST + '/components/'
+    },
+    pipe: types.js.pipe,
+    minify: types.js.minify
+};
+types.twig_components = {
+    path: {
+        src: DIR_SRC + '/components/**/*.twig',
+        dst: DIR_DST + '/components/'
     }
-})();
-
-var ext = {
-    css: '.css',
-    less: '.less',
-    js: '.js',
-    'css_components': '.css',
-    'js_components': '.js',
-    'twig_components': '.twig'
 };
-
-
-// =============================
-//          helpers
-// =============================
-
-var constructHandler = function (msg) {
-    return function () {
-        process.stdout.write('>>> ' + msg + '\n');
-    };
+types.config = {
+    path: {
+        src: DIR_ROOT + '/deploy/phpConfig/**/*',
+        dst: DIR_ROOT + '/~dev_rating/application/config/'
+    }
 };
-
-
-var getConfig = function (type, src, dst, pipe) {
-    var _src = src || paths.src[type];
-    var _dst = dst || paths.dst[type];
-    var _pipe = pipe || pipes[type];
-
-    return {
-        src: _src,
-        dst: _dst,
-        pipe: _pipe,
-        changed: options.inc,
-        ext: ext[type],
-        error: constructHandler(type + ' error')
-    };
+types.etc = {
+    path: {
+        src: (function () {
+            var list = [ DIR_SRC + '/**/*' ];
+            Object.keys(types).forEach(function (type) {
+                list.push('!' + types[type].path.src);
+            });
+            return list;
+        })(),
+        dst: DIR_DST
+    }
 };
 
-var constructTask = function (config) {
-    var dump = function (e) {
-        throw e;
-    };
-    var errorHandler = config.error || dump;
-
-    var midPipe = config.pipe || empty;
 
-    var ext = config.ext ? {extension: config.ext} : {};
-    var chgPipe = config.changed ?
-        lazypipe().pipe(changed, config.dst, ext) :
-        empty;
+//=========================
+//  Опции командной строки
+//=========================
 
-    return gulp.src(config.src)
-        .pipe(chgPipe())
-        .pipe(midPipe())
-        .on('error', errorHandler)
-        .pipe(gulp.dest(config.dst));
+var opts = {
+    minify: process.argv.indexOf('release') !== -1
 };
 
 
-var constructWatch = function (config) {
-    gulp.watch(config.src, function (event) {
-        constructTask(config);
-    });
-};
+//=========================
+//  Обработчик ошибок
+//=========================
 
+var errorHandler = function (error) {
+    console.error(error.message);
+};
 
-// =============================
-//          rules
-// =============================
 
+//=========================
+//  Работа с потоками
+//=========================
 
-gulp.task('less:compile', function () {
-    return constructTask(getConfig('less'));
+// Добавление задач для каждого из типа файлов
+Object.keys(types).forEach(function (type) {
+    gulp.task(type, function () {
+        executePipe(type);
+    });
 });
 
-gulp.task('css:copy', function () {
-    return constructTask(getConfig('css'));
-});
+// Выполнить поток
+var executePipe = function (type) {
+    gulp.src(types[type].path.src)
+        .pipe(types[type].pipe ? types[type].pipe() : empty()).on('error', errorHandler)
+        .pipe(opts.minify && types[type].minify ? types[type].minify() : empty())
+        .pipe(gulp.dest(types[type].path.dst));
+};
 
-gulp.task('js:copy', function () {
-    return constructTask(getConfig('js'));
-});
 
-gulp.task('config:copy', function () {
-    return constructTask({
-        src: paths.src.config,
-        dst: paths.dst.config
+//=========================
+//  Задачи
+//=========================
+
+// Задачи, выполняемые по-умолчанию
+var defTasks = [
+    'css',
+    'less',
+    'js',
+    'css_components',
+    'js_components',
+    'twig_components',
+    'etc'
+];
+
+// Сборка
+// По-умолчанию
+gulp.task('default', defTasks);
+
+// Сборка релиза
+// Заглушка, чтобы не выдавалась ошибка, детект флага находится выше
+gulp.task('release', defTasks);
+
+// Отслеживание изменений
+//TODO: исправить отслеживание новых файлов
+gulp.task('watch', function () {
+    defTasks.forEach(function (type) {
+        gulp.watch(types[type].path.src, [ type ]);
     });
 });
 
-gulp.task('components:copy', function () {
-    constructTask(getConfig('css_components'));
-    constructTask(getConfig('twig_components'));
-    return constructTask(getConfig('js_components'));
+// Очистка папки сборки
+gulp.task('clean', function () {
+    del(DIR_DST);
 });
 
-
-// todo:
-gulp.task('folders:create', function () {
-    var app = paths.root + '/~dev_rating/application';
-
+gulp.task('folders', function () {
+    var app = DIR_ROOT + '/~dev_rating/application';
 
     var dirs = [
         app + '/logs/',
@@ -224,54 +186,30 @@ gulp.task('folders:create', function () {
     dirs.forEach(function (dir) {
         try {
             fs.mkdirSync(dir);
-        } catch (err) {
-            if (err.code !== 'EEXIST') {
-                throw err;
+        } catch (error) {
+            if (error.code !== 'EEXIST') {
+                errorHandler(error);
             }
         }
     });
 });
 
+// Копирование конфигурации
+// Визуальная заглушка, задача генерируется в конфигурации
+// gulp.task('config', ['config']);
 
-// =============================
-//          watch
-// =============================
-
-gulp.task('watch', function (event) {
-    constructWatch(getConfig('less', event.path));
-    constructWatch(getConfig('css', event.path));
-    constructWatch(getConfig('js', event.path));
-    constructWatch(getConfig('css_components', event.path));
-    constructWatch(getConfig('js_components', event.path));
-    constructWatch(getConfig('twig_components', event.path));
-});
-
-
-// =============================
-//          common tasks
-// =============================
-
-gulp.task('config', [
-    'config:copy'
-]);
-
-gulp.task('default', [
-    'less:compile',
-    'css:copy',
-    'js:copy',
-    'components:copy'
-]);
-
+// Установка и сборка
 gulp.task('install', [
-    'folders:create',
+    'folders',
     'config',
     'default'
 ]);
 
-gulp.task('apidoc', function(done){
-    apidoc({
-        src: "~dev_rating/application/classes",
-        dest: "apidoc/",
-        config: "./"
-    },done);
-});
+// Генерациа документации
+gulp.task('apidoc', function (done) {
+    require('gulp-apidoc')({
+        src: DIR_ROOT + '/~dev_rating/application/classes',
+        dest: DIR_ROOT + '/apidoc/',
+        config: DIR_ROOT
+    }, done);
+});
\ No newline at end of file