cgitize 6.0.5__tar.gz → 8.0.0__tar.gz

{cgitize-6.0.5 → cgitize-8.0.0}/.github/workflows/ci.yml

@@ -21,19 +21,18 @@ jobs:
         uses: psf/black@stable
 
   test_local:
-    needs: [lint]
     runs-on: ubuntu-latest
     strategy:
       matrix:
         python-version: ['3.9', '3.10', '3.11', '3.12', '3.13', '3.14']
     name: 'Test / ${{ matrix.python-version }}'
     env:
-      CGITIZE_GITHUB_USERNAME: cgitize-test
+      CGITIZE_GITHUB_USERNAME: '${{ secrets.CGITIZE_GITHUB_USERNAME }}'
       CGITIZE_GITHUB_TOKEN: '${{ secrets.CGITIZE_GITHUB_TOKEN }}'
-      CGITIZE_BITBUCKET_USERNAME: cgitize-test
+      CGITIZE_BITBUCKET_EMAIL: '${{ secrets.CGITIZE_BITBUCKET_EMAIL }}'
       CGITIZE_BITBUCKET_TOKEN: '${{ secrets.CGITIZE_BITBUCKET_TOKEN }}'
-      CGITIZE_GITLAB_USERNAME: cgitize-test
-      CGITIZE_GITLAB_TOKEN: '${{ secrets.CGITIZE_GITLAB_TOKEN}}'
+      CGITIZE_GITLAB_USERNAME: '${{ secrets.CGITIZE_GITLAB_USERNAME }}'
+      CGITIZE_GITLAB_TOKEN: '${{ secrets.CGITIZE_GITLAB_TOKEN }}'
     steps:
       - name: Checkout
         uses: actions/checkout@v6
@@ -65,12 +64,12 @@ jobs:
     runs-on: ubuntu-latest
     name: 'Test / example config'
     env:
-      CGITIZE_GITHUB_USERNAME: cgitize-test
+      CGITIZE_GITHUB_USERNAME: '${{ secrets.CGITIZE_GITHUB_USERNAME }}'
       CGITIZE_GITHUB_TOKEN: '${{ secrets.CGITIZE_GITHUB_TOKEN }}'
-      CGITIZE_BITBUCKET_USERNAME: cgitize-test
+      CGITIZE_BITBUCKET_EMAIL: '${{ secrets.CGITIZE_BITBUCKET_EMAIL }}'
       CGITIZE_BITBUCKET_TOKEN: '${{ secrets.CGITIZE_BITBUCKET_TOKEN }}'
-      CGITIZE_GITLAB_USERNAME: cgitize-test
-      CGITIZE_GITLAB_TOKEN: '${{ secrets.CGITIZE_GITLAB_TOKEN}}'
+      CGITIZE_GITLAB_USERNAME: '${{ secrets.CGITIZE_GITLAB_USERNAME }}'
+      CGITIZE_GITLAB_TOKEN: '${{ secrets.CGITIZE_GITLAB_TOKEN }}'
     steps:
       - name: Checkout
         uses: actions/checkout@v6
@@ -88,7 +87,7 @@ jobs:
         run: make test/example
 
   publish_docker:
-    needs: [test_local, test_example_config, test_docker]
+    needs: [lint, test_local, test_example_config, test_docker]
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -149,7 +148,7 @@ jobs:
           tags: '${{ steps.meta.outputs.tags }}'
 
   publish_pypi:
-    needs: [test_local, test_example_config, test_docker, publish_docker]
+    needs: [publish_docker]
     runs-on: ubuntu-latest
     name: 'Publish / PyPI'
     steps:

{cgitize-6.0.5 → cgitize-8.0.0}/.github/workflows/maintenance.yml

@@ -16,8 +16,6 @@ jobs:
         with:
           # I think that by default, pushes don't trigger other workflows, and
           # you need a separate token for that: https://github.com/orgs/community/discussions/37103
-          #
-          # Re-using the Jekyll projects token here BTW:
           token: '${{ secrets.GH_TOKEN }}'
       - name: Set up ssh-agent
         uses: webfactory/ssh-agent@v0.10.0
@@ -27,11 +25,10 @@ jobs:
         uses: actions/setup-python@v6
         with:
           python-version-file: .python-version
-      - name: Run maintenance
-        id: maintenance
+      - name: Configure git
         run: |
           # See https://github.com/actions/checkout#push-a-commit-using-the-built-in-token
           git config user.name "github-actions[bot]"
           git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
-
-          make maintenance
+      - name: Run maintenance
+        run: make maintenance

{cgitize-6.0.5 → cgitize-8.0.0}/.pylintrc

@@ -7,4 +7,8 @@ init-hook=
 
 [MESSAGES CONTROL]
 
-disable=invalid-name,missing-docstring,too-few-public-methods,too-many-arguments
+disable=
+    invalid-name,
+    missing-docstring,
+    too-few-public-methods,
+    too-many-arguments,

cgitize-8.0.0/.python-version

@@ -0,0 +1 @@
+3.13.13

{cgitize-6.0.5 → cgitize-8.0.0}/DEVELOPMENT.md

@@ -18,11 +18,11 @@ test.
 You need to set the following environment variables for the authenticated
 access tests to work:
 
-* `CGITIZE_BITBUCKET_USERNAME`: `cgitize-test`
+* `CGITIZE_BITBUCKET_EMAIL`
 * `CGITIZE_BITBUCKET_TOKEN`
-* `CGITIZE_GITHUB_USERNAME`: `cgitize-test`
+* `CGITIZE_GITHUB_USERNAME`
 * `CGITIZE_GITHUB_TOKEN`
-* `CGITIZE_GITLAB_USERNAME`: `cgitize-test`
+* `CGITIZE_GITLAB_USERNAME`
 * `CGITIZE_GITLAB_TOKEN`
 
 You can run `. test/set_credentials.sh`; it'll ask you to fill in the secrets.

{cgitize-6.0.5 → cgitize-8.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cgitize
-Version: 6.0.5
+Version: 8.0.0
 Summary: Self-host your repositories using cgit
 Author-email: Egor Tensin <egor@tensin.name>
 License-Expression: MIT

{cgitize-6.0.5 → cgitize-8.0.0}/cgitize/bitbucket.py

@@ -8,12 +8,12 @@ import logging
 from atlassian.bitbucket.cloud import Cloud
 from requests.exceptions import HTTPError
 
-from cgitize.repo import Repo
+from cgitize.repo import Repo, Visibility
 
 
 class Bitbucket:
-    def __init__(self, username=None, password=None):
-        self._impl = Cloud(username=username, password=password, cloud=True)
+    def __init__(self, email=None, token=None):
+        self._impl = Cloud(username=email, password=token, cloud=True)
 
     def get_repo(self, repo):
         try:
@@ -28,10 +28,10 @@ class Bitbucket:
             logging.error("Couldn't fetch repository: %s", repo.id)
             raise
 
-    def get_user_repos(self, user):
+    def get_user_repos(self, user, visibility=Visibility.ALL):
         try:
             workspace = self._impl.workspaces.get(user.name)
-            yield from workspace.repositories.each()
+            yield from workspace.repositories.each(q=visibility.to_bitbucket_arg())
         except HTTPError:
             logging.error("Couldn't fetch user repositories: %s", user.name)
             raise

{cgitize-6.0.5 → cgitize-8.0.0}/cgitize/config.py

@@ -5,13 +5,14 @@
 
 from abc import ABC, abstractmethod
 import os
+from urllib.parse import quote
 
 import tomli
 
 from cgitize.bitbucket import Bitbucket
 from cgitize.github import GitHub
 from cgitize.gitlab import GitLab
-from cgitize.repo import Repo
+from cgitize.repo import Repo, Visibility
 
 
 class Section:
@@ -74,7 +75,8 @@ class ServiceSection(Section, ABC):
             yield api.convert_repo(api.get_repo(r), cfg, r.dir)
 
     def _enum_user_repositories(self, cfg, api, user):
-        for r in api.get_user_repos(user):
+        visibility = Visibility.from_config(user.public_repos, user.private_repos)
+        for r in api.get_user_repos(user, visibility=visibility):
             r = api.convert_repo(r, cfg, user.dir)
             if r.name in user.skip:
                 continue
@@ -109,7 +111,7 @@ class GitHubSection(ServiceSection):
 
     @property
     def url_auth(self):
-        return self.token
+        return (self.token, None)
 
     def _enum_org_repositories(self, cfg, api, org):
         for repo in api.get_org_repos(org):
@@ -134,12 +136,6 @@ class GitHubSection(ServiceSection):
         return GitHub(username, token)
 
 
-def two_part_url_auth(username, password):
-    if username is None or password is None:
-        return None
-    return f'{username}:{password}'
-
-
 class BitbucketSection(ServiceSection):
     @property
     def token(self):
@@ -147,11 +143,11 @@ class BitbucketSection(ServiceSection):
 
     @property
     def username(self):
-        return self._get_config_or_env('username', 'CGITIZE_BITBUCKET_USERNAME')
+        return self._get_config_or_env('email', 'CGITIZE_BITBUCKET_EMAIL')
 
     @property
     def url_auth(self):
-        return two_part_url_auth(self.username, self.token)
+        return (self.username, self.token)
 
     def connect_to_service(self):
         username = self.username
@@ -174,7 +170,7 @@ class GitLabSection(ServiceSection):
 
     @property
     def url_auth(self):
-        return two_part_url_auth(self.username, self.token)
+        return (self.username, self.token)
 
     def connect_to_service(self):
         username = self.username
@@ -201,12 +197,7 @@ class RepositoriesSection(Section):
         return self.impl.values()
 
 
-class User:
-    def __init__(self, impl):
-        if 'name' not in impl:
-            raise ValueError("every user must have a 'name'")
-        self._impl = impl
-
+class Entity(ABC):
     @property
     def name(self):
         return self._impl['name']
@@ -220,7 +211,22 @@ class User:
         return self._impl.get('skip', [])
 
 
-class Org(User):
+class User(Entity):
+    def __init__(self, impl):
+        if 'name' not in impl:
+            raise ValueError("every user must have a 'name'")
+        self._impl = impl
+
+    @property
+    def public_repos(self):
+        return self._impl.get('public', True)
+
+    @property
+    def private_repos(self):
+        return self._impl.get('private', False)
+
+
+class Org(Entity):
     def __init__(self, impl):
         if 'name' not in impl:
             raise ValueError("every organization must have a 'name'")

{cgitize-6.0.5 → cgitize-8.0.0}/cgitize/github.py

@@ -7,7 +7,7 @@ import logging
 
 from github import Auth, Github, GithubException
 
-from cgitize.repo import Repo
+from cgitize.repo import Repo, Visibility
 
 
 class GitHub:
@@ -25,14 +25,24 @@ class GitHub:
             logging.error("Couldn't fetch repository: %s", repo.id)
             raise
 
-    def get_user_repos(self, user):
+    def get_user_repos(self, user, visibility=Visibility.ALL):
+        visibility = visibility.to_github_arg()
+
+        # Not actually certain how it works, but just passing None as the
+        # named visibility parameter fails with an internal assert error. I
+        # honestly thought that that passing parameters like that and as a
+        # None makes no difference.
+        kwargs = {}
+        if visibility is not None:
+            kwargs['visibility'] = visibility
+
         try:
             if user.name == self._username:
                 # To get private repositories, get_user() must be called
                 # without arguments:
-                return self._impl.get_user().get_repos(affiliation='owner')
+                return self._impl.get_user().get_repos(affiliation='owner', **kwargs)
             else:
-                return self._impl.get_user(user.name).get_repos()
+                return self._impl.get_user(user.name).get_repos(**kwargs)
         except GithubException:
             logging.error("Couldn't fetch user repositories: %s", user.name)
             raise

{cgitize-6.0.5 → cgitize-8.0.0}/cgitize/gitlab.py

@@ -8,7 +8,7 @@ import logging
 from gitlab import Gitlab
 from gitlab.exceptions import GitlabGetError
 
-from cgitize.repo import Repo
+from cgitize.repo import Repo, Visibility
 
 
 class GitLab:
@@ -22,7 +22,8 @@ class GitLab:
             logging.error("Couldn't fetch repository: %s", repo.id)
             raise
 
-    def get_user_repos(self, user):
+    def get_user_repos(self, user, visibility=Visibility.ALL):
+        visibility = visibility.to_gitlab_arg()
         try:
             # Strictly speaking, GitLab supports the /users/:username/projects
             # endpoint, which means you shouldn't need to fetch the user first,
@@ -32,7 +33,7 @@ class GitLab:
                 raise RuntimeError(f"Couldn't find GitLab user: {user.name}")
             assert len(users) == 1
             user = users[0]
-            return user.projects.list()
+            return user.projects.list(visibility=visibility)
         except GitlabGetError:
             logging.error("Couldn't fetch user repositories: %s", user.name)
             raise

{cgitize-6.0.5 → cgitize-8.0.0}/cgitize/repo.py

@@ -3,11 +3,64 @@
 # For details, see https://github.com/egor-tensin/cgitize.
 # Distributed under the MIT License.
 
+from enum import Enum
 import os.path
 
 from cgitize.utils import url_remove_auth, url_replace_auth
 
 
+class Visibility(Enum):
+    ALL = 'all'
+    PUBLIC = 'public'
+    PRIVATE = 'private'
+
+    def __str__(self):
+        return self.name
+
+    @staticmethod
+    def from_config(public, private):
+        if public and private:
+            return Visibility.ALL
+        if not public and not private:
+            raise RuntimeError(
+                'you need to fetch either public or private repos, or both'
+            )
+        if public:
+            return Visibility.PUBLIC
+        return Visibility.PRIVATE
+
+    def to_bitbucket_arg(self):
+        # https://developer.atlassian.com/cloud/bitbucket/rest/intro/#filtering
+        # https://developer.atlassian.com/cloud/bitbucket/rest/api-group-repositories/#api-group-repositories
+        if self is Visibility.ALL:
+            return None
+        if self is Visibility.PUBLIC:
+            return 'is_private=False'
+        if self is Visibility.PRIVATE:
+            return 'is_private=True'
+        raise NotImplementedError(f'not implemented visibility level: {self}')
+
+    def to_github_arg(self):
+        # https://docs.github.com/en/rest/repos/repos?apiVersion=2026-03-10#list-repositories-for-the-authenticated-user
+        if self is Visibility.ALL:
+            return None
+        if self is Visibility.PUBLIC:
+            return 'public'
+        if self is Visibility.PRIVATE:
+            return 'private'
+        raise NotImplementedError(f'not implemented visibility level: {self}')
+
+    def to_gitlab_arg(self):
+        # https://python-gitlab.readthedocs.io/en/stable/gl_objects/projects.html#projects
+        if self is Visibility.ALL:
+            return None
+        if self is Visibility.PUBLIC:
+            return 'public'
+        if self is Visibility.PRIVATE:
+            return 'private'
+        raise NotImplementedError(f'not implemented visibility level: {self}')
+
+
 class Repo:
     @staticmethod
     def from_config(src, config):
@@ -34,8 +87,12 @@ class Repo:
 
         https_url = src.clone_url
         ssh_url = src.ssh_url
-        clone_url = ssh_url if config.main.clone_via_ssh else https_url
-        url_auth = None if config.main.clone_via_ssh else config.github.url_auth
+
+        clone_url = ssh_url
+        url_auth = None
+        if not config.main.clone_via_ssh:
+            clone_url = https_url
+            url_auth = config.github.url_auth
 
         return Repo(
             name,
@@ -60,7 +117,7 @@ class Repo:
         if len(https_urls) != 1:
             raise RuntimeError(f"no https:// clone URL for repository '{name}'?!")
         # Bitbucket leaves the username in the URL... Sigh.
-        https_url = url_remove_auth(https_urls[0]['href'])
+        api_auth, https_url = url_remove_auth(https_urls[0]['href'])
 
         ssh_urls = [
             link for link in src.data['links']['clone'] if link['name'] == 'ssh'
@@ -69,8 +126,18 @@ class Repo:
             raise RuntimeError(f"no ssh:// clone URL for repository '{name}'?!")
         ssh_url = ssh_urls[0]['href']
 
-        clone_url = ssh_url if config.main.clone_via_ssh else https_url
-        url_auth = None if config.main.clone_via_ssh else config.bitbucket.url_auth
+        clone_url = ssh_url
+        url_auth = None
+        if not config.main.clone_via_ssh:
+            clone_url = https_url
+            url_auth = config.bitbucket.url_auth
+            # Bitbucket, since deprecating app passwords, now requires that
+            # users authenticate with their Atlassian email & API token.
+            # Unfortunately (sigh...), if you want to clone a repo via HTTPS,
+            # you can't use the very same email + token combo in the URL, you
+            # have to use your username (double sigh...).  Luckily, for some
+            # reason, Bitbucket leaves the relevant username in the API response.
+            url_auth = api_auth[0], url_auth[1]
 
         return Repo(
             name,
@@ -91,8 +158,12 @@ class Repo:
 
         https_url = src.http_url_to_repo
         ssh_url = src.ssh_url_to_repo
-        clone_url = ssh_url if config.main.clone_via_ssh else https_url
-        url_auth = None if config.main.clone_via_ssh else config.gitlab.url_auth
+
+        clone_url = ssh_url
+        url_auth = None
+        if not config.main.clone_via_ssh:
+            clone_url = https_url
+            url_auth = config.gitlab.url_auth
 
         return Repo(
             name,

{cgitize-6.0.5 → cgitize-8.0.0}/cgitize/utils.py

@@ -9,7 +9,7 @@ import os
 import stat
 import subprocess
 import sys
-from urllib.parse import urlsplit, urlunsplit
+from urllib.parse import quote, urlsplit, urlunsplit
 
 
 @contextmanager
@@ -97,11 +97,12 @@ def protected_file(path):
             os.unlink(path)
 
 
-def url_replace_auth(url, username, password=None):
+def url_replace_auth(url, auth):
+    username, password = auth
     parts = urlsplit(url)
-    netloc = username
+    netloc = quote(username)
     if password is not None:
-        netloc += f':{password}'
+        netloc += f':{quote(password)}'
     netloc += f'@{parts.hostname}'
     if parts.port is not None:
         netloc += f':{parts.port}'
@@ -111,6 +112,9 @@ def url_replace_auth(url, username, password=None):
 
 def url_remove_auth(url):
     parts = urlsplit(url)
+    auth = parts.username, parts.password
     netloc = parts.hostname
+    if parts.port is not None:
+        netloc += f':{parts.port}'
     parts = parts._replace(netloc=netloc)
-    return urlunsplit(parts)
+    return auth, urlunsplit(parts)

{cgitize-6.0.5 → cgitize-8.0.0}/cgitize.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cgitize
-Version: 6.0.5
+Version: 8.0.0
 Summary: Self-host your repositories using cgit
 Author-email: Egor Tensin <egor@tensin.name>
 License-Expression: MIT

{cgitize-6.0.5 → cgitize-8.0.0}/docker/README.md

@@ -48,13 +48,13 @@ Here's an example docker-compose.yml file:
           SCHEDULE: '0 */3 * * *'
           # Set CGITIZE_{GITHUB,BITBUCKET,GITLAB}_{USERNAME,TOKEN} variables
           # here or in the config file.
-        image: egortensin/cgitize:6
+        image: egortensin/cgitize:8
         restart: unless-stopped
         volumes:
           - ./example.toml:/etc/cgitize/cgitize.toml:ro
           - /srv/volumes/cgitize:/mnt/cgitize
       frontend:
-        image: egortensin/cgitize-frontend:6
+        image: egortensin/cgitize-frontend:8
         ports:
           - '127.0.0.1:80:80'
         restart: unless-stopped

{cgitize-6.0.5 → cgitize-8.0.0}/docs/api.md

@@ -4,10 +4,9 @@ unfortunately, peculiar in their own way.
 Tokens
 ------
 
-All of the forges support access tokens, of course (although they're called
-"app passwords" on Bitbucket).  They can be used to do `git clone https://`
-with authentication info in the URL.  For GitHub, it's enough to just specify
-the token:
+All of the forges support access tokens, of course.  They can be used to do
+`git clone https://` with authentication info in the URL.  For GitHub, it's
+enough to just specify the token:
 
     git clone https://TOKEN@github.com/USER/REPO.git
 
@@ -16,6 +15,9 @@ token in the URL:
 
     git clone https://USER:TOKEN@bitbucket.org/USER/REPO.git
 
+(For Bitbucket, since they deprecated their "app passwords", you need to
+specify not the username, but rather the Atlassian account email.)
+
 Terminology
 -----------
 

{cgitize-6.0.5 → cgitize-8.0.0}/docs/auth.md

@@ -22,11 +22,9 @@ When using HTTPS, there're multiple options to access the private repositories.
 
 2. Use OAuth.  I thought this was too complicated to implement quickly.
 
-3. Use per-application passwords.  This option is pretty cool.  Both GitHub (in
-   the form of "personal access tokens") and Bitbucket (calls them "app
-   passwords") support creating one-purpose passwords that are supposed to be
-   used by a single app only.  They allow to bypass the 2FA also.  Let's do
-   this!
+3. Use application access tokens.  This option is pretty cool.  Both GitHub
+   and Bitbucket support creating read-only tokens.   They allow to bypass the
+   2FA also.  Let's do this!
 
 Passing the access tokens to Git is tricky though.  First, simply including
 them in the clone URL would be incredibly stupid, since that URL is going to be

{cgitize-6.0.5 → cgitize-8.0.0}/examples/cgitize.toml

@@ -7,8 +7,8 @@ output_dir = "/tmp/cgitize"
 # repository's directory path.
 clone_url = "https://yourhost.com/git/{repo}"
 
-# Clones via SSH by default.
-clone_via_ssh = false
+# Clones via SSH by default (instead of Git-over-HTTPS).
+clone_via_ssh = true
 
 # Unless this is specified, cgit is going to derive the owner from the
 # repository's directory ownership.
@@ -19,8 +19,10 @@ owner = "Your Name"
 
 [github]
 # If some of the repositories hosted on GitHub are private (or if you hit the
-# request rate limit), use "access tokens". Set in the config or using the
-# CGITIZE_GITHUB_TOKEN environment variable.
+# request rate limit), use a personal access token. Set in the config or using
+# the CGITIZE_GITHUB_TOKEN environment variable.
+# Required scopes:
+#     * repo
 #token = "XXX"
 # Set the username that owns the token here or using the environment variable
 # CGITIZE_GITHUB_USERNAME.
@@ -34,6 +36,10 @@ dir = "github-dir"
 # Repositories to skip:
 skip = ["repo1", "repo2"]
 
+# The defaults.
+public = true
+private = false
+
 [github.organizations.goauthentik]
 # For GitHub, you can also specify organizations. The settings are similar to
 # those for users. "goauthentik" is a random organization.
@@ -52,20 +58,23 @@ dir = "python"
 # Bitbucket
 # =========
 
-# Bitbucket settings are similar to those for GitHub.
-
 [bitbucket]
-# Access tokens are called "app passwords" on Bitbucket.
-# The environment variable is CGITIZE_BITBUCKET_TOKEN.
+# Atlassian API token (environment variable CGITIZE_BITBUCKET_TOKEN).
+# Required scopes:
+#     * read:workspace:bitbucket
+#     * read:repository:bitbucket
 #token = "XXX"
-# The environment variable is CGITIZE_BITBUCKET_USERNAME.
-#username = "your-username"
+# Atlassian account email address (environment variable CGITIZE_BITBUCKET_EMAIL).
+#email = "your-email"
 
 [bitbucket.users.me]
 name = "cgitize-test-workspace"
 dir = "bitbucket-dir"
 #skip = ["repo1", "repo2"]
 
+public = true
+private = false
+
 # Some random repositories hosted on Bitbucket:
 [bitbucket.repositories.cef]
 id = "chromiumembedded/cef"
@@ -76,12 +85,12 @@ id = "berkeleylab/upc-runtime"
 # GitLab
 # ======
 
-# GitLab settings are similar to those for GitHub.
-
 [gitlab]
-# The environment variable is CGITIZE_GITLAB_TOKEN.
+# Personal access token (environment variable CGITIZE_GITLAB_TOKEN).
+# Required scopes (for legacy tokens):
+#     * read_api
 #token = "XXX"
-# The environment variable is CGITIZE_GITLAB_USERNAME.
+# Gitlab username (environment variable CGITIZE_GITLAB_USERNAME).
 #username = "your-username"
 
 [gitlab.users.me]
@@ -89,6 +98,9 @@ name = "cgitize-test"
 dir = "gitlab-dir"
 #skip = ["repo1", "repo2"]
 
+public = true
+private = false
+
 # Some random repositories hosted on Gitlab:
 [gitlab.repositories.gitter]
 id = "gitterHQ/webapp"

{cgitize-6.0.5 → cgitize-8.0.0}/requirements.txt

@@ -1,23 +1,23 @@
 atlassian-python-api==4.0.7
-beautifulsoup4==4.14.3
-certifi==2026.4.22
+beautifulsoup4==4.15.0
+certifi==2026.5.20
 cffi==2.0.0
 charset-normalizer==3.4.7
 cryptography==48.0.0
 Deprecated==1.3.1
-idna==3.15
+idna==3.18
 jmespath==1.1.0
 oauthlib==3.3.1
 pycparser==3.0
 PyGithub==2.9.1
-PyJWT==2.12.1
+PyJWT==2.13.0
 PyNaCl==1.6.2
 python-gitlab==6.5.0
 requests==2.34.2
 requests-oauthlib==2.0.0
 requests-toolbelt==1.0.0
-soupsieve==2.8.3
+soupsieve==2.8.4
 tomli==2.4.1
 typing_extensions==4.15.0
 urllib3==2.7.0
-wrapt==2.1.2
+wrapt==2.2.1

{cgitize-6.0.5 → cgitize-8.0.0}/test/integration/example/test.sh

@@ -25,6 +25,14 @@ clone_via_ssh_false() {
     sed -i -E -e 's/^clone_via_ssh = (true|false)$/clone_via_ssh = false/' -- "$cgitize_toml_path"
 }
 
+private_repos_true() {
+    sed -i -E -e 's/^private = (true|false)$/private = true/' -- "$cgitize_toml_path"
+}
+
+private_repos_false() {
+    sed -i -E -e 's/^private = (true|false)$/private = false/' -- "$cgitize_toml_path"
+}
+
 cleanup() {
     echo
     echo ----------------------------------------------------------------------
@@ -35,6 +43,8 @@ cleanup() {
     rm -rf -- "$output_dir"
     echo "Reverting clone_via_ssh settings: $cgitize_toml_path"
     clone_via_ssh_false
+    echo "Reverting repository visibility settings: $cgitize_toml_path"
+    private_repos_false
 }
 
 cgitize() {
@@ -54,6 +64,10 @@ setup_https() {
     clone_via_ssh_false
 }
 
+setup_private_repos() {
+    private_repos_true
+}
+
 verify_origin() {
     if [ "$#" -ne 2 ]; then
         echo "usage: ${FUNCNAME[0]} REPO URL" >&2
@@ -129,6 +143,44 @@ test_ssh() {
     setup_ssh
     cgitize
 
+    verify_repos \
+        lens \
+        chromiumembedded/cef \
+        graphviz \
+        wireguard/wintun \
+        goauthentik-dir/authentik \
+        github-dir/public \
+        bitbucket-dir/public \
+        gitlab-dir/public
+
+    verify_no_repos \
+        github-dir/private \
+        bitbucket-dir/private \
+        gitlab-dir/private
+
+    verify_origin lens 'git@github.com:ekmett/lens.git'
+    verify_origin chromiumembedded/cef 'git@bitbucket.org:chromiumembedded/cef.git'
+    verify_origin graphviz 'git@gitlab.com:graphviz/graphviz.git'
+    verify_origin goauthentik-dir/authentik 'git@github.com:goauthentik/authentik.git'
+
+    verify_origin github-dir/public 'git@github.com:cgitize-test/public.git'
+    verify_origin bitbucket-dir/public 'git@bitbucket.org:cgitize-test-workspace/public.git'
+    verify_origin gitlab-dir/public 'git@gitlab.com:cgitize-test/public.git'
+
+    cleanup
+    success
+}
+
+test_ssh_private() {
+    echo
+    echo ======================================================================
+    echo "${FUNCNAME[0]}"
+    echo ======================================================================
+
+    setup_ssh
+    setup_private_repos
+    cgitize
+
     verify_repos \
         lens \
         chromiumembedded/cef \
@@ -167,6 +219,44 @@ test_https() {
     setup_https
     cgitize
 
+    verify_repos \
+        lens \
+        chromiumembedded/cef \
+        graphviz \
+        wireguard/wintun \
+        goauthentik-dir/authentik \
+        github-dir/public \
+        bitbucket-dir/public \
+        gitlab-dir/public
+
+    verify_no_repos \
+        github-dir/private \
+        bitbucket-dir/private \
+        gitlab-dir/private
+
+    verify_origin lens 'https://github.com/ekmett/lens.git'
+    verify_origin chromiumembedded/cef 'https://bitbucket.org/chromiumembedded/cef.git'
+    verify_origin graphviz 'https://gitlab.com/graphviz/graphviz.git'
+    verify_origin goauthentik-dir/authentik 'https://github.com/goauthentik/authentik.git'
+
+    verify_origin github-dir/public 'https://github.com/cgitize-test/public.git'
+    verify_origin bitbucket-dir/public 'https://bitbucket.org/cgitize-test-workspace/public.git'
+    verify_origin gitlab-dir/public 'https://gitlab.com/cgitize-test/public.git'
+
+    cleanup
+    success
+}
+
+test_https_private() {
+    echo
+    echo ======================================================================
+    echo "${FUNCNAME[0]}"
+    echo ======================================================================
+
+    setup_https
+    setup_private_repos
+    cgitize
+
     verify_repos \
         lens \
         chromiumembedded/cef \
@@ -213,7 +303,9 @@ test_one_repo() {
 main() {
     trap cleanup EXIT
     test_ssh
+    test_ssh_private
     test_https
+    test_https_private
     test_one_repo
 }
 

{cgitize-6.0.5 → cgitize-8.0.0}/test/set_credentials.sh

@@ -1,3 +1,5 @@
+IFS= read -r -s -p 'Bitbucket email: ' CGITIZE_BITBUCKET_EMAIL
+echo
 IFS= read -r -s -p 'Bitbucket token: ' CGITIZE_BITBUCKET_TOKEN
 echo
 IFS= read -r -s -p 'GitHub token: ' CGITIZE_GITHUB_TOKEN
@@ -5,7 +7,7 @@ echo
 IFS= read -r -s -p 'GitLab token: ' CGITIZE_GITLAB_TOKEN
 echo
 
-export CGITIZE_BITBUCKET_USERNAME=cgitize-test
+export CGITIZE_BITBUCKET_EMAIL
 export CGITIZE_BITBUCKET_TOKEN
 export CGITIZE_GITHUB_USERNAME=cgitize-test
 export CGITIZE_GITHUB_TOKEN

{cgitize-6.0.5 → cgitize-8.0.0}/test/unit/test_bitbucket.py

@@ -13,7 +13,7 @@ from requests.exceptions import HTTPError
 class BitbucketTests(unittest.TestCase):
     def setUp(self):
         self.bitbucket = Cloud(
-            username=os.environ.get('CGITIZE_BITBUCKET_USERNAME'),
+            username=os.environ.get('CGITIZE_BITBUCKET_EMAIL'),
             password=os.environ.get('CGITIZE_BITBUCKET_TOKEN'),
             cloud=True,
         )
@@ -30,6 +30,8 @@ class BitbucketTests(unittest.TestCase):
         self.assertEqual(r.data['workspace']['name'], 'Test cgitize workspace')
         self.assertEqual(r.data['workspace']['slug'], 'cgitize-test-workspace')
 
+        self.assertFalse(r.data['is_private'])
+
         self.assertEqual(
             r.get_link('html'), 'https://bitbucket.org/cgitize-test-workspace/public'
         )
@@ -57,10 +59,27 @@ class BitbucketTests(unittest.TestCase):
         self.assertEqual(r.data['workspace']['name'], 'Test cgitize workspace')
         self.assertEqual(r.data['workspace']['slug'], 'cgitize-test-workspace')
 
+        self.assertTrue(r.data['is_private'])
+
         self.assertEqual(
             r.get_link('html'), 'https://bitbucket.org/cgitize-test-workspace/private'
         )
 
+        clone_urls = [
+            link for link in r.data['links']['clone'] if link['name'] == 'https'
+        ]
+        self.assertEqual(len(clone_urls), 1)
+        self.assertEqual(
+            clone_urls[0]['href'],
+            'https://cgitize-test@bitbucket.org/cgitize-test-workspace/private.git',
+        )
+
+        ssh_urls = [link for link in r.data['links']['clone'] if link['name'] == 'ssh']
+        self.assertEqual(len(ssh_urls), 1)
+        self.assertEqual(
+            ssh_urls[0]['href'], 'git@bitbucket.org:cgitize-test-workspace/private.git'
+        )
+
     def test_user(self):
         w = self.bitbucket.workspaces.get('cgitize-test-workspace')
         self.assertEqual(

{cgitize-6.0.5 → cgitize-8.0.0}/test/unit/test_github.py

@@ -23,6 +23,7 @@ class GitHubTests(unittest.TestCase):
         self.assertEqual(r.description, 'Public test cgitize repository')
         self.assertEqual(r.owner.name, 'Test cgitize user')
         self.assertEqual(r.owner.login, 'cgitize-test')
+        self.assertEqual(r.visibility, 'public')
         self.assertEqual(r.html_url, 'https://github.com/cgitize-test/public')
         self.assertEqual(r.clone_url, 'https://github.com/cgitize-test/public.git')
         self.assertEqual(r.ssh_url, 'git@github.com:cgitize-test/public.git')
@@ -33,6 +34,7 @@ class GitHubTests(unittest.TestCase):
         self.assertEqual(r.description, 'Private test cgitize repository')
         self.assertEqual(r.owner.name, 'Test cgitize user')
         self.assertEqual(r.owner.login, 'cgitize-test')
+        self.assertEqual(r.visibility, 'private')
         self.assertEqual(r.html_url, 'https://github.com/cgitize-test/private')
         self.assertEqual(r.clone_url, 'https://github.com/cgitize-test/private.git')
         self.assertEqual(r.ssh_url, 'git@github.com:cgitize-test/private.git')

{cgitize-6.0.5 → cgitize-8.0.0}/test/unit/test_gitlab.py

@@ -26,6 +26,7 @@ class GitLabTests(unittest.TestCase):
         self.assertEqual(r.description, 'Public test cgitize repository')
         self.assertEqual(r.namespace['name'], 'Test cgitize user')
         self.assertEqual(r.namespace['path'], 'cgitize-test')
+        self.assertEqual(r.visibility, 'public')
         self.assertEqual(r.web_url, 'https://gitlab.com/cgitize-test/public')
         self.assertEqual(
             r.http_url_to_repo, 'https://gitlab.com/cgitize-test/public.git'
@@ -38,6 +39,7 @@ class GitLabTests(unittest.TestCase):
         self.assertEqual(r.description, 'Private test cgitize repository')
         self.assertEqual(r.namespace['name'], 'Test cgitize user')
         self.assertEqual(r.namespace['path'], 'cgitize-test')
+        self.assertEqual(r.visibility, 'private')
         self.assertEqual(r.web_url, 'https://gitlab.com/cgitize-test/private')
         self.assertEqual(
             r.http_url_to_repo, 'https://gitlab.com/cgitize-test/private.git'

cgitize-6.0.5/.python-version

@@ -1 +0,0 @@
-3.10.10