GWicke has submitted this change and it was merged. Change subject: Update restbase to b3d73a6 ......................................................................
Update restbase to b3d73a6 List of changes: d7a34b0 WIP: Spec format & router cleanup d2a3435 Cleaner x-modules & config updates c34fb6c Move project definitions into sub-specs c6117d0 More clean-up ccac420 Update configs to reflect mathoid changes 95020af Fix ETag header in storage miss response 52f3e58 Drop unused sys/mathoid module & small fixes 5ac57cd Protect options.templates from expansion 797c1e5 Bump version to 0.9.0 b922fc2 Remove module caching & cleanup 6049009 Remove stray /page prefix xxxxxxx Update node module dependencies Change-Id: I056a1ef7d6f1e7ba4fbed146bc65fef13a0bad04 --- R node_modules/jsonwebtoken/node_modules/jws/node_modules/base64url/node_modules/meow/node_modules/camelcase-keys/node_modules/camelcase/index.js R node_modules/jsonwebtoken/node_modules/jws/node_modules/base64url/node_modules/meow/node_modules/camelcase-keys/node_modules/camelcase/license R node_modules/jsonwebtoken/node_modules/jws/node_modules/base64url/node_modules/meow/node_modules/camelcase-keys/node_modules/camelcase/package.json M node_modules/restbase-mod-table-cassandra/node_modules/cassandra-driver/node_modules/async/package.json M node_modules/restbase-mod-table-cassandra/node_modules/restbase-mod-table-spec/node_modules/routeswitch/node_modules/async/package.json M node_modules/service-runner/node_modules/yargs/index.js M node_modules/service-runner/node_modules/yargs/lib/parser.js M node_modules/service-runner/node_modules/yargs/lib/usage.js A node_modules/service-runner/node_modules/yargs/locales/id.json A node_modules/service-runner/node_modules/yargs/locales/ko.json A node_modules/service-runner/node_modules/yargs/locales/nb.json A node_modules/service-runner/node_modules/yargs/locales/tr.json A node_modules/service-runner/node_modules/yargs/node_modules/camelcase/index.js C node_modules/service-runner/node_modules/yargs/node_modules/camelcase/license C node_modules/service-runner/node_modules/yargs/node_modules/camelcase/package.json R node_modules/service-runner/node_modules/yargs/node_modules/string-width/index.js R node_modules/service-runner/node_modules/yargs/node_modules/string-width/license R node_modules/service-runner/node_modules/yargs/node_modules/string-width/node_modules/code-point-at/index.js R node_modules/service-runner/node_modules/yargs/node_modules/string-width/node_modules/code-point-at/license R node_modules/service-runner/node_modules/yargs/node_modules/string-width/node_modules/code-point-at/package.json R node_modules/service-runner/node_modules/yargs/node_modules/string-width/node_modules/is-fullwidth-code-point/index.js R node_modules/service-runner/node_modules/yargs/node_modules/string-width/node_modules/is-fullwidth-code-point/license R node_modules/service-runner/node_modules/yargs/node_modules/string-width/node_modules/is-fullwidth-code-point/package.json R node_modules/service-runner/node_modules/yargs/node_modules/string-width/package.json M node_modules/service-runner/node_modules/yargs/node_modules/window-size/package.json M node_modules/service-runner/node_modules/yargs/package.json M restbase 27 files changed, 253 insertions(+), 36 deletions(-) Approvals: GWicke: Verified; Looks good to me, approved diff --git a/node_modules/camelcase/index.js b/node_modules/jsonwebtoken/node_modules/jws/node_modules/base64url/node_modules/meow/node_modules/camelcase-keys/node_modules/camelcase/index.js similarity index 100% rename from node_modules/camelcase/index.js rename to node_modules/jsonwebtoken/node_modules/jws/node_modules/base64url/node_modules/meow/node_modules/camelcase-keys/node_modules/camelcase/index.js diff --git a/node_modules/camelcase/license b/node_modules/jsonwebtoken/node_modules/jws/node_modules/base64url/node_modules/meow/node_modules/camelcase-keys/node_modules/camelcase/license similarity index 100% rename from node_modules/camelcase/license rename to node_modules/jsonwebtoken/node_modules/jws/node_modules/base64url/node_modules/meow/node_modules/camelcase-keys/node_modules/camelcase/license diff --git a/node_modules/camelcase/package.json b/node_modules/jsonwebtoken/node_modules/jws/node_modules/base64url/node_modules/meow/node_modules/camelcase-keys/node_modules/camelcase/package.json similarity index 94% rename from node_modules/camelcase/package.json rename to node_modules/jsonwebtoken/node_modules/jws/node_modules/base64url/node_modules/meow/node_modules/camelcase-keys/node_modules/camelcase/package.json index 895db7c..afb1aec 100644 --- a/node_modules/camelcase/package.json +++ b/node_modules/jsonwebtoken/node_modules/jws/node_modules/base64url/node_modules/meow/node_modules/camelcase-keys/node_modules/camelcase/package.json @@ -45,7 +45,7 @@ "homepage": "https://github.com/sindresorhus/camelcase";, "_id": "camelcase@1.2.1", "_shasum": "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39", - "_from": "camelcase@1.2.1", + "_from": "camelcase@^1.0.1", "_npmVersion": "2.11.2", "_nodeVersion": "0.12.5", "_npmUser": { @@ -63,6 +63,5 @@ } ], "directories": {}, - "_resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz";, - "readme": "ERROR: No README data found!" + "_resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"; } diff --git a/node_modules/restbase-mod-table-cassandra/node_modules/cassandra-driver/node_modules/async/package.json b/node_modules/restbase-mod-table-cassandra/node_modules/cassandra-driver/node_modules/async/package.json index 76d5799..34c2887 100644 --- a/node_modules/restbase-mod-table-cassandra/node_modules/cassandra-driver/node_modules/async/package.json +++ b/node_modules/restbase-mod-table-cassandra/node_modules/cassandra-driver/node_modules/async/package.json @@ -57,7 +57,7 @@ "homepage": "https://github.com/caolan/async#readme";, "_id": "async@0.9.2", "_shasum": "aea74d5e61c1f899613bf64bda66d4c78f2fd17d", - "_from": "async@~0.9.0", + "_from": "async@^0.9.0", "_npmVersion": "2.9.0", "_nodeVersion": "2.0.1", "_npmUser": { diff --git a/node_modules/restbase-mod-table-cassandra/node_modules/restbase-mod-table-spec/node_modules/routeswitch/node_modules/async/package.json b/node_modules/restbase-mod-table-cassandra/node_modules/restbase-mod-table-spec/node_modules/routeswitch/node_modules/async/package.json index 76d5799..37f1cb0 100644 --- a/node_modules/restbase-mod-table-cassandra/node_modules/restbase-mod-table-spec/node_modules/routeswitch/node_modules/async/package.json +++ b/node_modules/restbase-mod-table-cassandra/node_modules/restbase-mod-table-spec/node_modules/routeswitch/node_modules/async/package.json @@ -79,5 +79,6 @@ "tarball": "http://registry.npmjs.org/async/-/async-0.9.2.tgz"; }, "directories": {}, - "_resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz"; + "_resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz";, + "readme": "ERROR: No README data found!" } diff --git a/node_modules/service-runner/node_modules/yargs/index.js b/node_modules/service-runner/node_modules/yargs/index.js index 96c2aa2..276de68 100644 --- a/node_modules/service-runner/node_modules/yargs/index.js +++ b/node_modules/service-runner/node_modules/yargs/index.js @@ -58,7 +58,8 @@ requiresArg: [], count: [], normalize: [], - config: [] + config: [], + envPrefix: undefined } usage = Usage(self, y18n) // handle usage output. @@ -342,6 +343,14 @@ return groups } + // as long as options.envPrefix is not undefined, + // parser will apply env vars matching prefix to argv + self.env = function (prefix) { + if (prefix === false) options.envPrefix = undefined + else options.envPrefix = prefix || '' + return self + } + self.wrap = function (cols) { usage.wrap(cols) return self @@ -510,7 +519,7 @@ var handlerKeys = Object.keys(self.getCommandHandlers()) for (var i = 0, command; (command = handlerKeys[i]) !== undefined; i++) { if (~argv._.indexOf(command)) { - self.getCommandHandlers()[command](self.reset()) + runCommand(command, self, argv) return self.argv } } @@ -592,6 +601,11 @@ } } + function runCommand (command, yargs, argv) { + setPlaceholderKeys(argv) + yargs.getCommandHandlers()[command](yargs.reset(), argv) + } + function setPlaceholderKeys (argv) { Object.keys(options.key).forEach(function (key) { // don't set placeholder keys for dot diff --git a/node_modules/service-runner/node_modules/yargs/lib/parser.js b/node_modules/service-runner/node_modules/yargs/lib/parser.js index e1a6006..235f7ed 100644 --- a/node_modules/service-runner/node_modules/yargs/lib/parser.js +++ b/node_modules/service-runner/node_modules/yargs/lib/parser.js @@ -220,7 +220,14 @@ } } + // order of precedence: + // 1. command line arg + // 2. value from config file + // 3. value from env var + // 4. configured default value + applyEnvVars(opts, argv, true) // special case: check env vars that point to config file setConfig(argv) + applyEnvVars(opts, argv, false) applyDefaultsAndAliases(argv, aliases, defaults) Object.keys(flags.counts).forEach(function (key) { @@ -351,6 +358,20 @@ }) } + function applyEnvVars (opts, argv, configOnly) { + if (typeof opts.envPrefix === 'undefined') return + + var prefix = typeof opts.envPrefix === 'string' ? opts.envPrefix : '' + Object.keys(process.env).forEach(function (envVar) { + if (prefix === '' || envVar.lastIndexOf(prefix, 0) === 0) { + var key = camelCase(envVar.substring(prefix.length)) + if (((configOnly && flags.configs[key]) || !configOnly) && (!(key in argv) || flags.defaulted[key])) { + setArg(key, process.env[envVar]) + } + } + }) + } + function applyDefaultsAndAliases (obj, aliases, defaults) { Object.keys(defaults).forEach(function (key) { if (!hasKey(obj, key.split('.'))) { diff --git a/node_modules/service-runner/node_modules/yargs/lib/usage.js b/node_modules/service-runner/node_modules/yargs/lib/usage.js index 8fd963c..b1b59bc 100644 --- a/node_modules/service-runner/node_modules/yargs/lib/usage.js +++ b/node_modules/service-runner/node_modules/yargs/lib/usage.js @@ -2,6 +2,7 @@ // failures, etc. keeps logging in one place. var cliui = require('cliui') var decamelize = require('decamelize') +var stringWidth = require('string-width') var wsize = require('window-size') module.exports = function (yargs, y18n) { @@ -260,7 +261,7 @@ } table.forEach(function (v) { - width = Math.max(v[0].length, width) + width = Math.max(stringWidth(v[0]), width) }) // if we've enabled 'wrap' we should limit diff --git a/node_modules/service-runner/node_modules/yargs/locales/id.json b/node_modules/service-runner/node_modules/yargs/locales/id.json new file mode 100644 index 0000000..7cb7e56 --- /dev/null +++ b/node_modules/service-runner/node_modules/yargs/locales/id.json @@ -0,0 +1,37 @@ + +{ + "Commands:": "Perintah:", + "Options:": "Pilihan:", + "Examples:": "Contoh:", + "boolean": "boolean", + "count": "jumlah", + "string": "string", + "array": "larik", + "required": "diperlukan", + "default:": "bawaan:", + "choices:": "pilihan:", + "generated-value": "nilai-yang-dihasilkan", + "Not enough non-option arguments: got %s, need at least %s": "Argumen wajib kurang: hanya %s, minimal %s", + "Too many non-option arguments: got %s, maximum of %s": "Terlalu banyak argumen wajib: ada %s, maksimal %s", + "Missing argument value: %s": { + "one": "Kurang argumen: %s", + "other": "Kurang argumen: %s" + }, + "Missing required argument: %s": { + "one": "Kurang argumen wajib: %s", + "other": "Kurang argumen wajib: %s" + }, + "Unknown argument: %s": { + "one": "Argumen tak diketahui: %s", + "other": "Argumen tak diketahui: %s" + }, + "Invalid values:": "Nilai-nilai tidak valid:", + "Argument: %s, Given: %s, Choices: %s": "Argumen: %s, Diberikan: %s, Pilihan: %s", + "Argument check failed: %s": "Pemeriksaan argument gagal: %s", + "Implications failed:": "Implikasi gagal:", + "Not enough arguments following: %s": "Kurang argumen untuk: %s", + "Invalid JSON config file: %s": "Berkas konfigurasi JSON tidak valid: %s", + "Path to JSON config file": "Alamat berkas konfigurasi JSON", + "Show help": "Lihat bantuan", + "Show version number": "Lihat nomor versi" +} diff --git a/node_modules/service-runner/node_modules/yargs/locales/ko.json b/node_modules/service-runner/node_modules/yargs/locales/ko.json new file mode 100644 index 0000000..a16971a --- /dev/null +++ b/node_modules/service-runner/node_modules/yargs/locales/ko.json @@ -0,0 +1,36 @@ +{ + "Commands:": "명령:", + "Options:": "옵션:", + "Examples:": "예시:", + "boolean": "여부", + "count": "개수", + "string": "문자열", + "array": "배열", + "required": "필수", + "default:": "기본:", + "choices:": "선택:", + "generated-value": "생성된 값", + "Not enough non-option arguments: got %s, need at least %s": "옵션이 아닌 인자가 충분치 않습니다: %s개를 받았지만, 적어도 %s개는 필요합니다", + "Too many non-option arguments: got %s, maximum of %s": "옵션이 아닌 인자가 너무 많습니다: %s개를 받았지만, %s개 이하여야 합니다", + "Missing argument value: %s": { + "one": "인자값을 받지 못했습니다: %s", + "other": "인자값들을 받지 못했습니다: %s" + }, + "Missing required argument: %s": { + "one": "필수 인자를 받지 못했습니다: %s", + "other": "필수 인자들을 받지 못했습니다: %s" + }, + "Unknown argument: %s": { + "one": "알 수 없는 인자입니다: %s", + "other": "알 수 없는 인자들입니다: %s" + }, + "Invalid values:": "잘못된 값입니다:", + "Argument: %s, Given: %s, Choices: %s": "인자: %s, 입력받은 값: %s, 선택지: %s", + "Argument check failed: %s": "유효하지 않은 인자입니다: %s", + "Implications failed:": "옵션의 조합이 잘못되었습니다:", + "Not enough arguments following: %s": "인자가 충분하게 주어지지 않았습니다: %s", + "Invalid JSON config file: %s": "유효하지 않은 JSON 설정파일입니다: %s", + "Path to JSON config file": "JSON 설정파일 경로", + "Show help": "도움말을 보여줍니다", + "Show version number": "버전 넘버를 보여줍니다" +} diff --git a/node_modules/service-runner/node_modules/yargs/locales/nb.json b/node_modules/service-runner/node_modules/yargs/locales/nb.json new file mode 100644 index 0000000..65fa6ae --- /dev/null +++ b/node_modules/service-runner/node_modules/yargs/locales/nb.json @@ -0,0 +1,36 @@ +{ + "Commands:": "Kommandoer:", + "Options:": "Alternativer:", + "Examples:": "Eksempler:", + "boolean": "boolsk", + "count": "antall", + "string": "streng", + "array": "matrise", + "required": "obligatorisk", + "default:": "standard:", + "choices:": "valg:", + "generated-value": "generert-verdi", + "Not enough non-option arguments: got %s, need at least %s": "Ikke nok ikke-alternativ argumenter: fikk %s, trenger minst %s", + "Too many non-option arguments: got %s, maximum of %s": "For mange ikke-alternativ argumenter: fikk %s, maksimum %s", + "Missing argument value: %s": { + "one": "Mangler argument verdi: %s", + "other": "Mangler argument verdier: %s" + }, + "Missing required argument: %s": { + "one": "Mangler obligatorisk argument: %s", + "other": "Mangler obligatoriske argumenter: %s" + }, + "Unknown argument: %s": { + "one": "Ukjent argument: %s", + "other": "Ukjente argumenter: %s" + }, + "Invalid values:": "Ugyldige verdier:", + "Argument: %s, Given: %s, Choices: %s": "Argument: %s, Gitt: %s, Valg: %s", + "Argument check failed: %s": "Argument sjekk mislyktes: %s", + "Implications failed:": "Konsekvensene mislyktes:", + "Not enough arguments following: %s": "Ikke nok følgende argumenter: %s", + "Invalid JSON config file: %s": "Ugyldig JSON konfigurasjonsfil: %s", + "Path to JSON config file": "Bane til JSON konfigurasjonsfil", + "Show help": "Vis hjelp", + "Show version number": "Vis versjonsnummer" +} diff --git a/node_modules/service-runner/node_modules/yargs/locales/tr.json b/node_modules/service-runner/node_modules/yargs/locales/tr.json new file mode 100644 index 0000000..cef09d2 --- /dev/null +++ b/node_modules/service-runner/node_modules/yargs/locales/tr.json @@ -0,0 +1,36 @@ +{ + "Commands:": "Komutlar:", + "Options:": "Seçenekler:", + "Examples:": "Örnekler:", + "boolean": "boolean", + "count": "sayı", + "string": "string", + "array": "array", + "required": "zorunlu", + "default:": "varsayılan:", + "choices:": "seçimler:", + "generated-value": "oluşturulan-değer", + "Not enough non-option arguments: got %s, need at least %s": "Seçenek dışı argümanlar yetersiz: %s bulundu, %s gerekli", + "Too many non-option arguments: got %s, maximum of %s": "Seçenek dışı argümanlar gereğinden fazla: %s bulundu, azami %s", + "Missing argument value: %s": { + "one": "Eksik argüman değeri: %s", + "other": "Eksik argüman değerleri: %s" + }, + "Missing required argument: %s": { + "one": "Eksik zorunlu argüman: %s", + "other": "Eksik zorunlu argümanlar: %s" + }, + "Unknown argument: %s": { + "one": "Bilinmeyen argüman: %s", + "other": "Bilinmeyen argümanlar: %s" + }, + "Invalid values:": "Geçersiz değerler:", + "Argument: %s, Given: %s, Choices: %s": "Argüman: %s, Verilen: %s, Seçimler: %s", + "Argument check failed: %s": "Argüman kontrolü başarısız oldu: %s", + "Implications failed:": "Sonuçlar başarısız oldu:", + "Not enough arguments following: %s": "%s için yeterli argüman bulunamadı", + "Invalid JSON config file: %s": "Geçersiz JSON yapılandırma dosyası: %s", + "Path to JSON config file": "JSON yapılandırma dosya konumu", + "Show help": "Yardım detaylarını göster", + "Show version number": "Versiyon detaylarını göster" +} diff --git a/node_modules/service-runner/node_modules/yargs/node_modules/camelcase/index.js b/node_modules/service-runner/node_modules/yargs/node_modules/camelcase/index.js new file mode 100644 index 0000000..6bf8af0 --- /dev/null +++ b/node_modules/service-runner/node_modules/yargs/node_modules/camelcase/index.js @@ -0,0 +1,35 @@ +'use strict'; +module.exports = function () { + var str = [].map.call(arguments, function (str) { + return str.trim(); + }).filter(function (str) { + return str.length; + }).join('-'); + + if (!str.length) { + return ''; + } + + if (str.length === 1) { + return str; + } + + if (!(/[_.\- ]+/).test(str)) { + if (str === str.toUpperCase()) { + return str.toLowerCase(); + } + + if (str[0] !== str[0].toLowerCase()) { + return str[0].toLowerCase() + str.slice(1); + } + + return str; + } + + return str + .replace(/^[_.\- ]+/, '') + .toLowerCase() + .replace(/[_.\- ]+(\w|$)/g, function (m, p1) { + return p1.toUpperCase(); + }); +}; diff --git a/node_modules/service-runner/node_modules/yargs/node_modules/cliui/node_modules/string-width/license b/node_modules/service-runner/node_modules/yargs/node_modules/camelcase/license similarity index 100% copy from node_modules/service-runner/node_modules/yargs/node_modules/cliui/node_modules/string-width/license copy to node_modules/service-runner/node_modules/yargs/node_modules/camelcase/license diff --git a/node_modules/camelcase/package.json b/node_modules/service-runner/node_modules/yargs/node_modules/camelcase/package.json similarity index 73% copy from node_modules/camelcase/package.json copy to node_modules/service-runner/node_modules/yargs/node_modules/camelcase/package.json index 895db7c..0af8980 100644 --- a/node_modules/camelcase/package.json +++ b/node_modules/service-runner/node_modules/yargs/node_modules/camelcase/package.json @@ -1,6 +1,6 @@ { "name": "camelcase", - "version": "1.2.1", + "version": "2.0.1", "description": "Convert a dash/dot/underscore/space separated string to camelCase: foo-bar → fooBar", "license": "MIT", "repository": { @@ -16,7 +16,7 @@ "node": ">=0.10.0" }, "scripts": { - "test": "node test.js" + "test": "xo && ava" }, "files": [ "index.js" @@ -36,25 +36,26 @@ "convert" ], "devDependencies": { - "ava": "0.0.4" + "ava": "*", + "xo": "*" }, - "gitHead": "185ba12da723be9c1ee986cc2956bdc4c517a141", + "gitHead": "fb178b39412e3b63ef86bf6933089282d74d85c4", "bugs": { "url": "https://github.com/sindresorhus/camelcase/issues"; }, "homepage": "https://github.com/sindresorhus/camelcase";, - "_id": "camelcase@1.2.1", - "_shasum": "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39", - "_from": "camelcase@1.2.1", - "_npmVersion": "2.11.2", - "_nodeVersion": "0.12.5", + "_id": "camelcase@2.0.1", + "_shasum": "57568d687b8da56c4c1d17b4c74a3cee26d73aeb", + "_from": "camelcase@^2.0.1", + "_npmVersion": "2.14.7", + "_nodeVersion": "4.2.1", "_npmUser": { "name": "sindresorhus", "email": "sindresor...@gmail.com" }, "dist": { - "shasum": "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39", - "tarball": "http://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"; + "shasum": "57568d687b8da56c4c1d17b4c74a3cee26d73aeb", + "tarball": "http://registry.npmjs.org/camelcase/-/camelcase-2.0.1.tgz"; }, "maintainers": [ { @@ -63,6 +64,5 @@ } ], "directories": {}, - "_resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz";, - "readme": "ERROR: No README data found!" + "_resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.0.1.tgz"; } diff --git a/node_modules/service-runner/node_modules/yargs/node_modules/cliui/node_modules/string-width/index.js b/node_modules/service-runner/node_modules/yargs/node_modules/string-width/index.js similarity index 100% rename from node_modules/service-runner/node_modules/yargs/node_modules/cliui/node_modules/string-width/index.js rename to node_modules/service-runner/node_modules/yargs/node_modules/string-width/index.js diff --git a/node_modules/service-runner/node_modules/yargs/node_modules/cliui/node_modules/string-width/license b/node_modules/service-runner/node_modules/yargs/node_modules/string-width/license similarity index 100% rename from node_modules/service-runner/node_modules/yargs/node_modules/cliui/node_modules/string-width/license rename to node_modules/service-runner/node_modules/yargs/node_modules/string-width/license diff --git a/node_modules/service-runner/node_modules/yargs/node_modules/cliui/node_modules/string-width/node_modules/code-point-at/index.js b/node_modules/service-runner/node_modules/yargs/node_modules/string-width/node_modules/code-point-at/index.js similarity index 100% rename from node_modules/service-runner/node_modules/yargs/node_modules/cliui/node_modules/string-width/node_modules/code-point-at/index.js rename to node_modules/service-runner/node_modules/yargs/node_modules/string-width/node_modules/code-point-at/index.js diff --git a/node_modules/service-runner/node_modules/yargs/node_modules/cliui/node_modules/string-width/node_modules/code-point-at/license b/node_modules/service-runner/node_modules/yargs/node_modules/string-width/node_modules/code-point-at/license similarity index 100% rename from node_modules/service-runner/node_modules/yargs/node_modules/cliui/node_modules/string-width/node_modules/code-point-at/license rename to node_modules/service-runner/node_modules/yargs/node_modules/string-width/node_modules/code-point-at/license diff --git a/node_modules/service-runner/node_modules/yargs/node_modules/cliui/node_modules/string-width/node_modules/code-point-at/package.json b/node_modules/service-runner/node_modules/yargs/node_modules/string-width/node_modules/code-point-at/package.json similarity index 100% rename from node_modules/service-runner/node_modules/yargs/node_modules/cliui/node_modules/string-width/node_modules/code-point-at/package.json rename to node_modules/service-runner/node_modules/yargs/node_modules/string-width/node_modules/code-point-at/package.json diff --git a/node_modules/service-runner/node_modules/yargs/node_modules/cliui/node_modules/string-width/node_modules/is-fullwidth-code-point/index.js b/node_modules/service-runner/node_modules/yargs/node_modules/string-width/node_modules/is-fullwidth-code-point/index.js similarity index 100% rename from node_modules/service-runner/node_modules/yargs/node_modules/cliui/node_modules/string-width/node_modules/is-fullwidth-code-point/index.js rename to node_modules/service-runner/node_modules/yargs/node_modules/string-width/node_modules/is-fullwidth-code-point/index.js diff --git a/node_modules/service-runner/node_modules/yargs/node_modules/cliui/node_modules/string-width/node_modules/is-fullwidth-code-point/license b/node_modules/service-runner/node_modules/yargs/node_modules/string-width/node_modules/is-fullwidth-code-point/license similarity index 100% rename from node_modules/service-runner/node_modules/yargs/node_modules/cliui/node_modules/string-width/node_modules/is-fullwidth-code-point/license rename to node_modules/service-runner/node_modules/yargs/node_modules/string-width/node_modules/is-fullwidth-code-point/license diff --git a/node_modules/service-runner/node_modules/yargs/node_modules/cliui/node_modules/string-width/node_modules/is-fullwidth-code-point/package.json b/node_modules/service-runner/node_modules/yargs/node_modules/string-width/node_modules/is-fullwidth-code-point/package.json similarity index 100% rename from node_modules/service-runner/node_modules/yargs/node_modules/cliui/node_modules/string-width/node_modules/is-fullwidth-code-point/package.json rename to node_modules/service-runner/node_modules/yargs/node_modules/string-width/node_modules/is-fullwidth-code-point/package.json diff --git a/node_modules/service-runner/node_modules/yargs/node_modules/cliui/node_modules/string-width/package.json b/node_modules/service-runner/node_modules/yargs/node_modules/string-width/package.json similarity index 100% rename from node_modules/service-runner/node_modules/yargs/node_modules/cliui/node_modules/string-width/package.json rename to node_modules/service-runner/node_modules/yargs/node_modules/string-width/package.json diff --git a/node_modules/service-runner/node_modules/yargs/node_modules/window-size/package.json b/node_modules/service-runner/node_modules/yargs/node_modules/window-size/package.json index 86592a4..e1c54a9 100644 --- a/node_modules/service-runner/node_modules/yargs/node_modules/window-size/package.json +++ b/node_modules/service-runner/node_modules/yargs/node_modules/window-size/package.json @@ -56,7 +56,7 @@ "gitHead": "619d0da99254adc5c6059c84e3ec2b24564add46", "_id": "window-size@0.1.4", "_shasum": "f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876", - "_from": "window-size@^0.1.2", + "_from": "window-size@^0.1.4", "_npmVersion": "3.3.6", "_nodeVersion": "5.0.0", "_npmUser": { diff --git a/node_modules/service-runner/node_modules/yargs/package.json b/node_modules/service-runner/node_modules/yargs/package.json index 94822c8..a6a3351 100644 --- a/node_modules/service-runner/node_modules/yargs/package.json +++ b/node_modules/service-runner/node_modules/yargs/package.json @@ -1,6 +1,6 @@ { "name": "yargs", - "version": "3.30.0", + "version": "3.31.0", "description": "Light-weight option parsing with an argv hash. No optstrings attached.", "main": "./index.js", "files": [ @@ -11,11 +11,12 @@ "LICENSE" ], "dependencies": { - "camelcase": "^1.2.1", + "camelcase": "^2.0.1", "cliui": "^3.0.3", "decamelize": "^1.1.1", "os-locale": "^1.4.0", - "window-size": "^0.1.2", + "string-width": "^1.0.1", + "window-size": "^0.1.4", "y18n": "^3.2.0" }, "devDependencies": { @@ -24,9 +25,9 @@ "coveralls": "^2.11.4", "es6-promise": "^3.0.2", "hashish": "0.0.4", - "mocha": "^2.3.3", - "nyc": "^3.2.2", - "standard": "^5.3.1", + "mocha": "^2.3.4", + "nyc": "^4.0.1", + "standard": "^5.4.1", "which": "^1.1.2", "win-spawn": "^2.0.0" }, @@ -97,23 +98,23 @@ "engine": { "node": ">=0.4" }, - "gitHead": "9a0171ea15d87b3f98aaab39e372523ac158b050", + "gitHead": "e37a70c7ca67742e05ec6420772793c9d5e6bc82", "bugs": { "url": "https://github.com/bcoe/yargs/issues"; }, "homepage": "https://github.com/bcoe/yargs#readme";, - "_id": "yargs@3.30.0", - "_shasum": "5ec82ef8c7296fe02fa0ee37863f6d9d9e24acef", + "_id": "yargs@3.31.0", + "_shasum": "9f28210aaa0a796570e99505644b968f5e41a1bc", "_from": "yargs@^3.24.0", - "_npmVersion": "3.3.5", - "_nodeVersion": "0.10.40", + "_npmVersion": "2.14.13", + "_nodeVersion": "3.2.0", "_npmUser": { "name": "bcoe", "email": "b...@npmjs.com" }, "dist": { - "shasum": "5ec82ef8c7296fe02fa0ee37863f6d9d9e24acef", - "tarball": "http://registry.npmjs.org/yargs/-/yargs-3.30.0.tgz"; + "shasum": "9f28210aaa0a796570e99505644b968f5e41a1bc", + "tarball": "http://registry.npmjs.org/yargs/-/yargs-3.31.0.tgz"; }, "maintainers": [ { @@ -134,5 +135,5 @@ } ], "directories": {}, - "_resolved": "https://registry.npmjs.org/yargs/-/yargs-3.30.0.tgz"; + "_resolved": "https://registry.npmjs.org/yargs/-/yargs-3.31.0.tgz"; } diff --git a/restbase b/restbase index 5e8112a..b3d73a6 160000 --- a/restbase +++ b/restbase -Subproject commit 5e8112a7e7a2c5f5c4a48b19557e39b6a12374bf +Subproject commit b3d73a611e80a0937b9a766e5de51fbda1823486 -- To view, visit https://gerrit.wikimedia.org/r/256989 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I056a1ef7d6f1e7ba4fbed146bc65fef13a0bad04 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/restbase/deploy Gerrit-Branch: master Gerrit-Owner: GWicke <gwi...@wikimedia.org> Gerrit-Reviewer: GWicke <gwi...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
