Merge branch 'develop'

# Conflicts:
#	package.json

Author: hjeti

README.md

@@ -4,7 +4,7 @@ A CLI generator for Vue components, pages and store modules
 ## Install
 
 ```console
-$ npm install vue-generator -g
+$ npm install -g vue-generator
 ```
 
 ## Usage

bin/vue-generator

@@ -9,10 +9,11 @@ program
   .version(require('../package').version)
   .usage('<command> [options]')
   .command('wizard', 'Start generator wizard', {isDefault: true})
+  .command('init', 'Create local .vuegenerator file with settings')
   .command('component', 'Create component')
   .command('store', 'Create store module')
   .command('page', 'Create page')
-  .command('reset', 'Reset settings')
+  .command('reset', 'Reset global settings')
   .command('settings', 'Set or display settings')
   .command('template', 'Open default template directory to edit default templates')
   .parse(process.argv);

bin/vue-generator-init

@@ -0,0 +1,9 @@
+#!/usr/bin/env node
+
+const program = require('commander');
+const init = require('../src/init');
+
+program
+  .parse(process.argv);
+
+init();

bin/vue-generator-reset

@@ -9,5 +9,12 @@ program
 
 Settings.resetSettings();
 
-console.log(chalk.green('Settings are reset to defaults'));
-console.log(Settings.getSettings());
+console.log();
+console.log(chalk.green('Global settings are reset to defaults.'));
+console.log();
+
+console.log(chalk.green('Global settings:'));
+
+Settings.logSettings(Settings.getSettings({}, true));
+
+

bin/vue-generator-settings

@@ -9,12 +9,24 @@ program
   .option('-s, --store-destination <destination>', 'Set store default destination')
   .option('-c, --component-destination <destination>', 'Set component default destination')
   .option('-t, --template-path <destination>', 'Set default template directory')
-  .option('-l, --log', 'Log settings')
+  .option('-g, --global', 'Set global settings')
+  .option('-l, --log', 'Log global or local settings depending on global flag')
   .parse(process.argv);
 
 if (program.log) {
-  console.log(chalk.green('Settings:'));
-  console.log(Settings.getSettings());
+  console.log();
+
+  if(program.global)
+  {
+    console.log(chalk.green('Global settings:'));
+    Settings.logSettings(Settings.getSettings({}, true));
+  }
+  else
+  {
+    console.log(chalk.green('Local settings:'));
+    Settings.logSettings(Settings.getLocalSettings());
+  }
+
   process.exit(1);
 }
 
@@ -36,7 +48,28 @@ if (program.templatePath) {
   settings['templatePath'] = program.templatePath;
 }
 
-Settings.setSettings(settings);
+if(Object.keys(settings).length == 0)
+{
+  console.log();
+  console.log(chalk.green(`Settings:`));
+  Settings.logSettings(Settings.getSettings());
+  process.exit(1);
+}
+
+if(program.global){
+  Settings.setGlobalSettings(settings);
+
+  console.log();
+  console.log(chalk.green('Global settings updated:'));
+  Settings.logSettings(Settings.getSettings({}, true));
+}
+else {
+  const updatedSettings = Object.assign({}, Settings.getLocalSettings(), settings);
+  Settings.setLocalSettings(updatedSettings);
+
+  console.log();
+  console.log(chalk.green('Local settings updated:'));
+  Settings.logSettings(updatedSettings);
+}
+
 
-console.log(chalk.green('Settings updated:'));
-console.log(Settings.getSettings());

package.json

@@ -12,14 +12,16 @@
     "vue-generator-settings": "bin/vue-generator-settings",
     "vue-generator-store": "bin/vue-generator-store",
     "vue-generator-template": "bin/vue-generator-template",
+    "vue-generator-init": "bin/vue-generator-init",
     "vg": "bin/vue-generator",
     "vg-wizard": "bin/vue-generator-wizard",
     "vg-component": "bin/vue-generator-component",
     "vg-page": "bin/vue-generator-page",
     "vg-reset": "bin/vue-generator-reset",
     "vg-settings": "bin/vue-generator-settings",
     "vg-store": "bin/vue-generator-store",
-    "vg-template": "bin/vue-generator-template"
+    "vg-template": "bin/vue-generator-template",
+    "vg-init": "bin/vue-generator-init"
   },
   "author": "Hendrik-Jan de Harder",
   "license": "MIT",
@@ -44,6 +46,7 @@
     "to-pascal-case": "^1.0.0",
     "to-slug-case": "^1.0.0",
     "to-snake-case": "^1.0.0",
+    "to-space-case": "^1.0.0",
     "user-settings": "^0.1.5"
   },
   "engines": {

src/generateDirect.js

@@ -24,7 +24,7 @@ module.exports = function generateDirect(type, destinationSettingsKey) {
 
 
   if (!componentName) {
-    console.error(chalk.red('no name given'));
+    console.error(chalk.red('No name given'));
     process.exit(1);
   }
 

src/init.js

@@ -0,0 +1,21 @@
+const Settings = require('./settings');
+const inquirer = require('inquirer');
+const Questions = require('./questions');
+const chalk = require('chalk');
+
+module.exports = function init() {
+  let settings = Settings.getSettings();
+
+  const questions = Questions.getSettingQuestions(settings);
+
+  inquirer.prompt(questions).then((answers) => {
+    Settings.setLocalSettings(answers);
+
+    console.log();
+    console.log(chalk.green('Local settings:'));
+
+    Settings.logSettings(Settings.getLocalSettings());
+  });
+};
+
+

src/questions.js

@@ -2,8 +2,9 @@ const templateType = require('./templateType');
 const wizardType = require('./wizardType');
 const path = require('path');
 const fs = require('fs');
+const toSpaceCase = require('to-space-case');
 
-module.exports = function questions(type, settings, name) {
+exports.getGeneratorQuestions = function (type, settings, name) {
   let questions;
 
   switch (type) {
@@ -28,6 +29,19 @@ module.exports = function questions(type, settings, name) {
   return questions;
 };
 
+exports.getSettingQuestions = function (settings) {
+  return Object.keys(settings).map(key => askSetting(key, settings[key]));
+};
+
+function askSetting(key, defaultValue) {
+  return {
+    type: 'input',
+    name: key,
+    message: toSpaceCase(key),
+    default: defaultValue || ''
+  }
+}
+
 function askType() {
   return {
     type: 'list',
@@ -42,7 +56,13 @@ function askName(defaultName) {
     type: 'input',
     name: 'name',
     message: 'What name do you want to use?',
-    default: defaultName || ''
+    default: defaultName || '',
+    filter(value){
+      return value.trim();
+    },
+    validate(value){
+      return value.trim().length == 0 ? 'No name given' : true;
+    }
   }
 }
 

src/settings.js

@@ -1,4 +1,9 @@
-const userSettings = require('user-settings').file('.vuegenerator');
+const settingsFile = '.vuegenerator';
+
+const userSettings = require('user-settings').file(settingsFile);
+const fs = require('fs');
+const path = require('path');
+const chalk = require('chalk');
 
 const defaultSettings = {
   pageDestination: './src/page/',
@@ -7,19 +12,48 @@ const defaultSettings = {
   templatePath: ''
 };
 
-exports.getSettings = function (overrides = {}) {
-  return Object.assign({}, defaultSettings, getUserSettings(), overrides);
+exports.getSettings = function (overrides = {}, ignoreLocalSettings = false) {
+  const localSettings = ignoreLocalSettings ? {} : this.getLocalSettings();
+
+  return Object.assign({}, defaultSettings, this.getUserSettings(), localSettings, overrides);
 };
 
 exports.resetSettings = function () {
   Object.keys(defaultSettings).forEach(key => userSettings.unset(key));
 };
 
-exports.setSettings = function (settings) {
+exports.setGlobalSettings = function (settings) {
   Object.keys(settings).forEach(key => userSettings.set(key, settings[key]));
 };
 
-function getUserSettings() {
+exports.setLocalSettings = function (settings) {
+  fs.writeFileSync(path.resolve(settingsFile), JSON.stringify(settings, null, 2));
+};
+
+exports.hasLocalSettings = function () {
+  return fs.existsSync(path.resolve(settingsFile));
+};
+
+exports.getLocalSettings = function () {
+  if (this.hasLocalSettings()) {
+    const fileContent = fs.readFileSync(path.resolve(settingsFile), {encoding: 'utf-8'});
+
+    let settings;
+
+    try {
+      settings = JSON.parse(fileContent);
+    } catch (e) {
+      console.error(chalk.red(`Error parsing local ${settingsFile} file.`));
+      process.exit(1);
+    }
+
+    return settings;
+  }
+
+  return {};
+};
+
+exports.getUserSettings = function () {
   return Object.keys(defaultSettings).reduce((settings, key) => {
     const setting = userSettings.get(key);
 
@@ -29,12 +63,11 @@ function getUserSettings() {
 
     return settings;
   }, {});
-}
-
-function getLocalSettings() {
-
-}
+};
 
-function saveSettingsLocal(overrides) {
+exports.logSettings = function (settings) {
+  Object.keys(settings).forEach((key) => {
+    console.log(`${chalk.bold(key)}: '${settings[key]}'`);
+  });
+};
 
-}