Gehel has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/394027 )
Change subject: align package.json with currently deployed version ...................................................................... align package.json with currently deployed version Bug: T162241 Change-Id: I2528c345802084163d384d7d57b4f083f2f82077 --- A .gitreview M app.js M package.json 3 files changed, 55 insertions(+), 71 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/maps/kartotherian/package refs/changes/27/394027/1 diff --git a/.gitreview b/.gitreview new file mode 100644 index 0000000..61c6841 --- /dev/null +++ b/.gitreview @@ -0,0 +1,6 @@ +[gerrit] +host=gerrit.wikimedia.org +port=29418 +project=maps/kartotherian/package.git +defaultbranch=master +defaultrebase=0 diff --git a/app.js b/app.js index 951251a..4c44358 100644 --- a/app.js +++ b/app.js @@ -1,47 +1,4 @@ 'use strict'; -var kartotherian = require('kartotherian') - -/** - * Creates an express app and initialises it - * @param {Object} options the options to initialise the app with - * @return {bluebird} the promise resolving to the app object - */ -function initApp(options) { - return kartotherian.app.initApp(options); -} - - -/** - * Loads all routes declared in routes/ into the app - * @param {Application} app the application object to load routes into - * @returns {bluebird} a promise resolving to the app object - */ -function loadRoutes (app) { - return kartotherian.app.loadRoutes(app); -} - - -/** - * Creates and start the service's web server - * @param {Application} app the app object to use in the service - * @returns {bluebird} a promise creating the web server - */ -function createServer(app) { - return kartotherian.app.createServer(app); -} - - -/** - * The service's entry point. It takes over the configuration - * options and the logger- and metrics-reporting objects from - * service-runner and starts an HTTP server, attaching the application - * object to it. - */ -module.exports = function(options) { - - return initApp(options) - .then(loadRoutes) - .then(createServer); - -}; +// just delegate everything to the main kartotherian package +module.exports = require('kartotherian') diff --git a/package.json b/package.json index eacb587..5047427 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "kartotherian-packaging", + "name": "kartotherian-package", "version": "0.0.1", "description": "Packaging of Kartotherian for use at WMF", "main": "./app.js", @@ -12,7 +12,7 @@ }, "repository": { "type": "git", - "url": "git://github.com/kartotherian/kartotherian-packaging.git" + "url": "https://gerrit.wikimedia.org/r/maps/kartotherian/package" }, "keywords": [ "REST", @@ -32,48 +32,69 @@ "url": "https://phabricator.wikimedia.org/tag/maps/" }, "homepage": "https://github.com/kartotherian/kartotherian", + "kartotherian": { "registerSourceLibs": [ "tilelive-bridge", "tilelive-vector", - "@kartotherian/autogen", - "@kartotherian/babel", - "@kartotherian/cassandra", - "@kartotherian/demultiplexer", - "@kartotherian/layermixer", - "@kartotherian/overzoom", - "@kartotherian/postgres", - "@kartotherian/substantial", - "@kartotherian/tilelive-http", - "tilejson" + "kartotherian-autogen", + "kartotherian-cassandra", + "kartotherian-postgres", + "kartotherian-demultiplexer", + "kartotherian-layermixer", + "kartotherian-overzoom", + "kartotherian-substantial" ], "requestHandlers": [ - "@kartotherian/geoshapes", - "@kartotherian/maki", - "@kartotherian/snapshot" + "kartotherian-geoshapes", + "kartotherian-maki", + "kartotherian-snapshot" ] }, + "dependencies": { - "kartotherian": "git+https://github.com/kartotherian/kartotherian.git", + "kartotherian": "git+https://github.com/kartotherian/kartotherian.git#v0.0.31", "service-runner": "^2.4.6" }, "optionalDependencies": { "bunyan-prettystream": "*" }, + "devDependencies": { + "extend": "^3.0.0", + "istanbul": "^0.4.3", + "mocha": "^2.4.5", + "mocha-jshint": "^2.3.1", + "mocha-lcov-reporter": "^1.2.0", + "swagger-router": "^0.4.2" + }, "deploy": { - "node": "6.11", + "node": "6.9.1", "target": "debian", + "install_opts": ["--build-from-source=mapnik", "--fallback-to-build=false"] , "dependencies": { - "_all": [ - "libcairo2-dev", - "libgif-dev", - "libpango1.0-dev" - ], - "ubuntu": [ - "libjpeg62-dev" - ], + "_all": ["libcairo2-dev", "libgif-dev", "libpango1.0-dev"], + "ubuntu": ["libjpeg62-dev"], "debian": [ - "libjpeg62-turbo-dev" + "libjpeg62-turbo-dev", + "fonts-dejavu", + "libboost-filesystem-dev", + "libboost-program-options-dev", + "libboost-regex-dev", + "libboost-system-dev", + "libboost-thread-dev", + "libgdal-dev", + "libicu-dev", + "libpq-dev", + "libcurl4-gnutls-dev", + "libproj-dev", + "libtiff-dev", + "libwebp5", + { + "repo_url": "https://apt.wikimedia.org/wikimedia", + "release": "jessie-wikimedia", + "pool": "backports", + "packages": [ "libmapbox-variant-dev", "libmapnik-dev", "mapnik-utils" ] + } ] } } -- To view, visit https://gerrit.wikimedia.org/r/394027 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2528c345802084163d384d7d57b4f083f2f82077 Gerrit-PatchSet: 1 Gerrit-Project: maps/kartotherian/package Gerrit-Branch: master Gerrit-Owner: Gehel <guillaume.leder...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits