Smal fixes. (#125)

Author: tjprescott

knack/cli.py

@@ -185,6 +185,7 @@ def invoke(self, args, initial_invocation_data=None, out_file=None):
 
         if not isinstance(args, (list, tuple)):
             raise TypeError('args should be a list or tuple.')
+        exit_code = 0
         try:
             args = self.completion.get_completion_args() or args
             out_file = out_file or self.out_file
@@ -195,6 +196,7 @@ def invoke(self, args, initial_invocation_data=None, out_file=None):
             self.raise_event(EVENT_CLI_PRE_EXECUTE)
             if CLI._should_show_version(args):
                 self.show_version()
+                self.result = CommandResultItem(None)
             else:
                 self.invocation = self.invocation_cls(cli_ctx=self,
                                                       parser_cls=self.parser_cls,
@@ -203,17 +205,19 @@ def invoke(self, args, initial_invocation_data=None, out_file=None):
                                                       initial_data=initial_invocation_data)
                 cmd_result = self.invocation.execute(args)
                 self.result = cmd_result
+                exit_code = self.result.exit_code
                 output_type = self.invocation.data['output']
                 if cmd_result and cmd_result.result is not None:
                     formatter = self.output.get_formatter(output_type)
                     self.output.out(cmd_result, formatter=formatter, out_file=out_file)
             self.raise_event(EVENT_CLI_POST_EXECUTE)
         except KeyboardInterrupt as ex:
-            self.result = CommandResultItem(None, exit_code=1, error=ex)
+            self.result = CommandResultItem(None, error=ex)
             exit_code = 1
         except Exception as ex:  # pylint: disable=broad-except
             exit_code = self.exception_handler(ex)
-            self.result = CommandResultItem(None, exit_code=exit_code, error=ex)
+            self.result = CommandResultItem(None, error=ex)
         finally:
             pass
-        return self.result.exit_code
+        self.result.exit_code = exit_code
+        return exit_code

knack/invocation.py

@@ -142,7 +142,7 @@ def execute(self, args):
             self.cli_ctx.completion.enable_autocomplete(self.parser)
             subparser = self.parser.subparsers[tuple()]
             self.help.show_welcome(subparser)
-            return None
+            return CommandResultItem(None, exit_code=0)
 
         if args[0].lower() == 'help':
             args[0] = '--help'

setup.py

@@ -9,7 +9,7 @@
 from codecs import open
 from setuptools import setup, find_packages
 
-VERSION = '0.5.0'
+VERSION = '0.5.1'
 
 DEPENDENCIES = [
     'argcomplete',