zsh_dots 0.6.0 → 0.6.2

data/config/gitconfig

@@ -11,8 +11,8 @@
 	on = branch
 	br = branch
   co = checkout
-  l = log --graph --pretty=format':%C(yellow)%h%Cblue%d%Creset %s %C(white) %an, %ar%Creset'
-  lol = log --pretty=oneline --abbrev-commit --graph --decorate
+  blog = log --graph --pretty=format':%C(yellow)%h%Cblue%d%Creset %s %C(white) %an, %ar%Creset' --decorate
+  l = !git blog
   unstage = reset HEAD
   staged = diff --cached
   unstaged = diff
@@ -29,6 +29,7 @@
   ship = !git to-master
   rename-branch = !export GIT_BRANCH=`git current-branch` && git checkout master && git branch -m $GIT_BRANCH $1
   delete-branch = !export GIT_BRANCH=`git current-branch` && git checkout master && git branch -D $GIT_BRANCH
+  prepare = rebase --interactive origin/master
 [apply]
   whitespace = warn
 [color]

data/config/gitignore

@@ -102,3 +102,6 @@ bin/
 _yardoc
 doc/
 bin/
+
+# CTags
+tags

data/config/vimrc

@@ -144,6 +144,9 @@ let Grep_Skip_Dirs = 'RCS CVS SCCS .svn generated .sass-cache .git'
 set grepprg=/bin/grep\ -nH
 " Enforce Ruby 1.9 syntax on this line
 map <leader>h :s/:\([a-z0-9_]\+\)\s*=>/\1: /g<cr>
+" Easy saving of files
+nnoremap Z :w<cr>
+nnoremap ZZ :wq<cr>
 
 
 ""
@@ -245,6 +248,10 @@ set background=light
 map <C-t> :CommandT<cr>
 " Pressing ,ss will toggle and untoggle spell checking
 map <leader>ss :setlocal spell!<cr>
+" Alternate between tabs
+map <leader>m :tabn<cr>
+map <C-s> :w<cr>
+map <leader>s :w<cr>
 
 " Remap :W => :w to avoid errors
 command! W w
@@ -256,7 +263,7 @@ command! W w
 let g:vroom_use_binstubs = 1
 let g:vroom_use_colors = 1
 let g:vroom_map_keys = 0
-let g:vroom_spec_command = 'rspec --format=documentation '
+let g:vroom_spec_command = 'bundle exec rspec --format=documentation '
 let g:vroom_test_unit_command = 'bundle exec ruby -Itest '
 "let g:vroom_test_unit_command = 'rtest '
 

data/lib/plugins/git/git.plugin.zsh

@@ -1,36 +1,29 @@
 # Aliases
 alias g='git'
 compdef g=git
-alias gst='git status'
-compdef _git gst=git-status
+
+# Branching
 alias gu='git pull'
 compdef _git gl=git-pull
 alias gur='git pull --rebase'
 compdef _git gl=git-pull
-alias gup='git fetch && git rebase'
-compdef _git gup=git-fetch
 alias gp='git push'
 compdef _git gp=git-push
 alias gpf='git push tubbo'
 compdef _git gpf=git-push
 gdv() { git diff -w "$@" | view - }
 compdef _git gdv=git-diff
-alias gc='git commit -v'
-compdef _git gc=git-commit
-alias gca='git commit -v -a'
-compdef _git gca=git-commit
 alias gco='git checkout'
 compdef _git gco=git-checkout
-alias gcm='git checkout master'
 alias gb='git branch'
 compdef _git gb=git-branch
 alias gba='git branch -a'
 compdef _git gba=git-branch
-alias gcount='git shortlog -sn'
-compdef gcount=git
-alias gcp='git cherry-pick'
-compdef _git gcp=git-cherry-pick
-alias gl='git l'
+alias gm='git merge'
+compdef _git gm=git-merge
+
+# Logging and Viewing
+alias gl='git blog'
 compdef _git glg=git-log
 alias gls='git log --stat --max-count=5'
 compdef _git gls=git-log
@@ -38,22 +31,28 @@ alias glg='git log --graph --max-count=5'
 compdef _git glg=git-log
 alias lol='git lol'
 compdef _git lol=git-log
+alias gcount='git shortlog -sn'
+compdef gcount=git
+alias gst='git status'
+compdef _git gst=git-status
 alias gsts='git status -s'
 compdef _git gss=git-status
-alias ga='git add'
-compdef _git ga=git-add
-alias gm='git merge'
-compdef _git gm=git-merge
-alias gls="git l"
-compdef _git gls=git-log
-alias grv='git remote -v'
-compdef _get grv=git-remote
 alias gd='git diff'
 compdef _get grv=git-diff
 alias gg='git grep'
 compdef _get gg=git-grep
 alias gbl='git blame'
 compdef _get gbl=git-blame
+
+# Manipulation
+alias gcp='git cherry-pick'
+compdef _git gcp=git-cherry-pick
+alias ga='git add'
+compdef _git ga=git-add
+alias gls="git l"
+compdef _git gls=git-log
+alias grv='git remote -v'
+compdef _get grv=git-remote
 alias gt='git reset'
 compdef _get gt=git-reset
 alias gth='git reset --hard'
@@ -62,6 +61,10 @@ alias gts='git reset --soft'
 compdef _get gt=git-reset
 alias gthh='git reset --hard HEAD'
 compdef _get gt=git-reset
+alias gc='git commit -v'
+compdef _git gc=git-commit
+alias gca='git commit -v -a'
+compdef _git gca=git-commit
 
 # Stash
 alias gs='git stash save'
@@ -69,7 +72,7 @@ compdef _get gsh=git-stash
 alias gsp='git stash pop'
 compdef _get gsh=git-stash
 
-# Merging and Rebasing
+# Rebase
 alias gr='git rebase'
 compdef _get gg=git-rebase
 alias grc='git rebase --continue'

data/lib/ruby/dots/version.rb

@@ -1,3 +1,3 @@
 module Dots
-  VERSION = "0.6.0"
+  VERSION = "0.6.2"
 end

metadata

@@ -1,59 +1,59 @@
 --- !ruby/object:Gem::Specification
 name: zsh_dots
 version: !ruby/object:Gem::Version
+  version: 0.6.2
   prerelease: 
-  version: 0.6.0
 platform: ruby
 authors:
 - Tom Scott
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-28 00:00:00.000000000 Z
+date: 2013-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: thor
+  type: :runtime
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
+  name: activemodel
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: activemodel
+  type: :runtime
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  type: :development
-  version_requirements: !ruby/object:Gem::Requirement
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: rake
+  type: :development
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -92,7 +92,6 @@ files:
 - config/vimrc
 - config/zshenv
 - config/zshrc
-- etc/irssi/config
 - etc/irssi/config.example
 - etc/irssi/default.theme
 - etc/irssi/nickserv.networks
@@ -163,9 +162,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      segments:
-      - 0
-      hash: -4117296198963250433
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false