Merge pull request #658 from seqpipe/add-directory-with-slash

Proper adding of 'directory/'

dvc/project.py

@@ -81,7 +81,7 @@ class Project(object):
         return os.path.relpath(path, self.root_dir)
 
     def add(self, fname):
-        out = os.path.basename(fname)
+        out = os.path.basename(os.path.normpath(fname))
         stage_fname = out + Stage.STAGE_FILE_SUFFIX
         cwd = os.path.dirname(os.path.abspath(fname))
         stage = Stage.loads(project=self,

tests/test_add.py

@@ -48,6 +48,13 @@ class TestAddDirectory(TestDvc):
         self.create(os.path.join(dname, 'file'), 'file')
         self.dvc.add(dname)
 
+class TestAddDirectoryWithForwardSlash(TestDvc):
+    def test(self):
+        dname = 'directory/'
+        os.mkdir(dname)
+        self.create(os.path.join(dname, 'file'), 'file')
+        stage = self.dvc.add(dname)
+        self.assertEquals(os.path.abspath('directory.dvc'), stage.path)
 
 class TestAddTrackedFile(TestDvc):
     def test(self):