From dbefeab68a015409c3097c320a8818570034a6bc Mon Sep 17 00:00:00 2001 From: Quanlong Date: Thu, 17 Mar 2016 12:08:45 +0800 Subject: [PATCH] Convert to ES6 syntax --- generators/app/index.js | 50 ++++++++++++++--------------- generators/carthage/index.js | 8 ++--- generators/cocoapods/index.js | 4 +-- generators/contributing/index.js | 2 +- generators/gitignore/index.js | 2 +- generators/license/index.js | 2 +- generators/mobileprovision/index.js | 20 ++++++------ generators/readme/index.js | 2 +- generators/script/index.js | 2 +- generators/travis/index.js | 2 +- generators/xcode/index.js | 14 ++++---- 11 files changed, 54 insertions(+), 54 deletions(-) diff --git a/generators/app/index.js b/generators/app/index.js index ab6ce67..411a3ec 100644 --- a/generators/app/index.js +++ b/generators/app/index.js @@ -1,8 +1,8 @@ 'use strict' -var generators = require('yeoman-generator') -var chalk = require('chalk') -var yosay = require('yosay') -var _ = require('underscore') +const generators = require('yeoman-generator') +const chalk = require('chalk') +const yosay = require('yosay') +const _ = require('underscore') module.exports = generators.Base.extend({ constructor: function () { @@ -19,12 +19,12 @@ module.exports = generators.Base.extend({ prompting: { askFor: function () { - var done = this.async() + let done = this.async() // Have Yeoman greet the user. this.log(yosay('Welcome to the outstanding ' + chalk.red('swift.framework') + ' generator!')) - var prompts = [{ + let prompts = [{ type: 'input', name: 'projectName', message: 'Project Name', @@ -43,7 +43,7 @@ module.exports = generators.Base.extend({ store: true }] - this.prompt(prompts, function (props) { + this.prompt(prompts, (props) => { this.projectName = props.projectName this.organizationName = props.organizationName this.organizationId = props.organizationId @@ -51,63 +51,63 @@ module.exports = generators.Base.extend({ this.props = props done() - }.bind(this)) + }) }, askForCocoaPods: function () { - var done = this.async() + let done = this.async() - var prompts = [{ + let prompts = [{ type: 'confirm', name: 'cocoapods', message: 'Would you like to distribute via CocoaPods?', default: true }] - this.prompt(prompts, function (props) { + this.prompt(prompts, (props) => { this.cocoapods = props.cocoapods done() - }.bind(this)) + }) }, askForGitHub: function () { - var done = this.async() + let done = this.async() - var prompts = [{ + let prompts = [{ type: 'input', name: 'githubUser', message: 'Would you mind telling me your username on GitHub?', store: true }] - this.prompt(prompts, function (props) { + this.prompt(prompts, (props) => { this.githubUser = props.githubUser this.props = _.extend(this.props, props) done() - }.bind(this)) + }) }, askForTravis: function () { - var done = this.async() + let done = this.async() - var prompts = [{ + let prompts = [{ type: 'confirm', name: 'travis', message: 'Would you like to enable Travis CI?', default: true }] - this.prompt(prompts, function (props) { + this.prompt(prompts, (props) => { this.travis = props.travis done() - }.bind(this)) + }) }, askForCertPath: function () { - var done = this.async() - var travis = this.travis + let done = this.async() + let travis = this.travis - var prompts = [{ + let prompts = [{ type: 'confirm', name: 'mobileprovision', message: 'Would you like to provision Development Certificate', @@ -118,10 +118,10 @@ module.exports = generators.Base.extend({ } }] - this.prompt(prompts, function (props) { + this.prompt(prompts, (props) => { this.mobileprovision = props.mobileprovision done() - }.bind(this)) + }) } }, diff --git a/generators/carthage/index.js b/generators/carthage/index.js index 6e2a63b..037a706 100644 --- a/generators/carthage/index.js +++ b/generators/carthage/index.js @@ -1,5 +1,5 @@ 'use strict' -var generators = require('yeoman-generator') +const generators = require('yeoman-generator') module.exports = generators.Base.extend({ constructor: function () { @@ -24,10 +24,10 @@ module.exports = generators.Base.extend({ return } - var done = this.async() - this.log('Carthage bootstraping') - var child = this.spawnCommand('carthage', ['bootstrap']) + + let done = this.async() + let child = this.spawnCommand('carthage', ['bootstrap']) child.on('exit', done) } } diff --git a/generators/cocoapods/index.js b/generators/cocoapods/index.js index ce3da23..b0500bf 100644 --- a/generators/cocoapods/index.js +++ b/generators/cocoapods/index.js @@ -1,5 +1,5 @@ 'use strict' -var generators = require('yeoman-generator') +const generators = require('yeoman-generator') module.exports = generators.Base.extend({ constructor: function () { @@ -18,7 +18,7 @@ module.exports = generators.Base.extend({ }, initializing: function () { - var podspec = this.destinationPath(this.options.projectName + '.podspec') + let podspec = this.destinationPath(`${this.options.projectName}.podspec`) this.fs.copyTpl(this.templatePath('PROJECT_NAME.podspec'), podspec, this.options) } }) diff --git a/generators/contributing/index.js b/generators/contributing/index.js index 041dda2..c431a5b 100644 --- a/generators/contributing/index.js +++ b/generators/contributing/index.js @@ -1,5 +1,5 @@ 'use strict' -var generators = require('yeoman-generator') +const generators = require('yeoman-generator') module.exports = generators.Base.extend({ constructor: function () { diff --git a/generators/gitignore/index.js b/generators/gitignore/index.js index 332fe30..392a1dd 100644 --- a/generators/gitignore/index.js +++ b/generators/gitignore/index.js @@ -1,5 +1,5 @@ 'use strict' -var generators = require('yeoman-generator') +const generators = require('yeoman-generator') module.exports = generators.Base.extend({ constructor: function () { diff --git a/generators/license/index.js b/generators/license/index.js index b064f27..3474202 100644 --- a/generators/license/index.js +++ b/generators/license/index.js @@ -1,5 +1,5 @@ 'use strict' -var generators = require('yeoman-generator') +const generators = require('yeoman-generator') module.exports = generators.Base.extend({ constructor: function () { diff --git a/generators/mobileprovision/index.js b/generators/mobileprovision/index.js index 6b534d0..ead6251 100644 --- a/generators/mobileprovision/index.js +++ b/generators/mobileprovision/index.js @@ -1,9 +1,9 @@ 'use strict' -var generators = require('yeoman-generator') -var path = require('path') -var fs = require('fs') +const generators = require('yeoman-generator') +const path = require('path') +const fs = require('fs') -var resolvePath = function (string) { +const resolvePath = function (string) { if (string.substr(0, 1) === '~') { string = process.env.HOME + string.substr(1) } @@ -22,9 +22,9 @@ module.exports = generators.Base.extend({ }, prompting: { askForCertPath: function () { - var done = this.async() + let done = this.async() - var prompts = [{ + let prompts = [{ type: 'input', name: 'certPath', message: 'Development Certificate Path', @@ -36,10 +36,10 @@ module.exports = generators.Base.extend({ message: 'The certificate you provide does not exist, specify again?', default: true, when: function (answers) { - var done = this.async() + let done = this.async() answers.certPath = resolvePath(answers.certPath) - fs.stat(answers.certPath, function (err, stats) { + fs.stat(answers.certPath, (err, stats) => { if (err || !stats.isFile()) { answers.certPath = null } @@ -48,14 +48,14 @@ module.exports = generators.Base.extend({ } }] - this.prompt(prompts, function (props) { + this.prompt(prompts, (props) => { if (props.askCertPathAgain) { return this.prompting.askForCertPath.call(this) } this.certPath = props.certPath done() - }.bind(this)) + }) } }, diff --git a/generators/readme/index.js b/generators/readme/index.js index e651de3..c43db52 100644 --- a/generators/readme/index.js +++ b/generators/readme/index.js @@ -1,5 +1,5 @@ 'use strict' -var generators = require('yeoman-generator') +const generators = require('yeoman-generator') module.exports = generators.Base.extend({ constructor: function () { diff --git a/generators/script/index.js b/generators/script/index.js index 6dfb082..e5df3bd 100644 --- a/generators/script/index.js +++ b/generators/script/index.js @@ -1,5 +1,5 @@ 'use strict' -var generators = require('yeoman-generator') +const generators = require('yeoman-generator') module.exports = generators.Base.extend({ constructor: function () { diff --git a/generators/travis/index.js b/generators/travis/index.js index e46eb8d..903b483 100644 --- a/generators/travis/index.js +++ b/generators/travis/index.js @@ -1,5 +1,5 @@ 'use strict' -var generators = require('yeoman-generator') +const generators = require('yeoman-generator') module.exports = generators.Base.extend({ constructor: function () { diff --git a/generators/xcode/index.js b/generators/xcode/index.js index c1ebea6..d346293 100644 --- a/generators/xcode/index.js +++ b/generators/xcode/index.js @@ -1,6 +1,6 @@ 'use strict' -var generators = require('yeoman-generator') -var glob = require('glob') +const generators = require('yeoman-generator') +const glob = require('glob') module.exports = generators.Base.extend({ constructor: function () { @@ -25,13 +25,13 @@ module.exports = generators.Base.extend({ writing: { xcode: function () { - var files = glob.sync('**/*', { + let files = glob.sync('**/*', { cwd: this.templatePath('.'), nodir: true }) - files.forEach(function (entry) { - var source = entry + files.forEach((entry) => { + let source = entry // Handle file name source = source.replace(/PROJECT_NAME/g, this.options.projectName) @@ -39,14 +39,14 @@ module.exports = generators.Base.extend({ this.fs.copyTpl(this.templatePath(entry), this.destinationPath(source), this.options) // Handle .xcodeproj - var data = this.fs.read(this.destinationPath(source), 'utf8') + let data = this.fs.read(this.destinationPath(source), 'utf8') data = data.replace(/ORGANIZATION-ID.PROJECT-NAME/g, this.options.organizationId + '.' + this.options.projectName) data = data.replace(/PROJECT_NAME/g, this.options.projectName) data = data.replace(/ORGANIZATION_NAME/g, this.options.organizationName) data = data.replace(/ORGANIZATION-ID/g, this.options.organizationId) this.fs.write(this.destinationPath(source), data, 'utf8') - }.bind(this)) + }) } }