From 2b4de240be3e56d28cf2979bebbed5c72a338f6e Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Sun, 8 Mar 2020 16:39:18 +0100 Subject: [PATCH 1/3] add better handling of meta dependencies in templates --- CHANGELOG.md | 1 + ansibledoctor/templates/hugo-book/_meta.j2 | 8 ++++++-- ansibledoctor/templates/readme/_meta.j2 | 8 ++++++-- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5d30138..5d686c0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,2 +1,3 @@ * BUGFIX * remove only first hashtag from a multiline comment + * add better handling of meta dependencies in templates diff --git a/ansibledoctor/templates/hugo-book/_meta.j2 b/ansibledoctor/templates/hugo-book/_meta.j2 index c75c2fe..55f07eb 100644 --- a/ansibledoctor/templates/hugo-book/_meta.j2 +++ b/ansibledoctor/templates/hugo-book/_meta.j2 @@ -3,9 +3,13 @@ ## Dependencies {% if meta | deep_get(meta, "dependencies.value") %} -{% for item in meta.dependencies.value %} -* {{ item }} +{% if meta.dependencies.value is mapping %} +{{ meta.dependencies.value.dependencies | to_nice_yaml(indent=0) }} +{% else %} +{% for line in meta.dependencies.value %} +{{ line }} {% endfor %} +{% endif %} {% else %} None. {% endif %} diff --git a/ansibledoctor/templates/readme/_meta.j2 b/ansibledoctor/templates/readme/_meta.j2 index 3dee21a..ec6356e 100644 --- a/ansibledoctor/templates/readme/_meta.j2 +++ b/ansibledoctor/templates/readme/_meta.j2 @@ -3,9 +3,13 @@ ## Dependencies {% if meta | deep_get(meta, "dependencies.value") %} -{% for item in meta.dependencies.value %} -* {{ item }} +{% if meta.dependencies.value is mapping %} +{{ meta.dependencies.value.dependencies | to_nice_yaml(indent=0) }} +{% else %} +{% for line in meta.dependencies.value %} +{{ line }} {% endfor %} +{% endif %} {% else %} None. {% endif %} From a258240b3f8053124d16a1fa9206e9931939b4f0 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Sun, 8 Mar 2020 16:55:08 +0100 Subject: [PATCH 2/3] use to_nice_yaml for dep lists also --- ansibledoctor/templates/hugo-book/_meta.j2 | 4 +--- ansibledoctor/templates/readme/_meta.j2 | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/ansibledoctor/templates/hugo-book/_meta.j2 b/ansibledoctor/templates/hugo-book/_meta.j2 index 55f07eb..f0ac73d 100644 --- a/ansibledoctor/templates/hugo-book/_meta.j2 +++ b/ansibledoctor/templates/hugo-book/_meta.j2 @@ -6,9 +6,7 @@ {% if meta.dependencies.value is mapping %} {{ meta.dependencies.value.dependencies | to_nice_yaml(indent=0) }} {% else %} -{% for line in meta.dependencies.value %} -{{ line }} -{% endfor %} +{{ meta.dependencies.value | to_nice_yaml(indent=0) }} {% endif %} {% else %} None. diff --git a/ansibledoctor/templates/readme/_meta.j2 b/ansibledoctor/templates/readme/_meta.j2 index ec6356e..5e5b4a7 100644 --- a/ansibledoctor/templates/readme/_meta.j2 +++ b/ansibledoctor/templates/readme/_meta.j2 @@ -6,9 +6,7 @@ {% if meta.dependencies.value is mapping %} {{ meta.dependencies.value.dependencies | to_nice_yaml(indent=0) }} {% else %} -{% for line in meta.dependencies.value %} -{{ line }} -{% endfor %} +{{ meta.dependencies.value | to_nice_yaml(indent=0) }} {% endif %} {% else %} None. From 750a71ff2eb779a3c16d33aae6b3d4681edb1d37 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Sun, 8 Mar 2020 17:00:46 +0100 Subject: [PATCH 3/3] add github config --- .github/settings.yml | 62 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 .github/settings.yml diff --git a/.github/settings.yml b/.github/settings.yml new file mode 100644 index 0000000..4b20213 --- /dev/null +++ b/.github/settings.yml @@ -0,0 +1,62 @@ +--- +repository: + name: ansible-doctor + description: Simple annotation based documentation for your roles + homepage: https://ansible-doctor.geekdocs.de + topics: ansible, documentation, automation, python + + private: false + has_issues: true + has_projects: false + has_wiki: false + has_downloads: false + + default_branch: master + + allow_squash_merge: true + allow_merge_commit: true + allow_rebase_merge: true + +labels: + - name: bug + color: d73a4a + description: Something isn't working + - name: documentation + color: 0075ca + description: Improvements or additions to documentation + - name: duplicate + color: cfd3d7 + description: This issue or pull request already exists + - name: enhancement + color: a2eeef + description: New feature or request + - name: good first issue + color: 7057ff + description: Good for newcomers + - name: help wanted + color: 008672 + description: Extra attention is needed + - name: invalid + color: e4e669 + description: This doesn't seem right + - name: question + color: d876e3 + description: Further information is requested + - name: wontfix + color: ffffff + description: This will not be worked on + +branches: + - name: master + protection: + required_pull_request_reviews: null + required_status_checks: + strict: true + contexts: + - continuous-integration/drone/pr + enforce_admins: false + restrictions: + users: [] + teams: [] + +...