batchfetch 1.1.6__tar.gz → 1.1.8__tar.gz

batchfetch-1.1.8/.gitignore

@@ -0,0 +1,138 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+cover/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+.pybuilder/
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+#   For a library or package, you might want to ignore these files since the code is
+#   intended to run in multiple environments; otherwise, check them in:
+# .python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# pytype static type analyzer
+.pytype/
+
+# Cython debug symbols
+cython_debug/

{batchfetch-1.1.6 → batchfetch-1.1.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: batchfetch
-Version: 1.1.6
+Version: 1.1.8
 Summary: Efficiently clone and pull multiple Git repositories.
 Home-page: https://github.com/jamescherti/batchfetch
 Author: James Cherti
@@ -17,6 +17,10 @@ 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
 
 # Batchfetch - Efficiently clone or pull multiple Git repositories in parallel
 

{batchfetch-1.1.6 → batchfetch-1.1.8}/batchfetch/batchfetch_git.py

@@ -136,8 +136,7 @@ class BatchFetchGit(TaskBatchFetch):
 
                 git_merge_done = self._repo_pull()
                 git_branch_changed = False
-                if self.is_branch:
-                    git_branch_changed = self._repo_fix_branch()
+                git_branch_changed = self._repo_fix_branch()
 
                 if git_merge_done or git_branch_changed:
                     self._repo_update_submodules()
@@ -254,50 +253,52 @@ class BatchFetchGit(TaskBatchFetch):
                 pass
 
             if not commit_ref and not self.is_branch:
+                do_git_pull = True
                 self.add_output(
                     self.indent_spaces +
-                    "[INFO] Git fetch origin reason:" +
+                    "[INFO] Git fetch origin reason: " +
                     f"The reference does not exist: {self['reference']}" +
                     "\n")
 
-                if not do_git_pull:
-                    try:
-                        # Check if the branch is a tag or a branch
-                        cmd = ["git", "show-ref", "--verify", "--quiet",
-                               f"refs/heads/{self['reference']}"]
-                        run_simple(cmd, env=self.env, cwd=self.git_local_dir)
-                        self.add_output(
-                            self.indent_spaces +
-                            "[INFO] Git fetch origin reason:" +
-                            f"{self['reference']} is a branch, not a tag" +
-                            "\n")
-                        do_git_pull = True
-                    except subprocess.CalledProcessError:
-                        pass
-
-            # if not do_git_pull:
-            #     try:
-            #         # If the tag is annotated, it points to a tag object,
-            #         # not directly to a commit. You need to resolve it to
-            #         # the commit it points to. Using `git rev-parse
-            #         # <tagname>^{commit}` allows getting the right
-            #         # reference.
-            #         commit_ref_head = self._git_tags("HEAD^{commit}")[0]
-            #         commit_ref_head = commit_ref_head.strip()
-            #     except GitReferenceDoesNotExist:
-            #         # HEAD is detached
-            #         commit_ref_head = None
-            #
-            #     # The wanted commit reference does not exist
-            #     # Or the commit ref of HEAD hasn't changed
-            #     if not commit_ref_head or commit_ref_head != commit_ref:
-            #         self.add_output(
-            #             self.indent_spaces +
-            #             "[INFO] Git fetch origin reason: "
-            #             f"Commit ref head '{commit_ref_head}' != "
-            #             f"commit ref '{commit_ref_head}'"
-            #             "\n")
-            #         do_git_pull = True
+            if not do_git_pull:
+                try:
+                    # Check if the branch is a tag or a branch
+                    cmd = ["git", "show-ref", "--verify", "--quiet",
+                           f"refs/heads/{self['reference']}"]
+                    run_simple(cmd, env=self.env, cwd=self.git_local_dir)
+                    self.add_output(
+                        self.indent_spaces +
+                        "[INFO] Git fetch origin reason:" +
+                        f"{self['reference']} is a branch, not a tag" +
+                        "\n")
+                    do_git_pull = True
+                except subprocess.CalledProcessError:
+                    pass
+
+            if not do_git_pull and commit_ref:
+                # This is to check if a tag has been changed
+                try:
+                    # If the tag is annotated, it points to a tag object,
+                    # not directly to a commit. You need to resolve it to
+                    # the commit it points to. Using `git rev-parse
+                    # <tagname>^{commit}` allows getting the right
+                    # reference.
+                    commit_ref_head = self._git_tags("HEAD^{commit}")[0]
+                    commit_ref_head = commit_ref_head.strip()
+                except GitReferenceDoesNotExist:
+                    # HEAD is detached
+                    commit_ref_head = None
+
+                # The wanted commit reference does not exist
+                # Or the commit ref of HEAD hasn't changed
+                if not commit_ref_head or commit_ref_head != commit_ref:
+                    self.add_output(
+                        self.indent_spaces +
+                        "[INFO] Git fetch origin reason: "
+                        f"Commit ref head '{commit_ref_head}' != "
+                        f"commit ref '{commit_ref_head}'"
+                        "\n")
+                    do_git_pull = True
 
         if not do_git_pull:
             self.add_output(self.indent_spaces + "[INFO] git pull ignored\n")
@@ -414,11 +415,17 @@ class BatchFetchGit(TaskBatchFetch):
             # Also check the commit reference in case
             # branch is a commit reference instead of a tag
             try:
-                git_ref_branch = self._git_tags(self["reference"] +
+                # Check if the branch exists
+                git_ref_branch = self._git_tags("origin/" +
+                                                self["reference"] +
                                                 "^{commit}")[0]
             except GitReferenceDoesNotExist as err:
-                raise BatchFetchError(f"The branch '{self['reference']}' "
-                                      "does not exist.") from err
+                # Check if the commit ref exists
+                try:
+                    git_ref_branch = self._git_tags(self["reference"])[0]
+                except GitReferenceDoesNotExist as err:
+                    raise BatchFetchError(f"The branch '{self['reference']}' "
+                                          "does not exist.") from err
 
             if git_ref_after_merge != git_ref_branch and \
                     self["reference"] not in git_tags:

{batchfetch-1.1.6 → batchfetch-1.1.8}/batchfetch.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: batchfetch
-Version: 1.1.6
+Version: 1.1.8
 Summary: Efficiently clone and pull multiple Git repositories.
 Home-page: https://github.com/jamescherti/batchfetch
 Author: James Cherti
@@ -17,6 +17,10 @@ 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
 
 # Batchfetch - Efficiently clone or pull multiple Git repositories in parallel
 

{batchfetch-1.1.6 → batchfetch-1.1.8}/batchfetch.egg-info/SOURCES.txt

@@ -1,5 +1,7 @@
+.gitignore
 LICENSE
 README.md
+run_tests.sh
 setup.py
 batchfetch/__init__.py
 batchfetch/batchfetch_base.py
@@ -11,4 +13,7 @@ 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
+tests/data/test-md5sum.txt
+tests/data/test-run_simple.sh

batchfetch-1.1.8/run_tests.sh

@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+#
+# Copyright (C) 2024 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/>.
+#
+cd "$(dirname "${BASH_SOURCE[0]}")"
+export PYTHONPATH="$(pwd)"
+exec pytest -v -v --cov=batchfetch --cov=tests \
+  --cov-report=term \
+  --cov-report=html:htmlcov \
+  tests/test_*py

{batchfetch-1.1.6 → batchfetch-1.1.8}/setup.py

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

batchfetch-1.1.8/tests/data/test-md5sum.txt

@@ -0,0 +1,3 @@
+Test 1.
+Test 2.
+Test 3.

batchfetch-1.1.8/tests/data/test-run_simple.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+cd "$(dirname "${BASH_SOURCE[0]}")"
+cat ./test-md5sum.txt
+cat ./test-md5sum.txt | tail -n 1 >&2

batchfetch-1.1.8/tests/test_helpers.py

@@ -0,0 +1,56 @@
+#!/usr/bin/env python
+#
+# Copyright (C) 2024 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.1.6 → batchfetch-1.1.8}/batchfetch.egg-info/requires.txt

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