[HASH]: refactor and closes issue #4

Signed-off-by: ashish <[email protected]>

Author: pateash

src/commands/hash.ts

@@ -19,16 +19,25 @@ export default class Hash extends Command {
 
   static args = [{name: 'string'}]
 
+  // only 2 parameters required HASH_TYPE and INPUT_STRING
   async run() {
     const {args, flags} = this.parse(Hash)
 
-    // only 2 parameters required HASH_TYPE and INPUT_STRING
     flags.type = this.getHashType(flags) //by default let it be sha1
-    args.string = this.getInputString(flags,args) // from either -s,-f or args
+    args.string = Hash.getInputString(this,flags,args) // from either -s,-f or args
 
+    //check params after evaluating all
+    this.checkParameters(flags, args)
     this.calculateHash(flags, args)
   }
 
+  // to check required parameters passed or not
+  private checkParameters(flags: any, args: any) {
+    if(args.string == undefined || args.string =="" )
+      Logger.error(this, 'Input string is empty or undefined')
+
+  }
+
   private calculateHash(flags: any, args:any) {
     const hashObject = this.getHashObject(flags)
     let hashed: string = hashObject.hex(args.string)
@@ -57,16 +66,14 @@ export default class Hash extends Command {
     return flags.type || 'sha1'
   }
 
-  public getInputString(flags: any, args:any) {
+   static getInputString(thisRef: any ,flags: any, args:any) { //need to make it static so Crypto can use this
     // if -s or -f is not passed we will take it from args
-    let str=''
     if (flags.string) //if -s given
-      str = flags.string
+      return flags.string
     else if (flags.file) {
-      Logger.info(this, `reading file: ${flags.file}`)
-      str = Utilities.getStringFromFile(this, flags.file)
+      Logger.info(thisRef, `reading file: ${flags.file}`)
+      return Utilities.getStringFromFile(thisRef, flags.file)
     } else
-      str = args.string
-    return str;
+      return args.string
   }
 }

src/utilities/Logger.ts

@@ -11,7 +11,7 @@ export default class Logger {
   }
   public static error(thisRef: any, message: string) {
     signale.error(`${message}`)
-    thisRef.exit() //added to exit command
+    thisRef.exit(0) //added to exit command
   }
 
   // public static logSuccess(thisRef: any, message: string) {

src/utilities/Utilities.ts

@@ -5,7 +5,7 @@ export default class Utilities {
   public static getStringFromFile(thisRef: any, filePath: string) {
     let fileStr = ''
     if (!fs.existsSync(filePath)) {
-      Logger.error(thisRef,`Couldn't find: ${filePath}`) // this will output error and exit command
+      Logger.error(thisRef,`Could not find file: ${filePath}`) // this will output error and exit command
     } else {
       fileStr = fs.readFileSync(filePath, 'utf8')
 

test/commands/hash.test.ts

@@ -4,75 +4,93 @@ describe('hash', () => {
   test
     .stdout()
     .command(['hash', 'ashish'])
-    .it("cdt hash 'ashish'", ctx => {
+    .it("Check default type -> cdt hash 'ashish'", ctx => {
       expect(ctx.stdout).to.contain('428b6da53085b8fd7b37e9fb259c0c609bd09984')
     })
 
+  //invalid type
+  test
+    .stdout()
+    .command(['hash', '-t', 'invalid', 'ashish'])
+    .exit(0)
+    .it("Invalid type -> cdt hash -t invalid 'ashish'", ctx => {
+      expect(ctx.stdout).to.contain('Invalid Or Unsupported hash type')
+    })
+
+  //empty string
+  test
+    .stdout()
+    .command(['hash', '-t', 'md5'])
+    .exit(0)
+    .it("Empty Input String -> cdt hash -t md5", ctx => {
+      expect(ctx.stdout).to.contain('Input string is empty or undefined')
+    })
+
+
   // passing sha1 as option
   test
     .stdout()
     .command(['hash', 'ashish' , '-t', 'sha1'])
-    .it("cdt hash 'ashish' -t 'sha1'", ctx => {
+    .it("Passing Default type:sha -> cdt hash 'ashish' -t 'sha1'", ctx => {
       expect(ctx.stdout).to.contain('428b6da53085b8fd7b37e9fb259c0c609bd09984')
     })
 
   //overriding string with option -s
   test
     .stdout()
     .command(['hash', '-s', 'ashish'])
-    .it("cdt hash -s 'ashish'", ctx => {
+    .it("Passing string with -s flag -> cdt hash -s 'ashish'", ctx => {
       expect(ctx.stdout).to.contain('428b6da53085b8fd7b37e9fb259c0c609bd09984')
     })
 
   // if both passed then need to take flag value of -s
   test
     .stdout()
     .command(['hash', 'patel', '-s', 'ashish'])
-    .it("cdt hash 'patel' -s 'ashish'", ctx => {
+    .it("Overriding argument string with -s flag -> cdt hash 'patel' -s 'ashish'", ctx => {
       expect(ctx.stdout).to.contain('428b6da53085b8fd7b37e9fb259c0c609bd09984')
     })
 
   //sha256
   test
     .stdout()
     .command(['hash', '-t', 'sha256', 'ashish'])
-    .it("cdt hash -t sha256 'ashish'", ctx => {
+    .it("Hash Sha256 -> cdt hash -t sha256 'ashish'", ctx => {
       expect(ctx.stdout).to.contain('05d08de271d2773a504b3a30f98df26cccda55689a8dc3514f55d3f247553d2b')
     })
 
   //md5
   test
     .stdout()
     .command(['hash', '--type', 'md5', 'ashish'])
-    .it("cdt hash --type md5 'ashish'", ctx => {
+    .it("Hash Md5 -> cdt hash --type md5 'ashish'", ctx => {
       expect(ctx.stdout).to.contain('7b69ad8a8999d4ca7c42b8a729fb0ffd')
     })
 
   //sha512
   test
     .stdout()
     .command(['hash', '--type', 'sha512', 'ashish'])
-    .it("cdt hash --type sha512 'ashish'", ctx => {
+    .it("Hash Sha512 -> cdt hash --type sha512 'ashish'", ctx => {
       expect(ctx.stdout).to.contain('2e076fcbd0e5dcb29d30da42a554de919864bbc29eaefe6d32c4f6bcb219d77ce5e48dada485dae92c918b10a03f42008c43ca721f06da6efa5fa9a223401907')
     })
 
   //rmd160
   test
     .stdout()
     .command(['hash', '--type', 'rmd160', 'ashish'])
-    .it("cdt hash --type rmd160 'ashish'", ctx => {
+    .it("Hash rmd160 -> cdt hash --type rmd160 'ashish'", ctx => {
       expect(ctx.stdout).to.contain('a85a72b0a240abecdf27f127aa75fd8663d6d5be')
     })
 
   //file input - file not found TODO: solve issue #4
-/*
   test
-    .stderr()
+    .stdout()
     .command(['hash', '-f', 'test/resources/filenotfound.txt'])
+    .exit(0)
     .it("cdt hash -f 'test/resources/filenotfound.txt'", ctx => {
-      expect(ctx.stderr).to.contain('Error: reading File')
+      expect(ctx.stdout).to.contain('Could not find file')
     })
-*/
 
   //file input
   test