Skip to content
This repository was archived by the owner on Sep 17, 2018. It is now read-only.

Commit 0fdccc1

Browse files
committed
Merge pull request #31 from twbs/deps
Update deps
2 parents 37eb8e1 + e266114 commit 0fdccc1

6 files changed

Lines changed: 29 additions & 50 deletions

File tree

.eslintrc

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
"root": true,
23
"env": {
34
"node": true
45
},
@@ -14,6 +15,7 @@
1415
"eqeqeq": 2,
1516
"indent": [2, 2],
1617
"key-spacing": [2, {"beforeColon": false, "afterColon": true}],
18+
"keyword-spacing": 2,
1719
"new-cap": 2,
1820
"new-parens": 2,
1921
"no-array-constructor": 2,
@@ -28,8 +30,8 @@
2830
"no-inline-comments": 0,
2931
"no-irregular-whitespace": 2,
3032
"no-mixed-spaces-and-tabs": 2,
31-
"no-multi-spaces": 2,
3233
"no-multiple-empty-lines": 0,
34+
"no-multi-spaces": 2,
3335
"no-new-object": 2,
3436
"no-param-reassign": 0,
3537
"no-process-env": 2,
@@ -40,21 +42,18 @@
4042
"no-trailing-spaces": 2,
4143
"no-underscore-dangle": 0,
4244
"no-void": 2,
45+
"object-curly-spacing": [2, "never"],
4346
"one-var": [2, "never"],
4447
"operator-assignment": [2, "always"],
4548
"padded-blocks": 0,
4649
"quotes": 0,
4750
"radix": 2,
4851
"semi": [2, "always"],
4952
"semi-spacing": [2, {"before": false, "after": true}],
50-
"space-after-keywords": [2, "always", {"checkFunctionKeyword": true}],
5153
"space-before-blocks": [2, "always"],
52-
"space-before-function-parentheses": [2, {"anonymous": "always", "named": "never"}],
53-
"space-in-brackets": [2, "never"],
54+
"spaced-comment": [2, "always"],
5455
"space-in-parens": [2, "never"],
55-
"space-return-throw-case": 2,
5656
"space-unary-ops": [2, {"words": true, "nonwords": false}],
57-
"spaced-line-comment": [2, "always"],
5857
"strict": [2, "global"],
5958
"vars-on-top": 0,
6059
"wrap-iife": [2, "inside"],

.travis.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
1+
sudo: false
12
language: node_js
23
node_js:
4+
- "5"
5+
- "4"
36
- "0.12"
7+
- "0.10"
48
install:
59
- npm install -g grunt-cli
610
- npm install
11+
matrix:
12+
fast_finish: true

README.md

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
# grunt-css-flip
22

3-
[![NPM version](https://badge.fury.io/js/grunt-css-flip.svg)](http://badge.fury.io/js/grunt-css-flip)
4-
[![Build Status](https://travis-ci.org/twbs/grunt-css-flip.svg?branch=master)](https://travis-ci.org/twbs/grunt-css-flip)
3+
[![NPM version](https://img.shields.io/npm/v/grunt-css-flip.svg)](https://www.npmjs.com/package/grunt-css-flip)
4+
[![Build Status](https://img.shields.io/travis/twbs/grunt-css-flip.svg?branch=master)](https://travis-ci.org/twbs/grunt-css-flip)
55
![Development Status :: 5 - Production/Stable](https://img.shields.io/badge/maturity-stable-green.svg "Development Status :: 5 - Production/Stable")
66
[![MIT License](https://img.shields.io/npm/l/grunt-css-flip.svg)](https://github.com/twbs/grunt-css-flip/blob/master/LICENSE)
7-
[![Dependency Status](https://david-dm.org/twbs/grunt-css-flip.svg)](https://david-dm.org/twbs/grunt-css-flip)
8-
[![devDependency Status](https://david-dm.org/twbs/grunt-css-flip/dev-status.svg)](https://david-dm.org/twbs/grunt-css-flip#info=devDependencies)
7+
[![Dependency Status](https://img.shields.io/david/twbs/grunt-css-flip.svg)](https://david-dm.org/twbs/grunt-css-flip)
8+
[![devDependency Status](https://img.shields.io/david/dev/twbs/grunt-css-flip.svg)](https://david-dm.org/twbs/grunt-css-flip#info=devDependencies)
9+
910

1011
> Grunt plugin for [Twitter's css-flip](https://github.com/twitter/css-flip)
1112
1213
## Getting Started
1314

14-
This plugin requires Grunt `~0.4.3`.
15-
1615
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:
1716

1817
```shell
@@ -52,14 +51,14 @@ All options are passed directly to css-flip's `flip()` function.
5251
None of the options are required.
5352

5453
#### options.compress
55-
Type: `Boolean`
56-
Default value: `false`
54+
* Type: `Boolean`
55+
* Default: `false`
5756

5857
Whether to slightly compress output. Some newlines and indentation are removed. Comments stay intact.
5958

6059
#### options.indent
61-
Type: `String`
62-
Default value: `' '` (two spaces)
60+
* Type: `String`
61+
* Default: `' '` (two spaces)
6362

6463
String value to use for 1 level of indentation in the output.
6564

package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"author": "Chris Rebert <[email protected]> (http://chrisrebert.com)",
77
"repository": {
88
"type": "git",
9-
"url": "https://github.com/twbs/grunt-css-flip.git"
9+
"url": "git+https://github.com/twbs/grunt-css-flip.git"
1010
},
1111
"bugs": {
1212
"url": "https://github.com/twbs/grunt-css-flip/issues"
@@ -20,19 +20,19 @@
2020
"test": "grunt test"
2121
},
2222
"dependencies": {
23-
"css-flip": "~0.5.0"
23+
"css-flip": "^0.5.0"
2424
},
2525
"devDependencies": {
26-
"grunt": "~0.4.5",
27-
"grunt-contrib-clean": "^0.6.0",
28-
"grunt-contrib-jshint": "^0.11.0",
29-
"grunt-contrib-nodeunit": "^0.4.1",
30-
"grunt-eslint": "^10.0.0",
31-
"grunt-jscs": "^1.5.0",
26+
"grunt": "^0.4.5",
27+
"grunt-contrib-clean": "^1.0.0",
28+
"grunt-contrib-jshint": "^1.0.0",
29+
"grunt-contrib-nodeunit": "^1.0.0",
30+
"grunt-eslint": "^18.0.0",
31+
"grunt-jscs": "^2.7.0",
3232
"load-grunt-tasks": "^3.1.0"
3333
},
3434
"peerDependencies": {
35-
"grunt": "~0.4.3"
35+
"grunt": ">=0.4.5"
3636
},
3737
"engines": {
3838
"node": ">= 0.10.0"

tasks/cssflip.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
var flip = require('css-flip');
1212

13-
1413
module.exports = function (grunt) {
1514
grunt.registerMultiTask('cssflip', 'Grunt plugin for Twitter\'s css-flip', function () {
1615
var options = this.options({});

test/cssflip_test.js

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,7 @@
22

33
var grunt = require('grunt');
44

5-
/*
6-
======== A Handy Little Nodeunit Reference ========
7-
https://github.com/caolan/nodeunit
8-
9-
Test methods:
10-
test.expect(numAssertions)
11-
test.done()
12-
Test assertions:
13-
test.ok(value, [message])
14-
test.equal(actual, expected, [message])
15-
test.notEqual(actual, expected, [message])
16-
test.deepEqual(actual, expected, [message])
17-
test.notDeepEqual(actual, expected, [message])
18-
test.strictEqual(actual, expected, [message])
19-
test.notStrictEqual(actual, expected, [message])
20-
test.throws(block, [error], [message])
21-
test.doesNotThrow(block, [error], [message])
22-
test.ifError(value)
23-
*/
24-
255
exports.cssflip = {
26-
setUp: function (done) {
27-
// setup here if necessary
28-
done();
29-
},
306
defaultOptions: function (test) {
317
test.expect(1);
328

0 commit comments

Comments
 (0)