Merge branch 'master' into master

1 files changed, 42 insertions, 8 deletions

diff --git a/gitlab/v4/cli.py b/gitlab/v4/cli.py
index 880b07d..242874d 100644
--- a/gitlab/v4/cli.py
+++ b/gitlab/v4/cli.py
@@ -19,6 +19,7 @@
 from __future__ import print_function
 import inspect
 import operator
+import sys
 
 import six
 
@@ -54,11 +55,18 @@ class GitlabCLI(object):
                     self.args[attr_name] = obj.get()
 
     def __call__(self):
+        # Check for a method that matches object + action
+        method = 'do_%s_%s' % (self.what, self.action)
+        if hasattr(self, method):
+            return getattr(self, method)()
+
+        # Fallback to standard actions (get, list, create, ...)
         method = 'do_%s' % self.action
         if hasattr(self, method):
             return getattr(self, method)()
-        else:
-            return self.do_custom()
+
+        # Finally try to find custom methods
+        return self.do_custom()
 
     def do_custom(self):
         in_obj = cli.custom_actions[self.cls_name][self.action][2]
@@ -77,6 +85,20 @@ class GitlabCLI(object):
         else:
             return getattr(self.mgr, self.action)(**self.args)
 
+    def do_project_export_download(self):
+        try:
+            project = self.gl.projects.get(int(self.args['project_id']),
+                                           lazy=True)
+            data = project.exports.get().download()
+            if hasattr(sys.stdout, 'buffer'):
+                # python3
+                sys.stdout.buffer.write(data)
+            else:
+                sys.stdout.write(data)
+
+        except Exception as e:
+            cli.die("Impossible to download the export", e)
+
     def do_create(self):
         try:
             return self.mgr.create(self.args)
@@ -280,14 +302,24 @@ class JSONPrinter(object):
 
 class YAMLPrinter(object):
     def display(self, d, **kwargs):
-        import yaml  # noqa
-        print(yaml.safe_dump(d, default_flow_style=False))
+        try:
+            import yaml  # noqa
+            print(yaml.safe_dump(d, default_flow_style=False))
+        except ImportError:
+            exit("PyYaml is not installed.\n"
+                 "Install it with `pip install PyYaml` "
+                 "to use the yaml output feature")
 
     def display_list(self, data, fields, **kwargs):
-        import yaml  # noqa
-        print(yaml.safe_dump(
-            [get_dict(obj, fields) for obj in data],
-            default_flow_style=False))
+        try:
+            import yaml  # noqa
+            print(yaml.safe_dump(
+                [get_dict(obj, fields) for obj in data],
+                default_flow_style=False))
+        except ImportError:
+            exit("PyYaml is not installed.\n"
+                 "Install it with `pip install PyYaml` "
+                 "to use the yaml output feature")
 
 
 class LegacyPrinter(object):
@@ -366,3 +398,5 @@ def run(gl, what, action, args, verbose, output, fields):
         printer.display(get_dict(data, fields), verbose=verbose, obj=data)
     elif isinstance(data, six.string_types):
         print(data)
+    elif hasattr(data, 'decode'):
+        print(data.decode())