From d4d7bb0ead80fe2c280354c5955103700ea5183c Mon Sep 17 00:00:00 2001 From: Bertrand Marron Date: Thu, 1 Oct 2015 11:33:17 +0200 Subject: [PATCH 1/6] Update dependencies and add circle configuration --- .gitignore | 1 + Gruntfile.js | 8 +++++++- circle.yml | 13 +++++++++++++ package.json | 21 +++++++++------------ readme.md | 6 +++--- 5 files changed, 33 insertions(+), 16 deletions(-) create mode 100644 circle.yml diff --git a/.gitignore b/.gitignore index 2d7ba66..4f6a676 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ node_modules/ +reports/ tmp/ diff --git a/Gruntfile.js b/Gruntfile.js index a44dc52..98e2d8d 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -139,7 +139,13 @@ module.exports = function (grunt) { nodeunit: { tests: [ 'test/*_test.js' - ] + ], + options: { + reporter: 'junit', + reporterOptions: { + output: 'reports' + } + } } }); diff --git a/circle.yml b/circle.yml new file mode 100644 index 0000000..5f91402 --- /dev/null +++ b/circle.yml @@ -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 grunt-cli@0.1.13 + +test: + post: + - cp -r reports/. $CIRCLE_TEST_REPORTS diff --git a/package.json b/package.json index 243dcfd..90bd56e 100644 --- a/package.json +++ b/package.json @@ -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" } } diff --git a/readme.md b/readme.md index ef51560..5006cb7 100644 --- a/readme.md +++ b/readme.md @@ -1,6 +1,6 @@ -# 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) @@ -8,7 +8,7 @@ > 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: From eb201a2fdeeb8b22058856f74fa2cfe73affad32 Mon Sep 17 00:00:00 2001 From: Bertrand Marron Date: Thu, 1 Oct 2015 11:44:27 +0200 Subject: [PATCH 2/6] Update travis configuration --- .travis.yml | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index cebec6a..f0863dc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 From 7dedd570a2ea65d5db6103bc6be13e82e59bb490 Mon Sep 17 00:00:00 2001 From: Bertrand Marron Date: Thu, 1 Oct 2015 11:58:40 +0200 Subject: [PATCH 3/6] Update version (use semver) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 90bd56e..fdcab59 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "grunt-subgrunt", - "version": "0.4.5", + "version": "1.0.0", "description": "Run sub-projects' grunt tasks.", "repository": { "type": "git", From 392e05acad29a26d78b21bd2a5ca870338b73475 Mon Sep 17 00:00:00 2001 From: Bertrand Marron Date: Thu, 1 Oct 2015 12:02:51 +0200 Subject: [PATCH 4/6] Add npm badge --- readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/readme.md b/readme.md index 5006cb7..9cdfb56 100644 --- a/readme.md +++ b/readme.md @@ -3,6 +3,7 @@ [![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. From c3a32655df23e9c0fdc4a26dcca9c443a2907fee Mon Sep 17 00:00:00 2001 From: Bertrand Marron Date: Thu, 1 Oct 2015 12:05:53 +0200 Subject: [PATCH 5/6] Update changelog --- changelog.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/changelog.md b/changelog.md index 4d51c06..2c1f071 100644 --- a/changelog.md +++ b/changelog.md @@ -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 From a68650260be1ba57f7e6aa62281a7f6cb015e700 Mon Sep 17 00:00:00 2001 From: Bertrand Marron Date: Thu, 1 Oct 2015 12:08:02 +0200 Subject: [PATCH 6/6] Add millipede --- readme.md | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/readme.md b/readme.md index 9cdfb56..572d368 100644 --- a/readme.md +++ b/readme.md @@ -148,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)