Support for pug-lint v2.2.0

Author: mrmlnc

Diff for: .travis.yml

@@ -6,6 +6,3 @@ node_js:
   - '4'
   - '0.12'
   - '0.10'
-
-before_script:
-  - npm install -g grunt-cli

Diff for: Gruntfile.js

@@ -1,50 +1,40 @@
-/*
- * grunt-puglint
- * https://github.com/mrmlnc/grunt-puglint
- */
-
 'use strict';
 
-module.exports = function (grunt) {
+module.exports = function(grunt) {
   grunt.initConfig({
     puglint: {
-      // Default test with default `clock` config
-      clock: {
+      default: {
         src: ['test/fixtures/**/*.jade']
       },
 
-      // Custom config with the string in the options
-      customConfigString: {
+      extendsClock: {
         options: {
-          preset: 'jadelint'
+          extends: 'clock'
         },
         src: ['test/fixtures/**/*.jade']
       },
 
-      // Custom config with the object in the options
-      customConfigObject: {
+      extendsPath: {
         options: {
-          preset: {
-            disallowIdLiterals: true
-          }
+          extends: './test/fixtures/.pug-lintrc'
         },
         src: ['test/fixtures/**/*.jade']
       },
 
-      // Array messages
-      arrayMessages: {
+      customConfigObject: {
         options: {
-          preset: {
-            disallowSpacesInsideAttributeBrackets: true
+          config: {
+            disallowIdLiterals: true
           }
         },
         src: ['test/fixtures/**/*.jade']
       },
 
-      // RC file
-      rcFile: {
+      arrayMessages: {
         options: {
-          puglintrc: 'test/fixtures/.pug-lintrc'
+          config: {
+            disallowSpacesInsideAttributeBrackets: true
+          }
         },
         src: ['test/fixtures/**/*.jade']
       }

Diff for: README.md

@@ -10,7 +10,7 @@
 ![image](https://cloud.githubusercontent.com/assets/7034281/12007446/c55156a8-ac15-11e5-9fda-4be1167c5709.png)
 
 ## Getting Started
-This plugin requires Grunt `~0.4.5`
+This plugin requires Grunt `~1.0.0`
 
 If you haven't used [Grunt](http://gruntjs.com/) before, be sure to check out the [Getting Started](http://gruntjs.com/getting-started) guide, as it explains how to create a [Gruntfile](http://gruntjs.com/sample-gruntfile) as well as install and use Grunt plugins. Once you're familiar with that process, you may install this plugin with this command:
 
@@ -26,24 +26,21 @@ grunt.loadNpmTasks('grunt-puglint');
 
 ## Usage
 
-If you need a clean config settings, then use the object(`preset: {}`) or config file (`puglintrc: '..'`).
+To configure validator, use the property `config`.
 
 ```js
 puglint: {
   taskName: {
     options: {
-      // The name of the preset: `clock` (default) or `jadelint`
-      preset: 'clock',
-      // If preset is an object, the standard preset is not loaded
-      preset: {
+      // Use preset: npm i -D pug-lint-config-clock
+      config: {
+        extends: 'clock'
+      },
+      // Or config
+      config: {
         disallowHtmlText: true,
         validateIndentation: 4
       }
-      // The path to the configuration file
-      puglintrc: 'test/fixtures/.pug-lintrc',
-      // Override preset settings (default: `clock`)
-      disallowHtmlText: true,
-      validateIndentation: 4
     },
     src: ['test/fixtures/**/*.jade']
   }
@@ -64,9 +61,10 @@ Plugin can read [.pug-lintrc file](https://github.com/pugjs/pug-lint#configurati
 
 [List of available rules](https://github.com/pugjs/pug-lint/blob/master/docs/rules.md).
 
-## History
+## Changelog
 
-  * **v0.1.3** [2016-03-09] - Fix failure when item.msg is array. Thanks [@Antiavanti](https://github.com/mrmlnc/grunt-puglint/pull/2).
-  * **v0.1.2** [2016-02-17] - Make sure the task fails whenever an error is found in any file. Thanks **@rdevaissiere**.
-  * **v0.1.1** [2015-12-26] - Add `xo` to test section.
-  * **v0.1.0** [2015-12-26] - Initial release.
+See the [Releases section of our GitHub project](https://github.com/mrmlnc/grunt-puglint/releases) for changelogs for each release version.
+
+## License
+
+This software is released under the terms of the MIT license.

Diff for: package.json

@@ -2,29 +2,22 @@
   "name": "grunt-puglint",
   "description": "Grunt plugin for pug-lint",
   "version": "0.1.3",
+  "license": "MIT",
+  "repository": "mrmlnc/grunt-puglint",
   "author": {
     "name": "Denis Malinochkin",
-    "email": "[email protected]"
+    "url": "canonium.com"
   },
-  "repository": "mrmlnc/grunt-puglint",
-  "license": "MIT",
   "engines": {
-    "node": ">= 0.8.0"
+    "node": ">=0.10.0"
   },
   "scripts": {
-    "test": "xo && ava test/test.js"
-  },
-  "devDependencies": {
-    "ava": "^0.8.0",
-    "grunt": "~0.4.5",
-    "rcloader": "^0.1.4",
-    "xo": "^0.12.1"
-  },
-  "dependencies": {
-    "chalk": "^1.1.1",
-    "pug-lint": "^2.1.1",
-    "text-table": "^0.2.0"
+    "test": "xo && mocha"
   },
+  "files": [
+    "tasks",
+    "lib"
+  ],
   "keywords": [
     "gruntplugin",
     "grunt",
@@ -37,21 +30,31 @@
     "lint",
     "hint"
   ],
-  "files": [
-    "tasks",
-    "lib"
-  ],
+  "devDependencies": {
+    "grunt": "~1.0.1",
+    "mocha": "^2.5.3",
+    "pug-lint-config-clock": "^1.1.1",
+    "xo": "^0.15.1"
+  },
+  "dependencies": {
+    "chalk": "^1.1.3",
+    "pug-lint": "^2.2.0",
+    "text-table": "^0.2.0"
+  },
   "xo": {
-    "space": true,
     "rules": {
-      "object-curly-spacing": [
-        2,
-        "always"
-      ],
-      "space-before-function-paren": 0
+      "indent": [2, 2, { "SwitchCase": 1 }],
+      "arrow-parens": [2, "always"],
+      "object-curly-spacing": [2, "always"],
+      "babel/object-curly-spacing": 0,
+      "space-before-function-paren": [2, "never"]
     },
+    "ignores": [
+      "test/**"
+    ],
     "envs": [
-      "node"
+      "node",
+      "mocha"
     ]
   }
 }

Diff for: tasks/puglint.js

@@ -10,23 +10,12 @@ var linter = new PugLint();
 var formatter = require('../lib/formatter');
 
 module.exports = function(grunt) {
-  grunt.registerMultiTask('puglint', 'Grunt plugin for pug-lint', function () {
+  grunt.registerMultiTask('puglint', 'Grunt plugin for pug-lint', function() {
     var done = this.async();
-    var options = this.options({
-      preset: 'clock'
-    });
-
-    if (typeof options.preset === 'object') {
-      options = options.preset;
-    }
+    var options = this.options({});
 
-    var pugLintRc = options.puglintrc;
-    if (pugLintRc) {
-      if (grunt.file.exists(pugLintRc)) {
-        options = grunt.file.readJSON(pugLintRc);
-      } else {
-        grunt.log.error('Configuration file not found. Used a standard config: `clock`.');
-      }
+    if (typeof options.config === 'object') {
+      options = options.config;
     }
 
     linter.configure(options);

Diff for: test/test.js

@@ -1,51 +1,46 @@
 'use strict';
 
-const test = require('ava');
-const exec = require('child_process').exec;
+var assert = require('assert');
+var exec = require('child_process').exec;
 
-test.cb('Default test with default `clock` config', function(t) {
-  exec('grunt puglint:clock', function(err, stdout) {
-    var isOneError = /ID literals must/.test(stdout.toString());
-    var isTwoError = /REQUIRECLASSLITERALSBEFOREIDLITERALS/.test(stdout.toString());
-
-    t.same(isOneError && isTwoError, true);
-    t.end();
+it('Should work without preferences', function(done) {
+  exec('grunt puglint:default', function(err, stdout) {
+    assert.equal(/Done\./.test(stdout), true);
+    done();
   });
 });
 
-test.cb('Custom config with the string in the options', function(t) {
-  exec('grunt puglint:customConfigString', function(err, stdout) {
-    var isOneError = /DISALLOWSPECIFICATTRIBUTES/.test(stdout.toString());
+it('Should work with extends from preset', function(done) {
+  exec('grunt puglint:extendsClock', function(err, stdout) {
+    var isOneError = /DISALLOWIDLITERALS/.test(stdout);
+    var isTwoError = /REQUIRECLASSLITERALSBEFOREIDLI/.test(stdout);
+    var isThreeError = /Missing line feed at file end/.test(stdout);
 
-    t.same(isOneError, true);
-    t.end();
+    assert.equal(isOneError && isTwoError && isThreeError, true);
+    done();
   });
 });
 
-test.cb('Custom config with the object in the options', function(t) {
-  exec('grunt puglint:customConfigObject', function(err, stdout) {
-    var isOneError = /DISALLOWIDLITERALS/.test(stdout.toString());
-
-    t.same(isOneError, true);
-    t.end();
+it('Should work with extends from path', function(done) {
+  exec('grunt puglint:extendsPath', function(err, stdout) {
+    assert.equal(/REQUIRECLASSLITERALSBEFOREIDLITERALS/.test(stdout), true);
+    done();
   });
 });
 
-test.cb('Array messages', function(t) {
-  exec('grunt puglint:arrayMessages', function(err, stdout) {
-    var isOneError = /Illegal space after opening bracket\s+DISALLOWSPACESINSIDEATTRIBUTEBRACKETS/.test(stdout.toString());
-    var isTwoError = /Illegal space before closing bracket\s+DISALLOWSPACESINSIDEATTRIBUTEBRACKETS/.test(stdout.toString());
-
-    t.same(isOneError && isTwoError, true);
-    t.end();
+it('Should work with the object in the option', function(done) {
+  exec('grunt puglint:customConfigObject', function(err, stdout) {
+    assert.equal(/DISALLOWIDLITERALS/.test(stdout), true);
+    done();
   });
 });
 
-test.cb('RC file', function(t) {
-  exec('grunt puglint:rcFile', function(err, stdout) {
-    var isOneError = /REQUIRECLASSLITERALSBEFOREIDLITERALS/.test(stdout.toString());
+it('Should work with array messages', function(done) {
+  exec('grunt puglint:arrayMessages', function(err, stdout) {
+    var isOneError = /Illegal space after opening bracket/.test(stdout);
+    var isTwoError = /Illegal space before closing bracket/.test(stdout);
 
-    t.same(isOneError, true);
-    t.end();
+    assert.equal(isOneError && isTwoError, true);
+    done();
   });
 });