Merge branch 'hotfix/v0.8.3'

CHANGES.md

@@ -1,6 +1,12 @@
 Changelog
 =========
 
+0.8.3 (2014/10/10)
+------------------
+
+- Fixed a bug running VCS commands in subdirectories.
+- Excluded `openpyxl==2.1.0` as a dependency version.
+
 0.8.2 (2014/09/29)
 ------------------
 

doorstop/__init__.py

@@ -1,7 +1,7 @@
 """Package for doorstop."""
 
 __project__ = 'Doorstop'
-__version__ = '0.8.2'
+__version__ = '0.8.3'
 
 CLI = 'doorstop'
 GUI = 'doorstop-gui'

doorstop/core/vcs/base.py

@@ -26,7 +26,7 @@ def __init__(self, path):
 
     def relpath(self, path):
         """Get a relative path to the working copy root for commands."""
-        return os.path.relpath(path, self.path).replace('\\', '/')
+        return os.path.relpath(path).replace('\\', '/')
 
     @staticmethod
     def call(*args, return_stdout=False):  # pragma: no cover (abstract method)

doorstop/core/vcs/git.py

@@ -24,7 +24,7 @@ def add(self, path):
         self.call('git', 'add', self.relpath(path))
 
     def delete(self, path):
-        self.call('git', 'rm', self.relpath(path), '--force', '--quiet')
+        self.call('git', 'rm', '-r', self.relpath(path), '--force', '--quiet')
 
     def commit(self, message=None):
         message = message or input("Commit message: ")  # pylint: disable=W0141

doorstop/core/vcs/test/test_commands.py

@@ -69,7 +69,7 @@ def test_add(self, mock_call):
     def test_delete(self, mock_call):
         """Verify Git can delete files."""
         self.delete()
-        calls = [call(("git", "rm", self.path, "--force", "--quiet"))]
+        calls = [call(("git", "rm", "-r", self.path, "--force", "--quiet"))]
         mock_call.assert_has_calls(calls)
 
     def test_commit(self, mock_call):

setup.py

@@ -51,7 +51,7 @@
     install_requires=[
         "PyYAML >= 3.10, < 4",
         "Markdown >= 2, < 3",
-        "openpyxl >= 2, < 2.1.0",
+        "openpyxl >= 2, < 3, != 2.1.0",
         "bottle >= 0.12, < 0.13",
         "requests >= 2, < 3",
         "pyficache >= 0.2.3, < 0.3",