From 30e81cf01514a6d3d34d4103dbdc4c61a0deb798 Mon Sep 17 00:00:00 2001
From: Samuel Galson <samgalson@gmail.com>
Date: Mon, 23 Oct 2017 17:57:41 +0100
Subject: [PATCH] remove option to add collection with setupdb
---
README.md | 3 +-
package.json | 4 +-
src/schemas/db.js | 3 -
test/cli/setupdb.js | 3 +-
test/integration.js | 3 +-
yarn.lock | 237 +++++++++++++++++++++++++++++++++++++-------
6 files changed, 208 insertions(+), 45 deletions(-)
diff --git a/README.md b/README.md
index 744283061..15cbbd6be 100644
--- a/README.md
+++ b/README.md
@@ -178,8 +178,7 @@ The command will prompt you with a series of questions to customise your app. If
pubsweet setupdb
--username someuser \
--email some@email.com \
- --password correct-horse-battery-staple \
- --collection Articles
+ --password correct-horse-battery-staple
```
### Running your app (`pubsweet start`)
diff --git a/package.json b/package.json
index 21700376b..0552ffeb0 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
"author": "Collaborative Knowledge Foundation",
"license": "MIT",
"dependencies": {
- "@pubsweet/db-manager": "^0.0.4",
+ "@pubsweet/db-manager": "^0.0.7",
"@pubsweet/logger": "^0.0.1",
"bluebird": "^3.5.0",
"colors": "^1.1.2",
@@ -44,10 +44,10 @@
"devDependencies": {
"@pubsweet/starter": "git+https://gitlab.coko.foundation/pubsweet/pubsweet-starter.git",
"eslint": "^4.8.0",
+ "eslint-config-standard": "^10.2.1",
"eslint-plugin-import": "^2.7.0",
"eslint-plugin-node": "^5.2.0",
"eslint-plugin-promise": "^3.5.0",
- "eslint-config-standard": "^10.2.1",
"eslint-plugin-standard": "^3.0.1",
"jest": "^21.0.0",
"nsp": "^2.8.1"
diff --git a/src/schemas/db.js b/src/schemas/db.js
index e20710695..69c825877 100644
--- a/src/schemas/db.js
+++ b/src/schemas/db.js
@@ -10,9 +10,6 @@ module.exports = {
hidden: true,
replace: '*'
},
- collection: {
- description: 'Initial collection title (optional)'
- },
clobber: {
type: 'boolean',
description: 'Overwrite any pre-existing database',
diff --git a/test/cli/setupdb.js b/test/cli/setupdb.js
index 7b6676cba..ce55424b8 100644
--- a/test/cli/setupdb.js
+++ b/test/cli/setupdb.js
@@ -8,8 +8,7 @@ const setupDbSpy = require('@pubsweet/db-manager').setupDb
const dbOpts = {
username: 'anotheruser',
email: 'bar@example.com',
- password: '12345',
- collection: 'entries'
+ password: '12345'
}
describe('setupdb', () => {
diff --git a/test/integration.js b/test/integration.js
index c2ebdbe9b..ed6f396f7 100644
--- a/test/integration.js
+++ b/test/integration.js
@@ -22,8 +22,7 @@ const nodeConfig = {
const dbOptions = {
username: 'someuser',
email: 'user@test.com',
- password: '12345678',
- collection: 'entries'
+ password: '12345678'
}
/* These tests run "pubsweet" commands as child processes with no mocking */
diff --git a/yarn.lock b/yarn.lock
index 3715da1ff..516158658 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13,6 +13,17 @@
pouchdb "^6.3.4"
pubsweet-server "git+https://gitlab.coko.foundation/pubsweet/pubsweet-server.git"
+"@pubsweet/db-manager@^0.0.7":
+ version "0.0.7"
+ resolved "https://registry.yarnpkg.com/@pubsweet/db-manager/-/db-manager-0.0.7.tgz#5107eb0dc1291771b873288f0f42db08f237dec2"
+ dependencies:
+ "@pubsweet/logger" "0.0.1"
+ fs-extra "^4.0.2"
+ isomorphic-fetch "^2.2.1"
+ joi "^11.0.2"
+ pouchdb "^6.3.4"
+ pubsweet-server "^1.0.0-beta.2"
+
"@pubsweet/logger@0.0.1", "@pubsweet/logger@^0.0.1":
version "0.0.1"
resolved "https://registry.yarnpkg.com/@pubsweet/logger/-/logger-0.0.1.tgz#ec0c15f04e0c64232c29173848ffe6da8190c9c2"
@@ -119,7 +130,7 @@ ajv-keywords@^1.1.1:
version "1.5.1"
resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.5.1.tgz#314dd0a4b3368fad3dfcdc54ede6171b886daf3c"
-ajv-keywords@^2.1.0:
+ajv-keywords@^2.0.0, ajv-keywords@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.0.tgz#a296e17f7bfae7c1ce4f7e0de53d29cb32162df0"
@@ -139,6 +150,15 @@ ajv@^5.1.0, ajv@^5.2.0, ajv@^5.2.3:
json-schema-traverse "^0.3.0"
json-stable-stringify "^1.0.1"
+ajv@^5.1.5:
+ version "5.2.4"
+ resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.2.4.tgz#3daf9a8b67221299fdae8d82d117ed8e6c80244b"
+ dependencies:
+ co "^4.6.0"
+ fast-deep-equal "^1.0.0"
+ json-schema-traverse "^0.3.0"
+ json-stable-stringify "^1.0.1"
+
align-text@^0.1.1, align-text@^0.1.3:
version "0.1.4"
resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"
@@ -571,7 +591,7 @@ block-stream@*:
dependencies:
inherits "~2.0.0"
-bluebird@^3.5.0:
+bluebird@^3.5.0, bluebird@^3.5.1:
version "3.5.1"
resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9"
@@ -1488,7 +1508,7 @@ end-stream@~0.1.0:
dependencies:
write-stream "~0.4.3"
-enhanced-resolve@^3.3.0:
+enhanced-resolve@^3.3.0, enhanced-resolve@^3.4.0:
version "3.4.1"
resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-3.4.1.tgz#0421e339fd71419b3da13d129b3979040230476e"
dependencies:
@@ -1561,10 +1581,25 @@ es5-ext@^0.10.14, es5-ext@^0.10.9, es5-ext@~0.10.14:
es6-iterator "~2.0.1"
es6-symbol "~3.1.1"
+es5-ext@^0.10.35:
+ version "0.10.35"
+ resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.35.tgz#18ee858ce6a3c45c7d79e91c15fcca9ec568494f"
+ dependencies:
+ es6-iterator "~2.0.1"
+ es6-symbol "~3.1.1"
+
es6-error@^4.0.0:
version "4.0.2"
resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.0.2.tgz#eec5c726eacef51b7f6b73c20db6e1b13b069c98"
+es6-iterator@^2.0.1:
+ version "2.0.3"
+ resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7"
+ dependencies:
+ d "1"
+ es5-ext "^0.10.35"
+ es6-symbol "^3.1.1"
+
es6-iterator@~2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.1.tgz#8e319c9f0453bf575d374940a655920e59ca5512"
@@ -1573,13 +1608,43 @@ es6-iterator@~2.0.1:
es5-ext "^0.10.14"
es6-symbol "^3.1"
-es6-symbol@^3.0.2, es6-symbol@^3.1, es6-symbol@~3.1.1:
+es6-map@^0.1.3:
+ version "0.1.5"
+ resolved "https://registry.yarnpkg.com/es6-map/-/es6-map-0.1.5.tgz#9136e0503dcc06a301690f0bb14ff4e364e949f0"
+ dependencies:
+ d "1"
+ es5-ext "~0.10.14"
+ es6-iterator "~2.0.1"
+ es6-set "~0.1.5"
+ es6-symbol "~3.1.1"
+ event-emitter "~0.3.5"
+
+es6-set@~0.1.5:
+ version "0.1.5"
+ resolved "https://registry.yarnpkg.com/es6-set/-/es6-set-0.1.5.tgz#d2b3ec5d4d800ced818db538d28974db0a73ccb1"
+ dependencies:
+ d "1"
+ es5-ext "~0.10.14"
+ es6-iterator "~2.0.1"
+ es6-symbol "3.1.1"
+ event-emitter "~0.3.5"
+
+es6-symbol@3.1.1, es6-symbol@^3.0.2, es6-symbol@^3.1, es6-symbol@^3.1.1, es6-symbol@~3.1.1:
version "3.1.1"
resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"
dependencies:
d "1"
es5-ext "~0.10.14"
+es6-weak-map@^2.0.1:
+ version "2.0.2"
+ resolved "https://registry.yarnpkg.com/es6-weak-map/-/es6-weak-map-2.0.2.tgz#5e3ab32251ffd1538a1f8e5ffa1357772f92d96f"
+ dependencies:
+ d "1"
+ es5-ext "^0.10.14"
+ es6-iterator "^2.0.1"
+ es6-symbol "^3.1.1"
+
escape-html@~1.0.3:
version "1.0.3"
resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
@@ -1599,6 +1664,15 @@ escodegen@^1.6.1:
optionalDependencies:
source-map "~0.5.6"
+escope@^3.6.0:
+ version "3.6.0"
+ resolved "https://registry.yarnpkg.com/escope/-/escope-3.6.0.tgz#e01975e812781a163a6dadfdd80398dc64c889c3"
+ dependencies:
+ es6-map "^0.1.3"
+ es6-weak-map "^2.0.1"
+ esrecurse "^4.1.0"
+ estraverse "^4.1.1"
+
eslint-config-standard@^10.2.1:
version "10.2.1"
resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-10.2.1.tgz#c061e4d066f379dc17cd562c64e819b4dd454591"
@@ -1754,6 +1828,13 @@ etag@~1.8.1:
version "1.8.1"
resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
+event-emitter@~0.3.5:
+ version "0.3.5"
+ resolved "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39"
+ dependencies:
+ d "1"
+ es5-ext "~0.10.14"
+
event-source-polyfill@^0.0.9:
version "0.0.9"
resolved "https://registry.yarnpkg.com/event-source-polyfill/-/event-source-polyfill-0.0.9.tgz#18c6205d170ab09db889ffceaa33f0e493f14a50"
@@ -3501,6 +3582,14 @@ loader-utils@^0.2.16:
json5 "^0.5.0"
object-assign "^4.0.1"
+loader-utils@^1.1.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd"
+ dependencies:
+ big.js "^3.1.3"
+ emojis-list "^2.0.0"
+ json5 "^0.5.0"
+
locate-path@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
@@ -4427,10 +4516,6 @@ pkginfo@0.3.x:
version "0.3.1"
resolved "https://registry.yarnpkg.com/pkginfo/-/pkginfo-0.3.1.tgz#5b29f6a81f70717142e09e765bbeab97b4f81e21"
-pkginfo@0.x.x:
- version "0.4.1"
- resolved "https://registry.yarnpkg.com/pkginfo/-/pkginfo-0.4.1.tgz#b5418ef0439de5425fc4995042dced14fb2a84ff"
-
platform@1.3.4:
version "1.3.4"
resolved "https://registry.yarnpkg.com/platform/-/platform-1.3.4.tgz#6f0fb17edaaa48f21442b3a975c063130f1c3ebd"
@@ -4773,18 +4858,7 @@ promise@^7.1.1:
dependencies:
asap "~2.0.3"
-prompt@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/prompt/-/prompt-1.0.0.tgz#8e57123c396ab988897fb327fd3aedc3e735e4fe"
- dependencies:
- colors "^1.1.2"
- pkginfo "0.x.x"
- read "1.0.x"
- revalidator "0.1.x"
- utile "0.3.x"
- winston "2.1.x"
-
-prompt@flatiron/prompt#1c95d1d8d333b5fbc13fa5f0619f3dcf0d514f87:
+prompt@^1.0.0, prompt@flatiron/prompt#1c95d1d8d333b5fbc13fa5f0619f3dcf0d514f87:
version "1.0.0"
resolved "https://codeload.github.com/flatiron/prompt/tar.gz/1c95d1d8d333b5fbc13fa5f0619f3dcf0d514f87"
dependencies:
@@ -5034,6 +5108,45 @@ pubsweet-server@1.0.0-alpha.4, pubsweet-server@^1.0.0-alpha.3, "pubsweet-server@
uuid "^3.0.1"
winston "^2.2.0"
+pubsweet-server@^1.0.0-beta.2:
+ version "1.0.0-beta.2"
+ resolved "https://registry.yarnpkg.com/pubsweet-server/-/pubsweet-server-1.0.0-beta.2.tgz#d22165460cd71007ad195207bdbcdcd9e4d327a1"
+ dependencies:
+ "@pubsweet/logger" "^0.0.1"
+ authsome "0.0.9"
+ bcrypt "^1.0.2"
+ bluebird "^3.5.1"
+ body-parser "^1.15.2"
+ colors "^1.1.2"
+ config "^1.26.2"
+ cookie-parser "^1.4.3"
+ dotenv "^4.0.0"
+ express "^4.16.1"
+ helmet "^3.8.1"
+ http-status-codes "^1.0.6"
+ joi "^10.0.6"
+ jsonwebtoken "^7.1.7"
+ lodash "^4.0.0"
+ minimist "^1.2.0"
+ morgan "^1.8.2"
+ multer "^1.1.0"
+ passport "^0.3.2"
+ passport-anonymous "^1.0.1"
+ passport-http-bearer "^1.0.1"
+ passport-local "^1.0.0"
+ pouchdb-adapter-http "^6.2.0"
+ pouchdb-adapter-leveldb "^6.1.1"
+ pouchdb-adapter-memory "^6.1.1"
+ pouchdb-core "^6.1.1"
+ pouchdb-find "^0.10.3"
+ pouchdb-upsert "^2.0.0"
+ promise-queue "^2.2.3"
+ prompt "^1.0.0"
+ pubsweet-sse "^0.1.1"
+ relational-pouch "^1.4.5"
+ uuid "^3.0.1"
+ winston "^2.2.0"
+
pubsweet-sse@^0.1.1:
version "0.1.3"
resolved "https://registry.yarnpkg.com/pubsweet-sse/-/pubsweet-sse-0.1.3.tgz#a185e81e270ef3b1132cae12959c1ac430a6ae03"
@@ -5982,6 +6095,12 @@ supports-color@^4.0.0:
dependencies:
has-flag "^2.0.0"
+supports-color@^4.2.1:
+ version "4.5.0"
+ resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.5.0.tgz#be7a0de484dec5c5cddf8b3d59125044912f635b"
+ dependencies:
+ has-flag "^2.0.0"
+
symbol-observable@^1.0.3:
version "1.0.4"
resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.4.tgz#29bf615d4aa7121bdd898b22d4b3f9bc4e2aa03d"
@@ -6272,7 +6391,7 @@ ua-parser-js@^0.7.9:
version "0.7.14"
resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.14.tgz#110d53fa4c3f326c121292bbeac904d2e03387ca"
-uglify-js@^2.6, uglify-js@^2.8.27:
+uglify-js@^2.6, uglify-js@^2.8.27, uglify-js@^2.8.29:
version "2.8.29"
resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd"
dependencies:
@@ -6285,6 +6404,14 @@ uglify-to-browserify@~1.0.0:
version "1.0.2"
resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
+uglifyjs-webpack-plugin@^0.4.6:
+ version "0.4.6"
+ resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-0.4.6.tgz#b951f4abb6bd617e66f63eb891498e391763e309"
+ dependencies:
+ source-map "^0.5.6"
+ uglify-js "^2.8.29"
+ webpack-sources "^1.0.1"
+
uid-number@^0.0.6:
version "0.0.6"
resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81"
@@ -6430,7 +6557,7 @@ watch@~0.18.0:
exec-sh "^0.2.0"
minimist "^1.2.0"
-watchpack@^1.3.1:
+watchpack@^1.3.1, watchpack@^1.4.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.4.0.tgz#4a1472bcbb952bd0a9bb4036801f954dfb39faac"
dependencies:
@@ -6465,6 +6592,15 @@ webpack-hot-middleware@^2.19.1:
querystring "^0.2.0"
strip-ansi "^3.0.0"
+webpack-hot-middleware@^2.20.0:
+ version "2.20.0"
+ resolved "https://registry.yarnpkg.com/webpack-hot-middleware/-/webpack-hot-middleware-2.20.0.tgz#cb896d837758b6408fe0afeeafdc0e5316b15319"
+ dependencies:
+ ansi-html "0.0.7"
+ html-entities "^1.2.0"
+ querystring "^0.2.0"
+ strip-ansi "^3.0.0"
+
webpack-sources@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.0.1.tgz#c7356436a4d13123be2e2426a05d1dad9cbe65cf"
@@ -6498,6 +6634,33 @@ webpack@^2.3.2:
webpack-sources "^1.0.1"
yargs "^6.0.0"
+webpack@^3.8.1:
+ version "3.8.1"
+ resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.8.1.tgz#b16968a81100abe61608b0153c9159ef8bb2bd83"
+ dependencies:
+ acorn "^5.0.0"
+ acorn-dynamic-import "^2.0.0"
+ ajv "^5.1.5"
+ ajv-keywords "^2.0.0"
+ async "^2.1.2"
+ enhanced-resolve "^3.4.0"
+ escope "^3.6.0"
+ interpret "^1.0.0"
+ json-loader "^0.5.4"
+ json5 "^0.5.1"
+ loader-runner "^2.3.0"
+ loader-utils "^1.1.0"
+ memory-fs "~0.4.1"
+ mkdirp "~0.5.0"
+ node-libs-browser "^2.0.0"
+ source-map "^0.5.3"
+ supports-color "^4.2.1"
+ tapable "^0.2.7"
+ uglifyjs-webpack-plugin "^0.4.6"
+ watchpack "^1.4.0"
+ webpack-sources "^1.0.1"
+ yargs "^8.0.2"
+
whatwg-encoding@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.1.tgz#3c6c451a198ee7aec55b1ec61d0920c67801a5f4"
@@ -6566,18 +6729,6 @@ winston@0.8.x:
pkginfo "0.3.x"
stack-trace "0.0.x"
-winston@2.1.x:
- version "2.1.1"
- resolved "https://registry.yarnpkg.com/winston/-/winston-2.1.1.tgz#3c9349d196207fd1bdff9d4bc43ef72510e3a12e"
- dependencies:
- async "~1.0.0"
- colors "1.0.x"
- cycle "1.0.x"
- eyes "0.1.x"
- isstream "0.1.x"
- pkginfo "0.3.x"
- stack-trace "0.0.x"
-
winston@2.x, winston@^2.2.0:
version "2.4.0"
resolved "https://registry.yarnpkg.com/winston/-/winston-2.4.0.tgz#808050b93d52661ed9fb6c26b3f0c826708b0aee"
@@ -6696,6 +6847,24 @@ yargs@^6.0.0:
y18n "^3.2.1"
yargs-parser "^4.2.0"
+yargs@^8.0.2:
+ version "8.0.2"
+ resolved "https://registry.yarnpkg.com/yargs/-/yargs-8.0.2.tgz#6299a9055b1cefc969ff7e79c1d918dceb22c360"
+ dependencies:
+ camelcase "^4.1.0"
+ cliui "^3.2.0"
+ decamelize "^1.1.1"
+ get-caller-file "^1.0.1"
+ os-locale "^2.0.0"
+ read-pkg-up "^2.0.0"
+ require-directory "^2.1.1"
+ require-main-filename "^1.0.1"
+ set-blocking "^2.0.0"
+ string-width "^2.0.0"
+ which-module "^2.0.0"
+ y18n "^3.2.1"
+ yargs-parser "^7.0.0"
+
yargs@^9.0.0:
version "9.0.1"
resolved "https://registry.yarnpkg.com/yargs/-/yargs-9.0.1.tgz#52acc23feecac34042078ee78c0c007f5085db4c"
--
GitLab