From f189ed2bdfbd4e26797d335372b8cba1758f9a1b Mon Sep 17 00:00:00 2001
From: zigomir <zigomir@gmail.com>
Date: Tue, 26 Apr 2016 21:00:52 -0700
Subject: [PATCH 1/3] eslint fixes

---
 .eslintrc        | 4 ++++
 test/e2e/test.js | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.eslintrc b/.eslintrc
index 9448499f38..baca0c150c 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,5 +1,9 @@
 {
   "extends": "standard",
+  "env": {
+    "mocha": true,
+    "node": true
+  },
   "rules": {
     "arrow-parens": [2, "as-needed"]
   }
diff --git a/test/e2e/test.js b/test/e2e/test.js
index b7b2ee883c..01baf109a9 100644
--- a/test/e2e/test.js
+++ b/test/e2e/test.js
@@ -13,7 +13,7 @@ const generate = require('../../lib/generate')
 const MOCK_TEMPLATE_REPO_PATH = './test/e2e/mock-template-repo'
 const MOCK_TEMPLATE_BUILD_PATH = path.resolve('./test/e2e/mock-template-build')
 
-function monkeyPatchInquirer(answers) {
+function monkeyPatchInquirer (answers) {
   // monkey patch inquirer
   inquirer.prompt = (questions, cb) => {
     const key = questions[0].name
@@ -25,7 +25,7 @@ function monkeyPatchInquirer(answers) {
     }
     _answers[key] = answers[key]
     cb(_answers)
-  };
+  }
 }
 
 describe('vue-cli', () => {
@@ -95,7 +95,7 @@ describe('vue-cli', () => {
     var invalidName = extend({}, answers, {name: 'INVALID-NAME'})
     monkeyPatchInquirer(invalidName)
     generate('INVALID-NAME', MOCK_TEMPLATE_REPO_PATH, MOCK_TEMPLATE_BUILD_PATH, err => {
-      expect(err).to.be.an('error');
+      expect(err).to.be.an('error')
       done()
     })
   })

From eb2d921294fce52f4365bd4dce07506b4e93ef30 Mon Sep 17 00:00:00 2001
From: zigomir <zigomir@gmail.com>
Date: Tue, 26 Apr 2016 21:15:18 -0700
Subject: [PATCH 2/3] Override project name with destination directory name.

---
 lib/generate.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/generate.js b/lib/generate.js
index 508d4fb414..66b32093db 100644
--- a/lib/generate.js
+++ b/lib/generate.js
@@ -6,6 +6,7 @@ var path = require('path')
 var getOptions = require('./options')
 var ask = require('./ask')
 var filter = require('./filter')
+var extend = Object.assign || require('util')._extend
 
 // register hendlebars helper
 Handlebars.registerHelper('if_eq', function (a, b, opts) {
@@ -32,7 +33,8 @@ Handlebars.registerHelper('unless_eq', function (a, b, opts) {
 module.exports = function generate (name, src, dest, done) {
   var opts = getOptions(name, src)
   var metalsmith = Metalsmith(path.join(src, 'template'))
-  var data = metalsmith.metadata()
+  // extract all gathered data from user and override project name with destination directory name
+  var data = extend({}, metalsmith.metadata(), { name: name })
   // avoid handlebars escaping HTML
   data.noEscape = true
   metalsmith

From 9474bdb58bd8d40dfbb096f98d66385e681cbb0d Mon Sep 17 00:00:00 2001
From: zigomir <zigomir@gmail.com>
Date: Tue, 26 Apr 2016 22:10:57 -0700
Subject: [PATCH 3/3] More explicit name.

---
 lib/generate.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/generate.js b/lib/generate.js
index 66b32093db..733ce5b96a 100644
--- a/lib/generate.js
+++ b/lib/generate.js
@@ -34,7 +34,7 @@ module.exports = function generate (name, src, dest, done) {
   var opts = getOptions(name, src)
   var metalsmith = Metalsmith(path.join(src, 'template'))
   // extract all gathered data from user and override project name with destination directory name
-  var data = extend({}, metalsmith.metadata(), { name: name })
+  var data = extend({}, metalsmith.metadata(), { destDirName: name })
   // avoid handlebars escaping HTML
   data.noEscape = true
   metalsmith