Merge pull request Yoast#74 from Yoast/stories/at/codestyle

Fix jshint & jscs codestyle

.gruntjshintrc

@@ -8,11 +8,11 @@
     "latedef": true,
     "newcap": true,
     "noarg": true,
-    "quotmark": "single",
+    "quotmark": "double",
     "sub": true,
     "strict": true,
     "undef": true,
     "unused": true,
 
     "node": true
-}
+}

.jscsrc

@@ -1,3 +1,3 @@
 {
   "preset": "jquery"
-}
+}

.jshintrc

@@ -13,10 +13,9 @@
     "sub": true,
     "strict": false,
 
-    "undef": false,
+    "undef": true,
     "unused": true,
     "funcscope": false,
-    "browser": true,
     "jquery": false,
 
     "globals": {

.travis.yml

@@ -7,11 +7,13 @@ cache:
     - node_modules
 
 before_script:
+- npm install -g grunt-cli
 - npm install
 
 script:
 - npm test
+- grunt check
 
 notifications:
   slack:
-    secure: W3StABr+AdcdQawTObK4nbsnn5nLrTTtZfVpD/GEN6gvSOQcykbGEC5+ceYg0jn5b4StDyCiTo5blEsrpVICFpYKc44+ogah+qaGRUfVRS/rpOvn4AueXTWn4JxhZzuxqKMiTmyW+MQG0uYM7sk7Q5S+15jj6ilkj4QATaBVNbY=
+    secure: W3StABr+AdcdQawTObK4nbsnn5nLrTTtZfVpD/GEN6gvSOQcykbGEC5+ceYg0jn5b4StDyCiTo5blEsrpVICFpYKc44+ogah+qaGRUfVRS/rpOvn4AueXTWn4JxhZzuxqKMiTmyW+MQG0uYM7sk7Q5S+15jj6ilkj4QATaBVNbY=

Gruntfile.js

@@ -1,36 +1,34 @@
-module.exports = function(grunt) {
-    'use strict';
+module.exports = function( grunt ) {
+	"use strict";
 
-    //require('time-grunt')(grunt);
+	//require('time-grunt')(grunt);
 
-    // Define project configuration
-    var project = {
-        paths: {
-            grunt: 'grunt/',
-            js: 'js/',
-			css: 'css/',
+	// Define project configuration
+	var project = {
+		paths: {
+			grunt: "grunt/",
+			js: "js/",
+			css: "css/",
 			get config() {
-				return this.grunt + 'config/';
+				return this.grunt + "config/";
 			}
-        },
-        files: {
-            js: [
-                'js/*.js',
-                '!js/*.min.js',
-                'spec/*.js',
-                '!spec/*.min.js'
-            ],
-            get config() {
-                return project.paths.config + '*.js';
-            },
-            grunt: 'Gruntfile.js'
-        },
-        pkg: grunt.file.readJSON( 'package.json' )
-    };
+		},
+		files: {
+			js: [
+				"js/*.js",
+				"!js/*.min.js"
+			],
+			get config() {
+				return project.paths.config + "*.js";
+			},
+			grunt: "Gruntfile.js"
+		},
+		pkg: grunt.file.readJSON( "package.json" )
+	};
 
-    // Load Grunt configurations and tasks
-    require( 'load-grunt-config' )(grunt, {
-        configPath: require( 'path' ).join( process.cwd(), project.paths.config ),
-        data: project
-    });
-};
+	// Load Grunt configurations and tasks
+	require( "load-grunt-config" )( grunt, {
+		configPath: require( "path" ).join( process.cwd(), project.paths.config ),
+		data: project
+	} );
+};

grunt/config/aliases.yaml

@@ -15,6 +15,7 @@ check:
   - 'jshint'
   - 'jsonlint'
   - 'jsvalidate'
+  - 'jscs'
 # Default task
 default:
   - check

grunt/config/clean.js

@@ -1,3 +1,3 @@
 module.exports = {
-	'build': ['js/dist/*.min.js', '!<%= paths.js %>/dist/yoast-seo-content-analysis.min.js']
-};
+	"build": [ "js/dist/*.min.js", "!<%= paths.js %>/dist/yoast-seo-content-analysis.min.js" ]
+};

grunt/config/cssmin.js

@@ -2,9 +2,7 @@
 module.exports = {
 	target: {
 		files: {
-			'<%= paths.css %>dist/yoast-seo-content-analysis.min.css': ['<%= paths.css %>*.css']
+			"<%= paths.css %>dist/yoast-seo-content-analysis.min.css": [ "<%= paths.css %>*.css" ]
 		}
 	}
 };
-
-

grunt/config/jscs.js

@@ -1,24 +1,28 @@
 // https://github.com/jscs-dev/grunt-jscs
 module.exports = {
 	options: {
-		config: '.jscsrc'
+		config: ".jscsrc"
 	},
 	plugin: {
+		options: {
+
+			// We already have non camel case variables names that we cannot change easily
+			requireCamelCaseOrUpperCaseIdentifiers: null
+		},
 		files: {
-			src: [
-				'js/analyzer.js'
-			]
+			src: "<%= files.js %>"
 		}
 	},
 	grunt: {
 		options: {
+
 			// We have no control over task names that use underscores
-			requireCamelCaseOrUpperCaseIdentifiers: 'ignoreProperties'
+			requireCamelCaseOrUpperCaseIdentifiers: "ignoreProperties"
 		},
 		files: {
 			src: [
-				'<%= files.grunt %>',
-				'<%= files.config %>'
+				"<%= files.grunt %>",
+				"<%= files.config %>"
 			]
 		}
 	}

grunt/config/jshint.js

@@ -2,17 +2,17 @@
 module.exports = {
 	plugin: {
 		options: {
-			jshintrc: '.jshintrc'
+			jshintrc: ".jshintrc"
 		},
-		src: '<%= files.js %>'
+		src: "<%= files.js %>"
 	},
 	grunt: {
 		options: {
-			jshintrc: '.gruntjshintrc'
+			jshintrc: ".gruntjshintrc"
 		},
 		src: [
-			'<%= files.grunt %>',
-			'<%= files.config %>'
+			"<%= files.grunt %>",
+			"<%= files.config %>"
 		]
 	}
 };

grunt/config/jsonlint.js

@@ -2,11 +2,11 @@
 module.exports = {
     all: {
         src: [
-            '.gruntjshintrc',
-            '.jscsrc',
-            '.jshintrc',
-            'composer.json',
-            'package.json'
+            ".gruntjshintrc",
+            ".jscsrc",
+            ".jshintrc",
+            "composer.json",
+            "package.json"
         ]
     }
 };

grunt/config/jsvalidate.js

@@ -5,14 +5,14 @@ module.exports = {
 	},
 	plugin: {
 		files: {
-			src: 'js/analyzer.js'
+			src: "js/analyzer.js"
 		}
 	},
 	grunt: {
 		files: {
 			src: [
-				'<%= files.grunt %>',
-				'<%= files.config %>'
+				"<%= files.grunt %>",
+				"<%= files.config %>"
 			]
 		}
 	}

grunt/config/po2json.js

@@ -2,10 +2,10 @@
 module.exports = {
     all: {
         options: {
-            format: 'jed1.x',
-            domain: 'js-text-analysis'
+            format: "jed1.x",
+            domain: "js-text-analysis"
         },
-        src: [ 'languages/*.po' ],
-        dest: 'languages'
+        src: [ "languages/*.po" ],
+        dest: "languages"
     }
 };

grunt/config/shell.js

@@ -1,23 +1,25 @@
 // https://github.com/sindresorhus/grunt-shell
-module.exports = function(grunt) {
+module.exports = function( grunt ) {
+    "use strict";
+
     return {
         makepot: {
-            potFile: 'languages/js-text-analysis.pot',
-            textdomain: 'js-text-analysis',
-            command: function () {
+            potFile: "languages/js-text-analysis.pot",
+            textdomain: "js-text-analysis",
+            command: function() {
                 var files;
 
-                files = ['js/*.js', 'js/config/*.js'];
-                files = grunt.file.expand(files);
+                files = [ "js/*.js", "js/config/*.js" ];
+                files = grunt.file.expand( files );
 
-                return 'xgettext ' +
-                    '--default-domain=<%= shell.makepot.textdomain %>' +
-                    ' -o <%= shell.makepot.potFile %>' +
-                    ' --package-version=<%= pkg.version %> --package-name=<%= pkg.name %>' +
-                    ' --force-po' +
-                    ' --from-code=UTF-8' +
-                    ' --add-comments="translators: "' +
-                    ' ' + files.join( ' ' );
+                return "xgettext" +
+                    " --default-domain=<%= shell.makepot.textdomain %>" +
+                    " -o <%= shell.makepot.potFile %>" +
+                    " --package-version=<%= pkg.version %> --package-name=<%= pkg.name %>" +
+                    " --force-po" +
+                    " --from-code=UTF-8" +
+                    " --add-comments=\"translators: \"" +
+                    " " + files.join( " " );
             }
         }
     };

grunt/config/uglify.js

@@ -1,13 +1,17 @@
 // https://github.com/gruntjs/grunt-contrib-uglify
 module.exports = {
-	'js-text-analysis': {
+	"js-text-analysis": {
 		options: {
-			preserveComments: 'some',
-			report: 'gzip'
+			preserveComments: "some",
+			report: "gzip"
 		},
 		files: {
-			'<%= paths.js %>/dist/yoast-seo-content-analysis.min.js': ['<%= paths.js %>/*.js', '<%= paths.js %>/config/*.js'],
-			'<%= paths.js %>/dist/yoast-seo-content-analyzer.min.js': ['<%= paths.js %>/analyzer.js', '<%= paths.js %>/config/scoring.js']
+			"<%= paths.js %>/dist/yoast-seo-content-analysis.min.js": [
+				"<%= paths.js %>/*.js", "<%= paths.js %>/config/*.js"
+			],
+			"<%= paths.js %>/dist/yoast-seo-content-analyzer.min.js": [
+				"<%= paths.js %>/analyzer.js", "<%= paths.js %>/config/scoring.js"
+			]
 		}
 	}
 };