feat(GEERLINGGUY.MAC): support new collections format

README.md

@@ -24,7 +24,8 @@ ClamAV should be granted `Full Disk Access`.  This requires making the appropria
 Requirements
 ------------
 
-None
+- Homebrew must aleady be present on the machine ([geerlingguy.mac.hombrew](https://github.com/geerlingguy/ansible-collection-mac) is a great solution for this).
+- See the [homebrew website](https://brew.sh/) for further details about this tool.
 
 Role Variables
 --------------
@@ -57,14 +58,16 @@ Role Variables
 Dependencies
 ------------
 
-- geerlingguy.homebrew
+None
 
 Example Playbook
 ----------------
 
 ```yaml
 - hosts: email
   roles:
+  - role: elliotweiser.osx-command-line-tools
+  - role: geerlingguy.mac.homebrew
   - role: osx_provisioner.clamav
     clamav_clamwatch: true
     clamav_clamwatch_target_folder: "{{ lookup('env','HOME') }}/Downloads"

meta/main.yml

@@ -17,5 +17,4 @@ galaxy_info:
     - antivirus
     - clamav
 
-dependencies:
-  - geerlingguy.homebrew
+dependencies: []

molecule/clamwatch/converge.yml

@@ -5,6 +5,5 @@
   vars:
     clamav_clamwatch: true
   tasks:
-    - name: "Include ClamAV"
-      ansible.builtin.include_role:
-        name: "osx_provisioner.clamav"
+    - name: Include Roles
+      include_tasks: "../common/tasks/roles.yml"

molecule/clamwatch/molecule.yml

@@ -1,6 +1,9 @@
 ---
 dependency:
   name: galaxy
+  options:
+    role-file: requirements.yml
+    requirements-file: requirements.yml
 driver:
   name: delegated
   options:

molecule/common/tasks/roles.yml

@@ -0,0 +1,12 @@
+---
+- name: Include elliotweiser.osx-command-line-tools
+  ansible.builtin.include_role:
+    name: "elliotweiser.osx-command-line-tools"
+
+- name: Include geerlingguy.mac.homebrew
+  ansible.builtin.include_role:
+    name: "geerlingguy.mac.homebrew"
+
+- name: Include clamav
+  ansible.builtin.include_role:
+    name: "osx_provisioner.clamav"

molecule/no_clamwatch/converge.yml

@@ -5,6 +5,5 @@
   vars:
     clamav_clamwatch: false
   tasks:
-    - name: "Include ClamAV"
-      ansible.builtin.include_role:
-        name: "osx_provisioner.clamav"
+    - name: Include Roles
+      include_tasks: "../common/tasks/roles.yml"

molecule/no_clamwatch/molecule.yml

@@ -1,6 +1,9 @@
 ---
 dependency:
   name: galaxy
+  options:
+    role-file: requirements.yml
+    requirements-file: requirements.yml
 driver:
   name: delegated
   options:

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "role-clamav"
-version = "0.1.1"
+version = "0.2.0"
 description = "Install ClamAV antivirus on OSX. Includes a simple realtime scan implementation that watches a configured folder."
 authors = ["Niall Byrne <[email protected]>"]
 

requirements.yml

@@ -1,3 +1,7 @@
 ---
-- src: geerlingguy.homebrew
-  version: 3.1.0
+roles:
+  - name: elliotweiser.osx-command-line-tools
+    version: 2.3.0
+collections:
+  - name: geerlingguy.mac
+    version: 1.1.2