From 378a9cd39ae50d010b1e3595f11b06309b65e8ad Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Thu, 27 Jul 2017 14:34:17 +0000 Subject: [PATCH 01/10] chore(package): update dependencies --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 43758b0..73a71e3 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ }, "dependencies": { "elasticsearch": "^13.2.0", - "proc-that": "^0.4.0", + "proc-that": "^0.7.0", "@types/node": "^8.0.17", "rxjs": "^5.4.2", "tslib": "^1.7.1" From 9bb4fe7347ccb61721ad03fae30038da1fa5c837 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Thu, 27 Jul 2017 14:34:20 +0000 Subject: [PATCH 02/10] docs(readme): add Greenkeeper badge --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 5b058d4..fcaae49 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,6 @@ # ElasticLoader + +[![Greenkeeper badge](https://badges.greenkeeper.io/smartive/proc-that-elastic-loader.svg)](https://greenkeeper.io/) Loader for `proc-that`. Loads processed items into an elasticsearch index. ##### A bunch of badges From 51d40afaf992d70bbea22134afa4774b346bb567 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20B=C3=BChler?= Date: Fri, 28 Jul 2017 08:22:09 +0200 Subject: [PATCH 03/10] docs(readme): move greenkeeper badge --- README.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index fcaae49..defa6d8 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,14 @@ # ElasticLoader -[![Greenkeeper badge](https://badges.greenkeeper.io/smartive/proc-that-elastic-loader.svg)](https://greenkeeper.io/) Loader for `proc-that`. Loads processed items into an elasticsearch index. ##### A bunch of badges -[![Build Status](https://travis-ci.org/smartive/proc-that-elastic-loader.svg?maxAge=3600)](https://travis-ci.org/smartive/proc-that-elastic-loader) [![npm](https://img.shields.io/npm/v/proc-that-elastic-loader.svg?maxAge=3600)](https://www.npmjs.com/package/proc-that-elastic-loader) [![Coverage status](https://img.shields.io/coveralls/smartive/proc-that-elastic-loader.svg?maxAge=3600)](https://coveralls.io/github/smartive/proc-that-elastic-loader) [![license](https://img.shields.io/github/license/smartive/proc-that-elastic-loader.svg?maxAge=2592000)](https://github.com/smartive/proc-that-elastic-loader) +[![Build Status](https://travis-ci.org/smartive/proc-that-elastic-loader.svg?maxAge=3600)](https://travis-ci.org/smartive/proc-that-elastic-loader) +[![npm](https://img.shields.io/npm/v/proc-that-elastic-loader.svg?maxAge=3600)](https://www.npmjs.com/package/proc-that-elastic-loader) +[![Coverage status](https://img.shields.io/coveralls/smartive/proc-that-elastic-loader.svg?maxAge=3600)](https://coveralls.io/github/smartive/proc-that-elastic-loader) +[![license](https://img.shields.io/github/license/smartive/proc-that-elastic-loader.svg?maxAge=2592000)](https://github.com/smartive/proc-that-elastic-loader) +[![Greenkeeper badge](https://badges.greenkeeper.io/smartive/proc-that-elastic-loader.svg)](https://greenkeeper.io/) ## Installation @@ -55,4 +58,4 @@ let type1Loader = new ElasticLoader({/*es-config*/}, 'index', 'type_1', obj => o let type2Loader = new ElasticLoader({/*es-config*/}, 'index', 'type_2', obj => obj.type === 'Type2'); new Etl().addLoader(type1Loader).addLoader(type2Loader).start().subscribe(/*...*/); -``` \ No newline at end of file +``` From be3db93172b52194af67d3158244f2b03811f603 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20B=C3=BChler?= Date: Fri, 28 Jul 2017 08:22:49 +0200 Subject: [PATCH 04/10] docs(changelog): delete changelog this is newly done by semantic release --- CHANGELOG.md | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md deleted file mode 100644 index 6d9ea93..0000000 --- a/CHANGELOG.md +++ /dev/null @@ -1,20 +0,0 @@ -# Change Log -All notable changes to this project will be documented in this file. -This project adheres to [Semantic Versioning](http://semver.org/). - -## [Unreleased] -### Changed -- Update node to v6/v8 and upgrade modules - - -## [v0.4.0] -### Added -- Changelog - -### Changed -- Updated dependencies -- Breaking: update loader to new interface of `proc-that` - - -[Unreleased]: https://github.com/smartive/proc-that-elastic-loader/compare/v0.4.0...master -[v0.4.0]: https://github.com/smartive/proc-that-elastic-loader/compare/v0.3.2...v0.4.0 From aaa05e437d4df554b125a849cda47e82cc55b753 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Wed, 16 Aug 2017 09:46:14 +0200 Subject: [PATCH 05/10] chore(package): update semantic-release to version 7.0.1 (#10) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 73a71e3..5f05e58 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "tslint-config-airbnb": "^5.2.1", "tsutils": "^2.8.0", "typescript": "^2.4.2", - "semantic-release": "^6.3.6" + "semantic-release": "^7.0.1" }, "dependencies": { "elasticsearch": "^13.2.0", From 76f630911e1ec4315786b42f61e623481c44a5fa Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Fri, 15 Sep 2017 07:29:33 +0200 Subject: [PATCH 06/10] chore(package): update ts-jest to version 21.0.0 (#12) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5f05e58..7de37b0 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "@types/jest": "^20.0.5", "del-cli": "^1.1.0", "jest": "^20.0.4", - "ts-jest": "^20.0.7", + "ts-jest": "^21.0.0", "tslint": "^5.5.0", "tslint-config-airbnb": "^5.2.1", "tsutils": "^2.8.0", From 568e68a2ff3d18c02b0c8991025fc2bf21bd894a Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Fri, 15 Sep 2017 07:35:17 +0200 Subject: [PATCH 07/10] chore(package): update jest to version 21.0.0 (#11) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7de37b0..6b67a38 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "devDependencies": { "@types/jest": "^20.0.5", "del-cli": "^1.1.0", - "jest": "^20.0.4", + "jest": "^21.0.0", "ts-jest": "^21.0.0", "tslint": "^5.5.0", "tslint-config-airbnb": "^5.2.1", From d01a30f0344c7f39df83c12cf601d918fcf3711c Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Wed, 20 Sep 2017 08:40:56 +0200 Subject: [PATCH 08/10] chore(package): update semantic-release to version 8.0.0 (#13) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6b67a38..9e1e08a 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "tslint-config-airbnb": "^5.2.1", "tsutils": "^2.8.0", "typescript": "^2.4.2", - "semantic-release": "^7.0.1" + "semantic-release": "^8.0.0" }, "dependencies": { "elasticsearch": "^13.2.0", From 2f0978ce44223f4ae2d0f7b47f1651289123ac3c Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Mon, 25 Sep 2017 08:40:00 +0200 Subject: [PATCH 09/10] chore(package): update @types/jest to version 21.1.0 (#14) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9e1e08a..f266ee2 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "author": "Christoph Bühler ", "license": "MIT", "devDependencies": { - "@types/jest": "^20.0.5", + "@types/jest": "^21.1.0", "del-cli": "^1.1.0", "jest": "^21.0.0", "ts-jest": "^21.0.0", From e54031af8e327e458c1463e588db3f5619461ff5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20B=C3=BChler?= Date: Mon, 6 Nov 2017 14:26:00 +0100 Subject: [PATCH 10/10] feat: upgrade deps and ver (#16) BREAKING CHANGE: Upgrade to v1 --- .appveyor.yml | 18 ++++++++++++++++++ .npmrc | 2 +- .travis.yml | 52 +++++++++++++++++++++++++++++++++------------------ README.md | 2 ++ package.json | 30 +++++++++++++++-------------- tslint.json | 2 ++ 6 files changed, 73 insertions(+), 33 deletions(-) create mode 100644 .appveyor.yml diff --git a/.appveyor.yml b/.appveyor.yml new file mode 100644 index 0000000..971a7a5 --- /dev/null +++ b/.appveyor.yml @@ -0,0 +1,18 @@ +version: "{build} - {branch}" +skip_tags: true +skip_branch_with_pr: true + +environment: + matrix: + - nodejs_version: "8" + - nodejs_version: "7" + - nodejs_version: "6" + +install: + - ps: Install-Product node $env:nodejs_version + - npm install + +test_script: + - npm test + +build: off diff --git a/.npmrc b/.npmrc index 9cf9495..43c97e7 100644 --- a/.npmrc +++ b/.npmrc @@ -1 +1 @@ -package-lock=false \ No newline at end of file +package-lock=false diff --git a/.travis.yml b/.travis.yml index 7bd9f66..44926fa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,25 +1,41 @@ language: node_js -cache: - directories: - - node_modules +stages: + - name: test + if: tag IS blank + - name: deploy + if: branch = master notifications: email: false -node_js: - - '8' - - '6' +env: + - BUILD_LEADER_ID=5 -before_script: - - npm prune - -after_success: - - npm install coveralls@^2.11.9 && cat ./coverage/lcov.info | coveralls - - npm i - - npm run build - - npm run semantic-release - -branches: - except: - - /^v\d+\.\d+\.\d+$/ +jobs: + include: + - stage: test + node_js: '8' + after_success: + - npm install coveralls@^2.11.9 && cat ./coverage/lcov.info | coveralls + - stage: test + node_js: '7' + after_success: + - npm install coveralls@^2.11.9 && cat ./coverage/lcov.info | coveralls + - stage: test + node_js: '6' + after_success: + - npm install coveralls@^2.11.9 && cat ./coverage/lcov.info | coveralls + - stage: deploy + node_js: '8' + script: npm run typedoc + deploy: + provider: pages + skip_cleanup: true + github_token: $GH_TOKEN + local_dir: ./docs + - stage: deploy + node_js: '8' + before_script: npm run build + script: echo "Deploy with semantic release" + after_success: npm run semantic-release diff --git a/README.md b/README.md index defa6d8..d0ad015 100644 --- a/README.md +++ b/README.md @@ -5,9 +5,11 @@ Loader for `proc-that`. Loads processed items into an elasticsearch index. ##### A bunch of badges [![Build Status](https://travis-ci.org/smartive/proc-that-elastic-loader.svg?maxAge=3600)](https://travis-ci.org/smartive/proc-that-elastic-loader) +[![Build Status](https://ci.appveyor.com/api/projects/status/382q34ka9its372v?svg=true)](https://ci.appveyor.com/project/buehler/proc-that-elastic-loader) [![npm](https://img.shields.io/npm/v/proc-that-elastic-loader.svg?maxAge=3600)](https://www.npmjs.com/package/proc-that-elastic-loader) [![Coverage status](https://img.shields.io/coveralls/smartive/proc-that-elastic-loader.svg?maxAge=3600)](https://coveralls.io/github/smartive/proc-that-elastic-loader) [![license](https://img.shields.io/github/license/smartive/proc-that-elastic-loader.svg?maxAge=2592000)](https://github.com/smartive/proc-that-elastic-loader) +[![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release) [![Greenkeeper badge](https://badges.greenkeeper.io/smartive/proc-that-elastic-loader.svg)](https://greenkeeper.io/) ## Installation diff --git a/package.json b/package.json index f266ee2..ddf45b6 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,8 @@ "lint": "tslint -c ./tslint.json -p ./config/tsconfig.build.json", "test": "npm run lint && npm run clean && jest -c ./jest.json", "test:watch": "npm run clean && jest -c ./jest.json --watch", - "semantic-release": "semantic-release pre && npm publish && semantic-release post" + "typedoc": "del-cli ./docs && typedoc --ignoreCompilerErrors --out ./docs --mode file --tsconfig ./config/tsconfig.build.json ./src/", + "semantic-release": "semantic-release" }, "keywords": [ "etl", @@ -31,21 +32,22 @@ "author": "Christoph Bühler ", "license": "MIT", "devDependencies": { - "@types/jest": "^21.1.0", + "@types/jest": "^21.1.5", "del-cli": "^1.1.0", - "jest": "^21.0.0", - "ts-jest": "^21.0.0", - "tslint": "^5.5.0", - "tslint-config-airbnb": "^5.2.1", - "tsutils": "^2.8.0", - "typescript": "^2.4.2", - "semantic-release": "^8.0.0" + "jest": "^21.2.1", + "semantic-release": "^9.0.0", + "ts-jest": "^21.1.4", + "tslint": "^5.8.0", + "tslint-config-airbnb": "^5.3.0", + "tsutils": "^2.12.2", + "typedoc": "^0.9.0", + "typescript": "^2.6.1" }, "dependencies": { - "elasticsearch": "^13.2.0", - "proc-that": "^0.7.0", - "@types/node": "^8.0.17", - "rxjs": "^5.4.2", - "tslib": "^1.7.1" + "elasticsearch": "^13.3.1", + "proc-that": "^1.0.1", + "@types/node": "^8.0.47", + "rxjs": "^5.5.2", + "tslib": "^1.8.0" } } diff --git a/tslint.json b/tslint.json index f26a210..1ccf077 100644 --- a/tslint.json +++ b/tslint.json @@ -26,6 +26,8 @@ ] } ], + "no-boolean-literal-compare": false, + "strict-boolean-expressions": false, "no-increment-decrement": false, "no-trailing-whitespace": [ true,