MAGETWO-55345: Grunt uses actual theme's list

Author: VladimirZaets

Gruntfile.js.sample

@@ -11,7 +11,7 @@ module.exports = function (grunt) {
 
     var _ = require('underscore'),
         path = require('path'),
-        themes = require('./dev/tools/grunt/tools/files-router').getThemes(),
+        themes = require('./dev/tools/grunt/tools/files-router').get('themes'),
         configDir = './dev/tools/grunt/configs',
         tasks = grunt.file.expand('./dev/tools/grunt/tasks/*');
 

dev/tools/grunt/configs/clean.js

@@ -5,7 +5,7 @@
 
 'use strict';
 
-var themes = require('../tools/files-router').getThemes(),
+var themes = require('../tools/files-router').get('themes'),
     _      = require('underscore');
 
 var themeOptions = {};

dev/tools/grunt/configs/combo.js

@@ -5,7 +5,7 @@
 
 'use strict';
 
-var theme = require('../tools/files-router').getThemes(),
+var theme = require('../tools/files-router').get('themes'),
     path = require('./path');
 
 /**

dev/tools/grunt/configs/exec.js

@@ -6,7 +6,7 @@
 'use strict';
 
 var combo = require('./combo'),
-    themes = require('../tools/files-router').getThemes(),
+    themes = require('../tools/files-router').get('themes'),
     _      = require('underscore');
 
 var themeOptions = {};

dev/tools/grunt/configs/less.js

@@ -6,7 +6,7 @@
 'use strict';
 
 var combo  = require('./combo'),
-    themes = require('../tools/files-router').getThemes(),
+    themes = require('../tools/files-router').get('themes'),
     _      = require('underscore');
 
 var themeOptions = {};

dev/tools/grunt/configs/watch.js

@@ -6,7 +6,7 @@
 'use strict';
 
 var combo  = require('./combo'),
-    themes = require('../tools/files-router').getThemes(),
+    themes = require('../tools/files-router').get('themes'),
     _      = require('underscore');
 
 var themeOptions = {};

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

@@ -23,23 +23,23 @@ module.exports = {
     })(),
 
     /**
-     * Loads "themes" file.
+     * Loads file.
      * Load priority:
      *      From user config;
      *      From default config with ".loc" suffix ;
      *      From default config;
      *
      * @returns themes file or error
      */
-    getThemes: function () {
-        if (this.userConfig && this.userConfig.themes) {
-            return require(this.getFullPath(this.userConfig.themes));
+    get: function (file) {
+        if (this.userConfig && this.userConfig[file]) {
+            return require(this.getFullPath(this.userConfig[file]));
         } else {
             try {
-                return require(this.getFullPath(this.defaultConfig.themes + '.loc'));
+                return require(this.getFullPath(this.defaultConfig[file] + '.loc'));
             } catch (error) {
                 try {
-                    return require(this.getFullPath(this.defaultConfig.themes));
+                    return require(this.getFullPath(this.defaultConfig[file]));
                 } catch (error) {
                     throw  error;
                 }