Fixed linting issues

TryGhost · May 2, 2018 · 2068489 · 2068489
1 parent df66855
commit 2068489
Show file tree

Hide file tree

Showing 28 changed files with 513 additions and 512 deletions.
diff --git a/app/index.js b/app/index.js
@@ -13,7 +13,6 @@ var express = require('express'),
     app = express(),
     scanHbs = hbs.create();
 
-
 // Configure express
 app.set('x-powered-by', false);
 app.set('query parser', false);
@@ -42,15 +41,15 @@ app.get('/example/', function (req, res) {
     });
 });
 
-app.post('/', 
-    upload.single('theme'), 
+app.post('/',
+    upload.single('theme'),
     function (req, res, next) {
         var zip = {
-            path: req.file.path, 
+            path: req.file.path,
             name: req.file.originalname
         };
         debug('Uploaded: ' + zip.name + ' to ' + zip.path);
-        
+
         gscan.checkZip(zip).then(function processResult(theme) {
             debug('Checked: ' + zip.name);
             res.theme = theme;
@@ -76,9 +75,10 @@ app.use(function (req, res, next) {
     next(new errors.NotFoundError({message: 'Page not found'}));
 });
 
+// eslint-disable-next-line no-unused-vars
 app.use(function (err, req, res, next) {
     req.err = err;
     res.render('error', {message: err.message, stack: err.stack});
 });
 
-server.start(app);
+server.start(app);
diff --git a/app/public/.eslintrc.js b/app/public/.eslintrc.js
@@ -1,3 +1,4 @@
+/* eslint-env node */
 module.exports = {
     plugins: ['ghost'],
     extends: [

diff --git a/app/public/js/gscan.js b/app/public/js/gscan.js
@@ -1,48 +1,52 @@
 (function ($) {
-
     function timeSince(date) {
-
         var seconds = Math.floor((new Date() - date) / 1000);
         var interval = Math.floor(seconds / 31536000);
 
         if (interval >= 1) {
-            if(interval===1)
-                return interval + " year";
-            else
-                return interval + " years";
+            if (interval === 1) {
+                return interval + ' year';
+            } else {
+                return interval + ' years';
+            }
         }
         interval = Math.floor(seconds / 2592000);
         if (interval >= 1) {
-            if(interval===1)
-                return interval + " month";
-            else
-                return interval + " months";
+            if (interval === 1) {
+                return interval + ' month';
+            } else {
+                return interval + ' months';
+            }
         }
         interval = Math.floor(seconds / 86400);
         if (interval >= 1) {
-            if(interval===1)
-                return interval + " day";
-            else
-                return interval + " days";
+            if (interval === 1) {
+                return interval + ' day';
+            } else {
+                return interval + ' days';
+            }
         }
         interval = Math.floor(seconds / 3600);
         if (interval >= 1) {
-            if(interval===1)
-                return interval + " hour";
-            else
-                return interval + " hours";
+            if (interval === 1) {
+                return interval + ' hour';
+            } else {
+                return interval + ' hours';
+            }
         }
         interval = Math.floor(seconds / 60);
         if (interval >= 1) {
-            if(interval===1)
-                return interval + " minute";
-            else
-                return interval + " minutes";
+            if (interval === 1) {
+                return interval + ' minute';
+            } else {
+                return interval + ' minutes';
+            }
+        }
+        if (Math.floor(seconds) === 1) {
+            return Math.floor(seconds) + ' second';
+        } else {
+            return Math.floor(seconds) + ' seconds';
         }
-        if(Math.floor(seconds)===1)
-            return Math.floor(seconds) + " second";
-        else
-            return Math.floor(seconds) + " seconds";
     }
     $(document).ready(function ($) {
         if ($('#theme')[0]) {
@@ -56,20 +60,22 @@
         /** Latest News **/
         if ($('.myblogs-latest-news').length && window.ghost) {
             $.get(window.ghost.url.api('posts', {limit: 1, include: 'author'}), function (json) {
+                /* eslint-disable camelcase */
                 var item = json.posts[0],
                     parsed_date = new Date(item.published_at),
                     image_url = item.author.image.substr(0, 2) === '//' ? item.author.image : '//dev.ghost.org/' + item.author.image,
                     news_html = '<p><a href="https://dev.ghost.org' + item.url + '">' + item.title + '</a></p>' +
                         '<span class="meta">' +
                         '<img src="' + image_url + '" />' +
                         '<time title="' + parsed_date + '">' + timeSince(parsed_date) + ' ago</time> by ' + item.author.name + '</span>';
-                $(".myblogs-latest-news").html(news_html);
+                $('.myblogs-latest-news').html(news_html);
+
+                /* eslint-disable camelcase */
             });
         }
 
         /** Toggle Details **/
         if ($('.toggle-details').length) {
-
             $('.toggle-details').on('click', function () {
                 if ($(this).find('~ .details').is(':hidden')) {
                     $(this).find('~ .details').show();

diff --git a/bin/cli.js b/bin/cli.js
@@ -2,9 +2,9 @@
 
 var pkgJson = require('../package.json'),
     program = require('commander'),
-    _       = require('lodash'),
-    chalk   = require('chalk'),
-    gscan   = require('../lib'),
+    _ = require('lodash'),
+    chalk = require('chalk'),
+    gscan = require('../lib'),
 
     themePath = '',
     levels;
@@ -27,6 +27,7 @@ levels = {
     feature: chalk.green
 };
 
+/* eslint-disable no-console */
 function outputResult(result) {
     console.log('-', levels[result.level](result.level), result.rule);
 }
@@ -70,7 +71,8 @@ if (!program.args.length) {
             return err.code === 'ENOTDIR';
         }, function (err) {
             console.error(err.message);
-            console.error('Did you mean to add the -z flag to read a zip file?')
+            console.error('Did you mean to add the -z flag to read a zip file?');
+            /* eslint-enable no-console */
         });
     }
 }
diff --git a/lib/checker.js b/lib/checker.js
@@ -1,7 +1,7 @@
-var Promise    = require('bluebird'),
-    _          = require('lodash'),
+var Promise = require('bluebird'),
+    _ = require('lodash'),
     requireDir = require('require-dir'),
-    readTheme  = require('./read-theme'),
+    readTheme = require('./read-theme'),
     checker,
     checks;
 

diff --git a/lib/checks/001-deprecations.js b/lib/checks/001-deprecations.js
@@ -1,4 +1,4 @@
-var _       = require('lodash'),
+var _ = require('lodash'),
     path = require('path'),
     fs = require('fs-extra'),
     checkDeprecations;
@@ -121,19 +121,19 @@ checkDeprecations = function checkDeprecations(theme, themePath) {
             ruleCode: 'GS001-DEPR-C0H'
         },
         {
-            cssRegEx: /\.archive-template[\s\{]/g,
+            cssRegEx: /\.archive-template[\s{]/g,
             className: '.archive-template',
             css: true,
             ruleCode: 'GS001-DEPR-CSS-AT'
         },
         {
-            cssRegEx: /\.page[\s\{]/g,
+            cssRegEx: /\.page[\s{]/g,
             className: '.page',
             css: true,
             ruleCode: 'GS001-DEPR-CSS-PA'
         },
         {
-            cssRegEx: /\.page-template-\w+[\s\{]/g,
+            cssRegEx: /\.page-template-\w+[\s{]/g,
             className: '.page-template-slug',
             css: true,
             ruleCode: 'GS001-DEPR-CSS-PATS'
@@ -142,7 +142,7 @@ checkDeprecations = function checkDeprecations(theme, themePath) {
 
     _.each(checks, function (check) {
         _.each(theme.files, function (themeFile) {
-            var template = themeFile.file.match(/^[^\/]+.hbs$/) || themeFile.file.match(/^partials[\/\\]+(.*)\.hbs$/),
+            var template = themeFile.file.match(/^[^/]+.hbs$/) || themeFile.file.match(/^partials[/\\]+(.*)\.hbs$/),
                 css = themeFile.file.match(/\.css/),
                 cssDeprecations;
 
@@ -184,9 +184,9 @@ checkDeprecations = function checkDeprecations(theme, themePath) {
             }
         });
 
-       if (theme.results.pass.indexOf(check.ruleCode) === -1 && !theme.results.fail.hasOwnProperty(check.ruleCode)) {
-           theme.results.pass.push(check.ruleCode);
-       }
+        if (theme.results.pass.indexOf(check.ruleCode) === -1 && !theme.results.fail.hasOwnProperty(check.ruleCode)) {
+            theme.results.pass.push(check.ruleCode);
+        }
     });
 
     return theme;

diff --git a/lib/checks/002-comment-id.js b/lib/checks/002-comment-id.js
@@ -1,7 +1,7 @@
 var _ = require('lodash'),
     checkCommentID;
 
-checkCommentID = function checkCommentID(theme, themePath) {
+checkCommentID = function checkCommentID(theme) {
     var checks = [
         // Check 1:
         // Look for instances of: this.page.identifier = 'ghost-{{id}}';
@@ -20,7 +20,7 @@ checkCommentID = function checkCommentID(theme, themePath) {
 
     _.each(checks, function (check) {
         _.each(theme.files, function (themeFile) {
-            var template = themeFile.file.match(/^[^\/]+.hbs$/) || themeFile.file.match(/^partials[\/\\]+(.*)\.hbs$/);
+            var template = themeFile.file.match(/^[^/]+.hbs$/) || themeFile.file.match(/^partials[/\\]+(.*)\.hbs$/);
 
             if (template) {
                 if (themeFile.content.match(check.regex)) {

diff --git a/lib/checks/005-template-compile.js b/lib/checks/005-template-compile.js
@@ -1,6 +1,6 @@
-var _       = require('lodash'),
-    hbs     = require('express-hbs'),
-    spec    = require('../spec.js'),
+var _ = require('lodash'),
+    hbs = require('express-hbs'),
+    spec = require('../spec.js'),
     checkTemplatesCompile,
     fakeData = require('../faker');
 
@@ -30,7 +30,7 @@ checkTemplatesCompile = function checkTemplatesCompile(theme) {
     });
 
     _.each(theme.files, function (themeFile) {
-        var templateTest = themeFile.file.match(/^[^\/]+.hbs$/),
+        var templateTest = themeFile.file.match(/^[^/]+.hbs$/),
             compiled;
 
         // If this is a main template, test compiling it properly
@@ -39,7 +39,9 @@ checkTemplatesCompile = function checkTemplatesCompile(theme) {
                 // When we read the theme, we precompile, here we compile with registered partials and helpers
                 // Which will let us detect any missing partials, helpers or parse errors
                 compiled = localHbs.handlebars.compile(themeFile.content, {
-                    knownHelpers: _.zipObject(spec.knownHelpers, _.map(spec.knownHelpers, function() { return true; })),
+                    knownHelpers: _.zipObject(spec.knownHelpers, _.map(spec.knownHelpers, function () {
+                        return true;
+                    })),
                     knownHelpersOnly: true
                 });
 
@@ -50,7 +52,7 @@ checkTemplatesCompile = function checkTemplatesCompile(theme) {
                 if (error.message.match(/you specified knownhelpersOnly/gi)) {
                     try {
                         missingHelper = error.message.match(/but\sused\sthe\sunknown\shelper\s(.*)\s-/)[1];
-                    } catch(err) {
+                    } catch (err) {
                         missingHelper = 'unknown helper name';
                     }
 

diff --git a/lib/checks/010-package-json.js b/lib/checks/010-package-json.js
@@ -53,7 +53,7 @@ _private.validatePackageJSONFields = function validatePackageJSONFields(packageJ
         failed.push(packageJSONValidationRules.nameIsLowerCase);
     }
 
-    if (packageJSON.name && !packageJSON.name.match(/^[a-z0-9]+(\-?[a-z0-9]+)*$/gi)) {
+    if (packageJSON.name && !packageJSON.name.match(/^[a-z0-9]+(-?[a-z0-9]+)*$/gi)) {
         failed.push(packageJSONValidationRules.nameIsHyphenated);
     }
 
@@ -85,7 +85,7 @@ _private.getFailedRules = function getFailedRules(keys) {
     }));
 };
 
-module.exports = function checkPackageJSON(theme, themePath) {
+module.exports = function checkPackageJSON(theme) {
     var packageJSONPath = path.join(theme.path, packageJSONFile);
 
     // CASE: package.json must be present (if not, all validation rules fail)

diff --git a/lib/checks/020-theme-structure.js b/lib/checks/020-theme-structure.js
@@ -1,4 +1,4 @@
-var _       = require('lodash'),
+var _ = require('lodash'),
     checkThemeStructure;
 
 // TODO: template inspection
@@ -18,19 +18,19 @@ var _       = require('lodash'),
 
 checkThemeStructure = function checkThemeStructure(theme) {
     var checks = [
-            {
-                path: 'index.hbs',
-                ruleCode: 'GS020-INDEX-REQ'
-            },
-            {
-                path: 'post.hbs',
-                ruleCode: 'GS020-POST-REQ'
-            },
-            {
-                path: 'default.hbs',
-                ruleCode: 'GS020-DEF-REC'
-            }
-        ];
+        {
+            path: 'index.hbs',
+            ruleCode: 'GS020-INDEX-REQ'
+        },
+        {
+            path: 'post.hbs',
+            ruleCode: 'GS020-POST-REQ'
+        },
+        {
+            path: 'default.hbs',
+            ruleCode: 'GS020-DEF-REC'
+        }
+    ];
 
     _.each(checks, function (check) {
         if (!_.some(theme.files, {file: check.path})) {

diff --git a/lib/checks/030-assets.js b/lib/checks/030-assets.js
@@ -1,4 +1,4 @@
-var _       = require('lodash'),
+var _ = require('lodash'),
     path = require('path'),
     fs = require('fs'),
     checkAssets;
@@ -33,10 +33,9 @@ checkAssets = function checkAssets(theme, themePath) {
             if (stats.isSymbolicLink()) {
                 failures.push({ref: theme.file});
             }
-        } catch(err) {
+        } catch (err) {
             // ignore
         }
-
     });
 
     if (failures.length > 0) {