Release 1.1 (#11)

* cask is already included with homebrew, and pip3 required to run on my machine (#9)

* Macos catalina (#10)

* add alias for git log --graph

* change glog format

* add more mac os catalina fixes

* update .profile

* remove hub alias, add pyenv eval to profile instead of zshrc

Co-authored-by: Michael Meadows <michaelmeadows@gmail.com>

Author: daveyb

roles/bootstrap/tasks/darwin.yml

@@ -1,9 +1,21 @@
+- name: Install Xcode Command Line Tools Catalina +
+  block:
+    - stat:
+        path: /Library/Developer/CommandLineTools
+      register: xcode
+
+    - name: Install Xcode Command Line Tools w/ UI
+      shell: xcode-select --install
+      when: not xcode.stat.exists
+
+  when: ansible_facts['distribution_version'] is version('10.15.0', '>=')
+
 - name: touch installondemand file
   file:
     state: touch
     path: /tmp/.com.apple.dt.CommandLineTools.installondemand.in-progress
 
-- name: Install Xcode Command Line Tools
+- name: Install Xcode CLI Tools
   shell: |
     PROD=$(softwareupdate -l | grep "\*.*Command Line" | head -n 1 | awk -F"*" '{print $2}' | sed -e 's/^ *//' | tr -d '\n')
     softwareupdate -i "$PROD"
@@ -13,10 +25,10 @@
     state: absent
     path: /tmp/.com.apple.dt.CommandLineTools.installondemand.in-progress
 
-- name: alias xcrun git to git in profile
+- name: alias xcrun git to git in zshrc
   copy:
     dest: "/Users/{{ ansible_user_id }}/.profile"
-    content: aliast git='xcrun git'
+    content: alias git='xcrun git'
 
 - name: ensure homebrew dir exists
   file:
@@ -32,17 +44,14 @@
 
 - name: add homebrew binaries to path
   copy:
-    dest: "/Users/{{ ansible_user_id }}/.profile"
+    dest: "/Users/{{ ansible_user }}/.profile"
     content: PATH=$PATH:/usr/local/homebrew/bin
 
 - name: update homebrew
   homebrew:
     update_homebrew: yes
     upgrade_all: yes
 
-- name: enable homebrew cask
-  shell: brew tap caskroom/cask
-
 - name: install jq
   homebrew:
     name: jq

roles/git/tasks/darwin.yml

@@ -1,5 +1,5 @@
 ---
-- name: install hub for git
+- name: install cli for github
   homebrew:
-    name: hub
+    name: github/gh/gh
     state: latest

roles/git/tasks/linux.yml

@@ -5,7 +5,7 @@
     state: latest
   become: true
 
-- name: Install hub for git
+- name: Install cli for github
   package:
     name: hub
     state: latest

roles/git/tasks/main.yml

@@ -15,8 +15,3 @@
   get_url:
     url: https://gist.githubusercontent.com/octocat/9257657/raw/3f9569e65df83a7b328b39a091f0ce9c6efc6429/.gitignore
     dest: ~/.gitignore
-
-- name: Alias hub to git
-  lineinfile:
-    dest: ~/.profile
-    line: 'eval "$(hub alias -s)"'

roles/git/templates/gitconfig.j2

@@ -10,6 +10,7 @@
   ci = commit
   co = checkout
   slog = log --pretty=format:'%C(white)[%C(yellow)%h%C(white)] %C(blue)(%ad) %C(white)%s %C(green)%an' --date=local
+  glog = log --graph --pretty=oneline --abbrev-commit
   st = status -s
   blame = blame -w
   wtf = blame -w

roles/python/tasks/darwin.yml

@@ -10,5 +10,10 @@
     line: "export PATH=${PATH}:$(pyenv root)/shims"
     regexp: "^export PATH=${PATH}"
 
+- name: Add pyenv to .profile
+  lineinfile:
+    dest: "/Users/{{ ansible_user }}/.profile"
+    line: 'eval "$(pyenv init -)"'
+
 # NOTE: CFLAGS="-I$(xcrun --show-sdk-path)/usr/include" pyenv install 3.7.3
 # If you're getting compilation errors caused by xcode cli tools

roles/zsh/tasks/main.yml

@@ -18,7 +18,14 @@
   lineinfile:
     dest: "~/.zshrc"
     insertafter: BOF 
-    line: 'export PATH=/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin'
+    line: 'export PATH=$PATH:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin'
+    state: present
+
+- name: Shim profile into zshrc
+  lineinfile:
+    dest: "~/.zshrc"
+    insertafter: BOF
+    line: 'source ~/.profile'
     state: present
 
 - name: Set zsh theme
@@ -42,7 +49,7 @@
   become: true
 
 - name: Install powerline
-  shell: pip install --user git+git://github.com/powerline/powerline 
+  shell: pip install --user git+git://github.com/powerline/powerline
   become: true
 
 - name: reload zshrc
@@ -51,11 +58,6 @@
     executable: /usr/bin/zsh
   when: ansible_system == "Linux"
 
-- name: ensure ~/.profile is sourced in zshrc
-  lineinfile:
-    path: "/Users/{{ ansible_user_id }}/.zshrc"
-    line: 'source ~/.profile'
-
 - name: reload zshrc
   shell: "source ~/.zshrc"
   args: