Merge pull request #2 from microsoft/emimunoz/cli-tools

Adding Unit Test to Chatdown

Author: BruceHaley

packages/chatdown/package-lock.json

@@ -5,24 +5,18 @@
   "author": "Microsoft",
   "bugs": "https://github.com/Microsoft/chatdown/issues",
   "dependencies": {
-    "@oclif/command": "^1.5.13",
-    "@oclif/config": "^1.13.0",
-    "tslib": "^1.9.3",
-    "botframework-schema": "^4.0.0-preview1.2",
+    "@oclif/command": "~1.5.13",
+    "@oclif/config": "~1.13.0",
     "chalk": "2.4.1",
-    "cli-table3": "^0.5.1",
+    "chatdown": "^1.2.2",
     "fs-extra": "^5.0.0",
     "glob": "^7.1.3",
-    "latest-version": "^4.0.0",
     "intercept-stdout": "^0.1.2",
-    "mime-types": "^2.1.18",
-    "minimist": "^1.2.0",
+    "latest-version": "^4.0.0",
     "please-upgrade-node": "^3.0.1",
     "read-text-file": "^1.1.0",
-    "request": "^2.88.0",
-    "request-promise-native": "^1.0.5",
     "semver": "^5.5.1",
-    "window-size": "^1.1.0"
+    "tslib": "^1.9.3"
   },
   "devDependencies": {
     "@oclif/dev-cli": "^1.22.0",

packages/chatdown/package.json

@@ -4,17 +4,31 @@ const runProgram = require('../utils/chatdown.js')
 export default class Chatdown extends Command {
   static description = 'Chatdown cli tool used to parse chat dialogs (.chat file) into a mock transcript file'
 
-  static examples = [`$ bf chatdown`,]
+  static examples = ['$ bf chatdown']
 
   static flags = {
     help: flags.help({char: 'h'}),
     static: flags.boolean({description: 'Use static timestamps when generating timestamps on activities.'}),
+    folder: flags.string({char: 'f'}),
+    out_folder: flags.string({char: 'o'}),
+    version: flags.boolean({char: 'v'}),
+    prefix: flags.boolean()
   }
 
   static args = [{name: 'chat', description: 'The path of the chat file to be parsed. If omitted, stdin will be used.'}]
 
   async run() {
-    const {argv} = this.parse(Chatdown)
-    await runProgram.runChatdown(argv);
+    try {
+      const {flags, argv} = this.parse(Chatdown)
+      await runProgram.runChatdown(argv.length === 0 ? flags : argv)
+
+    } catch (err) {
+      if (err instanceof Error) {
+        this.error(err)
+      } else {
+        this._help()
+      }
+      this.exit(1)
+    }
   }
 }

packages/chatdown/src/commands/chatdown.ts

@@ -9,8 +9,7 @@ if (!semver.satisfies(process.version, requiredVersion)) {
 }
 
 const chalk = require('chalk');
-const help = require('./helpers/help');
-const chatdown = require('./helpers/index');
+const chatdown = require('chatdown');
 const txtfile = require('read-text-file');
 const glob = require('glob');
 const latestVersion = require('latest-version');
@@ -108,7 +107,7 @@ async function runProgram(args) {
 
     if (args.prefix) {
         intercept(function(txt) {
-            return `[${">=8.0.0"}]\n${txt}`;
+            return `[${pkg.name}]\n${txt}`;
         });
     }
 
@@ -125,18 +124,13 @@ async function runProgram(args) {
     }
 
     if (args.version || args.v) {
-        process.stdout.write("1.2.0");
-        return 0;
-    }
-
-    if (args.h || args.help) {
-        help(process.stdout);
+        process.stdout.write(pkg.version);
         return 0;
     }
 
     if (args.f || args.folder) {
-        let inputDir = args.f.trim();
-        let outputDir = (args.o || args.out_folder) ? args.o.trim() : "./";
+        let inputDir = args.folder.trim();
+        let outputDir = (args.o || args.out_folder) ? args.out_folder.trim() : "./";
         if (outputDir.substr(0, 2) === "./") {
             outputDir = path.resolve(process.cwd(), outputDir.substr(2))
         }
@@ -156,27 +150,9 @@ async function runProgram(args) {
             return 0;
         }
         else {
-            help();
             return -1;
         }
     }
 }
 
-/**
- * Utility function that exist the process with an
- * optional error. If an Error is received, the error
- * message is written to stdout, otherwise, the help
- * content are displayed.
- *
- * @param {*} error Either an instance of Error or null
- */
-function exitWithError(error) {
-    if (error instanceof Error) {
-        process.stderr.write(chalk.red(error));
-    } else {
-        help();
-    }
-    process.exit(1);
-}
-
 module.exports.runChatdown = runProgram;