only allow relative paths to config files, update README

aquifer · Nov 25, 2015 · eb3bfd0 · eb3bfd0
1 parent 0df02fa
commit eb3bfd0
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -26,8 +26,9 @@ _in your `aquifer.json` file:_
 "extensions": {
   "aquifer-coder": {
     "source": "aquifer-coder",
-    "eslintrc": "/path/to/eslintrc",
-    "phpcsStandard": "/path/to/phpcsStandardFile"
+    "eslintrc": "relative/path/to/.eslintrc",
+    "eslintIgnore": "relative/path/to/.eslintignore"
+    "phpcsStandard": "relative/path/to/phpcsStandardFile"
   }
 }
 ...

diff --git a/aquifer-coder.js b/aquifer-coder.js
@@ -20,13 +20,25 @@ module.exports = function(Aquifer, AquiferCoderConfig) {
       fs           = require('fs-extra'),
       syncExec     = require('sync-exec');
 
+  // Turn any passed-in paths into full paths.
+  if (AquiferCoderConfig.hasOwnProperty('eslintrc')) {
+    AquiferCoderConfig.eslintrc = path.join(Aquifer.projectDir, AquiferCoderConfig.eslintrc);
+  }
+  if (AquiferCoderConfig.hasOwnProperty('eslintIgnore')) {
+    AquiferCoderConfig.eslintIgnore = path.join(Aquifer.projectDir, AquiferCoderConfig.eslintIgnore);
+  }
+  if (AquiferCoderConfig.hasOwnProperty('phpcsStandard')) {
+    AquiferCoderConfig.phpcsStandard = path.join(Aquifer.projectDir, AquiferCoderConfig.phpcsStandard);
+  }
+
   // Create defauts for options.
   _.defaults(AquiferCoderConfig, {
     eslintrc: path.join(__dirname, 'src', '.eslintrc'),
     eslintIgnore: path.join(__dirname, 'src', '.eslintignore'),
     phpcsStandard: path.join(__dirname, '/vendor/drupalmodule/coder/coder_sniffer/Drupal')
   });
 
+
   /**
    * Creates a commands that are exported to Aquifer command.
    * @returns {object} commands to be added to Aquifer.