Comparing version 0.14.0 to 0.14.1
15
index.js
@@ -67,15 +67,16 @@ 'use strict'; | ||
var deps = [].concat.apply([], [].slice.call(arguments, 1)); | ||
var options = {}; | ||
var fn = noop; | ||
if (deps.length && typeof deps[deps.length - 1] === 'function') { | ||
fn = deps.pop(); | ||
var args = [].concat.apply([], [].slice.call(arguments, 1)); | ||
// get the actual task function | ||
if (args.length && typeof args[args.length - 1] === 'function') { | ||
fn = args.pop(); | ||
} | ||
if (deps.length && utils.isobject(deps[0])) { | ||
options = deps.shift(); | ||
if (utils.hasOptions(args)) { | ||
options = args.shift(); | ||
} | ||
options.deps = utils.unique(deps | ||
options.deps = utils.unique(args | ||
.concat(options.deps || []) | ||
@@ -82,0 +83,0 @@ .map(map.bind(this))); |
@@ -58,4 +58,4 @@ 'use strict'; | ||
} | ||
utils.extend(task.options, options); | ||
task.options = utils.extend({}, task.options, options); | ||
return task.run.bind(task); | ||
} |
@@ -82,2 +82,19 @@ 'use strict'; | ||
/** | ||
* Determine if the args array has an options object at the beginning. | ||
* | ||
* ```js | ||
* console.log(hasOptions([{}])); | ||
* //=> true | ||
* console.log(hasOptions([])); | ||
* //=> false | ||
* ``` | ||
* @param {Array} `args` Array of arguments | ||
* @return {Boolean} true if first element is an object | ||
*/ | ||
utils.hasOptions = function(args) { | ||
return args.length && utils.isobject(args[0]); | ||
}; | ||
/** | ||
* Expose `utils` modules | ||
@@ -84,0 +101,0 @@ */ |
{ | ||
"name": "composer", | ||
"description": "API-first task runner with three methods: task, run and watch.", | ||
"version": "0.14.0", | ||
"version": "0.14.1", | ||
"homepage": "https://github.com/doowb/composer", | ||
"author": "Jon Schlinkert (https://github.com/jonschlinkert)", | ||
"contributors": [ | ||
"Brian Woodward <brian.woodward@gmail.com> (https://github.com/doowb)", | ||
"Jon Schlinkert <github@sellside.com> (https://github.com/jonschlinkert)" | ||
"Brian Woodward (https://twitter.com/doowb)", | ||
"Jon Schlinkert (http://twitter.com/jonschlinkert)" | ||
], | ||
@@ -22,3 +22,3 @@ "repository": "doowb/composer", | ||
"engines": { | ||
"node": ">=4.0" | ||
"node": ">=0.10.0" | ||
}, | ||
@@ -29,13 +29,13 @@ "scripts": { | ||
"dependencies": { | ||
"array-unique": "^0.2.1", | ||
"bach": "^1.0.0", | ||
"array-unique": "^0.3.2", | ||
"bach": "^1.1.0", | ||
"co": "^4.6.0", | ||
"component-emitter": "^1.2.1", | ||
"define-property": "^0.2.5", | ||
"define-property": "^1.0.0", | ||
"extend-shallow": "^2.0.1", | ||
"is-generator": "^1.0.3", | ||
"is-glob": "^2.0.1", | ||
"isobject": "^2.1.0", | ||
"lazy-cache": "^2.0.1", | ||
"micromatch": "^2.3.10", | ||
"is-glob": "^3.1.0", | ||
"isobject": "^3.0.0", | ||
"lazy-cache": "^2.0.2", | ||
"micromatch": "^2.3.11", | ||
"nanoseconds": "^0.1.0", | ||
@@ -49,2 +49,3 @@ "pretty-time": "^0.2.0" | ||
"async": "^1.5.2", | ||
"bdd-stdin": "^0.2.0", | ||
"bluebird": "^3.4.1", | ||
@@ -51,0 +52,0 @@ "composer-runtimes": "^0.7.0", |
@@ -1,4 +0,4 @@ | ||
# composer [![NPM version](https://img.shields.io/npm/v/composer.svg?style=flat)](https://www.npmjs.com/package/composer) [![NPM downloads](https://img.shields.io/npm/dm/composer.svg?style=flat)](https://npmjs.org/package/composer) [![Build Status](https://img.shields.io/travis/doowb/composer.svg?style=flat)](https://travis-ci.org/doowb/composer) | ||
# composer [![NPM version](https://img.shields.io/npm/v/composer.svg?style=flat)](https://www.npmjs.com/package/composer) [![NPM monthly downloads](https://img.shields.io/npm/dm/composer.svg?style=flat)](https://npmjs.org/package/composer) [![NPM total downloads](https://img.shields.io/npm/dt/composer.svg?style=flat)](https://npmjs.org/package/composer) [![Linux Build Status](https://img.shields.io/travis/doowb/composer.svg?style=flat&label=Travis)](https://travis-ci.org/doowb/composer) | ||
API-first task runner with three methods: task, run and watch. | ||
> API-first task runner with three methods: task, run and watch. | ||
@@ -14,8 +14,2 @@ ## Table of Contents | ||
- [About](#about) | ||
* [Related projects](#related-projects) | ||
* [Contributing](#contributing) | ||
* [Building docs](#building-docs) | ||
* [Running tests](#running-tests) | ||
* [Author](#author) | ||
* [License](#license) | ||
@@ -32,2 +26,8 @@ _(TOC generated by [verb](https://github.com/verbose/verb) using [markdown-toc](https://github.com/jonschlinkert/markdown-toc))_ | ||
Install with [yarn](https://yarnpkg.com): | ||
```sh | ||
$ yarn add composer | ||
``` | ||
**Heads up** the `.watch` method was removed in version `0.11.0`. If you need _watch_ functionality, use [base-tasks](https://github.com/jonschlinkert/base-tasks) and [base-watch](https://github.com/node-base/base-watch). | ||
@@ -70,3 +70,3 @@ | ||
### [.build](index.js#L118) | ||
### [.build](index.js#L119) | ||
@@ -90,3 +90,3 @@ Build a task or array of tasks. | ||
### [.series](index.js#L185) | ||
### [.series](index.js#L186) | ||
@@ -122,3 +122,3 @@ Compose task or list of tasks into a single function that runs the tasks in series. | ||
### [.parallel](index.js#L217) | ||
### [.parallel](index.js#L218) | ||
@@ -373,10 +373,17 @@ Compose task or list of tasks into a single function that runs the tasks in parallel. | ||
### Contributors | ||
| **Commits** | **Contributor** | | ||
| --- | --- | | ||
| 195 | [doowb](https://github.com/doowb) | | ||
| 36 | [jonschlinkert](https://github.com/jonschlinkert) | | ||
### Building docs | ||
_(This document was generated by [verb-generate-readme](https://github.com/verbose/verb-generate-readme) (a [verb](https://github.com/verbose/verb) generator), please don't edit the readme directly. Any changes to the readme must be made in [.verb.md](.verb.md).)_ | ||
_(This project's readme.md is generated by [verb](https://github.com/verbose/verb-generate-readme), please don't edit the readme directly. Any changes to the readme must be made in the [.verb.md](.verb.md) readme template.)_ | ||
To generate the readme and API documentation with [verb](https://github.com/verbose/verb): | ||
To generate the readme, run the following command: | ||
```sh | ||
$ npm install -g verb verb-generate-readme && verb | ||
$ npm install -g verbose/verb#dev verb-generate-readme && verb | ||
``` | ||
@@ -386,6 +393,6 @@ | ||
Install dev dependencies: | ||
Running and reviewing unit tests is a great way to get familiarized with a library and its API. You can install dependencies and run tests with the following command: | ||
```sh | ||
$ npm install -d && npm test | ||
$ npm install && npm test | ||
``` | ||
@@ -398,11 +405,11 @@ | ||
* [github/jonschlinkert](https://github.com/jonschlinkert) | ||
* [twitter/jonschlinkert](http://twitter.com/jonschlinkert) | ||
* [twitter/jonschlinkert](https://twitter.com/jonschlinkert) | ||
### License | ||
Copyright © 2016, [Jon Schlinkert](https://github.com/jonschlinkert). | ||
Released under the [MIT license](https://github.com/doowb/composer/blob/master/LICENSE). | ||
Copyright © 2017, [Jon Schlinkert](https://github.com/jonschlinkert). | ||
Released under the [MIT License](LICENSE). | ||
*** | ||
_This file was generated by [verb](https://github.com/verbose/verb), v0.9.0, on July 13, 2016._ | ||
_This file was generated by [verb-generate-readme](https://github.com/verbose/verb-generate-readme), v0.6.0, on May 26, 2017._ |
Sorry, the diff of this file is not supported yet
38931
648
407
19
+ Addedarray-unique@0.3.2(transitive)
+ Addeddefine-property@1.0.0(transitive)
+ Addedis-descriptor@1.0.3(transitive)
+ Addedis-extglob@2.1.1(transitive)
+ Addedis-glob@3.1.0(transitive)
+ Addedisobject@3.0.1(transitive)
- Removeddefine-property@0.2.5(transitive)
- Removedis-descriptor@0.1.7(transitive)
Updatedarray-unique@^0.3.2
Updatedbach@^1.1.0
Updateddefine-property@^1.0.0
Updatedis-glob@^3.1.0
Updatedisobject@^3.0.0
Updatedlazy-cache@^2.0.2
Updatedmicromatch@^2.3.11