embarklabs
/
embark
mirror of https://github.com/embarklabs/embark.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

refactor install template code

This commit is contained in:
Iuri Matias 2018-07-06 11:52:47 +03:00
parent 483a0b01e1
commit 1600150c2b
1 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
lib/cmds/template_generator.js
View File

@ -7,8 +7,10 @@ class TemplateGenerator {
} }
downloadAndGenerate(uri, destinationFolder, name) { downloadAndGenerate(uri, destinationFolder, name) {
const self = this;
let {url, filePath} = this.getExternalProject(uri); let {url, filePath} = this.getExternalProject(uri);
let tmpFilePath = fs.tmpDir(filePath); let tmpFilePath = fs.tmpDir(filePath);
console.log(__('Installing Template from ' + uri + '....').green);
fs.mkdirpSync(utils.dirname(tmpFilePath)); fs.mkdirpSync(utils.dirname(tmpFilePath));
utils.downloadFile(url, tmpFilePath, () => { utils.downloadFile(url, tmpFilePath, () => {
@ -22,29 +24,20 @@ class TemplateGenerator {
file.path = utils.joinPath(...fixed_path); file.path = utils.joinPath(...fixed_path);
return file; return file;
} }
}).then(() => {
self.installTemplate(fspath, name, true);
}); });
}); });
} }
generate(destinationFolder, name) { generate(destinationFolder, name) {
let templatePath = fs.embarkPath(utils.joinPath('templates', this.templateName));
console.log(__('Initializing Embark Template....').green); console.log(__('Initializing Embark Template....').green);
let templatePath = fs.embarkPath(utils.joinPath('templates', this.templateName));
let fspath = utils.joinPath(destinationFolder, name); let fspath = utils.joinPath(destinationFolder, name);
fs.copySync(templatePath, fspath); fs.copySync(templatePath, fspath);
utils.cd(fspath);
utils.sed('package.json', '%APP_NAME%', name);
if (fs.existsSync('dot.gitignore')) {
fs.moveSync('dot.gitignore', '.gitignore');
}
if (name === 'embark_demo') { this.installTemplate(fspath, name, (name === 'embark_demo'));
console.log(__('Installing packages...').green);
utils.runCmd('npm install');
}
console.log(__('Init complete').green);
console.log('\n' + __('App ready at ').green + fspath);
if (name === 'embark_demo') { if (name === 'embark_demo') {
console.log('-------------------'.yellow); console.log('-------------------'.yellow);
@ -55,6 +48,23 @@ class TemplateGenerator {
} }
} }
installTemplate(templatePath, name, installPackages) {
utils.cd(templatePath);
utils.sed('package.json', '%APP_NAME%', name);
if (fs.existsSync('dot.gitignore')) {
fs.moveSync('dot.gitignore', '.gitignore');
}
if (installPackages) {
console.log(__('Installing packages...').green);
utils.runCmd('npm install');
}
console.log(__('Init complete').green);
console.log('\n' + __('App ready at ').green + templatePath);
}
getExternalProject(uri) { getExternalProject(uri) {
let match = uri.match( let match = uri.match(
/\.[a-z]+\/([-a-zA-Z0-9@:%_+.~#?&\/=]+)/ /\.[a-z]+\/([-a-zA-Z0-9@:%_+.~#?&\/=]+)/