Permalink
Browse files

lastest changes

  • Loading branch information...
forest committed Jul 25, 2012
1 parent cbdd4a7 commit 92161f180ecb8c9099d5db52dd6adb421723dece
Showing with 44 additions and 37 deletions.
  1. +0 −2 gitignore
  2. +12 −3 oh-my-zsh/custom/aliases.zsh
  3. +24 −24 pryrc
  4. +5 −5 railsrc
  5. +3 −3 zshrc
View
@@ -4,7 +4,6 @@
# Compiled source #
###################
*.com
*.class
*.dll
*.exe
@@ -35,7 +34,6 @@
.DS_Store
.DS_Store?
ehthumbs.db
Icon?
Thumbs.db
*~
.*.swp
@@ -1,5 +1,6 @@
# aliases
alias ealias='vim ~/.dotfiles/oh-my-zsh/custom/aliases.zsh'
alias ealias='mvim ~/.dotfiles/oh-my-zsh/custom/aliases.zsh'
alias reload='exec $SHELL'
# other
alias psg="ps ax | grep $1"
@@ -13,14 +14,15 @@ alias gs='git status'
alias gcd='git checkout development'
alias grm="git status | grep deleted | awk '{print \$3}' | xargs git rm"
alias gch='git cherry -v origin/master'
alias gh='git log --pretty=format:"%h %ad | %s%d [%an]" --graph --date=short'
alias gh='git log --graph --date=short'
function gbn {
set branch_name = $1
git push origin origin:refs/heads/${branch_name}
git fetch origin
git checkout --track -b ${branch_name} origin/${branch_name}
git pull
}
alias migrations='git diff --name-only master development | ack migrations'
# rails
alias rc='rails console'
@@ -60,7 +62,10 @@ alias binit='bundle init'
alias %=' '
# textmate
alias e='mate . &'
#alias e='mate . &'
# sublime edit
alias e='subl -n .'
# mvim
alias v='mvim'
@@ -99,3 +104,7 @@ alias pws='powify start'
alias pwr='powify restart'
alias pwb='powify browse'
alias pwl='powify logs'
#fasd
alias j='z'
View
48 pryrc
@@ -24,28 +24,28 @@ class Hash
end
end
if defined?(Rails) && Rails.env
require 'logger'
ActiveRecord::Base.logger = Logger.new(STDOUT)
ActiveRecord::Base.clear_active_connections!
class Class
def core_ext
self.instance_methods.map {|m| [m, self.instance_method(m).source_location] }.select {|m| m[1] && m[1][0] =~/activesupport/}.map {|m| m[0]}.sort
end
end
require_without_bundler 'hirb'
# https://github.com/cldwalker/hirb/issues/46#issuecomment-1870823
Pry.config.print = proc do |output, value|
Hirb::View.view_or_page_output(value) || Pry::DEFAULT_PRINT.call(output, value)
end
# https://github.com/pry/pry/wiki/Setting-up-Rails-or-Heroku-to-use-Pry#wiki-rails32up
extend Rails::ConsoleMethods
Hirb.enable
end
# if defined?(Rails) && Rails.env
# require 'logger'
#
# ActiveRecord::Base.logger = Logger.new(STDOUT)
# ActiveRecord::Base.clear_active_connections!
#
# class Class
# def core_ext
# self.instance_methods.map {|m| [m, self.instance_method(m).source_location] }.select {|m| m[1] && m[1][0] =~/activesupport/}.map {|m| m[0]}.sort
# end
# end
#
# require_without_bundler 'hirb'
#
# # https://github.com/cldwalker/hirb/issues/46#issuecomment-1870823
# Pry.config.print = proc do |output, value|
# Hirb::View.view_or_page_output(value) || Pry::DEFAULT_PRINT.call(output, value)
# end
#
# # https://github.com/pry/pry/wiki/Setting-up-Rails-or-Heroku-to-use-Pry#wiki-rails32up
# extend Rails::ConsoleMethods
#
# Hirb.enable
# end
View
10 railsrc
@@ -1,10 +1,10 @@
#!/usr/bin/ruby
begin
require 'hirb' # sudo gem install cldwalker-hirb --source http://gems.github.com
Hirb.enable
rescue LoadError
end
#begin
# require 'hirb' # sudo gem install cldwalker-hirb --source http://gems.github.com
# Hirb.enable
#rescue LoadError
#end
def change_log(stream)
ActiveRecord::Base.logger = Logger.new(stream)
View
6 zshrc
@@ -25,7 +25,7 @@ ZSH_THEME="steeef"
# Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
# Example format: plugins=(rails git textmate ruby lighthouse)
plugins=(h c rails3 git brew cap gem git git-flow github heroku redis-cli rvm mydirs powder bundler autojump)
plugins=(rails3 git brew cap gem git git-flow github heroku redis-cli rvm powder bundler fasd)
source $ZSH/oh-my-zsh.sh
@@ -35,15 +35,15 @@ for config_file ($ZSH_CUSTOM/*.zsh(N)) source $config_file
# required by TextMate
# http://manual.macromates.com/en/bundles#setting_lc_ctype
# You must set the LC_CTYPE variable to use UTF-8. If you do not, svn will give you an
# You must set the LC_CTYPE variable to use UTF-8. If you do not, svn will give you an
# svn: Can't recode string error when it stumbles upon non-ASCII filenames (some of the bundle items use these).
export LC_CTYPE=en_US.UTF-8
export EDITOR='mvim -f'
export PATH="$HOME/bin:$HOME/.bin:$HOME/.rvm/bin:/usr/local/homebrew/bin:/usr/local/bin:/usr/local/sbin:/usr/local/mysql/bin:$PATH"
export MANPATH="/usr/local/man:/usr/local/mysql/man:/usr/local/git/man:$MANPATH"
export DYLD_LIBRARY_PATH="/usr/local/mysql/lib:$DYLD_LIBRARY_PATH"
#export DYLD_LIBRARY_PATH="/usr/local/mysql/lib:$DYLD_LIBRARY_PATH"
export MSGMERGE_PATH="/usr/local/Cellar/gettext/0.18.1.1/bin/msgmerge"
# Load RVM into a shell session *as a function*

0 comments on commit 92161f1

Please sign in to comment.