[Pkg-javascript-commits] [node-cross-spawn] 01/06: Imported Upstream version 2.1.5
Ross Gammon
ross-guest at moszumanska.debian.org
Mon Feb 1 17:18:44 UTC 2016
This is an automated email from the git hooks/post-receive script.
ross-guest pushed a commit to branch master
in repository node-cross-spawn.
commit 041b66eeb69e44d826c5c7ddf47fbf7a78addc61
Author: Ross Gammon <rossgammon at mail.dk>
Date: Sun Jan 31 21:00:28 2016 +0100
Imported Upstream version 2.1.5
---
.editorconfig | 6 +++---
.gitignore | 2 ++
README.md | 16 +++++++++++++++-
appveyor.yml | 1 -
package.json | 12 ++++++------
test/test.js | 17 ++++++++++-------
6 files changed, 36 insertions(+), 18 deletions(-)
diff --git a/.editorconfig b/.editorconfig
index fe988fc..8bc4f10 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -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
diff --git a/.gitignore b/.gitignore
index fc48699..f4fc6e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
node_modules/
npm-debug.*
test/fixtures/(*
+test/fixtures/shebang_noenv
+test/tmp
diff --git a/README.md b/README.md
index f94b6a6..6e518e6 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,18 @@
-# cross-spawn [](https://travis-ci.org/IndigoUnited/node-cross-spawn) [](https://ci.appveyor.com/project/satazor/node-cross-spawn/branch/master)
+# cross-spawn
+
+[![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
+[downloads-image]:http://img.shields.io/npm/dm/cross-spawn.svg
+[npm-image]:http://img.shields.io/npm/v/cross-spawn.svg
+[travis-url]:https://travis-ci.org/IndigoUnited/node-cross-spawn
+[travis-image]:http://img.shields.io/travis/IndigoUnited/node-cross-spawn.svg
+[appveyor-url]:https://ci.appveyor.com/project/satazor/node-cross-spawn
+[appveyor-image]:https://img.shields.io/appveyor/ci/satazor/node-cross-spawn.svg
+[david-dm-url]:https://david-dm.org/IndigoUnited/node-cross-spawn
+[david-dm-image]:https://img.shields.io/david/IndigoUnited/node-cross-spawn.svg
+[david-dm-dev-url]:https://david-dm.org/IndigoUnited/node-cross-spawn#info=devDependencies
+[david-dm-dev-image]:https://img.shields.io/david/dev/IndigoUnited/node-cross-spawn.svg
A cross platform solution to node's spawn and spawnSync.
diff --git a/appveyor.yml b/appveyor.yml
index f02a6ba..02aad11 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -28,5 +28,4 @@ build: off
test_script:
- node --version
- npm --version
- - ps: npm test --no-color # PowerShell
- cmd: npm test --no-color
diff --git a/package.json b/package.json
index 8e16297..7305dc5 100644
--- a/package.json
+++ b/package.json
@@ -1,10 +1,10 @@
{
"name": "cross-spawn",
- "version": "2.0.1",
+ "version": "2.1.5",
"description": "Cross platform child_process#spawn and child_process#spawnSync",
"main": "index.js",
"scripts": {
- "test": "node test/prepare && mocha --bail -R spec test/test"
+ "test": "node test/prepare && mocha --bail test/test"
},
"bugs": {
"url": "https://github.com/IndigoUnited/node-cross-spawn/issues/"
@@ -32,14 +32,14 @@
"license": "MIT",
"dependencies": {
"cross-spawn-async": "^2.0.0",
- "spawn-sync": "1.0.13"
+ "spawn-sync": "^1.0.15"
},
"devDependencies": {
"expect.js": "^0.3.0",
- "glob": "^5.0.12",
+ "glob": "^6.0.3",
"mkdirp": "^0.5.1",
"mocha": "^2.2.5",
- "rimraf": "^2.4.4",
- "which": "^1.2.0"
+ "rimraf": "^2.5.0",
+ "which": "^1.2.4"
}
}
diff --git a/test/test.js b/test/test.js
index 19570df..5a2bd80 100644
--- a/test/test.js
+++ b/test/test.js
@@ -33,10 +33,13 @@ describe('cross-spawn', function () {
});
after(function (next) {
- // Need to wrap this in a set timeout otherwise it won't work on WINDOWS properly
- setTimeout(function () {
- rimraf(__dirname + '/tmp', next);
- }, 100);
+ // 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);
+ });
});
afterEach(function () {
@@ -104,10 +107,10 @@ describe('cross-spawn', function () {
});
it('should support shebang in executables with extensions', function (next) {
- fs.writeFileSync(__dirname + '/tmp/shebang.js', '#!/usr/bin/env node\n\nprocess.stdout.write(\'shebang with extension\');', { mode: parseInt('0777', 8) });
+ fs.writeFileSync(__dirname + '/tmp/shebang_' + method + '.js', '#!/usr/bin/env node\n\nprocess.stdout.write(\'shebang with extension\');', { mode: parseInt('0777', 8) });
process.env.PATH = path.normalize(__dirname + '/tmp/') + path.delimiter + process.env.PATH;
- buffered(method, __dirname + '/tmp/shebang.js', function (err, data, code) {
+ buffered(method, __dirname + '/tmp/shebang_' + method + '.js', function (err, data, code) {
expect(err).to.not.be.ok();
expect(code).to.be(0);
expect(data).to.equal('shebang with extension');
@@ -115,7 +118,7 @@ describe('cross-spawn', function () {
// Test if the actual shebang file is resolved against the PATH
process.env.PATH = path.normalize(__dirname + '/fixtures/') + path.delimiter + process.env.PATH;
- buffered(method, 'shebang.js', function (err, data, code) {
+ buffered(method, 'shebang_' + method + '.js', function (err, data, code) {
expect(err).to.not.be.ok();
expect(code).to.be(0);
expect(data).to.equal('shebang with extension');
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-cross-spawn.git
More information about the Pkg-javascript-commits
mailing list