🐛 FIX: non git repo in tests

Author: chrisjsewell

scss_compile/__init__.py

@@ -100,6 +100,13 @@ def config_provider(file_path, cmd_name):
     show_default=True,
     help="Exit code when files changed.",
 )
+@click.option(
+    "--git-add/--no-git-add",
+    default=True,
+    is_flag=True,
+    show_default=True,
+    help="Attempt to add new files to the git index (required by pre-commit).",
+)
 @click.option("--test-run", is_flag=True, help="Do not delete/create any files.")
 @click_config_file.configuration_option(
     provider=config_provider,
@@ -123,6 +130,7 @@ def run_compile(
     quiet,
     verbose,
     exit_code,
+    git_add,
     test_run,
 ):
     """Compile all SCSS files in the paths provided.
@@ -239,15 +247,23 @@ def run_compile(
             css_out_path = out_dir / (out_name + ".css")
         if not test_run:
 
-            if update_file(css_out_path, css_str, encoding):
+            if update_file(css_out_path, css_str, encoding, git_add):
                 changed_files = True
             if sourcemap and update_file(
-                out_dir / (scss_path.name + ".map.json"), sourcemap_str, encoding
+                out_dir / (scss_path.name + ".map.json"),
+                sourcemap_str,
+                encoding,
+                git_add,
             ):
                 changed_files = True
 
         if not quiet:
-            click.echo(f"Compiled: {str(scss_path)} -> {str(css_out_path)}")
+            if changed_files:
+                click.secho(
+                    f"Compiled: {str(scss_path)} -> {str(css_out_path)}", fg="blue"
+                )
+            elif verbose:
+                click.echo(f"Already Exists: {str(scss_path)} -> {str(css_out_path)}")
 
     if compilation_errors:
         raise click.ClickException(
@@ -263,13 +279,13 @@ def run_compile(
         sys.exit(exit_code)
 
 
-def update_file(path, text, encoding) -> bool:
+def update_file(path, text, encoding, git_add) -> bool:
 
     if not path.exists():
         path.write_text(text, encoding=encoding)
-        # this is required, to ensure creations are picked up by pre-commit
-        # TODO ignore for non-git repositories?
-        check_call(["git", "add", "--intent-to-add", str(path)])
+        if git_add:
+            # this is required, to ensure creations are picked up by pre-commit
+            check_call(["git", "add", str(path)])
         return True
 
     if text != path.read_text(encoding=encoding):

tests/example_scss/example2.scss

@@ -1,3 +1,3 @@
 div {
-    color: blue;
+    color: green;
 }

tests/test_run_compile.py

@@ -21,27 +21,33 @@ def test_help():
 
 
 def test_file(scss_folder):
-    result = CliRunner().invoke(run_compile, [str(scss_folder / "example1.scss")])
+    result = CliRunner().invoke(
+        run_compile, ["--no-git-add", str(scss_folder / "example1.scss")]
+    )
     assert result.exit_code == 2, result.output
     assert (scss_folder / "example1.css").exists(), result.output
 
     # should not change any files
-    result = CliRunner().invoke(run_compile, [str(scss_folder / "example1.scss")])
+    result = CliRunner().invoke(
+        run_compile, ["--no-git-add", str(scss_folder / "example1.scss")]
+    )
     assert result.exit_code == 0, result.output
     assert (scss_folder / "example1.css").exists(), result.output
 
 
 def test_file_hash(scss_folder):
     result = CliRunner().invoke(
-        run_compile, [str(scss_folder / "example1.scss"), "--hash-filenames"]
+        run_compile,
+        ["--no-git-add", str(scss_folder / "example1.scss"), "--hash-filenames"],
     )
     assert result.exit_code == 2, result.output
     assert len(list(scss_folder.glob("example1#*.css"))) == 1, result.output
     path = list(scss_folder.glob("example1#*.css"))[0]
 
     # should create same hash
     result = CliRunner().invoke(
-        run_compile, [str(scss_folder / "example1.scss"), "--hash-filenames"]
+        run_compile,
+        ["--no-git-add", str(scss_folder / "example1.scss"), "--hash-filenames"],
     )
     assert result.exit_code == 0, result.output
     assert len(list(scss_folder.glob("example1#*.css"))) == 1, result.output
@@ -50,7 +56,7 @@ def test_file_hash(scss_folder):
 
 def test_file_sourcemap(scss_folder):
     result = CliRunner().invoke(
-        run_compile, [str(scss_folder / "example1.scss"), "--sourcemap"]
+        run_compile, ["--no-git-add", str(scss_folder / "example1.scss"), "--sourcemap"]
     )
     assert result.exit_code == 2, result.output
     assert (scss_folder / "example1.css").exists(), result.output
@@ -59,21 +65,25 @@ def test_file_sourcemap(scss_folder):
 
 def test_partials(scss_folder):
     result = CliRunner().invoke(
-        run_compile, [str(scss_folder / "partials" / "_example1.scss")]
+        run_compile, ["--no-git-add", str(scss_folder / "partials" / "_example1.scss")]
     )
     assert result.exit_code == 0, result.output
     assert not (scss_folder / "example1.css").exists(), result.output
 
     result = CliRunner().invoke(
         run_compile,
-        [str(scss_folder / "partials" / "_example1.scss"), "--partial-depth=1"],
+        [
+            "--no-git-add",
+            str(scss_folder / "partials" / "_example1.scss"),
+            "--partial-depth=1",
+        ],
     )
     assert result.exit_code == 2, result.output
     assert (scss_folder / "example1.css").exists(), result.output
 
 
 def test_folder(scss_folder):
-    result = CliRunner().invoke(run_compile, [str(scss_folder)])
+    result = CliRunner().invoke(run_compile, ["--no-git-add", str(scss_folder)])
     assert result.exit_code == 2, result.output
     assert (scss_folder / "example1.css").exists(), result.output
     assert (scss_folder / "example2.css").exists(), result.output
@@ -83,6 +93,7 @@ def test_translate(scss_folder):
     result = CliRunner().invoke(
         run_compile,
         [
+            "--no-git-add",
             str(scss_folder / "example1.scss"),
             "--translate",
             str(scss_folder) + ":" + str(scss_folder.parent / "css"),