Merge pull request #214 from qudos-com/master

Make relative reporterOutput paths optional
gruntjs · Jan 23, 2016 · baa5913 · jsr6720 · May 19, 2016 · baa5913
2 parents cd26571 + efbb6f6
commit baa5913
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/tasks/jshint.js b/tasks/jshint.js
@@ -20,7 +20,8 @@ module.exports = function(grunt) {
     // Merge task-specific and/or target-specific options with these defaults.
     var options = this.options({
       force: false,
-      reporter: null
+      reporter: null,
+      reporterOutputRelative: true
     });
 
     // Report JSHint errors but dont fail the task

diff --git a/tasks/lib/jshint.js b/tasks/lib/jshint.js
@@ -156,15 +156,17 @@ exports.init = function(grunt) {
     var reporterOutputDir;
     // Get reporter output directory for relative paths in reporters
     if (options.hasOwnProperty('reporterOutput')) {
-      reporterOutputDir = path.dirname(options.reporterOutput);
+      if (options.reporterOutputRelative) {
+        reporterOutputDir = path.dirname(options.reporterOutput);
+      }
       delete options.reporterOutput;
     }
 
     // Select a reporter to use
     var reporter = exports.selectReporter(options);
 
     // Remove bad options that may have came in from the cli
-    ['reporter', 'jslint-reporter', 'checkstyle-reporter', 'show-non-errors'].forEach(function(opt) {
+    ['reporter', 'reporterOutputRelative', 'jslint-reporter', 'checkstyle-reporter', 'show-non-errors'].forEach(function(opt) {
       if (options.hasOwnProperty(opt)) {
         delete options[opt];
       }
@@ -194,9 +196,11 @@ exports.init = function(grunt) {
     var allData = [];
     cliOptions.args = files;
     cliOptions.reporter = function(results, data) {
-      results.forEach(function(datum) {
-        datum.file = reporterOutputDir ? path.relative(reporterOutputDir, datum.file) : datum.file;
-      });
+      if (reporterOutputDir) {
+        results.forEach(function(datum) {
+          datum.file = path.relative(reporterOutputDir, datum.file);
+        });
+      }
       reporter(results, data, options);
       allResults = allResults.concat(results);
       allData = allData.concat(data);