cgitize 5.0.4__tar.gz → 5.1.0__tar.gz

{cgitize-5.0.4 → cgitize-5.1.0}/LICENSE.txt

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018 Egor Tensin <Egor.Tensin@gmail.com>
+Copyright (c) 2018 Egor Tensin <egor@tensin.name>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

{cgitize-5.0.4/cgitize.egg-info → cgitize-5.1.0}/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.1
 Name: cgitize
-Version: 5.0.4
+Version: 5.1.0
 Summary: Self-host your repositories using cgit
-Author-email: Egor Tensin <Egor.Tensin@gmail.com>
+Author-email: Egor Tensin <egor@tensin.name>
 License: MIT
 Project-URL: Homepage, https://github.com/egor-tensin/cgitize
 Project-URL: Bug Tracker, https://github.com/egor-tensin/cgitize/issues

{cgitize-5.0.4 → cgitize-5.1.0}/cgitize/bitbucket.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Egor Tensin <Egor.Tensin@gmail.com>
+# Copyright (c) 2021 Egor Tensin <egor@tensin.name>
 # This file is part of the "cgitize" project.
 # For details, see https://github.com/egor-tensin/cgitize.
 # Distributed under the MIT License.

{cgitize-5.0.4 → cgitize-5.1.0}/cgitize/cgit.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2018 Egor Tensin <Egor.Tensin@gmail.com>
+# Copyright (c) 2018 Egor Tensin <egor@tensin.name>
 # This file is part of the "cgitize" project.
 # For details, see https://github.com/egor-tensin/cgitize.
 # Distributed under the MIT License.
@@ -166,10 +166,4 @@ class CGitRepositories:
         repo_dir = self.get_repo_dir(repo)
         with chdir(repo_dir):
             with Git.setup_auth(repo):
-                if not Git.check('remote', 'update', '--prune'):
-                    return False
-            # In case the local repository is not a bare repository, but a
-            # full-fledged working copy:
-            if Git.check('rev-parse', '--verify', '--quiet', 'origin/master'):
-                return Git.check('reset', '--soft', 'origin/master')
-            return True
+                return Git.check('remote', 'update', '--prune')

{cgitize-5.0.4 → cgitize-5.1.0}/cgitize/config.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Egor Tensin <Egor.Tensin@gmail.com>
+# Copyright (c) 2021 Egor Tensin <egor@tensin.name>
 # This file is part of the "cgitize" project.
 # For details, see https://github.com/egor-tensin/cgitize.
 # Distributed under the MIT License.
@@ -43,6 +43,10 @@ class MainSection(Section):
     def output_dir(self):
         return self._get_config_path('output_dir', default=MainSection.DEFAULT_OUTPUT_DIR)
 
+    @property
+    def error_header_path(self):
+        return os.path.join(self.output_dir, 'error.html')
+
     @property
     def clone_url(self):
         return self._get_config_value('clone_url', required=False)

{cgitize-5.0.4 → cgitize-5.1.0}/cgitize/git.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Egor Tensin <Egor.Tensin@gmail.com>
+# Copyright (c) 2021 Egor Tensin <egor@tensin.name>
 # This file is part of the "cgitize" project.
 # For details, see https://github.com/egor-tensin/cgitize.
 # Distributed under the MIT License.

{cgitize-5.0.4 → cgitize-5.1.0}/cgitize/github.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Egor Tensin <Egor.Tensin@gmail.com>
+# Copyright (c) 2021 Egor Tensin <egor@tensin.name>
 # This file is part of the "cgitize" project.
 # For details, see https://github.com/egor-tensin/cgitize.
 # Distributed under the MIT License.

{cgitize-5.0.4 → cgitize-5.1.0}/cgitize/gitlab.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Egor Tensin <Egor.Tensin@gmail.com>
+# Copyright (c) 2021 Egor Tensin <egor@tensin.name>
 # This file is part of the "cgitize" project.
 # For details, see https://github.com/egor-tensin/cgitize.
 # Distributed under the MIT License.

{cgitize-5.0.4 → cgitize-5.1.0}/cgitize/main.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2018 Egor Tensin <Egor.Tensin@gmail.com>
+# Copyright (c) 2018 Egor Tensin <egor@tensin.name>
 # This file is part of the "cgitize" project.
 # For details, see https://github.com/egor-tensin/cgitize.
 # Distributed under the MIT License.
@@ -32,23 +32,42 @@ def parse_args(argv=None):
     return parser.parse_args(argv)
 
 
+def setup_error_header_file(error_header_path, success, error=None):
+    with open(error_header_path, 'w') as file:
+        contents = ''
+        if not success:
+            contents = '''<p style="text-align: center; color: red; font-weight: bold;">'''
+            contents += '''Some repositories couldn't be updated, please check application logs for details.'''
+            if error is not None:
+                contents += f'''<br>{type(error).__name__}: {error}'''
+            contents += '''</p>\n'''
+        file.write(contents)
+
+
 def main(argv=None):
     args = parse_args(argv)
     with setup_logging(args.verbose):
         config = Config.read(args.config)
-        cgit_server = CGitServer(config.main.clone_url)
-        output = CGitRepositories(config.main.output_dir, cgit_server, force=args.force)
         success = True
-        for repo in config.parse_repositories():
-            if args.repos is None or repo.name in args.repos:
-                if not output.update(repo):
-                    success = False
+        error = None
+
+        try:
+            cgit_server = CGitServer(config.main.clone_url)
+            output = CGitRepositories(config.main.output_dir, cgit_server, force=args.force)
+            for repo in config.parse_repositories():
+                if args.repos is None or repo.name in args.repos:
+                    success = success and output.update(repo)
+        except Exception as e:
+            success = False
+            error = e
+
         if success:
             logging.info('All repositories were updated successfully')
-            return 0
         else:
             logging.warning("Some repositories couldn't be updated!")
-            return 1
+
+        setup_error_header_file(config.main.error_header_path, success, error)
+        return int(not success)
 
 
 if __name__ == '__main__':

{cgitize-5.0.4 → cgitize-5.1.0}/cgitize/repo.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2018 Egor Tensin <Egor.Tensin@gmail.com>
+# Copyright (c) 2018 Egor Tensin <egor@tensin.name>
 # This file is part of the "cgitize" project.
 # For details, see https://github.com/egor-tensin/cgitize.
 # Distributed under the MIT License.

{cgitize-5.0.4 → cgitize-5.1.0}/cgitize/utils.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2018 Egor Tensin <Egor.Tensin@gmail.com>
+# Copyright (c) 2018 Egor Tensin <egor@tensin.name>
 # This file is part of the "cgitize" project.
 # For details, see https://github.com/egor-tensin/cgitize.
 # Distributed under the MIT License.

{cgitize-5.0.4 → cgitize-5.1.0/cgitize.egg-info}/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.1
 Name: cgitize
-Version: 5.0.4
+Version: 5.1.0
 Summary: Self-host your repositories using cgit
-Author-email: Egor Tensin <Egor.Tensin@gmail.com>
+Author-email: Egor Tensin <egor@tensin.name>
 License: MIT
 Project-URL: Homepage, https://github.com/egor-tensin/cgitize
 Project-URL: Bug Tracker, https://github.com/egor-tensin/cgitize/issues

{cgitize-5.0.4 → cgitize-5.1.0}/docker/Dockerfile

@@ -28,7 +28,7 @@ RUN pip3 install -q --no-cache-dir --target=/deps -r /tmp/requirements.txt
 
 FROM base
 
-LABEL maintainer="Egor Tensin <Egor.Tensin@gmail.com>"
+LABEL maintainer="Egor Tensin <egor@tensin.name>"
 
 RUN apk add -q --no-cache bash git openssh-client tini
 

{cgitize-5.0.4 → cgitize-5.1.0}/docker/cgitize.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-# Copyright (c) 2023 Egor Tensin <Egor.Tensin@gmail.com>
+# Copyright (c) 2023 Egor Tensin <egor@tensin.name>
 # This file is part of the "cgitize" project.
 # For details, see https://github.com/egor-tensin/cgitize.
 # Distributed under the MIT License.

{cgitize-5.0.4 → cgitize-5.1.0}/docker/frontend/Dockerfile

@@ -1,4 +1,4 @@
-FROM nginx:1.25-alpine AS base
+FROM nginx:1.27-alpine AS base
 
 FROM base AS builder
 

{cgitize-5.0.4 → cgitize-5.1.0}/docker/frontend/etc/cgit/common

@@ -37,3 +37,5 @@ source-filter=/usr/lib/cgit/filters/syntax-highlighting.py
 
 # Set the directory path to search for repositories.
 scan-path=/mnt/cgitize
+
+header=/mnt/cgitize/error.html

{cgitize-5.0.4 → cgitize-5.1.0}/docker/in_cron.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-# Copyright (c) 2021 Egor Tensin <Egor.Tensin@gmail.com>
+# Copyright (c) 2021 Egor Tensin <egor@tensin.name>
 # This file is part of the "cgitize" project.
 # For details, see https://github.com/egor-tensin/cgitize.
 # Distributed under the MIT License.

{cgitize-5.0.4 → cgitize-5.1.0}/pyproject.toml

@@ -7,7 +7,7 @@ name = "cgitize"
 description = "Self-host your repositories using cgit"
 license = {text = "MIT"}
 dynamic = ["version"]
-authors = [{name = "Egor Tensin", email = "Egor.Tensin@gmail.com"}]
+authors = [{name = "Egor Tensin", email = "egor@tensin.name"}]
 readme = "README.md"
 requires-python = ">=3.6"
 

{cgitize-5.0.4 → cgitize-5.1.0}/test/integration/docker/git_server/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.19
+FROM alpine:3.20
 
 RUN apk add -q --no-cache bash git openssh-server tini && \
     echo 'root:root' | chpasswd && \

{cgitize-5.0.4 → cgitize-5.1.0}/test/integration/local/test.sh

@@ -107,18 +107,6 @@ setup_bare() {
     setup_cgitize
 }
 
-setup_workdir() {
-    setup_bare
-
-    echo
-    echo ----------------------------------------------------------------------
-    echo Setting up local repository clone
-    echo ----------------------------------------------------------------------
-
-    mkdir -p -- "$output_dir"
-    _git clone --quiet -- "$upstream_repo_dir" "$output_dir/test_repo"
-}
-
 cgitize() {
     echo
     echo ----------------------------------------------------------------------
@@ -179,34 +167,39 @@ verify_added_commits() {
     verify_commits 'first commit' 'second commit' 'third commit'
 }
 
-test_bare() {
+verify_error_header_empty() {
     echo
-    echo ======================================================================
-    echo "${FUNCNAME[0]}"
-    echo ======================================================================
+    echo ----------------------------------------------------------------------
+    echo Verifying the error header
+    echo ----------------------------------------------------------------------
 
-    setup_bare
-    cgitize
-    verify_initial_commits
-    add_commits
-    cgitize
-    verify_added_commits
-    cleanup
-    success
+    test ! -s "$output_dir/error.html"
 }
 
-test_workdir() {
+verify_error_header() {
+    echo
+    echo ----------------------------------------------------------------------
+    echo Verifying the error header
+    echo ----------------------------------------------------------------------
+
+    local contents
+    contents="$( cat -- "$output_dir/error.html" )"
+    check_contains "$contents" "Some repositories couldn't be updated"
+}
+
+test_bare() {
     echo
     echo ======================================================================
     echo "${FUNCNAME[0]}"
     echo ======================================================================
 
-    setup_workdir
+    setup_bare
     cgitize
     verify_initial_commits
     add_commits
     cgitize
     verify_added_commits
+    verify_error_header_empty
     cleanup
     success
 }
@@ -237,6 +230,7 @@ test_failure() {
         echo "The added commits should not have been pulled." >&2
         return 1
     fi
+    verify_error_header
     cleanup
     success
 }
@@ -244,7 +238,6 @@ test_failure() {
 main() {
     trap cleanup EXIT
     test_bare
-    test_workdir
     test_failure
 }
 

{cgitize-5.0.4 → cgitize-5.1.0}/test/unit/test_bitbucket.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Egor Tensin <Egor.Tensin@gmail.com>
+# Copyright (c) 2021 Egor Tensin <egor@tensin.name>
 # This file is part of the "cgitize" project.
 # For details, see https://github.com/egor-tensin/cgitize.
 # Distributed under the MIT License.

{cgitize-5.0.4 → cgitize-5.1.0}/test/unit/test_github.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Egor Tensin <Egor.Tensin@gmail.com>
+# Copyright (c) 2021 Egor Tensin <egor@tensin.name>
 # This file is part of the "cgitize" project.
 # For details, see https://github.com/egor-tensin/cgitize.
 # Distributed under the MIT License.

{cgitize-5.0.4 → cgitize-5.1.0}/test/unit/test_gitlab.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Egor Tensin <Egor.Tensin@gmail.com>
+# Copyright (c) 2021 Egor Tensin <egor@tensin.name>
 # This file is part of the "cgitize" project.
 # For details, see https://github.com/egor-tensin/cgitize.
 # Distributed under the MIT License.