[ADD] DCOS-2274

[FIX] fix from comment

[FIX] use "Command Not Recognised. Usage below" instead "Please see Usage "

[FIX] chenge message

cli/dcoscli/config/main.py

@@ -32,6 +32,7 @@
 from dcos import cmds, config, emitting, http, jsonitem, subcommand, util
 from dcos.errors import DCOSException
 from dcoscli import analytics
+from dcoscli.main import decorate_docopt_usage
 
 emitter = emitting.FlatEmitter()
 logger = util.get_logger(__name__)
@@ -45,6 +46,7 @@ def main():
         return 1
 
 
+@decorate_docopt_usage
 def _main():
     util.configure_process_from_environ()
 

cli/dcoscli/help/main.py

@@ -15,6 +15,7 @@
 from concurrent.futures import ThreadPoolExecutor
 from dcos import cmds, emitting, options, subcommand, util
 from dcos.errors import DCOSException
+from dcoscli.main import decorate_docopt_usage
 
 emitter = emitting.FlatEmitter()
 logger = util.get_logger(__name__)
@@ -28,6 +29,7 @@ def main():
         return 1
 
 
+@decorate_docopt_usage
 def _main():
     util.configure_process_from_environ()
 

cli/dcoscli/main.py

@@ -38,6 +38,7 @@
 import os
 import signal
 import sys
+from functools import wraps
 from subprocess import PIPE, Popen
 
 import dcoscli
@@ -130,3 +131,24 @@ def signal_handler(signal, frame):
     emitter.publish(
         errors.DefaultError("User interrupted command with Ctrl-C"))
     sys.exit(0)
+
+
+def decorate_docopt_usage(func):
+    """Handle DocoptExit exception
+
+    :param func: function
+    :type func: function
+    :return: wrapped function
+    :rtype: function
+    """
+
+    @wraps(func)
+    def wrapper(*args, **kwargs):
+        try:
+            result = func(*args, **kwargs)
+        except docopt.DocoptExit as e:
+            emitter.publish("Command not recognized\n")
+            emitter.publish(e)
+            return 1
+        return result
+    return wrapper

cli/dcoscli/marathon/main.py

@@ -108,6 +108,7 @@
 from dcos import cmds, emitting, http, jsonitem, marathon, options, util
 from dcos.errors import DCOSException
 from dcoscli import tables
+from dcoscli.main import decorate_docopt_usage
 
 logger = util.get_logger(__name__)
 emitter = emitting.FlatEmitter()
@@ -121,6 +122,7 @@ def main():
         return 1
 
 
+@decorate_docopt_usage
 def _main():
     util.configure_process_from_environ()
 

cli/dcoscli/node/main.py

@@ -30,6 +30,7 @@
 from dcos import cmds, emitting, errors, mesos, util
 from dcos.errors import DCOSException, DefaultError
 from dcoscli import log, tables
+from dcoscli.main import decorate_docopt_usage
 
 logger = util.get_logger(__name__)
 emitter = emitting.FlatEmitter()
@@ -43,6 +44,7 @@ def main():
         return 1
 
 
+@decorate_docopt_usage
 def _main():
     util.configure_process_from_environ()
 

cli/dcoscli/package/main.py

@@ -9,6 +9,7 @@
                   util)
 from dcos.errors import DCOSException
 from dcoscli import tables
+from dcoscli.main import decorate_docopt_usage
 
 logger = util.get_logger(__name__)
 emitter = emitting.FlatEmitter()
@@ -28,6 +29,7 @@ def _doc():
         'data/help/package.txt').decode('utf-8')
 
 
+@decorate_docopt_usage
 def _main():
     util.configure_process_from_environ()
 

cli/dcoscli/service/main.py

@@ -43,6 +43,7 @@
 from dcos import cmds, emitting, marathon, mesos, package, util
 from dcos.errors import DCOSException, DefaultError
 from dcoscli import log, tables
+from dcoscli.main import decorate_docopt_usage
 
 logger = util.get_logger(__name__)
 emitter = emitting.FlatEmitter()
@@ -56,6 +57,7 @@ def main():
         return 1
 
 
+@decorate_docopt_usage
 def _main():
     util.configure_process_from_environ()
 

cli/dcoscli/task/main.py

@@ -30,6 +30,7 @@
 from dcos import cmds, emitting, mesos, util
 from dcos.errors import DCOSException, DCOSHTTPException, DefaultError
 from dcoscli import log, tables
+from dcoscli.main import decorate_docopt_usage
 
 logger = util.get_logger(__name__)
 emitter = emitting.FlatEmitter()
@@ -43,6 +44,7 @@ def main():
         return 1
 
 
+@decorate_docopt_usage
 def _main():
     util.configure_process_from_environ()