GWicke has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/193166

Change subject: Update to master
......................................................................

Update to master

Change-Id: I0b8194574e71ffe889caae610455cec6c8886e18
---
M node_modules/mocha-lcov-reporter/package.json
M node_modules/service-runner/package.json
M node_modules/swagger-router/index.js
M node_modules/swagger-router/package.json
M restbase
5 files changed, 9 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy 
refs/changes/66/193166/1

diff --git a/node_modules/mocha-lcov-reporter/package.json 
b/node_modules/mocha-lcov-reporter/package.json
index b6c7591..26cfa83 100644
--- a/node_modules/mocha-lcov-reporter/package.json
+++ b/node_modules/mocha-lcov-reporter/package.json
@@ -32,7 +32,6 @@
     "type": "git",
     "url": "git://github.com/StevenLooman/mocha-lcov-reporter.git"
   },
-  "readme": "mocha-lcov-reporter\n===================\n\nLCOV reporter for 
Mocha.\n\nLCOV format can be found at 
[http://ltp.sourceforge.net/coverage/lcov/geninfo.1.php]. This LCOV reporter 
was built after 
[https://raw.github.com/SonarCommunity/sonar-javascript/master/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/coverage/LCOVParser.java].\n";,
   "_id": "[email protected]",
   "dist": {
     "shasum": "02670491db57ee6cb1fe7392e813700f6e336a21",
@@ -50,5 +49,5 @@
   "bugs": {
     "url": "https://github.com/StevenLooman/mocha-lcov-reporter/issues";
   },
-  "homepage": "https://github.com/StevenLooman/mocha-lcov-reporter";
+  "readme": "ERROR: No README data found!"
 }
diff --git a/node_modules/service-runner/package.json 
b/node_modules/service-runner/package.json
index 1ed823f..4f94abb 100644
--- a/node_modules/service-runner/package.json
+++ b/node_modules/service-runner/package.json
@@ -54,5 +54,5 @@
   "gitHead": "ba5a2ca6633dc0dcc67af6fa1d067abb51d6cd1e",
   "_id": "[email protected]",
   "_shasum": "8e3882f606163067832aff8683b07c2a9aebcbf5",
-  "_from": "service-runner@^0.1.0"
+  "_from": "service-runner@^0.1.4"
 }
diff --git a/node_modules/swagger-router/index.js 
b/node_modules/swagger-router/index.js
index 358e786..1339a41 100644
--- a/node_modules/swagger-router/index.js
+++ b/node_modules/swagger-router/index.js
@@ -1,8 +1,6 @@
 "use strict";
 
-if (!global.Promise || !global.Promise.promisify) {
-    global.Promise = require('bluebird');
-}
+var P = require('bluebird');
 
 /***
  * :SECTION 1:
@@ -371,7 +369,7 @@
     // First value, then each of the children (one by one)
     return fn(self.value, path)
     .then(function() {
-        return Promise.resolve(Object.keys(self._children))
+        return P.resolve(Object.keys(self._children))
         .each(function(childKey) {
             var segment = childKey.replace(/^\//, '');
             var child = self._children[childKey];
diff --git a/node_modules/swagger-router/package.json 
b/node_modules/swagger-router/package.json
index 98c8782..4c8e7f0 100644
--- a/node_modules/swagger-router/package.json
+++ b/node_modules/swagger-router/package.json
@@ -1,6 +1,6 @@
 {
   "name": "swagger-router",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "description": "An efficient swagger 2 based router with support for 
multiple APIs. For use in RESTBase.",
   "main": "index.js",
   "scripts": {
@@ -40,9 +40,8 @@
   },
   "readme": "# Swagger 2 
router\n[![Build\nStatus](https://travis-ci.org/gwicke/swagger-router.svg?branch=master)](https://travis-ci.org/gwicke/swagger-router)\n\n##
 Features\n- `O(path element)` lookup complexity, monomorphic design with 
simple fast path.\n- Support for prefix-based 'mounting' of swagger specs. 
Example: Mount the\n    same spec fragments at `/en.wikipedia.org/v1/` and\n    
`/de.wikipedia.org/v1/`.\n- Support for capture of fixed path segments. 
Example:\n    `/{domain:en.wikipedia.org}/v1/`. This feature is especially 
useful in\n    prefixes, as it enables the consistent construction of sensible 
params.\n- Support for static (purely spec-based) listings. Matching requests 
ending on\n    a slash are passed an array of matching child paths in the spec 
in the\n    `_ls` parameter.\n\n## Installation\n`npm install 
swagger-router`\n\n## Usage\n```javascript\nvar Router = 
require('swagger-router');\nvar router = new Router();\n\n// The main 
requirement is that each spec has a 'paths' member with some URL\n// 
patterns\nvar swaggerSpec = {\n    paths: {\n        '/': {\n            get: 
{\n                hello: 'A listing'\n            }\n        },\n        
'/some/{name}': { // This object is returned as 'value'\n            get: {\n   
             hello: 'world'\n            }\n        }\n    
}\n};\n\nrouter.addSpec(swaggerSpec);\n\n// Perform some 
lookups\nconsole.log(router.lookup('/some/title'));\n/* \n{\n    params: {\n    
    name: 'title'\n    },\n    value: { get: { hello: 'world' } }\n}\n*/\n\n// 
Use arrays internally for speed (no escaping / 
parsing)\nrouter.lookup(['some','path']);\n\n// Trailing slashes set an 
additional _ls param:\nrouter.lookup(['']); // equivalent: router.lookup('/'); 
\n/*\n{\n    params: {\n        _ls: ['some'],\n        name: 'title'\n    },\n 
   value: { get: { hello: 'A listing' } }\n}\n*/\n\n```\n",
   "readmeFilename": "README.md",
-  "gitHead": "b79b88f03f254c8382a9837b6bca64c8758f0069",
-  "_id": "[email protected]",
-  "_shasum": "a518cc70c83b3020e31e897ca152fcf1fa84017d",
-  "_from": "swagger-router@^0.0.3",
-  "homepage": "https://github.com/gwicke/swagger-router";
+  "gitHead": "085eb2a2cca87fbc4b1644f5130d1326bbb41f6b",
+  "_id": "[email protected]",
+  "_shasum": "61af1c970365b3c0a34fa9c783a2f866f2fc8b17",
+  "_from": "swagger-router@^0.0.4"
 }
diff --git a/restbase b/restbase
index fbf90b7..aeab429 160000
--- a/restbase
+++ b/restbase
-Subproject commit fbf90b7bc49a3387a81af3d8c46bfc3b5275bfb0
+Subproject commit aeab4293427d7946c01776f7799f729689dfd80d

-- 
To view, visit https://gerrit.wikimedia.org/r/193166
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0b8194574e71ffe889caae610455cec6c8886e18
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: GWicke <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to