From 472e5d3cfb7b17dd44fd764cd1ce0ab8935c8e9c Mon Sep 17 00:00:00 2001
From: Robert de Bock <robert@meinit.nl>
Date: Tue, 3 Nov 2020 15:49:20 +0100
Subject: [PATCH] Many small fixes.

---
 generate.yml           | 18 ++++++++----------
 templates/README.md.j2 | 29 +++++++++++++----------------
 vars/main.yml          |  1 -
 3 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/generate.yml b/generate.yml
index 35b941e..bc38a58 100755
--- a/generate.yml
+++ b/generate.yml
@@ -73,19 +73,12 @@
       register: check_requirements
 
     - name: load requirements.yml
-      slurp:
-        src: "{{ role_path }}/requirements.yml"
-      register: requirements
+      include_vars:
+        file: "{{ role_path }}/requirements.yml"
+        name: requirements
       when:
         - check_requirements.stat.exists | bool
 
-    - name: set no requirements when none exist
-      set_fact:
-        requirements:
-          content: "{{ '- none' | b64encode }}"
-      when:
-        - not check_requirements.stat.exists
-
     - name: load molecule/default/converge.yml
       slurp:
         src: "{{ role_path }}/molecule/default/converge.yml"
@@ -210,3 +203,8 @@
           dest: .github/workflows/galaxy.yml
       loop_control:
         label: "{{ item.source }}"
+
+    - name: pre-commit install
+      command: pre-commit install
+      args:
+        creates: .git/hooks/pre-commit
diff --git a/templates/README.md.j2 b/templates/README.md.j2
index 47c5cb8..d5e847d 100644
--- a/templates/README.md.j2
+++ b/templates/README.md.j2
@@ -12,21 +12,12 @@ This example is taken from `molecule/resources/converge.yml` and is tested on ea
 ```yaml
 {{ example.content | b64decode | regex_replace('ansible-role-', galaxy_namespace ~ '.') }}```
 
-The machine may need to be prepared using `molecule/resources/prepare.yml`:
-```yaml
 {% if prepare.content is defined %}
-{{ prepare.content | b64decode | regex_replace('ansible-role-', galaxy_namespace ~ '.') }}```
-{% else %}
-No preparation required.
-```
-{% endif %}
-
-{% if verifyyml.content is defined %}
-For verification `molecule/resources/verify.yml` runs after the role has been applied.
+The machine needs to be prepared in CI this is done using `molecule/resources/prepare.yml`:
 ```yaml
-{{ verifyyml.content | b64decode | regex_replace('ansible-role-', galaxy_namespace ~ '.') }}```
-{% endif %}
+{{ prepare.content | b64decode | regex_replace('ansible-role-', galaxy_namespace ~ '.') }}```
 
+{% endif %}
 Also see a [full explanation and example](https://robertdebock.nl/how-to-use-these-roles.html) on how to use these roles.
 
 {% if variables.content is defined %}
@@ -42,11 +33,15 @@ These variables are set in `defaults/main.yml`:
 - Access to a repository containing packages, likely on the internet.
 - A recent version of Ansible. (Tests run on the current, previous and next release of Ansible.)
 
-The following roles can be installed to ensure all requirements are met, using `ansible-galaxy install -r requirements.yml`:
+{% if requirements is defined %}
+## [Status of requirements](#status-of-requirements)
 
-```yaml
-{{ requirements.content | b64decode }}
-```
+| Requirement | Travis | GitHub |
+|-------------|--------|--------|
+{% for requirement in requirements.roles %}
+| [{{ requirement.name }}](https://galaxy.ansible.com/{{ github_namespace }}/{{ requirement.name | regex_replace(github_namespace + '\.') }}) | [![Build Status Travis](https://travis-ci.com/{{ github_namespace }}/{{ requirement.name | regex_replace(github_namespace + '\.', 'ansible-role-') }}.svg?branch=master)](https://travis-ci.com/{{ github_namespace }}/{{ requirement.name | regex_replace(github_namespace + '\.', 'ansible-role-') }}) | [![Build Status GitHub](https://github.com/{{ github_namespace }}/{{ requirement.name | regex_replace(github_namespace + '\.', 'ansible-role-') }}/workflows/Ansible%20Molecule/badge.svg)](https://github.com/{{ github_namespace }}/{{ requirement.name | regex_replace(github_namespace + '\.', 'ansible-role-') }}/actions) |
+{% endfor %}
+{% endif %}
 
 {% if meta.dependencies %}
 ## [Dependencies](#dependencies)
@@ -138,6 +133,7 @@ image="debian" tag="stable" tox
 
 {{ meta.galaxy_info.license }}
 
+{% if github_contributors is defined %}
 {% if github_contributors.json | length > 1 %}
 ## [Contributors](#contributors)
 
@@ -148,6 +144,7 @@ I'd like to thank everybody that made contributions to this repository. It motiv
 {% endif %}
 {% endfor %}
 {% endif %}
+{% endif %}
 
 ## [Author Information](#author-information)
 
diff --git a/vars/main.yml b/vars/main.yml
index e020d1d..0ed53bb 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -36,7 +36,6 @@ distribution_version_mapping:
   Alpine:
     all:
       - latest
-      - edge
   Amazon:
     all:
       - 1