diff options
| -rw-r--r-- | dotfiles.py | 8 | ||||
| -rw-r--r-- | test_dotfiles.py | 18 |
2 files changed, 2 insertions, 24 deletions
diff --git a/dotfiles.py b/dotfiles.py index e49a69b..18d49aa 100644 --- a/dotfiles.py +++ b/dotfiles.py @@ -9,11 +9,6 @@ DEFAULT_HOME = os.path.expanduser('~/') DEFAULT_REPO = os.path.expanduser('~/Dotfiles') -def unique_suffix(path_a, path_b): - discard = len(str(path_a.common(path_b))) + 1 - return (str(path_a)[discard:], str(path_b)[discard:]) - - class Repository(object): """A repository is a directory that contains dotfiles. @@ -58,8 +53,7 @@ class Dotfile(object): self.target = target def __str__(self): - short_name, _ = unique_suffix(self.name, self.target) - return '%s' % short_name + return self.name.basename def __repr__(self): return '<Dotfile %r>' % self.name diff --git a/test_dotfiles.py b/test_dotfiles.py index db63632..ed67884 100644 --- a/test_dotfiles.py +++ b/test_dotfiles.py @@ -1,23 +1,7 @@ import py import pytest -from dotfiles import cli, unique_suffix -from dotfiles import Repository, Dotfile - - -def test_unique_suffix_overlap(): - (name, target) = unique_suffix(py.path.local('/foo/baz'), - py.path.local('/foo/bar/bat')) - assert name == 'baz' - assert target == 'bar/bat' - - -@pytest.mark.xfail(reason='this is a bug') -def test_unique_suffix_no_overlap(): - (name, target) = unique_suffix(py.path.local('/a/b/c'), - py.path.local('/d/e/f')) - assert name == '/a/b/c' - assert target == '/d/e/f' +from dotfiles import Repository, Dotfile, cli class TestCli(object): |