changed path parsing approach, updated tests for Windows path support

Author: chrissimpkins

lib/fontline/commands.py

@@ -112,8 +112,9 @@ def modify_linegap_percent(fontpath, percent):
 
 
 def get_linegap_percent_filepath(fontpath, percent):
-    font_basename = os.path.basename(fontpath)
-    font_dirname = os.path.dirname(fontpath)
+    fontpath_list = os.path.split(fontpath)
+    font_dirname = fontpath_list[0]
+    font_basename = fontpath_list[1]
     basepath_list = font_basename.split(".")
     outfile_basename = basepath_list[0] + "-linegap" + percent + "." + basepath_list[1]
     return os.path.join(font_dirname, outfile_basename)

tests/test_filepaths.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
+import os
 import sys
 import pytest
 
@@ -12,23 +13,35 @@
 test_filepath_four = "~/dir1/dir2/test.ttf"
 percent_value = "10"
 
+expected_linegap_basename = "test-linegap" + percent_value + ".ttf"
+
+expected_testpath_list_one = os.path.split(test_filepath_one)
+expected_testpath_list_two = os.path.split(test_filepath_two)
+expected_testpath_list_three = os.path.split(test_filepath_three)
+expected_testpath_list_four = os.path.split(test_filepath_four)
+
+expected_testpath_one = os.path.join(expected_testpath_list_one[0], expected_linegap_basename)
+expected_testpath_two = os.path.join(expected_testpath_list_two[0], expected_linegap_basename)
+expected_testpath_three = os.path.join(expected_testpath_list_three[0], expected_linegap_basename)
+expected_testpath_four = os.path.join(expected_testpath_list_four[0], expected_linegap_basename)
+
 
 def test_linegap_outfile_filepath_basename():
     response = get_linegap_percent_filepath(test_filepath_one, percent_value)
-    assert response == "test-linegap10.ttf"
+    assert response == expected_testpath_one
 
 
 def test_linegap_outfile_filepath_samedir_withdotsyntax():
     response = get_linegap_percent_filepath(test_filepath_two, percent_value)
-    assert response == "./test-linegap10.ttf"
+    assert response == expected_testpath_two
 
 
 def test_linegap_outfile_filepath_differentdir_fromroot():
     response = get_linegap_percent_filepath(test_filepath_three, percent_value)
-    assert response == "/dir1/dir2/test-linegap10.ttf"
+    assert response == expected_testpath_three
 
 
 def test_linegap_outfile_filepath_differentdir_fromuser():
     response = get_linegap_percent_filepath(test_filepath_four, percent_value)
-    assert response == "~/dir1/dir2/test-linegap10.ttf"
+    assert response == expected_testpath_four