Merge branch 'master' of github.com:square/maximum-awesome

Author: kevunix

README.md

@@ -5,16 +5,16 @@ peace-loving hippies. Built for Mac OS X.
 
 ## What's in it?
 
-* [MacVim](https://code.google.com/p/macvim/) (independent or for use in a terminal)
+* [MacVim](https://github.com/macvim-dev/macvim) (independent or for use in a terminal)
 * [iTerm 2](http://www.iterm2.com/)
-* [tmux](http://tmux.sourceforge.net/)
+* [tmux](http://tmux.github.io/)
 * Awesome syntax highlighting with the [Solarized color scheme](http://ethanschoonover.com/solarized)
-* Want to know more? [Fly Vim, First Class](http://corner.squareup.com/2013/08/fly-vim-first-class.html)
+* Want to know more? [Fly Vim, First Class](https://corner.squareup.com/2013/08/fly-vim-first-class.html)
 
 ### vim
 
 * `,d` brings up [NERDTree](https://github.com/scrooloose/nerdtree), a sidebar buffer for navigating and manipulating files
-* `,t` brings up [ctrlp.vim](https://github.com/kien/ctrlp.vim), a project file filter for easily opening specific files
+* `,t` brings up [ctrlp.vim](https://github.com/ctrlpvim/ctrlp.vim), a project file filter for easily opening specific files
 * `,b` restricts ctrlp.vim to open buffers
 * `,a` starts project search with [ag.vim](https://github.com/rking/ag.vim) using [the silver searcher](https://github.com/ggreer/the_silver_searcher) (like ack, but faster)
 * `ds`/`cs` delete/change surrounding characters (e.g. `"Hey!"` + `ds"` = `Hey!`, `"Hey!"` + `cs"'` = `'Hey!'`) with [vim-surround](https://github.com/tpope/vim-surround)
@@ -44,6 +44,15 @@ You can adjust the size of the smaller panes in `tmux.conf` by lowering or incre
 
     rake
 
+## Update
+
+    rake
+
+This will update all installed plugins using Vundle's `:PluginInstall!`
+command. Any errors encountered during this process may be resolved by clearing
+out the problematic directories in ~/.vim/bundle. `:help PluginInstall`
+provides more detailed information about Vundle.
+
 ## Customize
 In your home directory, Maximum Awesome creates `.vimrc.local`, `.vimrc.bundles.local` and `.tmux.conf.local` files where you can customize
 Vim and tmux to your heart’s content. However, we’d love to incorporate your changes and improve Vim and tmux

Rakefile

@@ -10,16 +10,19 @@ def brew_install(package, *args)
   elsif options[:requires]
     # brew did not error out, verify tmux is greater than 1.8
     # e.g. brew_tmux_query = 'tmux 1.9a'
-    installed_version = versions.split(/\n/).first.split(' ')[1]
-    unless version_match?(options[:version], installed_version)
+    installed_version = versions.split(/\n/).first.split(' ').last
+    unless version_match?(options[:requires], installed_version)
       sh "brew upgrade #{package} #{args.join ' '}"
     end
   end
 end
 
 def version_match?(requirement, version)
   # This is a hack, but it lets us avoid a gem dep for version checking.
-  Gem::Dependency.new('', requirement).match?('', version)
+  # Gem dependencies must be numeric, so we remove non-numeric characters here.
+  matches = version.match(/(?<versionish>\d+\.\d+)/)
+  return false unless matches.length > 0
+  Gem::Dependency.new('', requirement).match?('', matches.captures[0])
 end
 
 def install_github_bundle(user, package)
@@ -32,7 +35,7 @@ def brew_cask_install(package, *options)
   output = `brew cask info #{package}`
   return unless output.include?('Not installed')
 
-  sh "brew cask install #{package} #{options.join ' '}"
+  sh "brew cask install --binarydir=#{`brew --prefix`.chomp}/bin #{package} #{options.join ' '}"
 end
 
 def step(description)
@@ -128,11 +131,9 @@ namespace :install do
   task :brew_cask do
     step 'Homebrew Cask'
     system('brew untap phinze/cask') if system('brew tap | grep phinze/cask > /dev/null')
-    unless system('brew tap | grep caskroom/cask > /dev/null') || system('brew tap caskroom/homebrew-cask')
-      abort "Failed to tap caskroom/homebrew-cask in Homebrew."
+    unless system('brew tap | grep caskroom/cask > /dev/null') || system('brew tap caskroom/cask')
+      abort "Failed to tap caskroom/cask in Homebrew."
     end
-
-    brew_install 'brew-cask'
   end
 
   desc 'Install The Silver Searcher'
@@ -165,7 +166,7 @@ namespace :install do
   task :tmux do
     step 'tmux'
     # tmux copy-pipe function needs tmux >= 1.8
-    brew_install 'tmux', :requires => '>= 1.8'
+    brew_install 'tmux', :requires => '>= 2.1'
   end
 
   desc 'Install MacVim'
@@ -183,6 +184,7 @@ namespace :install do
       puts %{  echo 'export PATH="~/bin:$PATH"' >> ~/.bashrc}
       puts
       puts 'The exact command and file will vary by your shell and configuration.'
+      puts 'You may need to restart your shell.'
     end
 
     FileUtils.mkdir_p(bin_dir)
@@ -199,8 +201,8 @@ exec /usr/bin/Vim "$@"
   desc 'Install Vundle'
   task :vundle do
     step 'vundle'
-    install_github_bundle 'gmarik','vundle'
-    sh '~/bin/vim -c "BundleInstall" -c "q" -c "q"'
+    install_github_bundle 'VundleVim','Vundle.vim'
+    sh '~/bin/vim -c "PluginInstall!" -c "q" -c "q"'
   end
 end
 

tmux.conf

@@ -11,9 +11,7 @@ bind-key R source-file ~/.tmux.conf \; display-message "tmux.conf reloaded."
 setw -g mode-keys vi
 
 # mouse behavior
-setw -g mode-mouse on
-set -g mouse-select-pane on
-set -g mouse-resize-pane on
+set -g mouse on
 
 set-option -g default-terminal screen-256color
 
@@ -26,20 +24,20 @@ bind-key bspace previous-window
 bind-key enter next-layout
 
 # use vim-like keys for splits and windows
-bind-key v split-window -h
-bind-key s split-window -v
+bind-key v split-window -h -c "#{pane_current_path}"
+bind-key s split-window -v -c "#{pane_current_path}"
 bind-key h select-pane -L
 bind-key j select-pane -D
 bind-key k select-pane -U
 bind-key l select-pane -R
 
-# smart pane switching with awareness of vim splits
-bind -n C-h run "(tmux display-message -p '#{pane_current_command}' | grep -iqE '(^|\/)vim$' && tmux send-keys C-h) || tmux select-pane -L"
-bind -n C-j run "(tmux display-message -p '#{pane_current_command}' | grep -iqE '(^|\/)vim$' && tmux send-keys C-j) || tmux select-pane -D"
-bind -n C-k run "(tmux display-message -p '#{pane_current_command}' | grep -iqE '(^|\/)vim$' && tmux send-keys C-k) || tmux select-pane -U"
-bind -n C-l run "(tmux display-message -p '#{pane_current_command}' | grep -iqE '(^|\/)vim$' && tmux send-keys C-l) || tmux select-pane -R"
-bind -n C-\ run "(tmux display-message -p '#{pane_current_command}' | grep -iqE '(^|\/)vim$' && tmux send-keys 'C-\\') || tmux select-pane -l"
-bind C-l send-keys 'C-l'
+# uncomment below stanza to enable smart pane switching with awareness of vim splits
+# bind -n C-h run "(tmux display-message -p '#{pane_current_command}' | grep -iqE '(^|\/)vim$' && tmux send-keys C-h) || tmux select-pane -L"
+# bind -n C-j run "(tmux display-message -p '#{pane_current_command}' | grep -iqE '(^|\/)vim$' && tmux send-keys C-j) || tmux select-pane -D"
+# bind -n C-k run "(tmux display-message -p '#{pane_current_command}' | grep -iqE '(^|\/)vim$' && tmux send-keys C-k) || tmux select-pane -U"
+# bind -n C-l run "(tmux display-message -p '#{pane_current_command}' | grep -iqE '(^|\/)vim$' && tmux send-keys C-l) || tmux select-pane -R"
+# bind -n C-\ run "(tmux display-message -p '#{pane_current_command}' | grep -iqE '(^|\/)vim$' && tmux send-keys 'C-\\') || tmux select-pane -l"
+# bind C-l send-keys 'C-l'
 
 bind-key C-o rotate-window
 
@@ -94,4 +92,13 @@ set-option -g default-command "/bin/zsh -c 'which reattach-to-user-namespace >/d
 # Allow the arrow key to be used immediately after changing windows
 set-option -g repeat-time 0
 
+# Fix to allow mousewheel/trackpad scrolling in tmux 2.1
+bind-key -T root WheelUpPane if-shell -F -t = "#{alternate_on}" "send-keys -M" "select-pane -t =; copy-mode -e; send-keys -M"
+bind-key -T root WheelDownPane if-shell -F -t = "#{alternate_on}" "send-keys -M" "select-pane -t =; send-keys -M"
+
+# Disable assume-paste-time, so that iTerm2's "Send Hex Codes" feature works
+# with tmux 2.1. This is backwards-compatible with earlier versions of tmux,
+# AFAICT.
+set-option -g assume-paste-time 0
+
 source-file ~/.tmux.conf.local

vim/snippets/javascript/func.snippet

@@ -0,0 +1,3 @@
+function(${1}) {
+  ${2}
+}

vim/snippets/javascript/itin.snippet

@@ -0,0 +1,3 @@
+for (var ${1} in ${2}) {
+  ${3}
+}

vim/snippets/javascript/us.snippet

@@ -0,0 +1,2 @@
+'use strict';
+${1}

vimrc

@@ -7,15 +7,17 @@ syntax enable
 " configure Vundle
 filetype on " without this vim emits a zero exit status, later, because of :ft off
 filetype off
-set rtp+=~/.vim/bundle/vundle/
-call vundle#rc()
+set rtp+=~/.vim/bundle/Vundle.vim
+call vundle#begin()
 
 " install Vundle bundles
 if filereadable(expand("~/.vimrc.bundles"))
   source ~/.vimrc.bundles
   source ~/.vimrc.bundles.local
 endif
 
+call vundle#end()
+
 " ensure ftdetect et al work by including this after the Vundle stuff
 filetype plugin indent on
 
@@ -67,7 +69,6 @@ nnoremap <leader>T :CtrlPClearCache<CR>:CtrlP<CR>
 nnoremap <leader>] :TagbarToggle<CR>
 nnoremap <leader><space> :call whitespace#strip_trailing()<CR>
 nnoremap <leader>g :GitGutterToggle<CR>
-nnoremap <leader>c <Plug>Kwbd
 noremap <silent> <leader>V :source ~/.vimrc<CR>:filetype detect<CR>:exe ":echo 'vimrc reloaded'"<CR>
 
 " in case you forgot to sudo

vimrc.bundles

@@ -1,43 +1,44 @@
-" Bundles here are part of the CORE Maximum Awesome setup
+" Plugins here are part of the CORE Maximum Awesome setup
 " Do NOT add bundles to this list, as they might get removed when you upgrade
 " Maximum Awesome.
 " Please create ~/.vimrc.bundles.local and add any extra bundles you want there
-Bundle 'airblade/vim-gitgutter'
-Bundle 'altercation/vim-colors-solarized'
-Bundle 'austintaylor/vim-indentobject'
-Bundle 'christoomey/vim-tmux-navigator'
-Bundle 'gmarik/vundle'
-Bundle 'juvenn/mustache.vim'
-Bundle 'kchmck/vim-coffee-script'
-Bundle 'kien/ctrlp.vim'
-Bundle 'leafgarland/typescript-vim'
-Bundle 'majutsushi/tagbar'
-Bundle 'rking/ag.vim'
-Bundle 'garbas/vim-snipmate'
-Bundle 'MarcWeber/vim-addon-mw-utils'
-Bundle 'tomtom/tlib_vim'
-Bundle 'nathanaelkane/vim-indent-guides'
-Bundle 'nono/vim-handlebars'
-Bundle 'pangloss/vim-javascript'
-Bundle 'wookiehangover/jshint.vim'
-Bundle 'scrooloose/nerdtree'
-Bundle 'scrooloose/syntastic'
-Bundle 'slim-template/vim-slim'
-Bundle 'tpope/vim-bundler'
-Bundle 'tpope/vim-commentary'
-Bundle 'tpope/vim-cucumber'
-Bundle 'tpope/vim-endwise'
-Bundle 'tpope/vim-fugitive'
-Bundle 'tpope/vim-pastie'
-Bundle 'tpope/vim-ragtag'
-Bundle 'tpope/vim-rails'
-Bundle 'tpope/vim-repeat'
-Bundle 'tpope/vim-surround'
-Bundle 'tpope/vim-unimpaired'
-Bundle 'tpope/vim-vividchalk'
-Bundle 'eventualbuddha/vim-protobuf'
-Bundle 'vim-ruby/vim-ruby'
-Bundle 'vim-scripts/Align'
-Bundle 'vim-scripts/greplace.vim'
-Bundle 'vim-scripts/matchit.zip'
-Bundle 'flazz/vim-colorschemes'
+Plugin 'VundleVim/Vundle.vim'
+Plugin 'airblade/vim-gitgutter'
+Plugin 'altercation/vim-colors-solarized'
+Plugin 'austintaylor/vim-indentobject'
+Plugin 'christoomey/vim-tmux-navigator'
+Plugin 'juvenn/mustache.vim'
+Plugin 'kchmck/vim-coffee-script'
+Plugin 'ctrlpvim/ctrlp.vim'
+Plugin 'leafgarland/typescript-vim'
+Plugin 'majutsushi/tagbar'
+Plugin 'rking/ag.vim'
+Plugin 'garbas/vim-snipmate'
+Plugin 'MarcWeber/vim-addon-mw-utils'
+Plugin 'tomtom/tlib_vim'
+Plugin 'nathanaelkane/vim-indent-guides'
+Plugin 'nono/vim-handlebars'
+Plugin 'pangloss/vim-javascript'
+Plugin 'wookiehangover/jshint.vim'
+Plugin 'scrooloose/nerdtree'
+Plugin 'scrooloose/syntastic'
+Plugin 'slim-template/vim-slim'
+Plugin 'tpope/vim-bundler'
+Plugin 'tpope/vim-commentary'
+Plugin 'tpope/vim-cucumber'
+Plugin 'tpope/vim-dispatch'
+Plugin 'tpope/vim-endwise'
+Plugin 'tpope/vim-fugitive'
+Plugin 'tpope/vim-pastie'
+Plugin 'tpope/vim-ragtag'
+Plugin 'tpope/vim-rails'
+Plugin 'tpope/vim-repeat'
+Plugin 'tpope/vim-surround'
+Plugin 'tpope/vim-unimpaired'
+Plugin 'tpope/vim-vividchalk'
+Plugin 'eventualbuddha/vim-protobuf'
+Plugin 'vim-ruby/vim-ruby'
+Plugin 'vim-scripts/Align'
+Plugin 'vim-scripts/greplace.vim'
+Plugin 'vim-scripts/matchit.zip'
+Plugin 'flazz/vim-colorschemes'