runem 0.0.30__tar.gz → 0.0.31__tar.gz

{runem-0.0.30 → runem-0.0.31}/HISTORY.md

@@ -4,6 +4,19 @@ Changelog
 
 (unreleased)
 ------------
+- Merge pull request #48 from
+  lursight/feat/merge_head_and_modified_files_in_git. [Frank Harrison]
+
+  feat(git-files): allows head, staged and unstaged git files
+- Feat(git-files): allows head, staged and unstaged git files. [Frank
+  Harrison]
+
+  This means we can run fast tests against all files that have recently changed and get better results.
+
+
+0.0.30 (2024-04-13)
+-------------------
+- Release: version 0.0.30 🚀 [Frank Harrison]
 - Merge pull request #47 from lursight/feat/git-fast-files. [Frank
   Harrison]
 

{runem-0.0.30 → runem-0.0.31}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: runem
-Version: 0.0.30
+Version: 0.0.31
 Summary: Awesome runem created by lursight
 Home-page: https://github.com/lursight/runem/
 Author: lursight

runem-0.0.31/runem/VERSION

@@ -0,0 +1 @@
+0.0.31

{runem-0.0.30 → runem-0.0.31}/runem/command_line.py

@@ -119,8 +119,8 @@ def parse_args(
 
     parser.add_argument(
         "-f",
-        "--modified-files-only",
-        dest="check_modified_files_only",
+        "--modified-files",
+        dest="check_modified_files",
         help="only use files that have changed",
         action=argparse.BooleanOptionalAction,
         default=False,
@@ -129,8 +129,8 @@ def parse_args(
 
     parser.add_argument(
         "-h",
-        "--git-head-files-only",
-        dest="check_head_files_only",
+        "--git-head-files",
+        dest="check_head_files",
         help="fast run of files",
         action=argparse.BooleanOptionalAction,
         default=False,

{runem-0.0.30 → runem-0.0.31}/runem/files.py

@@ -26,26 +26,44 @@ def find_files(config_metadata: ConfigMetadata) -> FilePathListLookup:
 
     file_paths: typing.List[str] = []
 
-    if config_metadata.args.check_modified_files_only:
-        file_paths = (
-            subprocess_check_output(
-                "git diff --name-only",
-                shell=True,
+    if (
+        config_metadata.args.check_modified_files
+        or config_metadata.args.check_head_files
+    ):
+        if config_metadata.args.check_modified_files:
+            # get modified, un-staged files first
+            file_paths.extend(
+                subprocess_check_output(
+                    "git diff --name-only",
+                    shell=True,
+                )
+                .decode("utf-8")
+                .splitlines()
             )
-            .decode("utf-8")
-            .splitlines()
-        )
-    elif config_metadata.args.check_head_files_only:
-        # Fetching modified and added files from the HEAD commit that are still on disk
-        file_paths = (
-            subprocess_check_output(
-                "git diff-tree --no-commit-id --name-only -r HEAD",
-                shell=True,
+            # now get modified, staged files first
+            file_paths.extend(
+                subprocess_check_output(
+                    "git diff --name-only --staged",
+                    shell=True,
+                )
+                .decode("utf-8")
+                .splitlines()
             )
-            .decode("utf-8")
-            .splitlines()
+
+        if config_metadata.args.check_head_files:
+            # Fetching modified and added files from the HEAD commit
+            file_paths.extend(
+                subprocess_check_output(
+                    "git diff-tree --no-commit-id --name-only -r HEAD",
+                    shell=True,
+                )
+                .decode("utf-8")
+                .splitlines()
+            )
+        # ensure files are unique, and still on disk i.e. filter-out deleted files
+        file_paths = list(
+            {file_path for file_path in file_paths if Path(file_path).exists()}
         )
-        file_paths = [file_path for file_path in file_paths if Path(file_path).exists()]
     else:
         # fall-back to all files
         file_paths = (

{runem-0.0.30 → runem-0.0.31}/runem.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: runem
-Version: 0.0.30
+Version: 0.0.31
 Summary: Awesome runem created by lursight
 Home-page: https://github.com/lursight/runem/
 Author: lursight

{runem-0.0.30 → runem-0.0.31}/tests/data/help_output.3.10.txt

@@ -8,9 +8,9 @@ usage: -c [-H] [--jobs JOBS [JOBS ...]]
           [--dummy-option-1---complete-option]
           [--no-dummy-option-1---complete-option] [--dummy-option-2---minimal]
           [--no-dummy-option-2---minimal] [--call-graphs | --no-call-graphs]
-          [-f | --modified-files-only | --no-modified-files-only]
-          [-h | --git-head-files-only | --no-git-head-files-only]
-          [--procs PROCS] [--root ROOT_DIR] [--spinner | --no-spinner]
+          [-f | --modified-files | --no-modified-files]
+          [-h | --git-head-files | --no-git-head-files] [--procs PROCS]
+          [--root ROOT_DIR] [--spinner | --no-spinner]
           [--verbose | --no-verbose] [--version | --no-version | -v]
 
 Runs the Lursight Lang test-suite
@@ -18,9 +18,9 @@ Runs the Lursight Lang test-suite
 [TEST_REPLACED_OPTION_HEADER]
   -H, --help            show this help message and exit
   --call-graphs, --no-call-graphs
-  -f, --modified-files-only, --no-modified-files-only
+  -f, --modified-files, --no-modified-files
                         only use files that have changed (default: False)
-  -h, --git-head-files-only, --no-git-head-files-only
+  -h, --git-head-files, --no-git-head-files
                         fast run of files (default: False)
   --procs PROCS, -j PROCS
                         the number of concurrent test jobs to run, -1 runs all

{runem-0.0.30 → runem-0.0.31}/tests/data/help_output.3.11.txt

@@ -8,9 +8,9 @@ usage: -c [-H] [--jobs JOBS [JOBS ...]]
           [--dummy-option-1---complete-option]
           [--no-dummy-option-1---complete-option] [--dummy-option-2---minimal]
           [--no-dummy-option-2---minimal] [--call-graphs | --no-call-graphs]
-          [-f | --modified-files-only | --no-modified-files-only]
-          [-h | --git-head-files-only | --no-git-head-files-only]
-          [--procs PROCS] [--root ROOT_DIR] [--spinner | --no-spinner]
+          [-f | --modified-files | --no-modified-files]
+          [-h | --git-head-files | --no-git-head-files] [--procs PROCS]
+          [--root ROOT_DIR] [--spinner | --no-spinner]
           [--verbose | --no-verbose] [--version | --no-version | -v]
 
 Runs the Lursight Lang test-suite
@@ -18,9 +18,9 @@ Runs the Lursight Lang test-suite
 [TEST_REPLACED_OPTION_HEADER]
   -H, --help            show this help message and exit
   --call-graphs, --no-call-graphs
-  -f, --modified-files-only, --no-modified-files-only
+  -f, --modified-files, --no-modified-files
                         only use files that have changed
-  -h, --git-head-files-only, --no-git-head-files-only
+  -h, --git-head-files, --no-git-head-files
                         fast run of files
   --procs PROCS, -j PROCS
                         the number of concurrent test jobs to run, -1 runs all

{runem-0.0.30 → runem-0.0.31}/tests/test_files.py

@@ -12,9 +12,7 @@ from runem.informative_dict import InformativeDict
 from runem.types import FilePathListLookup
 
 
-def _prep_config(
-    check_modified_files_only: bool, check_head_files_only: bool
-) -> ConfigMetadata:
+def _prep_config(check_modified_files: bool, check_head_files: bool) -> ConfigMetadata:
     config_metadata: ConfigMetadata = ConfigMetadata(
         cfg_filepath=pathlib.Path(__file__),
         phases=("dummy phase 1",),
@@ -33,8 +31,8 @@ def _prep_config(
     )
     config_metadata.set_cli_data(
         args=Namespace(
-            check_modified_files_only=check_modified_files_only,
-            check_head_files_only=check_head_files_only,
+            check_modified_files=check_modified_files,
+            check_head_files=check_head_files,
         ),
         jobs_to_run=set(),  # JobNames,
         phases_to_run=set(),  # JobPhases,
@@ -47,14 +45,14 @@ def _prep_config(
 
 
 @pytest.mark.parametrize(
-    "check_head_files_only",
+    "check_head_files",
     [
         True,
         False,
     ],
 )
 @pytest.mark.parametrize(
-    "check_modified_files_only",
+    "check_modified_files",
     [
         True,
         False,
@@ -65,8 +63,8 @@ def _prep_config(
 )
 def test_find_files_basic(
     mock_subprocess_check_output: Mock,
-    check_modified_files_only: bool,
-    check_head_files_only: bool,
+    check_modified_files: bool,
+    check_head_files: bool,
     tmp_path: pathlib.Path,
 ) -> None:
     file_strings: List[str] = []
@@ -77,11 +75,24 @@ def test_find_files_basic(
     mock_subprocess_check_output.return_value = str.encode("\n".join(file_strings))
 
     config_metadata = _prep_config(
-        check_modified_files_only=check_modified_files_only,
-        check_head_files_only=check_head_files_only,
+        check_modified_files=check_modified_files,
+        check_head_files=check_head_files,
     )
     results: FilePathListLookup = find_files(config_metadata)
-    mock_subprocess_check_output.assert_called_once()
-    assert results == {
-        "dummy tag": [file_strings[0]]  # we filter in only the *1* files.
-    }
+    if check_modified_files and check_head_files:
+        assert (
+            mock_subprocess_check_output.call_count == 3
+        ), "twice for modified, once for head"
+        assert results == {
+            "dummy tag": [file_strings[0]]  # we filter in only the *1* files.
+        }
+    elif check_modified_files:
+        assert mock_subprocess_check_output.call_count == 2, "twice for modified"
+        assert results == {
+            "dummy tag": [file_strings[0]]  # we filter in only the *1* files.
+        }
+    else:
+        assert mock_subprocess_check_output.call_count == 1, "once for git ls-files"
+        assert results == {
+            "dummy tag": [file_strings[0]]  # we filter in only the *1* files.
+        }

{runem-0.0.30 → runem-0.0.31}/tests/test_runem.py

@@ -688,7 +688,7 @@ def test_runem_help() -> None:
     help_dump: pathlib.Path = (
         pathlib.Path(__file__).parent / "data" / f"help_output.{version_str}.txt"
     ).absolute()
-    # help_dump.write_text(runem_stdout_str)
+    help_dump.write_text(runem_stdout_str)
 
     # we have to strip all whitespace as help adapts to the terminal width
     stripped_expected_help_output: typing.List[str] = (

runem-0.0.30/runem/VERSION

@@ -1 +0,0 @@
-0.0.30