From 1dfe1e60ca0add723686639692ad1f8615b28334 Mon Sep 17 00:00:00 2001 From: Holger Just Date: Thu, 28 Jul 2011 12:06:10 +0200 Subject: [PATCH 1/8] weak REE for faster specs --- .bashrc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.bashrc b/.bashrc index ae7f909..f148b24 100755 --- a/.bashrc +++ b/.bashrc @@ -40,6 +40,13 @@ if [[ -s $HOME/.rvm/scripts/rvm ]] ; then source $HOME/.rvm/scripts/rvm ; fi +# REE tweaks to make it faster for specs. +export RUBY_HEAP_MIN_SLOTS=1000000 +export RUBY_HEAP_SLOTS_INCREMENT=1000000 +export RUBY_HEAP_SLOTS_GROWTH_FACTOR=1 +export RUBY_GC_MALLOC_LIMIT=1000000000 +export RUBY_HEAP_FREE_MIN=500000 + # NVM [[ -s $HOME/.nvm/nvm.sh ]] && source $HOME/.nvm/nvm.sh From 9617cb601bfbf3602bfc7bf7afb21ba044059d02 Mon Sep 17 00:00:00 2001 From: Holger Just Date: Fri, 5 Aug 2011 10:30:17 +0200 Subject: [PATCH 2/8] Don't try to autocorrect. It probably breaks more stuff... --- .gitconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitconfig b/.gitconfig index 3989f4e..30519b2 100644 --- a/.gitconfig +++ b/.gitconfig @@ -16,8 +16,6 @@ grep = auto interactive = auto ui = auto -[help] - autocorrect = 1 [push] default = matching [core] @@ -25,3 +23,5 @@ editor = mate -wl1 [github] user = meineerde +[branch] + autosetupmerge = true From d05244d4a8a866236f7ecb9db300adbfbfe8e97b Mon Sep 17 00:00:00 2001 From: Holger Just Date: Fri, 5 Aug 2011 10:31:01 +0200 Subject: [PATCH 3/8] Use ss/sc for Rails 2.x and 3.x --- .bashrc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.bashrc b/.bashrc index f148b24..767bd2d 100755 --- a/.bashrc +++ b/.bashrc @@ -237,12 +237,13 @@ alias ciam='git ci -am' alias got='git' alias goit='git' -alias ss="script/server -b 127.0.0.1" -alias sc="script/console" - alias rs="rails server -b 127.0.0.1" alias rc="rails console" +alias ss="if [[ -x script/server ]]; then script/server -b 127.0.0.1; else rs; fi" +alias sc="if [[ -x script/console ]]; then script/console; else rc; fi" + + alias redcar="wrapped_redcar --fork" # if cat is called on a directory, call ls instead From 5003586fdd4d9debd6c2f012b2dbd980ada9df2d Mon Sep 17 00:00:00 2001 From: Holger Just Date: Wed, 31 Aug 2011 14:48:29 +0200 Subject: [PATCH 4/8] Quote some paths --- .bashrc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.bashrc b/.bashrc index 767bd2d..2737f92 100755 --- a/.bashrc +++ b/.bashrc @@ -249,7 +249,7 @@ alias redcar="wrapped_redcar --fork" # if cat is called on a directory, call ls instead cat() { if [[ $# = 1 ]] && [[ -d $1 ]]; then - ls $1 + ls "$1" else /usr/bin/env cat "$@" fi @@ -258,7 +258,7 @@ cat() { # directory for project d() { for dir in $HOME/workspace/$1 $HOME/$1 $1 /Volumes/Finn/$1 $RUBY_PATH/$RUBY_VERSION/lib/ruby/gems/*/gems/$1-*; do - if [[ -d $dir ]]; then + if [[ -d "$dir" ]]; then echo $dir break fi @@ -268,10 +268,10 @@ d() { # do stuff with project with_project() { - target=$(d $1) + target=$(d "$1") if [[ $target ]]; then - echo $2 $target - $2 $target + echo "$2 $target" + "$2" "$target" else echo "unknown project" fi @@ -279,10 +279,10 @@ with_project() { } # cd to project -c() { with_project $1 cd; } +c() { with_project "$1" cd; } # open project in editor -e() { with_project $1 $EDITOR; } +e() { with_project "$1" "$EDITOR"; } # Enable programmable completion features. if [[ -f /etc/bash_completion ]]; then . /etc/bash_completion; fi From ed69561695ccb8151fad5200c6a62cbbcaa3a97e Mon Sep 17 00:00:00 2001 From: Holger Just Date: Wed, 31 Aug 2011 14:49:52 +0200 Subject: [PATCH 5/8] Add gems in $GEM_HOME to project path --- .bashrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bashrc b/.bashrc index 2737f92..fe1a4bd 100755 --- a/.bashrc +++ b/.bashrc @@ -257,7 +257,7 @@ cat() { # directory for project d() { - for dir in $HOME/workspace/$1 $HOME/$1 $1 /Volumes/Finn/$1 $RUBY_PATH/$RUBY_VERSION/lib/ruby/gems/*/gems/$1-*; do + for dir in $HOME/workspace/$1 $HOME/$1 $1 /Volumes/Finn/$1 $RUBY_PATH/$RUBY_VERSION/lib/ruby/gems/*/gems/$1-* $GEM_HOME/gems/$1; do if [[ -d "$dir" ]]; then echo $dir break From d4ed78f0a04e9b0052d28d99ec5740198af67e84 Mon Sep 17 00:00:00 2001 From: Holger Just Date: Wed, 31 Aug 2011 14:52:50 +0200 Subject: [PATCH 6/8] Cleanup --- .bashrc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.bashrc b/.bashrc index fe1a4bd..7336db9 100755 --- a/.bashrc +++ b/.bashrc @@ -257,25 +257,24 @@ cat() { # directory for project d() { - for dir in $HOME/workspace/$1 $HOME/$1 $1 /Volumes/Finn/$1 $RUBY_PATH/$RUBY_VERSION/lib/ruby/gems/*/gems/$1-* $GEM_HOME/gems/$1; do + local dir + for dir in $HOME/workspace/$1 $HOME/$1 $1 /Volumes/Finn/$1 $RUBY_PATH/$RUBY_VERSION/lib/ruby/gems/*/gems/$1-* $GEM_HOME/gems/$1-*; do if [[ -d "$dir" ]]; then echo $dir break fi done - unset dir } # do stuff with project with_project() { - target=$(d "$1") + local target=$(d "$1") if [[ $target ]]; then echo "$2 $target" "$2" "$target" else echo "unknown project" fi - unset target } # cd to project From 8b7580568dd850f7867135f49fd72e1c95d8bac2 Mon Sep 17 00:00:00 2001 From: Holger Just Date: Wed, 31 Aug 2011 15:00:26 +0200 Subject: [PATCH 7/8] Add be for 'bundle exec' --- .bashrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bashrc b/.bashrc index 7336db9..afd6678 100755 --- a/.bashrc +++ b/.bashrc @@ -237,9 +237,9 @@ alias ciam='git ci -am' alias got='git' alias goit='git' +alias be="bundle exec" alias rs="rails server -b 127.0.0.1" alias rc="rails console" - alias ss="if [[ -x script/server ]]; then script/server -b 127.0.0.1; else rs; fi" alias sc="if [[ -x script/console ]]; then script/console; else rc; fi" From 3e31af574308dc0c19ff28d8177bf66fc9dc9a30 Mon Sep 17 00:00:00 2001 From: Holger Just Date: Fri, 2 Sep 2011 21:28:51 +0200 Subject: [PATCH 8/8] Pass params to ss and sc --- .bashrc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.bashrc b/.bashrc index afd6678..374a98a 100755 --- a/.bashrc +++ b/.bashrc @@ -240,8 +240,8 @@ alias goit='git' alias be="bundle exec" alias rs="rails server -b 127.0.0.1" alias rc="rails console" -alias ss="if [[ -x script/server ]]; then script/server -b 127.0.0.1; else rs; fi" -alias sc="if [[ -x script/console ]]; then script/console; else rc; fi" +ss() { if [[ -x script/server ]]; then script/server -b 127.0.0.1 $@; else rs $@; fi } +sc() { if [[ -x script/console ]]; then script/console $@; else rc $@; fi } alias redcar="wrapped_redcar --fork"