Merge pull request #196 from microsoft/chatdown-refactor-2

Further refactor of chatdown and fix 1 bug

Author: munozemilio

packages/chatdown/README.md

@@ -27,7 +27,7 @@ OPTIONS
 
   -h, --help                   Chatdown command help
 
-  -o, --out=out  Path to the directory where the output of the multiple chat file processing (-f) will be
+  -o, --out=out  Path to the directory where the output of the multiple chat file processing (-o) will be
                                placed.
 
   -p, --prefix                 Prefix stdout with package name.

packages/chatdown/src/commands/chatdown.ts

@@ -37,12 +37,11 @@ export default class Chatdown extends Command {
         })
       }
 
+      let outputDir = flags.out ? path.resolve(flags.out) : null
+
       if (inputIsDirectory) {
         let inputDir = flags.in ? flags.in.trim() : ''
-        let outputDir = (flags.out) ? flags.out.trim() : './'
-        if (outputDir.substr(0, 2) === './') {
-          outputDir = path.resolve(process.cwd(), outputDir.substr(2))
-        }
+
         const len = await this.processFiles(inputDir, outputDir)
         if (len === 0) {
           throw new CLIError('No chat files found at: ' + flags.in)
@@ -51,9 +50,10 @@ export default class Chatdown extends Command {
         return
       } else {
         const fileContents = await this.getInput(flags.in)
+        const fileName = flags.in ? this.getFileName(flags.in) : ''
         if (fileContents) {
           const activities = await chatdown(fileContents, flags)
-          const writeConfirmation = await this.writeOut(activities)
+          const writeConfirmation = await this.writeOut(activities, fileName, outputDir)
           /* tslint:disable:strict-type-predicates */
           if (typeof writeConfirmation === 'string') {
             process.stdout.write(`${chalk.green('Successfully wrote file:')}  ${writeConfirmation}\n`)
@@ -91,21 +91,20 @@ export default class Chatdown extends Command {
     }
   }
 
+  private getFileName(file: any) {
+    let fileName = path.basename(file, path.extname(file))
+    return fileName
+  }
+
   private async processFiles(inputDir: any, outputDir: any) {
     return new Promise(async (resolve, reject) => {
       let files = glob.sync(inputDir, {ignore: ['**/node_modules/**']})
       /* tslint:disable:prefer-for-of */
       for (let i = 0; i < files.length; i++) {
         try {
-          let fileName = files[i]
-          if (files[i].lastIndexOf('/') !== -1) {
-            fileName = files[i].substr(files[i].lastIndexOf('/'))
-          }
-          fileName = fileName.split('.')[0]
+          const fileName = this.getFileName(files[i])
           let activities = await chatdown(await utils.readTextFile(files[i]))
-          let writeFile = `${outputDir}/${fileName}.transcript`
-          await fs.ensureFile(writeFile)
-          await fs.writeJson(writeFile, activities, {spaces: 2})
+          await this.writeOut(activities, fileName, outputDir)
         } catch (e) {
           if (e.message.match(/no such file or directory/)) {
             reject(new CLIError(e.message))
@@ -119,7 +118,13 @@ export default class Chatdown extends Command {
     })
   }
 
-  private async writeOut(activities: any) {
+  private async writeOut(activities: any, fileName: string, outputDir: any) {
+    if (fileName && outputDir) {
+      let writeFile = path.join(outputDir, `${fileName}.transcript`)
+      await fs.ensureFile(writeFile)
+      await fs.writeJson(writeFile, activities, {spaces: 2})
+      return writeFile
+    }
     const output = JSON.stringify(activities, null, 2)
     await new Promise(done => process.stdout.write(output, 'utf-8', () => done()))
     return true

packages/chatdown/test/commands/chatdown.test.ts

@@ -44,7 +44,7 @@ describe('chatdown', () => {
     });
 
     it('should read from file when chat file is passed as an argument', done => {
-        cp.exec(`node ./bin/run chatdown --in ${path.join(__dirname, '../utils/cli.sample.chat')}`, (error, stdout) => {
+        cp.exec(`node ./bin/run chatdown --in ./test/utils/cli.sample.chat`, (error, stdout) => {
             assert.doesNotThrow(() => JSON.parse(stdout));
             done();
         });