Metalsmith and inquirer

* Use inquirer and metalsmith instead of Khaos and prompt-for.

* This should work.

* Reuse name var.

* Just use dest to preserve current vue behaviour.

Document .source option.

Author: zigomir

README.md

@@ -59,7 +59,7 @@ You can also create your own template from scratch:
 
 - All template files will be piped through Handlebars for simple templating - `vue-cli` will automatically infer the prompts based on `{{}}` interpolations found in the files.
 
-- A template repo **may** have a `meta.json` file that provides a schema for the prompts. The schema will be passed to [prompt-for](https://github.com/segmentio/prompt-for#prompt-for) as options. See [example](https://github.com/vuejs-templates/webpack/blob/master/meta.json).
+- A template repo **may** have a `meta.json` file that provides a schema for the prompts. The schema will be passed to [inquirer](https://github.com/SBoudrias/Inquirer.js). See [example](https://github.com/vuejs-templates/webpack/blob/master/meta.json). We only support `string` and `boolean` types at the moment.
 
 While developing your template you can test via `vue-cli` with:
 

bin/vue-init

@@ -1,15 +1,17 @@
 #!/usr/bin/env node
 
-var Khaos = require('khaos-patched')
 var metadata = require('read-metadata')
+var async = require('async')
+var Metalsmith = require('metalsmith')
+var render = require('consolidate').handlebars.render
 var download = require('download-git-repo')
 var program = require('commander')
 var exists = require('fs').existsSync
 var path = require('path')
 var rm = require('rimraf').sync
 var uid = require('uid')
 var chalk = require('chalk')
-var prompt = require('prompt-for-patched')
+var inquirer = require('inquirer')
 var logger = require('../lib/logger')
 var getGitUser = require('../lib/git-user')
 var Spinner = require('../lib/spinner')
@@ -62,21 +64,17 @@ var hasSlash = template.indexOf('/') > -1
 var rawName = program.args[1]
 var inPlace = !rawName || rawName === '.'
 var name = inPlace ? path.relative('../', process.cwd()) : rawName
-var dir = program.directory
 var to = path.resolve(rawName || '.')
 var clone = program.clone || false
 
 if (exists(to)) {
-  prompt({
-    ok: {
-      type: 'boolean',
-      default: true,
-      label: inPlace
-        ? 'Generate project in current directory?'
-        : 'Target directory exists. Continue?'
-    }
-  }, function (err, answers) {
-    if (err) throw err
+  inquirer.prompt([{
+    type: 'confirm',
+    message: inPlace
+      ? 'Generate project in current directory?'
+      : 'Target directory exists. Continue?',
+    name: 'ok'
+  }], function (answers) {
     if (answers.ok) {
       run()
     }
@@ -119,6 +117,66 @@ function run () {
   }
 }
 
+var promptInquirerTypeMapping = {
+  string: 'input',
+  boolean: 'confirm'
+}
+
+/**
+ * Prompt plugin.
+ *
+ * @param {Object} files
+ * @param {Metalsmith} metalsmith
+ * @param {Function} done
+ */
+
+function ask (files, metalsmith, done) {
+  var opts = options(metalsmith._directory + '/..')
+
+  var prompts = Object.keys(opts.schema)
+  var metalsmithMetadata = metalsmith.metadata()
+
+  async.eachSeries(prompts, run, done)
+
+  function run(key, done) {
+    var prompt = opts.schema[key]
+
+    inquirer.prompt([{
+      type: promptInquirerTypeMapping[prompt.type],
+      name: key,
+      message: prompt.label || key,
+      default: prompt.default
+    }], function (answers) {
+      metalsmithMetadata[key] = answers[key]
+      done()
+    })
+  }
+}
+
+/**
+ * Template in place plugin.
+ *
+ * @param {Object} files
+ * @param {Metalsmith} metalsmith
+ * @param {Function} done
+ */
+
+function renderTemplateFiles (files, metalsmith, done) {
+  var keys = Object.keys(files)
+  var metalsmithMetadata = metalsmith.metadata()
+
+  async.each(keys, run, done)
+
+  function run(file, done){
+    var str = files[file].contents.toString()
+    render(str, metalsmithMetadata, function (err, res) {
+      if (err) return done(err)
+      files[file].contents = new Buffer(res)
+      done()
+    });
+  }
+}
+
 /**
  * Generate a template given a `src` and `dest`.
  *
@@ -129,11 +187,18 @@ function run () {
 
 function generate (src, dest, fn) {
   var template = path.join(src, 'template')
-  var khaos = new Khaos(template)
-  var opts = options(src)
 
-  khaos.schema(opts.schema)
-  khaos.generate(dest, fn)
+  Metalsmith(template)
+    .use(ask)
+    .use(renderTemplateFiles)
+    .clean(false)
+    .source('.') // start from template root instead of `./src` which is Metalsmith's default for `source`
+    .destination(dest)
+    .build(function (err) {
+      if (err) throw err
+
+      fn()
+    })
 }
 
 /**

package.json

@@ -1,14 +1,11 @@
 {
   "name": "vue-cli",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "description": "A simple CLI for scaffolding Vue.js projects.",
   "preferGlobal": true,
   "bin": {
     "vue": "bin/vue"
   },
-  "scripts": {
-    "test": "mocha"
-  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/vuejs/vue-cli.git"
@@ -26,11 +23,14 @@
   "homepage": "https://github.com/vuejs/vue-cli#readme",
   "main": "lib/index.js",
   "dependencies": {
+    "async": "^2.0.0-rc.2",
     "chalk": "^1.1.1",
     "commander": "^2.9.0",
+    "consolidate": "^0.14.0",
     "download-git-repo": "^0.1.1",
-    "khaos-patched": "^0.9.3",
-    "prompt-for-patched": "^1.1.3",
+    "handlebars": "^4.0.5",
+    "inquirer": "^0.12.0",
+    "metalsmith": "^2.1.0",
     "read-metadata": "^1.0.0",
     "request": "^2.67.0",
     "rimraf": "^2.5.0",