mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2024-11-26 21:51:05 +01:00
Updated Soliah theme and added basic rails command tab completion.
This commit is contained in:
parent
01b0366f3e
commit
30620d4638
3 changed files with 118 additions and 3 deletions
54
plugins/rails3/_rails3
Normal file
54
plugins/rails3/_rails3
Normal file
|
@ -0,0 +1,54 @@
|
||||||
|
#compdef rails
|
||||||
|
#autoload
|
||||||
|
|
||||||
|
# rails 3 zsh completion, based on homebrew completion
|
||||||
|
|
||||||
|
local -a _1st_arguments
|
||||||
|
_1st_arguments=(
|
||||||
|
'generate:Generate new code (short-cut alias: "g")'
|
||||||
|
'console:Start the Rails console (short-cut alias: "c")'
|
||||||
|
'server:Start the Rails server (short-cut alias: "s")'
|
||||||
|
'dbconsole:Start a console for the database specified in config/database.yml (short-cut alias: "db")'
|
||||||
|
'new:Create a new Rails application. "rails new my_app" creates a new application called MyApp in "./my_app"'
|
||||||
|
'application:Generate the Rails application code'
|
||||||
|
'destroy:Undo code generated with "generate"'
|
||||||
|
'benchmarker:See how fast a piece of code runs'
|
||||||
|
'profiler:Get profile information from a piece of code'
|
||||||
|
'plugin:Install a plugin'
|
||||||
|
)
|
||||||
|
|
||||||
|
_rails_generate_arguments() {
|
||||||
|
generate_arguments=(
|
||||||
|
controller
|
||||||
|
generator
|
||||||
|
helper
|
||||||
|
integration_test
|
||||||
|
mailer
|
||||||
|
migration
|
||||||
|
model
|
||||||
|
observer
|
||||||
|
performance_test
|
||||||
|
plugin
|
||||||
|
resource
|
||||||
|
scaffold
|
||||||
|
scaffold_controller
|
||||||
|
session_migration
|
||||||
|
stylesheets
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
_arguments \
|
||||||
|
'(--version)--version[show version]' \
|
||||||
|
'(--help)--help[show help]' \
|
||||||
|
'*:: :->subcmds' && return 0
|
||||||
|
|
||||||
|
if (( CURRENT == 1 )); then
|
||||||
|
_describe -t commands "rails subcommand" _1st_arguments
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
|
||||||
|
case "$words[1]" in
|
||||||
|
generate)
|
||||||
|
_rails_generate_arguments
|
||||||
|
_wanted generate_arguments expl 'all generate' compadd -a generate_arguments ;;
|
||||||
|
esac
|
|
@ -1,3 +1,7 @@
|
||||||
|
fpath=($ZSH/plugins/rails3 $fpath)
|
||||||
|
autoload -U compinit
|
||||||
|
compinit -i
|
||||||
|
|
||||||
alias rs='ruby script/rails server'
|
alias rs='ruby script/rails server'
|
||||||
alias rg='ruby script/rails generate'
|
alias rg='ruby script/rails generate'
|
||||||
alias rd='ruby script/rails destroy'
|
alias rd='ruby script/rails destroy'
|
||||||
|
|
|
@ -1,6 +1,63 @@
|
||||||
PROMPT='%{$fg[blue]%}%B%20~%b%{$reset_color%}%{$(git_prompt_info)%} $ '
|
PROMPT='%{$fg[blue]%}%n%{$reset_color%} on %{$fg[red]%}%M%{$reset_color%} in %{$fg[blue]%}%~%b%{$reset_color%}$(git_time_since_commit)$(git_prompt_info)
|
||||||
|
$ '
|
||||||
|
|
||||||
ZSH_THEME_GIT_PROMPT_PREFIX="(%{$fg[green]%}"
|
ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[white]%}"
|
||||||
ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%})"
|
ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%})"
|
||||||
ZSH_THEME_GIT_PROMPT_DIRTY="*%{$reset_color%}"
|
|
||||||
|
|
||||||
|
# Text to display if the branch is dirty
|
||||||
|
ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}*%{$reset_color%}"
|
||||||
|
|
||||||
|
# Text to display if the branch is clean
|
||||||
|
ZSH_THEME_GIT_PROMPT_CLEAN=""
|
||||||
|
|
||||||
|
# Colors vary depending on time lapsed.
|
||||||
|
ZSH_THEME_GIT_TIME_SINCE_COMMIT_SHORT="%{$fg[green]%}"
|
||||||
|
ZSH_THEME_GIT_TIME_SHORT_COMMIT_MEDIUM="%{$fg[yellow]%}"
|
||||||
|
ZSH_THEME_GIT_TIME_SINCE_COMMIT_LONG="%{$fg[red]%}"
|
||||||
|
ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL="%{$fg[cyan]%}"
|
||||||
|
|
||||||
|
# Determine the time since last commit. If branch is clean,
|
||||||
|
# use a neutral color, otherwise colors will vary according to time.
|
||||||
|
function git_time_since_commit() {
|
||||||
|
if git rev-parse --git-dir > /dev/null 2>&1; then
|
||||||
|
# Only proceed if there is actually a commit.
|
||||||
|
if [[ $(git log 2>&1 > /dev/null | grep -c "^fatal: bad default revision") == 0 ]]; then
|
||||||
|
# Get the last commit.
|
||||||
|
last_commit=`git log --pretty=format:'%at' -1 2> /dev/null`
|
||||||
|
now=`date +%s`
|
||||||
|
seconds_since_last_commit=$((now-last_commit))
|
||||||
|
|
||||||
|
# Totals
|
||||||
|
MINUTES=$((seconds_since_last_commit / 60))
|
||||||
|
HOURS=$((seconds_since_last_commit/3600))
|
||||||
|
|
||||||
|
# Sub-hours and sub-minutes
|
||||||
|
DAYS=$((seconds_since_last_commit / 86400))
|
||||||
|
SUB_HOURS=$((HOURS % 24))
|
||||||
|
SUB_MINUTES=$((MINUTES % 60))
|
||||||
|
|
||||||
|
if [[ -n $(git status -s 2> /dev/null) ]]; then
|
||||||
|
if [ "$MINUTES" -gt 30 ]; then
|
||||||
|
COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_LONG"
|
||||||
|
elif [ "$MINUTES" -gt 10 ]; then
|
||||||
|
COLOR="$ZSH_THEME_GIT_TIME_SHORT_COMMIT_MEDIUM"
|
||||||
|
else
|
||||||
|
COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_SHORT"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$HOURS" -gt 24 ]; then
|
||||||
|
echo "($COLOR${DAYS}d${SUB_HOURS}h${SUB_MINUTES}m%{$reset_color%}|"
|
||||||
|
elif [ "$MINUTES" -gt 60 ]; then
|
||||||
|
echo "($COLOR${HOURS}h${SUB_MINUTES}m%{$reset_color%}|"
|
||||||
|
else
|
||||||
|
echo "($COLOR${MINUTES}m%{$reset_color%}|"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL"
|
||||||
|
echo "($COLOR~|"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in a new issue