Merge branch 'release/release-v0.1' of https://github.com/codingtools/cdt into feature/test-encryption-decryption-together

Author: pateash

.github/FUNDING.yml

@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+patreon: ashishpatel0720

.github/workflows/npmpublish.yml

@@ -0,0 +1,47 @@
+name: GithubPublish
+
+on:
+  push:
+    tags:
+      - v0.1.*
+      - v0.2.*
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v1
+        with:
+          node-version: 12
+      - run: npm ci
+      - run: npm test
+
+  publish-npm:
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v1
+        with:
+          node-version: 12
+          registry-url: https://registry.npmjs.org/
+      - run: npm ci
+      - run: npm publish
+        env:
+          NODE_AUTH_TOKEN: ${{secrets.npm_token}}
+
+#  publish-gpr:
+#    needs: build
+#    runs-on: ubuntu-latest
+#    steps:
+#      - uses: actions/checkout@v2
+#      - uses: actions/setup-node@v1
+#        with:
+#          node-version: 12
+#          registry-url: https://npm.pkg.github.com/
+#          scope: '@codingtools/cdt'
+#      - run: npm ci
+#      - run: npm publish
+#        env:
+#          NODE_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}

.gitignore

@@ -9,6 +9,12 @@ node_modules
 /.idea
 cdt.iml
 **/.DS_Store
-output/*
-!output/.gitkeep
+
+output
+output/**.json
+output/**.avro
+output/**.avsc
+
 coverage/*.json
+
+

README.md

@@ -40,7 +40,7 @@ $ npm install -g @codingtools/cdt
 $ cdt COMMAND
 running command...
 $ cdt (-v|--version|version)
-@codingtools/cdt/0.1.6 darwin-x64 node-v12.9.0
+@codingtools/cdt/0.1.8 darwin-x64 node-v12.9.0
 $ cdt --help [COMMAND]
 USAGE
   $ cdt COMMAND
@@ -96,7 +96,7 @@ OPTIONS
   -t, --schemaType=schemaType  schema type file path
 ```
 
-_See code: [src/commands/avro.ts](https://github.com/codingtools/cdt/blob/v0.1.6/src/commands/avro.ts)_
+_See code: [src/commands/avro.ts](https://github.com/codingtools/cdt/blob/v0.1.8/src/commands/avro.ts)_
 
 ## `cdt bundlephobia [PACKAGE]`
 
@@ -112,7 +112,7 @@ OPTIONS
   -p, --packages=packages  packages for which cost is required, can pass more than one separated by space
 ```
 
-_See code: [src/commands/bundlephobia.ts](https://github.com/codingtools/cdt/blob/v0.1.6/src/commands/bundlephobia.ts)_
+_See code: [src/commands/bundlephobia.ts](https://github.com/codingtools/cdt/blob/v0.1.8/src/commands/bundlephobia.ts)_
 
 ## `cdt crypto [STRING]`
 
@@ -132,7 +132,7 @@ OPTIONS
   -s, --string=string          string to be encrypted/decrypted
 ```
 
-_See code: [src/commands/crypto.ts](https://github.com/codingtools/cdt/blob/v0.1.6/src/commands/crypto.ts)_
+_See code: [src/commands/crypto.ts](https://github.com/codingtools/cdt/blob/v0.1.8/src/commands/crypto.ts)_
 
 ## `cdt datetime [DATE]`
 
@@ -150,7 +150,7 @@ OPTIONS
   -z, --timezone=timezone  Timezone for Datetime parsing, default: Your timezone
 ```
 
-_See code: [src/commands/datetime.ts](https://github.com/codingtools/cdt/blob/v0.1.6/src/commands/datetime.ts)_
+_See code: [src/commands/datetime.ts](https://github.com/codingtools/cdt/blob/v0.1.8/src/commands/datetime.ts)_
 
 ## `cdt hash [STRING]`
 
@@ -161,14 +161,14 @@ USAGE
   $ cdt hash [STRING]
 
 OPTIONS
-  -f, --file=file              file to be hashed
-  -h, --help                   show CLI help
-  -o, --outputFile=outputFile  output file path
-  -s, --string=string          string to be hashed
-  -t, --type=type              type of hash [SHA1(default), MD5, SHA256, SHA512, RMD160 or RIPEMD160]
+  -f, --file=file      file to be hashed
+  -h, --help           show CLI help
+  -o, --output=output  output file path
+  -s, --string=string  string to be hashed
+  -t, --type=type      type of hash [SHA1(default), MD5, SHA256, SHA512, RMD160 or RIPEMD160]
 ```
 
-_See code: [src/commands/hash.ts](https://github.com/codingtools/cdt/blob/v0.1.6/src/commands/hash.ts)_
+_See code: [src/commands/hash.ts](https://github.com/codingtools/cdt/blob/v0.1.8/src/commands/hash.ts)_
 
 ## `cdt help [COMMAND]`
 
@@ -196,15 +196,13 @@ USAGE
   $ cdt minify [FILE]
 
 OPTIONS
-  -f, --file=file              file to be minified
-  -h, --help                   show CLI help
-  -o, --outputFile=outputFile  output file path
-
-  -t, --type=type              type of file to be minified, it will try to find type with extension supported: JS,
-                               HTML/HTM, CSS
+  -f, --file=file      file to be minified
+  -h, --help           show CLI help
+  -o, --output=output  output file path
+  -t, --type=type      type of file to be minified, it will try to find type with extension supported: JS, HTML/HTM, CSS
 ```
 
-_See code: [src/commands/minify.ts](https://github.com/codingtools/cdt/blob/v0.1.6/src/commands/minify.ts)_
+_See code: [src/commands/minify.ts](https://github.com/codingtools/cdt/blob/v0.1.8/src/commands/minify.ts)_
 <!-- commandsstop -->
 
 ## Acknowledgement
@@ -227,16 +225,38 @@ This Project is created and supported by [Ashish Patel](http://ashish.live/)
 
 ## Releasing Version
 * this needs to be done from release* branch
+
+### Increasing Version
+
 ```bash
 npm version patch 
 ```
 it will update readme.md and update package.json, also will create tag and commit.
 
+### Publishing to NPM
+
 ```bash
 npm publish --access public
 ```
 this will publish package to **npm** starting with updating README and publishing tarballs
 
+> Already a Github Action is there to publish on pushing a tag.
+
+### Creating Standalone Tarballs
+
+```bash
+oclif-dev pack
+```
+this will release standalone tarballs for linux, macos and windows which we can extract and uses.
+
+### Creating Installers
+
+```bash 
+oclif-dev pack:macos 
+oclif-dev pack:win 
+```
+these will create installers for macos and windows
+
 ## License
 
 [MIT](https://raw.githubusercontent.com/codingtools/cdt/master/LICENSE)

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@codingtools/cdt",
   "description": "CLI for Developers",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "author": "Ashish Patel @ashishpatel0720",
   "bin": {
     "cdt": "./bin/run"
@@ -20,10 +20,11 @@
     "axios": "^0.19.0",
     "chalk": "^3.0.0",
     "codecov": "^3.6.5",
-    "crypto-js": "^3.1.9-1",
+    "crypto-js": "^4.0.0",
     "detect-character-encoding": "^0.8.0",
     "encoding-japanese": "^1.0.30",
     "jshashes": "^1.0.7",
+    "json-2-csv": "^3.5.9",
     "minify": "^5.0.0",
     "moment": "^2.24.0",
     "moment-timezone": "^0.5.27",
@@ -37,14 +38,15 @@
     "@oclif/dev-cli": "^1.22.2",
     "@oclif/test": "^1.2.5",
     "@oclif/tslint": "^3.1.1",
-    "@types/chai": "^4.2.3",
+    "@types/chai": "^4.2.9",
     "@types/mocha": "^7.0.0",
     "@types/moment-timezone": "^0.5.12",
-    "@types/node": "^13.1.0",
+    "@types/node": "13.9.2",
     "@types/crypto-js": "^3.1.43",
     "@types/signale": "^1.2.1",
     "chai": "^4.2.0",
     "globby": "^10.0.1",
+    "mocha": "^7.0.1",
     "jest": "^24.9.0",
     "jest-mock": "^24.9.0",
     "mocha": "^6.2.2",

src/commands/avro.ts

@@ -2,6 +2,7 @@ import {Command, flags} from '@oclif/command'
 import * as avro from 'avsc'
 import * as chalk from 'chalk'
 import * as fs from 'fs' // includes all from avro-js and some more
+import * as Json2Csv from 'json-2-csv'
 
 import Logger from '../utilities/logger'
 import Utilities from '../utilities/utilities'
@@ -12,9 +13,10 @@ export default class Avro extends Command {
   static GET_SCHEMA = 'get_schema'
   static TO_JSON = 'to_json'
   static TO_AVRO = 'to_avro'
+  static TO_CSV = 'to_csv'
 
   // do not change order otherwise we need to change order in getCommand() also
-  static SupportedCommands = [Avro.GET_SCHEMA, Avro.TO_JSON, Avro.TO_AVRO]
+  static SupportedCommands = [Avro.GET_SCHEMA, Avro.TO_JSON, Avro.TO_AVRO, Avro.TO_CSV]
   static flags = {
     help: flags.help({char: 'h'}),
     file: flags.string({char: 'f' , description: 'input file path'}),
@@ -52,12 +54,14 @@ export default class Avro extends Command {
 
   private executeCommand(flags: any, args: any) {
     switch (args.command) {
-    case Avro.SupportedCommands[0]:
+    case Avro.GET_SCHEMA:
       return this.getSchema(flags, args)
-    case Avro.SupportedCommands[1]:
+    case Avro.TO_JSON:
       return this.toJson(flags, args)
-    case Avro.SupportedCommands[2]:
+    case Avro.TO_AVRO:
       return this.toAvro(flags, args)
+    case Avro.TO_CSV:
+      return this.toCsv(flags, args)
     default:
       Logger.error(this, 'Unsupported Command, supported: ' + Avro.SupportedCommands)
     }
@@ -83,19 +87,55 @@ export default class Avro extends Command {
 
   // tslint:disable-next-line:no-unused
   private toJson(flags: any, args: any) {
+    Logger.progressStart(this, 'Converting Avro To Json')
+    // setTimeout(() => {
+    Logger.progressStop(this, ' Converting Avro To Json')
     Utilities.truncateFile(this, flags.output)
     avro.createFileDecoder(flags.file)
       .on('data', function (recordStr) {
         // @ts-ignore
         Utilities.appendStringToFile(this, flags.output, JSON.stringify(recordStr))
       })
     Logger.success(this, `${chalk.blue('Json')} written to file: ${chalk.green(flags.output)}`) // this will output error and exit command
+    // }, 1000)
+  }
+
+// tslint:disable-next-line:no-unused
+  private toCsv(flags: any, args: any) {
+    Logger.progressStart(this, 'Converting Avro To Csv')
+
+    // setTimeout(() => {
+    Logger.progressStop(this, ' Converting Avro To Csv')
+    Utilities.truncateFile(this, flags.output)
+    let prependHeader = true // only write on the first line
+    avro.createFileDecoder(flags.file)
+      .on('data', function (recordStr) {
+          // @ts-ignore
+        let json = JSON.parse(JSON.stringify(recordStr))
+        Json2Csv.json2csv(json, (err?: Error, csv?: string) => {
+          if (csv) {
+              // @ts-ignore
+            Utilities.appendStringToFile(this, flags.output, csv + '\n')
+          }
+          if (err) {
+              // @ts-ignore
+            Logger.error(this, err.toString())
+          }
+        }, {prependHeader})
+        prependHeader = false
+      })
+    Logger.success(this, `${chalk.blue('Csv')} written to file: ${chalk.green(flags.output)}`) // this will output error and exit command
+    // }, 300)
   }
 
   private toAvro(flags: any, args: any) {
     if (!flags.schemaType)
       Logger.error(this, 'Schema file is not provided')
 
+    Logger.progressStart(this, 'Generating Avro')
+    // setTimeout(() => {
+    Logger.progressStop(this, ' Generating Avro')
+
     let schema = avro.parse(flags.schemaType)
     let avroEncoder = new avro.streams.BlockEncoder(schema)
 
@@ -104,9 +144,9 @@ export default class Avro extends Command {
 // We write the records to the block encoder, which will take care of serializing them
 // into an object container file.
 
-    let jsonStr = '[' + Utilities.getInputString(this, flags, args) + ']'
-    jsonStr = jsonStr.replace(/[\s\n]+/mg, '')
-    jsonStr = jsonStr.replace(/\}\{/mg, '},{')
+    let inputString = Utilities.getInputString(this, flags, args)
+    let jsonStr = this.convertAvroJsonToValidJson(inputString)
+
     let jsonObjects = JSON.parse(jsonStr)
 
     jsonObjects.forEach(function (data: any) {
@@ -119,5 +159,14 @@ export default class Avro extends Command {
     })
     Logger.success(this, `${chalk.blue('Avro')} written to file: ${chalk.green(flags.output)}`) // this will output error and exit command
     avroEncoder.end()
+    // }, 300)
+
+  }
+
+  private convertAvroJsonToValidJson(json: string) {
+    let jsonStr = '[' + json + ']'
+    jsonStr = jsonStr.replace(/[\s\n]+/mg, '')
+    jsonStr = jsonStr.replace(/\}\{/mg, '},{')
+    return jsonStr
   }
 }