Mono repo take three

.gitignore

@@ -1,4 +1,4 @@
-node_modules/
+/node_modules
 testdb_*
 test_*
 _pouch_*
@@ -12,3 +12,4 @@ config.json
 log.txt
 /pouchdb
 /tmp
+pouchdb-tests

.travis.yml

@@ -31,6 +31,8 @@ env:
   - secure: "MiufQQKR/EBoS7kcau/I7oYenVilysEqwx37zdgLEKlEUe3SxVOe31uLZv/bhfLNZiRuLAfmIOZmhLGnhMf0LaBzR2yC5qhBxrVHcAiTuS3q6zxpzEf02jnu+hACvj1kJJEPjpOLpEVx7ghWL4McEO0qLbdtSbQlm2IkOX1ONg0="
 
   matrix:
+  - COMMAND=unit-tests
+  - COMMAND=test-express-minimum
   - CLIENT=node COMMAND=test-pouchdb
   - CLIENT=node SERVER_ARGS=--in-memory COMMAND=test-pouchdb
   - CLIENT=node SERVER_ARGS=--sqlite COMMAND=test-pouchdb
@@ -40,6 +42,10 @@ env:
   - CLIENT=selenium:firefox COMMAND=test-pouchdb
   - CLIENT=selenium:phantomjs COMMAND=test-pouchdb
 
+  # Run the mapreduce tests
+  - COMMAND=test-pouchdb TYPE=mapreduce CLIENT=node
+  - COMMAND=test-pouchdb TYPE=mapreduce CLIENT=selenium:firefox
+
   # Test against the couchdb harness
   - COMMAND=test-couchdb
 

CONTRIBUTING.md

@@ -1,11 +1,9 @@
-Want to help me make this thing awesome? Great! Here's how you should get started.
-
-1. First, make sure that the bugfix or feature you're looking to implement isn't better fit for [express-pouchdb](https://github.com/nick-thompson/express-pouchdb).
-2. PouchDB is still developing rapidly. If you need bleeding egde versions, you should first read how to [set up express-pouchdb for local development](https://github.com/nick-thompson/express-pouchdb#contributing). (Make sure that, afterwards, you `npm link` express-pouchdb).
-3. Go ahead and fork **pouchdb-server**, clone it to your machine.
-4. Now you'll want to, from the root of **pouchdb-server**, `npm link express-pouchdb`.
-5. `npm install` the rest of the dependencies.
+# Contributing
 
-Please make your changes on a separate branch whose name reflects your changes, push them to your fork, and open a pull request!
+Want to help me make this thing awesome? Great! Here's how you should get started.
 
-For commit message style guidelines, please refer to [PouchDB CONTRIBUTING.md](https://github.com/pouchdb/pouchdb/blob/master/CONTRIBUTING.md).
+1. First, check whether your bugfix must be in `express-pouchdb` or `pouchdb-server`.
+2. Make your changes on a separate branch whose name reflects your changes,
+3. Run all tests to make sure your changes do not break anything
+4. To create a PR, push your changes to your fork, and open a pull request!
+5. For a PR, follow the commit message style guidelines in[PouchDB CONTRIBUTING.md](https://github.com/pouchdb/pouchdb/blob/master/CONTRIBUTING.md).

README.md

@@ -1,195 +1,24 @@
-# pouchdb-server
+# pouchdb-server monorepo
 [![Build Status](https://travis-ci.org/pouchdb/pouchdb-server.svg)](https://travis-ci.org/pouchdb/pouchdb-server)
 
-> A standalone REST interface server for PouchDB.
+This is the monorepo for PouchDB-Server and Express-PouchDB. It follows the same format as the (PouchDB monorepo](https://github.com/pouchdb/pouchdb). This follows the [alle](https://github.com/boennemann/alle) monorepo setup. You can read more about monorepo's [here](https://github.com/babel/babel/blob/master/doc/design/monorepo.md)) and (here)[https://gist.github.com/nolanlawson/457cdb309c9ec5b39f0d420266a9faa4].
 
-## Introduction
+Getting Help
+------------
 
-**pouchdb-server** is a simple Node.js server that presents a simple REST API, which mimics that of [CouchDB](http://couchdb.apache.org),
-on top of [PouchDB](http://pouchdb.com). Among other things, this allows users to replicate IndexedDB stores to LevelDB, or to
-spin up a quick and dirty drop-in replacement for CouchDB to get things moving quickly.
+The PouchDB community is active [on Freenode IRC](https://www.irccloud.com/invite?channel=pouchdb&hostname=irc.freenode.net&port=6697&ssl=1), [Slack](http://slack.pouchdb.com),in [the Google Groups mailing list](https://groups.google.com/forum/#!forum/pouchdb), and [on StackOverflow](http://stackoverflow.com/questions/tagged/pouchdb). Or you can [tweet @pouchdb](http://twitter.com/pouchdb)!
 
-## Installation
+If you think you've found a bug in PouchDB, please write a reproducible test case and file [a Github issue](https://github.com/pouchdb/pouchdb/issues). We recommend [bl.ocks.org](http://bl.ocks.org/) for code snippets, because some iframe-based services like JSFiddle and JSBin do not support IndexedDB in all browsers. You can start with [this template](https://gist.github.com/nolanlawson/816f138a51b86785d3e6).
 
-```bash
-$ npm install -g pouchdb-server
-```
-
-## Usage
-
-```
-
-Usage: pouchdb-server [options]
-
-Options:
-   -p, --port             Port on which to run the server. (Defaults to
-                          /_config/httpd/port which defaults to 5984).
-   -d, --dir              Where to store database files. (Defaults to
-                          /_config/couchdb/database_dir which defaults to the
-                          current directory).
-   -c, --config           The location of the configuration file that backs
-                          /_config. (Defaults to ./config.json).
-   -o, --host             The address to bind the server to. (Defaults to
-                          /_config/httpd/bind_address which defaults to
-                          127.0.0.1).
-   -m, --in-memory        Use a pure in-memory database which will be deleted
-                          upon restart. (Defaults to
-                          /_config/pouchdb_server/in_memory which defaults to
-                          false).
-   --sqlite               Use PouchDB over SQLite instead of LevelDOWN.
-                          (Defaults to /_config/pouchdb_server/sqlite which
-                          defaults to false).
-   -r, --proxy            Proxy requests to the specified host. Include a
-                          trailing '/'. (Defaults to
-                          /_config/pouchdb_server/proxy which defaults to
-                          undefined).
-   -n, --no-stdout-logs   Stops the log file from also being written to stdout.
-                          (Defaults to /_config/pouchdb_server/no-stdout-logs
-                          which defaults to false).
-   --no-color             Disable coloring of logging output.
-   --level-backend        Advanced - Alternate LevelDOWN backend (e.g. memdown,
-                          riakdown, redisdown). Note that you'll need to
-                          manually npm install it first. (Defaults to
-                          /_config/pouchdb_server/level_backend which defaults
-                          to undefined).
-   --level-prefix         Advanced - Prefix to use for all database names,
-                          useful for URLs in alternate backends, e.g.
-                          riak://localhost:8087/ for riakdown. (Defaults to
-                          /_config/pouchdb_server/level_prefix which defaults
-                          to undefined).
-
-Examples:
-
-  pouchdb-server --level-backend riakdown --level-prefix riak://localhost:8087
-  Starts up a pouchdb-server that talks to Riak.
-  Requires: npm install riakdown
-
-  pouchdb-server --level-backend redisdown
-  Starts up a pouchdb-server that talks to Redis, on localhost:6379.
-  Requires: npm install redisdown
-
-  pouchdb-server --level-backend sqldown --level-prefix /tmp/
-  Starts up a pouchdb-server using SQLite, with files stored in /tmp/.
-  Requires: npm install sqldown sqlite3
-```
-
-A simple example might be,
-
-```bash
-$ pouchdb-server -p 15984
-pouchdb-server listening on port 15984.
-```
-
-Alternatively, **pouchdb-server**'s functionality can be mounted into other Express web apps. For more information
-on that, check out [express-pouchdb](https://github.com/nick-thompson/express-pouchdb).
-
-## Fauxton
-
-**pouchdb-server** currently supports an experimental version of CouchDB's [Fauxton](http://docs.couchdb.org/en/latest/fauxton/index.html). Fauxton, the successor to CouchDB's original Futon, is a simple web UI for interacting with your databases. With your server running, navigate to `/_utils` to check it out!
-
-## Configuration
-
-By default, you can configure pouchdb-server using a `config.json` file, which is
-typically expected at the root of wherever you run pouchdb-server, but may be specified with the `--config` option.
-
-Below are some examples of `config.json` options:
-
-### log.level
-
-To change the log output level, you can create a `config.json` file containing e.g.:
-
-```js
-{
-  "log": {
-    "level": "none"
-  }
-}
-
-```
-
-The available values are `debug`, `info`, `warning`, `error`, and `none`. The default
-is `info`.
-
-### log.file
-
-To choose the file where logs are written, you can create a `config.json` file containing e.g.:
-
-```js
-{
-  "log": {
-    "file": "/path/to/log.txt"
-  }
-}
-
-```
-
-By default, logs are written to `./log.txt`.
-
-## Automatic port configuration
-
-Due to conventions set by Heroku and others, if you have a `PORT` environment variable,
-`pouchdb-server` will pick up on that and use it instead of `5984` as the default.
-
-```bash
-export PORT=3000
-pouchdb-server # will run on port 3000
-```
-
-## Testing
-
-One of the primary benefits of **pouchdb-server** is the ability to run PouchDB's Node test suite against itself. To do that, you can simply,
-
-```bash
-$ npm run test-pouchdb
-```
-
-Whatever args you provide as `SERVER_ARGS` will be passed to `pouchdb-server` itself:
-
-```bash
-$ SERVER_ARGS='--in-memory' npm run test-pouchdb
-```
-
-Or to test in Firefox (IndexedDB):
-
-```bash
-$ CLIENT=selenium:firefox npm run test-pouchdb
-```
-
-Or to test in PhantomJS (WebSQL):
-
-```bash
-$ CLIENT=selenium:phantomjs ES5_SHIM=true npm run test-pouchdb
-```
-
-Additionally, we've started porting CouchDB's JavaScript test harness to
-[a simple Node module](https://github.com/nick-thompson/couchdb-harness), which can be run against PouchDB via **pouchdb-server**.
-
-```bash
-$ npm run test-couchdb
-```
 
 ## Contributing
 
-Want to help me make this thing awesome? Great! Here's how you should get started.
-
-1. First, make sure that the bugfix or feature you're looking to implement isn't better fit for [express-pouchdb](https://github.com/nick-thompson/express-pouchdb).
-2. PouchDB is still developing rapidly. If you need bleeding egde versions, you should first read how to [set up express-pouchdb for local development](https://github.com/nick-thompson/express-pouchdb#contributing). (Make sure that, afterwards, you `npm link` express-pouchdb).
-3. Go ahead and fork **pouchdb-server**, clone it to your machine.
-4. Now you'll want to, from the root of **pouchdb-server**, `npm link express-pouchdb`.
-5. `npm install` the rest of the dependencies.
-
-Please make your changes on a separate branch whose name reflects your changes, push them to your fork, and open a pull request!
-
-For commit message style guidelines, please refer to [PouchDB CONTRIBUTING.md](https://github.com/pouchdb/pouchdb/blob/master/CONTRIBUTING.md).
+See the CONTRIBUTING.md file for how to get involved
 
 ## Contributors
 
-[These people](https://github.com/pouchdb/express-pouchdb/graphs/contributors) made **pouchdb-server** into what it is today!
-
-## Changelog
-
-`pouchdb-server` follows [semantic versioning](http://semver.org/). To see a changelog with all releases since v2.0.0, check out the [Github releases page](https://github.com/pouchdb/pouchdb-server/releases).
+[These people](https://github.com/pouchdb/pouchdb-server/graphs/contributors) made **pouchdb-server** into what it is today!
 
 ## License
 
-Apache License Version 2.0. See [the LICENSE file](https://github.com/pouchdb/pouchdb-server/blob/master/LICENSE) for more information.
+The MIT License. See [the LICENSE file](https://github.com/pouchdb/pouchdb-server/blob/master/LICENSE) for more information.

bin/express-pouchdb-minimum-for-pouchdb.js

@@ -0,0 +1,8 @@
+'use strict';
+
+var PouchDB = require('pouchdb');
+
+var app = require('../packages/node_modules/express-pouchdb')(PouchDB, {
+  mode: 'minimumForPouchDB'
+});
+app.listen(6984);

bin/set-version.js

@@ -0,0 +1,25 @@
+#!/usr/bin/env node
+
+'use strict';
+
+// Set the version of all modules, since they're versioned together.
+// Usage: npm run set-version -- [version]
+// e.g.   npm run set-version -- 1.2.3
+
+var version = process.argv[process.argv.length - 1];
+var fs = require('fs');
+var path = require('path');
+
+var packages = fs.readdirSync('packages/node_modules');
+
+packages.map(function (pkg) {
+  return path.resolve(__dirname, '../packages/node_modules', pkg, 'package.json');
+}).concat([
+  path.resolve(__dirname, '../package.json')
+]).forEach(function (jsonFile) {
+  var json = JSON.parse(fs.readFileSync(jsonFile), 'utf-8');
+  json.version = version;
+  fs.writeFileSync(jsonFile, JSON.stringify(json, null, '  ') + '\n', 'utf-8');
+});
+
+console.log('done');

bin/test-couchdb.sh

@@ -4,7 +4,7 @@
 # couchdb-harness depends on the fact that /_config/httpd/port equals
 # the port on which pouchdb-server is running.
 echo '{"httpd": {"port": 6984}}' > config.json
-node bin/pouchdb-server &
+./packages/node_modules/pouchdb-server/bin/pouchdb-server &
 export POUCHDB_SERVER_PID=$!
 ./node_modules/couchdb-harness/bin/couchdb-harness -p 6984
 

bin/test-express-minimum.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+node ./bin/express-pouchdb-minimum-for-pouchdb.js &
+POUCHDB_SERVER_PID=$!
+
+cd ./pouchdb-tests
+
+COUCH_HOST=http://127.0.0.1:6984 TIMEOUT=120000 npm run test-node
+
+EXIT_STATUS=$?
+if [[ ! -z $POUCHDB_SERVER_PID ]]; then
+  kill $POUCHDB_SERVER_PID
+fi
+exit $EXIT_STATUS

bin/test-pouchdb.sh

@@ -1,18 +1,14 @@
 #!/bin/bash
 
-rm -fr tmp
-mkdir -p tmp
-cd tmp
-
-../bin/pouchdb-server -n -p 6984 $SERVER_ARGS &
+./packages/node_modules/pouchdb-server/bin/pouchdb-server -n -p 6984 $SERVER_ARGS &
 POUCHDB_SERVER_PID=$!
 
-cd ../pouchdb
+cd ./pouchdb-tests
 
-COUCH_HOST=http://127.0.0.1:6984 TIMEOUT=120000 npm run test-node
+COUCH_HOST=http://localhost:6984 TIMEOUT=120000 npm run test-node
 
 EXIT_STATUS=$?
 if [[ ! -z $POUCHDB_SERVER_PID ]]; then
   kill $POUCHDB_SERVER_PID
 fi
-exit $EXIT_STATUS
+exit $EXIT_STATUS

bin/test-setup.sh

@@ -1,18 +1,14 @@
 #!/bin/bash
 
-# install pouchdb from git rather than npm,
-# so we can run its own tests
-# also this branch may change as we update pouchdb
-# versions because we can't necessarily test against
-# the master tests since we use the version of pouchdb
-# from npm
-rm -rf pouchdb
-git clone --single-branch \
-  --branch master \
-  --depth 300 \
-  https://github.com/pouchdb/pouchdb.git pouchdb
-cd pouchdb
-# using a specific commit for now rather than master
-git reset --hard 587ba8f4df4b6fcf32a8fd015f8c7ebadd8f280d
+DIRECTORY='pouchdb-tests'
+
+if [ ! -d "$DIRECTORY" ]; then
+  # Control will enter here if $DIRECTORY exists.
+  git clone --single-branch --branch master \
+    https://github.com/pouchdb/pouchdb.git ${DIRECTORY}
+fi
+
+cd pouchdb-tests
 npm install
-cd -
+
+cd ..