From 650822507fb7ca92dd923a33ae13f088511814fd Mon Sep 17 00:00:00 2001 From: Riku Takeuchi Date: Mon, 1 May 2023 00:25:43 +0900 Subject: [PATCH 1/3] chore: move appstore into macos --- .provision/playbook.yml | 6 +++--- .provision/roles/appstore/tasks/main.yml | 2 -- .provision/roles/{appstore => macos}/spec/appstore_spec.rb | 0 .../{appstore/tasks/mas.yml => macos/tasks/appstore.yml} | 3 ++- .provision/roles/macos/tasks/main.yml | 2 ++ 5 files changed, 7 insertions(+), 6 deletions(-) delete mode 100644 .provision/roles/appstore/tasks/main.yml rename .provision/roles/{appstore => macos}/spec/appstore_spec.rb (100%) rename .provision/roles/{appstore/tasks/mas.yml => macos/tasks/appstore.yml} (93%) create mode 100644 .provision/roles/macos/tasks/main.yml diff --git a/.provision/playbook.yml b/.provision/playbook.yml index c67f348..9f49d90 100644 --- a/.provision/playbook.yml +++ b/.provision/playbook.yml @@ -15,13 +15,13 @@ - role: gui tags: gui -- name: appstore +- name: macos hosts: localhost connection: local gather_facts: yes roles: - - role: appstore - tags: appstore + - role: macos + tags: macos - name: os hosts: localhost diff --git a/.provision/roles/appstore/tasks/main.yml b/.provision/roles/appstore/tasks/main.yml deleted file mode 100644 index e2b2fed..0000000 --- a/.provision/roles/appstore/tasks/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -- import_tasks: mas.yml diff --git a/.provision/roles/appstore/spec/appstore_spec.rb b/.provision/roles/macos/spec/appstore_spec.rb similarity index 100% rename from .provision/roles/appstore/spec/appstore_spec.rb rename to .provision/roles/macos/spec/appstore_spec.rb diff --git a/.provision/roles/appstore/tasks/mas.yml b/.provision/roles/macos/tasks/appstore.yml similarity index 93% rename from .provision/roles/appstore/tasks/mas.yml rename to .provision/roles/macos/tasks/appstore.yml index e40abb5..04ac07b 100644 --- a/.provision/roles/appstore/tasks/mas.yml +++ b/.provision/roles/macos/tasks/appstore.yml @@ -1,6 +1,7 @@ --- - name: Install mas packages - shell: "mas install {{ item.id }}" + mas: + id: "{{ item.id }}" with_items: - { name: BetterSnapTool, id: 417375580 } - { name: Evernote, id: 406056744 } diff --git a/.provision/roles/macos/tasks/main.yml b/.provision/roles/macos/tasks/main.yml new file mode 100644 index 0000000..ff28696 --- /dev/null +++ b/.provision/roles/macos/tasks/main.yml @@ -0,0 +1,2 @@ +--- +- import_tasks: appstore.yml From e230260fbfd55c64d3389d46bcfaaa732b462b3d Mon Sep 17 00:00:00 2001 From: Riku Takeuchi Date: Mon, 1 May 2023 10:24:05 +0900 Subject: [PATCH 2/3] chore: move os into macos --- .provision/playbook.yml | 11 +---------- .provision/roles/{os => macos}/spec/os_spec.rb | 0 .provision/roles/macos/tasks/main.yml | 3 +++ .../roles/{os/tasks/main.yml => macos/tasks/os.yml} | 0 4 files changed, 4 insertions(+), 10 deletions(-) rename .provision/roles/{os => macos}/spec/os_spec.rb (100%) rename .provision/roles/{os/tasks/main.yml => macos/tasks/os.yml} (100%) diff --git a/.provision/playbook.yml b/.provision/playbook.yml index 9f49d90..6119b1a 100644 --- a/.provision/playbook.yml +++ b/.provision/playbook.yml @@ -16,14 +16,6 @@ tags: gui - name: macos - hosts: localhost - connection: local - gather_facts: yes - roles: - - role: macos - tags: macos - -- name: os hosts: localhost connection: local gather_facts: yes @@ -33,5 +25,4 @@ - name: "Restart Finder" shell: "killall Finder" roles: - - role: os - tags: os + - role: macos diff --git a/.provision/roles/os/spec/os_spec.rb b/.provision/roles/macos/spec/os_spec.rb similarity index 100% rename from .provision/roles/os/spec/os_spec.rb rename to .provision/roles/macos/spec/os_spec.rb diff --git a/.provision/roles/macos/tasks/main.yml b/.provision/roles/macos/tasks/main.yml index ff28696..0b8a1c4 100644 --- a/.provision/roles/macos/tasks/main.yml +++ b/.provision/roles/macos/tasks/main.yml @@ -1,2 +1,5 @@ --- - import_tasks: appstore.yml + tags: appstore +- import_tasks: os.yml + tags: os diff --git a/.provision/roles/os/tasks/main.yml b/.provision/roles/macos/tasks/os.yml similarity index 100% rename from .provision/roles/os/tasks/main.yml rename to .provision/roles/macos/tasks/os.yml From 12e4d33225b043bed15874e0b1c24c1ff1e943f0 Mon Sep 17 00:00:00 2001 From: Riku Takeuchi Date: Mon, 1 May 2023 10:33:06 +0900 Subject: [PATCH 3/3] chore: move gui into macos --- .provision/playbook.yml | 8 -------- .provision/roles/gui/tasks/main.yml | 2 -- .provision/roles/{gui => macos}/spec/gui_spec.rb | 0 .provision/roles/macos/tasks/command.yml | 6 ++++++ .../{gui/tasks/homebrew.yml => macos/tasks/gui.yml} | 13 +++---------- .provision/roles/macos/tasks/main.yml | 3 +++ 6 files changed, 12 insertions(+), 20 deletions(-) delete mode 100644 .provision/roles/gui/tasks/main.yml rename .provision/roles/{gui => macos}/spec/gui_spec.rb (100%) create mode 100644 .provision/roles/macos/tasks/command.yml rename .provision/roles/{gui/tasks/homebrew.yml => macos/tasks/gui.yml} (60%) diff --git a/.provision/playbook.yml b/.provision/playbook.yml index 6119b1a..0a0cb24 100644 --- a/.provision/playbook.yml +++ b/.provision/playbook.yml @@ -7,14 +7,6 @@ - role: cui tags: cui -- name: gui - hosts: localhost - connection: local - gather_facts: yes - roles: - - role: gui - tags: gui - - name: macos hosts: localhost connection: local diff --git a/.provision/roles/gui/tasks/main.yml b/.provision/roles/gui/tasks/main.yml deleted file mode 100644 index f9dfc71..0000000 --- a/.provision/roles/gui/tasks/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -- import_tasks: homebrew.yml diff --git a/.provision/roles/gui/spec/gui_spec.rb b/.provision/roles/macos/spec/gui_spec.rb similarity index 100% rename from .provision/roles/gui/spec/gui_spec.rb rename to .provision/roles/macos/spec/gui_spec.rb diff --git a/.provision/roles/macos/tasks/command.yml b/.provision/roles/macos/tasks/command.yml new file mode 100644 index 0000000..e27b522 --- /dev/null +++ b/.provision/roles/macos/tasks/command.yml @@ -0,0 +1,6 @@ +--- +- name: Install mas which is package manager of Mac App Store + homebrew: + name: "{{ item.name }}" + with_items: + - { name: mas } diff --git a/.provision/roles/gui/tasks/homebrew.yml b/.provision/roles/macos/tasks/gui.yml similarity index 60% rename from .provision/roles/gui/tasks/homebrew.yml rename to .provision/roles/macos/tasks/gui.yml index 30d5b42..fc5f386 100644 --- a/.provision/roles/gui/tasks/homebrew.yml +++ b/.provision/roles/macos/tasks/gui.yml @@ -1,15 +1,7 @@ +--- - name: Tap brew packages homebrew_tap: name: "homebrew/cask-fonts" -- name: Install font - homebrew_cask: - name: font-fira-code-nerd-font - -- name: Install mas which is package manager of Mac App Store - homebrew: - name: "{{ item.name }}" - with_items: - - { name: mas } - name: Install brew cask packages homebrew_cask: @@ -18,6 +10,7 @@ - { name: clipy } - { name: docker } - { name: drawio } + - { name: dynalist } + - { name: font-fira-code-nerd-font } - { name: google-chrome } - { name: typora } - - { name: dynalist } diff --git a/.provision/roles/macos/tasks/main.yml b/.provision/roles/macos/tasks/main.yml index 0b8a1c4..45c9850 100644 --- a/.provision/roles/macos/tasks/main.yml +++ b/.provision/roles/macos/tasks/main.yml @@ -3,3 +3,6 @@ tags: appstore - import_tasks: os.yml tags: os +- import_tasks: command.yml +- import_tasks: gui.yml + tags: gui