fixup bug in .jscsrc, clean up codestyle errors, fixup versions

Alexej Yaroshevich · Alexej Yaroshevich · commit ecefdc6821f1 · 2014-08-24T05:10:43.000+04:00
diff --git a/.jscsrc b/.jscsrc
@@ -1,6 +1,5 @@
 {
     "preset": "google",
-    "fileExtensions": "jscs",
 
     "requireParenthesesAroundIIFE": true,
     "maximumLineLength": 120,
diff --git a/lib/jsdoc-helpers.js b/lib/jsdoc-helpers.js
@@ -30,7 +30,9 @@ function jsDocParseComments (comments) {
     }
 
     function jsDocForEachTag (fn) {
-        if (!this.data.tags || !this.data.tags.length) return;
+        if (!this.data.tags || !this.data.tags.length) {
+            return;
+        }
         this.data.tags.forEach(fn);
     }
 
diff --git a/lib/rules/validate-jsdoc.js b/lib/rules/validate-jsdoc.js
@@ -24,8 +24,6 @@ module.exports.prototype = {
                 validators.checkOptions(v, options);
             }
         }.bind(this));
-
-
     },
 
     getOptionName: function () {
diff --git a/lib/rules/validate-jsdoc/check-redundant-access.js b/lib/rules/validate-jsdoc/check-redundant-access.js
@@ -14,15 +14,15 @@ function checkRedundantAccess(node, err) {
         return;
     }
 
-	var access;
+    var access;
     node.jsDoc.data.tags.forEach(function (tag) {
         if (['private', 'protected', 'public', 'access'].indexOf(tag.tag) === -1) {
             return;
         }
 
         if (access) {
-        	err('Multiple access definition');
-        	return;
+            err('Multiple access definition');
+            return;
         }
 
         if (tag.tag === 'access' && !tag.name) {
diff --git a/lib/rules/validate-jsdoc/leading-underscore-access.js b/lib/rules/validate-jsdoc/leading-underscore-access.js
@@ -27,7 +27,7 @@ function validateLeadingUnderscoresAccess(node, err) {
         name = node.parentNode.key.name;
         break;
     default: // try to use func name itself (if not anonymous)
-        name = (node.id||{}).name;
+        name = (node.id || {}).name;
         break;
     }
 
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "jscs-jsdoc",
   "author": "Alexej Yaroshevich <alex@qfox.ru>",
   "description": "JSCS jsdoc plugin",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "main": "lib/index",
   "homepage": "https://github.com/zxqfox/jscs-jsdoc",
   "license": "MIT",
@@ -17,7 +17,7 @@
     "Alexej Yaroshevich <alex@qfox.ru>"
   ],
   "engines": {
-    "node": ">= 0.8.0"
+    "node": ">= 0.10.0"
   },
   "dependencies": {
     "comment-parser": "zxqfox/comment-parser#jscs-jsdoc",
@@ -27,7 +27,7 @@
     "browserify": "~3.30.2",
     "chai": "^1.9.1",
     "esprima": "^1.2.2",
-    "jscs": ">=1.3.0 <2.0",
+    "jscs": ">=1.5.9 <2.0",
     "jshint": "~2.5.4",
     "mocha": "~1.17.1"
   },
diff --git a/test/init.js b/test/init.js
@@ -53,7 +53,7 @@ function rulesChecker(opts) {
             items = items || [];
             items.forEach(function (test) {
 
-                (test.skip? it.skip : it)(test.it, function () {
+                (test.skip ? it.skip : it)(test.it, function () {
                     if (test.rules) {
                         checker.configure({ jsDoc: test.rules });
                     }
diff --git a/test/lib/rules/validate-jsdoc/leading-underscore-access.js b/test/lib/rules/validate-jsdoc/leading-underscore-access.js
@@ -70,7 +70,7 @@ describe('rules/validate-jsdoc', function () {
                      */
                     function _funcName(p) {}
                 },
-                errors: [{ line: 6, column: 0, message: "Method access doesn't match", rule: "jsDoc" }]
+                errors: [{ line: 6, column: 0, message: 'Method access doesn\'t match', rule: 'jsDoc' }]
             }, {
                 it: 'should skip anonymous',
                 rules: {leadingUnderscoreAccess: true},

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"preset": "google",`
`3`		`- "fileExtensions": "jscs",`
`4`	`3`
`5`	`4`	`"requireParenthesesAroundIIFE": true,`
`6`	`5`	`"maximumLineLength": 120,`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,9 @@ function jsDocParseComments (comments) {`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`function jsDocForEachTag (fn) {`
`33`		`- if (!this.data.tags \|\| !this.data.tags.length) return;`
	`33`	`+ if (!this.data.tags \|\| !this.data.tags.length) {`
	`34`	`+ return;`
	`35`	`+ }`
`34`	`36`	`this.data.tags.forEach(fn);`
`35`	`37`	`}`
`36`	`38`
Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,6 @@ module.exports.prototype = {`
`24`	`24`	`validators.checkOptions(v, options);`
`25`	`25`	`}`
`26`	`26`	`}.bind(this));`
`27`		`-`
`28`		`-`
`29`	`27`	`},`
`30`	`28`
`31`	`29`	`getOptionName: function () {`
Original file line number	Diff line number	Diff line change
`@@ -14,15 +14,15 @@ function checkRedundantAccess(node, err) {`
`14`	`14`	`return;`
`15`	`15`	`}`
`16`	`16`
`17`		`- var access;`
	`17`	`+ var access;`
`18`	`18`	`node.jsDoc.data.tags.forEach(function (tag) {`
`19`	`19`	`if (['private', 'protected', 'public', 'access'].indexOf(tag.tag) === -1) {`
`20`	`20`	`return;`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`if (access) {`
`24`		`- err('Multiple access definition');`
`25`		`- return;`
	`24`	`+ err('Multiple access definition');`
	`25`	`+ return;`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`if (tag.tag === 'access' && !tag.name) {`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ function validateLeadingUnderscoresAccess(node, err) {`
`27`	`27`	`name = node.parentNode.key.name;`
`28`	`28`	`break;`
`29`	`29`	`default: // try to use func name itself (if not anonymous)`
`30`		`- name = (node.id\|\|{}).name;`
	`30`	`+ name = (node.id \|\| {}).name;`
`31`	`31`	`break;`
`32`	`32`	`}`
`33`	`33`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ function rulesChecker(opts) {`
`53`	`53`	`items = items \|\| [];`
`54`	`54`	`items.forEach(function (test) {`
`55`	`55`
`56`		`- (test.skip? it.skip : it)(test.it, function () {`
	`56`	`+ (test.skip ? it.skip : it)(test.it, function () {`
`57`	`57`	`if (test.rules) {`
`58`	`58`	`checker.configure({ jsDoc: test.rules });`
`59`	`59`	`}`