Commit 9434f5d2 authored by Ross Gammon's avatar Ross Gammon

Merge tag 'upstream/2.1.6'

Upstream version 2.1.6

# gpg: Signature made Wed 20 Jan 2016 19:10:43 CET
# gpg:                using RSA key 0x733E6BF93CE8F6D9
# gpg: Good signature from "Ross Gammon (Rosco) <rossgammon@mail.dk>"
# gpg:                 aka "Ross Gammon (Genealogy) <genealogy@the-gammons.net>"
# gpg:                 aka "Ross Gammon (www.one-name.org) <gammon@one-name.org>"
# gpg:                 aka "Ross Gammon (www.the-gammons.net) <ross@the-gammons.net>"
# gpg:                 aka "[jpeg image of size 3524]"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: FBEE 0190 904F 1EA0 BA6A  300E 53FE 7BBD A689 10FC
#      Subkey fingerprint: 7AEE BC7A 44AB 8B90 5CA7  8FC6 733E 6BF9 3CE8 F6D9
parents 96bd7b3a 1856deb8
......@@ -8,8 +8,8 @@ charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
[.gitignore]
trim_trailing_whitespace = false
[*.md]
trim_trailing_whitespace = false
[package.json]
indent_size = 2
# cross-spawn-async [![Build Status](https://travis-ci.org/IndigoUnited/node-cross-spawn-async.svg?branch=master)](https://travis-ci.org/IndigoUnited/node-cross-spawn-async) [![Build status](https://ci.appveyor.com/api/projects/status/9rglfmcmxuu5lbcq/branch/master?svg=true)](https://ci.appveyor.com/project/satazor/node-cross-spawn-async/branch/master)
# cross-spawn-async
[![NPM version][npm-image]][npm-url] [![Downloads][downloads-image]][npm-url] [![Build Status][travis-image]][travis-url] [![Build status][appveyor-image]][appveyor-url] [![Dependency status][david-dm-image]][david-dm-url] [![Dev Dependency status][david-dm-dev-image]][david-dm-dev-url]
[npm-url]:https://npmjs.org/package/cross-spawn-async
[downloads-image]:http://img.shields.io/npm/dm/cross-spawn-async.svg
[npm-image]:http://img.shields.io/npm/v/cross-spawn-async.svg
[travis-url]:https://travis-ci.org/IndigoUnited/node-cross-spawn-async
[travis-image]:http://img.shields.io/travis/IndigoUnited/node-cross-spawn-async.svg
[appveyor-url]:https://ci.appveyor.com/project/satazor/node-cross-spawn-async
[appveyor-image]:https://img.shields.io/appveyor/ci/satazor/node-cross-spawn-async.svg
[david-dm-url]:https://david-dm.org/IndigoUnited/node-cross-spawn-async
[david-dm-image]:https://img.shields.io/david/IndigoUnited/node-cross-spawn-async.svg
[david-dm-dev-url]:https://david-dm.org/IndigoUnited/node-cross-spawn-async#info=devDependencies
[david-dm-dev-image]:https://img.shields.io/david/dev/IndigoUnited/node-cross-spawn-async.svg
A cross platform solution to node's spawn.
......
{
"name": "cross-spawn-async",
"version": "2.1.0",
"version": "2.1.6",
"description": "Cross platform child_process#spawn",
"main": "index.js",
"scripts": {
......@@ -30,14 +30,14 @@
"author": "IndigoUnited <hello@indigounited.com> (http://indigounited.com)",
"license": "MIT",
"dependencies": {
"lru-cache": "^3.2.0",
"lru-cache": "^4.0.0",
"which": "^1.2.0"
},
"devDependencies": {
"expect.js": "^0.3.0",
"glob": "^5.0.12",
"glob": "^6.0.3",
"mkdirp": "^0.5.1",
"mocha": "^2.2.5",
"rimraf": "^1.0.9"
"rimraf": "^2.5.0"
}
}
......@@ -29,6 +29,9 @@ describe('cross-spawn-async', function () {
});
after(function (next) {
// Give it some time, RIMRAF was giving problems on windows
this.timeout(10000);
rimraf(__dirname + '/tmp', function (err) {
// Ignore errors, RIMRAF was giving problems on windows
next(null);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment