Merge pull request #11 from azu/support-tilde

feat(prh): support ~/ path

Author: azu

package.json

@@ -32,15 +32,16 @@
     "prh"
   ],
   "dependencies": {
-    "prh": "^0.9.0",
+    "prh": "^1.0.1",
     "structured-source": "^3.0.2",
-    "textlint-rule-helper": "^1.1.3"
+    "textlint-rule-helper": "^1.1.3",
+    "untildify": "^3.0.2"
   },
   "devDependencies": {
     "babel-cli": "^6.7.5",
-    "babel-plugin-add-module-exports": "^0.1.2",
+    "babel-plugin-add-module-exports": "^0.2.1",
     "babel-preset-es2015": "^6.6.0",
-    "babel-preset-jsdoc-to-assert": "^1.0.1",
+    "babel-preset-jsdoc-to-assert": "^2.0.1",
     "babel-preset-power-assert": "^1.0.0",
     "babel-register": "^6.7.2",
     "mocha": "^2.3.2",

src/prh-rule.js

@@ -4,12 +4,14 @@ import {RuleHelper} from "textlint-rule-helper";
 import StructuredSource from "structured-source";
 import prh from "prh";
 import path from "path";
+const untildify = require('untildify');
 function createPrhEngine(rulePaths, baseDir) {
     if (rulePaths.length === 0) {
         return null;
     }
-    const prhEngine = prh.fromYAMLFilePath(path.resolve(baseDir, rulePaths[0]));
-    rulePaths.slice(1).forEach(ruleFilePath => {
+    const expandedRulePaths = rulePaths.map(rulePath => untildify(rulePath));
+    const prhEngine = prh.fromYAMLFilePath(path.resolve(baseDir, expandedRulePaths[0]));
+    expandedRulePaths.slice(1).forEach(ruleFilePath => {
         const config = prh.fromYAMLFilePath(path.resolve(baseDir, ruleFilePath));
         prhEngine.merge(config);
     });
@@ -82,10 +84,10 @@ function reporter(context, options = {}) {
                     return;
                 }
                 /*
-                line start with 1
-                column start with 0
+                 line start with 1
+                 column start with 0
 
-                adjust position => line -1, column +0
+                 adjust position => line -1, column +0
                  */
                 var position = src.indexToPosition(changeSet.index);
 

test/textlintrc-test.js

@@ -13,7 +13,7 @@ describe(".textlinrc test", function () {
                 "prh": rule
             }, {
                 "prh": {
-                    "rulePaths": [path.join(__dirname, "fixtures", "rule.yaml")]
+                    "rulePaths": [path.join(__dirname, "fixtures", "rule.yaml"), path.join(__dirname, "fixtures", "imports.yml")]
                 }
             });
             return textlint.lintMarkdown("jquery").then(result => {