gitlabber 1.2.6__tar.gz → 1.2.8__tar.gz

{gitlabber-1.2.6/gitlabber.egg-info → gitlabber-1.2.8}/PKG-INFO

@@ -1,12 +1,11 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: gitlabber
-Version: 1.2.6
+Version: 1.2.8
 Summary: A Gitlab clone/pull utility for backing up or cloning Gitlab groups
-Home-page: https://github.com/ezbz/gitlabber
-Download-URL: https://github.com/ezbz/gitlabber/archive/main.zip
-Author: Erez Mazor
-Author-email: erezmazor@gmail.com
+Author-email: Erez Mazor <erezmazor@gmail.com>
 License: MIT
+Project-URL: Homepage, https://github.com/ezbz/gitlabber
+Project-URL: Download, https://github.com/ezbz/gitlabber/archive/main.zip
 Keywords: gitlab,python,cli
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
@@ -15,14 +14,27 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Natural Language :: English
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3
 Description-Content-Type: text/x-rst
 License-File: LICENSE.txt
+Requires-Dist: docopt
+Requires-Dist: anytree
+Requires-Dist: globre
+Requires-Dist: pyyaml
+Requires-Dist: tqdm
+Requires-Dist: GitPython
+Requires-Dist: python-gitlab
+Provides-Extra: test
+Requires-Dist: coverage; extra == "test"
+Requires-Dist: pytest; extra == "test"
+Requires-Dist: pytest-cov; extra == "test"
+Requires-Dist: pytest-integration; extra == "test"
+Dynamic: license-file
 
 .. image:: https://github.com/ezbz/gitlabber/actions/workflows/python-app.yml/badge.svg?branch=master
     :target: https://github.com/ezbz/gitlabber/actions/workflows/python-app.yml
@@ -40,7 +52,7 @@ License-File: LICENSE.txt
     :target: https://pypi.python.org/pypi/gitlabber/
 
 .. image:: https://readthedocs.org/projects/gitlabber/badge/?version=latest&style=plastic
-    :target: https://gitlabber.readthedocs.io/en/latest/README.html
+    :target: https://app.readthedocs.org/projects/gitlabber/
 
 
 Gitlabber
@@ -104,7 +116,7 @@ Usage
 
 * To see how to use glob patterns and regex to filter tree nodes, see the `globre project page <https://pypi.org/project/globre/#details>`_.
 
-* Include/Exclude patterns do not work at the API level but work on the results returned from the API, for large Gitlab installations this can take a lot of time, if you need to reduce the amound of API calls for such projects use the ``--group-search`` parameter to search only for the top level groups the interest you using the `Gitlab Group Search API <https://docs.gitlab.com/ee/api/groups.html#search-for-group>` which allows you to do a partial like query for a Group's path or name
+* Include/Exclude patterns do not work at the API level but work on the results returned from the API, for large Gitlab installations this can take a lot of time, if you need to reduce the amound of API calls for such projects use the ``--group-search`` parameter to search only for the top level groups the interest you using the `Gitlab Group Search API <https://docs.gitlab.com/ee/api/groups.html#search-for-group>`_ which allows you to do a partial like query for a Group's path or name
 
 * Cloning vs Pulling: when running Gitlabber consecutively with the same parameters, it will scan the local tree structure; if the project directory exists and is a valid git repository (has .git folder in it) Gitlabber will perform a git pull in the directory, otherwise the project directory will be created and the GitLab project will be cloned into it.
 
@@ -145,7 +157,6 @@ Usage
                             comma delimited list of glob patterns of paths to projects or groups to exclude from clone/pull
     -r, --recursive       clone/pull git submodules recursively
     -F, --use-fetch       clone/fetch git repository (mirrored repositories)
-    -d, --dont-checkout   don't checkout pulled git repository
     -s, --include-shared  include shared projects in the results
     -g term, --group-search term
                             only include groups matching the search term, filtering done at the API level (useful for large projects, see: https://docs.gitlab.com/ee/api/groups.html#search-for-group works with partial names of path or name)
@@ -174,7 +185,7 @@ Usage
         clone projects that start with a case insensitive 'w' using a regular expression:
         gitlabber -i '/{[w].*}' .
 
-        clone a user's personal projects to username-personal-projects
+        clone the personal projects to username-personal-projects
         gitlabber -U .
 
         perform a shallow clone of the git repositories
@@ -201,3 +212,8 @@ Known Limitations
 * Renaming, moving and deleting projects: Gitlabber doesn't maintain local tree state (projects and groups). For that reason is does not rename move or delete local projects when they are modified on the server. When projects are moved or renamed, Gitlabber will clone them again under their new name or location. When deleted, Gitlabber will not delete the local project.
 * Folder naming strategy: Consecutively running Gitlabber with different values for the ``-n`` parameter will produce undesirable results. Use the same value as previous runs, or simply don't change it from the default (project name).
 * If you're going to clone a large number of projects, observe rate limits `for gitlab.com <https://docs.gitlab.com/ee/user/gitlab_com/index.html#gitlabcom-specific-rate-limits/>`_, and `for on-premise installations <https://docs.gitlab.com/ee/security/rate_limits.html>`_.
+
+
+Links
+-----
+* Gitlabber `tutorial <https://medium.com/@natskvi/clone-all-your-gitlab-groups-repos-before-starting-to-code-dd559ec5c8d6>`_ by nsk

{gitlabber-1.2.6 → gitlabber-1.2.8}/README.rst

@@ -14,7 +14,7 @@
     :target: https://pypi.python.org/pypi/gitlabber/
 
 .. image:: https://readthedocs.org/projects/gitlabber/badge/?version=latest&style=plastic
-    :target: https://gitlabber.readthedocs.io/en/latest/README.html
+    :target: https://app.readthedocs.org/projects/gitlabber/
 
 
 Gitlabber
@@ -78,7 +78,7 @@ Usage
 
 * To see how to use glob patterns and regex to filter tree nodes, see the `globre project page <https://pypi.org/project/globre/#details>`_.
 
-* Include/Exclude patterns do not work at the API level but work on the results returned from the API, for large Gitlab installations this can take a lot of time, if you need to reduce the amound of API calls for such projects use the ``--group-search`` parameter to search only for the top level groups the interest you using the `Gitlab Group Search API <https://docs.gitlab.com/ee/api/groups.html#search-for-group>` which allows you to do a partial like query for a Group's path or name
+* Include/Exclude patterns do not work at the API level but work on the results returned from the API, for large Gitlab installations this can take a lot of time, if you need to reduce the amound of API calls for such projects use the ``--group-search`` parameter to search only for the top level groups the interest you using the `Gitlab Group Search API <https://docs.gitlab.com/ee/api/groups.html#search-for-group>`_ which allows you to do a partial like query for a Group's path or name
 
 * Cloning vs Pulling: when running Gitlabber consecutively with the same parameters, it will scan the local tree structure; if the project directory exists and is a valid git repository (has .git folder in it) Gitlabber will perform a git pull in the directory, otherwise the project directory will be created and the GitLab project will be cloned into it.
 
@@ -119,7 +119,6 @@ Usage
                             comma delimited list of glob patterns of paths to projects or groups to exclude from clone/pull
     -r, --recursive       clone/pull git submodules recursively
     -F, --use-fetch       clone/fetch git repository (mirrored repositories)
-    -d, --dont-checkout   don't checkout pulled git repository
     -s, --include-shared  include shared projects in the results
     -g term, --group-search term
                             only include groups matching the search term, filtering done at the API level (useful for large projects, see: https://docs.gitlab.com/ee/api/groups.html#search-for-group works with partial names of path or name)
@@ -148,7 +147,7 @@ Usage
         clone projects that start with a case insensitive 'w' using a regular expression:
         gitlabber -i '/{[w].*}' .
 
-        clone a user's personal projects to username-personal-projects
+        clone the personal projects to username-personal-projects
         gitlabber -U .
 
         perform a shallow clone of the git repositories
@@ -175,3 +174,8 @@ Known Limitations
 * Renaming, moving and deleting projects: Gitlabber doesn't maintain local tree state (projects and groups). For that reason is does not rename move or delete local projects when they are modified on the server. When projects are moved or renamed, Gitlabber will clone them again under their new name or location. When deleted, Gitlabber will not delete the local project.
 * Folder naming strategy: Consecutively running Gitlabber with different values for the ``-n`` parameter will produce undesirable results. Use the same value as previous runs, or simply don't change it from the default (project name).
 * If you're going to clone a large number of projects, observe rate limits `for gitlab.com <https://docs.gitlab.com/ee/user/gitlab_com/index.html#gitlabcom-specific-rate-limits/>`_, and `for on-premise installations <https://docs.gitlab.com/ee/security/rate_limits.html>`_.
+
+
+Links
+-----
+* Gitlabber `tutorial <https://medium.com/@natskvi/clone-all-your-gitlab-groups-repos-before-starting-to-code-dd559ec5c8d6>`_ by nsk

gitlabber-1.2.8/gitlabber/__init__.py

@@ -0,0 +1,2 @@
+""" Gitlabber """
+__version__ = '1.2.8'

{gitlabber-1.2.6 → gitlabber-1.2.8}/gitlabber/cli.py

@@ -1,4 +1,3 @@
-
 import os
 import sys
 import logging
@@ -73,7 +72,7 @@ def config_logging(args):
 
 
 def parse_args(argv=None):
-    example_text = '''examples:
+    example_text = r'''examples:
 
     clone an entire gitlab tree using a url and a token:
     gitlabber -t <personal access token> -u <gitlab url>
@@ -93,7 +92,7 @@ def parse_args(argv=None):
     clone projects that start with a case insensitive 'w' using a regular expression:
     gitlabber -i '/{[w].*}' .
     
-    clone a user's personal projects to username-personal-projects
+    clone the user personal projects to username-personal-projects
     gitlabber -U .
     
     perform a shallow clone of the git repositories
@@ -200,12 +199,6 @@ def parse_args(argv=None):
         action='store_true',
         default=False,
         help='clone/fetch git repository (mirrored repositories)')
-    parser.add_argument(
-        '-d',
-        '--dont-checkout',
-        action='store_true',
-        default=False,
-        help="don't checkout pulled git repository")    
     parser.add_argument(
         '-s',
         '--include-shared',

{gitlabber-1.2.6 → gitlabber-1.2.8}/gitlabber/gitlab_tree.py

@@ -119,26 +119,37 @@ class GitlabTree:
             projects = group.projects.list(archived=self.archived, with_shared=self.include_shared, get_all=True)
             self.progress.update_progress_length(len(projects))
             self.add_projects(parent, projects)
+            
+            if self.include_shared and hasattr(group, 'shared_projects'):
+                shared_projects = group.shared_projects.list(get_all=True)
+                self.progress.update_progress_length(len(shared_projects))
+                self.add_projects(parent, shared_projects)
         except GitlabListError as error:
             log.error(f"Error getting projects on {group.name} id: [{group.id}]  error message: [{error.error_message}]")
 
     def get_subgroups(self, group, parent):
-        subgroups = group.subgroups.list(as_list=False, get_all=True)
-        self.progress.update_progress_length(len(subgroups))
-        for subgroup_def in subgroups:
-            try:
-                subgroup = self.gitlab.groups.get(subgroup_def.id)
-                subgroup_id = subgroup.name if self.naming == FolderNaming.NAME else subgroup.path
-                node = self.make_node("subgroup", subgroup_id, parent, url=subgroup.web_url)
-                self.progress.show_progress(node.name, 'group')
-                self.get_subgroups(subgroup, node)
-                self.get_projects(subgroup, node)
-            except GitlabListError as error:
-                if error.response_code == 404:
-                    log.error(f"{error.response_code} error while listing subgroup with name: {group.name} [id: {group.id}]. Check your permissions as you may not have access to it. Message: {error.error_message}")
-                    continue
-                else:
-                    raise error
+        try:
+            subgroups = group.subgroups.list(as_list=False, get_all=True)
+            self.progress.update_progress_length(len(subgroups))
+            for subgroup_def in subgroups:
+                try:
+                    subgroup = self.gitlab.groups.get(subgroup_def.id)
+                    subgroup_id = subgroup.name if self.naming == FolderNaming.NAME else subgroup.path
+                    node = self.make_node("subgroup", subgroup_id, parent, url=subgroup.web_url)
+                    self.progress.show_progress(node.name, 'group')
+                    self.get_subgroups(subgroup, node)
+                    self.get_projects(subgroup, node)
+                except GitlabGetError as error:
+                    if error.response_code == 404:
+                        log.error(f"{error.response_code} error while getting subgroup with name: {group.name} [id: {group.id}]. Check your permissions as you may not have access to it. Message: {error.error_message}")
+                        continue
+                    else:
+                        raise error
+        except GitlabListError as error:
+            if error.response_code == 404:
+                log.error(f"{error.response_code} error while listing subgroup with name: {group.name} [id: {group.id}]. Check your permissions as you may not have access to it. Message: {error.error_message}")
+            else:
+                raise error
 
     def load_gitlab_tree(self):
         log.debug(f"Starting group search with archived: {self.archived} search term: {self.group_search}")

{gitlabber-1.2.6 → gitlabber-1.2.8/gitlabber.egg-info}/PKG-INFO

@@ -1,12 +1,11 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: gitlabber
-Version: 1.2.6
+Version: 1.2.8
 Summary: A Gitlab clone/pull utility for backing up or cloning Gitlab groups
-Home-page: https://github.com/ezbz/gitlabber
-Download-URL: https://github.com/ezbz/gitlabber/archive/main.zip
-Author: Erez Mazor
-Author-email: erezmazor@gmail.com
+Author-email: Erez Mazor <erezmazor@gmail.com>
 License: MIT
+Project-URL: Homepage, https://github.com/ezbz/gitlabber
+Project-URL: Download, https://github.com/ezbz/gitlabber/archive/main.zip
 Keywords: gitlab,python,cli
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
@@ -15,14 +14,27 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Natural Language :: English
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3
 Description-Content-Type: text/x-rst
 License-File: LICENSE.txt
+Requires-Dist: docopt
+Requires-Dist: anytree
+Requires-Dist: globre
+Requires-Dist: pyyaml
+Requires-Dist: tqdm
+Requires-Dist: GitPython
+Requires-Dist: python-gitlab
+Provides-Extra: test
+Requires-Dist: coverage; extra == "test"
+Requires-Dist: pytest; extra == "test"
+Requires-Dist: pytest-cov; extra == "test"
+Requires-Dist: pytest-integration; extra == "test"
+Dynamic: license-file
 
 .. image:: https://github.com/ezbz/gitlabber/actions/workflows/python-app.yml/badge.svg?branch=master
     :target: https://github.com/ezbz/gitlabber/actions/workflows/python-app.yml
@@ -40,7 +52,7 @@ License-File: LICENSE.txt
     :target: https://pypi.python.org/pypi/gitlabber/
 
 .. image:: https://readthedocs.org/projects/gitlabber/badge/?version=latest&style=plastic
-    :target: https://gitlabber.readthedocs.io/en/latest/README.html
+    :target: https://app.readthedocs.org/projects/gitlabber/
 
 
 Gitlabber
@@ -104,7 +116,7 @@ Usage
 
 * To see how to use glob patterns and regex to filter tree nodes, see the `globre project page <https://pypi.org/project/globre/#details>`_.
 
-* Include/Exclude patterns do not work at the API level but work on the results returned from the API, for large Gitlab installations this can take a lot of time, if you need to reduce the amound of API calls for such projects use the ``--group-search`` parameter to search only for the top level groups the interest you using the `Gitlab Group Search API <https://docs.gitlab.com/ee/api/groups.html#search-for-group>` which allows you to do a partial like query for a Group's path or name
+* Include/Exclude patterns do not work at the API level but work on the results returned from the API, for large Gitlab installations this can take a lot of time, if you need to reduce the amound of API calls for such projects use the ``--group-search`` parameter to search only for the top level groups the interest you using the `Gitlab Group Search API <https://docs.gitlab.com/ee/api/groups.html#search-for-group>`_ which allows you to do a partial like query for a Group's path or name
 
 * Cloning vs Pulling: when running Gitlabber consecutively with the same parameters, it will scan the local tree structure; if the project directory exists and is a valid git repository (has .git folder in it) Gitlabber will perform a git pull in the directory, otherwise the project directory will be created and the GitLab project will be cloned into it.
 
@@ -145,7 +157,6 @@ Usage
                             comma delimited list of glob patterns of paths to projects or groups to exclude from clone/pull
     -r, --recursive       clone/pull git submodules recursively
     -F, --use-fetch       clone/fetch git repository (mirrored repositories)
-    -d, --dont-checkout   don't checkout pulled git repository
     -s, --include-shared  include shared projects in the results
     -g term, --group-search term
                             only include groups matching the search term, filtering done at the API level (useful for large projects, see: https://docs.gitlab.com/ee/api/groups.html#search-for-group works with partial names of path or name)
@@ -174,7 +185,7 @@ Usage
         clone projects that start with a case insensitive 'w' using a regular expression:
         gitlabber -i '/{[w].*}' .
 
-        clone a user's personal projects to username-personal-projects
+        clone the personal projects to username-personal-projects
         gitlabber -U .
 
         perform a shallow clone of the git repositories
@@ -201,3 +212,8 @@ Known Limitations
 * Renaming, moving and deleting projects: Gitlabber doesn't maintain local tree state (projects and groups). For that reason is does not rename move or delete local projects when they are modified on the server. When projects are moved or renamed, Gitlabber will clone them again under their new name or location. When deleted, Gitlabber will not delete the local project.
 * Folder naming strategy: Consecutively running Gitlabber with different values for the ``-n`` parameter will produce undesirable results. Use the same value as previous runs, or simply don't change it from the default (project name).
 * If you're going to clone a large number of projects, observe rate limits `for gitlab.com <https://docs.gitlab.com/ee/user/gitlab_com/index.html#gitlabcom-specific-rate-limits/>`_, and `for on-premise installations <https://docs.gitlab.com/ee/security/rate_limits.html>`_.
+
+
+Links
+-----
+* Gitlabber `tutorial <https://medium.com/@natskvi/clone-all-your-gitlab-groups-repos-before-starting-to-code-dd559ec5c8d6>`_ by nsk

{gitlabber-1.2.6 → gitlabber-1.2.8}/gitlabber.egg-info/SOURCES.txt

@@ -1,6 +1,7 @@
 LICENSE.txt
 MANIFEST.in
 README.rst
+pyproject.toml
 setup.cfg
 setup.py
 gitlabber/__init__.py
@@ -34,16 +35,4 @@ tests/test_git.py
 tests/test_gitlab_tree.py
 tests/test_integration.py
 tests/test_method.py
-tests/test_naming.py
-tests/__pycache__/__init__.cpython-311.pyc
-tests/__pycache__/gitlab_test_utils.cpython-311.pyc
-tests/__pycache__/io_test_util.cpython-311.pyc
-tests/__pycache__/test_archive.cpython-311-pytest-8.2.2.pyc
-tests/__pycache__/test_cli.cpython-311-pytest-8.2.2.pyc
-tests/__pycache__/test_e2e.cpython-311-pytest-8.2.2.pyc
-tests/__pycache__/test_format.cpython-311-pytest-8.2.2.pyc
-tests/__pycache__/test_git.cpython-311-pytest-8.2.2.pyc
-tests/__pycache__/test_gitlab_tree.cpython-311-pytest-8.2.2.pyc
-tests/__pycache__/test_integration.cpython-311-pytest-8.2.2.pyc
-tests/__pycache__/test_method.cpython-311-pytest-8.2.2.pyc
-tests/__pycache__/test_naming.cpython-311-pytest-8.2.2.pyc
+tests/test_naming.py

{gitlabber-1.2.6 → gitlabber-1.2.8}/gitlabber.egg-info/requires.txt

@@ -5,3 +5,9 @@ pyyaml
 tqdm
 GitPython
 python-gitlab
+
+[test]
+coverage
+pytest
+pytest-cov
+pytest-integration

gitlabber-1.2.8/pyproject.toml

@@ -0,0 +1,79 @@
+[build-system]
+requires = ["setuptools>=45", "wheel"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "gitlabber"
+version = "1.2.8"
+description = "A Gitlab clone/pull utility for backing up or cloning Gitlab groups"
+readme = "README.rst"
+requires-python = ">=3"
+license = {text = "MIT"}
+authors = [
+    {name = "Erez Mazor", email = "erezmazor@gmail.com"},
+]
+keywords = ["gitlab", "python", "cli"]
+classifiers = [
+    "Development Status :: 4 - Beta",
+    "Intended Audience :: Developers",
+    "Topic :: Utilities",
+    "License :: OSI Approved :: MIT License",
+    "Natural Language :: English",
+    "Operating System :: OS Independent",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+]
+dependencies = [
+    "docopt",
+    "anytree",
+    "globre",
+    "pyyaml",
+    "tqdm",
+    "GitPython",
+    "python-gitlab",
+]
+
+[project.optional-dependencies]
+test = [
+    "coverage",
+    "pytest",
+    "pytest-cov",
+    "pytest-integration",
+]
+
+[project.urls]
+Homepage = "https://github.com/ezbz/gitlabber"
+Download = "https://github.com/ezbz/gitlabber/archive/main.zip"
+
+[project.scripts]
+gitlabber = "gitlabber.cli:main"
+
+[tool.setuptools]
+packages = ["gitlabber"]
+include-package-data = true
+
+[tool.pytest.ini_options]
+addopts = [
+    "-vv",
+    "--cov=gitlabber",
+    "--no-cov-on-fail",
+    "--cov-append",
+    "--cov-report=term-missing",
+    "--cov-report=xml",
+    "--verbose",
+    "--capture=sys",
+    "--without-slow-integration",
+    "--integration-cover"
+]
+norecursedirs = [
+    "dist",
+    "build"
+]
+testpaths = ["tests"]
+
+[tool.coverage.run]
+parallel = true

gitlabber-1.2.8/setup.cfg

@@ -0,0 +1,10 @@
+[bdist_wheel]
+universal = 1
+
+[metadata]
+description_file = README.rst
+
+[egg_info]
+tag_build = 
+tag_date = 0
+

gitlabber-1.2.8/setup.py

@@ -0,0 +1,3 @@
+from setuptools import setup
+
+setup()

{gitlabber-1.2.6 → gitlabber-1.2.8}/tests/gitlab_test_utils.py

@@ -23,7 +23,7 @@ TREE_TEST_OUTPUT_FILE = "tests/test-output.tree"
 
 
 class MockNode:
-    def __init__(self, type, id, name, url, subgroups=mock.MagicMock(), projects=mock.MagicMock(), parent_id=None, archived=0, shared=False, group_search=None, git_options=None):
+    def __init__(self, type, id, name, url, subgroups=mock.MagicMock(), projects=mock.MagicMock(), shared_projects=mock.MagicMock(), parent_id=None, archived=0, shared=False, group_search=None, git_options=None):
         self.type = type
         self.id = id
         self.name = name
@@ -34,6 +34,7 @@ class MockNode:
         self.http_url_to_repo = url
         self.subgroups = subgroups
         self.projects = projects
+        self.shared_projects = shared_projects
         self.parent_id = parent_id
         self.archived = archived
         self.shared = shared
@@ -119,9 +120,17 @@ def validate_tree(root):
     validate_subgroup(root.children[0].children[0])
     validate_project(root.children[0].children[0].children[0])
 
-def create_test_gitlab(monkeypatch, includes=None, excludes=None, in_file=None, hide_token=True, method=CloneMethod.SSH):
+def create_test_gitlab(monkeypatch, includes=None, excludes=None, in_file=None, hide_token=True, method=CloneMethod.SSH, token=TOKEN):
     gl = gitlab_tree.GitlabTree(
-        URL, TOKEN, "ssh", "name", includes=includes, excludes=excludes, in_file=in_file, hide_token=hide_token)
+        URL, 
+        token, 
+        method,  # Use the method parameter instead of hardcoding "ssh"
+        "name", 
+        includes=includes, 
+        excludes=excludes, 
+        in_file=in_file, 
+        hide_token=hide_token
+    )
     projects = Listable(MockNode("project", 2, PROJECT_NAME, PROJECT_URL if hide_token else PROJECT_URL_WITH_TOKEN))
     groups = Listable(
             MockNode("group", 2, GROUP_NAME, GROUP_URL, subgroups=Listable(
@@ -131,7 +140,6 @@ def create_test_gitlab(monkeypatch, includes=None, excludes=None, in_file=None,
     monkeypatch.setattr(gl.gitlab, "groups", Tree(groups))
     return gl
 
-
 def create_test_gitlab_with_toplevel_subgroups(monkeypatch):
     gl = gitlab_tree.GitlabTree(URL, TOKEN, "ssh", "path")
     groups = Listable(
@@ -167,9 +175,12 @@ def create_test_gitlab_with_shared(monkeypatch, includes=None, excludes=None, in
 
     projects = Listable(
         MockNode("project", 19, PROJECT_NAME, PROJECT_URL),
+    )
+     
+    shared_projects = Listable(
         MockNode("project", 20, "_shared_" + PROJECT_NAME, "_shared_" + PROJECT_URL, shared=True)
     )
     monkeypatch.setattr(gl.gitlab, "groups", Tree(Listable(
-        MockNode("group", 21, GROUP_NAME, GROUP_URL, projects=projects)
+        MockNode("group", 21, GROUP_NAME, GROUP_URL, projects=projects, shared_projects=shared_projects)
     )))
     return gl

{gitlabber-1.2.6 → gitlabber-1.2.8}/tests/test_e2e.py

@@ -11,7 +11,7 @@ coverage.process_startup()
 @pytest.mark.slow_integration_test
 def test_clone_subgroup():
     os.environ['GITLAB_URL'] = 'https://gitlab.com/'
-    output = io_util.execute(['-p', '--print-format', 'json', '--group-search', 'Group Test'], 60)
+    output = io_util.execute(['-p', '--print-format', 'json', '--group-search', 'Group Test'], 90)
     obj = json.loads(output)
     assert obj['children'][0]['name'] == 'Group Test'
     assert obj['children'][0]['children'][0]['name'] == 'Subgroup Test'
@@ -23,7 +23,7 @@ def test_clone_subgroup():
 @pytest.mark.slow_integration_test
 def test_clone_subgroup_exclude_archived():
     os.environ['GITLAB_URL'] = 'https://gitlab.com/'
-    output = io_util.execute(['-p', '--print-format', 'json', '--group-search', 'Group Test',  '-a', 'exclude'], 60)
+    output = io_util.execute(['-p', '--print-format', 'json', '--group-search', 'Group Test',  '-a', 'exclude'], 90)
     obj = json.loads(output)
     assert obj['children'][0]['name'] == 'Group Test'
     assert obj['children'][0]['children'][0]['name'] == 'Subgroup Test'
@@ -34,7 +34,7 @@ def test_clone_subgroup_exclude_archived():
 @pytest.mark.slow_integration_test
 def test_clone_subgroup_only_archived():
     os.environ['GITLAB_URL'] = 'https://gitlab.com/'
-    output = io_util.execute(['-p', '--print-format', 'json', '--group-search', 'Group Test',  '-a', 'only'], 60)
+    output = io_util.execute(['-p', '--print-format', 'json', '--group-search', 'Group Test',  '-a', 'only'], 90)
     obj = json.loads(output)
     assert obj['children'][0]['name'] == 'Group Test'
     assert obj['children'][0]['children'][0]['name'] == 'Subgroup Test'
@@ -45,7 +45,7 @@ def test_clone_subgroup_only_archived():
 @pytest.mark.slow_integration_test
 def test_clone_subgroup_naming_path():
     os.environ['GITLAB_URL'] = 'https://gitlab.com/'
-    output = io_util.execute(['-p', '--print-format', 'json', '-n', 'path', '--group-search', 'Group Test'], 60)
+    output = io_util.execute(['-p', '--print-format', 'json', '-n', 'path', '--group-search', 'Group Test'], 90)
     obj = json.loads(output)
     assert obj['children'][0]['name'] == 'erez-group-test'
     assert obj['children'][0]['children'][0]['name'] == 'subgroup-test'
@@ -58,7 +58,7 @@ def test_clone_subgroup_naming_path():
 @pytest.mark.slow_integration_test
 def test_large_groups():
     os.environ['GITLAB_URL'] = 'https://gitlab.com/'
-    output = io_util.execute(['-p', '--print-format', 'json', '-n', 'path', '--group-search', 'large-group-test'], 60)
+    output = io_util.execute(['-p', '--print-format', 'json', '-n', 'path', '--group-search', 'large-group-test'], 90)
     obj = json.loads(output)
     assert obj['children'][0]['name'] == 'large-group-test'
     assert obj['children'][0]['children'][0]['name'] == 'many-subgroups'
@@ -70,8 +70,18 @@ def test_large_groups():
 @pytest.mark.slow_integration_test
 def test_user_personal_projects():
     os.environ['GITLAB_URL'] = 'https://gitlab.com/'
-    output = io_util.execute(['-p', '--print-format', 'json', '-n', 'path', '--user-projects'], 60)
+    output = io_util.execute(['-p', '--print-format', 'json', '-n', 'path', '--user-projects'], 90)
     obj = json.loads(output)
     assert obj['children'][0]['name'] == 'erezmazor-prsonal-projects'
     assert obj['children'][0]['children'][0]['name'] == 'gitlabber-personal-project'
+    
+
+@pytest.mark.slow_integration_test
+def test_shared_group_and_project():
+    os.environ['GITLAB_URL'] = 'https://gitlab.com/'
+    output = io_util.execute(['-p', '--print-format', 'json', '-s', '--group-search', 'shared-group3'], 90)
+    obj = json.loads(output)
+    assert obj['children'][0]['name'] == 'Shared Group'
+    assert obj['children'][0]['children'][0]['name'] == 'Shared Project'
+    
     

{gitlabber-1.2.6 → gitlabber-1.2.8}/tests/test_gitlab_tree.py

@@ -1,8 +1,10 @@
-
 from gitlabber.method import CloneMethod
 import tests.gitlab_test_utils as gitlab_util
 import tests.io_test_util as output_util
 from gitlabber.archive import ArchivedResults
+import pytest
+from unittest import mock
+from gitlab.exceptions import GitlabGetError
 
 def test_load_tree(monkeypatch):
     gl = gitlab_util.create_test_gitlab(monkeypatch)
@@ -173,3 +175,73 @@ def test_hide_token_from_project_url(monkeypatch):
     gl.load_tree()
     gl.print_tree()
     assert 'gitlab-token:xxx@' not in gl.root.children[0].children[0].children[0].url
+
+
+def test_get_subgroups_404_error(monkeypatch):
+    gl = gitlab_util.create_test_gitlab(monkeypatch)
+
+    # Create mock group and subgroup
+    mock_group = mock.Mock()
+    mock_group.name = "mock_group"
+    mock_group.id = 123
+    
+    # Create a mock subgroup definition that will be returned by list()
+    mock_subgroup_def = mock.Mock()
+    mock_subgroup_def.id = 456
+    
+    # Make subgroups.list return our mock subgroup definition
+    mock_group.subgroups.list.return_value = [mock_subgroup_def]
+
+    # This is the function that will raise the 404 when trying to get the subgroup
+    def mock_get_subgroup(id):
+        raise GitlabGetError(response_code=404, error_message="Not Found")
+
+    # Patch the groups.get method
+    monkeypatch.setattr(gl.gitlab.groups, "get", mock_get_subgroup)
+
+    with mock.patch("gitlabber.gitlab_tree.log.error") as mock_log_error:
+        gl.get_subgroups(mock_group, gl.root)
+        
+        mock_log_error.assert_called_once_with(
+            f"404 error while getting subgroup with name: {mock_group.name} [id: {mock_group.id}]. Check your permissions as you may not have access to it. Message: Not Found"
+        )
+        
+def test_hide_token_in_project_url_both_cases(monkeypatch):
+    test_token = "test-token-123"
+    
+    # Create two instances to test both cases
+    gl_hidden = gitlab_util.create_test_gitlab(monkeypatch, 
+                                             hide_token=True, 
+                                             method=CloneMethod.HTTP,
+                                             token=test_token)
+                                             
+    gl_visible = gitlab_util.create_test_gitlab(monkeypatch, 
+                                              hide_token=False, 
+                                              method=CloneMethod.HTTP,
+                                              token=test_token)
+
+    # Create mock project
+    mock_project = mock.Mock()
+    mock_project.name = "test-project"
+    mock_project.path = "test-project"
+    mock_project.ssh_url_to_repo = "git@gitlab.com:group/test-project.git"
+    mock_project.http_url_to_repo = "https://gitlab.com/group/test-project.git"
+
+    # Test with hide_token=True
+    with mock.patch("gitlabber.gitlab_tree.log.debug") as mock_log_debug_hidden:
+        gl_hidden.add_projects(gl_hidden.root, [mock_project])
+        project_node_hidden = gl_hidden.root.children[0]
+        
+        # Verify token is not in URL
+        assert project_node_hidden.url == "https://gitlab.com/group/test-project.git"
+        mock_log_debug_hidden.assert_any_call("Hiding token from project url: %s", 
+                                            project_node_hidden.url)
+
+    # Test with hide_token=False
+    with mock.patch("gitlabber.gitlab_tree.log.debug") as mock_log_debug_visible:
+        gl_visible.add_projects(gl_visible.root, [mock_project])
+        project_node_visible = gl_visible.root.children[0]
+        
+        expected_url = f"https://gitlab-token:{test_token}@gitlab.com/group/test-project.git"
+        assert project_node_visible.url == expected_url
+        mock_log_debug_visible.assert_any_call("Generated URL: %s", expected_url)

gitlabber-1.2.6/gitlabber/__init__.py

@@ -1 +0,0 @@
-__version__ = '1.2.6'

gitlabber-1.2.6/setup.cfg

@@ -1,24 +0,0 @@
-[bdist_wheel]
-universal = 1
-
-[metadata]
-description-file = README.rst
-
-[coverage:run]
-parallel = true
-
-[tool:pytest]
-addopts = 
-	-vv --cov=gitlabber --no-cov-on-fail --cov-append --cov-report term-missing --cov-report xml --verbose --capture=sys --without-slow-integration --integration-cover
-norecursedirs = 
-	dist
-	build
-
-[aliases]
-dists = sdist bdist_wheel
-testpaths = tests
-
-[egg_info]
-tag_build = 
-tag_date = 0
-

gitlabber-1.2.6/setup.py

@@ -1,89 +0,0 @@
-"""Packaging settings."""
-
-
-from codecs import open
-import os
-from os.path import abspath, dirname, join
-from subprocess import call
-
-from setuptools import Command, find_packages, setup
-
-from gitlabber import __version__
-
-
-this_dir = abspath(dirname(__file__))
-with open(join(this_dir, 'README.rst'), encoding='utf-8') as file:
-    long_description = file.read()
-
-
-class RunTests(Command):
-    """Run all tests."""
-    description = 'run tests'
-    user_options = []
-
-    def initialize_options(self):
-        pass
-
-    def finalize_options(self):
-        pass
-
-    def run(self):
-        """Run all tests!"""
-        errno = call(['py.test'])
-        raise SystemExit(errno)
-setup(
-    python_requires='>=3',
-    name = 'gitlabber',
-    packages = ['gitlabber'],
-    version = __version__,
-    description = 'A Gitlab clone/pull utility for backing up or cloning Gitlab groups',
-    long_description = long_description,
-    long_description_content_type="text/x-rst",
-    url = 'https://github.com/ezbz/gitlabber',
-    download_url = 'https://github.com/ezbz/gitlabber/archive/main.zip',
-    author = 'Erez Mazor',
-    author_email = 'erezmazor@gmail.com',
-    license = 'MIT',
-    keywords = ['gitlab', 'python', 'cli'], 
-    include_package_data = True,
-
-    classifiers = [
-        'Development Status :: 4 - Beta',   
-        'Intended Audience :: Developers',
-        'Topic :: Utilities',
-        'License :: OSI Approved :: MIT License',
-        'Natural Language :: English',
-        'Operating System :: OS Independent',
-        'Programming Language :: Python :: 3',     
-        'Programming Language :: Python :: 3.8',
-        'Programming Language :: Python :: 3.9',
-        'Programming Language :: Python :: 3.10',
-        'Programming Language :: Python :: 3.11',
-        'Programming Language :: Python :: 3.12'
-    ],
-    setup_requires = [
-            'docopt', 
-            'anytree', 
-            'globre',
-            'pyyaml',
-            'tqdm',
-            'GitPython', 
-            'python-gitlab'
-    ],
-    install_requires = [
-            'docopt', 
-            'anytree', 
-            'globre', 
-            'pyyaml',
-            'tqdm',
-            'GitPython', 
-            'python-gitlab'
-    ],
-    tests_require=  ['coverage', 'pytest', 'pytest-cov', 'pytest-integration'],
-    entry_points = {
-        'console_scripts': [
-            'gitlabber=gitlabber.cli:main',
-        ],
-    },
-    cmdclass = {'test': RunTests},
-)