batchfetch 1.0.6__tar.gz → 1.0.8__tar.gz

{batchfetch-1.0.6 → batchfetch-1.0.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: batchfetch
-Version: 1.0.6
+Version: 1.0.8
 Summary: Efficiently clone and pull multiple Git repositories.
 Home-page: https://github.com/jamescherti/batchfetch
 Author: James Cherti

{batchfetch-1.0.6 → batchfetch-1.0.8}/batchfetch/batchfetch_base.py

@@ -41,21 +41,21 @@ class BatchFetchBase:
 
         # Default
         self.global_options_schema: Dict[Any, Any] = {
-            Optional("pre_exec"): Or([str], str),
-            Optional("post_exec"): Or([str], str),
+            Optional("exec_before"): Or([str], str),
+            Optional("exec_after"): Or([str], str),
         }
 
         self.item_schema: Dict[Any, Any] = {
             Optional("path"): str,
             Optional("delete"): bool,
 
-            Optional("pre_exec"): Or([str], str),
-            Optional("post_exec"): Or([str], str),
+            Optional("exec_before"): Or([str], str),
+            Optional("exec_after"): Or([str], str),
         }
 
         self.global_options_values: Dict[str, Any] = {
-            "pre_exec": [],
-            "post_exec": [],
+            "exec_before": [],
+            "exec_after": [],
         }
 
         self.item_default_values: Dict[str, Any] = {
@@ -112,7 +112,7 @@ class BatchFetchBase:
 
     def _run_pre_exec(self, cwd: os.PathLike = Path(".")):
         self._initialize_data()
-        for pre_exec in self["pre_exec"]:
+        for pre_exec in self["exec_before"]:
             if not pre_exec:
                 continue
 
@@ -124,7 +124,7 @@ class BatchFetchBase:
         if self["delete"] or not self.is_changed():
             return
 
-        for post_exec in self["post_exec"]:
+        for post_exec in self["exec_after"]:
             if not post_exec:
                 continue
 

{batchfetch-1.0.6 → batchfetch-1.0.8}/batchfetch/batchfetch_cli.py

@@ -43,7 +43,7 @@ class BatchFetchCli:
     def __init__(self, max_workers: int, verbose: bool = False):
         self.cfg: dict = {}
         self.folder = Path(".")
-        self.managed_filenames: Set[str] = set()
+        self.managed_paths: Set[Path] = set()
         self.verbose = verbose
         self.max_workers = max_workers
         self._logger = logging.getLogger(self.__class__.__name__)
@@ -149,7 +149,7 @@ class BatchFetchCli:
         error = False
         threads = []
         num_success = 0
-        self.managed_filenames = set()
+        self.managed_paths = set()
 
         executor_update = ThreadPoolExecutor(max_workers=self.max_workers)
 
@@ -160,26 +160,28 @@ class BatchFetchCli:
             for task in all_tasks:
                 self.dirs_relative_to_batchfetch.add(str(task["path"]))
                 if not task["delete"]:
-                    self.managed_filenames.add(task["path"])
+                    self.managed_paths.add(Path(task["path"]).absolute())
                 threads.append(executor_update.submit(task.update))
 
             for future in as_completed(threads):
                 data = future.result()
                 if data["result"]["error"]:
-                    print(Fore.RED, end="")
-                elif data["result"]["changed"]:
-                    print(Fore.YELLOW, end="")
+                    error = True
+                    failed.append(data)
                 else:
-                    if not self.verbose:
-                        continue
+                    num_success += 1
 
-                    print(Fore.GREEN, end="")
+                if (not self.verbose and
+                    not data["result"]["error"] and
+                        not data["result"]["changed"]):
+                    continue
 
                 if data["result"]["error"]:
-                    error = True
-                    failed.append(data)
+                    print(Fore.RED, end="")
+                elif data["result"]["changed"]:
+                    print(Fore.YELLOW, end="")
                 else:
-                    num_success += 1
+                    print(Fore.GREEN, end="")
 
                 if data["result"]["output"]:
                     print(data["result"]["output"].rstrip("\n"))
@@ -229,6 +231,8 @@ def parse_args():
     )
 
     args = parser.parse_args()
+    if not args.batchfetch_files:
+        args.batchfetch_files = ["./batchfetch.yaml"]
 
     for batchfetch_file in args.batchfetch_files:
         if not Path(batchfetch_file).is_file():

{batchfetch-1.0.6 → batchfetch-1.0.8}/batchfetch/batchfetch_git.py

@@ -119,7 +119,7 @@ class BatchFetchGit(BatchFetchBase):
 
         self.add_output(
             f"[GIT {update_type}] {self[self.main_key]}" +
-            (f" (Reference: {self['reference']})"
+            (f" (Ref: {self['reference']})"
              if self["reference"] else "") + "\n"
         )
 
@@ -218,27 +218,35 @@ class BatchFetchGit(BatchFetchBase):
             try:
                 self._git_tags(self["reference"])
             except GitReferenceDoesNotExist:
-                pass
+                # The reference does not exist. We should maybe git pull
+                # in case the reference is in a new commit.
+                ignore_git_pull = False
             else:
-                # The branch exists:
-                # 1. Ignore Git pull when the git reference is the same
-                # as the "branch:" key
-                try:
-                    commit_ref = self._git_ref(cwd=self.git_local_dir)
-                except subprocess.CalledProcessError:
-                    # Ignore git pull because the head is detached
-                    pass
+                if self.current_branch and \
+                        self.current_branch == self["reference"]:
+                    ignore_git_pull = False
                 else:
-                    if (self.current_branch and
-                        (commit_ref == self["reference"] or
-                         self.current_branch == self["reference"])):
+                    # The reference exists:
+                    # 1. Ignore Git pull when the git reference is the same
+                    # as the "branch:" key
+                    try:
+                        commit_ref = self._git_ref(cwd=self.git_local_dir)
+                    except subprocess.CalledProcessError:
+                        # Ignore git pull because the head is detached
+                        pass
+                    else:
+                        # The head is not detached
+                        # self.current_branch contains the current branch
+                        if (commit_ref == self["reference"] or
+                            (self.current_branch and
+                                self.current_branch == self["reference"])):
+                            ignore_git_pull = True
+
+                    # 2. Ignore Git pull if it is not a local branch
+                    if (not ignore_git_pull and
+                            not self._git_is_local_branch(self["reference"])):
                         ignore_git_pull = True
 
-                # 2. Ignore Git pull if it is not a local branch
-                if (not ignore_git_pull and
-                        not self._git_is_local_branch(self["reference"])):
-                    ignore_git_pull = True
-
         if ignore_git_pull:
             self.add_output(self.indent_spaces +
                             "[INFO] git pull ignored\n")

{batchfetch-1.0.6 → batchfetch-1.0.8}/batchfetch.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: batchfetch
-Version: 1.0.6
+Version: 1.0.8
 Summary: Efficiently clone and pull multiple Git repositories.
 Home-page: https://github.com/jamescherti/batchfetch
 Author: James Cherti

{batchfetch-1.0.6 → batchfetch-1.0.8}/setup.py

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