add some error handling to App

3 files changed, 16 insertions, 3 deletions

diff --git a/demoapp/cliffdemo/main.py b/demoapp/cliffdemo/main.py
index cebf552..9059227 100644
--- a/demoapp/cliffdemo/main.py
+++ b/demoapp/cliffdemo/main.py
@@ -19,14 +19,16 @@ class DemoApp(App):
     def prepare_to_run_command(self, cmd):
         self.log.debug('prepare_to_run_command %s', cmd.__class__.__name__)
 
-    def clean_up(self, cmd, result):
+    def clean_up(self, cmd, result, err):
         self.log.debug('clean_up %s', cmd.__class__.__name__)
+        if err:
+            self.log.debug('got an error: %s', err)
 
 
 def main(argv=sys.argv[1:]):
     myapp = DemoApp()
-    myapp.run(argv)
+    return myapp.run(argv)
 
 
 if __name__ == '__main__':
-    main(sys.argv[1:])
+    sys.exit(main(sys.argv[1:]))
diff --git a/demoapp/cliffdemo/simple.py b/demoapp/cliffdemo/simple.py
index 2f273b9..1d449d0 100644
--- a/demoapp/cliffdemo/simple.py
+++ b/demoapp/cliffdemo/simple.py
@@ -12,3 +12,13 @@ class Simple(Command):
         self.log.info('sending greeting')
         self.log.debug('debugging')
         print('hi!')
+
+
+class Error(Command):
+    "Always raises an error"
+
+    log = logging.getLogger(__name__)
+
+    def run(self, parsed_args):
+        self.log.info('causing error')
+        raise RuntimeError('this is the expected exception')
diff --git a/demoapp/setup.py b/demoapp/setup.py
index ec3dcec..fea934c 100644
--- a/demoapp/setup.py
+++ b/demoapp/setup.py
@@ -163,6 +163,7 @@ setup(
         'cliff.demo': [
             'simple = cliffdemo.simple:Simple',
             'two_part = cliffdemo.simple:Simple',
+            'error = cliffdemo.simple:Error',
             ],
         # 'virtualenvwrapper.initialize': [
         #     'user_scripts = virtualenvwrapper.user_scripts:initialize',