Skip to content

Commit

Permalink
Merge branch 'master' of github.com:nodejs/node into test-spawn-fix
Browse files Browse the repository at this point in the history
Merge
  • Loading branch information
geek committed Sep 30, 2016
2 parents 03a5ba9 + 4c61f57 commit 6429d42
Show file tree
Hide file tree
Showing 1,058 changed files with 31,351 additions and 28,193 deletions.
4 changes: 2 additions & 2 deletions .remarkrc
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"file-extension": "md",
"final-definition": true,
"final-newline": true,
"first-heading-level": false,
"first-heading-level": 1,
"hard-break-spaces": true,
"heading-increment": false,
"heading-style": "atx",
Expand All @@ -30,7 +30,7 @@
"no-duplicate-definitions": true,
"no-duplicate-headings": false,
"no-emphasis-as-heading": false,
"no-file-name-articles": false,
"no-file-name-articles": true,
"no-file-name-consecutive-dashes": true,
"no-file-name-irregular-characters": false,
"no-file-name-mixed-case": false,
Expand Down
11 changes: 2 additions & 9 deletions BUILDING.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## Building Node.js
# Building Node.js

Depending on what platform or features you require, the build process may
differ slightly. After you've successfully built a binary, running the
Expand Down Expand Up @@ -34,14 +34,7 @@ $ ./configure
$ make
```

If your Python binary is in a non-standard location or has a
non-standard name, run the following instead:

```console
$ export PYTHON=/path/to/python
$ $PYTHON ./configure
$ make
```
Note that the above requires that `python` resolve to Python 2.6 or 2.7 and not a newer version.

To run the tests:

Expand Down
12 changes: 8 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ release.
</tr>
<tr>
<td valign="top">
<b><a href="doc/changelogs/CHANGELOG_V6.md#6.6.0">6.6.0</a></b><br/>
<b><a href="doc/changelogs/CHANGELOG_V6.md#6.7.0">6.7.0</a></b><br/>
<a href="doc/changelogs/CHANGELOG_V6.md#6.6.0">6.6.0</a><br/>
<a href="doc/changelogs/CHANGELOG_V6.md#6.5.0">6.5.0</a><br/>
<a href="doc/changelogs/CHANGELOG_V6.md#6.4.0">6.4.0</a><br/>
<a href="doc/changelogs/CHANGELOG_V6.md#6.3.1">6.3.1</a><br/>
Expand Down Expand Up @@ -58,7 +59,8 @@ release.
<a href="doc/changelogs/CHANGELOG_V5.md#5.0.0">5.0.0</a><br/>
</td>
<td valign="top">
<b><a href="doc/changelogs/CHANGELOG_V4.md#4.5.0">4.5.0</a></b><br/>
<b><a href="doc/changelogs/CHANGELOG_V4.md#4.6.0">4.6.0</a></b><br/>
<a href="doc/changelogs/CHANGELOG_V4.md#4.5.0">4.5.0</a><br/>
<a href="doc/changelogs/CHANGELOG_V4.md#4.4.7">4.4.7</a></b>
<a href="doc/changelogs/CHANGELOG_V4.md#4.4.6">4.4.6</a></b>
<a href="doc/changelogs/CHANGELOG_V4.md#4.4.5">4.4.5</a></b>
Expand All @@ -83,7 +85,8 @@ release.
<a href="doc/changelogs/CHANGELOG_V4.md#4.0.0">4.0.0</a><br/>
</td>
<td valign="top">
<b><a href="doc/changelogs/CHANGELOG_V012.md#0.12.15">0.12.15</a></b><br/>
<b><a href="doc/changelogs/CHANGELOG_V012.md#0.12.16">0.12.16</a></b><br/>
<a href="doc/changelogs/CHANGELOG_V012.md#0.12.15">0.12.15</a><br/>
<a href="doc/changelogs/CHANGELOG_V012.md#0.12.14">0.12.14</a><br/>
<a href="doc/changelogs/CHANGELOG_V012.md#0.12.13">0.12.13</a><br/>
<a href="doc/changelogs/CHANGELOG_V012.md#0.12.12">0.12.12</a><br/>
Expand All @@ -101,7 +104,8 @@ release.
<a href="doc/changelogs/CHANGELOG_V012.md#0.12.0">0.12.0</a><br/>
</td>
<td valign="top">
<b><a href="doc/changelogs/CHANGELOG_V010.md#0.10.46">0.10.46</a></b><br/>
<b><a href="doc/changelogs/CHANGELOG_V010.md#0.10.47">0.10.47</a></b><br/>
<a href="doc/changelogs/CHANGELOG_V010.md#0.10.46">0.10.46</a><br/>
<a href="doc/changelogs/CHANGELOG_V010.md#0.10.45">0.10.45</a><br/>
<a href="doc/changelogs/CHANGELOG_V010.md#0.10.44">0.10.44</a><br/>
<a href="doc/changelogs/CHANGELOG_V010.md#0.10.43">0.10.43</a><br/>
Expand Down
10 changes: 5 additions & 5 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## Code of Conduct
# Code of Conduct

### Conduct
## Conduct

* We are committed to providing a friendly, safe and welcoming
environment for all, regardless of level of experience, gender
Expand Down Expand Up @@ -38,17 +38,17 @@
documentation. There is no need to address persons when explaining
code (e.g. "When the developer").

### Contact
## Contact
Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported by:

* Emailing [report@nodejs.org](mailto:report@nodejs.org) (this will email all TSC members)
* Contacting [individual TSC members](https://nodejs.org/en/foundation/tsc/#current-members-of-the-technical-steering-committee).

### Moderation
## Moderation
See the TSC's [moderation policy](https://github.com/nodejs/TSC/blob/master/Moderation-Policy.md) for details about moderation.

### Attribution
## Attribution

This Code of Conduct is adapted from [Rust's wonderful
CoC](http://www.rust-lang.org/conduct.html) as well as the
Expand Down
10 changes: 7 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -93,15 +93,19 @@ Writing good commit logs is important. A commit log should describe what
changed and why. Follow these guidelines when writing one:

1. The first line should be 50 characters or less and contain a short
description of the change prefixed with the name of the changed
subsystem (e.g. "net: add localAddress and localPort to Socket").
description of the change. All words in the description should be in
lowercase with the exception of proper nouns, acronyms, and the ones that
refer to code, like function/variable names. The description should
be prefixed with the name of the changed subsystem and start with an
imperative verb, for example, "net: add localAddress and localPort
to Socket".
2. Keep the second line blank.
3. Wrap all other lines at 72 columns.

A good commit log can look something like this:

```txt
subsystem: explaining the commit in one line
subsystem: explain the commit in one line
Body of commit message is a few lines of text, explaining things
in more detail, possibly giving some background about the issue
Expand Down
5 changes: 5 additions & 0 deletions benchmark/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@ benchmarker to be used by providing it as an argument, e. g.:

`node benchmark/http/simple.js benchmarker=autocannon`

Basic Unix tools are required for some benchmarks.
[Git for Windows][git-for-windows] includes Git Bash and the necessary tools,
which need to be included in the global Windows `PATH`.

To analyze the results `R` should be installed. Check you package manager or
download it from https://www.r-project.org/.

Expand Down Expand Up @@ -348,3 +352,4 @@ Supported options keys are:
[autocannon]: https://github.com/mcollina/autocannon
[wrk]: https://github.com/wg/wrk
[t-test]: https://en.wikipedia.org/wiki/Student%27s_t-test#Equal_or_unequal_sample_sizes.2C_unequal_variances
[git-for-windows]: http://git-scm.com/download/win
86 changes: 86 additions & 0 deletions benchmark/buffers/buffer-from.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
'use strict';

const common = require('../common.js');
const assert = require('assert');
const bench = common.createBenchmark(main, {
source: [
'array',
'arraybuffer',
'arraybuffer-middle',
'buffer',
'uint8array',
'string',
'string-base64'
],
len: [10, 2048],
n: [1024]
});

function main(conf) {
const len = +conf.len;
const n = +conf.n;

const array = new Array(len).fill(42);
const arrayBuf = new ArrayBuffer(len);
const str = 'a'.repeat(len);
const buffer = Buffer.allocUnsafe(len);
const uint8array = new Uint8Array(len);

var i;

switch (conf.source) {
case 'array':
bench.start();
for (i = 0; i < n * 1024; i++) {
Buffer.from(array);
}
bench.end(n);
break;
case 'arraybuffer':
bench.start();
for (i = 0; i < n * 1024; i++) {
Buffer.from(arrayBuf);
}
bench.end(n);
break;
case 'arraybuffer-middle':
const offset = ~~(len / 4);
const length = ~~(len / 2);
bench.start();
for (i = 0; i < n * 1024; i++) {
Buffer.from(arrayBuf, offset, length);
}
bench.end(n);
break;
case 'buffer':
bench.start();
for (i = 0; i < n * 1024; i++) {
Buffer.from(buffer);
}
bench.end(n);
break;
case 'uint8array':
bench.start();
for (i = 0; i < n * 1024; i++) {
Buffer.from(uint8array);
}
bench.end(n);
break;
case 'string':
bench.start();
for (i = 0; i < n * 1024; i++) {
Buffer.from(str);
}
bench.end(n);
break;
case 'string-base64':
bench.start();
for (i = 0; i < n * 1024; i++) {
Buffer.from(str, 'base64');
}
bench.end(n);
break;
default:
assert.fail(null, null, 'Should not get here');
}
}
69 changes: 69 additions & 0 deletions deps/npm/.github/issue_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
#### I'm opening this issue because:

- [ ] npm is crashing.
- [ ] npm is producing an incorrect install.
- [ ] npm is doing something I don't understand.
- [ ] Other (_see below for feature requests_):

#### What's going wrong?

#### How can the CLI team reproduce the problem?

<!--
Please a complete description of how to reproduce the problem.
Include a gist of your npm-debug.log file.
If you've never used gist.github.com, start here:
https://github.com/EmmaRamirez/how-to-submit-your-npm-debug-log
-->

### supporting information:

- `npm -v` prints:
- `node -v` prints:
- `npm config get registry` prints:
- Windows, OS X, or Linux?:
- Network issues:
- Geographic location where npm was run:
- [ ] I use a proxy to connect to the npm registry.
- [ ] I use a proxy to connect to the web.
- [ ] I use a proxy when downloading Git repos.
- [ ] I access the npm registry via a VPN
- [ ] I don't use a proxy, but have limited or unreliable internet access.
- Container:
- [ ] I develop using Vagrant on Windows.
- [ ] I develop using Vagrant on OS X or Linux.
- [ ] I develop / deploy using Docker.
- [ ] I deploy to a PaaS (Triton, Heroku).

<!--
Thank you for contributing to npm! Please review this checklist
before submitting your issue.
- Please check if there's a solution in the troubleshooting wiki:
https://github.com/npm/npm/wiki/Troubleshooting
- Also ensure that your new issue conforms to npm's contribution guidelines:
https://github.com/npm/npm/wiki/Contributing-Guidelines
- Participation in this open source project is subject to the npm Code of Conduct:
https://www.npmjs.com/policies/conduct
For feature requests, delete the above and uncomment the section following this one. But first, review the existing feature requests
and make sure there isn't one that already describes the feature
you'd like to see added:
https://github.com/npm/npm/issues?q=is%3Aopen+is%3Aissue+label%3Afeature-request+label%3Aalready-looked-at
-->

<!--
#### What's the feature?
#### What problem is the feature intended to solve?
#### Is the absence of this feature blocking you or your team? If so, how?
#### Is this feature similar to an existing feature in another tool?
#### Is this a feature you're prepared to implement, with support from the npm CLI team?
-->
2 changes: 2 additions & 0 deletions deps/npm/.mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ Dave Galbraith <dave@jut.io>
David Beitey <david@davidjb.com>
Domenic Denicola <domenic@domenicdenicola.com>
Einar Otto Stangvik <einaros@gmail.com>
Emma Ramirez <ramirez.emma.g@gmail.com>
Erik Wienhold <git@ewie.name>
Evan Lucas <evan@btc.com> <evan.lucas@hattiesburgclinic.com>
Evan Lucas <evan@btc.com> <evanlucas@me.com>
Expand All @@ -23,6 +24,7 @@ Forbes Lindesay <forbes@lindesay.co.uk>
Forrest L Norvell <ogd@aoaioxxysz.net> <forrest@npmjs.com>
Gabriel Barros <descartavel1@gmail.com>
Geoff Flarity <geoff.flarity@gmail.com> <gflarity@raptvm-x02.(none)>
Gregers Gram Rygg <gregers.gram.rygg@finn.no>
Ifeanyi Oraelosi <ifeanyioraelosi@gmail.com>
Isaac Z. Schlueter <i@izs.me> <i@foohack.com>
Isaac Z. Schlueter <i@izs.me> isaacs <i@izs.me>
Expand Down
42 changes: 25 additions & 17 deletions deps/npm/.travis.yml
Original file line number Diff line number Diff line change
@@ -1,23 +1,31 @@
sudo: false
# need to declare the language as well as the matrix below
language: node_js
node_js:
# LTS is our most important target
- "4"
# next LTS and master is next most important
- "6"
# still in LTS maintenance until fall 2016
# (also still in wide use)
- "0.10"
# will be unsupported as soon as 6 becomes LTS and 7 released
- "5"
# technically in LTS / distros, unbeloved
- "0.12"
env:
- DEPLOY_VERSION=testing
# having top-level `env:` adds a phantom build
# https://github.com/travis-ci/travis-ci/issues/4681
#env: DEPLOY_VERSION=testing
matrix:
include:
# LTS is our most important target
- node_js: "4"
# DEPLOY_VERSION is used to set the couchapp setup mode for test/tap/registry.js
# only gather coverage info for LTS
env: DEPLOY_VERSION=testing COVERALLS_REPO_TOKEN="$COVERALLS_OPTIONAL_TOKEN"
# next LTS and master is next most important
- node_js: "6"
env: DEPLOY_VERSION=testing
# still in LTS maintenance until fall 2016 (also still in wide use)
- node_js: "0.10"
env: DEPLOY_VERSION=testing
# will be unsupported as soon as 6 becomes LTS and 7 released
- node_js: "5"
env: DEPLOY_VERSION=testing
# technically in LTS / distros, unbeloved
- node_js: "0.12"
env: DEPLOY_VERSION=testing
before_install:
- "npm config set spin false"
- "node . install -g ."
# required by test/tap/registry.js
- "mkdir -p /var/run/couchdb"
sudo: false
script: "npm test"
notifications:
slack: npm-inc:kRqQjto7YbINqHPb1X6nS3g8
22 changes: 22 additions & 0 deletions deps/npm/AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -408,3 +408,25 @@ Aaron Tribou <aaron.tribou@gmail.com>
Tapani Moilanen <moilanen.tapani@gmail.com>
Han Seoul-Oh <laughinghan@gmail.com>
Aleksey Shvayka <shvaikalesh@gmail.com>
Emma Ramirez <ramirez.emma.g@gmail.com>
Julian Duque <julianduquej@gmail.com>
Simon MacDonald <simon.macdonald@gmail.com>
Adam Stankiewicz <sheerun@sher.pl>
Gregers Gram Rygg <gregers.gram.rygg@finn.no>
Peter Dave Hello <hsu@peterdavehello.org>
Jordan Klassen <forivall@gmail.com>
Jason Palmer <jason@jason-palmer.com>
Michael Hart <michael.hart.au@gmail.com>
Sasha Koss <koss@nocorp.me>
David Emmerson <david.emmerson@gmail.com>
Christophe Hurpeau <christophe@hurpeau.com>
Daniel Paz-Soldan <daniel.pazsoldan@gmail.com>
Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
Zach Renner <zarenner@microsoft.com>
Christopher Hiller <boneskull@boneskull.com>
legodude17 <legodudejb@gmail.com>
Andrew Meyer <andrewm.bpi@gmail.com>
Michael Jasper <mdjasper@gmail.com>
Max <contact@mstoiber.com>
Szymon Nowak <szimek@gmail.com>
Jason Karns <jason.karns@gmail.com>
Loading

0 comments on commit 6429d42

Please sign in to comment.