batchfetch 1.0.5__tar.gz → 1.0.7__tar.gz

{batchfetch-1.0.5 → batchfetch-1.0.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: batchfetch
-Version: 1.0.5
+Version: 1.0.7
 Summary: Efficiently clone and pull multiple Git repositories.
 Home-page: https://github.com/jamescherti/batchfetch
 Author: James Cherti
@@ -80,12 +80,13 @@ usage: batchfetch [--option] [args]
 
 Command line interface.
 
+positional arguments:
+  N                     Specify the batchfetch YAML file(s) (default: './batchfetch.yaml').
+
 options:
   -h, --help            show this help message and exit
   -j JOBS, --jobs JOBS  Run up to N Number of parallel processes (Default: 5).
   -v, --verbose         Enable verbose mode.
-  -f BATCHFETCH_FILE, --batchfetch-file BATCHFETCH_FILE
-                        Specify the batchfetch YAML file (default: './batchfetch.yaml').
 ```
 
 ## License

{batchfetch-1.0.5 → batchfetch-1.0.7}/README.md

@@ -60,12 +60,13 @@ usage: batchfetch [--option] [args]
 
 Command line interface.
 
+positional arguments:
+  N                     Specify the batchfetch YAML file(s) (default: './batchfetch.yaml').
+
 options:
   -h, --help            show this help message and exit
   -j JOBS, --jobs JOBS  Run up to N Number of parallel processes (Default: 5).
   -v, --verbose         Enable verbose mode.
-  -f BATCHFETCH_FILE, --batchfetch-file BATCHFETCH_FILE
-                        Specify the batchfetch YAML file (default: './batchfetch.yaml').
 ```
 
 ## License

{batchfetch-1.0.5 → batchfetch-1.0.7}/batchfetch/batchfetch_base.py

@@ -10,7 +10,8 @@
 #
 # 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.
+# 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/>.
@@ -40,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] = {
@@ -111,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
 
@@ -123,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.5 → batchfetch-1.0.7}/batchfetch/batchfetch_cli.py

@@ -10,7 +10,8 @@
 #
 # 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.
+# 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/>.
@@ -24,7 +25,7 @@ import subprocess
 import sys
 from concurrent.futures import ThreadPoolExecutor, as_completed
 from pathlib import Path
-from typing import Any, Dict, Set, TypeVar
+from typing import Any, Dict, Set
 
 import colorama
 import yaml  # type: ignore
@@ -48,8 +49,6 @@ class BatchFetchCli:
         self._logger = logging.getLogger(self.__class__.__name__)
         self.dirs_relative_to_batchfetch: Set[str] = set()
 
-        self.main_key = "git"
-
         # Plugin
         self.batchfetch_schemas: Dict[Any, Any] = {}
         self.batchfetch_classes: Dict[str, BatchFetchBase] = {}
@@ -134,17 +133,16 @@ class BatchFetchCli:
                 print(f"Schema error: {err}.", file=sys.stderr)
                 sys.exit(1)
 
-            if batchfetch_instance["path"] in dict_local_dir:
-                err_str = ("more than one repository have the " +
-                           "destination path '" +
-                           str(batchfetch_instance["path"]) + "' (" +
+            dest_path = Path(batchfetch_instance["path"]).resolve()
+            if str(dest_path) in dict_local_dir:
+                err_str = ("More than one task have the " +
+                           f"destination path '{dest_path}' (" +
                            str(task[keyword]) + " and " +
-                           str(dict_local_dir[batchfetch_instance["path"]]) +
+                           str(dict_local_dir[(str(dest_path))]) +
                            ")")
                 raise BatchFetchError(err_str)
 
-            dict_local_dir[batchfetch_instance["path"]] = \
-                batchfetch_instance[keyword]
+            dict_local_dir[str(dest_path)] = batchfetch_instance[keyword]
 
     def run_tasks(self) -> bool:
         failed = []
@@ -203,7 +201,7 @@ class BatchFetchCli:
             return False
         else:
             if num_success == 0:
-                print("Already up to date.")
+                print("Nothing to do.")
             elif not self.verbose:
                 print("Success.")
 
@@ -216,6 +214,10 @@ def parse_args():
     usage = "%(prog)s [--option] [args]"
     parser = argparse.ArgumentParser(description=desc, usage=usage)
 
+    parser.add_argument("batchfetch_files", metavar="N", type=str, nargs="*",
+                        help=("Specify the batchfetch YAML file(s) "
+                              "(default: './batchfetch.yaml')."))
+
     parser.add_argument(
         "-j", "--jobs", default="5", required=False,
         help="Run up to N Number of parallel processes (Default: 5).",
@@ -226,40 +228,25 @@ def parse_args():
         help="Enable verbose mode.",
     )
 
-    parser.add_argument(
-        "-f",
-        "--batchfetch-file",
-        default="./batchfetch.yaml",
-        required=False,
-        help="Specify the batchfetch YAML file (default: './batchfetch.yaml').",
-    )
-
     args = parser.parse_args()
+    if not args.batchfetch_files:
+        args.batchfetch_files = ["./batchfetch.yaml"]
 
-    if not Path(args.batchfetch_file).is_file():
-        print(f"Error: File not found: {args.batchfetch_file}",
-              file=sys.stderr)
-        sys.exit(1)
+    for batchfetch_file in args.batchfetch_files:
+        if not Path(batchfetch_file).is_file():
+            print(f"Error: File not found: {batchfetch_file}",
+                  file=sys.stderr)
+            sys.exit(1)
 
     return args
 
 
-def command_line_interface():
-    """Command line interface."""
+def run_batchfetch_procedure(batchfetch_file: Path, args) -> int:
     errno = 0
-    logging.basicConfig(level=logging.INFO, stream=sys.stdout,
-                        format="%(asctime)s %(name)s: %(message)s")
-
-    colorama.init()
-    setproctitle(subprocess.list2cmdline([Path(sys.argv[0]).name] +
-                                         sys.argv[1:]))
-
-    args = parse_args()
     batchfetch_cli = BatchFetchCli(verbose=args.verbose,
                                    max_workers=int(args.jobs))
-
-    batchfetch_cli.load(args.batchfetch_file)
-    os.chdir(os.path.dirname(args.batchfetch_file))
+    batchfetch_cli.load(batchfetch_file)
+    os.chdir(batchfetch_file.parent)
 
     try:
         if not batchfetch_cli.run_tasks():
@@ -271,4 +258,31 @@ def command_line_interface():
         print(f"Error: {err}.", file=sys.stderr)
         errno = 1
 
-    sys.exit(errno)
+    return errno
+
+
+def command_line_interface():
+    """Command line interface."""
+    try:
+        errno = 0
+        logging.basicConfig(level=logging.INFO, stream=sys.stdout,
+                            format="%(asctime)s %(name)s: %(message)s")
+
+        colorama.init()
+        setproctitle(subprocess.list2cmdline([Path(sys.argv[0]).name] +
+                                             sys.argv[1:]))
+
+        args = parse_args()
+        done = []
+        for batchfetch_file in args.batchfetch_files:
+            batchfetch_file = Path(batchfetch_file)
+            batchfetch_file_resolved = batchfetch_file.resolve()
+            if batchfetch_file_resolved in done:
+                continue
+
+            done.append(batchfetch_file_resolved)
+            errno |= run_batchfetch_procedure(batchfetch_file, args)
+
+        sys.exit(errno)
+    except BrokenPipeError:
+        pass

{batchfetch-1.0.5 → batchfetch-1.0.7}/batchfetch/batchfetch_git.py

@@ -10,7 +10,8 @@
 #
 # 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.
+# 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/>.
@@ -158,7 +159,7 @@ class BatchFetchGit(BatchFetchBase):
                             textwrap.indent(err.stderr, " " * self.indent))
 
         if not self.is_error() and not self.is_changed():
-            self.add_output(self.indent_spaces + "# Already up to date\n")
+            self.add_output(self.indent_spaces + "[INFO] Nothing to do.\n")
 
         return self.values
 
@@ -175,7 +176,7 @@ class BatchFetchGit(BatchFetchBase):
 
     def _repo_delete(self):
         if not self.git_local_dir.exists():
-            self.add_output(self.indent_spaces + "# Already deleted\n")
+            self.add_output(self.indent_spaces + "[INFO] Already deleted\n")
         elif not self.git_local_dir.joinpath(".git").is_dir():
             self.add_output(
                 self.indent_spaces +
@@ -186,7 +187,7 @@ class BatchFetchGit(BatchFetchBase):
         elif self.git_local_dir.is_dir():
             shutil.rmtree(str(self.git_local_dir))
             self.add_output(self.indent_spaces +
-                            f"# Deleted: '{self.git_local_dir}'")
+                            f"[INFO] Deleted: '{self.git_local_dir}'")
             self.set_changed(True)
 
     def _repo_clone(self):
@@ -240,7 +241,7 @@ class BatchFetchGit(BatchFetchBase):
 
         if ignore_git_pull:
             self.add_output(self.indent_spaces +
-                            "# git pull ignored\n")
+                            "[INFO] git pull ignored\n")
         else:
             cmd = ["git", "fetch", "origin"]
             self._run(cmd, cwd=str(self.git_local_dir), env=self.env)
@@ -317,7 +318,8 @@ class BatchFetchGit(BatchFetchBase):
                 # Update the branch
                 self._run(["git", "checkout"] + [self["reference"]],
                           cwd=str(self.git_local_dir), env=self.env)
-                self.add_output(self.indent_spaces + "# Branch changed to " +
+                self.add_output(self.indent_spaces +
+                                "[INFO] Branch changed to " +
                                 self["reference"] + "\n")
                 self.set_changed(True)
                 branch_changed = True

{batchfetch-1.0.5 → batchfetch-1.0.7}/batchfetch/helpers.py

@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 #
 # Copyright (c) James Cherti
 # URL: https://github.com/jamescherti/batchfetch
@@ -9,7 +10,8 @@
 #
 # 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.
+# 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/>.
@@ -28,7 +30,7 @@ def md5sum(filename: os.PathLike):
     Calculate and return the MD5 checksum of a file.
 
     Args:
-        filename: The path to the file for which the MD5 checksum is calculated.
+        filename: Path to the file for which the MD5 checksum is calculated.
 
     Returns:
         str: The MD5 checksum of the file.

{batchfetch-1.0.5 → batchfetch-1.0.7}/batchfetch.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: batchfetch
-Version: 1.0.5
+Version: 1.0.7
 Summary: Efficiently clone and pull multiple Git repositories.
 Home-page: https://github.com/jamescherti/batchfetch
 Author: James Cherti
@@ -80,12 +80,13 @@ usage: batchfetch [--option] [args]
 
 Command line interface.
 
+positional arguments:
+  N                     Specify the batchfetch YAML file(s) (default: './batchfetch.yaml').
+
 options:
   -h, --help            show this help message and exit
   -j JOBS, --jobs JOBS  Run up to N Number of parallel processes (Default: 5).
   -v, --verbose         Enable verbose mode.
-  -f BATCHFETCH_FILE, --batchfetch-file BATCHFETCH_FILE
-                        Specify the batchfetch YAML file (default: './batchfetch.yaml').
 ```
 
 ## License

{batchfetch-1.0.5 → batchfetch-1.0.7}/setup.py

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