Merge pull request #722 from nwinkler/killrails-fix

Killrails fix
pull/724/merge
Nils Winkler 2016-05-19 09:28:14 +02:00
commit 6f87e259cd
2 changed files with 10 additions and 10 deletions

View File

@ -4,15 +4,15 @@ about-plugin 'Function to kill a daemonized Rails server.'
# Quick function to kill a daemonized Rails server # Quick function to kill a daemonized Rails server
function killrails() { function killrails() {
about 'Searches for a daemonized Rails server in tmp/pids and attempts to kill it.' about 'Searches for a daemonized Rails server in tmp/pids and attempts to kill it.'
group 'server' group 'killrails'
railsPid="$(cat tmp/pids/server.pid)" railsPid="$(cat tmp/pids/server.pid)"
if [ ! -z "$railsPid" ]; then if [ ! -z "$railsPid" ]; then
echo "[OK] Rails Server Process Id : ${railsPid}" echo "[OK] Rails Server Process Id : ${railsPid}"
kill -9 $railsPid kill -9 $railsPid
echo "[OK] Process Killed" echo "[OK] Process Killed"
else else
echo "[FAIL] Error killing Rails server" echo "[FAIL] Error killing Rails server"
return 1 return 1
fi fi
} }

View File

@ -23,7 +23,7 @@ NO_COLOR=true
run _bash-it-search 'ruby' 'gem' 'bundle' 'rake' 'rails' run _bash-it-search 'ruby' 'gem' 'bundle' 'rake' 'rails'
# And verify # And verify
[[ "${lines[0]/✓/}" == ' aliases => bundler rails' ]] && \ [[ "${lines[0]/✓/}" == ' aliases => bundler rails' ]] && \
[[ "${lines[1]/✓/}" == ' plugins => chruby chruby-auto ruby' ]] && \ [[ "${lines[1]/✓/}" == ' plugins => chruby chruby-auto killrails ruby' ]] && \
[[ "${lines[2]/✓/}" == ' completions => bundler gem rake' ]] [[ "${lines[2]/✓/}" == ' completions => bundler gem rake' ]]
} }
@ -31,7 +31,7 @@ NO_COLOR=true
run _bash-it-search 'ruby' 'gem' 'bundle' 'rake' 'rails' '--disable' run _bash-it-search 'ruby' 'gem' 'bundle' 'rake' 'rails' '--disable'
run _bash-it-search 'ruby' 'gem' 'bundle' '-chruby' 'rake' 'rails' run _bash-it-search 'ruby' 'gem' 'bundle' '-chruby' 'rake' 'rails'
[[ "${lines[0]/✓/}" == ' aliases => bundler rails' ]] && \ [[ "${lines[0]/✓/}" == ' aliases => bundler rails' ]] && \
[[ "${lines[1]/✓/}" == ' plugins => ruby' ]] && \ [[ "${lines[1]/✓/}" == ' plugins => killrails ruby' ]] && \
[[ "${lines[2]/✓/}" == ' completions => bundler gem rake' ]] [[ "${lines[2]/✓/}" == ' completions => bundler gem rake' ]]
} }
@ -40,7 +40,7 @@ NO_COLOR=true
run _enable-alias 'rails' run _enable-alias 'rails'
run _bash-it-search 'ruby' 'gem' 'bundle' 'rake' 'rails' run _bash-it-search 'ruby' 'gem' 'bundle' 'rake' 'rails'
[[ "${lines[0]}" == ' aliases => bundler ✓rails' ]] && \ [[ "${lines[0]}" == ' aliases => bundler ✓rails' ]] && \
[[ "${lines[1]}" == ' plugins => chruby chruby-auto ruby' ]] && \ [[ "${lines[1]}" == ' plugins => chruby chruby-auto killrails ruby' ]] && \
[[ "${lines[2]}" == ' completions => bundler gem rake' ]] [[ "${lines[2]}" == ' completions => bundler gem rake' ]]
} }
@ -48,6 +48,6 @@ NO_COLOR=true
run _bash-it-search 'ruby' 'gem' 'bundle' 'rake' '-chruby' 'rails' '--enable' run _bash-it-search 'ruby' 'gem' 'bundle' 'rake' '-chruby' 'rails' '--enable'
run _bash-it-search 'ruby' 'gem' 'bundle' 'rake' '-chruby' 'rails' run _bash-it-search 'ruby' 'gem' 'bundle' 'rake' '-chruby' 'rails'
[[ "${lines[0]}" == ' aliases => ✓bundler ✓rails' ]] && \ [[ "${lines[0]}" == ' aliases => ✓bundler ✓rails' ]] && \
[[ "${lines[1]}" == ' plugins => ✓ruby' ]] && \ [[ "${lines[1]}" == ' plugins => ✓killrails ✓ruby' ]] && \
[[ "${lines[2]}" == ' completions => ✓bundler ✓gem ✓rake' ]] [[ "${lines[2]}" == ' completions => ✓bundler ✓gem ✓rake' ]]
} }