Skip to content

Wrong directory name #87

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 27, 2016
Merged

Wrong directory name #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f189ed2
eslint fixes
zigomir Apr 27, 2016
eb2d921
Override project name with destination directory name.
zigomir Apr 27, 2016
9474bdb
More explicit name.
zigomir Apr 27, 2016
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .eslintrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
{
"extends": "standard",
"env": {
"mocha": true,
"node": true
},
"rules": {
"arrow-parens": [2, "as-needed"]
}
Expand Down
4 changes: 3 additions & 1 deletion lib/generate.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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(), { destDirName: name })
// avoid handlebars escaping HTML
data.noEscape = true
metalsmith
Expand Down
6 changes: 3 additions & 3 deletions test/e2e/test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -25,7 +25,7 @@ function monkeyPatchInquirer(answers) {
}
_answers[key] = answers[key]
cb(_answers)
};
}
}

describe('vue-cli', () => {
Expand Down Expand Up @@ -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()
})
})
Expand Down