update tests, and fix handling of output path

Author: frankrolf

goadbWriter.py

@@ -39,7 +39,7 @@ def _get_args(args=None):
     )
 
     parser.add_argument(
-        '-o', '--output',
+        '-o', '--output_path',
         action='store',
         help=(
             'output file or directory. '
@@ -563,7 +563,7 @@ def _make_goadb_content(glyph_order, glyph_name_dict):
 def make_goadb(input_ufo, include_template_glyphs=False):
     '''
     Make a GOADB from an input UFO.
-    Optionally, template glyphs can be included.
+    Optionally, include (un-filled) template glyphs.
     '''
     f = Font(input_ufo)
     glyph_order = get_glyph_order(f, include_template_glyphs)
@@ -576,12 +576,13 @@ def write_goadb(goadb_content, output_path=None):
     '''
     Write the GOADB to an output file or folder.
     '''
-    if output_path and output_path.is_file():
-        with open(output_path, 'w') as blob:
-            blob.write(goadb_content + '\n')
-    elif output_path and output_path.is_dir():
-        with open(output_path / 'GlyphOrderAndAliasDB', 'w') as blob:
-            blob.write(goadb_content + '\n')
+    if output_path:
+        if output_path.is_dir():
+            with open(output_path / 'GlyphOrderAndAliasDB', 'w') as blob:
+                blob.write(goadb_content + '\n')
+        else:
+            with open(output_path, 'w') as blob:
+                blob.write(goadb_content + '\n')
     else:
         print(goadb_content)
 

tests/test_goadbWriter.py

@@ -6,7 +6,7 @@
 
 
 sys.path.append("..")
-from goadbWriter import *
+from goadbWriter import _get_args, main
 
 
 TEST_DIR = Path(__file__).parent
@@ -29,10 +29,10 @@ def read_file(path):
 def test_get_args():
     # args through argparse
     ufo_path = str(TEST_DIR / 'goadb_full.ufo')
-    argparse_args = vars(get_args([ufo_path, '-o', 'goadb']))
+    argparse_args = vars(_get_args([ufo_path, '-o', 'goadb']))
     expected_args = {
-        'input_file': ufo_path,
-        'output': 'goadb',
+        'input_ufo': ufo_path,
+        'output_path': Path('goadb'),
         'template': False,
     }
     assert argparse_args == expected_args
@@ -77,6 +77,18 @@ def test_default():
     assert read_file(goadb_temp) == read_file(goadb_example)
 
 
+def test_write_to_dir():
+    '''
+    writing GOADB to directory (name is auto-generated)
+    '''
+    ufo_path = str(TEST_DIR / 'goadb_full.ufo')
+    goadb_example = TEST_DIR / 'goadb_full'
+    args = [ufo_path, '-o', str(TEMP_DIR)]
+    main(args)
+    goadb_temp = str(TEMP_DIR / 'GlyphOrderAndAliasDB')
+    assert read_file(goadb_temp) == read_file(goadb_example)
+
+
 def test_template():
     '''
     testing UFO with template glyphs only