Merge pull request #700 from li-qiang/master

dxg · dxg · commit c91227128acc · 2016-01-26T09:26:18.000+11:00
Fix bug for windows path
diff --git a/lib/Utilities.js b/lib/Utilities.js
@@ -282,9 +282,9 @@ exports.getRealPath = function (path_str, stack_index) {
 	} else if ((m = tmp.match(/^\s*at\s+.+\s+\((.+):\d+:\d+\)$/)) !== null) {
 		cwd = path.dirname(m[1]);
 	}
-
-	if (path_str[0] !== path.sep) {
-		path_str = cwd + "/" + path_str;
+	var pathIsAbsolute = path.isAbsolute || require('path-is-absolute');
+	if (!pathIsAbsolute(path_str)) {
+		path_str = path.join(cwd, path_str);
 	}
 	if (path_str.substr(-1) === path.sep) {
 		path_str += "index";
diff --git a/package.json b/package.json
@@ -36,11 +36,12 @@
 	},
 	"analyse"     : false,
 	"dependencies": {
-		"enforce"      : "0.1.6",
-		"sql-query"    : "0.1.26",
-		"sql-ddl-sync" : "0.3.11",
-		"hat"          : "0.0.3",
-		"lodash"       : "2.4.1"
+		"enforce"          : "0.1.6",
+		"sql-query"        : "0.1.26",
+		"sql-ddl-sync"     : "0.3.11",
+		"hat"              : "0.0.3",
+		"lodash"           : "2.4.1",
+		"path-is-absolute" : "1.0.0"
 	},
 	"devDependencies": {
 		"mysql"   : "2.9.0",

Original file line number	Diff line number	Diff line change
`@@ -282,9 +282,9 @@ exports.getRealPath = function (path_str, stack_index) {`
`282`	`282`	`} else if ((m = tmp.match(/^\s*at\s+.+\s+\((.+):\d+:\d+\)$/)) !== null) {`
`283`	`283`	`cwd = path.dirname(m[1]);`
`284`	`284`	`}`
`285`		`-`
`286`		`- if (path_str[0] !== path.sep) {`
`287`		`- path_str = cwd + "/" + path_str;`
	`285`	`+ var pathIsAbsolute = path.isAbsolute \|\| require('path-is-absolute');`
	`286`	`+ if (!pathIsAbsolute(path_str)) {`
	`287`	`+ path_str = path.join(cwd, path_str);`
`288`	`288`	`}`
`289`	`289`	`if (path_str.substr(-1) === path.sep) {`
`290`	`290`	`path_str += "index";`