Move CLI to a separate folder

Author: seignovert

opus/cli/__init__.py

@@ -0,0 +1 @@
+from .cli import *

opus/cli/cassini.py

@@ -0,0 +1,14 @@
+# -*- coding: utf-8 -*-
+
+from ..api import API
+from .cli import data
+
+api = API()
+
+def vims(argv=None, api=api):
+    '''Cassini VIMS data entry point'''
+    return data(argv, desc='Get Cassini VIMS Images and Cubes from OPUS API',
+                args=[{'surfacegeometrytargetname': {'help': 'VIMS target name', 'metavar': 'TARGET_NAME'}},
+                      {'--cols': {'default': 'ringobsid,target,revno,time1,primaryfilespec,channel',
+                                  'help': 'Output columns (default: `ringobsid,target,revno,time1,primaryfilespec,channel`)'}}],
+                defaults={'instrumentid': 'Cassini+VIMS', 'typeid': 'Image,Cube'}, api=api)

opus/cli.py opus/cli/cli.pyopus/cli.py renamed to opus/cli/cli.py

@@ -2,7 +2,7 @@
 import os
 import argparse
 
-from .api import API
+from ..api import API
 
 api = API()
 
@@ -63,12 +63,3 @@ def data(argv=None, desc='Get Data from OPUS-SETI API', args=[], defaults={}, ap
         os.sys.exit(2)
 
     return api.data(**vars(args))
-
-
-def vims(argv=None, api=api):
-    '''Cassini VIMS data entry point'''
-    return data(argv, desc='Get Cassini VIMS Images and Cubes from OPUS API',
-                args=[{'surfacegeometrytargetname': {'help': 'VIMS target name', 'metavar': 'TARGET_NAME'}},
-                    {'--cols': {'default': 'ringobsid,target,revno,time1,primaryfilespec,channel',
-                    'help': 'Output columns (default: `ringobsid,target,revno,time1,primaryfilespec,channel`)'}}],
-                defaults={'instrumentid': 'Cassini+VIMS', 'typeid': 'Image,Cube'}, api=api)

setup.cfg

@@ -34,4 +34,4 @@ addopts = -vv --cov-report term-missing --cov-report html --cov-report xml
 [entry_points]
 console_scripts =
     opus = opus.cli:data
-    opus-vims = opus.cli:vims
+    opus-vims = opus.cli.cassini:vims

tests/test_cli.py

@@ -4,7 +4,7 @@
 import six
 
 from opus.api import API
-from opus.cli import read, data, vims
+from opus.cli import read, data
 
 
 @pytest.fixture
@@ -84,23 +84,3 @@ def test_data_argv_none(api):
     with pytest.raises(SystemExit):
         resp = data(argv, api=api)
     assert len(responses.calls) == 0
-
-
-@responses.activate
-def test_cli_vims(api):
-    json = open('tests/api/data_vims.json', 'r').read()
-    responses.add(responses.GET,
-                  'http://localhost/data.json',
-                  body=json)
-
-    argv = ['TITAN']
-    resp = vims(argv, api=api)
-
-    assert len(responses.calls) == 1
-    if six.PY3:
-        assert responses.calls[0].request.url == 'http://localhost/data.json?surfacegeometrytargetname=TITAN&cols=ringobsid,target,revno,time1,primaryfilespec,channel&instrumentid=Cassini+VIMS&typeid=Image,Cube&limit=10&page=1'
-    else:
-        assert 'surfacegeometrytargetname=TITAN' in responses.calls[0].request.url
-
-    assert responses.calls[0].response.text == json
-    assert len(resp) == 10

tests/test_cli_cassini.py

@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+import pytest
+import responses
+import six
+
+from opus.api import API
+from opus.cli.cassini import vims
+
+
+@pytest.fixture
+def api():
+    return API('http://localhost/')
+
+
+@responses.activate
+def test_cli_vims(api):
+    json = open('tests/api/data_vims.json', 'r').read()
+    responses.add(responses.GET,
+                  'http://localhost/data.json',
+                  body=json)
+
+    argv = ['TITAN']
+    resp = vims(argv, api=api)
+
+    assert len(responses.calls) == 1
+    if six.PY3:
+        assert responses.calls[0].request.url == 'http://localhost/data.json?surfacegeometrytargetname=TITAN&cols=ringobsid,target,revno,time1,primaryfilespec,channel&instrumentid=Cassini+VIMS&typeid=Image,Cube&limit=10&page=1'
+    else:
+        assert 'surfacegeometrytargetname=TITAN' in responses.calls[0].request.url
+
+    assert responses.calls[0].response.text == json
+    assert len(resp) == 10