From b652d00fd9061a77516d810984231c78b5117246 Mon Sep 17 00:00:00 2001 From: Ruslan Kuprieiev Date: Thu, 5 Apr 2018 21:29:15 +0300 Subject: [PATCH] cli: add 'dvc remote {add|remove}' Signed-off-by: Ruslan Kuprieiev --- dvc/cli.py | 35 ++++++++++++++++++++++++++++++++ dvc/command/config.py | 47 +++++++++++++++++++++++++------------------ dvc/command/remote.py | 15 ++++++++++++++ 3 files changed, 77 insertions(+), 20 deletions(-) create mode 100644 dvc/command/remote.py diff --git a/dvc/cli.py b/dvc/cli.py index bbf707b6f..8457b3463 100644 --- a/dvc/cli.py +++ b/dvc/cli.py @@ -16,6 +16,7 @@ from dvc.command.gc import CmdGC from dvc.command.add import CmdAdd from dvc.command.config import CmdConfig from dvc.command.checkout import CmdCheckout +from dvc.command.remote import CmdRemoteAdd, CmdRemoteRemove from dvc.stage import Stage from dvc import VERSION @@ -228,6 +229,40 @@ def parse_args(argv=None): help='Option value') config_parser.set_defaults(func=CmdConfig) + + # Remote + remote_parser = subparsers.add_parser( + 'remote', + parents=[parent_parser], + help='Manage set of tracked repositories') + + remote_subparsers = remote_parser.add_subparsers( + dest='cmd', + help='Use dvc remote CMD --help for command-specific help') + + remote_add_parser = remote_subparsers.add_parser( + 'add', + parents=[parent_parser], + help='Add remote') + remote_add_parser.add_argument( + 'name', + help='Name') + remote_add_parser.add_argument( + 'url', + help='Url') + remote_add_parser.set_defaults(func=CmdRemoteAdd) + + + remote_remove_parser = remote_subparsers.add_parser( + 'remove', + parents=[parent_parser], + help='Remove remote') + remote_remove_parser.add_argument( + 'name', + help='Name') + remote_remove_parser.set_defaults(func=CmdRemoteRemove) + + args = parser.parse_args(argv) if args.quiet and not args.verbose: diff --git a/dvc/command/config.py b/dvc/command/config.py index c7d2a5ba6..2ac288ba6 100644 --- a/dvc/command/config.py +++ b/dvc/command/config.py @@ -12,6 +12,9 @@ class CmdConfig(CmdBase): self.args = args root_dir = self._find_root() self.config_file = os.path.join(root_dir, Project.DVC_DIR, Config.CONFIG) + # Using configobj because it doesn't + # drop comments like configparser does. + self.configobj = configobj.ConfigObj(self.config_file, write_empty_values=True) def run_cmd(self): return self.run() @@ -27,31 +30,39 @@ class CmdConfig(CmdBase): return None - def unset(self): + def save(self): try: - del self.configobj[self.section][self.opt] self.configobj.write() except Exception as exc: - Logger.error('Failed to unset \'{}\': {}'.format(self.args.name, exc)) + Logger.error("Failed to write config '{}'".format(self.configobj.filename), exc) + return 1 + return 0 + + def unset(self, section, opt): + if section not in self.configobj.keys(): + Logger.error("Section '{}' doesn't exist".format(section)) return 1 - return 0 + if opt not in self.configobj[section].keys(): + return 0 + + del self.configobj[section][opt] + if len(self.configobj[section]) == 0: + del self.configobj[section] + + return self.save() def show(self): Logger.info(self.configobj[self.section][self.opt]) return 0 - def set(self): - try: - self.configobj[self.section][self.opt] = self.args.value - self.configobj.write() - except Exception as exc: - Logger.error('Failed to set \'{}\' to \'{}\': {}'.format(self.args.name, - self.args.value, - exc)) - return 1 + def set(self, section, opt, value): + if section not in self.configobj.keys(): + self.configobj[section] = {} - return 0 + self.configobj[section][opt] = value + + return self.save() def check_opt(self): _section, _opt = self.args.name.strip().split('.', 1) @@ -74,17 +85,13 @@ class CmdConfig(CmdBase): return 0 def run(self): - # Using configobj because it doesn't - # drop comments like configparser does. - self.configobj = configobj.ConfigObj(self.config_file, write_empty_values=True) - if self.check_opt() != 0: return 1 if self.args.unset: - return self.unset() + return self.unset(self.section, self.opt) if self.args.value is None: return self.show() - return self.set() + return self.set(self.section, self.opt, self.args.value) diff --git a/dvc/command/remote.py b/dvc/command/remote.py new file mode 100644 index 000000000..a822b36e4 --- /dev/null +++ b/dvc/command/remote.py @@ -0,0 +1,15 @@ +from dvc.command.common.base import CmdBase +from dvc.config import Config +from dvc.command.config import CmdConfig + + +class CmdRemoteAdd(CmdConfig): + def run(self): + section = Config.SECTION_REMOTE_FMT.format(self.args.name) + return self.set(section, Config.SECTION_REMOTE_URL, self.args.url) + + +class CmdRemoteRemove(CmdConfig): + def run(self): + section = Config.SECTION_REMOTE_FMT.format(self.args.name) + return self.unset(section, Config.SECTION_REMOTE_URL)