Porting explosion/spaCy#12181 solution into weasel

setup.cfg

@@ -47,6 +47,10 @@ install_requires =
 console_scripts =
     weasel = weasel.cli:app
 
+[tool:pytest]
+markers =
+    issue: references specific issue
+
 [mypy]
 ignore_missing_imports = True
 no_implicit_optional = True

weasel/tests/cli/test_cli.py

@@ -4,10 +4,14 @@
 import pytest
 import srsly
 
+from tempfile import TemporaryDirectory
+from pathlib import Path
+
 from weasel.cli.remote_storage import RemoteStorage
 from weasel.schemas import ProjectConfigSchema, validate
 from weasel.util import is_subpath_of, load_project_config, make_tempdir
 from weasel.util import validate_project_commands
+from weasel.util import git_checkout
 
 
 def test_issue11235():
@@ -165,3 +169,30 @@ def test_local_remote_storage_pull_missing():
         remote = RemoteStorage(d / "root", str(d / "remote"))
         assert remote.pull(filename, command_hash="aaaa") is None
         assert remote.pull(filename) is None
+
+
+def test_project_git_dir_asset():
+    with TemporaryDirectory() as d:
+        p = Path(d)
+        # Use a very small repo.
+        git_checkout(
+            "https://github.com/explosion/os-signpost.git",
+            "os_signpost",
+            p / "signpost",
+            branch="v0.0.3",
+        )
+        assert os.path.isdir(p / "signpost")
+
+
+@pytest.mark.issue(66)
+def test_project_git_file_asset():
+    with TemporaryDirectory() as d:
+        p = Path(d)
+        # Use a very small repo.
+        git_checkout(
+            "https://github.com/explosion/os-signpost.git",
+            "README.md",
+            p / "readme.md",
+            branch="v0.0.3",
+        )
+        assert os.path.isfile(p / "readme.md")

weasel/util/git.py

@@ -1,6 +1,8 @@
+import os
 import shutil
 from pathlib import Path
 from typing import Tuple
+from tempfile import TemporaryDirectory
 
 from wasabi import msg
 
@@ -32,16 +34,20 @@ def git_checkout(
             f"temporarily. To only download the files needed, make sure "
             f"you're using Git v2.22 or above."
         )
-    with make_tempdir() as tmp_dir:
-        cmd = f"git -C {tmp_dir} clone {repo} . -b {branch}"
+    with TemporaryDirectory() as tmp_dir:
+        tmp_path = Path(tmp_dir)
+        cmd = f"git -C {tmp_path} clone {repo} . -b {branch}"
         run_command(cmd, capture=True)
         # We need Path(name) to make sure we also support subdirectories
         try:
-            source_path = tmp_dir / Path(subpath)
-            if not is_subpath_of(tmp_dir, source_path):
+            source_path = tmp_path / Path(subpath)
+            if not is_subpath_of(tmp_path, source_path):
                 err = f"'{subpath}' is a path outside of the cloned repository."
                 msg.fail(err, repo, exits=1)
-            shutil.copytree(str(source_path), str(dest))
+            if os.path.isdir(source_path):
+                shutil.copytree(source_path, dest)
+            else:
+                shutil.copyfile(source_path, dest)
         except FileNotFoundError:
             err = f"Can't clone {subpath}. Make sure the directory exists in the repo (branch '{branch}')"
             msg.fail(err, repo, exits=1)