Merge pull request #18 from artis3n/molecule

Adding Molecule

.flake8

@@ -0,0 +1,3 @@
+[flake8]
+ignore = E402
+max-line-length = 100

.github/workflows/main.yml

@@ -0,0 +1,31 @@
+name: Ansible
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up Python 3
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.8'
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install pipenv
+          pipenv install --dev
+          pipenv run ansible-galaxy install -r requirements.yml
+          pipenv run ansible-galaxy collection install -r requirements.yml
+          echo "${{ secrets.VAULT_PASS }}" > .vault_pass
+
+      - name: Molecule
+        run: pipenv run molecule test

.gitignore

@@ -1,8 +1,6 @@
-venv/
 .vscode
 .vault_pass
 .idea
 roles/
-.vagrant/
-files/secrets.yml
 collections/
+__pycache__

.yamllint

@@ -0,0 +1,36 @@
+---
+# Based on ansible-lint config
+extends: default
+
+ignore: |
+  .pre-commit-config.yaml
+
+rules:
+  braces:
+    max-spaces-inside: 1
+    level: error
+  brackets:
+    max-spaces-inside: 1
+    level: error
+  colons:
+    max-spaces-after: -1
+    level: error
+  commas:
+    max-spaces-after: -1
+    level: error
+  comments: disable
+  comments-indentation: disable
+  document-start: disable
+  empty-lines:
+    max: 3
+    level: error
+  hyphens:
+    level: error
+  indentation: disable
+  key-duplicates: enable
+  line-length: disable
+  new-line-at-end-of-file: disable
+  new-lines:
+    type: unix
+  trailing-spaces: disable
+  truthy: disable

Makefile

@@ -1,18 +1,17 @@
 #!/usr/bin/make
 
 .PHONY: all
-all: install
+all: dev-install
 
 .PHONY: install
 install:
 	if [ ! -f /usr/bin/python3 ]; then sudo apt update && sudo apt install -y python3; fi;
 	if [ ! -f /usr/bin/pip3 ]; then sudo apt update && sudo apt install -y python3-pip; fi;
-	if [ ! -f ~/.local/bin/pipenv ]; then pip3 install pipenv; fi;
+	if [ ! -f ~/.local/bin/pipenv ]; then pip3 install --user pipenv; fi;
 	if [ ! -d ~/.local/share/virtualenvs ]; then mkdir -p ~/.local/share/virtualenvs/; fi;
-	if [ ! $$(find ~/.local/share/virtualenvs/ -name "dev-setup*") ]; then ~/.local/bin/pipenv install --python /usr/bin/python3; fi;
-	if [ ! -d ~/.ansible/roles/gantsign.visual-studio-code ]; then ~/.local/bin/pipenv run ansible-galaxy install gantsign.visual-studio-code; fi;
-	if [ ! -d ~/.ansible/roles/artis3n.bitwarden_app ]; then ~/.local/bin/pipenv run ansible-galaxy install artis3n.bitwarden_app; fi;
-	if [ ! -d ./collections/ansible_collections/artis3n/github_version ]; then ~/.local/bin/pipenv run ansible-galaxy collection install artis3n.github_version -p ./collections; fi;
+	if [ ! $$(find ~/.local/share/virtualenvs/ -name "dev-setup*") ]; then ~/.local/bin/pipenv install; fi;
+	~/.local/bin/pipenv run ansible-galaxy install -r requirements.yml
+	~/.local/bin/pipenv run ansible-galaxy collection install -r requirements.yml
 
 .PHONY: dev-install
 dev-install: install
@@ -22,19 +21,19 @@ dev-install: install
 clean:
 	-~/.local/bin/pipenv --rm
 	rm -rf ~/.ansible/roles/
-	rm -rf ~/.ansible/collections/ansible_collections/artis3n/github_version
+	rm -rf ~/.ansible/collections/ansible_collections/artis3n/github
 
 .PHONY: lint
 lint:
-	~/.local/bin/pipenv run ansible-lint -c .ansible-lint *.yml
+	~/.local/bin/pipenv run ansible-lint
 
 .PHONY: provision
 provision:
-	~/.local/bin/pipenv run ansible-playbook --vault-id .vault_pass -i inventory main.yml --ask-become-pass
+	ANSIBLE_COLOR_DEBUG="magenta" ~/.local/bin/pipenv run ansible-playbook --vault-id .vault_pass -i inventory main.yml --ask-become-pass --force-handlers
 
-.PHONY: secret
-secret:
-	if [ -f ./files/secrets.yml ]; then ~/.local/bin/pipenv run ansible-vault edit ./files/secrets.yml; else ~/.local/bin/pipenv run ansible-vault create ./files/secrets.yml; fi;
+.PHONY: test
+test:
+	ANSIBLE_COLOR_DEBUG="magenta" pipenv run molecule test
 
 .PHONY: reset-run
-reset-run: clean install run
+reset-run: clean install provision

Pipfile

@@ -9,6 +9,8 @@ ansible = "*"
 [dev-packages]
 pre-commit = "*"
 ansible-lint = "*"
+molecule = {extras = ["docker"],version = "*"}
+docker = "*"
 
 [requires]
-python_version = "3.6"
+python_version = "3.8"