batchfetch 1.0.8__tar.gz → 1.1.0__tar.gz

batchfetch-1.1.0/.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.0.8 → batchfetch-1.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: batchfetch
-Version: 1.0.8
+Version: 1.1.0
 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.0.8 → batchfetch-1.1.0}/batchfetch/batchfetch_git.py

@@ -92,7 +92,7 @@ class BatchFetchGit(BatchFetchBase):
 
         The command will fail if the branch is detached.
         """
-        cmd = "git show-ref --head --verify HEAD"
+        cmd = ["git", "show-ref", "--head", "--verify", "HEAD"]
         try:
             stdout, _ = run_simple(cmd, cwd=cwd, env=self.env)
             output = stdout[0].split(" ")[0]
@@ -208,64 +208,64 @@ class BatchFetchGit(BatchFetchBase):
         git_merge = False
 
         # Merge
-        ignore_git_pull = False
-        if not self["git_pull"]:
-            ignore_git_pull = True
-
+        do_git_pull = self["git_pull"]
         if self["reference"]:
-            ignore_git_pull = False
-            # Check if the new branch exists
+            do_git_pull = False
+            commit_ref = None
+
             try:
-                self._git_tags(self["reference"])
+                # Returns the commit ref of the branch or commit
+                #
+                # 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 = self._git_tags(self["reference"] + "^{commit}")[0]
             except GitReferenceDoesNotExist:
-                # The reference does not exist. We should maybe git pull
-                # in case the reference is in a new commit.
-                ignore_git_pull = False
-            else:
-                if self.current_branch and \
-                        self.current_branch == self["reference"]:
-                    ignore_git_pull = False
+                # The wanted reference does not exist. We should git pull in
+                # case we can get the reference
+                do_git_pull = True
+            else:  # The reference exists
+                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]
+                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 commit_ref and commit_ref_head == commit_ref:
+                    do_git_pull = False
                 else:
-                    # 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
-
-        if ignore_git_pull:
-            self.add_output(self.indent_spaces +
-                            "[INFO] git pull ignored\n")
-        else:
-            cmd = ["git", "fetch", "origin"]
-            self._run(cmd, cwd=str(self.git_local_dir), env=self.env)
+                    do_git_pull = True
+
+        if not do_git_pull:
+            self.add_output(self.indent_spaces + "[INFO] git pull ignored\n")
+            return git_merge
 
-            # TODO: only merge when difference from upstream
-            commit_ref = self._git_ref(cwd=self.git_local_dir)
+        # Fetch
+        cmd = ["git", "fetch", "origin"]
+        self._run(cmd, cwd=str(self.git_local_dir), env=self.env)
+
+        # Merge
+        real_branch = self._git_is_local_branch("HEAD")
+        if real_branch:
+           # TODO: only merge when difference from upstream
+            commit_ref_head = self._git_ref(cwd=self.git_local_dir)
             self._run(["git", "merge", "--ff-only"],
                       cwd=str(self.git_local_dir), env=self.env)
             git_ref_after_merge = self._git_ref(cwd=self.git_local_dir)
-            if commit_ref != git_ref_after_merge:
+            if commit_ref_head != git_ref_after_merge:
                 git_merge = True
                 self.set_changed(True)
                 self._run(["git", "log",
                            '--pretty=format:"%h %ad %s [%cn]"',
                            "--decorate", "--date=short",
-                           f"{commit_ref}..{git_ref_after_merge}"],
+                           f"{commit_ref_head}..{git_ref_after_merge}"],
                           cwd=str(self.git_local_dir),
                           env=self.env)
 
@@ -291,10 +291,9 @@ class BatchFetchGit(BatchFetchBase):
     def _git_tags(self, branch: str) -> List[str]:
         stdout: List[str] = []
         try:
-            stdout, _ = run_simple(
-                ["git", "rev-parse", "--verify", branch],
-                env=self.env,
-                cwd=self.git_local_dir)
+            stdout, _ = run_simple(["git", "rev-parse", "--verify", branch],
+                                   env=self.env,
+                                   cwd=self.git_local_dir)
         except subprocess.CalledProcessError as err:
             raise GitReferenceDoesNotExist(
                 f"The reference '{branch}' does not exist.") from err

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: batchfetch
-Version: 1.0.8
+Version: 1.1.0
 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.0.8 → batchfetch-1.1.0}/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.0/run_tests.sh

@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+#
+# Copyright (c) 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.0.8 → batchfetch-1.1.0}/setup.py

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

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

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

batchfetch-1.1.0/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.0/tests/test_helpers.py

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

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