simplifying command line by removing output option (you can just redirect output to a file if wanted, more flexible) and fixing tests

Author: mvexel

overpass/cli.py

@@ -2,7 +2,7 @@
 from __future__ import print_function
 import click
 import geojson
-
+import sys
 import overpass
 
 
@@ -13,21 +13,13 @@
 @click.option('--responseformat', default='geojson', help="""Format to save the data.
     Options are 'geojson' and 'osm'. Default format is geojson.""")
 @click.argument('query', type=str)
-@click.argument('output_file', type=click.Path())
-def cli(timeout, endpoint, responseformat, query, output_file):
-    """Run query and save the result in output_file"""
-
+def cli(timeout, endpoint, responseformat, query):
+    """Run query"""
     api = overpass.API(timeout=timeout, endpoint=endpoint)
-
     if responseformat not in api.SUPPORTED_FORMATS:
         print("format {} not supported. Supported formats: {}".format(
             responseformat,
-            api.SUPPORTED_FORMATS.join(", ")))
+            ", ".join(api.SUPPORTED_FORMATS)))
+        sys.exit(1)
     result = api.Get(query, responseformat=responseformat)
-    with open(output_file, 'w') as f:
-        if responseformat=="geojson":
-            geojson.dump(result, f, indent=2, sort_keys=True)
-        else:
-            f.write(result.encode('utf-8'))
-        f.close()
-    print('File saved at %s.' % output_file)
+    click.echo(result)

tests/test_cli.py

@@ -4,27 +4,18 @@
 from overpass.cli import cli
 from nose.tools import nottest
 
-#@nottest
 def test_cli():
+    
     runner = CliRunner()
     with runner.isolated_filesystem():
         result = runner.invoke(cli, [
-            '--timeout', 40,
-            '--endpoint', 'http://overpass-api.de/api/interpreter',
-            'node(area:3600362504)[amenity=cafe]', 'out.geojson'
-            ])
+            'node(40.704,-74.010,40.708,-74.013)[amenity=cafe]'])
         assert result.exit_code == 0
-        assert exists('out.geojson')
 
-#@nottest
 def test_cli_xml():
     runner = CliRunner()
     with runner.isolated_filesystem():
         result = runner.invoke(cli, [
-            '--timeout', 40,
-            '--endpoint', 'http://overpass-api.de/api/interpreter',
             '--responseformat', 'osm',
-            'node(area:3600362504)[amenity=cafe]', 'out.osm'
-            ])
+            'node(40.704,-74.010,40.708,-74.013)[amenity=cafe]'])
         assert result.exit_code == 0
-        assert exists('out.osm')