pr updates
Project: http://git-wip-us.apache.org/repos/asf/couchdb-nmo/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-nmo/commit/89c18c06 Tree: http://git-wip-us.apache.org/repos/asf/couchdb-nmo/tree/89c18c06 Diff: http://git-wip-us.apache.org/repos/asf/couchdb-nmo/diff/89c18c06 Branch: refs/heads/replicate Commit: 89c18c069df0f48924f51fe5878f2c5075393ee9 Parents: 034554b Author: Garren Smith <[email protected]> Authored: Wed Nov 11 11:03:15 2015 +0200 Committer: Garren Smith <[email protected]> Committed: Mon Nov 16 14:06:42 2015 +0200 ---------------------------------------------------------------------- doc/api/nmo-replicate-from.md | 4 ++-- doc/api/replicate-to.md | 4 ++-- doc/cli/nmo-replicate-from.md | 2 +- doc/cli/nmo-replicate-to.md | 24 ++++++++++++++++++++++++ doc/cli/replicate-to.md | 24 ------------------------ src/replicate-to.js | 4 ++-- test/replicate-from.js | 2 +- test/replicate-to.js | 4 ++-- 8 files changed, 34 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-nmo/blob/89c18c06/doc/api/nmo-replicate-from.md ---------------------------------------------------------------------- diff --git a/doc/api/nmo-replicate-from.md b/doc/api/nmo-replicate-from.md index f4fc7eb..126e28a 100644 --- a/doc/api/nmo-replicate-from.md +++ b/doc/api/nmo-replicate-from.md @@ -1,9 +1,9 @@ -nmo-replicateFrom(3) -- replicate-from +nmo-replicatefrom(3) -- replicate-from ============================== ## SYNOPSIS - nmo.commands.replicateFrom([<clusterurl> || <cluster>], database, url) + nmo.commands.replicatefrom([<clusterurl> || <cluster>], database, url) ## DESCRIPTION http://git-wip-us.apache.org/repos/asf/couchdb-nmo/blob/89c18c06/doc/api/replicate-to.md ---------------------------------------------------------------------- diff --git a/doc/api/replicate-to.md b/doc/api/replicate-to.md index 248ad14..41b3dee 100644 --- a/doc/api/replicate-to.md +++ b/doc/api/replicate-to.md @@ -1,9 +1,9 @@ -nmo-replicateTo(3) -- replicate-to +nmo-replicateto(3) -- replicate-to ============================== ## SYNOPSIS - nmo.commands.replicateTo([<clusterurl> || <cluster>], database, url) + nmo.commands.replicateto([<clusterurl> || <cluster>], database, url) ## DESCRIPTION http://git-wip-us.apache.org/repos/asf/couchdb-nmo/blob/89c18c06/doc/cli/nmo-replicate-from.md ---------------------------------------------------------------------- diff --git a/doc/cli/nmo-replicate-from.md b/doc/cli/nmo-replicate-from.md index f5707b5..57fd903 100644 --- a/doc/cli/nmo-replicate-from.md +++ b/doc/cli/nmo-replicate-from.md @@ -21,4 +21,4 @@ This will replicate the database `hello-database` from the cluster `mycluster` t nmo replicate-from mycluster hello-database http://192.0.0.1/hello-database-replicated --create-target --continuous This will replicate the database `hello-database` from the url `http://my-couchdb-cluster.com` to the supplied url - nmo replicate-from http://my-couchdb-cluster hello-database http://192.0.0.1/hello-database-replicated + nmo replicate-from http://my-couchdb-cluster.com hello-database http://192.0.0.1/hello-database-replicated http://git-wip-us.apache.org/repos/asf/couchdb-nmo/blob/89c18c06/doc/cli/nmo-replicate-to.md ---------------------------------------------------------------------- diff --git a/doc/cli/nmo-replicate-to.md b/doc/cli/nmo-replicate-to.md new file mode 100644 index 0000000..9549eb3 --- /dev/null +++ b/doc/cli/nmo-replicate-to.md @@ -0,0 +1,24 @@ +nmo-replicate-to(1) -- replicate a database to the cluster from another CouchDB database url +=========================================== + +## SYNOPSIS + + nmo replicate-to <cluster> <databasename> <url/dbname> [--continuous] [--create-target] [--json] + nmo replicate-to <url> <databasename> <url/dbname> [--continuous] [--create-target] [--json] + + +## DESCRIPTION + +Replicate a database to the `cluster` from the supplied CouchDB instance url and database. Or it will replicate from a CouchDB url and database to the supplied CouchDB instance url and database. + + +Example: + +This will replicate the database `hello-database` from the url to database `hlloe-database-replicated` in cluster `mycluster`. + nmo replicate-to mycluster hello-database-replicated http://192.0.0.1/hello-database + +This will replicate the database `hello-database` to the cluster `mycluster` and create the database and make it a continuous replication + nmo replicate-to mycluster hello-database-replicated http://192.0.0.1/hello-database --create-target --continuous + +This will replicate the database `hello-database` to the url `http://my-couchdb-cluster.com` from the supplied url + nmo replicate-to http://my-couchdb-cluster hello-database-replicated http://192.0.0.1/hello-database http://git-wip-us.apache.org/repos/asf/couchdb-nmo/blob/89c18c06/doc/cli/replicate-to.md ---------------------------------------------------------------------- diff --git a/doc/cli/replicate-to.md b/doc/cli/replicate-to.md deleted file mode 100644 index 7dcaa3f..0000000 --- a/doc/cli/replicate-to.md +++ /dev/null @@ -1,24 +0,0 @@ -nmo-replicate-to(1) -- replicate a database to the cluster from another CouchDB database url -=========================================== - -## SYNOPSIS - - nmo replicate-to <cluster> <databasename> <url/dbname> [--continuous] [--create-target] [--json] - nmo replicate-to <url> <databasename> <url/dbname> [--continuous] [--create-target] [--json] - - -## DESCRIPTION - -Replicate a database to the `cluster` from the supplied CouchDB instance url and database. Or it will replicate from a CouchDB url and database to the supplied CouchDB instance url and database. - - -Example: - -This will replicate the database `hello-database` from the url to database `hlloe-database-replicated` in cluster `mycluster`. - nmo replicate-to mycluster hello-database-replicated http://192.0.0.1/hello-database - -This will replicate the database `hello-database` to the cluster `mycluster` and create the database and make it a continuous replication - nmo replicate-to mycluster hello-database-replicated http://192.0.0.1/hello-database --create-target --continuous - -This will replicate the database `hello-database` to the url `http://my-couchdb-cluster.com` from the supplied url - nmo replicate-from http://my-couchdb-cluster hello-database-replicated http://192.0.0.1/hello-database http://git-wip-us.apache.org/repos/asf/couchdb-nmo/blob/89c18c06/src/replicate-to.js ---------------------------------------------------------------------- diff --git a/src/replicate-to.js b/src/replicate-to.js index 3841c0d..a58f97b 100644 --- a/src/replicate-to.js +++ b/src/replicate-to.js @@ -19,7 +19,7 @@ export function cli (cluster, dbname, url) { return reject(err); } - replicateTo(cluster, dbname, url) + replicateto(cluster, dbname, url) .then(resp => { console.log('Replication started.'); resolve(resp); @@ -31,7 +31,7 @@ export function cli (cluster, dbname, url) { }); } -export default function replicateTo(cluster, dbname, url) { +export default function replicateto(cluster, dbname, url) { return new Promise((resolve, reject) => { const clusterUrl = getUrlFromCluster(cluster); const replicatorUrl = clusterUrl + '/_replicator'; http://git-wip-us.apache.org/repos/asf/couchdb-nmo/blob/89c18c06/test/replicate-from.js ---------------------------------------------------------------------- diff --git a/test/replicate-from.js b/test/replicate-from.js index 2f33a0e..f0e24a7 100644 --- a/test/replicate-from.js +++ b/test/replicate-from.js @@ -1,7 +1,7 @@ import assert from 'assert'; import Lab from 'lab'; -import replicateFrom, {cli } from '../src/replicate-from.js'; +import { cli } from '../src/replicate-from.js'; import * as common from './common.js'; import nmo from '../src/nmo.js'; http://git-wip-us.apache.org/repos/asf/couchdb-nmo/blob/89c18c06/test/replicate-to.js ---------------------------------------------------------------------- diff --git a/test/replicate-to.js b/test/replicate-to.js index aac29d3..6cfee18 100644 --- a/test/replicate-to.js +++ b/test/replicate-to.js @@ -1,7 +1,7 @@ import assert from 'assert'; import Lab from 'lab'; -import replicateTo, {cli } from '../src/replicate-to.js'; +import { cli } from '../src/replicate-to.js'; import * as common from './common.js'; import nmo from '../src/nmo.js'; @@ -14,7 +14,7 @@ const nmoconf = {nmoconf: __dirname + '/fixtures/randomini'}; common.createConfigFile(); -lab.experiment('replicate-from', () => { +lab.experiment('replicate-to', () => { lab.experiment('cli', () => { lab.beforeEach((done) => {
