MAGETWO-55345: Grunt uses actual theme's list

Author: VladimirZaets

Gruntfile.js.sample

@@ -11,9 +11,13 @@ module.exports = function (grunt) {
 
     var _ = require('underscore'),
         path = require('path'),
-        themes = require('./dev/tools/grunt/tools/files-router').get('themes'),
+        filesRouter = require('./dev/tools/grunt/tools/files-router'),
         configDir = './dev/tools/grunt/configs',
-        tasks = grunt.file.expand('./dev/tools/grunt/tasks/*');
+        tasks = grunt.file.expand('./dev/tools/grunt/tasks/*'),
+        themes;
+
+        filesRouter.set('themes', 'dev/tools/grunt/configs/themes')
+        themes = filesRouter.get('themes')
 
     tasks = _.map(tasks, function(task){ return task.replace('.js', '') });
     tasks.push('time-grunt');

dev/tools/grunt/tools/files-router.js

@@ -5,22 +5,47 @@
 
 'use strict';
 
-module.exports = {
-    defaultConfig: {
-        'themes': 'dev/tools/grunt/configs/themes'
+var defaultConfig = {},
+
+    /**
+     * Generates full path to file.
+     *
+     * @param {String} path - relative path to file.
+     *
+     * @returns {String} Full path to file
+     */
+    getFullPath = function (path) {
+        return process.cwd() + '/' + path;
+    },
+
+    /**
+     * Returns file.
+     *
+     * @param {String} path - relative path to file.
+     *
+     * @returns {Object|Null} File or NULL
+     */
+    getFile = function (path) {
+        try {
+            return require(getFullPath(path));
+        } catch (error) {
+            return null;
+        }
     },
 
     /**
      * Immediately invoked function.
      * Loads user config file.
      */
-    userConfig: (function () {
+    userConfig = (function () {
         try {
             return require(process.cwd() + '/grunt-config');
         } catch (error) {
             return null;
         }
-    })(),
+    })();
+
+module.exports = {
 
     /**
      * Loads file.
@@ -29,32 +54,30 @@ module.exports = {
      *      From default config with ".loc" suffix ;
      *      From default config;
      *
-     * @returns themes file or error
+     * @param {String} alias
+     *
+     * @returns {Object} themes file or error
      */
-    get: function (file) {
-        if (this.userConfig && this.userConfig[file]) {
-            return require(this.getFullPath(this.userConfig[file]));
+    get: function (alias) {
+        var tmp;
+
+        if (userConfig && userConfig[alias]) {
+            return require(getFullPath(userConfig[alias]));
+        } else if (tmp = getFile(defaultConfig[alias] + '.loc') ||  getFile(defaultConfig[alias])) {
+            return tmp;
         } else {
-            try {
-                return require(this.getFullPath(this.defaultConfig[file] + '.loc'));
-            } catch (error) {
-                try {
-                    return require(this.getFullPath(this.defaultConfig[file]));
-                } catch (error) {
-                    throw  error;
-                }
-            }
+            throw new Error('Cannot find file. Alias "' + alias + '" not set. ' +
+                'Use "filesRouter.set" method to set it.').stack;
         }
     },
 
     /**
-     * Generates full path to file.
+     * Sets file alias.
      *
-     * @param {String} path - relative path to file.
-     *
-     * @returns {String} Full path to file
+     * @param {String} alias
+     * @param {String} path
      */
-    getFullPath: function (path) {
-        return process.cwd() + '/' + path;
+    set: function (alias, path) {
+        defaultConfig[alias] = path;
     }
 };