batchfetch 1.3.4__tar.gz → 1.3.6__tar.gz

{batchfetch-1.3.4 → batchfetch-1.3.6}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: batchfetch
-Version: 1.3.4
+Version: 1.3.6
 Summary: Efficiently clone and pull multiple Git repositories.
 Home-page: https://github.com/jamescherti/batchfetch
 Author: James Cherti
@@ -17,12 +17,26 @@ Classifier: Topic :: Utilities
 Requires-Python: >=3.6, <4
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: colorama
+Requires-Dist: schema
+Requires-Dist: setproctitle
+Requires-Dist: PyYAML
+Dynamic: author
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # Batchfetch - Efficiently clone or pull multiple Git repositories in parallel
 
 ## Introduction
 
-Batchfetch is a command-line tool designed to clone, fetch, and merge multiple Git repositories simultaneously. With Batchfetch, you no longer need to manually manage each repository one by one. It automates the tedious aspects of repository management, freeing you up to focus on what truly matters: your workflow.
+Batchfetch is a command-line tool designed to clone, fetch, and merge multiple Git repositories simultaneously. With Batchfetch, you no longer need to manually manage each repository one by one. It automates the tedious aspects of repository management.
 
 But why use Batchfetch? Because it is extremely fast, cloning repositories quickly by running Git operations in parallel. It intelligently detects whether a `git fetch` is needed, further speeding up the process of downloading data from repositories. Additionally, it allows specifying the revision (for Git), ensuring that the cloned repository matches the exact version you require.
 

{batchfetch-1.3.4 → batchfetch-1.3.6}/README.md

@@ -2,7 +2,7 @@
 
 ## Introduction
 
-Batchfetch is a command-line tool designed to clone, fetch, and merge multiple Git repositories simultaneously. With Batchfetch, you no longer need to manually manage each repository one by one. It automates the tedious aspects of repository management, freeing you up to focus on what truly matters: your workflow.
+Batchfetch is a command-line tool designed to clone, fetch, and merge multiple Git repositories simultaneously. With Batchfetch, you no longer need to manually manage each repository one by one. It automates the tedious aspects of repository management.
 
 But why use Batchfetch? Because it is extremely fast, cloning repositories quickly by running Git operations in parallel. It intelligently detects whether a `git fetch` is needed, further speeding up the process of downloading data from repositories. Additionally, it allows specifying the revision (for Git), ensuring that the cloned repository matches the exact version you require.
 

{batchfetch-1.3.4 → batchfetch-1.3.6}/batchfetch/batchfetch_cli.py

@@ -42,7 +42,9 @@ class BatchFetchCli:
     """Command-line-interface that downloads."""
 
     def __init__(self, max_workers: int, verbose: bool, check_untracked: bool,
-                 targets: List[str]):
+                 targets: List[str], cwd: os.PathLike):
+        os.chdir(cwd)
+        self._cwd = cwd
         self._logger = logging.getLogger(self.__class__.__name__)
         self.targets = {Path(item).absolute() for item in targets}
         self.cfg: dict = {}
@@ -111,6 +113,7 @@ class BatchFetchCli:
                 # Paths specified in the batchfetch.yaml file
                 untracked_paths = None
                 if "options" in yaml_dict and \
+                        isinstance(yaml_dict["options"], dict) and \
                         "ignore_untracked" in yaml_dict["options"]:
                     untracked_paths = \
                         yaml_dict["options"]["ignore_untracked"]
@@ -175,10 +178,7 @@ class BatchFetchCli:
             if str(dest_path) in dict_local_dir \
                     or str(dest_path2) in dict_local_dir:
                 err_str = ("More than one task have the " +
-                           f"destination path (" +
-                           str(task[keyword]) + " and " +
-                           str(dict_local_dir[(str(dest_path))]) +
-                           ")")
+                           f"destination path: {dest_path2}")
                 raise BatchFetchError(err_str)
 
             dict_local_dir[str(dest_path)] = batchfetch_instance[keyword]
@@ -310,8 +310,8 @@ class BatchFetchCli:
             err_str = "The following files need to be deleted:\n"
             for path in untracked_paths:
                 err_str += ("  - " +
-                            str(path) +
-                            ("/" if path.is_dir() else "") +
+                            str(path.relative_to(self._cwd)) +
+                            (os.sep if path.is_dir() else "") +
                             "\n")
             err_str += ("The paths above are not managed by batchfetch."
                         " To retain them, add them to the "
@@ -427,17 +427,10 @@ def command_line_interface():
                                              sys.argv[1:]))
 
         args = parse_args()
-        done = []
-        file = Path(args.file).absolute()
-        file_resolved = file.absolute()
-        if not file_resolved:
-            print(f"Error: cannot resolve the path {file}",
-                  file=sys.stderr)
-            sys.exit(1)
-
-        done.append(file_resolved)
+        file = Path(args.file)
+        file_abs = file.absolute()
 
-        args.directory = args.directory if args.directory else file.parent
+        args.directory = args.directory if args.directory else file_abs.parent
         if args.verbose and args.jobs:
             print(f"[FILE] {file}")
             print(f"[DIR] {args.directory}")
@@ -445,13 +438,13 @@ def command_line_interface():
             print(f"[CHECK UNTRACKED] {args.check_untracked}")
             print()
 
-        os.chdir(args.directory)
         try:
             batchfetch_cli = BatchFetchCli(
                 verbose=args.verbose,
                 max_workers=args.jobs,
                 check_untracked=args.check_untracked,
                 targets=args.targets,
+                cwd=args.directory,
             )
 
             batchfetch_cli.load(file)

{batchfetch-1.3.4 → batchfetch-1.3.6}/batchfetch/batchfetch_git.py

@@ -117,7 +117,7 @@ class BatchFetchGit(TaskBatchFetch):
 
         self.add_output(f"[GIT {update_type}] {self[self.main_key]}"
                         + (f" (Ref: {self['revision']})"
-                           if self["revision"] else "") + "\n")
+                         if self["revision"] else "") + "\n")
 
         try:
             # Delete
@@ -130,32 +130,34 @@ class BatchFetchGit(TaskBatchFetch):
 
             # Update
             if self.git_local_dir.is_dir():
+                do_git_fetch = self["git_pull"]
+
                 # Pre exec
-                self._update_current_branch_name()
+                if do_git_fetch:
+                    self._update_current_branch_name()
+
                 self._repo_fix_remote_origin()
                 self._exec_before(cwd=self.git_local_dir)
 
                 if not self["revision"]:
                     self.values["revision"] = self._run_get_firstline(
-                        "git symbolic-ref refs/remotes/origin/HEAD"
-                    ).split("/")[-1]
+                        "git symbolic-ref --short HEAD")
                     if not self["revision"]:
                         raise BatchFetchError(
                             "Unable to determine the default origin branch"
                         )
 
                     self.add_output(self.indent_spaces +
-                                    f"[INFO] Update revision to: '" +
+                                    "[INFO] Update revision to: '" +
                                     self["revision"] + "'\n")
 
-                git_fetch_done = self._repo_fetch()
+                if do_git_fetch:
+                    git_fetch_done = self._repo_fetch()
 
-                git_branch_changed = False
-                git_branch_changed = self._repo_fix_branch()
+                self._repo_fix_branch()
 
-                git_merge_done = False
                 if git_fetch_done:
-                    git_merge_done = self._git_merge()
+                    self._git_merge()
 
                 if self.get_changed():
                     self._exec_after(cwd=self.git_local_dir)
@@ -192,6 +194,8 @@ class BatchFetchGit(TaskBatchFetch):
 
         :param cmd: Command to be executed. Can be a list or a string.
         :param kwargs: Additional keyword arguments for Popen.
+        :cwd: Current working directory.
+        :env: Environment variables.
         :return: Tuple containing two lists: stdout lines and stderr lines.
         """
         if not cwd:
@@ -264,11 +268,10 @@ class BatchFetchGit(TaskBatchFetch):
         # Merge
         do_git_fetch = self["git_pull"]
         do_git_fetch = False
-        commit_ref = None
 
         try:
             # Check if the revision such as
-            stdout, _ = self._run(["git", "cat-file", "-e", self["revision"]])
+            _, _ = self._run(["git", "cat-file", "-e", self["revision"]])
         except subprocess.CalledProcessError:
             do_git_fetch = True
             self.add_output(

{batchfetch-1.3.4 → batchfetch-1.3.6}/batchfetch.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: batchfetch
-Version: 1.3.4
+Version: 1.3.6
 Summary: Efficiently clone and pull multiple Git repositories.
 Home-page: https://github.com/jamescherti/batchfetch
 Author: James Cherti
@@ -17,12 +17,26 @@ Classifier: Topic :: Utilities
 Requires-Python: >=3.6, <4
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: colorama
+Requires-Dist: schema
+Requires-Dist: setproctitle
+Requires-Dist: PyYAML
+Dynamic: author
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # Batchfetch - Efficiently clone or pull multiple Git repositories in parallel
 
 ## Introduction
 
-Batchfetch is a command-line tool designed to clone, fetch, and merge multiple Git repositories simultaneously. With Batchfetch, you no longer need to manually manage each repository one by one. It automates the tedious aspects of repository management, freeing you up to focus on what truly matters: your workflow.
+Batchfetch is a command-line tool designed to clone, fetch, and merge multiple Git repositories simultaneously. With Batchfetch, you no longer need to manually manage each repository one by one. It automates the tedious aspects of repository management.
 
 But why use Batchfetch? Because it is extremely fast, cloning repositories quickly by running Git operations in parallel. It intelligently detects whether a `git fetch` is needed, further speeding up the process of downloading data from repositories. Additionally, it allows specifying the revision (for Git), ensuring that the cloned repository matches the exact version you require.
 

{batchfetch-1.3.4 → batchfetch-1.3.6}/batchfetch.egg-info/SOURCES.txt

@@ -11,4 +11,5 @@ batchfetch.egg-info/SOURCES.txt
 batchfetch.egg-info/dependency_links.txt
 batchfetch.egg-info/entry_points.txt
 batchfetch.egg-info/requires.txt
-batchfetch.egg-info/top_level.txt
+batchfetch.egg-info/top_level.txt
+tests/test_helpers.py

{batchfetch-1.3.4 → batchfetch-1.3.6}/setup.py

@@ -22,7 +22,7 @@ from setuptools import find_packages, setup
 
 setup(
     name="batchfetch",
-    version="1.3.4",
+    version="1.3.6",
     packages=find_packages(),
     description="Efficiently clone and pull multiple Git repositories.",
     license="GPLv3",

batchfetch-1.3.6/tests/test_helpers.py

@@ -0,0 +1,56 @@
+#!/usr/bin/env python
+#
+# Copyright (C) 2024-2025 James Cherti
+# URL: https://github.com/jamescherti/batchfetch
+#
+# This program is free software: you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation, either version 3 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program. If not, see <https://www.gnu.org/licenses/>.
+#
+"""Unit tests."""
+
+from pathlib import Path
+
+from batchfetch import helpers
+
+DATA_PATH = Path(".").joinpath("tests", "data").absolute()
+SCRIPT_RUN_SIMPLE = DATA_PATH / "test-run_simple.sh"
+TEST_MD5SUM_FILE = DATA_PATH / "test-md5sum.txt"
+
+
+def test_md5sum():
+    md5sum = helpers.md5sum(TEST_MD5SUM_FILE)
+    assert md5sum == "f31e127edc87a6aa2eb01b7d94d2ec58"
+
+
+def test_run_simple():
+    # Stdout
+    stdout_lines, stderr_lines = helpers.run_simple(str(SCRIPT_RUN_SIMPLE))
+    assert stdout_lines == ['Test 1.',
+                            'Test 2.',
+                            'Test 3.']
+    assert stderr_lines == ['Test 3.']
+
+
+def test_indent_raw_output():
+    list_str = \
+        helpers.indent_raw_output(["Test 1.", "Test 2."])
+
+    assert list_str == ["    Test 1.", "    Test 2."]
+
+
+def test_run_indent():
+    stdout_lines, stderr_lines = helpers.run_indent(str(SCRIPT_RUN_SIMPLE))
+    assert stdout_lines == [f'    [RUN] {str(SCRIPT_RUN_SIMPLE)}',
+                            '        Test 1.',
+                            '        Test 2.',
+                            '        Test 3.']
+    assert stderr_lines == ['    Test 3.']

{batchfetch-1.3.4 → batchfetch-1.3.6}/batchfetch.egg-info/requires.txt

@@ -1,4 +1,4 @@
-PyYAML
 colorama
 schema
 setproctitle
+PyYAML