aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorEgor Tensin <Egor.Tensin@gmail.com>2020-03-01 11:17:29 +0300
committerEgor Tensin <Egor.Tensin@gmail.com>2020-03-01 11:24:09 +0300
commit0352e233955bc5d04344a4ae3ef04436d8299ae1 (patch)
tree7b99b9bbf7b6390cbea22966ba257dfd09f1fea9
parentTravis: lint the config (diff)
downloadcgitize-0352e233955bc5d04344a4ae3ef04436d8299ae1.tar.gz
cgitize-0352e233955bc5d04344a4ae3ef04436d8299ae1.zip
rename the modules
-rw-r--r--.travis/docker/client/etc/my_repos.py2
-rwxr-xr-x.travis/local/test.sh4
-rw-r--r--Dockerfile4
-rw-r--r--README.md8
-rw-r--r--cgit/__init__.py (renamed from pull/__init__.py)0
-rw-r--r--cgit/repos/__init__.py0
-rw-r--r--cgit/repos/cgit.py (renamed from pull/cgit.py)2
-rw-r--r--cgit/repos/main.py (renamed from pull/main.py)4
-rw-r--r--cgit/repos/repo.py (renamed from pull/repo.py)0
-rw-r--r--cgit/repos/utils.py (renamed from pull/utils.py)0
-rw-r--r--examples/my_repos.py2
11 files changed, 13 insertions, 13 deletions
diff --git a/.travis/docker/client/etc/my_repos.py b/.travis/docker/client/etc/my_repos.py
index 2e1bc8b..9d90f21 100644
--- a/.travis/docker/client/etc/my_repos.py
+++ b/.travis/docker/client/etc/my_repos.py
@@ -1,4 +1,4 @@
-from pull.repo import Repo
+from cgit.repos.repo import Repo
MY_REPOS = (
diff --git a/.travis/local/test.sh b/.travis/local/test.sh
index 5cc1fdd..2045e1e 100755
--- a/.travis/local/test.sh
+++ b/.travis/local/test.sh
@@ -56,7 +56,7 @@ setup_my_repos_py() {
mkdir -p -- "$conf_dir"
cat <<EOF | tee "$my_repos_path"
-from pull.repo import Repo
+from cgit.repos.repo import Repo
MY_REPOS = (
@@ -81,7 +81,7 @@ run() {
echo Pulling repository from upstream
echo ----------------------------------------------------------------------
- python3 -m pull.main --config "$cgit_repos_conf_path"
+ python3 -m cgit.repos.main --config "$cgit_repos_conf_path"
}
verify() {
diff --git a/Dockerfile b/Dockerfile
index f680993..8017f3b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,7 @@ ARG ssh_sock_path="$ssh_sock_dir/ssh-agent.sock"
ENV SSH_AUTH_SOCK "$ssh_sock_path"
-COPY ["pull/", "/usr/src/pull/"]
+COPY ["cgit/", "/usr/src/cgit/"]
WORKDIR /usr/src
-CMD ["python3", "-m", "pull.main"]
+CMD ["python3", "-m", "cgit.repos.main"]
diff --git a/README.md b/README.md
index fcd207c..0db6aad 100644
--- a/README.md
+++ b/README.md
@@ -11,13 +11,13 @@ Usage
Adjust the config in [examples/cgit-repos.conf] and pass it using the
`--config` parameter:
- > python3 -m pull.main --config path/to/cgit-repos.conf
+ > python3 -m cgit.repos.main --config path/to/cgit-repos.conf
The repository list is stored in my_repos.py (the `my_repos` setting in the
config).
See [examples/my_repos.py] for an example.
-pull/main.py calls git, which might call ssh internally.
+cgit/repos/main.py calls git, which might call ssh internally.
Make sure the required keys are loaded to a ssh-agent.
[examples/cgit-repos.conf]: examples/cgit-repos.conf
@@ -37,7 +37,7 @@ For example:
-v "/path/to/config:/etc/cgit-repos:ro" \
-v "$SSH_AUTH_SOCK:/var/run/cgit-repos/ssh-agent.sock" \
-v "/path/to/output:/var/tmp/cgit-repos/output" \
- egortensin/pull-cgit-repos
+ egortensin/cgit-repos
### my_repos.py
@@ -63,7 +63,7 @@ To build an image:
Requires [Pylint].
- > pylint pull
+ > pylint cgit
[Pylint]: https://www.pylint.org/
diff --git a/pull/__init__.py b/cgit/__init__.py
index e69de29..e69de29 100644
--- a/pull/__init__.py
+++ b/cgit/__init__.py
diff --git a/cgit/repos/__init__.py b/cgit/repos/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/cgit/repos/__init__.py
diff --git a/pull/cgit.py b/cgit/repos/cgit.py
index 86a94ea..bb010d3 100644
--- a/pull/cgit.py
+++ b/cgit/repos/cgit.py
@@ -9,7 +9,7 @@ import os
import os.path
import shutil
-from pull.utils import chdir, check_output, run
+from cgit.repos.utils import chdir, check_output, run
_ENV = os.environ.copy()
diff --git a/pull/main.py b/cgit/repos/main.py
index 299b53c..8132208 100644
--- a/pull/main.py
+++ b/cgit/repos/main.py
@@ -10,8 +10,8 @@ import logging
import os.path
import sys
-from pull.cgit import CGit, Output
-from pull.repo import BitbucketRepo, GithubRepo, Repo
+from cgit.repos.cgit import CGit, Output
+from cgit.repos.repo import BitbucketRepo, GithubRepo, Repo
DEFAULT_OUTPUT_DIR = '/var/tmp/cgit-repos/output'
diff --git a/pull/repo.py b/cgit/repos/repo.py
index a128dbf..a128dbf 100644
--- a/pull/repo.py
+++ b/cgit/repos/repo.py
diff --git a/pull/utils.py b/cgit/repos/utils.py
index 84337e8..84337e8 100644
--- a/pull/utils.py
+++ b/cgit/repos/utils.py
diff --git a/examples/my_repos.py b/examples/my_repos.py
index 2047b8d..d0b84b3 100644
--- a/examples/my_repos.py
+++ b/examples/my_repos.py
@@ -1,4 +1,4 @@
-from pull.repo import BitbucketRepo, GithubRepo, Repo
+from cgit.repos.repo import BitbucketRepo, GithubRepo, Repo
MY_REPOS = (