Support for official templates to specify specific branch. (vuejs#145)

zigomir · yyx990803 · commit 2e4ea85665d7 · 2016-08-11T23:27:41.000-05:00
Otherwise it would fail inside checkDistBranch function which expects
body to be an array.

Also fix linters and test.
diff --git 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
@@ -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
@@ -50,15 +50,15 @@ 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()
   })
 
   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')
