bug/homebrew dir (#27)

* add privs, add gh cli

* fix mac bugs, remove old software, add wsl defaults

Co-authored-by: Dave <dave.benedic@insight.com>

Author: daveyb

roles/bootstrap/tasks/darwin.yml

@@ -30,21 +30,30 @@
     dest: "/Users/{{ ansible_user_id }}/.profile"
     content: alias git='xcrun git'
 
-- name: ensure homebrew dir exists
-  file:
-    path: /usr/local/homebrew
-    state: directory
-    mode: 0755
-    owner: "{{ ansible_user_id }}"
-    group: "{{ ansible_user_gid }}"
-  become: yes
+- name: curl homebrew
+  block:
+    - stat:
+        path: /usr/local/homebrew
+      register: homebrew
 
-- name: install homebrew
-  shell: cd /usr/local/src && curl -L https://github.com/Homebrew/brew/tarball/master | tar xz --strip 1 -C /usr/local/homebrew
+    - shell: rm -rf /usr/local/homebrew
+      when: homebrew.stat.exists
+      become: yes
+
+    - name: ensure homebrew dir exists
+      file:
+        path: /usr/local/homebrew
+        state: directory
+        mode: 0755
+        owner: "{{ ansible_user_id }}"
+        group: "{{ ansible_user_gid }}"
+      become: yes
+
+    - shell: cd /usr/local/src && curl -L https://github.com/Homebrew/brew/tarball/master | tar xz --strip 1 -C /usr/local/homebrew
 
 - name: add homebrew binaries to path
   copy:
-    dest: "/Users/{{ ansible_user }}/.profile"
+    dest: "/Users/{{ ansible_user_id }}/.profile"
     content: PATH=$PATH:/usr/local/homebrew/bin
 
 - name: update homebrew

roles/git/tasks/darwin.yml

@@ -1,7 +1,7 @@
 ---
 - name: install cli for github
   homebrew:
-    name: github/gh/gh
+    name: gh
     state: latest
 
 # http://pre-commit.com

roles/git/tasks/main.yml

@@ -7,7 +7,7 @@
 
 - name: set fact for wsl environment
   set_fact:
-    wsl_environment: "{{ wsl_environment }}"
+    wsl_environment: "{{ wsl_environment | default('false') }}"
 
 - name: template gitconfig
   template:

roles/misc/tasks/darwin.yml

@@ -4,21 +4,11 @@
     name: the_silver_searcher
     state: latest
 
-- name: install royal-tsx
-  shell: brew cask install royal-tsx
-
-- name: install slack
-  shell: brew cask install slack
-  ignore_errors: yes # preinstalled version causing error
-
 - name: install fswatch
   homebrew:
     name: fswatch
     state: latest
 
-- name: install vagrant
-  shell: brew cask install vagrant
-
 - name: autohide OSX dock
   shell: defaults write com.apple.dock autohide true
   notify: restart dock
@@ -51,3 +41,13 @@
   homebrew:
     name: direnv
     state: latest
+
+- name: check if privileges cli app is installed (corporate nanny)
+  command: /Applications/Privileges.app/Contents/Resources/PrivilegesCLI --help
+  register: privs_install_check
+
+- name: add privileges app alias
+  lineinfile:
+    dest: "~/.zshrc"
+    line : alias privs=/Applications/Privileges.app/Contents/Resources/PrivilegesCLI
+  when: privs_install_check.rc == 1

roles/python/tasks/darwin.yml

@@ -6,13 +6,13 @@
 
 - name: shim pyenv into ~/.profile
   lineinfile:
-    path: "/Users/{{ ansible_user }}/.profile"
+    path: "/Users/{{ ansible_user_id }}/.profile"
     line: "export PATH=${PATH}:$(pyenv root)/shims"
     regexp: "^export PATH=${PATH}"
 
 - name: Add pyenv to .profile
   lineinfile:
-    dest: "/Users/{{ ansible_user }}/.profile"
+    dest: "/Users/{{ ansible_user_id }}/.profile"
     line: 'eval "$(pyenv init -)"'
 
 # NOTE: CFLAGS="-I$(xcrun --show-sdk-path)/usr/include" pyenv install 3.7.3

roles/vim/tasks/main.yml

@@ -29,7 +29,7 @@
 
 - name: set fact for wsl environment
   set_fact:
-    wsl_environment: "{{ wsl_environment }}"
+    wsl_environment: "{{ wsl_environment | default('false') }}"
 
 - name: template vimrc
   template:
@@ -41,26 +41,31 @@
   git:
     repo: 'https://github.com/scrooloose/nerdtree.git'
     dest: ~/.vim/bundle/nerdtree
+    force: yes
 
 - name: clone vim-sensible to ~/.vim/bundle/
   git:
     repo: 'https://github.com/tpope/vim-sensible.git'
     dest: ~/.vim/bundle/vim-sensible
+    force: yes
 
 - name: clone vim-airline to ~/.vim/bundle/
   git:
     repo: https://github.com/vim-airline/vim-airline
     dest: ~/.vim/bundle/vim-airline
+    force: yes
 
 - name: clone vim-mustache-handlebars to ~/.vim/bundle
   git:
     repo: https://github.com/mustache/vim-mustache-handlebars.git
     dest: ~/.vim/bundle/vim-mustache-handlebars
+    force: yes
 
 - name: clone vim-easy-align to ~/.vim/bundle/
   git:
     repo: https://github.com/junegunn/vim-easy-align
     dest: ~/.vim/bundle/vim-easy-align
+    force: yes
 
 - name: clone vim-ShowTrailingWhitespace to ~/.vim/bundle/
   git:

roles/zsh/tasks/darwin.yml

@@ -8,3 +8,11 @@
   homebrew:
     name: direnv
     state: latest
+
+- name: ensure ~/.bash_profile exists
+  file:
+    path: "/Users/{{ ansible_user_id }}/.bash_profile"
+    state: touch
+    mode: 0755
+    owner: "{{ ansible_user_id }}"
+    group: "{{ ansible_user_gid }}"