Skip to content

Commit

Permalink
Merge pull request #18 from tusbar/tusbar/circle
Browse files Browse the repository at this point in the history
Update dependencies and add circle configuration
  • Loading branch information
Bertrand Marron committed Oct 1, 2015
2 parents 9b59c00 + a686502 commit 6a05b55
Show file tree
Hide file tree
Showing 7 changed files with 64 additions and 22 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
node_modules/

reports/
tmp/
14 changes: 11 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,15 @@
sudo: false

language: node_js

node_js:
- "0.10"
- "0.12"
- "iojs"
- 0.10
- 0.12
- 4.0

cache:
directories:
- node_modules

before_install:
- npm install -g grunt-cli
8 changes: 7 additions & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,13 @@ module.exports = function (grunt) {
nodeunit: {
tests: [
'test/*_test.js'
]
],
options: {
reporter: 'junit',
reporterOptions: {
output: 'reports'
}
}
}
});

Expand Down
7 changes: 7 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
### v1.0.0 [view commit logs](https://github.com/tusbar/grunt-subgrunt/compare/v0.4.5...v1.0.0)

* Update dependencies
* Update travis configuration (include Node.js 4.0)
* Add Circle CI tests
* Use [Semantic Versioning](http://semver.org/)

### v0.4.5 [view commit logs](https://github.com/tusbar/grunt-subgrunt/compare/v0.4.4...v0.4.5)

* Update dependencies
Expand Down
13 changes: 13 additions & 0 deletions circle.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
machine:
node:
version: 0.12.7


dependencies:
pre:
# Install grunt-cli as we’re using a custom node version.
- which grunt || npm install -g [email protected]

test:
post:
- cp -r reports/. $CIRCLE_TEST_REPORTS
23 changes: 10 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "grunt-subgrunt",
"version": "0.4.5",
"version": "1.0.0",
"description": "Run sub-projects' grunt tasks.",
"repository": {
"type": "git",
Expand All @@ -24,22 +24,19 @@
"bugs": {
"url": "https://github.com/tusbar/grunt-subgrunt/issues"
},
"peerDependencies": {
"grunt": "~0.4.4"
},
"dependencies": {
"async": "^1.0.0",
"glob": "^5.0.9"
"async": "1.4.2",
"glob": "5.0.15"
},
"engines": {
"node": ">=0.8.0"
"node": ">=0.10.0"
},
"devDependencies": {
"grunt": "^0.4.5",
"grunt-contrib-clean": "^0.6.0",
"grunt-contrib-jshint": "^0.11.2",
"grunt-contrib-nodeunit": "^0.4.1",
"grunt-jscs": "^1.8.0",
"load-grunt-tasks": "^3.2.0"
"grunt": "0.4.5",
"grunt-contrib-clean": "0.6.0",
"grunt-contrib-jshint": "0.11.3",
"grunt-contrib-nodeunit": "0.4.1",
"grunt-jscs": "2.1.0",
"load-grunt-tasks": "3.3.0"
}
}
20 changes: 15 additions & 5 deletions readme.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
# grunt-subgrunt
# grunt-subgrunt [![Circle CI](https://circleci.com/gh/tusbar/grunt-subgrunt.svg?style=svg)](https://circleci.com/gh/tusbar/grunt-subgrunt)

[![Build Status](https://secure.travis-ci.org/tusbar/grunt-subgrunt.svg?branch=master)](https://travis-ci.org/tusbar/grunt-subgrunt)
[![Travis](https://secure.travis-ci.org/tusbar/grunt-subgrunt.svg?branch=master)](https://travis-ci.org/tusbar/grunt-subgrunt)
[![Dependencies Status](https://david-dm.org/tusbar/grunt-subgrunt.svg)](https://david-dm.org/tusbar/grunt-subgrunt)
[![Dev Dependencies Status](https://david-dm.org/tusbar/grunt-subgrunt/dev-status.svg)](https://david-dm.org/tusbar/grunt-subgrunt#info=devDependencies)
[![npm version](https://img.shields.io/npm/v/grunt-subgrunt.svg)](https://www.npmjs.com/package/grunt-subgrunt)

> Run sub-projects' grunt tasks.
> This plugin was inspired by https://gist.github.com/cowboy/3819170.
## Getting started
This plugin requires Grunt `^0.4.5`
This plugin requires Grunt `0.4.5`

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:

Expand Down Expand Up @@ -147,5 +148,14 @@ grunt.initConfig({
## Contributing
In lieu of a formal styleguide, take care to maintain the existing coding style. Add unit tests for any new or changed functionality. Lint and test your code using [Grunt](http://gruntjs.com/).

## License
[MIT License](http://en.wikipedia.org/wiki/MIT_License)
```
╚⊙ ⊙╝
╚═(███)═╝
╚═(███)═╝
╚═(███)═╝
╚═(███)═╝
╚═(███)═╝
╚═(███)═╝
```

![MIT](https://img.shields.io/badge/licence-MIT-blue.svg)

0 comments on commit 6a05b55

Please sign in to comment.