diff --git a/.gitignore b/.gitignore index a418e8c6..040b421a 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,5 @@ config/environments/*.js tools/munin/windshaft.conf logs/ pids/ +redis.pid +test.log diff --git a/NEWS.md b/NEWS.md index 671ae399..3e3d48ac 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,7 +1,34 @@ -1.18.1 -- 2014-mm-dd +1.19.1 -- 2014-mm-dd -------------------- +1.19.0 -- 2014-10-14 +-------------------- + +Announcements: + - Dropping support for npm <1.2.1 + npm-shrinkwrap.json is incompatible when generated with npm >=1.2.1 and consumed by npm <1.2.1 + - Upgrades windshaft to 0.28.2 + - Generates npm-shrinkwrap.json with npm >1.2.0 + + +1.18.2 -- 2014-10-13 +-------------------- + +Bug fixes: + - Defaults resultSet to object if undefined in QueryTablesApi + +Announcements: + - Upgrades windshaft to 0.28.1 + + +1.18.1 -- 2014-10-13 +-------------------- + +New features: + - Allow to add more node.js' threadpool workers via process.env.UV_THREADPOOL_SIZE + + 1.18.0 -- 2014-10-03 -------------------- diff --git a/app.js b/app.js index de77d794..a3d27f97 100755 --- a/app.js +++ b/app.js @@ -38,6 +38,10 @@ log4js_config = { replaceConsole:true }; +if (global.environment.uv_threadpool_size) { + process.env.UV_THREADPOOL_SIZE = global.environment.uv_threadpool_size; +} + if ( global.environment.log_filename ) { var logdir = path.dirname(global.environment.log_filename); // See cwd inlog4js.configure call below diff --git a/config/environments/development.js.example b/config/environments/development.js.example index 59c9f6aa..d0ec046b 100644 --- a/config/environments/development.js.example +++ b/config/environments/development.js.example @@ -2,6 +2,7 @@ var config = { environment: 'development' ,port: 8181 ,host: '127.0.0.1' + ,uv_threadpool_size: undefined // Regular expression pattern to extract username // from hostname. Must have a single grabbing block. ,user_from_host: '^(.*)\\.localhost' diff --git a/config/environments/production.js.example b/config/environments/production.js.example index 851671da..794f7dfc 100644 --- a/config/environments/production.js.example +++ b/config/environments/production.js.example @@ -2,6 +2,7 @@ var config = { environment: 'production' ,port: 8181 ,host: '127.0.0.1' + ,uv_threadpool_size: undefined // Regular expression pattern to extract username // from hostname. Must have a single grabbing block. ,user_from_host: '^(.*)\\.cartodb\\.com$' diff --git a/config/environments/staging.js.example b/config/environments/staging.js.example index 1084f1e6..c07d17cb 100644 --- a/config/environments/staging.js.example +++ b/config/environments/staging.js.example @@ -2,6 +2,7 @@ var config = { environment: 'production' ,port: 8181 ,host: '127.0.0.1' + ,uv_threadpool_size: undefined // Regular expression pattern to extract username // from hostname. Must have a single grabbing block. ,user_from_host: '^(.*)\\.cartodb\\.com$' diff --git a/config/environments/test.js.example b/config/environments/test.js.example index 2937f285..f91e36a4 100644 --- a/config/environments/test.js.example +++ b/config/environments/test.js.example @@ -2,6 +2,7 @@ var config = { environment: 'test' ,port: 8888 ,host: '127.0.0.1' + ,uv_threadpool_size: undefined // Regular expression pattern to extract username // from hostname. Must have a single grabbing block. ,user_from_host: '(.*)' diff --git a/lib/cartodb/api/query_tables_api.js b/lib/cartodb/api/query_tables_api.js index 11a416b8..c6eb2e48 100644 --- a/lib/cartodb/api/query_tables_api.js +++ b/lib/cartodb/api/query_tables_api.js @@ -93,6 +93,7 @@ function runQuery(username, options, query, queryHandler, callback) { if (shouldQueryPostgresDirectly()) { var psql = new PSQL(options); psql.query(query, function(err, resultSet) { + resultSet = resultSet || {}; var rows = resultSet.rows || []; queryHandler(err, rows, callback); }); diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index a84e3555..e72b9e40 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1,55 +1,218 @@ { "name": "windshaft-cartodb", - "version": "1.18.1", + "version": "1.19.1", "dependencies": { - "node-varnish": { - "version": "0.3.0", - "from": "https://github.com/Vizzuality/node-varnish/tarball/0.3.0" + "cartodb-psql": { + "version": "0.4.0", + "from": "https://github.com/CartoDB/node-cartodb-psql/tarball/0.4.0", + "resolved": "https://github.com/CartoDB/node-cartodb-psql/tarball/0.4.0", + "dependencies": { + "pg": { + "version": "2.6.2-cdb1", + "from": "pg@git://github.com/CartoDB/node-postgres.git#2.6.2-cdb1", + "resolved": "git://github.com/CartoDB/node-postgres.git#836a2dc3131e873fc4ba20cd16e7fb69a7dca98a", + "dependencies": { + "generic-pool": { + "version": "2.0.3", + "from": "generic-pool@2.0.3" + }, + "buffer-writer": { + "version": "1.0.0", + "from": "buffer-writer@1.0.0" + } + } + } + } }, - "underscore": { - "version": "1.6.0" + "cartodb-redis": { + "version": "0.11.0", + "from": "https://github.com/CartoDB/node-cartodb-redis/tarball/0.11.0", + "resolved": "https://github.com/CartoDB/node-cartodb-redis/tarball/0.11.0", + "dependencies": { + "redis-mpool": { + "version": "0.1.0", + "from": "redis-mpool@git://github.com/CartoDB/node-redis-mpool.git#0.1.0", + "resolved": "git://github.com/CartoDB/node-redis-mpool.git#47510b8d4525ee24aa2e5328976372274a1d144e", + "dependencies": { + "generic-pool": { + "version": "2.1.1", + "from": "generic-pool@~2.1.1" + }, + "redis": { + "version": "0.12.1", + "from": "redis@~0.12.1" + }, + "hiredis": { + "version": "0.1.17", + "from": "hiredis@~0.1.17", + "dependencies": { + "bindings": { + "version": "1.2.1", + "from": "bindings@*" + }, + "nan": { + "version": "1.1.2", + "from": "nan@~1.1.0" + } + } + } + } + } + } }, "dot": { - "version": "1.0.2" + "version": "1.0.2", + "from": "dot@~1.0.2" + }, + "log4js": { + "version": "0.6.21", + "from": "log4js@~0.6.17", + "dependencies": { + "async": { + "version": "0.2.10", + "from": "async@~0.2.0" + }, + "readable-stream": { + "version": "1.0.33-1", + "from": "readable-stream@~1.0.2", + "dependencies": { + "core-util-is": { + "version": "1.0.1", + "from": "core-util-is@~1.0.0" + }, + "isarray": { + "version": "0.0.1", + "from": "isarray@0.0.1" + }, + "string_decoder": { + "version": "0.10.31", + "from": "string_decoder@~0.10.x" + }, + "inherits": { + "version": "2.0.1", + "from": "inherits@2" + } + } + } + } + }, + "lzma": { + "version": "1.3.7", + "from": "lzma@~1.3.7" + }, + "node-varnish": { + "version": "0.3.0", + "from": "https://github.com/Vizzuality/node-varnish/tarball/0.3.0", + "resolved": "https://github.com/Vizzuality/node-varnish/tarball/0.3.0" + }, + "redis-mpool": { + "version": "0.1.0", + "from": "https://github.com/CartoDB/node-redis-mpool/tarball/0.1.0", + "resolved": "https://github.com/CartoDB/node-redis-mpool/tarball/0.1.0", + "dependencies": { + "generic-pool": { + "version": "2.1.1", + "from": "generic-pool@~2.1.1" + }, + "redis": { + "version": "0.12.1", + "from": "redis@~0.12.1" + }, + "hiredis": { + "version": "0.1.17", + "from": "hiredis@~0.1.17", + "dependencies": { + "bindings": { + "version": "1.2.1", + "from": "bindings@*" + }, + "nan": { + "version": "1.1.2", + "from": "nan@~1.1.0" + } + } + } + } + }, + "request": { + "version": "2.9.203", + "from": "request@~2.9.203" + }, + "rollbar": { + "version": "0.3.13", + "from": "rollbar@~0.3.13", + "dependencies": { + "node-uuid": { + "version": "1.4.1", + "from": "node-uuid@1.4.x" + }, + "lru-cache": { + "version": "2.2.4", + "from": "lru-cache@~2.2.1" + }, + "json-stringify-safe": { + "version": "5.0.0", + "from": "json-stringify-safe@~5.0.0" + } + } + }, + "step": { + "version": "0.0.5", + "from": "step@~0.0.5" + }, + "underscore": { + "version": "1.6.0", + "from": "underscore@~1.6.0" }, "windshaft": { - "version": "0.28.1", - "from": "https://github.com/CartoDB/Windshaft/tarball/0.28.0", + "version": "0.28.2", + "from": "https://github.com/CartoDB/Windshaft/tarball/0.28.2", + "resolved": "https://github.com/CartoDB/Windshaft/tarball/0.28.2", "dependencies": { "chronograph": { "version": "0.1.0", - "from": "git://github.com/CartoDB/chronographjs.git#0.1.0" + "from": "chronograph@git://github.com/CartoDB/chronographjs.git#0.1.0", + "resolved": "git://github.com/CartoDB/chronographjs.git#0b8c35eee510cfa14a16be24d70533b38ecc1d2d" }, "grainstore": { "version": "0.22.0", "from": "https://github.com/CartoDB/grainstore/tarball/0.22.0", + "resolved": "https://github.com/CartoDB/grainstore/tarball/0.22.0", "dependencies": { "carto": { "version": "0.9.5-cdb2", "from": "https://github.com/CartoDB/carto/tarball/0.9.5-cdb2", + "resolved": "https://github.com/CartoDB/carto/tarball/0.9.5-cdb2", "dependencies": { "underscore": { - "version": "1.4.4" + "version": "1.4.4", + "from": "underscore@~1.4.3" }, "mapnik-reference": { - "version": "5.0.9" + "version": "5.0.9", + "from": "mapnik-reference@~5.0.7" }, "xml2js": { "version": "0.2.8", + "from": "xml2js@~0.2.4", "dependencies": { "sax": { - "version": "0.5.8" + "version": "0.5.8", + "from": "sax@0.5.x" } } }, "optimist": { "version": "0.6.1", + "from": "optimist@~0.6.0", "dependencies": { "wordwrap": { - "version": "0.0.2" + "version": "0.0.2", + "from": "wordwrap@~0.0.2" }, "minimist": { - "version": "0.0.10" + "version": "0.0.10", + "from": "minimist@~0.0.1" } } } @@ -57,220 +220,319 @@ }, "millstone": { "version": "0.6.14", + "from": "millstone@~0.6.14", "dependencies": { "generic-pool": { - "version": "2.0.4" + "version": "2.0.4", + "from": "generic-pool@~2.0.3" }, "request": { "version": "2.34.0", + "from": "request@~2.34.0", "dependencies": { "qs": { - "version": "0.6.6" + "version": "0.6.6", + "from": "qs@~0.6.0" }, "json-stringify-safe": { - "version": "5.0.0" + "version": "5.0.0", + "from": "json-stringify-safe@~5.0.0" }, "forever-agent": { - "version": "0.5.2" + "version": "0.5.2", + "from": "forever-agent@~0.5.0" }, "node-uuid": { - "version": "1.4.1" + "version": "1.4.1", + "from": "node-uuid@~1.4.0" }, "tough-cookie": { "version": "0.12.1", + "from": "tough-cookie@>=0.12.0", "dependencies": { "punycode": { - "version": "1.3.1" + "version": "1.3.1", + "from": "punycode@>=0.2.0" } } }, "form-data": { "version": "0.1.4", + "from": "form-data@~0.1.0", "dependencies": { "combined-stream": { "version": "0.0.5", + "from": "combined-stream@~0.0.4", "dependencies": { "delayed-stream": { - "version": "0.0.5" + "version": "0.0.5", + "from": "delayed-stream@0.0.5" } } }, "async": { - "version": "0.9.0" + "version": "0.9.0", + "from": "async@~0.9.0" } } }, "tunnel-agent": { - "version": "0.3.0" + "version": "0.3.0", + "from": "tunnel-agent@~0.3.0" }, "http-signature": { "version": "0.10.0", + "from": "http-signature@~0.10.0", "dependencies": { "assert-plus": { - "version": "0.1.2" + "version": "0.1.2", + "from": "assert-plus@0.1.2" }, "asn1": { - "version": "0.1.11" + "version": "0.1.11", + "from": "asn1@0.1.11" }, "ctype": { - "version": "0.5.2" + "version": "0.5.2", + "from": "ctype@0.5.2" } } }, "oauth-sign": { - "version": "0.3.0" + "version": "0.3.0", + "from": "oauth-sign@~0.3.0" }, "hawk": { "version": "1.0.0", + "from": "hawk@~1.0.0", "dependencies": { "hoek": { - "version": "0.9.1" + "version": "0.9.1", + "from": "hoek@0.9.x" }, "boom": { - "version": "0.4.2" + "version": "0.4.2", + "from": "boom@0.4.x" }, "cryptiles": { - "version": "0.2.2" + "version": "0.2.2", + "from": "cryptiles@0.2.x" }, "sntp": { - "version": "0.2.4" + "version": "0.2.4", + "from": "sntp@0.2.x" } } }, "aws-sign2": { - "version": "0.5.0" + "version": "0.5.0", + "from": "aws-sign2@~0.5.0" } } }, "srs": { "version": "0.4.3", + "from": "srs@~0.4.1", "dependencies": { "nan": { - "version": "1.2.0" + "version": "1.2.0", + "from": "nan@~1.2.0" }, "node-pre-gyp": { "version": "0.5.17", + "from": "node-pre-gyp@0.5.x", + "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.5.17.tgz", "dependencies": { "nopt": { "version": "2.2.1", + "from": "nopt@~2.2.0", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-2.2.1.tgz", "dependencies": { "abbrev": { - "version": "1.0.5" + "version": "1.0.5", + "from": "abbrev@1", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.5.tgz" } } }, "npmlog": { "version": "0.0.6", + "from": "npmlog@~0.0.6", + "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-0.0.6.tgz", "dependencies": { "ansi": { - "version": "0.2.1" + "version": "0.2.1", + "from": "ansi@~0.2.1", + "resolved": "https://registry.npmjs.org/ansi/-/ansi-0.2.1.tgz" } } }, "request": { "version": "2.36.0", + "from": "request@2", + "resolved": "https://registry.npmjs.org/request/-/request-2.36.0.tgz", "dependencies": { "qs": { - "version": "0.6.6" + "version": "0.6.6", + "from": "qs@~0.6.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-0.6.6.tgz" }, "json-stringify-safe": { - "version": "5.0.0" + "version": "5.0.0", + "from": "json-stringify-safe@~5.0.0", + "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz" }, "mime": { - "version": "1.2.11" + "version": "1.2.11", + "from": "mime@~1.2.9", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz" }, "forever-agent": { - "version": "0.5.2" + "version": "0.5.2", + "from": "forever-agent@~0.5.0", + "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz" }, "node-uuid": { - "version": "1.4.1" + "version": "1.4.1", + "from": "node-uuid@~1.4.0", + "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz" }, "tough-cookie": { "version": "0.12.1", + "from": "tough-cookie@>=0.12.0", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz", "dependencies": { "punycode": { - "version": "1.2.4" + "version": "1.2.4", + "from": "punycode@>=0.2.0", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.2.4.tgz" } } }, "form-data": { "version": "0.1.2", + "from": "form-data@~0.1.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.2.tgz", "dependencies": { "combined-stream": { "version": "0.0.4", + "from": "combined-stream@~0.0.4", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.4.tgz", "dependencies": { "delayed-stream": { - "version": "0.0.5" + "version": "0.0.5", + "from": "delayed-stream@0.0.5", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz" } } }, "async": { - "version": "0.2.10" + "version": "0.2.10", + "from": "async@~0.2.9", + "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz" } } }, "tunnel-agent": { - "version": "0.4.0" + "version": "0.4.0", + "from": "tunnel-agent@~0.4.0", + "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz" }, "http-signature": { "version": "0.10.0", + "from": "http-signature@~0.10.0", + "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.0.tgz", "dependencies": { "assert-plus": { - "version": "0.1.2" + "version": "0.1.2", + "from": "assert-plus@0.1.2", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.2.tgz" }, "asn1": { - "version": "0.1.11" + "version": "0.1.11", + "from": "asn1@0.1.11", + "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz" }, "ctype": { - "version": "0.5.2" + "version": "0.5.2", + "from": "ctype@0.5.2", + "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.2.tgz" } } }, "oauth-sign": { - "version": "0.3.0" + "version": "0.3.0", + "from": "oauth-sign@~0.3.0", + "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz" }, "hawk": { "version": "1.0.0", + "from": "hawk@~1.0.0", + "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz", "dependencies": { "hoek": { - "version": "0.9.1" + "version": "0.9.1", + "from": "hoek@0.9.x", + "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz" }, "boom": { - "version": "0.4.2" + "version": "0.4.2", + "from": "boom@0.4.x", + "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz" }, "cryptiles": { - "version": "0.2.2" + "version": "0.2.2", + "from": "cryptiles@0.2.x", + "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz" }, "sntp": { - "version": "0.2.4" + "version": "0.2.4", + "from": "sntp@0.2.x", + "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz" } } }, "aws-sign2": { - "version": "0.5.0" + "version": "0.5.0", + "from": "aws-sign2@~0.5.0", + "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz" } } }, "semver": { - "version": "2.3.0" + "version": "2.3.0", + "from": "semver@~2.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-2.3.0.tgz" }, "tar": { "version": "0.1.19", + "from": "tar@~0.1.19", + "resolved": "https://registry.npmjs.org/tar/-/tar-0.1.19.tgz", "dependencies": { "inherits": { - "version": "2.0.1" + "version": "2.0.1", + "from": "inherits@2", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" }, "block-stream": { - "version": "0.0.7" + "version": "0.0.7", + "from": "block-stream@*", + "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.7.tgz" }, "fstream": { "version": "0.1.25", + "from": "fstream@~0.1.8", + "resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.25.tgz", "dependencies": { "mkdirp": { - "version": "0.3.5" + "version": "0.3.5", + "from": "mkdirp@0.3", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz" }, "graceful-fs": { - "version": "2.0.3" + "version": "2.0.3", + "from": "graceful-fs@~2.0.0", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz" } } } @@ -278,98 +540,152 @@ }, "tar-pack": { "version": "2.0.0", + "from": "tar-pack@~2.0.0", + "resolved": "https://registry.npmjs.org/tar-pack/-/tar-pack-2.0.0.tgz", "dependencies": { "uid-number": { - "version": "0.0.3" + "version": "0.0.3", + "from": "uid-number@0.0.3", + "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.3.tgz" }, "once": { - "version": "1.1.1" + "version": "1.1.1", + "from": "once@~1.1.1", + "resolved": "https://registry.npmjs.org/once/-/once-1.1.1.tgz" }, "debug": { - "version": "0.7.4" + "version": "0.7.4", + "from": "debug@~0.7.2", + "resolved": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz" }, "fstream": { "version": "0.1.25", + "from": "fstream@~0.1.22", + "resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.25.tgz", "dependencies": { "mkdirp": { - "version": "0.3.5" + "version": "0.3.5", + "from": "mkdirp@0.3", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz" }, "graceful-fs": { - "version": "2.0.3" + "version": "2.0.3", + "from": "graceful-fs@~2.0.0", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz" }, "inherits": { - "version": "2.0.1" + "version": "2.0.1", + "from": "inherits@~2.0.0", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" } } }, "fstream-ignore": { "version": "0.0.7", + "from": "fstream-ignore@0.0.7", + "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-0.0.7.tgz", "dependencies": { "minimatch": { "version": "0.2.14", + "from": "minimatch@~0.2.0", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz", "dependencies": { "lru-cache": { - "version": "2.5.0" + "version": "2.5.0", + "from": "lru-cache@2", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz" }, "sigmund": { - "version": "1.0.0" + "version": "1.0.0", + "from": "sigmund@~1.0.0", + "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz" } } }, "inherits": { - "version": "2.0.1" + "version": "2.0.1", + "from": "inherits@~2.0.0", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" } } }, "readable-stream": { "version": "1.0.27-1", + "from": "readable-stream@~1.0.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.27-1.tgz", "dependencies": { "core-util-is": { - "version": "1.0.1" + "version": "1.0.1", + "from": "core-util-is@~1.0.0", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz" }, "isarray": { - "version": "0.0.1" + "version": "0.0.1", + "from": "isarray@0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz" }, "string_decoder": { - "version": "0.10.25-1" + "version": "0.10.25-1", + "from": "string_decoder@~0.10.x", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.25-1.tgz" }, "inherits": { - "version": "2.0.1" + "version": "2.0.1", + "from": "inherits@~2.0.0", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" } } }, "graceful-fs": { - "version": "1.2.3" + "version": "1.2.3", + "from": "graceful-fs@1.2", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz" } } }, "mkdirp": { "version": "0.5.0", + "from": "mkdirp@~0.5.0", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz", "dependencies": { "minimist": { - "version": "0.0.8" + "version": "0.0.8", + "from": "minimist@0.0.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz" } } }, "rc": { "version": "0.4.0", + "from": "rc@~0.4.0", + "resolved": "https://registry.npmjs.org/rc/-/rc-0.4.0.tgz", "dependencies": { "minimist": { - "version": "0.0.10" + "version": "0.0.10", + "from": "minimist@~0.0.7", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz" }, "deep-extend": { - "version": "0.2.10" + "version": "0.2.10", + "from": "deep-extend@~0.2.5", + "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.2.10.tgz" }, "strip-json-comments": { - "version": "0.1.3" + "version": "0.1.3", + "from": "strip-json-comments@0.1.x", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-0.1.3.tgz" }, "ini": { - "version": "1.1.0" + "version": "1.1.0", + "from": "ini@~1.1.0", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.1.0.tgz" } } }, "rimraf": { - "version": "2.2.8" + "version": "2.2.8", + "from": "rimraf@~2.2.5", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz" } } } @@ -377,133 +693,206 @@ }, "zipfile": { "version": "0.5.3", + "from": "zipfile@~0.5.2", "dependencies": { "nan": { - "version": "1.2.0" + "version": "1.2.0", + "from": "nan@~1.2.0" }, "node-pre-gyp": { "version": "0.5.19", + "from": "node-pre-gyp@0.5.x", "dependencies": { "nopt": { "version": "2.2.1", + "from": "nopt@~2.2.0", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-2.2.1.tgz", "dependencies": { "abbrev": { - "version": "1.0.5" + "version": "1.0.5", + "from": "abbrev@1", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.5.tgz" } } }, "npmlog": { "version": "0.0.6", + "from": "npmlog@~0.0.6", + "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-0.0.6.tgz", "dependencies": { "ansi": { - "version": "0.2.1" + "version": "0.2.1", + "from": "ansi@~0.2.1", + "resolved": "https://registry.npmjs.org/ansi/-/ansi-0.2.1.tgz" } } }, "request": { "version": "2.36.0", + "from": "request@2", + "resolved": "https://registry.npmjs.org/request/-/request-2.36.0.tgz", "dependencies": { "qs": { - "version": "0.6.6" + "version": "0.6.6", + "from": "qs@~0.6.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-0.6.6.tgz" }, "json-stringify-safe": { - "version": "5.0.0" + "version": "5.0.0", + "from": "json-stringify-safe@~5.0.0", + "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz" }, "mime": { - "version": "1.2.11" + "version": "1.2.11", + "from": "mime@~1.2.9", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz" }, "forever-agent": { - "version": "0.5.2" + "version": "0.5.2", + "from": "forever-agent@~0.5.0", + "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz" }, "node-uuid": { - "version": "1.4.1" + "version": "1.4.1", + "from": "node-uuid@~1.4.0", + "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz" }, "tough-cookie": { "version": "0.12.1", + "from": "tough-cookie@>=0.12.0", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz", "dependencies": { "punycode": { - "version": "1.2.4" + "version": "1.2.4", + "from": "punycode@>=0.2.0", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.2.4.tgz" } } }, "form-data": { "version": "0.1.2", + "from": "form-data@~0.1.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.2.tgz", "dependencies": { "combined-stream": { "version": "0.0.4", + "from": "combined-stream@~0.0.4", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.4.tgz", "dependencies": { "delayed-stream": { - "version": "0.0.5" + "version": "0.0.5", + "from": "delayed-stream@0.0.5", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz" } } }, "async": { - "version": "0.2.10" + "version": "0.2.10", + "from": "async@~0.2.9", + "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz" } } }, "tunnel-agent": { - "version": "0.4.0" + "version": "0.4.0", + "from": "tunnel-agent@~0.4.0", + "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz" }, "http-signature": { "version": "0.10.0", + "from": "http-signature@~0.10.0", + "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.0.tgz", "dependencies": { "assert-plus": { - "version": "0.1.2" + "version": "0.1.2", + "from": "assert-plus@0.1.2", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.2.tgz" }, "asn1": { - "version": "0.1.11" + "version": "0.1.11", + "from": "asn1@0.1.11", + "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz" }, "ctype": { - "version": "0.5.2" + "version": "0.5.2", + "from": "ctype@0.5.2", + "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.2.tgz" } } }, "oauth-sign": { - "version": "0.3.0" + "version": "0.3.0", + "from": "oauth-sign@~0.3.0", + "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz" }, "hawk": { "version": "1.0.0", + "from": "hawk@~1.0.0", + "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz", "dependencies": { "hoek": { - "version": "0.9.1" + "version": "0.9.1", + "from": "hoek@0.9.x", + "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz" }, "boom": { - "version": "0.4.2" + "version": "0.4.2", + "from": "boom@0.4.x", + "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz" }, "cryptiles": { - "version": "0.2.2" + "version": "0.2.2", + "from": "cryptiles@0.2.x", + "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz" }, "sntp": { - "version": "0.2.4" + "version": "0.2.4", + "from": "sntp@0.2.x", + "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz" } } }, "aws-sign2": { - "version": "0.5.0" + "version": "0.5.0", + "from": "aws-sign2@~0.5.0", + "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz" } } }, "semver": { - "version": "2.3.0" + "version": "2.3.0", + "from": "semver@~2.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-2.3.0.tgz" }, "tar": { "version": "0.1.19", + "from": "tar@~0.1.19", + "resolved": "https://registry.npmjs.org/tar/-/tar-0.1.19.tgz", "dependencies": { "inherits": { - "version": "2.0.1" + "version": "2.0.1", + "from": "inherits@2", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" }, "block-stream": { - "version": "0.0.7" + "version": "0.0.7", + "from": "block-stream@*", + "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.7.tgz" }, "fstream": { "version": "0.1.25", + "from": "fstream@~0.1.8", + "resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.25.tgz", "dependencies": { "mkdirp": { - "version": "0.3.5" + "version": "0.3.5", + "from": "mkdirp@0.3", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz" }, "graceful-fs": { - "version": "2.0.3" + "version": "2.0.3", + "from": "graceful-fs@~2.0.0", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz" } } } @@ -511,98 +900,152 @@ }, "tar-pack": { "version": "2.0.0", + "from": "tar-pack@~2.0.0", + "resolved": "https://registry.npmjs.org/tar-pack/-/tar-pack-2.0.0.tgz", "dependencies": { "uid-number": { - "version": "0.0.3" + "version": "0.0.3", + "from": "uid-number@0.0.3", + "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.3.tgz" }, "once": { - "version": "1.1.1" + "version": "1.1.1", + "from": "once@~1.1.1", + "resolved": "https://registry.npmjs.org/once/-/once-1.1.1.tgz" }, "debug": { - "version": "0.7.4" + "version": "0.7.4", + "from": "debug@~0.7.2", + "resolved": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz" }, "fstream": { "version": "0.1.25", + "from": "fstream@~0.1.22", + "resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.25.tgz", "dependencies": { "mkdirp": { - "version": "0.3.5" + "version": "0.3.5", + "from": "mkdirp@0.3", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz" }, "graceful-fs": { - "version": "2.0.3" + "version": "2.0.3", + "from": "graceful-fs@~2.0.0", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz" }, "inherits": { - "version": "2.0.1" + "version": "2.0.1", + "from": "inherits@~2.0.0", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" } } }, "fstream-ignore": { "version": "0.0.7", + "from": "fstream-ignore@0.0.7", + "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-0.0.7.tgz", "dependencies": { "minimatch": { "version": "0.2.14", + "from": "minimatch@~0.2.0", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz", "dependencies": { "lru-cache": { - "version": "2.5.0" + "version": "2.5.0", + "from": "lru-cache@2", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz" }, "sigmund": { - "version": "1.0.0" + "version": "1.0.0", + "from": "sigmund@~1.0.0", + "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz" } } }, "inherits": { - "version": "2.0.1" + "version": "2.0.1", + "from": "inherits@~2.0.0", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" } } }, "readable-stream": { "version": "1.0.27-1", + "from": "readable-stream@~1.0.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.27-1.tgz", "dependencies": { "core-util-is": { - "version": "1.0.1" + "version": "1.0.1", + "from": "core-util-is@~1.0.0", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz" }, "isarray": { - "version": "0.0.1" + "version": "0.0.1", + "from": "isarray@0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz" }, "string_decoder": { - "version": "0.10.25-1" + "version": "0.10.25-1", + "from": "string_decoder@~0.10.x", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.25-1.tgz" }, "inherits": { - "version": "2.0.1" + "version": "2.0.1", + "from": "inherits@~2.0.0", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" } } }, "graceful-fs": { - "version": "1.2.3" + "version": "1.2.3", + "from": "graceful-fs@1.2", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz" } } }, "mkdirp": { "version": "0.5.0", + "from": "mkdirp@~0.5.0", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz", "dependencies": { "minimist": { - "version": "0.0.8" + "version": "0.0.8", + "from": "minimist@0.0.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz" } } }, "rc": { "version": "0.4.0", + "from": "rc@~0.4.0", + "resolved": "https://registry.npmjs.org/rc/-/rc-0.4.0.tgz", "dependencies": { "minimist": { - "version": "0.0.10" + "version": "0.0.10", + "from": "minimist@~0.0.7", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz" }, "deep-extend": { - "version": "0.2.10" + "version": "0.2.10", + "from": "deep-extend@~0.2.5", + "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.2.10.tgz" }, "strip-json-comments": { - "version": "0.1.3" + "version": "0.1.3", + "from": "strip-json-comments@0.1.x", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-0.1.3.tgz" }, "ini": { - "version": "1.1.0" + "version": "1.1.0", + "from": "ini@~1.1.0", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.1.0.tgz" } } }, "rimraf": { - "version": "2.2.8" + "version": "2.2.8", + "from": "rimraf@~2.2.5", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz" } } } @@ -610,265 +1053,405 @@ }, "sqlite3": { "version": "2.2.7", + "from": "sqlite3@2.x", "dependencies": { "nan": { - "version": "1.1.2" + "version": "1.1.2", + "from": "nan@1.1.2" }, "node-pre-gyp": { "version": "0.5.22", + "from": "node-pre-gyp@0.5.22", + "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.5.22.tgz", "dependencies": { "nopt": { "version": "3.0.1", + "from": "nopt@~3.0.1", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.1.tgz", "dependencies": { "abbrev": { - "version": "1.0.5" + "version": "1.0.5", + "from": "abbrev@1", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.5.tgz" } } }, "npmlog": { "version": "0.1.1", + "from": "npmlog@~0.1.1", + "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-0.1.1.tgz", "dependencies": { "ansi": { - "version": "0.3.0" + "version": "0.3.0", + "from": "ansi@~0.3.0", + "resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.0.tgz" } } }, "request": { "version": "2.39.0", + "from": "request@2.x", + "resolved": "https://registry.npmjs.org/request/-/request-2.39.0.tgz", "dependencies": { "qs": { - "version": "0.6.6" + "version": "0.6.6", + "from": "qs@~0.6.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-0.6.6.tgz" }, "json-stringify-safe": { - "version": "5.0.0" + "version": "5.0.0", + "from": "json-stringify-safe@~5.0.0", + "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz" }, "mime-types": { - "version": "1.0.2" + "version": "1.0.2", + "from": "mime-types@~1.0.1", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz" }, "forever-agent": { - "version": "0.5.2" + "version": "0.5.2", + "from": "forever-agent@~0.5.0", + "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz" }, "node-uuid": { - "version": "1.4.1" + "version": "1.4.1", + "from": "node-uuid@~1.4.0", + "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz" }, "tough-cookie": { "version": "0.12.1", + "from": "tough-cookie@>=0.12.0", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz", "dependencies": { "punycode": { - "version": "1.3.0" + "version": "1.3.0", + "from": "punycode@>=0.2.0", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.0.tgz" } } }, "form-data": { "version": "0.1.4", + "from": "form-data@~0.1.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz", "dependencies": { "combined-stream": { "version": "0.0.5", + "from": "combined-stream@~0.0.4", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.5.tgz", "dependencies": { "delayed-stream": { - "version": "0.0.5" + "version": "0.0.5", + "from": "delayed-stream@0.0.5", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz" } } }, "mime": { - "version": "1.2.11" + "version": "1.2.11", + "from": "mime@~1.2.11", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz" }, "async": { - "version": "0.9.0" + "version": "0.9.0", + "from": "async@~0.9.0", + "resolved": "https://registry.npmjs.org/async/-/async-0.9.0.tgz" } } }, "tunnel-agent": { - "version": "0.4.0" + "version": "0.4.0", + "from": "tunnel-agent@~0.4.0", + "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz" }, "http-signature": { "version": "0.10.0", + "from": "http-signature@~0.10.0", + "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.0.tgz", "dependencies": { "assert-plus": { - "version": "0.1.2" + "version": "0.1.2", + "from": "assert-plus@0.1.2", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.2.tgz" }, "asn1": { - "version": "0.1.11" + "version": "0.1.11", + "from": "asn1@0.1.11", + "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz" }, "ctype": { - "version": "0.5.2" + "version": "0.5.2", + "from": "ctype@0.5.2", + "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.2.tgz" } } }, "oauth-sign": { - "version": "0.3.0" + "version": "0.3.0", + "from": "oauth-sign@~0.3.0", + "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz" }, "hawk": { "version": "1.1.1", + "from": "hawk@1.1.1", + "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz", "dependencies": { "hoek": { - "version": "0.9.1" + "version": "0.9.1", + "from": "hoek@0.9.x", + "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz" }, "boom": { - "version": "0.4.2" + "version": "0.4.2", + "from": "boom@0.4.x", + "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz" }, "cryptiles": { - "version": "0.2.2" + "version": "0.2.2", + "from": "cryptiles@0.2.x", + "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz" }, "sntp": { - "version": "0.2.4" + "version": "0.2.4", + "from": "sntp@0.2.x", + "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz" } } }, "aws-sign2": { - "version": "0.5.0" + "version": "0.5.0", + "from": "aws-sign2@~0.5.0", + "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz" }, "stringstream": { - "version": "0.0.4" + "version": "0.0.4", + "from": "stringstream@~0.0.4", + "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz" } } }, "semver": { - "version": "3.0.1" + "version": "3.0.1", + "from": "semver@~3.0.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-3.0.1.tgz" }, "tar": { "version": "1.0.0", + "from": "tar@~1.0.0", + "resolved": "https://registry.npmjs.org/tar/-/tar-1.0.0.tgz", "dependencies": { "block-stream": { - "version": "0.0.7" + "version": "0.0.7", + "from": "block-stream@*", + "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.7.tgz" }, "fstream": { "version": "1.0.1", + "from": "fstream@^1.0.0", + "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.1.tgz", "dependencies": { "graceful-fs": { - "version": "3.0.2" + "version": "3.0.2", + "from": "graceful-fs@3", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.2.tgz" } } }, "inherits": { - "version": "2.0.1" + "version": "2.0.1", + "from": "inherits@~2.0.1", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" } } }, "tar-pack": { "version": "2.0.0", + "from": "tar-pack@~2.0.0", + "resolved": "https://registry.npmjs.org/tar-pack/-/tar-pack-2.0.0.tgz", "dependencies": { "uid-number": { - "version": "0.0.3" + "version": "0.0.3", + "from": "uid-number@0.0.3", + "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.3.tgz" }, "once": { - "version": "1.1.1" + "version": "1.1.1", + "from": "once@~1.1.1", + "resolved": "https://registry.npmjs.org/once/-/once-1.1.1.tgz" }, "debug": { - "version": "0.7.4" + "version": "0.7.4", + "from": "debug@~0.7.2", + "resolved": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz" }, "fstream": { "version": "0.1.31", + "from": "fstream@~0.1.22", + "resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz", "dependencies": { "graceful-fs": { - "version": "3.0.2" + "version": "3.0.2", + "from": "graceful-fs@3", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.2.tgz" }, "inherits": { - "version": "2.0.1" + "version": "2.0.1", + "from": "inherits@2", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" } } }, "tar": { "version": "0.1.20", + "from": "tar@~0.1.17", + "resolved": "https://registry.npmjs.org/tar/-/tar-0.1.20.tgz", "dependencies": { "block-stream": { - "version": "0.0.7" + "version": "0.0.7", + "from": "block-stream@*", + "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.7.tgz" }, "inherits": { - "version": "2.0.1" + "version": "2.0.1", + "from": "inherits@2", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" } } }, "fstream-ignore": { "version": "0.0.7", + "from": "fstream-ignore@0.0.7", + "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-0.0.7.tgz", "dependencies": { "minimatch": { "version": "0.2.14", + "from": "minimatch@~0.2.0", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz", "dependencies": { "lru-cache": { - "version": "2.5.0" + "version": "2.5.0", + "from": "lru-cache@2", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz" }, "sigmund": { - "version": "1.0.0" + "version": "1.0.0", + "from": "sigmund@~1.0.0", + "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz" } } }, "inherits": { - "version": "2.0.1" + "version": "2.0.1", + "from": "inherits@2", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" } } }, "readable-stream": { "version": "1.0.27-1", + "from": "readable-stream@~1.0.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.27-1.tgz", "dependencies": { "core-util-is": { - "version": "1.0.1" + "version": "1.0.1", + "from": "core-util-is@~1.0.0", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz" }, "isarray": { - "version": "0.0.1" + "version": "0.0.1", + "from": "isarray@0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz" }, "string_decoder": { - "version": "0.10.25-1" + "version": "0.10.25-1", + "from": "string_decoder@~0.10.x", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.25-1.tgz" }, "inherits": { - "version": "2.0.1" + "version": "2.0.1", + "from": "inherits@2", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" } } }, "graceful-fs": { - "version": "1.2.3" + "version": "1.2.3", + "from": "graceful-fs@1.2", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz" } } }, "mkdirp": { "version": "0.5.0", + "from": "mkdirp@~0.5.0", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz", "dependencies": { "minimist": { - "version": "0.0.8" + "version": "0.0.8", + "from": "minimist@0.0.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz" } } }, "rc": { "version": "0.5.0", + "from": "rc@~0.5.0", + "resolved": "https://registry.npmjs.org/rc/-/rc-0.5.0.tgz", "dependencies": { "minimist": { - "version": "0.0.10" + "version": "0.0.10", + "from": "minimist@~0.0.7", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz" }, "deep-extend": { - "version": "0.2.11" + "version": "0.2.11", + "from": "deep-extend@~0.2.5", + "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.2.11.tgz" }, "strip-json-comments": { - "version": "0.1.3" + "version": "0.1.3", + "from": "strip-json-comments@0.1.x", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-0.1.3.tgz" }, "ini": { - "version": "1.1.0" + "version": "1.1.0", + "from": "ini@~1.1.0", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.1.0.tgz" } } }, "rimraf": { - "version": "2.2.8" + "version": "2.2.8", + "from": "rimraf@~2.2.8", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz" } } }, "set-immediate": { - "version": "0.1.1" + "version": "0.1.1", + "from": "set-immediate@0.1.1" } } }, "mime": { - "version": "1.2.11" + "version": "1.2.11", + "from": "mime@~1.2.9" }, "mkdirp": { - "version": "0.3.5" + "version": "0.3.5", + "from": "mkdirp@~0.3.3" }, "optimist": { "version": "0.6.1", + "from": "optimist@~0.6.0", "dependencies": { "wordwrap": { - "version": "0.0.2" + "version": "0.0.2", + "from": "wordwrap@~0.0.2" }, "minimist": { - "version": "0.0.10" + "version": "0.0.10", + "from": "minimist@~0.0.1" } } } @@ -878,269 +1461,409 @@ }, "express": { "version": "2.5.11", + "from": "express@~2.5.11", "dependencies": { "connect": { "version": "1.9.2", + "from": "connect@1.x", "dependencies": { "formidable": { - "version": "1.0.15" + "version": "1.0.15", + "from": "formidable@1.0.x" } } }, "mime": { - "version": "1.2.4" + "version": "1.2.4", + "from": "mime@1.2.4" }, "qs": { - "version": "0.4.2" + "version": "0.4.2", + "from": "qs@0.4.x" }, "mkdirp": { - "version": "0.3.0" + "version": "0.3.0", + "from": "mkdirp@0.3.0" } } }, "mapnik": { "version": "1.4.15", "from": "https://github.com/CartoDB/node-mapnik/tarball/1.4.15-cdb", + "resolved": "https://github.com/CartoDB/node-mapnik/tarball/1.4.15-cdb", "dependencies": { "nan": { - "version": "1.2.0" + "version": "1.2.0", + "from": "nan@~1.2.0" }, "mapnik-vector-tile": { - "version": "0.5.5" + "version": "0.5.5", + "from": "mapnik-vector-tile@0.5.5" }, "node-pre-gyp": { "version": "0.5.25", + "from": "node-pre-gyp@0.5.25", "dependencies": { "nopt": { "version": "3.0.1", + "from": "nopt@~3.0.1", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.1.tgz", "dependencies": { "abbrev": { - "version": "1.0.5" + "version": "1.0.5", + "from": "abbrev@1", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.5.tgz" } } }, "npmlog": { "version": "0.1.1", + "from": "npmlog@~0.1.1", + "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-0.1.1.tgz", "dependencies": { "ansi": { - "version": "0.3.0" + "version": "0.3.0", + "from": "ansi@~0.3.0", + "resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.0.tgz" } } }, "request": { "version": "2.40.0", + "from": "request@2.x", + "resolved": "https://registry.npmjs.org/request/-/request-2.40.0.tgz", "dependencies": { "qs": { - "version": "1.0.2" + "version": "1.0.2", + "from": "qs@~1.0.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-1.0.2.tgz" }, "json-stringify-safe": { - "version": "5.0.0" + "version": "5.0.0", + "from": "json-stringify-safe@~5.0.0", + "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz" }, "mime-types": { - "version": "1.0.2" + "version": "1.0.2", + "from": "mime-types@~1.0.1", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz" }, "forever-agent": { - "version": "0.5.2" + "version": "0.5.2", + "from": "forever-agent@~0.5.0", + "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz" }, "node-uuid": { - "version": "1.4.1" + "version": "1.4.1", + "from": "node-uuid@~1.4.0", + "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz" }, "tough-cookie": { "version": "0.12.1", + "from": "tough-cookie@>=0.12.0", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz", "dependencies": { "punycode": { - "version": "1.3.1" + "version": "1.3.1", + "from": "punycode@>=0.2.0", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.1.tgz" } } }, "form-data": { "version": "0.1.4", + "from": "form-data@~0.1.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz", "dependencies": { "combined-stream": { "version": "0.0.5", + "from": "combined-stream@~0.0.4", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.5.tgz", "dependencies": { "delayed-stream": { - "version": "0.0.5" + "version": "0.0.5", + "from": "delayed-stream@0.0.5", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz" } } }, "mime": { - "version": "1.2.11" + "version": "1.2.11", + "from": "mime@~1.2.11", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz" }, "async": { - "version": "0.9.0" + "version": "0.9.0", + "from": "async@~0.9.0", + "resolved": "https://registry.npmjs.org/async/-/async-0.9.0.tgz" } } }, "tunnel-agent": { - "version": "0.4.0" + "version": "0.4.0", + "from": "tunnel-agent@~0.4.0", + "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz" }, "http-signature": { "version": "0.10.0", + "from": "http-signature@~0.10.0", + "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.0.tgz", "dependencies": { "assert-plus": { - "version": "0.1.2" + "version": "0.1.2", + "from": "assert-plus@0.1.2", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.2.tgz" }, "asn1": { - "version": "0.1.11" + "version": "0.1.11", + "from": "asn1@0.1.11", + "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz" }, "ctype": { - "version": "0.5.2" + "version": "0.5.2", + "from": "ctype@0.5.2", + "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.2.tgz" } } }, "oauth-sign": { - "version": "0.3.0" + "version": "0.3.0", + "from": "oauth-sign@~0.3.0", + "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz" }, "hawk": { "version": "1.1.1", + "from": "hawk@1.1.1", + "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz", "dependencies": { "hoek": { - "version": "0.9.1" + "version": "0.9.1", + "from": "hoek@0.9.x", + "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz" }, "boom": { - "version": "0.4.2" + "version": "0.4.2", + "from": "boom@0.4.x", + "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz" }, "cryptiles": { - "version": "0.2.2" + "version": "0.2.2", + "from": "cryptiles@0.2.x", + "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz" }, "sntp": { - "version": "0.2.4" + "version": "0.2.4", + "from": "sntp@0.2.x", + "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz" } } }, "aws-sign2": { - "version": "0.5.0" + "version": "0.5.0", + "from": "aws-sign2@~0.5.0", + "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz" }, "stringstream": { - "version": "0.0.4" + "version": "0.0.4", + "from": "stringstream@~0.0.4", + "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz" } } }, "semver": { - "version": "3.0.1" + "version": "3.0.1", + "from": "semver@~3.0.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-3.0.1.tgz" }, "tar": { "version": "1.0.1", + "from": "tar@~1.0.0", + "resolved": "https://registry.npmjs.org/tar/-/tar-1.0.1.tgz", "dependencies": { "block-stream": { - "version": "0.0.7" + "version": "0.0.7", + "from": "block-stream@*", + "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.7.tgz" }, "fstream": { "version": "1.0.2", + "from": "fstream@^1.0.2", + "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.2.tgz", "dependencies": { "graceful-fs": { - "version": "3.0.2" + "version": "3.0.2", + "from": "graceful-fs@3", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.2.tgz" } } }, "inherits": { - "version": "2.0.1" + "version": "2.0.1", + "from": "inherits@2", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" } } }, "tar-pack": { "version": "2.0.0", + "from": "tar-pack@~2.0.0", + "resolved": "https://registry.npmjs.org/tar-pack/-/tar-pack-2.0.0.tgz", "dependencies": { "uid-number": { - "version": "0.0.3" + "version": "0.0.3", + "from": "uid-number@0.0.3", + "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.3.tgz" }, "once": { - "version": "1.1.1" + "version": "1.1.1", + "from": "once@~1.1.1", + "resolved": "https://registry.npmjs.org/once/-/once-1.1.1.tgz" }, "debug": { - "version": "0.7.4" + "version": "0.7.4", + "from": "debug@~0.7.2", + "resolved": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz" }, "fstream": { "version": "0.1.31", + "from": "fstream@~0.1.22", + "resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz", "dependencies": { "graceful-fs": { - "version": "3.0.2" + "version": "3.0.2", + "from": "graceful-fs@~3.0.2", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.2.tgz" }, "inherits": { - "version": "2.0.1" + "version": "2.0.1", + "from": "inherits@2", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" } } }, "tar": { "version": "0.1.20", + "from": "tar@~0.1.17", + "resolved": "https://registry.npmjs.org/tar/-/tar-0.1.20.tgz", "dependencies": { "block-stream": { - "version": "0.0.7" + "version": "0.0.7", + "from": "block-stream@*", + "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.7.tgz" }, "inherits": { - "version": "2.0.1" + "version": "2.0.1", + "from": "inherits@2", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" } } }, "fstream-ignore": { "version": "0.0.7", + "from": "fstream-ignore@0.0.7", + "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-0.0.7.tgz", "dependencies": { "minimatch": { "version": "0.2.14", + "from": "minimatch@~0.2.0", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz", "dependencies": { "lru-cache": { - "version": "2.5.0" + "version": "2.5.0", + "from": "lru-cache@2", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz" }, "sigmund": { - "version": "1.0.0" + "version": "1.0.0", + "from": "sigmund@~1.0.0", + "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz" } } }, "inherits": { - "version": "2.0.1" + "version": "2.0.1", + "from": "inherits@2", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" } } }, "readable-stream": { "version": "1.0.31", + "from": "readable-stream@~1.0.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.31.tgz", "dependencies": { "core-util-is": { - "version": "1.0.1" + "version": "1.0.1", + "from": "core-util-is@~1.0.0", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz" }, "isarray": { - "version": "0.0.1" + "version": "0.0.1", + "from": "isarray@0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz" }, "string_decoder": { - "version": "0.10.31" + "version": "0.10.31", + "from": "string_decoder@~0.10.x", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" }, "inherits": { - "version": "2.0.1" + "version": "2.0.1", + "from": "inherits@~2.0.1", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" } } }, "graceful-fs": { - "version": "1.2.3" + "version": "1.2.3", + "from": "graceful-fs@1.2", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz" } } }, "mkdirp": { "version": "0.5.0", + "from": "mkdirp@~0.5.0", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz", "dependencies": { "minimist": { - "version": "0.0.8" + "version": "0.0.8", + "from": "minimist@0.0.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz" } } }, "rc": { "version": "0.5.1", + "from": "rc@~0.5.0", + "resolved": "https://registry.npmjs.org/rc/-/rc-0.5.1.tgz", "dependencies": { "minimist": { - "version": "0.0.10" + "version": "0.0.10", + "from": "minimist@~0.0.7", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz" }, "deep-extend": { - "version": "0.2.11" + "version": "0.2.11", + "from": "deep-extend@~0.2.5", + "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.2.11.tgz" }, "strip-json-comments": { - "version": "0.1.3" + "version": "0.1.3", + "from": "strip-json-comments@0.1.x", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-0.1.3.tgz" }, "ini": { - "version": "1.1.0" + "version": "1.1.0", + "from": "ini@~1.1.0", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.1.0.tgz" } } }, "rimraf": { - "version": "2.2.8" + "version": "2.2.8", + "from": "rimraf@~2.2.8", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz" } } } @@ -1148,66 +1871,113 @@ }, "tilelive": { "version": "4.5.3", + "from": "tilelive@~4.5.3", "dependencies": { "optimist": { "version": "0.6.1", + "from": "optimist@~0.6.0", "dependencies": { "wordwrap": { - "version": "0.0.2" + "version": "0.0.2", + "from": "wordwrap@~0.0.2" }, "minimist": { - "version": "0.0.10" + "version": "0.0.10", + "from": "minimist@~0.0.1" } } }, "sphericalmercator": { - "version": "1.0.2" + "version": "1.0.2", + "from": "sphericalmercator@~1.0.1" } } }, "tilelive-mapnik": { "version": "0.6.11", + "from": "tilelive-mapnik@0.6.11", "dependencies": { "underscore": { - "version": "1.3.3" + "version": "1.3.3", + "from": "underscore@~1.3.3" }, "generic-pool": { - "version": "2.0.4" + "version": "2.0.4", + "from": "generic-pool@~2.0.0" }, "mime": { - "version": "1.2.11" + "version": "1.2.11", + "from": "mime@~1.2.9" }, "sphericalmercator": { - "version": "1.0.2" + "version": "1.0.2", + "from": "sphericalmercator@~1.0.1" + } + } + }, + "redis-mpool": { + "version": "0.1.0", + "from": "redis-mpool@git://github.com/CartoDB/node-redis-mpool.git#0.1.0", + "resolved": "git://github.com/CartoDB/node-redis-mpool.git#47510b8d4525ee24aa2e5328976372274a1d144e", + "dependencies": { + "generic-pool": { + "version": "2.1.1", + "from": "generic-pool@~2.1.1" + }, + "redis": { + "version": "0.12.1", + "from": "redis@~0.12.1" + }, + "hiredis": { + "version": "0.1.17", + "from": "hiredis@~0.1.17", + "dependencies": { + "bindings": { + "version": "1.2.1", + "from": "bindings@*" + }, + "nan": { + "version": "1.1.2", + "from": "nan@~1.1.0" + } + } } } }, "carto": { "version": "0.9.5-cdb3", "from": "http://github.com/CartoDB/carto/tarball/0.9.5-cdb3", + "resolved": "http://github.com/CartoDB/carto/tarball/0.9.5-cdb3", "dependencies": { "underscore": { - "version": "1.4.4" + "version": "1.4.4", + "from": "underscore@~1.4.3" }, "mapnik-reference": { - "version": "5.0.9" + "version": "5.0.9", + "from": "mapnik-reference@~5.0.7" }, "xml2js": { "version": "0.2.8", + "from": "xml2js@~0.2.4", "dependencies": { "sax": { - "version": "0.5.8" + "version": "0.5.8", + "from": "sax@0.5.x" } } }, "optimist": { "version": "0.6.1", + "from": "optimist@~0.6.0", "dependencies": { "wordwrap": { - "version": "0.0.2" + "version": "0.0.2", + "from": "wordwrap@~0.0.2" }, "minimist": { - "version": "0.0.10" + "version": "0.0.10", + "from": "minimist@~0.0.1" } } } @@ -1215,173 +1985,17 @@ }, "step-profiler": { "version": "0.1.0", - "from": "git://github.com/CartoDB/node-step-profiler.git#0.1.0" + "from": "step-profiler@git://github.com/CartoDB/node-step-profiler.git#0.1.0", + "resolved": "git://github.com/CartoDB/node-step-profiler.git#9b97881e450445bd8a307a9cc372b5129cb4529a" }, "torque.js": { - "version": "2.2.0" + "version": "2.2.0", + "from": "torque.js@~2.2.0", + "resolved": "https://registry.npmjs.org/torque.js/-/torque.js-2.2.00.tgz" }, "node-statsd": { - "version": "0.0.7" - } - } - }, - "step": { - "version": "0.0.5" - }, - "request": { - "version": "2.9.203" - }, - "cartodb-redis": { - "version": "0.11.0", - "from": "https://github.com/CartoDB/node-cartodb-redis/tarball/0.11.0" - }, - "cartodb-psql": { - "version": "0.4.0", - "from": "https://github.com/CartoDB/node-cartodb-psql/tarball/0.4.0", - "dependencies": { - "pg": { - "version": "2.6.2-cdb1", - "from": "git://github.com/CartoDB/node-postgres.git#2.6.2-cdb1", - "dependencies": { - "generic-pool": { - "version": "2.0.3" - }, - "buffer-writer": { - "version": "1.0.0" - } - } - } - } - }, - "redis-mpool": { - "version": "0.1.0", - "from": "https://github.com/CartoDB/node-redis-mpool/tarball/0.1.0", - "dependencies": { - "generic-pool": { - "version": "2.1.1" - }, - "redis": { - "version": "0.12.1" - }, - "hiredis": { - "version": "0.1.17", - "dependencies": { - "bindings": { - "version": "1.2.1" - }, - "nan": { - "version": "1.1.2" - } - } - } - } - }, - "lzma": { - "version": "1.3.7" - }, - "log4js": { - "version": "0.6.21", - "dependencies": { - "async": { - "version": "0.2.10" - }, - "readable-stream": { - "version": "1.0.32", - "dependencies": { - "core-util-is": { - "version": "1.0.1" - }, - "isarray": { - "version": "0.0.1" - }, - "string_decoder": { - "version": "0.10.31" - }, - "inherits": { - "version": "2.0.1" - } - } - } - } - }, - "rollbar": { - "version": "0.3.13", - "dependencies": { - "node-uuid": { - "version": "1.4.1" - }, - "lru-cache": { - "version": "2.2.4" - }, - "json-stringify-safe": { - "version": "5.0.0" - } - } - }, - "redis": { - "version": "0.8.6" - }, - "semver": { - "version": "1.1.4" - }, - "strftime": { - "version": "0.8.2" - }, - "mocha": { - "version": "1.21.4", - "dependencies": { - "commander": { - "version": "2.0.0" - }, - "growl": { - "version": "1.8.1" - }, - "jade": { - "version": "0.26.3", - "dependencies": { - "commander": { - "version": "0.6.1" - }, - "mkdirp": { - "version": "0.3.0" - } - } - }, - "diff": { - "version": "1.0.7" - }, - "debug": { - "version": "2.0.0", - "dependencies": { - "ms": { - "version": "0.6.2" - } - } - }, - "mkdirp": { - "version": "0.3.5" - }, - "glob": { - "version": "3.2.3", - "dependencies": { - "minimatch": { - "version": "0.2.14", - "dependencies": { - "lru-cache": { - "version": "2.5.0" - }, - "sigmund": { - "version": "1.0.0" - } - } - }, - "graceful-fs": { - "version": "2.0.3" - }, - "inherits": { - "version": "2.0.1" - } - } + "version": "0.0.7", + "from": "node-statsd@~0.0.7" } } } diff --git a/package.json b/package.json index e6050297..215d68de 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "windshaft-cartodb", - "version": "1.18.1", + "version": "1.19.1", "description": "A map tile server for CartoDB", "keywords": [ "cartodb" @@ -25,7 +25,7 @@ "node-varnish": "https://github.com/Vizzuality/node-varnish/tarball/0.3.0", "underscore" : "~1.6.0", "dot": "~1.0.2", - "windshaft": "https://github.com/CartoDB/Windshaft/tarball/0.28.0", + "windshaft": "https://github.com/CartoDB/Windshaft/tarball/0.28.2", "step": "~0.0.5", "request": "~2.9.203", "cartodb-redis": "https://github.com/CartoDB/node-cartodb-redis/tarball/0.11.0", @@ -43,5 +43,9 @@ }, "scripts": { "test": "make check" + }, + "engines": { + "node": ">=0.8 <0.11", + "npm": ">=1.2.1" } }