Merge pull request #31 from twbs/deps

Update deps

6 files changed, 29 insertions, 50 deletions

diff --git a/.eslintrc b/.eslintrc
index 93b72a6..91f00bd 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,4 +1,5 @@
 {
+    "root": true,
     "env": {
         "node": true
     },
@@ -14,6 +15,7 @@
         "eqeqeq": 2,
         "indent": [2, 2],
         "key-spacing": [2, {"beforeColon": false, "afterColon": true}],
+        "keyword-spacing": 2,
         "new-cap": 2,
         "new-parens": 2,
         "no-array-constructor": 2,
@@ -28,8 +30,8 @@
         "no-inline-comments": 0,
         "no-irregular-whitespace": 2,
         "no-mixed-spaces-and-tabs": 2,
-        "no-multi-spaces": 2,
         "no-multiple-empty-lines": 0,
+        "no-multi-spaces": 2,
         "no-new-object": 2,
         "no-param-reassign": 0,
         "no-process-env": 2,
@@ -40,6 +42,7 @@
         "no-trailing-spaces": 2,
         "no-underscore-dangle": 0,
         "no-void": 2,
+        "object-curly-spacing": [2, "never"],
         "one-var": [2, "never"],
         "operator-assignment": [2, "always"],
         "padded-blocks": 0,
@@ -47,14 +50,10 @@
         "radix": 2,
         "semi": [2, "always"],
         "semi-spacing": [2, {"before": false, "after": true}],
-        "space-after-keywords": [2, "always", {"checkFunctionKeyword": true}],
         "space-before-blocks": [2, "always"],
-        "space-before-function-parentheses": [2, {"anonymous": "always", "named": "never"}],
-        "space-in-brackets": [2, "never"],
+        "spaced-comment": [2, "always"],
         "space-in-parens": [2, "never"],
-        "space-return-throw-case": 2,
         "space-unary-ops": [2, {"words": true, "nonwords": false}],
-        "spaced-line-comment": [2, "always"],
         "strict": [2, "global"],
         "vars-on-top": 0,
         "wrap-iife": [2, "inside"],
diff --git a/.travis.yml b/.travis.yml
index 33debdd..3cb8101 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,12 @@
+sudo: false
 language: node_js
 node_js:
+  - "5"
+  - "4"
   - "0.12"
+  - "0.10"
 install:
   - npm install -g grunt-cli
   - npm install
+matrix:
+  fast_finish: true
diff --git a/README.md b/README.md
index 18cb70b..4f62d69 100644
--- a/README.md
+++ b/README.md
@@ -1,18 +1,17 @@
 # grunt-css-flip
 
-[![NPM version](https://badge.fury.io/js/grunt-css-flip.svg)](http://badge.fury.io/js/grunt-css-flip)
-[![Build Status](https://travis-ci.org/twbs/grunt-css-flip.svg?branch=master)](https://travis-ci.org/twbs/grunt-css-flip)
+[![NPM version](https://img.shields.io/npm/v/grunt-css-flip.svg)](https://www.npmjs.com/package/grunt-css-flip)
+[![Build Status](https://img.shields.io/travis/twbs/grunt-css-flip.svg?branch=master)](https://travis-ci.org/twbs/grunt-css-flip)
 ![Development Status :: 5 - Production/Stable](https://img.shields.io/badge/maturity-stable-green.svg "Development Status :: 5 - Production/Stable")
 [![MIT License](https://img.shields.io/npm/l/grunt-css-flip.svg)](https://github.com/twbs/grunt-css-flip/blob/master/LICENSE)
-[![Dependency Status](https://david-dm.org/twbs/grunt-css-flip.svg)](https://david-dm.org/twbs/grunt-css-flip)
-[![devDependency Status](https://david-dm.org/twbs/grunt-css-flip/dev-status.svg)](https://david-dm.org/twbs/grunt-css-flip#info=devDependencies)
+[![Dependency Status](https://img.shields.io/david/twbs/grunt-css-flip.svg)](https://david-dm.org/twbs/grunt-css-flip)
+[![devDependency Status](https://img.shields.io/david/dev/twbs/grunt-css-flip.svg)](https://david-dm.org/twbs/grunt-css-flip#info=devDependencies)
+
 
 > Grunt plugin for [Twitter's css-flip](https://github.com/twitter/css-flip)
 
 ## Getting Started
 
-This plugin requires Grunt `~0.4.3`.
-
 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:
 
 ```shell
@@ -52,14 +51,14 @@ All options are passed directly to css-flip's `flip()` function.
 None of the options are required.
 
 #### options.compress
-Type: `Boolean`
-Default value: `false`
+* Type: `Boolean`
+* Default: `false`
 
 Whether to slightly compress output. Some newlines and indentation are removed. Comments stay intact.
 
 #### options.indent
-Type: `String`
-Default value: `'  '` (two spaces)
+* Type: `String`
+* Default: `'  '` (two spaces)
 
 String value to use for 1 level of indentation in the output.
 
diff --git a/package.json b/package.json
index a2fdd90..15df528 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
   "author": "Chris Rebert <code@rebertia.com> (http://chrisrebert.com)",
   "repository": {
     "type": "git",
-    "url": "https://github.com/twbs/grunt-css-flip.git"
+    "url": "git+https://github.com/twbs/grunt-css-flip.git"
   },
   "bugs": {
     "url": "https://github.com/twbs/grunt-css-flip/issues"
@@ -20,19 +20,19 @@
     "test": "grunt test"
   },
   "dependencies": {
-    "css-flip": "~0.5.0"
+    "css-flip": "^0.5.0"
   },
   "devDependencies": {
-    "grunt": "~0.4.5",
-    "grunt-contrib-clean": "^0.6.0",
-    "grunt-contrib-jshint": "^0.11.0",
-    "grunt-contrib-nodeunit": "^0.4.1",
-    "grunt-eslint": "^10.0.0",
-    "grunt-jscs": "^1.5.0",
+    "grunt": "^0.4.5",
+    "grunt-contrib-clean": "^1.0.0",
+    "grunt-contrib-jshint": "^1.0.0",
+    "grunt-contrib-nodeunit": "^1.0.0",
+    "grunt-eslint": "^18.0.0",
+    "grunt-jscs": "^2.7.0",
     "load-grunt-tasks": "^3.1.0"
   },
   "peerDependencies": {
-    "grunt": "~0.4.3"
+    "grunt": ">=0.4.5"
   },
   "engines": {
     "node": ">= 0.10.0"
diff --git a/tasks/cssflip.js b/tasks/cssflip.js
index 71ffd31..2d7d9ac 100644
--- a/tasks/cssflip.js
+++ b/tasks/cssflip.js
@@ -10,7 +10,6 @@
 
 var flip = require('css-flip');
 
-
 module.exports = function (grunt) {
   grunt.registerMultiTask('cssflip', 'Grunt plugin for Twitter\'s css-flip', function () {
     var options = this.options({});
diff --git a/test/cssflip_test.js b/test/cssflip_test.js
index b62ced7..15e8427 100644
--- a/test/cssflip_test.js
+++ b/test/cssflip_test.js
@@ -2,31 +2,7 @@
 
 var grunt = require('grunt');
 
-/*
-  ======== A Handy Little Nodeunit Reference ========
-  https://github.com/caolan/nodeunit
-
-  Test methods:
-    test.expect(numAssertions)
-    test.done()
-  Test assertions:
-    test.ok(value, [message])
-    test.equal(actual, expected, [message])
-    test.notEqual(actual, expected, [message])
-    test.deepEqual(actual, expected, [message])
-    test.notDeepEqual(actual, expected, [message])
-    test.strictEqual(actual, expected, [message])
-    test.notStrictEqual(actual, expected, [message])
-    test.throws(block, [error], [message])
-    test.doesNotThrow(block, [error], [message])
-    test.ifError(value)
-*/
-
 exports.cssflip = {
-  setUp: function (done) {
-    // setup here if necessary
-    done();
-  },
   defaultOptions: function (test) {
     test.expect(1);