Merge branch 'master' into emilio/luis

Author: munozemilio

packages/command/src/command.ts

@@ -2,6 +2,7 @@
 
 import { Command as Base } from '@oclif/command'
 export { flags } from '@oclif/command'
+import { CLIError as OCLIFError } from '@oclif/errors'
 import { CLIError } from './clierror'
 export { CLIError } from './clierror'
 import ReadPipedData from './readpipeddata'
@@ -33,7 +34,7 @@ export abstract class Command extends Base {
   }
 
   async catch(err: any) {
-    if (err instanceof CLIError) {
+    if (err instanceof CLIError || err instanceof OCLIFError) {
       if (!err.message.match(/EEXIT: 0/)) {
         this.error(err.message)
       }
@@ -71,7 +72,7 @@ export abstract class Command extends Base {
   }
 
   private extractError(input: string | Error): string {
-    return input instanceof Error ? input.message.concat(input.name) : input
+    return input instanceof Error ? input.name : input
   }
 
   private getTelemetryProperties(): Array<string> {

packages/command/test/command.test.ts

@@ -1,5 +1,6 @@
 import {Command} from '../src/command'
 import {CLIError} from './../src/clierror' 
+import { CLIError as OCLIFError } from '@oclif/errors'
 import {expect, fancy} from 'fancy-test'
 import ReadPipedStdin from '../src/readpipeddata'
 import * as path from 'path';
@@ -36,6 +37,20 @@ describe('command', () => {
   .do(output => expect(output.stderr).to.equal('failure\n'))
   .it('Exits with error')
 
+  fancy
+  .stderr()
+  .do(async () => {
+    class Test extends Command {
+        async run() {
+          throw new OCLIFError('failure')
+        }
+      }
+
+    return Test.run([])
+  })
+  .do(output => expect(output.stderr).to.equal('failure\n'))
+  .it('Handles OCLIF Errors')
+
   fancy
   .stderr()
   .do(async () => {