Update to iojs 2.3.1

.eslintignore

@@ -3,3 +3,5 @@ test/addons/doc-*/
 test/fixtures
 test/**/node_modules
 test/parallel/test-fs-non-number-arguments-throw.js
+test/disabled
+test/tmp*/

.eslintrc

@@ -39,14 +39,9 @@ rules:
   # Stylistic Issues
   # list: https://github.com/eslint/eslint/tree/master/docs/rules#stylistic-issues
   ## use single quote, we can use double quote when escape chars
-  quotes:
-    - 2
-    - "single"
-    - "avoid-escape"
+  quotes: [2, "single", "avoid-escape"]
   ## 2 space indentation
-  indent:
-    - 2
-    - 2
+  indent: [2, 2]
   ## add space after comma
   ## set to 'warn' because of https://github.com/eslint/eslint/issues/2408
   comma-spacing: 1
@@ -63,35 +58,46 @@ rules:
   ## require parens for Constructor
   new-parens: 2
   ## max 80 length
-  max-len:
-    - 2
-    - 80
-    - 2
+  max-len: [2, 80, 2]
+  ## max 2 consecutive empty lines
+  no-multiple-empty-lines: [2, {max: 2}]
+  ## require newline at end of files
+  eol-last: 2
+  ## no trailing spaces
+  no-trailing-spaces: 2
 
   # Strict Mode
   # list: https://github.com/eslint/eslint/tree/master/docs/rules#strict-mode
   ## 'use strict' on top
-  strict:
-    - 2
-    - "global"
+  strict: [2, "global"]
+
+  # Variables
+  # list: https://github.com/eslint/eslint/tree/master/docs/rules#variables
+  ## disallow use of undefined variables (globals)
+  no-undef: 2
+
+  # Custom rules in tools/eslint-rules
+  require-buffer: 2
 
 # Global scoped method and vars
 globals:
-  DTRACE_HTTP_CLIENT_REQUEST: true
-  LTTNG_HTTP_CLIENT_REQUEST: true
-  COUNTER_HTTP_CLIENT_REQUEST: true
-  DTRACE_HTTP_CLIENT_RESPONSE: true
-  LTTNG_HTTP_CLIENT_RESPONSE: true
-  COUNTER_HTTP_CLIENT_RESPONSE: true
-  DTRACE_HTTP_SERVER_REQUEST: true
-  LTTNG_HTTP_SERVER_REQUEST: true
-  COUNTER_HTTP_SERVER_REQUEST: true
-  DTRACE_HTTP_SERVER_RESPONSE: true
-  LTTNG_HTTP_SERVER_RESPONSE: true
-  COUNTER_HTTP_SERVER_RESPONSE: true
-  DTRACE_NET_STREAM_END: true
-  LTTNG_NET_STREAM_END: true
-  COUNTER_NET_SERVER_CONNECTION_CLOSE: true
-  DTRACE_NET_SERVER_CONNECTION: true
-  LTTNG_NET_SERVER_CONNECTION: true
-  COUNTER_NET_SERVER_CONNECTION: true
+  DTRACE_HTTP_CLIENT_REQUEST           : false
+  LTTNG_HTTP_CLIENT_REQUEST            : false
+  COUNTER_HTTP_CLIENT_REQUEST          : false
+  DTRACE_HTTP_CLIENT_RESPONSE          : false
+  LTTNG_HTTP_CLIENT_RESPONSE           : false
+  COUNTER_HTTP_CLIENT_RESPONSE         : false
+  DTRACE_HTTP_SERVER_REQUEST           : false
+  LTTNG_HTTP_SERVER_REQUEST            : false
+  COUNTER_HTTP_SERVER_REQUEST          : false
+  DTRACE_HTTP_SERVER_RESPONSE          : false
+  LTTNG_HTTP_SERVER_RESPONSE           : false
+  COUNTER_HTTP_SERVER_RESPONSE         : false
+  DTRACE_NET_STREAM_END                : false
+  LTTNG_NET_STREAM_END                 : false
+  COUNTER_NET_SERVER_CONNECTION_CLOSE  : false
+  DTRACE_NET_SERVER_CONNECTION         : false
+  LTTNG_NET_SERVER_CONNECTION          : false
+  COUNTER_NET_SERVER_CONNECTION        : false
+  escape                               : false
+  unescape                             : false

.gitignore

@@ -22,6 +22,7 @@ icu_config.gypi
 
 # various stuff that VC++ produces/uses
 Debug/
+!node_modules/debug/
 Release/
 !doc/blog/**
 *.sln

COLLABORATOR_GUIDE.md

@@ -2,11 +2,12 @@
 
 **Contents**
 
-* Issues and Pull Requests
-* Accepting Modifications
- - Involving the TC
-* Landing Pull Requests
- - Technical HOWTO
+* [Issues and Pull Requests](#issues-and-pull-requests)
+* [Accepting Modifications](#accepting-modifications)
+ - [Involving the TC](#involving-the-tc)
+* [Landing Pull Requests](#landing-pull-requests)
+ - [Technical HOWTO](#technical-howto)
+ - [I Just Made a Mistake](#i-just-made-a-mistake)
 
 This document contains information for Collaborators of the io.js
 project regarding maintaining the code, documentation and issues.
@@ -67,6 +68,10 @@ TC for resolution (see below).
 All bugfixes require a test case which demonstrates the defect. The
 test should *fail* before the change, and *pass* after the change.
 
+All pull requests that modify executable code should be subjected to
+continuous integration tests on the
+[project CI server](https://jenkins-iojs.nodesource.com/).
+
 ### Involving the TC
 
 Collaborators may opt to elevate pull requests or issues to the TC for
@@ -101,10 +106,10 @@ exactly how to format your commit messages.
 
 Additionally:
 
-- Double check PR's to make sure the person's _full name_ and email
+- Double check PRs to make sure the person's _full name_ and email
   address are correct before merging.
 - Except when updating dependencies, all commits should be self
-  contained.  Meaning, every commit should pass all tests. This makes
+  contained (meaning every commit should pass all tests). This makes
   it much easier when bisecting to find a breaking change.
 
 ### Technical HOWTO
@@ -148,8 +153,8 @@ $ git log origin/master...master
 ```
 
 If there are multiple commits that relate to the same feature or
-one with a feature and separate with a test for that feature -
-you'll need to squash them (or strictly speaking `fixup`).
+one with a feature and separate with a test for that feature,
+you'll need to use `squash` or `fixup`:
 
 ```text
 $ git rebase -i origin/master
@@ -201,25 +206,24 @@ reword 51759dc feature B
 fixup 7d6f433 test for feature B
 ```
 
-Save the file and close the editor, you'll be asked to enter new
-commit message for that commit, and everything else should go
-smoothly. Note that this is a good moment to fix incorrect commit
-logs, ensure that they are properly formatted, and add `Reviewed-By`
-line.
+Save the file and close the editor. You'll be asked to enter a new
+commit message for that commit. This is a good moment to fix incorrect
+commit logs, ensure that they are properly formatted, and add
+`Reviewed-By` lines.
 
 Time to push it:
 
 ```text
 $ git push origin master
 ```
 
-### I just made a mistake
+### I Just Made a Mistake
 
-With git, there's a way to override remote trees by force pushing
+With `git`, there's a way to override remote trees by force pushing
 (`git push -f`). This should generally be seen as forbidden (since
 you're rewriting history on a repository other people are working
 against) but is allowed for simpler slip-ups such as typos in commit
 messages. However, you are only allowed to force push to any io.js
 branch within 10 minutes from your original push. If someone else
-pushes to the branch your commit lives in or the 10 minute period
-passes, consider the commit final.
+pushes to the branch or the 10 minute period passes, consider the
+commit final.

GOVERNANCE.md

@@ -34,7 +34,7 @@ individuals are identified by the TC and their addition as
 Collaborators is discussed during the weekly TC meeting.
 
 _Note:_ If you make a significant contribution and are not considered
-for commit-access log an issue or contact a TC member directly and it
+for commit-access, log an issue or contact a TC member directly and it
 will be brought up in the next TC meeting.
 
 Modifications of the contents of the iojs/io.js repository are made on
@@ -96,16 +96,16 @@ Items are added to the TC agenda which are considered contentious or
 are modifications of governance, contribution policy, TC membership,
 or release process.
 
-The intention of the agenda is not to approve or review all patches,
-that should happen continuously on GitHub and be handled by the larger
+The intention of the agenda is not to approve or review all patches.
+That should happen continuously on GitHub and be handled by the larger
 group of Collaborators.
 
 Any community member or contributor can ask that something be added to
 the next meeting's agenda by logging a GitHub Issue. Any Collaborator,
 TC member or the moderator can add the item to the agenda by adding
 the ***tc-agenda*** tag to the issue.
 
-Prior to each TC meeting the moderator will share the Agenda with
+Prior to each TC meeting, the moderator will share the Agenda with
 members of the TC. TC members can add any items they like to the
 agenda at the beginning of each meeting. The moderator and the TC
 cannot veto or remove items.
@@ -117,19 +117,19 @@ participate in a non-voting capacity. These invitees currently are:
   chosen by that project.
 
 The moderator is responsible for summarizing the discussion of each
-agenda item and send it as a pull request after the meeting.
+agenda item and sending it as a pull request after the meeting.
 
 ## Consensus Seeking Process
 
 The TC follows a
 [Consensus Seeking](http://en.wikipedia.org/wiki/Consensus-seeking_decision-making)
 decision making model.
 
-When an agenda item has appeared to reach a consensus the moderator
+When an agenda item has appeared to reach a consensus, the moderator
 will ask "Does anyone object?" as a final call for dissent from the
 consensus.
 
-If an agenda item cannot reach a consensus a TC member can call for
+If an agenda item cannot reach a consensus, a TC member can call for
 either a closing vote or a vote to table the issue to the next
-meeting. The call for a vote must be seconded by a majority of the TC
+meeting. The call for a vote must be approved by a majority of the TC
 or else the discussion will continue. Simple majority wins.

Makefile

@@ -87,16 +87,16 @@ test-valgrind: all
 	$(PYTHON) tools/test.py --mode=release --valgrind sequential parallel message
 
 test/gc/node_modules/weak/build/Release/weakref.node: $(NODE_EXE)
-	./$(NODE_EXE) deps/npm/node_modules/node-gyp/bin/node-gyp rebuild \
+	$(NODE) deps/npm/node_modules/node-gyp/bin/node-gyp rebuild \
 		--directory="$(shell pwd)/test/gc/node_modules/weak" \
 		--nodedir="$(shell pwd)"
 
 build-addons: $(NODE_EXE)
 	rm -rf test/addons/doc-*/
-	./$(NODE_EXE) tools/doc/addon-verify.js
+	$(NODE) tools/doc/addon-verify.js
 	$(foreach dir, \
 			$(sort $(dir $(wildcard test/addons/*/*.gyp))), \
-			./$(NODE_EXE) deps/npm/node_modules/node-gyp/bin/node-gyp rebuild \
+			$(NODE) deps/npm/node_modules/node-gyp/bin/node-gyp rebuild \
 					--directory="$(shell pwd)/$(dir)" \
 					--nodedir="$(shell pwd)" && ) echo "build done"
 
@@ -113,8 +113,6 @@ test-all-valgrind: test-build
 
 test-ci:
 	$(PYTHON) tools/test.py -p tap --logfile test.tap --mode=release message parallel sequential
-	$(MAKE) jslint
-	$(MAKE) cpplint
 
 test-release: test-build
 	$(PYTHON) tools/test.py --mode=release
@@ -141,7 +139,7 @@ test-npm: $(NODE_EXE)
 	NODE_EXE=$(NODE_EXE) tools/test-npm.sh
 
 test-npm-publish: $(NODE_EXE)
-	npm_package_config_publishtest=true ./$(NODE_EXE) deps/npm/test/run.js
+	npm_package_config_publishtest=true $(NODE) deps/npm/test/run.js
 
 test-addons: test-build
 	$(PYTHON) tools/test.py --mode=release addons
@@ -173,10 +171,10 @@ out/doc/%: doc/%
 	cp -r $< $@
 
 out/doc/api/%.json: doc/api/%.markdown $(NODE_EXE)
-	out/Release/$(NODE_EXE) tools/doc/generate.js --format=json $< > $@
+	$(NODE) tools/doc/generate.js --format=json $< > $@
 
 out/doc/api/%.html: doc/api/%.markdown $(NODE_EXE)
-	out/Release/$(NODE_EXE) tools/doc/generate.js --format=html --template=doc/template.html $< > $@
+	$(NODE) tools/doc/generate.js --format=html --template=doc/template.html $< > $@
 
 docopen: out/doc/api/all.html
 	-google-chrome out/doc/api/all.html
@@ -370,12 +368,12 @@ bench-http-simple:
 	 benchmark/http_simple_bench.sh
 
 bench-idle:
-	./$(NODE_EXE) benchmark/idle_server.js &
+	$(NODE) benchmark/idle_server.js &
 	sleep 1
-	./$(NODE_EXE) benchmark/idle_clients.js &
+	$(NODE) benchmark/idle_clients.js &
 
 jslint:
-	./$(NODE_EXE) tools/eslint/bin/eslint.js src lib test --reset --quiet
+	$(NODE) tools/eslint/bin/eslint.js src lib test --rulesdir tools/eslint-rules --reset --quiet
 
 CPPLINT_EXCLUDE ?=
 CPPLINT_EXCLUDE += src/node_lttng.cc