deps: upgrade npm to 2.11.0

PR-URL: https://github.com/iojs/io.js/pull/1829
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>

3 files changed, 26 insertions, 35 deletions

diff --git a/deps/npm/node_modules/rimraf/LICENSE b/deps/npm/node_modules/rimraf/LICENSE
index 05a4010949..19129e315f 100644
--- a/deps/npm/node_modules/rimraf/LICENSE
+++ b/deps/npm/node_modules/rimraf/LICENSE
@@ -1,23 +1,15 @@
-Copyright 2009, 2010, 2011 Isaac Z. Schlueter.
-All rights reserved.
+The ISC License
 
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
+Copyright (c) Isaac Z. Schlueter and Contributors
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
+IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
diff --git a/deps/npm/node_modules/rimraf/package.json b/deps/npm/node_modules/rimraf/package.json
index 7b28e7302a..aabb562a7a 100644
--- a/deps/npm/node_modules/rimraf/package.json
+++ b/deps/npm/node_modules/rimraf/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rimraf",
-  "version": "2.3.3",
+  "version": "2.3.4",
   "main": "rimraf.js",
   "description": "A deep deletion module for node (like `rm -rf`)",
   "author": {
@@ -8,10 +8,7 @@
     "email": "i@izs.me",
     "url": "http://blog.izs.me/"
   },
-  "license": {
-    "type": "MIT",
-    "url": "https://github.com/isaacs/rimraf/raw/master/LICENSE"
-  },
+  "license": "ISC",
   "repository": {
     "type": "git",
     "url": "git://github.com/isaacs/rimraf.git"
@@ -31,23 +28,23 @@
     "LICENSE",
     "README.md"
   ],
-  "gitHead": "ad4efe8102a72c77bf2b13165ecc2229a9a68955",
+  "gitHead": "2a6cc45bbbdd8da5fd703d8af62843565f7dea57",
   "bugs": {
     "url": "https://github.com/isaacs/rimraf/issues"
   },
-  "homepage": "https://github.com/isaacs/rimraf",
-  "_id": "rimraf@2.3.3",
-  "_shasum": "d0073d8b3010611e8f3ad377b08e9a3c18b98f06",
-  "_from": "rimraf@>=2.3.3 <2.4.0",
-  "_npmVersion": "2.7.6",
-  "_nodeVersion": "1.7.1",
+  "homepage": "https://github.com/isaacs/rimraf#readme",
+  "_id": "rimraf@2.3.4",
+  "_shasum": "82d9bc1b2fcf31e205ac7b28138a025d08e9159a",
+  "_from": "rimraf@>=2.3.4 <2.4.0",
+  "_npmVersion": "2.10.0",
+  "_nodeVersion": "2.0.1",
   "_npmUser": {
     "name": "isaacs",
     "email": "isaacs@npmjs.com"
   },
   "dist": {
-    "shasum": "d0073d8b3010611e8f3ad377b08e9a3c18b98f06",
-    "tarball": "http://registry.npmjs.org/rimraf/-/rimraf-2.3.3.tgz"
+    "shasum": "82d9bc1b2fcf31e205ac7b28138a025d08e9159a",
+    "tarball": "http://registry.npmjs.org/rimraf/-/rimraf-2.3.4.tgz"
   },
   "maintainers": [
     {
@@ -56,5 +53,6 @@
     }
   ],
   "directories": {},
-  "_resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.3.3.tgz"
+  "_resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.3.4.tgz",
+  "readme": "ERROR: No README data found!"
 }
diff --git a/deps/npm/node_modules/rimraf/rimraf.js b/deps/npm/node_modules/rimraf/rimraf.js
index 8d420d2516..7f684e4b59 100644
--- a/deps/npm/node_modules/rimraf/rimraf.js
+++ b/deps/npm/node_modules/rimraf/rimraf.js
@@ -258,6 +258,7 @@ function rimrafSync (p, options) {
   assert(p, 'rimraf: missing path')
   assert.equal(typeof p, 'string', 'rimraf: path should be a string')
   assert(options, 'rimraf: missing options')
+  assert.equal(typeof options, 'object', 'rimraf: options should be object')
 
   var results