Merge branch 'master' of github.com:gruntjs/grunt-contrib-jshint

* 'master' of github.com:gruntjs/grunt-contrib-jshint:
  v0.12.0
  Bump JSHint to v2.9.1.
  formatting
  make relative reporterOutput paths optional

CHANGELOG

@@ -1,3 +1,7 @@
+v0.12.0:
+  date: 2016-01-17
+  changes:
+    - Update to JSHint ~2.9.0.
 v0.11.3:
   date: 2015-09-03
   changes:

README.md

@@ -1,4 +1,4 @@
-# grunt-contrib-jshint v0.11.3 [![Build Status: Linux](https://travis-ci.org/gruntjs/grunt-contrib-jshint.svg?branch=master)](https://travis-ci.org/gruntjs/grunt-contrib-jshint) [![Build Status: Windows](https://ci.appveyor.com/api/projects/status/j04ik7qgx21ixyfw/branch/master?svg=true)](https://ci.appveyor.com/project/gruntjs/grunt-contrib-jshint/branch/master)
+# grunt-contrib-jshint v0.12.0 [![Build Status: Linux](https://travis-ci.org/gruntjs/grunt-contrib-jshint.svg?branch=master)](https://travis-ci.org/gruntjs/grunt-contrib-jshint) [![Build Status: Windows](https://ci.appveyor.com/api/projects/status/j04ik7qgx21ixyfw/branch/master?svg=true)](https://ci.appveyor.com/project/gruntjs/grunt-contrib-jshint/branch/master)
 
 > Validate files with JSHint
 
@@ -215,6 +215,7 @@ grunt.initConfig({
 
 ## Release History
 
+ * 2016-01-17   v0.12.0   Update to JSHint ~2.9.0.
  * 2015-09-03   v0.11.3   Update to JSHint ~2.8.0.
  * 2015-04-16   v0.11.2   Fix default value of the `reporter` option.
  * 2015-03-20   v0.11.1   Fix io.js compatibility issues. Other fixes to pathing.
@@ -253,4 +254,4 @@ grunt.initConfig({
 
 Task submitted by ["Cowboy" Ben Alman](http://benalman.com/)
 
-*This file was generated on Mon Oct 12 2015 00:56:47.*
+*This file was generated on Sun Jan 17 2016 13:06:03.*

package.json

@@ -1,7 +1,7 @@
 {
   "name": "grunt-contrib-jshint",
   "description": "Validate files with JSHint",
-  "version": "0.11.3",
+  "version": "0.12.0",
   "author": {
     "name": "Grunt Team",
     "url": "http://gruntjs.com/"
@@ -17,7 +17,7 @@
   },
   "dependencies": {
     "hooker": "^0.2.3",
-    "jshint": "~2.8.0"
+    "jshint": "~2.9.1"
   },
   "devDependencies": {
     "grunt": "^0.4.5",

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

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);