fix(config.js) make the require the first import on every module. Fix the require error for config in InstallMenu.

Author: 3pchrisd

lib/cli/initialiseMenu.js

@@ -41,7 +41,8 @@ function promptConfig(callback) {
     ['description', 'Do you want to specify a short description of this project?'],
     ['javascriptVersion', 'What version of JavaScript do you want to use?',[compileTargets.ES6, compileTargets.ES5]],
     ['serverHttpPort', 'What http port do you want for the local development server?', PORT]
-  ]
+  ];
+
   var menu = new Menu();
   ITEMS.forEach(function(item) {
     menu.askText.apply(menu, item); // @impaler - if this is the only use of Menu should we not inline this call?

lib/cli/installMenu.js

@@ -5,7 +5,6 @@ var inquirer      = require('inquirer'),
     fs            = require('fs');
 
 var ideTemplate   = require('ide-template'),
-    generatorUtil = require('../generator/generator').util,
     webStorm      = require('../../templates/webStorm');
 
 require('shelljs/global');
@@ -45,6 +44,7 @@ function promptFileTemplates() {
       return value.toLowerCase();
     }
   };
+
   function handleMenu(answer) {
     var templateFolder = webStorm.copyFileTemplates(answer.choice);
     console.log([
@@ -54,7 +54,7 @@ function promptFileTemplates() {
     ].join('\n'));
   }
   inquirer.prompt(menuPrompt, handleMenu);
-};
+}
 
 function promptExternalTools() {
   var externalToolPath = path.join(ideTemplate.webStorm.userPreferences(), 'tools', 'Angularity.xml');
@@ -72,6 +72,7 @@ function promptExternalTools() {
       return value.toLowerCase();
     }
   };
+
   function handleMenu(answer) {
     console.log('If you have WebStorm open, please restart it.');
     switch(answer.choice) {
@@ -95,18 +96,8 @@ function promptExternalTools() {
     }
   }
   inquirer.prompt(menuPrompt, handleMenu);
-};
-
-function initGlobalConfig() {
-  console.log('\nWelcome to Angularity, \ndefault settings are being written to a global configuration.\n');
-  console.log('\nTo change your defaults edit your ' + ideTemplate.util.HOME() + '/.angularity file');
-
-  //TODO check for latest version of angularity global install
-
-  generatorUtil.createAngularityGlobalConfig();
-};
+}
 
 module.exports = {
-  prompt:           prompt,
-  initGlobalConfig: initGlobalConfig
+  prompt:           prompt
 };

lib/cli/mainMenu.js

@@ -8,8 +8,8 @@ var inquirer = require('inquirer'),
     gulpUtil = require('gulp-util'),
     fs       = require('fs');
 
-var generatorUtil  = require('../generator/generator').util,
-    config         = require('../config/config'),
+var config         = require('../config/config'), // order is important for the global config.json
+    generatorUtil  = require('../generator/generator').util,
     initialiseMenu = require('./initialiseMenu'),
     generatorMenu  = require('./generatorMenu'),
     installMenu    = require('./installMenu');

lib/config/config.js

@@ -18,7 +18,8 @@ var fs     = require('fs'),
 
 var installMenu    = require('./../cli/installMenu'),
     templateUtil   = require('ide-template').util,
-    configDefaults = require('./defaults');
+    configDefaults = require('./defaults'),
+    generatorUtil  = require('../generator/generator').util;
 
 var CONFIG_PATH_GLOBAL  = path.join(templateUtil.HOME(), '.angularity'),
     CONFIG_PATH_PROJECT = path.join(process.cwd(), 'angularity.json'),
@@ -165,7 +166,6 @@ function configGetterFor(name) {
     }
   }
 }
-
 function Config() {
   var globalValidator = getValidator({
     serverHttpPort   : 'number',
@@ -232,7 +232,7 @@ Config.prototype.getWebstormExecutablePath = configGetterFor('webstormExecutable
  */
 var globalConfigPresent = fs.existsSync(path.join(templateUtil.HOME(), '.angularity'));
 if (!globalConfigPresent) {
-  installMenu.initGlobalConfig();
+    generatorUtil.createAngularityGlobalConfig();
 }
 
 module.exports = new Config();

lib/config/streams.js

@@ -5,8 +5,8 @@ var gulp       = require('gulp'),
     combined   = require('combined-stream'),
     slash      = require('gulp-slash');
 
-var bowerFiles = require('../inject/bower-files'),
-    config     = require('./config');
+var config     = require('./config'),
+    bowerFiles = require('../inject/bower-files');
 
 var CONSOLE_WIDTH = config.getConsoleWidth();
 

lib/generator/generator.js

@@ -21,7 +21,7 @@ var projects = [];
  * by the ci for generating projects.
  * @param name
  */
- function generateProject(name) {
+function generateProject(name) {
   if (listProjects().indexOf(name) >= 0) {
     var generator = require('./generator');
     var project = generator.createProject(name);
@@ -59,6 +59,9 @@ function projectsPath(suffix) {
  * @param override template context
  */
 function createAngularityGlobalConfig(override) {
+  console.log('\nWelcome to Angularity, \ndefault settings are being written to a global configuration.\n');
+  console.log('\nTo change your defaults edit your ' + ideTemplate.util.HOME() + '/.angularity file');
+
   var configTemplate = fs.readFileSync(templatesPath('.angularity'), 'utf8');
   var defaultContext = configDefaults.globalConfig;
 
@@ -70,11 +73,10 @@ function createAngularityGlobalConfig(override) {
   try {
     configFileContent = template(configTemplate, defaultContext)
   } catch (error) {
-// @implaler - what is to be achieved here?
-    console.error('createAngularityGlobalConfig()');
+    console.error('createAngularityGlobalConfig() the config template for the global angularity file is invalid.');
     throw error;
   }
-  fs.writeFileSync(path.join(ideTemplate.HOME(), '.angularity'), configFileContent, 'utf8');
+  fs.writeFileSync(path.join(ideTemplate.util.HOME(), '.angularity'), configFileContent, 'utf8');
 }
 
 /**
@@ -95,7 +97,7 @@ function createAngularityProjectConfig(destination, override) {
   try {
     configFileContent = template(configTemplate, defaultContext)
   } catch (error) {
-    console.error('createAngularityProjectConfig()');
+    console.error('createAngularityGlobalConfig() the config template for the angularity project file is invalid.');
     throw error;
   }
 

tasks/css.js

@@ -5,8 +5,8 @@ var gulp        = require('gulp'),
     runSequence = require('run-sequence'),
     bourbon     = require('node-bourbon');
 
-var nodeSass = require('../lib/build/node-sass'),
-    config   = require('../lib/config/config'),
+var config   = require('../lib/config/config'),
+    nodeSass = require('../lib/build/node-sass'),
     hr       = require('../lib/util/hr'),
     streams  = require('../lib/config/streams'),
     sass;

tasks/default.js

@@ -1,9 +1,10 @@
 'use strict';
 
 var gulp        = require('gulp'),
-    runSequence = require('run-sequence'),
-    hr          = require('../lib/util/hr'),
-    config      = require('../lib/config/config');
+    runSequence = require('run-sequence');
+
+var config      = require('../lib/config/config'),
+    hr          = require('../lib/util/hr');
 
 var CONSOLE_WIDTH = config.getConsoleWidth();
 

tasks/html.js

@@ -9,10 +9,10 @@ var gulp        = require('gulp'),
     rimraf      = require('gulp-rimraf'),
     runSequence = require('run-sequence');
 
-var injectAdjacent = require('../lib/inject/adjacent-files'),
+var config         = require('../lib/config/config'),
+    injectAdjacent = require('../lib/inject/adjacent-files'),
     bowerFiles     = require('../lib/inject/bower-files'),
     hr             = require('../lib/util/hr'),
-    config         = require('../lib/config/config'),
     streams        = require('../lib/config/streams');
 
 var CONSOLE_WIDTH = config.getConsoleWidth();

tasks/javascript.js

@@ -8,12 +8,11 @@ var gulp        = require('gulp'),
     to5ify      = require('6to5ify'),
     ngAnnotate  = require('browserify-ngannotate');
 
-var karma          = require('../lib/test/karma'),
+var config         = require('../lib/config/config'),
+    karma          = require('../lib/test/karma'),
     jsHintReporter = require('../lib/build/jshint-reporter'),
     browserify     = require('../lib/build/browserify'),
-    config         = require('../lib/config/config'),
     hr             = require('../lib/util/hr'),
-    config         = require('../lib/config/config'),
     streams        = require('../lib/config/streams');
 
 var CONSOLE_WIDTH = config.getConsoleWidth();