Update abstra-cli

abstra_cli/utils/file.py

@@ -5,17 +5,19 @@
 from .main import remove_prefix
 
 
+GIT_FOLDER = ".git/"
 ABSTRA_FOLDER = ".abstra/"
 ABSTRA_IGNORE = ".abstraignore"
 CREDENTIALS_FILE = ".abstra/credentials"
 
 
 def get_ignore_files(dir):
+    GITIGNORE = os.path.join(dir, ".gitignore")
     IGNOREFILE = os.path.join(dir, ABSTRA_IGNORE)
+    git_path = os.path.join(dir, GIT_FOLDER)
     abstra_path = os.path.join(dir, ABSTRA_FOLDER)
-    ignored = [IGNOREFILE, abstra_path]
+    ignored = [IGNOREFILE, GITIGNORE, abstra_path, git_path]
 
-    GITIGNORE = os.path.join(dir, ".gitignore")
     if os.path.exists(IGNOREFILE):
         with open(IGNOREFILE, "r") as f:
             ignored.extend([os.path.join(dir, f) for f in f.read().split("\n") if f])

tests/test_listing.py

@@ -72,3 +72,25 @@ def test_ignore_wildcard(self):
         self.add_file(".abstraignore", "*.ipynb")
         files = files_from_directory(self.path)
         assert files == [PosixPath(tracked)]
+
+    def test_ignore_abstra_folder(self):
+        abstra = self.add_folder(".abstra")
+        self.add_file("credentials", "SECRET", path=abstra)
+        files = files_from_directory(self.path)
+        assert files == []
+
+    def test_ignore_git_folder(self):
+        git = self.add_folder(".git")
+        self.add_file("somefile", "somecontent", path=git)
+        files = files_from_directory(self.path)
+        assert files == []
+
+    def test_ignore_abstra_ignore_file(self):
+        self.add_file(".abstraignore", "ignored")
+        files = files_from_directory(self.path)
+        assert files == []
+
+    def test_ignore_git_ignore_file(self):
+        self.add_file(".gitignore", "ignored")
+        files = files_from_directory(self.path)
+        assert files == []