From 2e21c39c00964310d267d1dd964af2c015b3d763 Mon Sep 17 00:00:00 2001
From: Ruslan Kuprieiev <kupruser@gmail.com>
Date: Thu, 8 Mar 2018 14:03:49 +0200
Subject: [PATCH] cli: move push/pull from under 'dvc cache'

Fixes #528

Signed-off-by: Ruslan Kuprieiev <kupruser@gmail.com>
---
 dvc/cli.py               | 19 +++++--------------
 tests/test_cli.py        |  6 +++---
 tests/test_data_cloud.py | 12 ++++++------
 3 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/dvc/cli.py b/dvc/cli.py
index f275f788b..c6c4b0d94 100644
--- a/dvc/cli.py
+++ b/dvc/cli.py
@@ -138,38 +138,29 @@ def parse_args(argv=None):
                         default=None,
                         help='DVC files.')
 
-    # Cache
-    cache_parser = subparsers.add_parser(
-                        'cache',
-                        parents=[parent_parser],
-                        help='Cache operations')
-    cache_subparsers = cache_parser.add_subparsers(
-                        dest='cmd',
-                        help='Use `dvc cache CMD` --help for command-specific help')
-
     # Pull
-    pull_parser = cache_subparsers.add_parser(
+    pull_parser = subparsers.add_parser(
                         'pull',
                         parents=[parent_cache_parser],
                         help='Pull data files from the cloud')
     pull_parser.set_defaults(func=CmdDataPull)
 
     # Push
-    push_parser = cache_subparsers.add_parser(
+    push_parser = subparsers.add_parser(
                         'push',
                         parents=[parent_cache_parser],
                         help='Push data files to the cloud')
     push_parser.set_defaults(func=CmdDataPush)
 
-    #Fetch
-    fetch_parser = cache_subparsers.add_parser(
+    # Fetch
+    fetch_parser = subparsers.add_parser(
                         'fetch',
                         parents=[parent_cache_parser],
                         help='Fetch data files from the cloud')
     fetch_parser.set_defaults(func=CmdDataFetch)
 
     # Status
-    status_parser = cache_subparsers.add_parser(
+    status_parser = subparsers.add_parser(
                         'status',
                         parents=[parent_cache_parser],
                         help='Show mismatches between local cache and cloud cache')
diff --git a/tests/test_cli.py b/tests/test_cli.py
index d4500d110..8f9a8cf52 100644
--- a/tests/test_cli.py
+++ b/tests/test_cli.py
@@ -62,19 +62,19 @@ class TestRun(TestDvc):
 
 class TestPull(TestDvc):
     def test(self):
-        args = parse_args(['cache', 'pull'])
+        args = parse_args(['pull'])
         self.assertIsInstance(args.func(args), CmdDataPull)
 
 
 class TestPush(TestDvc):
     def test(self):
-        args = parse_args(['cache', 'push'])
+        args = parse_args(['push'])
         self.assertIsInstance(args.func(args), CmdDataPush)
 
 
 class TestStatus(TestDvc):
     def test(self):
-        args = parse_args(['cache', 'status'])
+        args = parse_args(['status'])
         self.assertIsInstance(args.func(args), CmdDataStatus)
 
 
diff --git a/tests/test_data_cloud.py b/tests/test_data_cloud.py
index 9ce221615..9b5826d9f 100644
--- a/tests/test_data_cloud.py
+++ b/tests/test_data_cloud.py
@@ -204,26 +204,26 @@ class TestDataCloudLocalCli(TestDvc):
         cache_dir = stage_dir.outs[0].cache
 
         #FIXME check status output
-        self.main(['cache', 'status'])
+        self.main(['status'])
 
-        self.main(['cache', 'push'])
+        self.main(['push'])
         self.assertTrue(os.path.exists(cache))
         self.assertTrue(os.path.isfile(cache))
         self.assertTrue(os.path.isfile(cache_dir))
 
-        self.main(['cache', 'status'])
+        self.main(['status'])
 
         os.chmod(cache, 0o777)
         os.unlink(cache)
         self.dvc._remove_cache(cache_dir)
 
-        self.main(['cache', 'status'])
+        self.main(['status'])
 
-        self.main(['cache', 'pull'])
+        self.main(['pull'])
         self.assertTrue(os.path.exists(cache))
         self.assertTrue(os.path.isfile(cache))
         with open(cache, 'r') as fd:
             self.assertEqual(fd.read(), self.FOO_CONTENTS)
         self.assertTrue(os.path.isfile(cache_dir))
 
-        self.main(['cache', 'status'])
+        self.main(['status'])