Merge pull request #329 from HaxeCheckstyle/exclude-path-option

exclude path option

Author: adireddy

checkstyle.json

@@ -518,59 +518,60 @@
 		}
 	],
 	"exclude": {
+		"path": "relative",
 		"all": [],
 		"Dynamic": [
-			"checkstyle.Main",
-			"checkstyle.Checker",
-			"checkstyle.ChecksInfo",
-			"checkstyle.checks.Check",
-			"checkstyle.checks.Directive",
-			"checkstyle.checks.whitespace.SpacingCheck",
-			"checkstyle.checks.imports.UnusedImportCheck",
+			"checkstyle/Main",
+			"checkstyle/Checker",
+			"checkstyle/ChecksInfo",
+			"checkstyle/checks/Check",
+			"checkstyle/checks/Directive",
+			"checkstyle/checks/whitespace/SpacingCheck",
+			"checkstyle/checks/imports/UnusedImportCheck",
 			"TestMain",
-			"misc.ExtensionsTest",
-			"token.TokenTreeBuilderParsingTest"
+			"misc/ExtensionsTest",
+			"token/TokenTreeBuilderParsingTest"
 		],
 		"MultipleStringLiterals": [
 			"checks",
 			"token"
 		],
 		"CyclomaticComplexity": [
-			"checkstyle.checks.Check",
-			"checkstyle.utils.ExprUtils",
-			"checkstyle.utils.ComplexTypeUtils",
-			"checkstyle.checks.metrics.CyclomaticComplexityCheck",
-			"checkstyle.checks.block.LeftCurlyCheck",
-			"checkstyle.checks.block.RightCurlyCheck",
-			"checkstyle.checks.naming.MethodNameCheck",
-			"checkstyle.checks.type.ReturnCheck",
-			"checkstyle.checks.whitespace.OperatorWrapCheck",
-			"checkstyle.checks.whitespace.WhitespaceAfterCheck",
-			"checkstyle.checks.whitespace.WhitespaceAroundCheck",
-			"checkstyle.checks.block.EmptyBlockCheck",
-			"checkstyle.checks.whitespace.EmptyLinesCheck",
-			"checkstyle.token.walk.WalkStatement"
+			"checkstyle/checks/Check",
+			"checkstyle/utils/ExprUtils",
+			"checkstyle/utils/ComplexTypeUtils",
+			"checkstyle/checks/metrics/CyclomaticComplexityCheck",
+			"checkstyle/checks/block/LeftCurlyCheck",
+			"checkstyle/checks/block/RightCurlyCheck",
+			"checkstyle/checks/naming/MethodNameCheck",
+			"checkstyle/checks/type/ReturnCheck",
+			"checkstyle/checks/whitespace/OperatorWrapCheck",
+			"checkstyle/checks/whitespace/WhitespaceAfterCheck",
+			"checkstyle/checks/whitespace/WhitespaceAroundCheck",
+			"checkstyle/checks/block/EmptyBlockCheck",
+			"checkstyle/checks/whitespace/EmptyLinesCheck",
+			"checkstyle/token/walk/WalkStatement"
 		],
 		"LeftCurly": [
-			"checkstyle.checks.metrics.CyclomaticComplexityCheck"
+			"checkstyle/checks/metrics/CyclomaticComplexityCheck"
 		],
 		"RightCurly": [
-			"checkstyle.checks.metrics.CyclomaticComplexityCheck"
+			"checkstyle/checks/metrics/CyclomaticComplexityCheck"
 		],
 		"MethodCount": [
-			"checkstyle.token.TokenTreeBuilder"
+			"checkstyle/token/TokenTreeBuilder"
 		],
 		"MethodLength": [
-			"checkstyle.checks.whitespace.WhitespaceAfterCheck",
-			"checkstyle.checks.whitespace.WhitespaceAroundCheck",
-			"checkstyle.checks.whitespace.EmptyLinesCheck",
-			"checkstyle.token.walk.WalkStatement"
+			"checkstyle/checks/whitespace/WhitespaceAfterCheck",
+			"checkstyle/checks/whitespace/WhitespaceAroundCheck",
+			"checkstyle/checks/whitespace/EmptyLinesCheck",
+			"checkstyle/token/walk/WalkStatement"
 		],
 		"NestedForDepth": [
 			"TestMain"
 		],
 		"MemberName": [
-			"checkstyle.Main"
+			"checkstyle/Main"
 		]
 	}
 }

haxelib.json

@@ -16,8 +16,8 @@
 	"contributors": [
 		"adireddy"
 	],
-	"releasenote": "new PublicAccessorCheck and bug fixes",
-	"version": "2.1.12",
+	"releasenote": "added path option in exclude config",
+	"version": "2.1.13",
 	"url": "https://github.com/HaxeCheckstyle/haxe-checkstyle",
 	"dependencies": {
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "checkstyle",
-  "version": "2.1.12",
+  "version": "2.1.13",
   "description": "Automated code analysis ideal for projects that want to enforce a coding standard.",
   "repository": {
     "type": "git",

src/checkstyle/Main.hx

@@ -33,6 +33,8 @@ class Main {
 	static var CODE_CLIMATE_REPORTER:String = "codeclimate";
 	static var SHOW_MISSING_CHECKS:Bool = false;
 	static var exitCode:Int;
+	static var PATH_TYPE_RELATIVE:String = "relative";
+	static var PATH_TYPE_ABSOLUTE:String = "absolute";
 
 	var info:ChecksInfo;
 	var checker:Checker;
@@ -143,21 +145,32 @@ class Main {
 
 	function parseExcludes(config:ExcludeConfig) {
 		var excludes = Reflect.fields(config);
+		var pathType = Reflect.field(config, "path");
+		if (pathType == null) pathType = PATH_TYPE_RELATIVE;
 		for (exclude in excludes) {
+			if (exclude == "path") continue;
 			createExcludeMapElement(exclude);
 			var excludeValues:Array<String> = Reflect.field(config, exclude);
 			if (excludeValues == null || excludeValues.length == 0) continue;
-			for (val in excludeValues) updateExcludes(exclude, val);
+			for (val in excludeValues) updateExcludes(exclude, val, pathType);
 		}
 	}
 
 	function createExcludeMapElement(exclude:String) {
 		if (excludesMap.get(exclude) == null) excludesMap.set(exclude, []);
 	}
 
-	function updateExcludes(exclude:String, val:String) {
-		for (p in paths) {
-			var path = p + "/" + val.split(".").join("/");
+	function updateExcludes(exclude:String, val:String, pathType:String) {
+		if (pathType == PATH_TYPE_RELATIVE) {
+			for (p in paths) {
+				//var basePath = ~/[\/\\]/.split(p)[0];
+				var path = p + "/" + val.split(".").join("/");
+				if (exclude == "all") allExcludes.push(path);
+				else excludesMap.get(exclude).push(path);
+			}
+		}
+		else {
+			var path = val.split(".").join("/");
 			if (exclude == "all") allExcludes.push(path);
 			else excludesMap.get(exclude).push(path);
 		}