@@ -32,12 +32,14 @@ zstyle ':completion:*:cd:*' tag-order local-directories directory-stack path-dir

 cdpath=(.)

 # use /etc/hosts and known_hosts for hostname completion

+[ -r /etc/ssh/ssh_known_hosts ] && _global_ssh_hosts=(${${${${(f)"$(</etc/ssh/ssh_known_hosts)"}:#[\|]*}%%\ *}%%,*}) || _ssh_hosts=()

 [ -r ~/.ssh/known_hosts ] && _ssh_hosts=(${${${${(f)"$(<$HOME/.ssh/known_hosts)"}:#[\|]*}%%\ *}%%,*}) || _ssh_hosts=()

 [ -r /etc/hosts ] && : ${(A)_etc_hosts:=${(s: :)${(ps:\t:)${${(f)~~"$(</etc/hosts)"}%%\#*}##[:blank:]#[^[:blank:]]#}}} || _etc_hosts=()

 hosts=(

+  "$_global_ssh_hosts[@]"

   "$_ssh_hosts[@]"

   "$_etc_hosts[@]"

-  `hostname`

+  "$HOST"

   localhost

 )

 zstyle ':completion:*:hosts' hosts $hosts

@@ -3,11 +3,11 @@ function zsh_stats() {

 }

 function uninstall_oh_my_zsh() {

-  /bin/sh $ZSH/tools/uninstall.sh

+  /usr/bin/env ZSH=$ZSH /bin/sh $ZSH/tools/uninstall.sh

 }

 function upgrade_oh_my_zsh() {

-  /bin/sh $ZSH/tools/upgrade.sh

+  /usr/bin/env ZSH=$ZSH /bin/sh $ZSH/tools/upgrade.sh

 }

 function take() {

@@ -9,15 +9,21 @@ function disable_git_prompt_info() {

   GIT_PROMPT_DISABLED=1

 }

+

 # Checks if working tree is dirty

 parse_git_dirty() {

-  if [[ -n $(git status -s 2> /dev/null) ]]; then

+  local SUBMODULE_SYNTAX=''

+  if [[ $POST_1_7_2_GIT -gt 0 ]]; then

+        SUBMODULE_SYNTAX="--ignore-submodules=dirty"

+  fi

+  if [[ -n $(git status -s ${SUBMODULE_SYNTAX}  2> /dev/null) ]]; then

     echo "$ZSH_THEME_GIT_PROMPT_DIRTY"

   else

     echo "$ZSH_THEME_GIT_PROMPT_CLEAN"

   fi

 }

+

 # Checks if there are commits ahead from remote

 function git_prompt_ahead() {

   if $(echo "$(git log origin/$(current_branch)..HEAD 2> /dev/null)" | grep '^commit' &> /dev/null); then

@@ -67,3 +73,29 @@ git_prompt_status() {

   fi

   echo $STATUS

 }

+

+#compare the provided version of git to the version installed and on path

+#prints 1 if input version <= installed version

+#prints -1 otherwise 

+function git_compare_version() {

+  local INPUT_GIT_VERSION=$1;

+  local INSTALLED_GIT_VERSION

+  INPUT_GIT_VERSION=(${(s/./)INPUT_GIT_VERSION});

+  INSTALLED_GIT_VERSION=($(git --version));

+  INSTALLED_GIT_VERSION=(${(s/./)INSTALLED_GIT_VERSION[3]});

+

+  for i in {1..3}; do

+    if [[ $INSTALLED_GIT_VERSION[$i] -lt $INPUT_GIT_VERSION[$i] ]]; then

+      echo -1

+      return 0

+    fi

+  done

+  echo 1

+}

+

+#this is unlikely to change so make it all statically assigned

+POST_1_7_2_GIT=$(git_compare_version "1.7.2")

+#clean up the namespace slightly by removing the checker function

+unset -f git_compare_version

+

+

@@ -3,15 +3,11 @@ HISTFILE=$HOME/.zsh_history

 HISTSIZE=100000

 SAVEHIST=100000

-setopt hist_ignore_dups # ignore duplication command history list

-setopt share_history # share command history data

-

-setopt hist_verify

-setopt inc_append_history

+setopt append_history

 setopt extended_history

 setopt hist_expire_dups_first

+setopt hist_ignore_dups # ignore duplication command history list

 setopt hist_ignore_space

-setopt hist_reduce_blanks

-

-setopt SHARE_HISTORY

-setopt APPEND_HISTORY

+setopt hist_verify

+setopt inc_append_history

+setopt share_history # share command history data

@@ -4,7 +4,7 @@

 #Limited support for Apple Terminal (Terminal can't set window or tab separately)

 function title {

   [ "$DISABLE_AUTO_TITLE" != "true" ] || return

-  if [[ "$TERM" == screen* ]]; then 

+  if [[ "$TERM" == screen* ]]; then

     print -Pn "\ek$1:q\e\\" #set screen hardstatus, usually truncated at 20 chars

   elif [[ "$TERM" == xterm* ]] || [[ $TERM == rxvt* ]] || [[ "$TERM_PROGRAM" == "iTerm.app" ]]; then

     print -Pn "\e]2;$2:q\a" #set window name

@@ -16,14 +16,18 @@ ZSH_THEME_TERM_TAB_TITLE_IDLE="%15<..<%~%<<" #15 char left truncated PWD

 ZSH_THEME_TERM_TITLE_IDLE="%n@%m: %~"

 #Appears when you have the prompt

-function precmd {

+function omz_termsupport_precmd {

   title $ZSH_THEME_TERM_TAB_TITLE_IDLE $ZSH_THEME_TERM_TITLE_IDLE

 }

 #Appears at the beginning of (and during) of command execution

-function preexec {

+function omz_termsupport_preexec {

   emulate -L zsh

   setopt extended_glob

   local CMD=${1[(wr)^(*=*|sudo|ssh|-*)]} #cmd name only, or if this is sudo or ssh, the next cmd

   title "$CMD" "%100>...>$2%<<"

 }

+

+autoload -U add-zsh-hook

+add-zsh-hook precmd  omz_termsupport_precmd

+add-zsh-hook preexec omz_termsupport_preexec

@@ -13,20 +13,33 @@ fpath=($ZSH/functions $ZSH/completions $fpath)

 # TIP: Add files you don't want in git to .gitignore

 for config_file ($ZSH/lib/*.zsh) source $config_file

-# Add all defined plugins to fpath

-plugin=${plugin:=()}

-for plugin ($plugins) fpath=($ZSH/plugins/$plugin $fpath)

+# Set ZSH_CUSTOM to the path where your custom config files

+# and plugins exists, or else we will use the default custom/

+if [[ -z "$ZSH_CUSTOM" ]]; then

+    ZSH_CUSTOM="$ZSH/custom"

+fi

+

+

+is_plugin() {

+  local base_dir=$1

+  local name=$2

+  test -f $base_dir/plugins/$name/$name.plugin.zsh \

+    || test -f $base_dir/plugins/$name/_$name

+}

+# Add all defined plugins to fpath. This must be done

+# before running compinit.

+for plugin ($plugins); do

+  if is_plugin $ZSH_CUSTOM $plugin; then

+    fpath=($ZSH_CUSTOM/plugins/$plugin $fpath)

+  elif is_plugin $ZSH $plugin; then

+    fpath=($ZSH/plugins/$plugin $fpath)

+  fi

+done

 # Load and run compinit

 autoload -U compinit

 compinit -i

-# Set ZSH_CUSTOM to the path where your custom config files

-# and plugins exists, or else we will use the default custom/

-if [ "$ZSH_CUSTOM" = ""  ]

-then

-    ZSH_CUSTOM="$ZSH/custom"

-fi

 # Load all of the plugins that were defined in ~/.zshrc

 for plugin ($plugins); do

@@ -52,7 +65,12 @@ then

 else

   if [ ! "$ZSH_THEME" = ""  ]

   then

-    source "$ZSH/themes/$ZSH_THEME.zsh-theme"

+    if [ -f "$ZSH/custom/$ZSH_THEME.zsh-theme" ]

+    then

+      source "$ZSH/custom/$ZSH_THEME.zsh-theme"

+    else

+      source "$ZSH/themes/$ZSH_THEME.zsh-theme"

+    fi

   fi

 fi

@@ -9,6 +9,7 @@ if [[ -x `which yaourt` ]]; then

   alias yaconf='yaourt -C'        # Fix all configuration files with vimdiff

   # Pacman - https://wiki.archlinux.org/index.php/Pacman_Tips

   alias yaupg='yaourt -Syu'        # Synchronize with repositories before upgrading packages that are out of date on the local system.

+  alias yasu='yaourt --sucre'      # Same as yaupg, but without confirmation

   alias yain='yaourt -S'           # Install specific package(s) from the repositories

   alias yains='yaourt -U'          # Install specific package not from the repositories but from a file 

   alias yare='yaourt -R'           # Remove the specified package(s), retaining its configuration(s) and required dependencies

@@ -1,3 +1,9 @@

-if [ -f `brew --prefix`/etc/autojump ]; then

-  . `brew --prefix`/etc/autojump

+if [ $commands[autojump] ]; then # check if autojump is installed

+  if [ -f /usr/share/autojump/autojump.zsh ]; then # debian and ubuntu package

+    . /usr/share/autojump/autojump.zsh

+  elif [ -f /etc/profile.d/autojump.zsh ]; then # manual installation

+    . /etc/profile.d/autojump.zsh

+  elif [ $commands[brew] -a -f `brew --prefix`/etc/autojump ]; then # mac os x with brew

+    . `brew --prefix`/etc/autojump

+  fi

 fi

new file mode 100644

@@ -0,0 +1,20 @@

+if [[ $(acpi 2&>/dev/null | grep -c '^Battery.*Discharging') -gt 0 ]] ; then

+  function battery_pct_remaining() { echo "$(acpi | cut -f2 -d ',' | tr -cd '[:digit:]')" }

+  function battery_time_remaining() { echo $(acpi | cut -f3 -d ',') }

+  function battery_pct_prompt() {

+    b=$(battery_pct_remaining)

+    if [ $b -gt 50 ] ; then

+      color='green'

+    elif [ $b -gt 20 ] ; then

+      color='yellow'

+    else

+      color='red'

+    fi

+    echo "%{$fg[$color]%}[$(battery_pct_remaining)%%]%{$reset_color%}"

+  }

+else

+  error_msg='no battery'

+  function battery_pct_remaining() { echo $error_msg }

+  function battery_time_remaining() { echo $error_msg }

+  function battery_pct_prompt() { echo '' }

+fi

@@ -1,7 +1,3 @@

-fpath=($ZSH/plugins/bundler $fpath)

-autoload -U compinit

-compinit -i

-

 alias be="bundle exec"

 alias bi="bundle install"

 alias bl="bundle list"

@@ -10,7 +6,7 @@ alias bu="bundle update"

 # The following is based on https://github.com/gma/bundler-exec

-bundled_commands=(cap capify cucumber foreman guard heroku nanoc rackup rails rainbows rake rspec ruby shotgun spec spork thin unicorn unicorn_rails)

+bundled_commands=(annotate cap capify cucumber ey foreman guard heroku middleman nanoc rackup rainbows rails rake rspec ruby shotgun spec spork thin thor unicorn unicorn_rails)

 ## Functions

@@ -20,7 +16,7 @@ _bundler-installed() {

 _within-bundled-project() {

   local check_dir=$PWD

-  while [ "$(dirname $check_dir)" != "/" ]; do

+  while [ $check_dir != "/" ]; do

     [ -f "$check_dir/Gemfile" ] && return

     check_dir="$(dirname $check_dir)"

   done

@@ -41,6 +37,6 @@ for cmd in $bundled_commands; do

   alias $cmd=bundled_$cmd

   if which _$cmd > /dev/null 2>&1; then

-        compdef _$cmd bundled_$cmd

+        compdef _$cmd bundled_$cmd=$cmd

   fi

 done

@@ -54,7 +54,7 @@ if [[ $use_sudo -eq 1 ]]; then

     # apt-get only

     alias ads="sudo $apt_pref dselect-upgrade"

-    

+

     # Install all .deb files in the current directory.

     # Warning: you will need to put the glob in single quotes if you use:

     # glob_subst

@@ -113,9 +113,6 @@ alias allpkgs='aptitude search -F "%p" --disable-columns ~i'

 alias mydeb='time dpkg-buildpackage -rfakeroot -us -uc'

-

-

-

 # Functions #################################################################

 # create a simple script that can be used to 'duplicate' a system

 apt-copy() {

@@ -132,11 +129,46 @@ apt-copy() {

     chmod +x apt-copy.sh

 }

+# Prints apt history

+# Usage:

+#   apt-history install

+#   apt-history upgrade

+#   apt-history remove

+#   apt-history rollback

+#   apt-history list

+# Based On: http://linuxcommando.blogspot.com/2008/08/how-to-show-apt-log-history.html

+apt-history () {

+  case "$1" in

+    install)

+      zgrep --no-filename 'install ' $(ls -rt /var/log/dpkg*)

+      ;;

+    upgrade|remove)

+      zgrep --no-filename $1 $(ls -rt /var/log/dpkg*)

+      ;;

+    rollback)

+      zgrep --no-filename upgrade $(ls -rt /var/log/dpkg*) | \

+        grep "$2" -A10000000 | \

+        grep "$3" -B10000000 | \

+        awk '{print $4"="$5}'

+      ;;

+    list)

+      zcat $(ls -rt /var/log/dpkg*)

+      ;;

+    *)

+      echo "Parameters:"

+      echo " install - Lists all packages that have been installed."

+      echo " upgrade - Lists all packages that have been upgraded."

+      echo " remove - Lists all packages that have been removed."

+      echo " rollback - Lists rollback information."

+      echo " list - Lists all contains of dpkg logs."

+      ;;

+  esac

+}

 # Kernel-package building shortcut

 kerndeb () {

     # temporarily unset MAKEFLAGS ( '-j3' will fail )

-    MAKEFLAGS=$( print - $MAKEFLAGS | perl -pe 's/-j\s*[\d]+//g' )		

+    MAKEFLAGS=$( print - $MAKEFLAGS | perl -pe 's/-j\s*[\d]+//g' )

     print '$MAKEFLAGS set to '"'$MAKEFLAGS'"

 	appendage='-custom' # this shows up in $ (uname -r )

     revision=$(date +"%Y%m%d") # this shows up in the .deb file name

@@ -220,3 +220,4 @@ _managepy() {

 compdef _managepy manage.py

 compdef _managepy django

+compdef _managepy django-manage

@@ -78,8 +78,3 @@ function extract() {

 alias x=extract

-# add extract completion function to path

-fpath=($ZSH/plugins/extract $fpath)

-autoload -U compinit

-compinit -i

-

@@ -9,7 +9,7 @@ alias gup='git fetch && git rebase'

 compdef _git gup=git-fetch

 alias gp='git push'

 compdef _git gp=git-push

-gdv() { git-diff -w "$@" | view - }

+gdv() { git diff -w "$@" | view - }

 compdef _git gdv=git-diff

 alias gc='git commit -v'

 compdef _git gc=git-commit

@@ -17,6 +17,7 @@ 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'

@@ -35,6 +36,8 @@ alias ga='git add'

 compdef _git ga=git-add

 alias gm='git merge'

 compdef _git gm=git-merge

+alias grh='git reset HEAD'

+alias grhh='git reset HEAD --hard'

 # Git and svn mix

 alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'

@@ -57,4 +60,4 @@ compdef ggpull=git

 alias ggpush='git push origin $(current_branch)'

 compdef ggpush=git

 alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)'

-compdef ggpnp=git

+compdef ggpnp=git

\ No newline at end of file

@@ -1,7 +1,17 @@

 # Setup hub function for git, if it is available; http://github.com/defunkt/hub

 if [ "$commands[(I)hub]" ] && [ "$commands[(I)ruby]" ]; then

     # eval `hub alias -s zsh`

-    function git(){hub "$@"}

+    function git(){

+        if ! (( $+_has_working_hub  )); then

+            hub --version &> /dev/null

+            _has_working_hub=$(($? == 0))

+        fi

+        if (( $_has_working_hub )) ; then

+            hub "$@"

+        else

+            command git "$@"

+        fi

+    }

 fi

 # Functions #################################################################

new file mode 100644

@@ -0,0 +1,14 @@

+#---oh-my-zsh plugin : task Autocomplete for Jake tool---

+# Jake : https://github.com/mde/jake

+# Warning : Jakefile should have the right case : Jakefile or jakefile

+# Tested on : MacOSX 10.7 (Lion), Ubuntu 11.10

+# Author : Alexandre Lacheze (@al3xstrat)

+# Inspiration : http://weblog.rubyonrails.org/2006/3/9/fast-rake-task-completion-for-zsh 

+

+function _jake () {

+  if [ -f Jakefile ]||[ -f jakefile ]; then

+    compadd `jake -T | cut -d " " -f 2 | sed -E "s/.\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g"`

+  fi

+}

+

+compdef _jake jake

\ No newline at end of file

@@ -26,7 +26,7 @@ _knife() {

   case $state in

   knifecmd)

-    compadd -Q "$@" bootstrap client configure cookbook "cookbook site" "data bag" exec index node recipe role search ssh status windows $cloudproviders

+    compadd -Q "$@" bootstrap client configure cookbook "cookbook site" "data bag" exec environment index node recipe role search ssh status windows $cloudproviders

   ;;

   knifesubcmd)

     case $words[2] in

@@ -42,6 +42,9 @@ _knife() {

     cookbook)

       compadd -Q "$@" test list create download delete "metadata from" show "bulk delete" metadata upload

     ;;

+  environment)

+      compadd -Q "$@" list create delete edit show "from file"

+      ;;

     node)

      compadd -Q "$@" "from file" create show edit delete list run_list "bulk delete"

     ;;

@@ -138,27 +141,31 @@ _knife_options3() {

 # The chef_x_remote functions use knife to get a list of objects of type x on the server

 _chef_roles_remote() {

- (knife role list | grep \" | awk '{print $1}' | awk -F"," '{print $1}' | awk -F"\"" '{print $2}')

+ (knife role list --format json | grep \" | awk '{print $1}' | awk -F"," '{print $1}' | awk -F"\"" '{print $2}')

 }

 _chef_clients_remote() {

- (knife client list | grep \" | awk '{print $1}' | awk -F"," '{print $1}' | awk -F"\"" '{print $2}')

+ (knife client list --format json | grep \" | awk '{print $1}' | awk -F"," '{print $1}' | awk -F"\"" '{print $2}')

 }

 _chef_nodes_remote() {

- (knife node list | grep \" | awk '{print $1}' | awk -F"," '{print $1}' | awk -F"\"" '{print $2}')

+ (knife node list --format json | grep \" | awk '{print $1}' | awk -F"," '{print $1}' | awk -F"\"" '{print $2}')

 }

 _chef_cookbooks_remote() {

- (knife cookbook list | grep \" | awk '{print $1}' | awk -F"," '{print $1}' | awk -F"\"" '{print $2}')

+ (knife cookbook list --format json | grep \" | awk '{print $1}' | awk -F"," '{print $1}' | awk -F"\"" '{print $2}')

 }

 _chef_sitecookbooks_remote() {

- (knife cookbook site list | grep \" | awk '{print $1}' | awk -F"," '{print $1}' | awk -F"\"" '{print $2}')

+ (knife cookbook site list --format json | grep \" | awk '{print $1}' | awk -F"," '{print $1}' | awk -F"\"" '{print $2}')

 }

 _chef_data_bags_remote() {

- (knife data bag list | grep \" | awk '{print $1}' | awk -F"," '{print $1}' | awk -F"\"" '{print $2}')

+ (knife data bag list --format json | grep \" | awk '{print $1}' | awk -F"," '{print $1}' | awk -F"\"" '{print $2}')

+}

+

+_chef_environments_remote() {

+  (knife environment list | awk '{print $1}')

 }

 # The chef_x_local functions use the knife config to find the paths of relevant objects x to be uploaded to the server

@@ -1,14 +1,14 @@

 # Mercurial

-alias hgc='hg commit -v'

-alias hgb='hg branch -v'

+alias hgc='hg commit'

+alias hgb='hg branch'

 alias hgba='hg branches'

 alias hgco='hg checkout'

 alias hgd='hg diff'

 alias hged='hg diffmerge'

 # pull and update

-alias hgl='hg pull -u -v'

-alias hgp='hg push -v'

-alias hgs='hg status -v'

+alias hgl='hg pull -u'

+alias hgp='hg push'

+alias hgs='hg status'

 # this is the 'git commit --amend' equivalent

 alias hgca='hg qimport -r tip ; hg qrefresh -e ; hg qfinish tip'

new file mode 100644

@@ -0,0 +1,5 @@

+if [[ -x `which nc` ]]; then

+  alias nyan='nc -v miku.acm.uiuc.edu 23' # nyan cat

+fi

+

+

@@ -3,30 +3,43 @@

 # pip zsh completion, based on homebrew completion

+_pip_all() {

+  # we cache the list of packages (originally from the macports plugin)

+  if (( ! $+piplist )); then

+    echo -n " (caching package index...)"

+	piplist=($(pip search * | cut -d ' ' -f 1 | tr '[A-Z]' '[a-z]'))

+  fi

+}

+

 _pip_installed() {

-  installed_pkgs=(`pip freeze`)

+  installed_pkgs=(`pip freeze | cut -d '=' -f 1`)

 }

 local -a _1st_arguments

 _1st_arguments=(

-  'bundle:Create pybundles (archives containing multiple packages)'

-  'freeze:Output all currently installed packages (exact versions) to stdout'

-  'help:Show available commands'

-  'install:Install packages'

-  'search:Search PyPI'

-  'uninstall:Uninstall packages'

-  'unzip:Unzip individual packages'

-  'zip:Zip individual packages'

+  'bundle:create pybundles (archives containing multiple packages)'

+  'freeze:output all currently installed packages (exact versions) to stdout'

+  'help:show available commands'

+  'install:install packages'

+  'search:search PyPI'

+  'uninstall:uninstall packages'

+  'unzip:unzip individual packages'

+  'zip:zip individual packages'

 )

 local expl

-local -a pkgs installed_pkgs

+local -a all_pkgs installed_pkgs

 _arguments \

-  '(--version)--version[Show version number of program and exit]' \

-  '(-v --verbose)'{-v,--verbose}'[Give more output]' \

-  '(-q --quiet)'{-q,--quiet}'[Give less output]' \

-  '(-h --help)'{-h,--help}'[Show help]' \

+  '(--version)--version[show version number of program and exit]' \

+  '(-h --help)'{-h,--help}'[show help]' \

+  '(-E --environment)'{-E,--environment}'[virtualenv environment to run pip in]' \

+  '(-s --enable-site-packages)'{-s,--enable-site-packages}'[include site-packages in virtualenv]' \

+  '(-v --verbose)'{-v,--verbose}'[give more output]' \

+  '(-q --quiet)'{-q,--quiet}'[give less output]' \

+  '(--log)--log[log file location]' \

+  '(--proxy)--proxy[proxy in form user:passwd@proxy.server:port]' \

+  '(--timeout)--timeout[socket timeout (default 15s)]' \

   '*:: :->subcmds' && return 0

 if (( CURRENT == 1 )); then

@@ -35,10 +48,25 @@ if (( CURRENT == 1 )); then

 fi

 case "$words[1]" in

-  list)

-      if [[ "$state" == forms ]]; then

-        _pip_installed

-        _requested installed_pkgs expl 'installed packages' compadd -a installed_pkgs

+  search)

+    _arguments \

+      '(--index)--index[base URL of Python Package Index]' ;;

+  freeze)

+    _arguments \

+      '(-l --local)'{-l,--local}'[report only virtualenv packages]' ;;

+  install)

+  	_arguments \

+      '(-U --upgrade)'{-U,--upgrade}'[upgrade all packages to the newest available version]' \

+      '(-f --find-links)'{-f,--find-links}'[URL for finding packages]' \

+      '(--no-deps --no-dependencies)'{--no-deps,--no-dependencies}'[iIgnore package dependencies]' \

+      '(--no-install)--no-install[only download packages]' \

+      '(--no-download)--no-download[only install downloaded packages]' \

+      '(--install-option)--install-option[extra arguments to be supplied to the setup.py]' \

+      '1: :->packages' &&  return 0

+     

+      if [[ "$state" == packages ]]; then

+        _pip_all

+        _wanted piplist expl 'packages' compadd -a piplist

       fi ;;

   uninstall)

     _pip_installed

@@ -1,10 +1,66 @@

-# Thanks to Christopher Sexton

-# https://gist.github.com/965032

-function kapow {

-	touch ~/.pow/$1/tmp/restart.txt

-	if [ $? -eq 0 ]; then

-		echo "$fg[yellow]Pow restarting $1...$reset_color"

-	fi

+# Restart a rack app running under pow

+# http://pow.cx/

+#

+# Adds a kapow command that will restart an app

+#

+#   $ kapow myapp

+#

+# Supports command completion.

+#

+# If you are not already using completion you might need to enable it with

+# 

+#    autoload -U compinit compinit

+#

+# Changes:

+#

+# Defaults to the current application, and will walk up the tree to find 

+# a config.ru file and restart the corresponding app

+#

+# Will Detect if a app does not exist in pow and print a (slightly) helpful 

+# error message

+

+rack_root_detect(){

+  setopt chaselinks

+  local orgdir=$(pwd)

+  local basedir=$(pwd)

+

+  while [[ $basedir != '/' ]]; do

+    test -e "$basedir/config.ru" && break

+    builtin cd ".." 2>/dev/null

+    basedir="$(pwd)"

+  done

+

+  builtin cd $orgdir 2>/dev/null

+  [[ ${basedir} == "/" ]] && return 1

+  echo `basename $basedir | sed -E "s/.(com|net|org)//"`

 }

+kapow(){

+  local vhost=$1

+  [ ! -n "$vhost" ] && vhost=$(rack_root_detect)

+  if [ ! -h ~/.pow/$vhost ]

+  then

+    echo "pow: This domain isn’t set up yet. Symlink your application to ${vhost} first."

+    return 1

+  fi

+

+  [ ! -d ~/.pow/${vhost}/tmp ] && mkdir -p ~/.pow/$vhost/tmp

+  touch ~/.pow/$vhost/tmp/restart.txt;

+  [ $? -eq 0 ] &&  echo "pow: restarting $vhost.dev"

+}

 compctl -W ~/.pow -/ kapow

+

+powit(){

+	local basedir=$(pwd)

+  local vhost=$1

+  [ ! -n "$vhost" ] && vhost=$(rack_root_detect)

+  if [ ! -h ~/.pow/$vhost ]

+	then

+		echo "pow: Symlinking your app with pow. ${vhost}"

+	  [ ! -d ~/.pow/${vhost} ] && ln -s $basedir ~/.pow/$vhost

+    return 1

+  fi

+}

+

+# View the standard out (puts) from any pow app

+alias kaput="tail -f ~/Library/Logs/Pow/apps/*"

@@ -2,6 +2,7 @@ alias ss='thin --stats "/thin/stats" start'

 alias sg='ruby script/generate'

 alias sd='ruby script/destroy'

 alias sp='ruby script/plugin'

+alias sr='ruby script/runner'

 alias ssp='ruby script/spec'

 alias rdbm='rake db:migrate'

 alias sc='ruby script/console'

@@ -14,6 +14,9 @@ alias rdb='_rails_command dbconsole'

 alias rdbm='rake db:migrate db:test:clone'

 alias rg='_rails_command generate'

 alias rp='_rails_command plugin'

+alias ru='_rails_command runner'

 alias rs='_rails_command server'

 alias rsd='_rails_command server --debugger'

 alias devlog='tail -f log/development.log'

+alias rdm='rake db:migrate'

+alias rdr='rake db:rollback'

new file mode 100644

@@ -0,0 +1,6 @@

+alias rake="noglob rake" # allows square brackts for rake task invocation

+alias brake='noglob bundle exec rake' # execute the bundled rake gem

+alias srake='noglob sudo rake' # noglob must come before sudo

+alias sbrake='noglob sudo bundle exec rake' # altogether now ... 

+

+

new file mode 100644

@@ -0,0 +1,44 @@

+FOUND_RBENV=0

+for rbenvdir in "$HOME/.rbenv" "/usr/local/rbenv" "/opt/rbenv" ; do

+  if [ -d $rbenvdir/bin -a $FOUND_RBENV -eq 0 ] ; then

+    FOUND_RBENV=1

+    export RBENV_ROOT=$rbenvdir

+    export PATH=${rbenvdir}/bin:$PATH

+    eval "$(rbenv init -)"

+

+    alias rubies="rbenv versions"

+    alias gemsets="rbenv gemset list"

+

+    function current_ruby() {

+      echo "$(rbenv version-name)"

+    }

+

+    function current_gemset() {

+      echo "$(rbenv gemset active 2&>/dev/null | sed -e ":a" -e '$ s/\n/+/gp;N;b a' | head -n1)"

+    }

+

+    function gems {

+      local rbenv_path=$(rbenv prefix)

+      gem list $@ | sed \

+        -Ee "s/\([0-9\.]+( .+)?\)/$fg[blue]&$reset_color/g" \

+        -Ee "s|$(echo $rbenv_path)|$fg[magenta]\$rbenv_path$reset_color|g" \

+        -Ee "s/$current_ruby@global/$fg[yellow]&$reset_color/g" \

+        -Ee "s/$current_ruby$current_gemset$/$fg[green]&$reset_color/g"

+    }

+

+    function rbenv_prompt_info() {

+      if [[ -n $(current_gemset) ]] ; then

+        echo "$(current_ruby)@$(current_gemset)"

+      else

+        echo "$(current_ruby)"

+      fi

+    }

+  fi

+done

+unset rbenvdir

+

+if [ $FOUND_RBENV -eq 0 ] ; then

+  alias rubies='ruby -v'

+  function gemsets() { echo 'not supported' }

+  function rbenv_prompt_info() { echo "system: $(ruby -v | cut -f-2 -d ' ')" }

+fi

@@ -3,4 +3,4 @@

 alias sgem='sudo gem'

 # Find ruby file

-alias rfind='find . -name *.rb | xargs grep -n'

+alias rfind='find . -name "*.rb" | xargs grep -n'

@@ -37,7 +37,7 @@ function gems {

 	local current_gemset=`rvm-prompt g`

 	gem list $@ | sed \

-		-Ee "s/\([0-9\.]+( .+)?\)/$fg[blue]&$reset_color/g" \

+		-Ee "s/\([0-9, \.]+( .+)?\)/$fg[blue]&$reset_color/g" \

 		-Ee "s|$(echo $rvm_path)|$fg[magenta]\$rvm_path$reset_color|g" \

 		-Ee "s/$current_ruby@global/$fg[yellow]&$reset_color/g" \

 		-Ee "s/$current_ruby$current_gemset$/$fg[green]&$reset_color/g"

new file mode 100644

@@ -0,0 +1,64 @@

+# Contributed and SLIGHTLY modded by Matt Parnell/ilikenwf <parwok -at- gmail>

+# Created by the blogger at the URL below...I don't know where to find his/her name

+# Original found at http://www.shellperson.net/sprunge-pastebin-script/

+ 

+usage() {

+description | fmt -s >&2

+}

+ 

+description() {

+cat << HERE

+ 

+DESCRIPTION

+  Upload data and fetch URL from the pastebin http://sprunge.us

+ 

+USAGE

+  $0 filename.txt

+  $0 text string

+  $0 < filename.txt

+  piped_data | $0

+ 

+NOTES

+--------------------------------------------------------------------------

+* INPUT METHODS *

+$0 can accept piped data, STDIN redirection [<filename.txt], text strings following the command as arguments, or filenames as arguments.  Only one of these methods can be used at a time, so please see the note on precedence.  Also, note that using a pipe or STDIN redirection will treat tabs as spaces, or disregard them entirely (if they appear at the beginning of a line).  So I suggest using a filename as an argument if tabs are important either to the function or readability of the code.

+ 

+* PRECEDENCE *

+STDIN redirection has precedence, then piped input, then a filename as an argument, and finally text strings as an arguments.

+ 

+  EXAMPLE:

+  echo piped | "$0" arguments.txt < stdin_redirection.txt

+ 

+In this example, the contents of file_as_stdin_redirection.txt would be uploaded. Both the piped_text and the file_as_argument.txt are ignored. If there is piped input and arguments, the arguments will be ignored, and the piped input uploaded.

+ 

+* FILENAMES *

+If a filename is misspelled or doesn't have the necessary path description, it will NOT generate an error, but will instead treat it as a text string and upload it.

+--------------------------------------------------------------------------

+ 

+HERE

+exit

+}

+

+sprunge() {

+	if [ -t 0 ]; then

+	  echo Running interactively, checking for arguments... >&2

+	  if [ "$*" ]; then

+		echo Arguments present... >&2

+		if [ -f "$*" ]; then

+		  echo Uploading the contents of "$*"... >&2

+		  cat "$*"

+		else

+		  echo Uploading the text: \""$*"\"... >&2

+		  echo "$*"

+		fi | curl -F 'sprunge=<-' http://sprunge.us

+	  else

+		echo No arguments found, printing USAGE and exiting. >&2

+		usage

+	  fi

+	else

+	  echo Using input from a pipe or STDIN redirection... >&2

+	  while read -r line ; do

+		echo $line

+	  done | curl -F 'sprunge=<-' http://sprunge.us

+	fi

+}

new file mode 100644

@@ -0,0 +1,13 @@

+# Symfony2 basic command completion

+

+_symfony2_get_command_list () {

+	app/console --no-ansi | sed "1,/Available commands/d" | awk '/^  [a-z]+/ { print $1 }'

+}

+

+_symfony2 () {

+  if [ -f app/console ]; then

+    compadd `_symfony2_get_command_list`

+  fi

+}

+