batchfetch 1.0.2__tar.gz → 1.0.4__tar.gz

{batchfetch-1.0.2/batchfetch.egg-info → batchfetch-1.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: batchfetch
-Version: 1.0.2
+Version: 1.0.4
 Summary: Efficiently clone and pull multiple Git repositories.
 Home-page: https://github.com/jamescherti/batchfetch
 Author: James Cherti
@@ -22,11 +22,21 @@ Requires-Dist: schema
 Requires-Dist: setproctitle
 Requires-Dist: PyYAML
 
-# Batchfetch - Efficiently clone or pull multiple Git repositories.
+# Batchfetch - Efficiently clone or pull multiple Git repositories in parallel
 
 ## Introduction
 
-Efficiently clone or pull multiple Git repositories in parallel. Ideal for developers managing multiple projects or for downloading plugins or packages in bulk.
+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 ideal for quickly cloning or pulling multiple Git repositories. It is also useful for cloning various addons, such as Vim plugins, Emacs packages, Ansible roles, Ansible collections, and other addons available on websites like GitHub, Codeberg, and GitLab.
+
+## Features:
+- Git Clone and Fetch/Merge: Clones the repositories and their submodules, ensuring that all the repositories are always up-to-date by fetching and merging changes.
+- Parallel Operations: Utilizes threads to simultaneously Git clone or pull multiple repositories, dramatically reducing wait times.
+- User-Friendly Interface: Provides simple and straightforward command-line options that make it easy to get started and effectively manage your repositories.
+- Custom Configuration: Allows the use of a YAML configuration file to specify and manage the repositories you interact with, enabling repeatable setups and consistent environments.
 
 ## Installation
 
@@ -69,15 +79,15 @@ Execute the `batchfetch` command from the same directory as `batchfetch.yml` to
 
 Here are the various options that `batchfetch` provides, along with descriptions of their usage:
 
-```sh
+```
 usage: batchfetch [--option] [args]
 
 Command line interface.
 
 options:
   -h, --help            show this help message and exit
-  -p MAX_PROCS, --max-procs MAX_PROCS
-                        Run up to N Number of parallel git processes (Default: 3).
+  -j JOBS, --jobs JOBS
+                        Run up to N Number of parallel git processes (Default: 5).
   -v, --verbose         Enable verbose mode.
   -f BATCHFETCH_FILE, --batchfetch-file BATCHFETCH_FILE
                         Specify the batchfetch YAML file (default: './batchfetch.yaml').

{batchfetch-1.0.2 → batchfetch-1.0.4}/README.md

@@ -1,8 +1,18 @@
-# Batchfetch - Efficiently clone or pull multiple Git repositories.
+# Batchfetch - Efficiently clone or pull multiple Git repositories in parallel
 
 ## Introduction
 
-Efficiently clone or pull multiple Git repositories in parallel. Ideal for developers managing multiple projects or for downloading plugins or packages in bulk.
+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 ideal for quickly cloning or pulling multiple Git repositories. It is also useful for cloning various addons, such as Vim plugins, Emacs packages, Ansible roles, Ansible collections, and other addons available on websites like GitHub, Codeberg, and GitLab.
+
+## Features:
+- Git Clone and Fetch/Merge: Clones the repositories and their submodules, ensuring that all the repositories are always up-to-date by fetching and merging changes.
+- Parallel Operations: Utilizes threads to simultaneously Git clone or pull multiple repositories, dramatically reducing wait times.
+- User-Friendly Interface: Provides simple and straightforward command-line options that make it easy to get started and effectively manage your repositories.
+- Custom Configuration: Allows the use of a YAML configuration file to specify and manage the repositories you interact with, enabling repeatable setups and consistent environments.
 
 ## Installation
 
@@ -45,15 +55,15 @@ Execute the `batchfetch` command from the same directory as `batchfetch.yml` to
 
 Here are the various options that `batchfetch` provides, along with descriptions of their usage:
 
-```sh
+```
 usage: batchfetch [--option] [args]
 
 Command line interface.
 
 options:
   -h, --help            show this help message and exit
-  -p MAX_PROCS, --max-procs MAX_PROCS
-                        Run up to N Number of parallel git processes (Default: 3).
+  -j JOBS, --jobs JOBS
+                        Run up to N Number of parallel git processes (Default: 5).
   -v, --verbose         Enable verbose mode.
   -f BATCHFETCH_FILE, --batchfetch-file BATCHFETCH_FILE
                         Specify the batchfetch YAML file (default: './batchfetch.yaml').

{batchfetch-1.0.2 → batchfetch-1.0.4}/batchfetch/batchfetch_base.py

@@ -113,7 +113,7 @@ class BatchFetchBase:
 
         if not stdout.endswith("\n"):
             stdout += "\n"
-        self.add_output((" " * self.indent) + stdout)
+        self.add_output(stdout)
 
     def _run_pre_exec(self, cwd: os.PathLike = Path(".")):
         self._initialize_data()

{batchfetch-1.0.2 → batchfetch-1.0.4}/batchfetch/batchfetch_cli.py

@@ -184,7 +184,7 @@ class BatchFetchCli:
         else:
             if num_success == 0:
                 print("Already up to date.")
-            else:
+            elif not self.verbose:
                 print("Success.")
 
         return True
@@ -205,8 +205,8 @@ def parse_args():
     parser = argparse.ArgumentParser(description=desc, usage=usage)
 
     parser.add_argument(
-        "-p", "--max-procs", default="3", required=False,
-        help="Run up to N Number of parallel git processes (Default: 3).",
+        "-j", "--jobs", default="5", required=False,
+        help="Run up to N Number of parallel git processes (Default: 5).",
     )
 
     parser.add_argument(
@@ -244,7 +244,7 @@ def command_line_interface():
 
     args = parse_args()
     downloader_cli = BatchFetchCli(verbose=args.verbose,
-                                   max_workers=int(args.max_procs))
+                                   max_workers=int(args.jobs))
 
     downloader_cli.load(args.batchfetch_file)
     os.chdir(os.path.dirname(args.batchfetch_file))

{batchfetch-1.0.2 → batchfetch-1.0.4}/batchfetch/batchfetch_git.py

@@ -209,16 +209,19 @@ class BatchFetchGit(BatchFetchBase):
             try:
                 self._git_tags(self["branch"])
             except GitBranchDoesNotExist:
-                ignore_git_pull = False
+                pass
             else:
                 # The branch exists
-                ignore_git_pull = True
 
-            # Check if the new branch is different from the current one
-            commit_ref = self._git_ref(cwd=self.git_local_dir)
-            if self.current_branch and (commit_ref == self["branch"] or
-                                        self.current_branch == self["branch"]):
-                ignore_git_pull = True
+                # Ignore Git pull when the git reference is the same
+                commit_ref = self._git_ref(cwd=self.git_local_dir)
+                if (self.current_branch and
+                    (commit_ref == self["branch"] or
+                     self.current_branch == self["branch"])):
+                    ignore_git_pull = True
+                # Ignore Git pull if it is not a local branch
+                elif not self._git_is_local_branch(self["branch"]):
+                    ignore_git_pull = True
 
         if ignore_git_pull:
             self.add_output(self.indent_spaces +
@@ -244,6 +247,23 @@ class BatchFetchGit(BatchFetchBase):
 
         return git_merge
 
+    def _git_is_local_branch(self, branch: str) -> bool:
+        try:
+            stdout, _ = run_simple(["git", "rev-parse", "--symbolic-full-name",
+                                    branch], env=self.env,
+                                   cwd=self.git_local_dir)
+            if not stdout:
+                return False
+
+            full_branch_name = stdout[0].strip()
+
+            if full_branch_name.startswith("refs/heads/"):
+                return True
+        except subprocess.CalledProcessError:
+            pass
+
+        return False
+
     def _git_tags(self, branch: str) -> List[str]:
         stdout: List[str] = []
         try:

{batchfetch-1.0.2 → batchfetch-1.0.4/batchfetch.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: batchfetch
-Version: 1.0.2
+Version: 1.0.4
 Summary: Efficiently clone and pull multiple Git repositories.
 Home-page: https://github.com/jamescherti/batchfetch
 Author: James Cherti
@@ -22,11 +22,21 @@ Requires-Dist: schema
 Requires-Dist: setproctitle
 Requires-Dist: PyYAML
 
-# Batchfetch - Efficiently clone or pull multiple Git repositories.
+# Batchfetch - Efficiently clone or pull multiple Git repositories in parallel
 
 ## Introduction
 
-Efficiently clone or pull multiple Git repositories in parallel. Ideal for developers managing multiple projects or for downloading plugins or packages in bulk.
+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 ideal for quickly cloning or pulling multiple Git repositories. It is also useful for cloning various addons, such as Vim plugins, Emacs packages, Ansible roles, Ansible collections, and other addons available on websites like GitHub, Codeberg, and GitLab.
+
+## Features:
+- Git Clone and Fetch/Merge: Clones the repositories and their submodules, ensuring that all the repositories are always up-to-date by fetching and merging changes.
+- Parallel Operations: Utilizes threads to simultaneously Git clone or pull multiple repositories, dramatically reducing wait times.
+- User-Friendly Interface: Provides simple and straightforward command-line options that make it easy to get started and effectively manage your repositories.
+- Custom Configuration: Allows the use of a YAML configuration file to specify and manage the repositories you interact with, enabling repeatable setups and consistent environments.
 
 ## Installation
 
@@ -69,15 +79,15 @@ Execute the `batchfetch` command from the same directory as `batchfetch.yml` to
 
 Here are the various options that `batchfetch` provides, along with descriptions of their usage:
 
-```sh
+```
 usage: batchfetch [--option] [args]
 
 Command line interface.
 
 options:
   -h, --help            show this help message and exit
-  -p MAX_PROCS, --max-procs MAX_PROCS
-                        Run up to N Number of parallel git processes (Default: 3).
+  -j JOBS, --jobs JOBS
+                        Run up to N Number of parallel git processes (Default: 5).
   -v, --verbose         Enable verbose mode.
   -f BATCHFETCH_FILE, --batchfetch-file BATCHFETCH_FILE
                         Specify the batchfetch YAML file (default: './batchfetch.yaml').

{batchfetch-1.0.2 → batchfetch-1.0.4}/setup.py

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