Normalize tasks

Gruntfile.js

@@ -1,48 +1,48 @@
 module.exports = function(grunt) {
-    require('load-grunt-tasks')(grunt);
-    grunt.loadTasks('./grunt_tasks');
-    grunt.loadTasks('./vendor/open-orchestra/open-orchestra-cms-bundle/GruntTasks');
-    grunt.loadTasks('./vendor/open-orchestra/open-orchestra-media-admin-bundle/GruntTasks');
-
-    var merge = require('merge');
-    var config = {
-        pkg: grunt.file.readJSON('package.json'),
-        env: process.env
-    };
-    config = merge.recursive(true, config, loadDirConfig('./grunt_tasks/options/'));
-    config = merge.recursive(true, config, loadDirConfig('./vendor/open-orchestra/open-orchestra-cms-bundle/GruntTasks/Options/'));
-    config = merge.recursive(true, config, loadDirConfig('./vendor/open-orchestra/open-orchestra-media-admin-bundle/GruntTasks/Options/'));
-
-    grunt.initConfig(config);
+  require('load-grunt-tasks')(grunt);
+  grunt.loadTasks('./grunt_tasks');
+  grunt.loadTasks('./vendor/open-orchestra/open-orchestra-cms-bundle/GruntTasks');
+  grunt.loadTasks('./vendor/open-orchestra/open-orchestra-media-admin-bundle/GruntTasks');
+
+  var merge = require('merge');
+  var config = {
+    pkg: grunt.file.readJSON('package.json'),
+    env: process.env
+  };
+  config = merge.recursive(true, config, loadDirConfig('./grunt_tasks/subtasks/'));
+  config = merge.recursive(true, config, loadDirConfig('./vendor/open-orchestra/open-orchestra-cms-bundle/GruntTasks/Subtasks/'));
+  config = merge.recursive(true, config, loadDirConfig('./vendor/open-orchestra/open-orchestra-media-admin-bundle/GruntTasks/Subtasks/'));
+
+  grunt.initConfig(config);
 };
 
 function loadDirConfig(path) {
-    var glob = require('glob');
-    var merge = require('merge');
-    var dirConfig = {};
+  var glob = require('glob');
+  var merge = require('merge');
+  var dirConfig = {};
 
-    glob.sync('*', {cwd: path}).forEach(function(filename) {
-        var fileConfig = loadFileConfig(path, filename);
-        dirConfig = merge.recursive(true, dirConfig, fileConfig);
-    });
+  glob.sync('*', {cwd: path}).forEach(function(filename) {
+    var fileConfig = loadFileConfig(path, filename);
+    dirConfig = merge.recursive(true, dirConfig, fileConfig);
+  });
 
-    return dirConfig;
+  return dirConfig;
 }
 
 function loadFileConfig(path, filename) {
-    var keys =  filename.replace(/\.js$/,'').split('.');
-
-    var buildFileConfig = function(keys, filepath) {
-        if (keys.length == 0) {
-            return require(filepath);
-        } else {
-            var subArray = {};
-            var index = keys[0];
-            keys.shift();
-            subArray[index] = buildFileConfig(keys, filepath);
-            return subArray;
-        }
-    };
-
-    return buildFileConfig(keys, path + filename);
+  var keys =  filename.replace(/\.js$/, '').split('.');
+
+  var buildFileConfig = function(keys, filepath) {
+    if (keys.length == 0) {
+      return require(filepath);
+    } else {
+      var subArray = {};
+      var index = keys[0];
+      keys.shift();
+      subArray[index] = buildFileConfig(keys, filepath);
+      return subArray;
+    }
+  };
+
+  return buildFileConfig(keys, path + filename);
 }

grunt_tasks/css_task.js

@@ -1,15 +1,16 @@
 module.exports = function(grunt) {
-    grunt.registerTask('css',
-        [
-            'less:discovering',
-            'less',
-            'concat:libcss',
-            'concat:smartadminpatchescss',
-            'concat:orchestracss',
-            'concat:mediacss',
-            'concat:presmartadmincss',
-            'concat:postsmartadmincss',
-            'cssmin'
-        ]
-    );
+  grunt.registerTask(
+    'css',
+    [
+      'less:discovering',
+      'less',
+      'concat:lib_css',
+      'concat:smartadmin_patches_css',
+      'concat:orchestra_css',
+      'concat:mediacss',
+      'concat:pre_smartadmin_css',
+      'concat:post_smartadmin_css',
+      'cssmin'
+    ]
+  );
 };

grunt_tasks/default_task.js

@@ -1,13 +1,15 @@
 module.exports = function(grunt) {
-    grunt.registerTask('default',
-        [
-            'clean',
-            'commands:assets_install',
-            'symlink',
-            'css',
-            'javascript',
-            'javascriptProd',
-            'commands:assetic_dump'
-         ]
-    );
+  grunt.registerTask(
+    'default',
+    [
+      'clean:built',
+      'clean:symlinks',
+      'commands:assets_install',
+      'symlink',
+      'css',
+      'javascript',
+      'javascriptProd',
+      'commands:assetic_dump'
+    ]
+  );
 };

grunt_tasks/javascriptProd_task.js

@@ -1,7 +1,6 @@
 module.exports = function(grunt) {
-    grunt.registerTask('javascriptProd',
-        [
-            'uglify'
-        ]
-    );
+  grunt.registerTask(
+    'javascriptProd',
+    ['uglify:all_js']
+  );
 };

grunt_tasks/javascript_task.js

@@ -1,13 +1,14 @@
 module.exports = function(grunt) {
-    grunt.registerTask('javascript',
-        [
-            'coffee:discovering',
-            'coffee',
-            'concat:smartadminjs',
-            'concat:libjs',
-            'concat:orchestrajs',
-            'concat:mediajs',
-            'concat:js'
-        ]
-    );
+  grunt.registerTask(
+    'javascript',
+    [
+      'coffee:discovering',
+      'coffee',
+      'concat:smartadmin_js',
+      'concat:lib_js',
+      'concat:orchestra_js',
+      'concat:mediajs',
+      'concat:all_js'
+    ]
+  );
 };

grunt_tasks/subtasks/clean.built.js

@@ -0,0 +1,5 @@
+module.exports = [
+  'web/built',
+  'web/js',
+  'web/css'
+];

grunt_tasks/subtasks/clean.symlinks.js

@@ -0,0 +1,6 @@
+module.exports = [
+  'web/img',
+  'web/images',
+  'web/sound',
+  'web/fonts'
+];

grunt_tasks/subtasks/commands.assetic_dump.js

@@ -0,0 +1,3 @@
+module.exports = {
+  cmd: 'php app/console assetic:dump'
+};

grunt_tasks/subtasks/commands.assets_install.js

@@ -0,0 +1,3 @@
+module.exports = {
+  cmd: 'php app/console assets:install --symlink'
+};

grunt_tasks/subtasks/concat.all_js.js

@@ -0,0 +1,9 @@
+module.exports = {
+  src: [
+    'web/built/smartadmin.js',
+    'web/built/lib.js',
+    'web/built/orchestra.js',
+    'web/built/media.js'
+  ],
+  dest: 'web/js/all.js'
+};

grunt_tasks/subtasks/concat.post_smartadmin_css.js

@@ -0,0 +1,8 @@
+module.exports = {
+  src: [
+    'web/built/smartadminpatches.css',
+    'web/built/orchestra.css',
+    'web/built/media.css'
+  ],
+  dest: 'web/css/postsmartadmin.css'
+};

grunt_tasks/subtasks/concat.pre_smartadmin_css.js

@@ -0,0 +1,4 @@
+module.exports = {
+  src: ['web/built/lib.css'],
+  dest: 'web/css/presmartadmin.css'
+};

grunt_tasks/subtasks/cssmin.minify.js

@@ -0,0 +1,8 @@
+module.exports = {
+  expand: true,
+  src: [
+    'web/css/presmartadmin.css',
+    'web/css/postsmartadmin.css'
+  ],
+  ext: '.min.css'
+};

grunt_tasks/subtasks/uglify.all_js.js

@@ -0,0 +1,5 @@
+module.exports = {
+  files: {
+    'web/js/all.min.js': ['web/js/all.js']
+  }
+};