diff options
| author | Forrest L Norvell <forrest@npmjs.com> | 2015-02-20 09:03:34 -0800 |
|---|---|---|
| committer | Ben Noordhuis <info@bnoordhuis.nl> | 2015-02-22 07:42:24 +0100 |
| commit | 1e2fa1537f9978acbd27db6ee151885ab02346c1 (patch) | |
| tree | aa886046ac044759ab2c4650d4b45d2b736dbcde /deps/npm/node_modules/ini | |
| parent | 3ab9b92e90e4bb3ed68457fcb95bc32f17586f3a (diff) | |
| download | android-node-v8-1e2fa1537f9978acbd27db6ee151885ab02346c1.tar.gz android-node-v8-1e2fa1537f9978acbd27db6ee151885ab02346c1.tar.bz2 android-node-v8-1e2fa1537f9978acbd27db6ee151885ab02346c1.zip | |
deps: upgrade npm to 2.6.0
PR-URL: https://github.com/iojs/io.js/pull/904
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Diffstat (limited to 'deps/npm/node_modules/ini')
| -rw-r--r-- | deps/npm/node_modules/ini/ini.js | 2 | ||||
| -rw-r--r-- | deps/npm/node_modules/ini/package.json | 20 | ||||
| -rw-r--r-- | deps/npm/node_modules/ini/test/fixtures/foo.ini | 2 | ||||
| -rw-r--r-- | deps/npm/node_modules/ini/test/foo.js | 2 |
4 files changed, 15 insertions, 11 deletions
diff --git a/deps/npm/node_modules/ini/ini.js b/deps/npm/node_modules/ini/ini.js index 1e232e7438..ddf5bd9cc6 100644 --- a/deps/npm/node_modules/ini/ini.js +++ b/deps/npm/node_modules/ini/ini.js @@ -145,7 +145,7 @@ function isQuoted (val) { function safe (val) { return ( typeof val !== "string" - || val.match(/[\r\n]/) + || val.match(/[=\r\n]/) || val.match(/^\[/) || (val.length > 1 && isQuoted(val)) diff --git a/deps/npm/node_modules/ini/package.json b/deps/npm/node_modules/ini/package.json index a910b78861..5a1e10b81c 100644 --- a/deps/npm/node_modules/ini/package.json +++ b/deps/npm/node_modules/ini/package.json @@ -6,7 +6,7 @@ }, "name": "ini", "description": "An ini encoder/decoder for node", - "version": "1.3.2", + "version": "1.3.3", "repository": { "type": "git", "url": "git://github.com/isaacs/ini.git" @@ -23,16 +23,16 @@ "tap": "~0.4.0" }, "license": "ISC", - "gitHead": "bbe4a8bb09afa58f724c04ce43a49037cabeadfb", + "gitHead": "566268f1fb8dd3c0f7d968091de7b7fb2b97b483", "bugs": { "url": "https://github.com/isaacs/ini/issues" }, "homepage": "https://github.com/isaacs/ini", - "_id": "ini@1.3.2", - "_shasum": "9ebf4a44daf9d89acd07aab9f89a083d887f6dec", - "_from": "ini@>=1.3.2 <1.4.0", - "_npmVersion": "2.1.9", - "_nodeVersion": "0.10.16", + "_id": "ini@1.3.3", + "_shasum": "c07e34aef1de06aff21d413b458e52b21533a11e", + "_from": "ini@>=1.3.1 <1.4.0", + "_npmVersion": "2.5.1", + "_nodeVersion": "1.1.0", "_npmUser": { "name": "isaacs", "email": "i@izs.me" @@ -44,9 +44,9 @@ } ], "dist": { - "shasum": "9ebf4a44daf9d89acd07aab9f89a083d887f6dec", - "tarball": "http://registry.npmjs.org/ini/-/ini-1.3.2.tgz" + "shasum": "c07e34aef1de06aff21d413b458e52b21533a11e", + "tarball": "http://registry.npmjs.org/ini/-/ini-1.3.3.tgz" }, "directories": {}, - "_resolved": "https://registry.npmjs.org/ini/-/ini-1.3.2.tgz" + "_resolved": "https://registry.npmjs.org/ini/-/ini-1.3.3.tgz" } diff --git a/deps/npm/node_modules/ini/test/fixtures/foo.ini b/deps/npm/node_modules/ini/test/fixtures/foo.ini index 27555e9d82..fc2080f161 100644 --- a/deps/npm/node_modules/ini/test/fixtures/foo.ini +++ b/deps/npm/node_modules/ini/test/fixtures/foo.ini @@ -29,6 +29,8 @@ ar = this is included br = cold br = warm +eq = "eq=eq" + ; a section [a] av = a val diff --git a/deps/npm/node_modules/ini/test/foo.js b/deps/npm/node_modules/ini/test/foo.js index 9d34aa6fda..58102d1e72 100644 --- a/deps/npm/node_modules/ini/test/foo.js +++ b/deps/npm/node_modules/ini/test/foo.js @@ -18,6 +18,7 @@ var i = require("../") + 'ar[]=three\n' + 'ar[]=this is included\n' + 'br=warm\n' + + 'eq=\"eq=eq\"\n' + '\n' + '[a]\n' + 'av=a val\n' @@ -43,6 +44,7 @@ var i = require("../") 'zr': ['deedee'], 'ar': ['one', 'three', 'this is included'], 'br': 'warm', + 'eq': 'eq=eq', a: { av: 'a val', e: '{ o: p, a: { av: a val, b: { c: { e: "this [value]" } } } }', |