Restyle GDrive remote support

dvc/config.py

@@ -1,18 +1,24 @@
 """DVC config objects."""
-
 from __future__ import unicode_literals
 
-from dvc.utils.compat import str, open
-
-import os
-import re
 import copy
 import errno
-import configobj
 import logging
+import os
+import re
 
-from schema import Schema, Optional, And, Use, Regex, SchemaError
-from dvc.exceptions import DvcException, NotDvcRepoError
+import configobj
+from schema import And
+from schema import Optional
+from schema import Regex
+from schema import Schema
+from schema import SchemaError
+from schema import Use
+
+from dvc.exceptions import DvcException
+from dvc.exceptions import NotDvcRepoError
+from dvc.utils.compat import open
+from dvc.utils.compat import str
 
 logger = logging.getLogger(__name__)
 
@@ -26,19 +32,16 @@ class ConfigError(DvcException):
     """
 
     def __init__(self, msg, cause=None):
-        super(ConfigError, self).__init__(
-            "config file error: {}".format(msg), cause=cause
-        )
+        super(ConfigError, self).__init__("config file error: {}".format(msg),
+                                          cause=cause)
 
 
 class NoRemoteError(ConfigError):
     def __init__(self, command, cause=None):
-        msg = (
-            "no remote specified. Setup default remote with\n"
-            "    dvc config core.remote <name>\n"
-            "or use:\n"
-            "    dvc {} -r <name>\n".format(command)
-        )
+        msg = ("no remote specified. Setup default remote with\n"
+               "    dvc config core.remote <name>\n"
+               "or use:\n"
+               "    dvc {} -r <name>\n".format(command))
 
         super(NoRemoteError, self).__init__(msg, cause=cause)
 
@@ -147,6 +150,8 @@ class Config(object):  # pylint: disable=too-many-instance-attributes
     CONFIG = "config"
     CONFIG_LOCAL = "config.local"
 
+    CREDENTIALPATH = "credentialpath"
+
     LEVEL_LOCAL = 0
     LEVEL_REPO = 1
     LEVEL_GLOBAL = 2
@@ -157,8 +162,7 @@ class Config(object):  # pylint: disable=too-many-instance-attributes
     SECTION_CORE = "core"
     SECTION_CORE_LOGLEVEL = "loglevel"
     SECTION_CORE_LOGLEVEL_SCHEMA = And(
-        Use(str.lower), Choices("info", "debug", "warning", "error")
-    )
+        Use(str.lower), Choices("info", "debug", "warning", "error"))
     SECTION_CORE_REMOTE = "remote"
     SECTION_CORE_INTERACTIVE_SCHEMA = BOOL_SCHEMA
     SECTION_CORE_INTERACTIVE = "interactive"
@@ -197,25 +201,22 @@ class Config(object):  # pylint: disable=too-many-instance-attributes
     }
 
     SECTION_CORE_SCHEMA = {
-        Optional(SECTION_CORE_LOGLEVEL): And(
-            str, Use(str.lower), SECTION_CORE_LOGLEVEL_SCHEMA
-        ),
-        Optional(SECTION_CORE_REMOTE, default=""): And(str, Use(str.lower)),
-        Optional(
-            SECTION_CORE_INTERACTIVE, default=False
-        ): SECTION_CORE_INTERACTIVE_SCHEMA,
-        Optional(
-            SECTION_CORE_ANALYTICS, default=True
-        ): SECTION_CORE_ANALYTICS_SCHEMA,
-        Optional(
-            SECTION_CORE_CHECKSUM_JOBS, default=None
-        ): SECTION_CORE_CHECKSUM_JOBS_SCHEMA,
+        Optional(SECTION_CORE_LOGLEVEL):
+        And(str, Use(str.lower), SECTION_CORE_LOGLEVEL_SCHEMA),
+        Optional(SECTION_CORE_REMOTE, default=""):
+        And(str, Use(str.lower)),
+        Optional(SECTION_CORE_INTERACTIVE, default=False):
+        SECTION_CORE_INTERACTIVE_SCHEMA,
+        Optional(SECTION_CORE_ANALYTICS, default=True):
+        SECTION_CORE_ANALYTICS_SCHEMA,
+        Optional(SECTION_CORE_CHECKSUM_JOBS, default=None):
+        SECTION_CORE_CHECKSUM_JOBS_SCHEMA,
     }
 
     # backward compatibility
     SECTION_AWS = "aws"
     SECTION_AWS_STORAGEPATH = "storagepath"
-    SECTION_AWS_CREDENTIALPATH = "credentialpath"
+    SECTION_AWS_CREDENTIALPATH = CREDENTIALPATH
     SECTION_AWS_ENDPOINT_URL = "endpointurl"
     SECTION_AWS_LIST_OBJECTS = "listobjects"
     SECTION_AWS_REGION = "region"
@@ -238,7 +239,7 @@ class Config(object):  # pylint: disable=too-many-instance-attributes
     # backward compatibility
     SECTION_GCP = "gcp"
     SECTION_GCP_STORAGEPATH = SECTION_AWS_STORAGEPATH
-    SECTION_GCP_CREDENTIALPATH = SECTION_AWS_CREDENTIALPATH
+    SECTION_GCP_CREDENTIALPATH = CREDENTIALPATH
     SECTION_GCP_PROJECTNAME = "projectname"
     SECTION_GCP_SCHEMA = {
         SECTION_GCP_STORAGEPATH: str,
@@ -255,6 +256,10 @@ class Config(object):  # pylint: disable=too-many-instance-attributes
     SECTION_OSS_ACCESS_KEY_ID = "oss_key_id"
     SECTION_OSS_ACCESS_KEY_SECRET = "oss_key_secret"
     SECTION_OSS_ENDPOINT = "oss_endpoint"
+    # GDrive options
+    SECTION_GDRIVE_CLIENT_ID = "gdrive_client_id"
+    SECTION_GDRIVE_CLIENT_SECRET = "gdrive_client_secret"
+    SECTION_GDRIVE_USER_CREDENTIALS_FILE = "gdrive_user_credentials_file"
 
     SECTION_REMOTE_REGEX = r'^\s*remote\s*"(?P<name>.*)"\s*$'
     SECTION_REMOTE_FMT = 'remote "{}"'
@@ -271,7 +276,7 @@ class Config(object):  # pylint: disable=too-many-instance-attributes
         SECTION_REMOTE_URL: str,
         Optional(SECTION_AWS_REGION): str,
         Optional(SECTION_AWS_PROFILE): str,
-        Optional(SECTION_AWS_CREDENTIALPATH): str,
+        Optional(CREDENTIALPATH): str,
         Optional(SECTION_AWS_ENDPOINT_URL): str,
         Optional(SECTION_AWS_LIST_OBJECTS, default=False): BOOL_SCHEMA,
         Optional(SECTION_AWS_USE_SSL, default=True): BOOL_SCHEMA,
@@ -291,6 +296,9 @@ class Config(object):  # pylint: disable=too-many-instance-attributes
         Optional(SECTION_OSS_ACCESS_KEY_ID): str,
         Optional(SECTION_OSS_ACCESS_KEY_SECRET): str,
         Optional(SECTION_OSS_ENDPOINT): str,
+        Optional(SECTION_GDRIVE_CLIENT_ID): str,
+        Optional(SECTION_GDRIVE_CLIENT_SECRET): str,
+        Optional(SECTION_GDRIVE_USER_CREDENTIALS_FILE): str,
         Optional(PRIVATE_CWD): str,
         Optional(SECTION_REMOTE_NO_TRAVERSE, default=True): BOOL_SCHEMA,
     }
@@ -339,9 +347,8 @@ def get_global_config_dir():
         """
         from appdirs import user_config_dir
 
-        return user_config_dir(
-            appname=Config.APPNAME, appauthor=Config.APPAUTHOR
-        )
+        return user_config_dir(appname=Config.APPNAME,
+                               appauthor=Config.APPAUTHOR)
 
     @staticmethod
     def get_system_config_dir():
@@ -352,9 +359,8 @@ def get_system_config_dir():
         """
         from appdirs import site_config_dir
 
-        return site_config_dir(
-            appname=Config.APPNAME, appauthor=Config.APPAUTHOR
-        )
+        return site_config_dir(appname=Config.APPNAME,
+                               appauthor=Config.APPAUTHOR)
 
     @staticmethod
     def init(dvc_dir):
@@ -397,13 +403,11 @@ def _resolve_paths(self, config):
         return ret
 
     def _load_configs(self):
-        system_config_file = os.path.join(
-            self.get_system_config_dir(), self.CONFIG
-        )
+        system_config_file = os.path.join(self.get_system_config_dir(),
+                                          self.CONFIG)
 
-        global_config_file = os.path.join(
-            self.get_global_config_dir(), self.CONFIG
-        )
+        global_config_file = os.path.join(self.get_global_config_dir(),
+                                          self.CONFIG)
 
         self._system_config = configobj.ConfigObj(system_config_file)
         self._global_config = configobj.ConfigObj(global_config_file)
@@ -437,10 +441,10 @@ def load(self):
 
         self.config = configobj.ConfigObj()
         for c in [
-            self._system_config,
-            self._global_config,
-            self._repo_config,
-            self._local_config,
+                self._system_config,
+                self._global_config,
+                self._repo_config,
+                self._local_config,
         ]:
             c = self._resolve_paths(c)
             c = self._lower(c)
@@ -516,9 +520,8 @@ def unset(self, section, opt=None, level=None, force=False):
             if opt not in config[section].keys():
                 if force:
                     return
-                raise ConfigError(
-                    "option '{}.{}' doesn't exist".format(section, opt)
-                )
+                raise ConfigError("option '{}.{}' doesn't exist".format(
+                    section, opt))
             del config[section][opt]
 
             if not config[section]:
@@ -551,8 +554,7 @@ def set(self, section, opt, value, level=None, force=True):
         elif not force:
             raise ConfigError(
                 "Section '{}' already exists. Use `-f|--force` to overwrite "
-                "section with new value.".format(section)
-            )
+                "section with new value.".format(section))
 
         config[section][opt] = value
         self.save(config)
@@ -574,9 +576,8 @@ def get(self, section, opt=None, level=None):
             raise ConfigError("section '{}' doesn't exist".format(section))
 
         if opt not in config[section].keys():
-            raise ConfigError(
-                "option '{}.{}' doesn't exist".format(section, opt)
-            )
+            raise ConfigError("option '{}.{}' doesn't exist".format(
+                section, opt))
 
         return config[section][opt]
 

dvc/remote/__init__.py

@@ -1,20 +1,20 @@
 from __future__ import unicode_literals
 
+from .config import RemoteConfig
 from dvc.remote.azure import RemoteAZURE
+from dvc.remote.gdrive import RemoteGDrive
 from dvc.remote.gs import RemoteGS
 from dvc.remote.hdfs import RemoteHDFS
-from dvc.remote.local import RemoteLOCAL
-from dvc.remote.s3 import RemoteS3
-from dvc.remote.ssh import RemoteSSH
 from dvc.remote.http import RemoteHTTP
 from dvc.remote.https import RemoteHTTPS
+from dvc.remote.local import RemoteLOCAL
 from dvc.remote.oss import RemoteOSS
-
-from .config import RemoteConfig
-
+from dvc.remote.s3 import RemoteS3
+from dvc.remote.ssh import RemoteSSH
 
 REMOTES = [
     RemoteAZURE,
+    RemoteGDrive,
     RemoteGS,
     RemoteHDFS,
     RemoteHTTP,