Merge pull request #59 from codingtools/refactoring-v0.1.6

Refactoring v0.1.6

Author: pateash

.gitignore

@@ -9,3 +9,5 @@ node_modules
 /.idea
 cdt.iml
 **/.DS_Store
+output/*
+!output/.gitkeep

src/commands/hash.ts

@@ -16,7 +16,7 @@ export default class Hash extends Command {
     type: flags.string({char: 't' , description: 'type of hash [SHA1(default), MD5, SHA256, SHA512, RMD160 or RIPEMD160]'}),
     string: flags.string({char: 's' , description: 'string to be hashed'}),
     file: flags.string({char: 'f' , description: 'file to be hashed'}),
-    outputFile: flags.string({char: 'o' , description: 'output file path'}),
+    output: flags.string({char: 'o' , description: 'output file path'}),
   }
 
   static args = [{name: 'string'}]
@@ -47,8 +47,8 @@ export default class Hash extends Command {
     let hashed: string = hashObject(args.string)
     Logger.success(this, `[${flags.type.toUpperCase()}] ${hashed}`)
 
-    if (flags.outputFile) { // if output path is provided then write to file also
-      Utilities.writeStringToFile(this, flags.outputFile, hashed)
+    if (flags.output) { // if output path is provided then write to file also
+      Utilities.writeStringToFile(this, flags.output, hashed)
     }
   }
 

src/commands/minify.ts

@@ -12,7 +12,7 @@ export default class Minify extends Command {
     help: flags.help({char: 'h'}),
     type: flags.string({char: 't' , description: 'type of file to be minified, it will try to find type with extension supported: JS, HTML/HTM, CSS'}),
     file: flags.string({char: 'f' , description: 'file to be minified'}),
-    outputFile: flags.string({char: 'o' , description: 'output file path'}),
+    output: flags.string({char: 'o' , description: 'output file path'}),
   }
 
   static args = [{name: 'file'}]
@@ -100,8 +100,8 @@ export default class Minify extends Command {
     Logger.progressStop(this, `file: ${flags.file} minified`)
     // }, 1000)
 
-    if (flags.outputFile) { // if output path is provided then write to file also
-      Utilities.writeStringToFile(this, flags.outputFile, output)
+    if (flags.output) { // if output path is provided then write to file also
+      Utilities.writeStringToFile(this, flags.output, output)
     } else
       Logger.success(this, `minified output: \n${output}`)
   }

test/commands/hash.test.ts

@@ -2,7 +2,7 @@ import {expect, test} from '@oclif/test'
 
 describe('hash', () => {
   test
-    .timeout(10000) // added timeout to resolve timeout problem
+    .timeout(20000) // added timeout to resolve timeout problem
     .stdout()
     .command(['hash', 'ashish'])
     .it("Check default type -> cdt hash 'ashish'", ctx => {
@@ -107,6 +107,13 @@ describe('hash', () => {
       expect(ctx.stdout).to.contain('4493b97b4a0d21fc561070c48d4a62a9bfbeb78c5d9b3c59abf6d41f70da2e9bd45af63d8c62812cf41e50e352ec41b4f407f71d5778b575c503b70081e7a151')
     })
 
+  test
+    .stdout()
+    .command(['hash', '-f', 'test/resources/test.txt', '-t', 'sha512', '--output', 'test/resources/output/out.txt'])
+    .it("File Hashing, output to a file", ctx => {
+      expect(ctx.stdout).to.contain('✔  success   output written to file')
+    })
+
   //file input - file not found
   test
     .stdout()

test/commands/minify.test.ts

@@ -2,6 +2,7 @@ import {expect, test} from '@oclif/test'
 
 describe('minify', () => {
   test
+    .timeout(20000) // added timeout to resolve timeout problem
     .stdout()
     .command(['minify', '-t', 'js'])
     .exit(0)
@@ -46,4 +47,10 @@ describe('minify', () => {
       expect(ctx.stdout).to.contain('body{margin:25px;background-color:#f0f0f0;font-family:arial,sans-serif;font-size:14px}h1{font-size:35px;font-weight:400;margin-top:5px}.someclass{color:red}#someid{color:green}')
     })
 
+  test
+    .stdout()
+    .command(['minify', '-f', 'test/resources/test.css', '--output', 'test/resources/output/ouput.css'])
+    .it('Minify CSS, output to a file', ctx => {
+      expect(ctx.stdout).to.contain('✔  success   output written to file')
+    })
 })

test/resources/avro/output/.gitkeep

@@ -0,0 +1 @@
+4493b97b4a0d21fc561070c48d4a62a9bfbeb78c5d9b3c59abf6d41f70da2e9bd45af63d8c62812cf41e50e352ec41b4f407f71d5778b575c503b70081e7a151