Improve code style

yeoman · May 17, 2015 · 3eafc63 · 3eafc63
1 parent c6362f3
commit 3eafc63
Show file tree

Hide file tree

Showing 16 changed files with 63 additions and 96 deletions.
diff --git a/.jshintrc b/.jshintrc
@@ -2,7 +2,6 @@
   "node": true,
   "esnext": true,
   "bitwise": true,
-  "camelcase": true,
   "curly": true,
   "eqeqeq": true,
   "immed": true,

diff --git a/.travis.yml b/.travis.yml
@@ -7,4 +7,3 @@ node_js:
 before_script:
   - git config --global user.name "Travis-CI"
   - git config --global user.email "[email protected]"
-
diff --git a/app/deps.js b/app/deps.js
@@ -2,7 +2,6 @@
  * WSK dependencies check module
  */
 'use strict';
-
 var exec = require('child_process').exec;
 var events = require('events');
 var iniparser = require('iniparser');
@@ -101,4 +100,3 @@ module.exports = {
   checkGit: checkGit,
   checkGcloud: checkGcloud
 };
-
diff --git a/app/download.js b/app/download.js
@@ -1,5 +1,4 @@
 'use strict';
-
 var request = require('request');
 var Download = require('download');
 
@@ -21,7 +20,6 @@ function getLatestRelease(cb) {
       cb(err || new Error(body || 'web-starter-kit/releases replied with ' + res.statusCode));
       return;
     }
-    /*jshint camelcase:false */
     var release = {tag_name: ''};
     for (var i = 0, r; (r = body[i]); i++) {
       if (release.tag_name < r.tag_name) {
@@ -31,7 +29,7 @@ function getLatestRelease(cb) {
     if (!release.tag_name) {
       err = new Error('could not fetch WSK release version');
     }
-    /*jshint camelcase:true */
+
     cb(err, release);
   });
 }
@@ -42,9 +40,9 @@ function createDownloader(opts, cb) {
       cb(err);
       return;
     }
-    /*jshint camelcase:false */
+
     var url = WSK_ZIP_URL + ver.tag_name + '.zip';
-    /*jshint camelcase:true */
+
     cb(null, new Download(opts).get(url), url, ver);
   });
 }

diff --git a/app/hosting.js b/app/hosting.js
@@ -1,5 +1,4 @@
 'use strict';
-
 var request = require('request');
 
 
@@ -38,12 +37,8 @@ function fetchConfig(provider, callback) {
   });
 }
 
-//function deployTaskFilename(provider, tool) {
-//}
-
 module.exports = {
   config: config,
   isSupported: isSupported,
-  fetchConfig: fetchConfig,
-  //deployTaskFilename: deployTaskFilename
+  fetchConfig: fetchConfig
 };
diff --git a/app/index.js b/app/index.js
@@ -1,5 +1,4 @@
 'use strict';
-
 var exec = require('child_process').exec;
 var path = require('path');
 var yeoman = require('yeoman-generator');
@@ -76,9 +75,9 @@ module.exports = yeoman.generators.Base.extend({
     var self = this,
         done = this.async();
 
-    /*jshint expr:true */
-    this.verbose && this.log.write().info('Getting latest WSK release version ...');
-    /*jshint expr:false */
+    if (this.verbose) {
+      this.log.write().info('Getting latest WSK release version ...');
+    }
 
     download({extract: true, strip: 1}, function (err, downloader, url, ver) {
       if (err) {
@@ -87,11 +86,9 @@ module.exports = yeoman.generators.Base.extend({
       }
 
       if (self.verbose) {
-        /*jshint camelcase:false */
         self.log.info('Found release %s', ver.tag_name)
-           .info('Fetching %s ...', url)
-           .info(chalk.yellow('This might take a few moments'));
-        /*jshint camelcase:true */
+          .info('Fetching %s ...', url)
+          .info(chalk.yellow('This might take a few moments'));
         downloader.use(function (res) {
           res.on('data', function () { self.log.write('.'); });
         });
@@ -112,9 +109,10 @@ module.exports = yeoman.generators.Base.extend({
 
         checks.on('passed', function (res) {
           self.checks[res.what] = {data: res.data};
-          /*jshint expr:true */
-          self.verbose && self.log.ok(res.what + ' ' + (res.result || ''));
-          /*jshint expr:false */
+
+          if (self.verbose) {
+            self.log.ok(res.what + ' ' + (res.result || ''));
+          }
         });
 
         checks.on('failed', function (res) {
@@ -129,9 +127,9 @@ module.exports = yeoman.generators.Base.extend({
 
   writing: {
     gulpfile: function () {
-      /*jshint expr:true */
-      this.verbose && this.log.info('Configuring gulpfile.js');
-      /*jshint expr:false */
+      if (this.verbose) {
+        this.log.info('Configuring gulpfile.js');
+      }
 
       var filepath = path.join(this.destinationRoot(), 'gulpfile.js'),
           gulpfile = this.readFileAsString(filepath);
@@ -183,9 +181,9 @@ module.exports = yeoman.generators.Base.extend({
     // },
 
     packagejson: function () {
-      /*jshint expr:true */
-      this.verbose && this.log.info('Configuring package.json');
-      /*jshint expr:false */
+      if (this.verbose) {
+        this.log.info('Configuring package.json');
+      }
 
       var filepath = path.join(this.destinationRoot(), 'package.json'),
           pkg = JSON.parse(this.readFileAsString(filepath));
@@ -203,9 +201,9 @@ module.exports = yeoman.generators.Base.extend({
     },
 
     webmanifest: function () {
-      /*jshint expr:true */
-      this.verbose && this.log.info('Configuring manifest.webapp');
-      /*jshint expr:false */
+      if (this.verbose) {
+        this.log.info('Configuring manifest.webapp');
+      }
 
       var filepath = path.join(this.destinationRoot(), 'app', 'manifest.webapp'),
           manifest = JSON.parse(this.readFileAsString(filepath));
@@ -221,9 +219,9 @@ module.exports = yeoman.generators.Base.extend({
     },
 
     layout: function () {
-      /*jshint expr:true */
-      this.verbose && this.log.info('Configuring layout and contents');
-      /*jshint expr:false */
+      if (this.verbose) {
+        this.log.info('Configuring layout and contents');
+      }
 
       var basic = path.join(this.destinationRoot(), 'app', 'basic.html'),
           index = path.join(this.destinationRoot(), 'app', 'index.html'),
@@ -303,9 +301,10 @@ module.exports = yeoman.generators.Base.extend({
         'git remote add origin [email protected]:' + this.prompts.githubTarget
       ];
       exec(cmd.join(' && '), {cwd: path.join('dist')}, function (err, stdout) {
-        /*jshint expr:true */
-        log && log.write().info(stdout);
-        /*jshint expr:false */
+        if (log) {
+          log.write().info(stdout);
+        }
+
         done();
       });
     }
@@ -315,14 +314,15 @@ module.exports = yeoman.generators.Base.extend({
   install: {
     npminstall: function () {
       if (!this.skipInstall) {
-        /*jshint expr:true */
-        this.verbose && this.log.write()
-          .info('Running ' + chalk.yellow('npm install') + ' ' +
-                'to install the required dependencies. ' +
-                'If this fails, try running the command yourself.')
-          .info(chalk.yellow('This might take a few moments'))
-          .write();
-        /*jshint expr:false */
+        if (this.verbose) {
+          this.log.write()
+            .info('Running ' + chalk.yellow('npm install') + ' ' +
+                  'to install the required dependencies. ' +
+                  'If this fails, try running the command yourself.')
+            .info(chalk.yellow('This might take a few moments'))
+            .write();
+        }
+
         this.npmInstall();
       }
     },
@@ -341,20 +341,25 @@ module.exports = yeoman.generators.Base.extend({
           ];
 
       exec(cmd.join(' && '), function (err, stdout) {
-        /*jshint expr:true */
-        err && self.log.error(err);
-        self.verbose && self.log.write(stdout);
-        /*jshint expr:false */
+        if (err) {
+          self.log.error(err);
+        }
+
+        if (self.verbose) {
+          self.log.write(stdout);
+        }
+
         done();
       });
     }
   },
 
   end: function () {
     if (this.messages.length === 0) {
-      /*jshint expr:true */
-      this.verbose && this.log.write().ok('You are all set now. Happy coding!');
-      /*jshint expr:false */
+      if (this.verbose) {
+        this.log.write().ok('You are all set now. Happy coding!');
+      }
+
       return;
     }
 
@@ -365,4 +370,3 @@ module.exports = yeoman.generators.Base.extend({
     }
   }
 });
-
diff --git a/app/prompt.js b/app/prompt.js
@@ -1,5 +1,4 @@
 'use strict';
-
 var path = require('path');
 var iniparser = require('iniparser');
 
@@ -78,9 +77,8 @@ function questions(defaults) {
         if (!url || RE_URL.test(url)) {
           return true;
         }
-        /*jshint quotmark:false */
-        return "That doesn't look like a valid URL";
-        /*jshint quotmark:single */
+
+        return 'That doesn\'t look like a valid URL';
       }
     },
     {
@@ -116,9 +114,7 @@ function questions(defaults) {
         {value: 'paas', name: 'PaaS (GAE, Heroku)'},
         {value: 'static', name: 'Static (GitHub, GCS, S3)'},
         {value: 'server', name: 'Server (Apache, Nginx, etc.)'},
-        /*jshint quotmark:false */
-        {value: 'none', name: "Nowhere, don't worry about it"}
-        /*jshint quotmark:single */
+        {value: 'none', name: 'Nowhere, don\'t worry about it'}
       ],
       default: function (answers) {
         return defaults.hostingCat ||
@@ -191,10 +187,8 @@ function questions(defaults) {
     // -------------- Heroku (PaaS hosting) ------------------
 
     {
-      /*jshint quotmark:false */
-      message: ("What is your Heroku app name?\n  "+
-                "(just hitting enter is OK, we'll create one for you)\n "),
-      /*jshint quotmark:single */
+      message: ('What is your Heroku app name?\n  ' +
+                '(just hitting enter is OK, we\'ll create one for you)\n '),
       name: 'herokuApp',
       default: defaults.herokuApp,
       when: function (answers) {
@@ -245,9 +239,8 @@ function questions(defaults) {
         if (RE_GITHUB_TARGET.test(v)) {
           return true;
         }
-        /*jshint quotmark:false */
-        return "It's either 'owner' or 'owner/repo'";
-        /*jshint quotmark:single */
+
+        return 'It\'s either \'owner\' or \'owner/repo\'';
       },
       filter: function (v) {
         if (v && v.indexOf('/') === -1) {

diff --git a/app/templates/deploy_gae.js b/app/templates/deploy_gae.js
@@ -1,5 +1,4 @@
 'use strict';
-
 var spawn = require('child_process').spawn;
 var gulp = require('gulp');
 

diff --git a/app/templates/deploy_github.js b/app/templates/deploy_github.js
@@ -1,5 +1,4 @@
 'use strict';
-
 var path = require('path');
 var exec = require('child_process').exec;
 var spawn = require('child_process').spawn;
@@ -20,9 +19,7 @@ gulp.task('deploy:commit', function (done) {
     msg = process.argv.slice(im, im + 2)[1];
   }
   msg = msg || 'Production build';
-  /*jshint quotmark:false */
-  var cmd = ["git add .", "git commit -m '" + msg + "'", "git status"];
-  /*jshint quotmark:true */
+  var cmd = ['git add .', 'git commit -m \'' + msg + '\'', 'git status'];
   exec(cmd.join(' && '), {cwd: path.join(process.cwd(), 'dist')}, function (err, stdout, stderr) {
     if (!/working directory clean/m.test(stdout)) {
       console.log('--- ERROR log ---\n' + stderr);

diff --git a/docs/deploy-gae.md b/docs/deploy-gae.md
@@ -9,7 +9,7 @@ ID, which is also how you'll be able to access the published website.
 What the generator does when using 'deploy to GAE' option is the following:
 
 1. Creates a `.gcloud/properties` file with the specified Project ID.
-2. Copies `app.yaml` from [H5BP GAE server-config](https://github.com/h5bp/server-configs-gae)
+2. Copies `app.yaml` from [H5BP GAE server configs](https://github.com/h5bp/server-configs-gae)
    to `app/app.yaml`.
 3. Modifies `app/app.yaml` to use correct Project ID, the one you specified.
 

diff --git a/test/test-app.js b/test/test-app.js
@@ -1,6 +1,5 @@
 /*global describe, before, it*/
 'use strict';
-
 var fs = require('fs');
 var assert = require('yeoman-generator').assert;
 var testUtil = require('./util');

diff --git a/test/test-download.js b/test/test-download.js
@@ -1,6 +1,5 @@
 /*global describe, before, after, afterEach, it*/
 'use strict';
-
 var assert = require('yeoman-generator').assert;
 var nock = require('nock');
 var download = require('../app/download');
@@ -11,21 +10,17 @@ describe('download module', function () {
   after(function () { nock.enableNetConnect(); });
 
   it('fetches latest release version and creates downloader', function (done) {
-    /*jshint camelcase:false */
     var scope = nock('https://api.github.com')
       .get('/repos/google/web-starter-kit/releases')
       .reply(200, [
         {tag_name: 'v1'},
         {tag_name: 'v2'},
         {tag_name: 'v2.5.2'}
       ]);
-    /*jshint camelcase:true */
 
     download({}, function (err, d, url, ver) {
       assert(!err, err);
-      /*jshint camelcase:false */
       assert.deepEqual(ver, {tag_name: 'v2.5.2'});
-      /*jshint camelcase:false */
       assert.equal(url, download.WSK_ZIP_URL + 'v2.5.2.zip');
       assert(d);
 

diff --git a/test/test-gae.js b/test/test-gae.js
@@ -1,6 +1,5 @@
 /*global describe, before, it*/
 'use strict';
-
 var assert = require('yeoman-generator').assert;
 var testUtil = require('./util');
 

diff --git a/test/test-github.js b/test/test-github.js
@@ -1,6 +1,5 @@
 /*global describe, before, it*/
 'use strict';
-
 var fs = require('fs');
 var exec = require('child_process').exec;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,4 +7,3 @@ node_js:
		before_script:
		- git config --global user.name "Travis-CI"
		- git config --global user.email "[email protected]"