Merge pull request #21 from terascope/use-teraslice-cli

v2.1.1 use teraslice-cli to build

.gitignore

@@ -61,6 +61,7 @@ typings/
 .next
 
 # Ignore teraslice asset builds
+build/
 builds/
 
 asset/dist

.travis.yml

@@ -39,17 +39,21 @@ before_install:
   - sleep 3
   # Make it colorful
   - export FORCE_COLOR=1
+  # Install teraslice-cli
+  - yarn global add teraslice-cli
 install:
   - yarn install
 script:
     - '[[ -z "$DEBUG" ]] && yarn test:all || yarn test:debug | yarn bunyan -o short'
 after_success:
   - bash <(curl -s https://codecov.io/bash)
   - yarn lint:all
+  # Attempt to build the asset (so it doesn't blow up when it deploys)
+  - teraslice-cli assets build
 after_failure:
   - tail -n 100 $KAFKA_HOME/*.log
 before_deploy:
-  - ./scripts/build.sh
+  - teraslice-cli assets build
   - cp ./docs/CONNECTORS.md packages/terafoundation_kafka_connector/README.md
   - echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > ~/.npmrc
 deploy:
@@ -64,7 +68,7 @@ deploy:
     api_key: $GITHUB_TOKEN
     prerelease: true
     file_glob: true
-    file: builds/*.zip
+    file: build/*.zip
     skip_cleanup: true
     on:
       tags: true

README.md

@@ -160,7 +160,7 @@ terafoundation:
 {
     // make sure to include the asset bundle
     // additionally you can specify the version
-    // "kafka:2.1.0"
+    // "kafka:2.1.1"
     "assets": [ "kafka" ],
     "apis": [
         {
@@ -219,7 +219,7 @@ terafoundation:
     "slicers": 1,
     // make sure to include the asset bundle
     // additionally you can specify the version
-    // "kafka:2.1.0"
+    // "kafka:2.1.1"
     "assets": [ "kafka" ],
     // ...
     "operations": [
@@ -271,7 +271,7 @@ terafoundation:
 {
     // make sure to include the asset bundle
     // additionally you can specify the version
-    // "kafka:2.1.0"
+    // "kafka:2.1.1"
     "assets": [ "kafka" ],
     // ...
     "operations": [
@@ -311,8 +311,14 @@ yarn test
 
 Build a compiled asset bundle to deploy to a teraslice cluster.
 
+**Install Teraslice CLI**
+
+```bash
+yarn global add teraslice-cli
+```
+
 ```bash
-./scripts/build.sh
+teraslice-cli assets build
 ```
 
 ### Documentation

asset/asset.json

@@ -1,5 +1,5 @@
 {
     "name": "kafka",
     "description": "Kafka reader and writer support.",
-    "version": "2.1.0"
+    "version": "2.1.1"
 }

asset/package.json

@@ -1,11 +1,11 @@
 {
     "name": "kafka-assets",
-    "version": "2.1.0",
+    "version": "2.1.1",
     "private": true,
     "description": "Teraslice asset for kafka operations",
     "main": "index.js",
     "dependencies": {
-        "@terascope/job-components": "^0.14.5",
+        "@terascope/job-components": "^0.15.0",
         "lodash.once": "^4.1.1"
     },
     "devDependencies": {},

asset/yarn.lock

@@ -2,13 +2,13 @@
 # yarn lockfile v1
 
 
-"@terascope/job-components@^0.14.5":
-  version "0.14.5"
-  resolved "https://registry.yarnpkg.com/@terascope/job-components/-/job-components-0.14.5.tgz#43f35a423c154b4446d5d9522ca0fa7758a5fb45"
-  integrity sha512-0blBzu13lcC3Ikb88zfTqXar2MySN/bMXHTed2nNYPL8PhYlEFDsIcYbXRBqujgHbH7uEfU7hWIUkP+7yE+SDQ==
+"@terascope/job-components@^0.15.0":
+  version "0.15.0"
+  resolved "https://registry.yarnpkg.com/@terascope/job-components/-/job-components-0.15.0.tgz#9174470a13b65cb4be0afcb91bda346e717466ac"
+  integrity sha512-F9JJS781fsJoZWfGmuMDs9b8E04k4XZRSjqTnYsRIebc18w90Z8vV/++hALTpd/rusAYD32OMgSpe44ZTBQCVw==
   dependencies:
     "@terascope/queue" "^1.1.6"
-    "@terascope/utils" "^0.4.1"
+    "@terascope/utils" "^0.6.0"
     convict "^4.4.1"
     datemath-parser "^1.0.6"
     uuid "^3.3.2"
@@ -18,10 +18,10 @@
   resolved "https://registry.yarnpkg.com/@terascope/queue/-/queue-1.1.6.tgz#763d035cf31d2e1fd819ae827274f50874016708"
   integrity sha512-TmLOLh49UVdksjwAUzOO6lqOQMwJIW0pHsXKibcdfzAcUgwXL3JH6BjO2l1u5njQeHjoj1SOyBk6aU1/fHd0PQ==
 
-"@terascope/utils@^0.4.1":
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/@terascope/utils/-/utils-0.4.1.tgz#7d470c6ac6f74a1998e52ac2a4b9e555803832f3"
-  integrity sha512-wO/ZoBoklc9BdxVgSoEzhX3EHzM8DXtstzQdmyeetheP+3mL25O2Rzxcy169k63cSEjeQvW5jhus4mmYLZDVxA==
+"@terascope/utils@^0.6.0":
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/@terascope/utils/-/utils-0.6.0.tgz#72a226ef3f675b3b5b561b4a2d5491af6991af99"
+  integrity sha512-Aeztbtd6Rn6dQ6pfCfIFSAXRiO5N0lFmNvu6cTPyxsqtjyPMe8jv5Jgtz3Guh+PX6trktvMVNzQNhsTel9Nc4A==
   dependencies:
     debug "^4.1.1"
     is-plain-object "^2.0.4"

docs/USAGE.md

@@ -19,8 +19,14 @@ yarn test
 
 Build a compiled asset bundle to deploy to a teraslice cluster.
 
+**Install Teraslice CLI**
+
+```bash
+yarn global add teraslice-cli
+```
+
 ```bash
-./scripts/build.sh
+teraslice-cli assets build
 ```
 
 ### Documentation

docs/kafka_dead_letter/USAGE.md

@@ -4,7 +4,7 @@
 {
     // make sure to include the asset bundle
     // additionally you can specify the version
-    // "kafka:2.1.0"
+    // "kafka:2.1.1"
     "assets": [ "kafka" ],
     "apis": [
         {

docs/kafka_reader/USAGE.md

@@ -6,7 +6,7 @@
     "slicers": 1,
     // make sure to include the asset bundle
     // additionally you can specify the version
-    // "kafka:2.1.0"
+    // "kafka:2.1.1"
     "assets": [ "kafka" ],
     // ...
     "operations": [

docs/kafka_sender/USAGE.md

@@ -4,7 +4,7 @@
 {
     // make sure to include the asset bundle
     // additionally you can specify the version
-    // "kafka:2.1.0"
+    // "kafka:2.1.1"
     "assets": [ "kafka" ],
     // ...
     "operations": [

package.json

@@ -1,6 +1,6 @@
 {
     "name": "kafka-asset-bundle",
-    "version": "2.1.0",
+    "version": "2.1.1",
     "description": "A bundle of Kafka operations and processors for Teraslice",
     "private": true,
     "scripts": {
@@ -9,6 +9,7 @@
         "lint:fix": "yarn lint --fix",
         "prepare": "yarn workspaces run build",
         "postinstall": "yarn --cwd ./asset --prod install",
+        "asset:build": "yarn run build",
         "build": "rimraf asset/dist; tsc --project tsconfig.json --pretty",
         "build:watch": "yarn build --watch",
         "test": "jest --colors --maxWorkers=2 --detectOpenHandles --forceExit",
@@ -21,17 +22,17 @@
     "author": "Terascope, LLC <[email protected]>",
     "license": "MIT",
     "devDependencies": {
-        "@types/jest": "^24.0.9",
+        "@types/jest": "^24.0.10",
         "@types/lodash.once": "^4.1.6",
         "@types/node": "^11.10.5",
         "@types/uuid": "^3.4.4",
         "bunyan": "^1.8.12",
-        "jest": "^24.3.0",
+        "jest": "^24.3.1",
         "jest-extended": "^0.11.1",
         "markdown-table": "^1.1.2",
         "markdown-toc": "^1.2.0",
         "rimraf": "^2.6.3",
-        "teraslice-test-harness": "^0.5.2",
+        "teraslice-test-harness": "^0.5.3",
         "ts-jest": "^24.0.0",
         "ts-node": "^8.0.3",
         "tslint": "^5.13.1",

packages/terafoundation_kafka_connector/package.json

@@ -26,7 +26,7 @@
         "node-rdkafka": "^2.5.1"
     },
     "devDependencies": {
-        "@terascope/job-components": "^0.14.5",
+        "@terascope/job-components": "^0.15.0",
         "@types/convict": "^4.2.1",
         "convict": "^4.4.1"
     },