From ef99ee73050dc30ca4fc1cc41809b883b3bdd372 Mon Sep 17 00:00:00 2001
From: zigomir <zigomir@gmail.com>
Date: Thu, 11 Aug 2016 18:27:06 -0700
Subject: [PATCH] Support for official templates to specify specific branch.

Otherwise it would fail inside checkDistBranch function which expects
body to be an array.

Also fix linters and test.
---
 bin/vue-init     | 6 +++++-
 package.json     | 2 +-
 test/e2e/test.js | 4 ++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/bin/vue-init b/bin/vue-init
index a08fcf5a48..8d3dd22d4c 100755
--- a/bin/vue-init
+++ b/bin/vue-init
@@ -101,7 +101,11 @@ function run () {
       if (!hasSlash) {
         // use official templates
         template = 'vuejs-templates/' + template
-        checkDistBranch(template, downloadAndGenerate)
+        if (template.indexOf('#') !== -1) {
+          downloadAndGenerate(template)
+        } else {
+          checkDistBranch(template, downloadAndGenerate)
+        }
       } else {
         downloadAndGenerate(template)
       }
diff --git a/package.json b/package.json
index 2881a884ab..ebf81175c9 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
   "main": "lib/index.js",
   "scripts": {
     "test": "npm run lint && npm run e2e",
-    "lint": "eslint test/test.js lib bin/* --env mocha",
+    "lint": "eslint test/e2e/test.js lib bin/* --env mocha",
     "e2e": "rimraf test/e2e/mock-template-build/*.* && cross-env BABEL_ENV=development mocha test/e2e/test.js --slow 1000 --compilers js:babel-core/register"
   },
   "dependencies": {
diff --git a/test/e2e/test.js b/test/e2e/test.js
index 4c01bfea65..85ffeadb9d 100644
--- a/test/e2e/test.js
+++ b/test/e2e/test.js
@@ -50,7 +50,7 @@ describe('vue-cli', () => {
   })
 
   it('read metadata from js', done => {
-    const meta = metadata('test-pkg', __dirname + '/mock-metadata-repo-js')
+    const meta = metadata('test-pkg', path.join(__dirname, '/mock-metadata-repo-js'))
     expect(meta).to.be.an('object')
     expect(meta.prompts).to.have.property('description')
     done()
@@ -58,7 +58,7 @@ describe('vue-cli', () => {
 
   it('helpers', done => {
     monkeyPatchInquirer(answers)
-    const buildPath = __dirname + '/mock-metadata-repo-js'
+    const buildPath = path.join(__dirname, '/mock-metadata-repo-js')
     generate('test', buildPath, MOCK_TEMPLATE_BUILD_PATH, err => {
       if (err) done(err)
       const contents = fs.readFileSync(`${MOCK_TEMPLATE_BUILD_PATH}/readme.md`, 'utf-8')