extend@3.0.0

6 files changed, 99 insertions, 47 deletions

diff --git a/node_modules/extend/.jscs.json b/node_modules/extend/.jscs.json
index 496777b71..7e84b282b 100644
--- a/node_modules/extend/.jscs.json
+++ b/node_modules/extend/.jscs.json
@@ -1,6 +1,12 @@
 {
 	"additionalRules": [],
 
+	"requireSemicolons": true,
+
+	"disallowMultipleSpaces": true,
+
+	"disallowIdentifierNames": [],
+
 	"requireCurlyBraces": ["if", "else", "for", "while", "do", "try", "catch"],
 
 	"requireSpaceAfterKeywords": ["if", "else", "for", "while", "do", "switch", "return", "try", "catch", "function"],
@@ -63,6 +69,36 @@
 	"validateQuoteMarks": {
 		"escape": true,
 		"mark": "'"
-	}
+	},
+
+	"disallowOperatorBeforeLineBreak": [],
+
+	"requireSpaceBeforeKeywords": [
+		"do",
+		"for",
+		"if",
+		"else",
+		"switch",
+		"case",
+		"try",
+		"catch",
+		"finally",
+		"while",
+		"with",
+		"return"
+	],
+
+	"validateAlignedFunctionParameters": {
+		"lineBreakAfterOpeningBraces": true,
+		"lineBreakBeforeClosingBraces": true
+	},
+
+	"requirePaddingNewLinesBeforeExport": true,
+
+	"validateNewlineAfterArrayElements": {
+		"maximum": 6
+	},
+
+	"requirePaddingNewLinesAfterUseStrict": true
 }
 
diff --git a/node_modules/extend/.travis.yml b/node_modules/extend/.travis.yml
index e6f69e8d8..ebef64499 100644
--- a/node_modules/extend/.travis.yml
+++ b/node_modules/extend/.travis.yml
@@ -1,5 +1,9 @@
 language: node_js
 node_js:
+  - "iojs-v2.3"
+  - "iojs-v2.2"
+  - "iojs-v2.1"
+  - "iojs-v2.0"
   - "iojs-v1.8"
   - "iojs-v1.7"
   - "iojs-v1.6"
@@ -17,10 +21,15 @@ node_js:
   - "0.6"
   - "0.4"
 before_install:
-  - '[ "${TRAVIS_NODE_VERSION}" == "0.6" ] || npm install -g npm@~1.4.6'
+  - '[ "${TRAVIS_NODE_VERSION}" = "0.6" ] || npm install -g npm@1.4.28 && npm install -g npm'
+sudo: false
 matrix:
   fast_finish: true
   allow_failures:
+    - node_js: "iojs-v2.2"
+    - node_js: "iojs-v2.1"
+    - node_js: "iojs-v2.0"
+    - node_js: "iojs-v1.7"
     - node_js: "iojs-v1.6"
     - node_js: "iojs-v1.5"
     - node_js: "iojs-v1.4"
@@ -33,4 +42,3 @@ matrix:
     - node_js: "0.8"
     - node_js: "0.6"
     - node_js: "0.4"
-sudo: false
diff --git a/node_modules/extend/CHANGELOG.md b/node_modules/extend/CHANGELOG.md
index 6f7b56d6e..ee0cfd6ad 100644
--- a/node_modules/extend/CHANGELOG.md
+++ b/node_modules/extend/CHANGELOG.md
@@ -1,3 +1,11 @@
+3.0.0 / 2015-07-01
+==================
+  * [Possible breaking change] Use global "strict" directive (#32)
+  * [Tests] `int` is an ES3 reserved word
+  * [Tests] Test up to `io.js` `v2.3`
+  * [Tests] Add `npm run eslint`
+  * [Dev Deps] Update `covert`, `jscs`
+
 2.0.1 / 2015-04-25
 ==================
   * Use an inline `isArray` check, for ES3 browsers. (#27)
diff --git a/node_modules/extend/component.json b/node_modules/extend/component.json
index bfb4518a2..1500a2f37 100644
--- a/node_modules/extend/component.json
+++ b/node_modules/extend/component.json
@@ -1,7 +1,7 @@
 {
 	"name": "extend",
 	"author": "Stefan Thomas <justmoon@members.fsf.org> (http://www.justmoon.net)",
-	"version": "2.0.1",
+	"version": "3.0.0",
 	"description": "Port of jQuery.extend for node.js and the browser.",
 	"scripts": [
 		"index.js"
diff --git a/node_modules/extend/index.js b/node_modules/extend/index.js
index 57a8bcc16..f5ec75d52 100644
--- a/node_modules/extend/index.js
+++ b/node_modules/extend/index.js
@@ -1,6 +1,7 @@
+'use strict';
+
 var hasOwn = Object.prototype.hasOwnProperty;
 var toStr = Object.prototype.toString;
-var undefined;
 
 var isArray = function isArray(arr) {
 	if (typeof Array.isArray === 'function') {
@@ -11,28 +12,26 @@ var isArray = function isArray(arr) {
 };
 
 var isPlainObject = function isPlainObject(obj) {
-	'use strict';
 	if (!obj || toStr.call(obj) !== '[object Object]') {
 		return false;
 	}
 
-	var has_own_constructor = hasOwn.call(obj, 'constructor');
-	var has_is_property_of_method = obj.constructor && obj.constructor.prototype && hasOwn.call(obj.constructor.prototype, 'isPrototypeOf');
+	var hasOwnConstructor = hasOwn.call(obj, 'constructor');
+	var hasIsPrototypeOf = obj.constructor && obj.constructor.prototype && hasOwn.call(obj.constructor.prototype, 'isPrototypeOf');
 	// Not own constructor property must be Object
-	if (obj.constructor && !has_own_constructor && !has_is_property_of_method) {
+	if (obj.constructor && !hasOwnConstructor && !hasIsPrototypeOf) {
 		return false;
 	}
 
 	// Own properties are enumerated firstly, so to speed up,
 	// if last one is own, then all properties are own.
 	var key;
-	for (key in obj) {}
+	for (key in obj) {/**/}
 
-	return key === undefined || hasOwn.call(obj, key);
+	return typeof key === 'undefined' || hasOwn.call(obj, key);
 };
 
 module.exports = function extend() {
-	'use strict';
 	var options, name, src, copy, copyIsArray, clone,
 		target = arguments[0],
 		i = 1,
@@ -59,25 +58,23 @@ module.exports = function extend() {
 				copy = options[name];
 
 				// Prevent never-ending loop
-				if (target === copy) {
-					continue;
-				}
+				if (target !== copy) {
+					// Recurse if we're merging plain objects or arrays
+					if (deep && copy && (isPlainObject(copy) || (copyIsArray = isArray(copy)))) {
+						if (copyIsArray) {
+							copyIsArray = false;
+							clone = src && isArray(src) ? src : [];
+						} else {
+							clone = src && isPlainObject(src) ? src : {};
+						}
 
-				// Recurse if we're merging plain objects or arrays
-				if (deep && copy && (isPlainObject(copy) || (copyIsArray = isArray(copy)))) {
-					if (copyIsArray) {
-						copyIsArray = false;
-						clone = src && isArray(src) ? src : [];
-					} else {
-						clone = src && isPlainObject(src) ? src : {};
-					}
+						// Never move original objects, clone them
+						target[name] = extend(deep, clone, copy);
 
-					// Never move original objects, clone them
-					target[name] = extend(deep, clone, copy);
-
-				// Don't bring in undefined values
-				} else if (copy !== undefined) {
-					target[name] = copy;
+					// Don't bring in undefined values
+					} else if (typeof copy !== 'undefined') {
+						target[name] = copy;
+					}
 				}
 			}
 		}
diff --git a/node_modules/extend/package.json b/node_modules/extend/package.json
index 6e957d802..64d1715fd 100644
--- a/node_modules/extend/package.json
+++ b/node_modules/extend/package.json
@@ -1,36 +1,36 @@
 {
   "_args": [
     [
-      "extend@~2.0.1",
+      "extend@~3.0.0",
       "/Users/rebecca/code/npm/node_modules/request"
     ]
   ],
-  "_from": "extend@>=2.0.1 <2.1.0",
-  "_id": "extend@2.0.1",
+  "_from": "extend@>=3.0.0 <3.1.0",
+  "_id": "extend@3.0.0",
   "_inCache": true,
   "_location": "/extend",
-  "_nodeVersion": "1.8.1",
+  "_nodeVersion": "2.3.1",
   "_npmUser": {
     "email": "ljharb@gmail.com",
     "name": "ljharb"
   },
-  "_npmVersion": "2.8.3",
+  "_npmVersion": "2.11.3",
   "_phantomChildren": {},
   "_requested": {
     "name": "extend",
-    "raw": "extend@~2.0.1",
-    "rawSpec": "~2.0.1",
+    "raw": "extend@~3.0.0",
+    "rawSpec": "~3.0.0",
     "scope": null,
-    "spec": ">=2.0.1 <2.1.0",
+    "spec": ">=3.0.0 <3.1.0",
     "type": "range"
   },
   "_requiredBy": [
     "/request"
   ],
-  "_resolved": "https://registry.npmjs.org/extend/-/extend-2.0.1.tgz",
-  "_shasum": "1ee8010689e7395ff9448241c98652bc759a8260",
+  "_resolved": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz",
+  "_shasum": "5a474353b9f3353ddd8176dfd37b91c83a46f1d4",
   "_shrinkwrap": null,
-  "_spec": "extend@~2.0.1",
+  "_spec": "extend@~3.0.0",
   "_where": "/Users/rebecca/code/npm/node_modules/request",
   "author": {
     "email": "justmoon@members.fsf.org",
@@ -49,16 +49,17 @@
   "dependencies": {},
   "description": "Port of jQuery.extend for node.js and the browser",
   "devDependencies": {
-    "covert": "^1.0.1",
-    "jscs": "^1.11.3",
+    "covert": "^1.1.0",
+    "eslint": "^0.24.0",
+    "jscs": "^1.13.1",
     "tape": "^4.0.0"
   },
   "directories": {},
   "dist": {
-    "shasum": "1ee8010689e7395ff9448241c98652bc759a8260",
-    "tarball": "http://registry.npmjs.org/extend/-/extend-2.0.1.tgz"
+    "shasum": "5a474353b9f3353ddd8176dfd37b91c83a46f1d4",
+    "tarball": "http://registry.npmjs.org/extend/-/extend-3.0.0.tgz"
   },
-  "gitHead": "ce3790222d3d2051f728f74be9565f155ed599c3",
+  "gitHead": "148e7270cab2e9413af2cd0cab147070d755ed6d",
   "homepage": "https://github.com/justmoon/node-extend#readme",
   "keywords": [
     "clone",
@@ -86,8 +87,10 @@
   "scripts": {
     "coverage": "covert test/index.js",
     "coverage-quiet": "covert test/index.js --quiet",
-    "lint": "jscs *.js */*.js",
+    "eslint": "eslint *.js */*.js",
+    "jscs": "jscs *.js */*.js",
+    "lint": "npm run jscs && npm run eslint",
     "test": "npm run lint && node test/index.js && npm run coverage-quiet"
   },
-  "version": "2.0.1"
+  "version": "3.0.0"
 }