Hook up custom module-building to rest of build process

grunt.js

@@ -3,22 +3,19 @@ var testacular = require('testacular');
 /*global module:false*/
 module.exports = function (grunt) {
 
-  var modules = {};
-  grunt.file.recurse('modules', function(abspath, rootdir, subdir, filename) {
-    //If numbers / is 1, we know it's first in depth. eg filters/inflector, not filters/inflector/test
-    if (subdir.split('/').length == 2) {
-      modules[subdir] = grunt.file.expand(rootdir+'/'+subdir+'/*.js');
-    }
-  });
-
   grunt.loadNpmTasks('grunt-recess');
   grunt.loadNpmTasks('grunt-coffee');
 
   // Project configuration.
   grunt.initConfig({
+    builddir: 'build',
     pkg: '<json:package.json>',
     meta: {
-      banner: '/**\n' + ' * <%= pkg.description %>\n' + ' * @version v<%= pkg.version %> - ' + '<%= grunt.template.today("yyyy-mm-dd") %>\n' + ' * @link <%= pkg.homepage %>\n' + ' * @license MIT License, http://www.opensource.org/licenses/MIT\n' + ' */'
+      banner: '/**\n' + ' * <%= pkg.description %>\n' + 
+      ' * @version v<%= pkg.version %> - ' + 
+      '<%= grunt.template.today("yyyy-mm-dd") %>\n' + 
+      ' * @link <%= pkg.homepage %>\n' + 
+      ' * @license MIT License, http://www.opensource.org/licenses/MIT\n' + ' */'
     },
     coffee: {
       build: {
@@ -27,36 +24,36 @@ module.exports = function (grunt) {
       }
     },
     concat: {
-      basic: {
-        src: ['<banner:meta.banner>', 'common/*.js', 'modules/*/*/*.js'],
-        dest: 'build/<%= pkg.name %>.js'
+      build: {
+        src: ['<banner:meta.banner>', 'common/*.js'],
+        dest: '<%= builddir %>/<%= pkg.name %>.js'
       },
       ieshiv: {
         src: ['<banner:meta.banner>', 'common/ieshiv/*.js'],
-        dest: 'build/<%= pkg.name %>-ieshiv.js'
+        dest: '<%= builddir %>/<%= pkg.name %>-ieshiv.js'
       }
     },
     min: {
-      basic: {
-        src: ['<banner:meta.banner>', '<config:concat.basic.dest>'],
-        dest: 'build/<%= pkg.name %>.min.js'
+      build: {
+        src: ['<banner:meta.banner>', '<config:concat.build.dest>'],
+        dest: '<%= builddir %>/<%= pkg.name %>.min.js'
       },
       ieshiv: {
         src: ['<banner:meta.banner>', '<config:concat.ieshiv.dest>'],
-        dest: 'build/<%= pkg.name %>-ieshiv.min.js'
+        dest: '<%= builddir %>/<%= pkg.name %>-ieshiv.min.js'
       }
     },
     recess: {
-      basic: {
-        src: 'common/**/*.less',
-        dest: 'build/<%= pkg.name %>.css',
+      build: {
+        src: ['common/**/*.less'],
+        dest: '<%= builddir %>/<%= pkg.name %>.css',
         options: {
           compile: true
         }
       },
       min: {
-        src: '<config:recess.basic.dest>',
-        dest: 'build/<%= pkg.name %>.min.css',
+        src: '<config:recess.build.dest>',
+        dest: '<%= builddir %>/<%= pkg.name %>.min.css',
         options: {
           compress: true
         }
@@ -70,12 +67,64 @@ module.exports = function (grunt) {
     },
     watch: {
       files: ['modules/**/*.coffee', 'modules/**/*.js', 'common/**/*.js', 'templates/**/*.js'],
-      tasks: 'coffee concat:basic test'
+      tasks: 'coffee concat:build test'
+    }
+  });
+
+  //Get all the available modules into an array
+  var modules = {};
+  grunt.file.recurse('modules', function(abspath, rootdir, subdir, filename) {
+    var moduleDir;
+    //If number of / is 1, we know it's first in depth. eg filters/inflector, not filters/inflector/test
+    if (subdir.split('/').length === 2) {
+      moduleDir = rootdir + '/' + subdir;
+      modules[subdir] = {
+        js: grunt.file.expand(moduleDir + '/*.js'),
+        less: grunt.file.expand(moduleDir + '/*.less')
+      };
     }
   });
 
   // Default task.
-  grunt.registerTask('default', 'coffee concat min recess:basic recess:min test');
+  grunt.registerTask('default', 'coffee build test');
+
+  grunt.registerTask('build', 'build all or some of the angular-ui modules', function() {
+
+    var jsBuildFiles = grunt.config('concat.build.src');
+    var lessBuildFiles = grunt.config('recess.build.src');
+
+    function addModuleFiles(module) {
+      module.js.forEach(function(file) {
+        jsBuildFiles.push(file);
+      });
+      module.less.forEach(function(file) {
+        lessBuildFiles.push(file);
+      });
+    }
+
+    if (this.args.length === 0) {
+      //if no modules given as args, go to default: build all
+      for (var moduleName in modules) {
+        if (modules.hasOwnProperty(moduleName)) {
+          addModuleFiles(modules[moduleName]);
+        }
+      }
+    } else {
+      //if args are found, build given modules & build to custom folder
+      grunt.config('builddir', 'build/custom');
+      this.args.forEach(function(moduleName) {
+        if (modules[moduleName]) {
+          addModuleFiles(modules[moduleName]);
+        }
+      });
+    }
+
+    //Set config with our new file lists
+    grunt.config('concat.build.src', jsBuildFiles);
+    grunt.config('recess.build.src', lessBuildFiles);
+
+    grunt.task.run('concat min recess:build recess:min');
+  });
 
   grunt.registerTask('server', 'start testacular server', function () {
     //Mark the task as async but never call done, so the server stays up
@@ -103,14 +152,4 @@ module.exports = function (grunt) {
       }
     });
   });
-
-  grunt.registerTask('build', 'Build a custom angular-ui.js', function() {
-    var files = ['common/module.js'];
-
-    this.args.forEach(function(moduleName) {
-      if (modules[moduleName])
-        files = files.concat(modules[moduleName]);
-    });
-    grunt.file.write('build/custom/angular-ui.js', grunt.helper('concat', files));
-  });
 };