From 06e2320682794ec0450f4b24834c9e4a890ebc0c Mon Sep 17 00:00:00 2001
From: Uwe Arnold <donvipre@gmail.com>
Date: Sat, 7 Jul 2018 17:27:06 +0200
Subject: [PATCH] Fix: ansible-galaxy minus to underscore

---
 .travis.yml      | 14 +++++++-------
 README.md        | 12 ++++++------
 meta/main.yml    |  5 ++---
 requirements.yml |  4 ++--
 tests/test.sh    | 13 -------------
 tests/test.yml   |  2 +-
 6 files changed, 18 insertions(+), 32 deletions(-)
 delete mode 100644 tests/test.sh

diff --git a/.travis.yml b/.travis.yml
index a28ab01..e1fce13 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,4 @@
 ---
-# TODO: Build better testing for multiple containers and os support
 language: python
 python: 
   - "2.7"
@@ -12,6 +11,8 @@ addons:
   apt:
     packages:
     - python-pip
+    - aspell
+    - aspell-en
 
 install:
   # Install ansible
@@ -22,16 +23,15 @@ install:
   # Check ansible version
   - ansible --version
 
-  # Create ansible.cfg with correct roles_path
-  - printf '[defaults]\nroles_path=../' >ansible.cfg
-
   # Link github repo to ansible-galaxy name
-  - ln -s  $PWD ../while-true-do.mariadb
+  - ln -s  $PWD ../while_true_do.mariadb
 
 # Run the tests
 script:
-  - chmod +x tests/test.sh
-  - tests/test.sh
+  - chmod +x tests/test-ansible.sh
+  - tests/test-ansible.sh
+  - chmod +x tests/test-spelling.sh
+  - tests/test-spelling.sh
 
 notifications:
   webhooks:
diff --git a/README.md b/README.md
index dc99757..73477d5 100644
--- a/README.md
+++ b/README.md
@@ -8,16 +8,16 @@
 Installing MariaDB together with "MySQL secure installation".
 
 ## Installation
-Install from [Ansible Galaxy](https://galaxy.ansible.com/while-true-do.mariadb)
+Install from [Ansible Galaxy](https://galaxy.ansible.com/while_true_do.mariadb)
 
 ```
-ansible-galaxy install while-true-do.mariadb
+ansible-galaxy install while_true_do.mariadb
 ```
 
 Install from [Github](https://github.com/while-true-do/ansible-role-mariadb)
 
 ```
-git clone https://github.com/while-true-do/ansible-role-mariadb.git while-true-do.mariadb
+git clone https://github.com/while-true-do/ansible-role-mariadb.git while_true_do.mariadb
 ```
 
 ## Requirements
@@ -34,7 +34,7 @@ Module requirements
 
 ## Dependencies
 
-This role depends on <https://galaxy.ansible.com/while-true-do/repo-mariadb>. You have to install the role:
+This role depends on <https://galaxy.ansible.com/while_true_do/repo-mariadb>. You have to install the role:
 
 ```
 ansible-galaxy install -r requirements.yml
@@ -55,7 +55,7 @@ You have to set a password for 'wtd_mariadb_root_password'.
 # repository:
 #   - default -> will use the distribution specific repository
 #   - repo_mariadb -> will use the official upstream repository
-#     there is also a dependency to while-true-do.repo-mariadb
+#     there is also a dependency to while_true_do.repo-mariadb
 #
 # Also some common best practices are applied like innodb tuning, activating query cache and setting default charset to utf8m4
 # 
@@ -117,7 +117,7 @@ Simple Example:
 ```yaml
 - hosts: servers 
   roles:
-    - { role: while-true-do.mariadb, wtd_mariadb_root_password: 'PASSWORD' }
+    - { role: while_true_do.mariadb, wtd_mariadb_root_password: 'PASSWORD' }
 ```
 
 ## Testing
diff --git a/meta/main.yml b/meta/main.yml
index 2f55a92..08ba9d8 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -1,13 +1,12 @@
 dependencies:
-  - { role: while-true-do.repo-mariadb, when: wtd_mariadb_repository == "repo_mariadb" }
+  - { role: while_true_do.repo-mariadb, when: wtd_mariadb_repository == "repo_mariadb" }
 
 galaxy_info:
   author: while-true-do.org
   description: This role installs and configures MariaDB
   company: while-true-do.org
 
-  issue_tracker_url: https://github.com/while-true-do/ansible-role-mariadb/issues
-  github_branch: master
+    github_branch: master
   license: BSD
 
   min_ansible_version: 2.2
diff --git a/requirements.yml b/requirements.yml
index 805be5d..6818de0 100644
--- a/requirements.yml
+++ b/requirements.yml
@@ -1,3 +1,3 @@
 ---
-# Install while-true-do.repo-mariadb from galaxy
-- src: while-true-do.repo-mariadb
+# Install while_true_do.repo-mariadb from galaxy
+- src: while_true_do.repo-mariadb
diff --git a/tests/test.sh b/tests/test.sh
deleted file mode 100644
index dd6437b..0000000
--- a/tests/test.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-#
-# Generic test-scripts for ansible roles
-if [ -f requirements.yml ]; then
-  echo "*** Installing requirements / dependencies ***"
-  ansible-galaxy install -r requirements.yml
-fi
-
-echo "***  Syntax ***"
-ansible-playbook tests/test.yml -i tests/inventory --syntax-check
-
-echo "*** Linting ***"
-ansible-lint -Rv tests/test.yml
diff --git a/tests/test.yml b/tests/test.yml
index 8082c9f..62b0954 100644
--- a/tests/test.yml
+++ b/tests/test.yml
@@ -2,4 +2,4 @@
 - hosts: localhost
   remote_user: root
   roles:
-    - while-true-do.mariadb
+    - while_true_do.mariadb