Merge 0bced13 into 0d0b859

feedhenry-raincatcher · Aug 28, 2017 · 83c0f81 · 83c0f81
2 parents 0d0b859 + 0bced13
commit 83c0f81
Show file tree

Hide file tree

Showing 43 changed files with 216 additions and 53 deletions.
diff --git a/.gitignore b/.gitignore
@@ -65,3 +65,6 @@ typings/
 
 # typedoc generated docs
 docs/
+
+npm-shrinkwrap.json
+package-lock.json
diff --git a/README.md b/README.md
@@ -150,20 +150,21 @@ We recommend users to write their code in TypeScript, especially if their new Ra
 
 See the example on [examples/js]() for more information also for reusing the unit test suites from JavaScript code.
 
-### Publishing modules
-
-Before publishing the typescript modules, do a manual compilation step via `npm run build` on the root of the repository.
-
 ### Repository commands
 
- `npm run test` - run unit tests
-
- `npm run bootstrap` - perform boostrap for all modules
-
- `npm run start` - run top level applications
+- `npm run test` - run unit tests
+- `npm run bootstrap` - perform boostrap for all modules
+- `npm run start` - run top level applications
+- `npm run lint` - execute tslint for all modules
+- `npm run build` - execute the build command for all modules, compiling TypeScript sources to JavaScript
+- `npm run cleanInstall` - perform install without executing additional scripts
 
- `npm run lint` - execute tslint for all modules
+#### Publishing
 
- `npm run build` - execute the build command for all modules, compiling TypeScript sources to JavaScript
+The repository also includes a set of commands for publishing both the standalone modules and the contained applications.
 
- `npm run cleanInstall` - perform install without executing additional scripts
+- `npm run publish:prepare` - builds TS sources and setups dependencies for publishing packages
+- `npm run publish:test` - runs a test of publishing packages to a local npm registry via the [Verdaccio](https://github.com/verdaccio/verdaccio) project
+- `npm run publish:full` - prepares packages and tries to publish to the public registry, requires human input for confirming the version bumps, see the [lerna publish](https://github.com/lerna/lerna#publish) documentation for more information.
+- `npm run publish:dry` - does a dry-run of the publish scripts for local test purposes, avoiding any permanent changes to git history or npm registries
+- `npm run publish:demo-server` - publishes the `demo/server` application to the feedhenry-templates repository as part of the project's inclusion in the [Red Hat Mobile Application Platform](https://www.redhat.com/en/technologies/mobile/application-platform)
diff --git a/client/datasync-client/.npmignore b/client/datasync-client/.npmignore
@@ -0,0 +1 @@
+test/
diff --git a/client/datasync-client/package.json b/client/datasync-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@raincatcher/datasync-client",
-  "version": "1.0.0",
+  "version": "0.0.1",
   "description": "Raincatcher datasync client wrapper for TypeScript",
   "types": "src/index.ts",
   "main": "src/",
@@ -53,7 +53,7 @@
     "typescript": "^2.5.0"
   },
   "dependencies": {
-    "@raincatcher/logger": "1.0.0",
+    "@raincatcher/logger": "0.0.1",
     "fh-sync-js": "^1.0.3",
     "lodash": "^4.17.4"
   }

diff --git a/client/logger b/client/logger
diff --git a/client/wfm/.npmignore b/client/wfm/.npmignore
@@ -0,0 +1 @@
+test/
diff --git a/client/wfm/package.json b/client/wfm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@raincatcher/wfm",
-  "version": "1.0.0",
+  "version": "0.0.1",
   "description": "Set of WorkForce Management tools",
   "types": "src/index.ts",
   "author": "feedhenry-raincatcher@redhat.com",
@@ -38,13 +38,13 @@
   },
   "devDependencies": {
     "@types/bluebird": "^3.5.8",
+    "@types/chai": "^4.0.3",
+    "@types/chai-as-promised": "0.0.31",
     "@types/lodash": "^4.14.73",
     "@types/mocha": "^2.2.41",
+    "@types/node": "^8.0.7",
     "@types/shortid": "0.0.29",
     "@types/valid-url": "^1.0.2",
-    "@types/node": "^8.0.7",
-    "@types/chai": "^4.0.3",
-    "@types/chai-as-promised": "0.0.31",
     "del-cli": "^1.1.0",
     "mocha": "^3.5.0",
     "nyc": "^11.1.0",

diff --git a/cloud/auth/.npmignore b/cloud/auth/.npmignore
@@ -0,0 +1 @@
+test/
diff --git a/cloud/auth/package.json b/cloud/auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@raincatcher/express-auth",
-  "version": "1.0.0",
+  "version": "0.0.1",
   "description": "Authentication interface for express based applications",
   "types": "src/index.ts",
   "author": "feedhenry-raincatcher@redhat.com",

diff --git a/cloud/datasync/.npmignore b/cloud/datasync/.npmignore
@@ -0,0 +1 @@
+test/
diff --git a/cloud/datasync/package.json b/cloud/datasync/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@raincatcher/datasync-cloud",
-  "version": "1.0.0",
+  "version": "0.0.1",
   "description": "Raincatcher DataSync cloud",
   "types": "src/index.ts",
   "main": "src/",
@@ -32,14 +32,14 @@
     "branches": 50
   },
   "devDependencies": {
-    "@raincatcher/logger": "1.0.0",
+    "@raincatcher/logger": "0.0.1",
     "@types/body-parser": "^1.16.4",
     "@types/cors": "^2.8.1",
     "@types/express": "^4.0.36",
     "@types/mocha": "^2.2.41",
+    "@types/mongodb": "^2.2.10",
     "@types/node": "^8.0.7",
     "@types/proxyquire": "^1.3.27",
-    "@types/mongodb": "^2.2.10",
     "del-cli": "^1.1.0",
     "mocha": "^3.5.0",
     "nyc": "^11.1.0",

diff --git a/cloud/passportauth/.npmignore b/cloud/passportauth/.npmignore
@@ -0,0 +1 @@
+test/
diff --git a/cloud/passportauth/package.json b/cloud/passportauth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@raincatcher/auth-passport",
-  "version": "1.0.0",
+  "version": "0.0.1",
   "description": "Passport authentication module",
   "types": "src/index.ts",
   "author": "feedhenry-raincatcher@redhat.com",
@@ -34,7 +34,7 @@
     "branches": 80
   },
   "devDependencies": {
-    "@raincatcher/logger": "1.0.0",
+    "@raincatcher/logger": "0.0.1",
     "@types/body-parser": "^1.16.4",
     "@types/cors": "^2.8.1",
     "@types/express": "^4.0.36",
@@ -53,7 +53,7 @@
     "typescript": "^2.5.0"
   },
   "dependencies": {
-    "@raincatcher/express-auth": "1.0.0",
+    "@raincatcher/express-auth": "0.0.1",
     "body-parser": "^1.17.2",
     "cors": "^2.8.4",
     "express": "^4.15.4",

diff --git a/cloud/wfm-demo-data/package.json b/cloud/wfm-demo-data/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@raincatcher/wfm-demo-data",
-  "version": "1.0.0",
+  "version": "0.0.1",
   "description": "Example seed data for the RainCatcher project",
   "types": "src/index.ts",
   "author": "feedhenry-raincatcher@redhat.com",
@@ -32,16 +32,16 @@
     "branches": 80
   },
   "dependencies": {
-    "@raincatcher/logger": "1.0.0",
-    "@raincatcher/wfm": "1.0.0",
-    "@raincatcher/wfm-user": "1.0.0",
+    "@raincatcher/logger": "0.0.1",
+    "@raincatcher/wfm": "0.0.1",
+    "@raincatcher/wfm-user": "0.0.1",
     "bluebird": "^3.5.0",
     "mongodb": "^2.2.31"
   },
   "devDependencies": {
-    "@types/mongodb": "^2.2.10",
     "@types/bluebird": "^3.5.8",
     "@types/mocha": "^2.2.41",
+    "@types/mongodb": "^2.2.10",
     "del-cli": "^1.1.0",
     "mocha": "^3.5.0",
     "nyc": "^11.1.0",
@@ -50,4 +50,3 @@
     "typescript": "^2.5.0"
   }
 }
-
diff --git a/cloud/wfm-rest-api/.npmignore b/cloud/wfm-rest-api/.npmignore
@@ -0,0 +1 @@
+test/
diff --git a/cloud/wfm-rest-api/package.json b/cloud/wfm-rest-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@raincatcher/wfm-rest-api",
-  "version": "1.0.0",
+  "version": "0.0.1",
   "description": "Module used for building a RESTful api on top of the WFM solution",
   "types": "src/index.ts",
   "author": "feedhenry-raincatcher@redhat.com",
@@ -33,8 +33,8 @@
     "branches": 70
   },
   "dependencies": {
-    "@raincatcher/logger": "1.0.0",
-    "@raincatcher/wfm": "1.0.0",
+    "@raincatcher/logger": "0.0.1",
+    "@raincatcher/wfm": "0.0.1",
     "bluebird": "^3.5.0",
     "express": "^4.15.4",
     "lodash": "^4.17.4",

diff --git a/cloud/wfm-user/.npmignore b/cloud/wfm-user/.npmignore
@@ -0,0 +1 @@
+test/
diff --git a/cloud/wfm-user/package.json b/cloud/wfm-user/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@raincatcher/wfm-user",
-  "version": "1.0.0",
+  "version": "0.0.1",
   "description": "Module responsible for user management",
   "types": "src/index.ts",
   "author": "feedhenry-raincatcher@redhat.com",
@@ -52,8 +52,8 @@
     "typescript": "^2.5.0"
   },
   "dependencies": {
-    "@raincatcher/wfm-rest-api": "1.0.0",
-    "@raincatcher/logger": "1.0.0",
+    "@raincatcher/logger": "0.0.1",
+    "@raincatcher/wfm-rest-api": "0.0.1",
     "bluebird": "^3.5.0",
     "express": "^4.15.4"
   }

diff --git a/cloud/logger/.gitignore → common/logger/.gitignore b/cloud/logger/.gitignore → common/logger/.gitignore
diff --git a/common/logger/.npmignore b/common/logger/.npmignore
@@ -0,0 +1 @@
+test/
diff --git a/cloud/logger/README.md → common/logger/README.md b/cloud/logger/README.md → common/logger/README.md
diff --git a/cloud/logger/example/index.ts → common/logger/example/index.ts b/cloud/logger/example/index.ts → common/logger/example/index.ts
diff --git a/cloud/logger/package.json → common/logger/package.json b/cloud/logger/package.json → common/logger/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@raincatcher/logger",
-  "version": "1.0.0",
+  "version": "0.0.1",
   "description": "Logger facade used by RainCatcher modules",
   "types": "src/index.ts",
   "author": "feedhenry-raincatcher@redhat.com",

diff --git a/cloud/logger/src/BunyanLogger.ts → common/logger/src/BunyanLogger.ts b/cloud/logger/src/BunyanLogger.ts → common/logger/src/BunyanLogger.ts
diff --git a/cloud/logger/src/ClientLogger.ts → common/logger/src/ClientLogger.ts b/cloud/logger/src/ClientLogger.ts → common/logger/src/ClientLogger.ts
diff --git a/cloud/logger/src/Logger.ts → common/logger/src/Logger.ts b/cloud/logger/src/Logger.ts → common/logger/src/Logger.ts
diff --git a/cloud/logger/src/index.ts → common/logger/src/index.ts b/cloud/logger/src/index.ts → common/logger/src/index.ts
diff --git a/cloud/logger/test/BunyanLogger.ts → common/logger/test/BunyanLogger.ts b/cloud/logger/test/BunyanLogger.ts → common/logger/test/BunyanLogger.ts
diff --git a/cloud/logger/test/ClientLogger.ts → common/logger/test/ClientLogger.ts b/cloud/logger/test/ClientLogger.ts → common/logger/test/ClientLogger.ts
diff --git a/cloud/logger/test/Logger.ts → common/logger/test/Logger.ts b/cloud/logger/test/Logger.ts → common/logger/test/Logger.ts
diff --git a/cloud/logger/test/mocha.opts → common/logger/test/mocha.opts b/cloud/logger/test/mocha.opts → common/logger/test/mocha.opts
diff --git a/cloud/logger/tsconfig.json → common/logger/tsconfig.json b/cloud/logger/tsconfig.json → common/logger/tsconfig.json
diff --git a/demo/data/.gitignore b/demo/data/.gitignore
@@ -0,0 +1,6 @@
+# generated code
+src/**/*.js
+src/**/*.map
+test/**/*.js
+test/**/*.map
+coverage_report/
diff --git a/demo/data/.npmignore b/demo/data/.npmignore
@@ -0,0 +1 @@
+test/
diff --git a/demo/server/.npmignore b/demo/server/.npmignore
@@ -0,0 +1 @@
+test/
diff --git a/demo/server/package.json b/demo/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@raincatcher/demo-server",
-  "version": "1.0.0",
+  "version": "0.0.1",
   "description": "Raincatcher demo application server using express",
   "types": "src/index.ts",
   "main": "src/index.ts",
@@ -35,7 +35,7 @@
     "branches": 70
   },
   "devDependencies": {
-    "@raincatcher/logger": "1.0.0",
+    "@raincatcher/logger": "0.0.1",
     "@types/bluebird": "^3.5.8",
     "@types/body-parser": "^1.16.4",
     "@types/cookie-parser": "^1.4.0",
@@ -57,13 +57,13 @@
     "typescript": "^2.5.0"
   },
   "dependencies": {
-    "@raincatcher/auth-passport": "1.0.0",
-    "@raincatcher/datasync-cloud": "1.0.0",
-    "@raincatcher/logger": "1.0.0",
-    "@raincatcher/wfm-rest-api": "1.0.0",
-    "@raincatcher/wfm-user": "1.0.0",
-    "@raincatcher/express-auth": "1.0.0",
-    "@raincatcher/wfm-demo-data": "1.0.0",
+    "@raincatcher/auth-passport": "0.0.1",
+    "@raincatcher/datasync-cloud": "0.0.1",
+    "@raincatcher/wfm-demo-data": "0.0.1",
+    "@raincatcher/logger": "0.0.1",
+    "@raincatcher/wfm-rest-api": "0.0.1",
+    "@raincatcher/wfm-user": "0.0.1",
+    "@raincatcher/express-auth": "0.0.1",
     "bluebird": "^3.5.0",
     "body-parser": "^1.17.2",
     "cookie-parser": "^1.4.3",

diff --git a/lerna.json b/lerna.json
@@ -3,13 +3,17 @@
   "packages": [
     "cloud/*",
     "client/*",
-    "integration/*",
+    "common/*",
     "demo/*"
   ],
   "commands": {
     "bootstrap": {
       "hoist": "**"
+    },
+    "publish": {
+      "ignore": "@raincatcher/demo-server",
+      "exact": true
     }
   },
-  "version": "independent"
+  "version": "0.0.1"
 }
diff --git a/package.json b/package.json
@@ -5,7 +5,7 @@
   "main": "index.js",
   "scripts": {
     "test": "lerna run test",
-    "test-ci": "npm-run-all test coverage:*",
+    "test-ci": "npm-run-all test coverage:* && npm run publish:test",
     "coverage:create-file": "echo '' > ./coverage_report/coverage_merged.info",
     "coverage:merge-reports": "lcov-result-merger './coverage_report/*/lcov.info' './coverage_report/coverage_merged.info'",
     "coverage:upload-coveralls": "cat ./coverage_report/coverage_merged.info | coveralls",
@@ -18,7 +18,13 @@
     "clean": "npm-run-all clean:*",
     "clean:coverage": "del coverage_report",
     "clean:packages": "lerna run clean",
-    "clean:docs": "del **/**/docs "
+    "clean:dependencies": "lerna clean --yes",
+    "clean:docs": "del **/**/docs ",
+    "publish:prepare": "./scripts/publish-prepare.sh",
+    "publish:dry": "npm run publish:prepare && lerna publish --skip-npm --skip-git --canary --yes",
+    "publish:test": "./scripts/test-publish.sh",
+    "publish:full": "npm run publish:prepare && lerna publish",
+    "publish:demo-server": "lerna run build --scope='@raincatcher/demo-server' && NODE_DEBUG=gh-pages node ./scripts/publish-app server --push true"
   },
   "repository": {
     "type": "git",
@@ -33,12 +39,15 @@
   "devDependencies": {
     "coveralls": "^2.13.1",
     "del-cli": "^1.1.0",
+    "gh-pages": "^1.0.0",
     "lcov-result-merger": "^1.2.0",
     "lerna": "^2.0.0-rc.5",
     "npm-run-all": "^4.0.2",
+    "opn-cli": "^3.1.0",
     "tslint": "^5.4.3",
     "typedoc": "^0.8.0",
-    "typescript": "^2.3.4"
+    "typescript": "^2.3.4",
+    "yargs": "^8.0.2"
   },
   "dependencies": {
     "tslint": "^5.6.0",

diff --git a/scripts/apps.json b/scripts/apps.json
@@ -0,0 +1,14 @@
+{
+  "server": {
+    "path": "demo/server",
+    "repo": "git@github.com:feedhenry-templates/wfm-server.git"
+  },
+  "mobile": {
+    "path": "demo/mobile",
+    "repo": "git@github.com:feedhenry-templates/wfm-mobile.git"
+  },
+  "portal": {
+    "path": "demo/portal",
+    "repo": "git@github.com:feedhenry-templates/wfm-portal.git"
+  }
+}