update roles

Author: buluma

.github/workflows/ci.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the codebase.
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           path: ansible_collections/buluma/mac
 
@@ -46,7 +46,7 @@ jobs:
 
     steps:
       - name: Check out the codebase.
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           path: ansible_collections/buluma/mac
 

.github/workflows/release.yml

@@ -20,7 +20,7 @@ jobs:
 
     steps:
       - name: Check out the codebase.
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           path: ansible_collections/buluma/mac
 

galaxy.yml

@@ -1,7 +1,7 @@
 ---
 namespace: buluma
 name: mac
-version: "2.0.1"
+version: "2.0.2"
 readme: README.md
 
 authors:

meta/runtime.yml

@@ -1,2 +1,2 @@
 ---
-requires_ansible: ">=2.9"
+requires_ansible: ">=2.10"

roles/dock/README.md

@@ -22,6 +22,18 @@ dockitems_persist: []
 
 Dock items to add. `pos` parameter is optional and will place the Dock item in a particular position in the Dock.
 
+```yaml
+dockutil_homebrew_cask: hpedrorodrigues/tools/dockutil
+```
+
+Which Homebrew cask to install for dockutil. See [this issue](https://github.com/kcrawford/dockutil/issues/127) to read more about why this cask is the default.
+
+```yaml
+dockutil_install: true
+```
+
+Whether to install dockutil or not. If set to false you'll need to have installed dockutil prior to the execution of this role. See [this issue](https://github.com/buluma/ansible-collection-mac/issues/42) for alternate installation methods, which may be necessary depending on your version of macOS.
+
 ## Dependencies
 
   - (Soft dependency) `buluma.homebrew`
@@ -60,6 +72,7 @@ See the [Mac Development Ansible Playbook](https://github.com/buluma/mac-dev-pla
 Apache-2.0
 
 ## Author Information
+
 This role was created in 2022 by [Michael Buluma](https://buluma.github.io)
 
-The contents of this role were originally created by [Michael Buluma](https://buluma.github.io/).
+The contents of this role were originally created by [@dspolleke](https://github.com/dspolleke) as part of the [`mac-dev-playbook`](https://github.com/buluma/mac-dev-playbook).

roles/dock/defaults/main.yml

@@ -12,3 +12,9 @@ dockitems_persist: []
 # - name: "Sublime Text"
 #   path: "/Applications/Sublime Text.app/"
 #   pos: 5
+
+# Which homebrew cask to install for dockutil
+dockutil_homebrew_cask: hpedrorodrigues/tools/dockutil
+
+# Whether to install dockutil or not
+dockutil_install: true

roles/dock/requirements.yml

@@ -0,0 +1,3 @@
+---
+collections:
+  - name: community.general

roles/dock/tasks/dock-add.yml

@@ -8,7 +8,13 @@
   changed_when: false
   tags: ['dock']
 
-- name: ensure dock item {{ item.name | default(item) }} exists.
+- name: ensure Dock item {{ item.name | default(item) }} exists.
   ansible.builtin.command: "dockutil --add '{{ item.path }}'"
   when: dockitem_exists.rc >0
   tags: ['dock']
+
+- name: pause for 7 seconds between dock changes.
+  ansible.builtin.pause:
+    seconds: 7
+  when: dockitem_exists.rc >0
+  tags: ['dock']

roles/dock/tasks/dock-position.yml

@@ -7,7 +7,7 @@
   changed_when: false
 
 - name: get current dock item position from output.
-  set_fact:
+  ansible.builtin.set_fact:
     current_position: "{{ dock_item_position | regex_replace('^.*slot (.*) in.*$', '\\1') }}"
 
 - name: move dock item to the correct position.

roles/dock/tasks/dock-remove.yml

@@ -1,5 +1,5 @@
 ---
-- name: "check if {{ item }} is in the Dock."
+- name: "see if {{ item }} is in the Dock."
   ansible.builtin.command:
     cmd: dockutil --find '{{ item }}'
   register: dockitem_exists
@@ -14,3 +14,9 @@
     cmd: dockutil --remove '{{ item }}'
   when: dockitem_exists.rc  == 0
   tags: ['dock']
+
+- name: pause for 7 seconds between dock changes.
+  ansible.builtin.pause:
+    seconds: 7
+  when: dockitem_exists.rc == 0
+  tags: ['dock']