Tim O'Brien
11 years ago
commit
e8639c700e
33 changed files with 570 additions and 422 deletions
@ -1,22 +1,19 @@ |
|||||||
# Ember-cli |
# Ember CLI |
||||||
|
|
||||||
**Maintainer:** [BilalBudhani](http://www.github.com/BilalBudhani) |
**Maintainers:** [BilalBudhani](http://www.github.com/BilalBudhani), [eubenesa](http://www.github.com/eubenesa) |
||||||
|
|
||||||
Ember-cli (http://www.ember-cli.com/) |
Ember CLI (http://www.ember-cli.com/) |
||||||
|
|
||||||
### List of Aliases |
### List of Aliases |
||||||
|
|
||||||
alias es='ember serve' |
alias es='ember serve' |
||||||
alias ea='ember addon' |
alias ea='ember addon' |
||||||
alias eb='ember build' |
alias eb='ember build' |
||||||
alias ed='ember destroy' |
alias ed='ember destroy' |
||||||
alias eg='ember generate' |
alias eg='ember generate' |
||||||
alias eh='ember help' |
alias eh='ember help' |
||||||
alias ein='ember init' |
alias ein='ember init' |
||||||
alias eia='ember install:addon' |
alias ei='ember install' |
||||||
alias eib='ember install:bower' |
alias et='ember test' |
||||||
alias ein='ember install:npm' |
alias eu='ember update' |
||||||
alias ei='ember install' |
alias ev='ember version' |
||||||
alias et='ember test' |
|
||||||
alias eu='ember update' |
|
||||||
alias ev='ember version' |
|
||||||
|
|||||||
@ -1,57 +1,92 @@ |
|||||||
# ZSH Git Prompt Plugin from: |
# ZSH Git Prompt Plugin from: |
||||||
# http://github.com/olivierverdier/zsh-git-prompt |
# http://github.com/olivierverdier/zsh-git-prompt |
||||||
# |
|
||||||
export __GIT_PROMPT_DIR=$ZSH/plugins/git-prompt |
|
||||||
|
|
||||||
# Allow for functions in the prompt. |
__GIT_PROMPT_DIR="${0:A:h}" |
||||||
setopt PROMPT_SUBST |
|
||||||
|
|
||||||
## Enable auto-execution of functions. |
## Hook function definitions |
||||||
typeset -ga preexec_functions |
function chpwd_update_git_vars() { |
||||||
typeset -ga precmd_functions |
update_current_git_vars |
||||||
typeset -ga chpwd_functions |
} |
||||||
|
|
||||||
# Append git functions needed for prompt. |
|
||||||
preexec_functions+='preexec_update_git_vars' |
|
||||||
precmd_functions+='precmd_update_git_vars' |
|
||||||
chpwd_functions+='chpwd_update_git_vars' |
|
||||||
|
|
||||||
## Function definitions |
|
||||||
function preexec_update_git_vars() { |
function preexec_update_git_vars() { |
||||||
case "$2" in |
case "$2" in |
||||||
git*) |
git*|hub*|gh*|stg*) |
||||||
__EXECUTED_GIT_COMMAND=1 |
__EXECUTED_GIT_COMMAND=1 |
||||||
;; |
;; |
||||||
esac |
esac |
||||||
} |
} |
||||||
|
|
||||||
function precmd_update_git_vars() { |
function precmd_update_git_vars() { |
||||||
if [ -n "$__EXECUTED_GIT_COMMAND" ]; then |
if [ -n "$__EXECUTED_GIT_COMMAND" ] || [ ! -n "$ZSH_THEME_GIT_PROMPT_CACHE" ]; then |
||||||
update_current_git_vars |
update_current_git_vars |
||||||
unset __EXECUTED_GIT_COMMAND |
unset __EXECUTED_GIT_COMMAND |
||||||
fi |
fi |
||||||
} |
} |
||||||
|
|
||||||
function chpwd_update_git_vars() { |
chpwd_functions+=(chpwd_update_git_vars) |
||||||
update_current_git_vars |
precmd_functions+=(precmd_update_git_vars) |
||||||
} |
preexec_functions+=(preexec_update_git_vars) |
||||||
|
|
||||||
|
|
||||||
|
## Function definitions |
||||||
function update_current_git_vars() { |
function update_current_git_vars() { |
||||||
unset __CURRENT_GIT_STATUS |
unset __CURRENT_GIT_STATUS |
||||||
|
|
||||||
local gitstatus="$__GIT_PROMPT_DIR/gitstatus.py" |
local gitstatus="$__GIT_PROMPT_DIR/gitstatus.py" |
||||||
_GIT_STATUS=`python ${gitstatus}` |
_GIT_STATUS=$(python ${gitstatus} 2>/dev/null) |
||||||
__CURRENT_GIT_STATUS=("${(f)_GIT_STATUS}") |
__CURRENT_GIT_STATUS=("${(@s: :)_GIT_STATUS}") |
||||||
|
GIT_BRANCH=$__CURRENT_GIT_STATUS[1] |
||||||
|
GIT_AHEAD=$__CURRENT_GIT_STATUS[2] |
||||||
|
GIT_BEHIND=$__CURRENT_GIT_STATUS[3] |
||||||
|
GIT_STAGED=$__CURRENT_GIT_STATUS[4] |
||||||
|
GIT_CONFLICTS=$__CURRENT_GIT_STATUS[5] |
||||||
|
GIT_CHANGED=$__CURRENT_GIT_STATUS[6] |
||||||
|
GIT_UNTRACKED=$__CURRENT_GIT_STATUS[7] |
||||||
} |
} |
||||||
|
|
||||||
function prompt_git_info() { |
git_super_status() { |
||||||
|
precmd_update_git_vars |
||||||
if [ -n "$__CURRENT_GIT_STATUS" ]; then |
if [ -n "$__CURRENT_GIT_STATUS" ]; then |
||||||
echo "(%{${fg[red]}%}$__CURRENT_GIT_STATUS[1]%{${fg[default]}%}$__CURRENT_GIT_STATUS[2]%{${fg[magenta]}%}$__CURRENT_GIT_STATUS[3]%{${fg[default]}%})" |
STATUS="$ZSH_THEME_GIT_PROMPT_PREFIX$ZSH_THEME_GIT_PROMPT_BRANCH$GIT_BRANCH%{${reset_color}%}" |
||||||
|
if [ "$GIT_BEHIND" -ne "0" ]; then |
||||||
|
STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_BEHIND$GIT_BEHIND%{${reset_color}%}" |
||||||
|
fi |
||||||
|
if [ "$GIT_AHEAD" -ne "0" ]; then |
||||||
|
STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_AHEAD$GIT_AHEAD%{${reset_color}%}" |
||||||
|
fi |
||||||
|
STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_SEPARATOR" |
||||||
|
if [ "$GIT_STAGED" -ne "0" ]; then |
||||||
|
STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_STAGED$GIT_STAGED%{${reset_color}%}" |
||||||
|
fi |
||||||
|
if [ "$GIT_CONFLICTS" -ne "0" ]; then |
||||||
|
STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_CONFLICTS$GIT_CONFLICTS%{${reset_color}%}" |
||||||
|
fi |
||||||
|
if [ "$GIT_CHANGED" -ne "0" ]; then |
||||||
|
STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_CHANGED$GIT_CHANGED%{${reset_color}%}" |
||||||
|
fi |
||||||
|
if [ "$GIT_UNTRACKED" -ne "0" ]; then |
||||||
|
STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_UNTRACKED%{${reset_color}%}" |
||||||
|
fi |
||||||
|
if [ "$GIT_CHANGED" -eq "0" ] && [ "$GIT_CONFLICTS" -eq "0" ] && [ "$GIT_STAGED" -eq "0" ] && [ "$GIT_UNTRACKED" -eq "0" ]; then |
||||||
|
STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_CLEAN" |
||||||
|
fi |
||||||
|
STATUS="$STATUS%{${reset_color}%}$ZSH_THEME_GIT_PROMPT_SUFFIX" |
||||||
|
echo "$STATUS" |
||||||
fi |
fi |
||||||
} |
} |
||||||
|
|
||||||
|
# Default values for the appearance of the prompt. |
||||||
|
ZSH_THEME_GIT_PROMPT_PREFIX="(" |
||||||
|
ZSH_THEME_GIT_PROMPT_SUFFIX=")" |
||||||
|
ZSH_THEME_GIT_PROMPT_SEPARATOR="|" |
||||||
|
ZSH_THEME_GIT_PROMPT_BRANCH="%{$fg_bold[magenta]%}" |
||||||
|
ZSH_THEME_GIT_PROMPT_STAGED="%{$fg[red]%}%{●%G%}" |
||||||
|
ZSH_THEME_GIT_PROMPT_CONFLICTS="%{$fg[red]%}%{✖%G%}" |
||||||
|
ZSH_THEME_GIT_PROMPT_CHANGED="%{$fg[blue]%}%{✚%G%}" |
||||||
|
ZSH_THEME_GIT_PROMPT_BEHIND="%{↓%G%}" |
||||||
|
ZSH_THEME_GIT_PROMPT_AHEAD="%{↑%G%}" |
||||||
|
ZSH_THEME_GIT_PROMPT_UNTRACKED="%{…%G%}" |
||||||
|
ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[green]%}%{✔%G%}" |
||||||
|
|
||||||
# Set the prompt. |
# Set the prompt. |
||||||
#PROMPT='%B%m%~%b$(prompt_git_info) %# ' |
RPROMPT='$(git_super_status)' |
||||||
# for a right prompt: |
|
||||||
#RPROMPT='%b$(prompt_git_info)' |
|
||||||
RPROMPT='$(prompt_git_info)' |
|
||||||
|
|||||||
@ -1,82 +1,84 @@ |
|||||||
#!/usr/bin/env python |
#!/usr/bin/env python |
||||||
# -*- coding: UTF-8 -*- |
from __future__ import print_function |
||||||
from subprocess import Popen, PIPE |
|
||||||
import re |
|
||||||
|
|
||||||
# change those symbols to whatever you prefer |
import sys |
||||||
symbols = { |
import re |
||||||
'ahead of': '↑', |
import shlex |
||||||
'behind': '↓', |
from subprocess import Popen, PIPE, check_output |
||||||
'staged': '♦', |
|
||||||
'changed': '‣', |
|
||||||
'untracked': '…', |
|
||||||
'clean': '⚡', |
|
||||||
'unmerged': '≠', |
|
||||||
'sha1': ':' |
|
||||||
} |
|
||||||
|
|
||||||
output, error = Popen( |
|
||||||
['git', 'status'], stdout=PIPE, stderr=PIPE, universal_newlines=True).communicate() |
|
||||||
|
|
||||||
if error: |
def get_tagname_or_hash(): |
||||||
import sys |
"""return tagname if exists else hash""" |
||||||
sys.exit(0) |
cmd = 'git log -1 --format="%h%d"' |
||||||
lines = output.splitlines() |
output = check_output(shlex.split(cmd)).decode('utf-8').strip() |
||||||
|
hash_, tagname = None, None |
||||||
|
# get hash |
||||||
|
m = re.search('\(.*\)$', output) |
||||||
|
if m: |
||||||
|
hash_ = output[:m.start()-1] |
||||||
|
# get tagname |
||||||
|
m = re.search('tag: .*[,\)]', output) |
||||||
|
if m: |
||||||
|
tagname = 'tags/' + output[m.start()+len('tag: '): m.end()-1] |
||||||
|
|
||||||
behead_re = re.compile( |
if tagname: |
||||||
r"^# Your branch is (ahead of|behind) '(.*)' by (\d+) commit") |
return tagname |
||||||
diverge_re = re.compile(r"^# and have (\d+) and (\d+) different") |
elif hash_: |
||||||
|
return hash_ |
||||||
|
return None |
||||||
|
|
||||||
status = '' |
|
||||||
staged = re.compile(r'^# Changes to be committed:$', re.MULTILINE) |
|
||||||
changed = re.compile(r'^# Changed but not updated:$', re.MULTILINE) |
|
||||||
untracked = re.compile(r'^# Untracked files:$', re.MULTILINE) |
|
||||||
unmerged = re.compile(r'^# Unmerged paths:$', re.MULTILINE) |
|
||||||
|
|
||||||
|
# `git status --porcelain --branch` can collect all information |
||||||
|
# branch, remote_branch, untracked, staged, changed, conflicts, ahead, behind |
||||||
|
po = Popen(['git', 'status', '--porcelain', '--branch'], stdout=PIPE, stderr=PIPE) |
||||||
|
stdout, sterr = po.communicate() |
||||||
|
if po.returncode != 0: |
||||||
|
sys.exit(0) # Not a git repository |
||||||
|
|
||||||
def execute(*command): |
# collect git status information |
||||||
out, err = Popen(stdout=PIPE, stderr=PIPE, *command).communicate() |
untracked, staged, changed, conflicts = [], [], [], [] |
||||||
if not err: |
ahead, behind = 0, 0 |
||||||
nb = len(out.splitlines()) |
status = [(line[0], line[1], line[2:]) for line in stdout.decode('utf-8').splitlines()] |
||||||
|
for st in status: |
||||||
|
if st[0] == '#' and st[1] == '#': |
||||||
|
if re.search('Initial commit on', st[2]): |
||||||
|
branch = st[2].split(' ')[-1] |
||||||
|
elif re.search('no branch', st[2]): # detached status |
||||||
|
branch = get_tagname_or_hash() |
||||||
|
elif len(st[2].strip().split('...')) == 1: |
||||||
|
branch = st[2].strip() |
||||||
|
else: |
||||||
|
# current and remote branch info |
||||||
|
branch, rest = st[2].strip().split('...') |
||||||
|
if len(rest.split(' ')) == 1: |
||||||
|
# remote_branch = rest.split(' ')[0] |
||||||
|
pass |
||||||
|
else: |
||||||
|
# ahead or behind |
||||||
|
divergence = ' '.join(rest.split(' ')[1:]) |
||||||
|
divergence = divergence.lstrip('[').rstrip(']') |
||||||
|
for div in divergence.split(', '): |
||||||
|
if 'ahead' in div: |
||||||
|
ahead = int(div[len('ahead '):].strip()) |
||||||
|
elif 'behind' in div: |
||||||
|
behind = int(div[len('behind '):].strip()) |
||||||
|
elif st[0] == '?' and st[1] == '?': |
||||||
|
untracked.append(st) |
||||||
else: |
else: |
||||||
nb = '?' |
if st[1] == 'M': |
||||||
return nb |
changed.append(st) |
||||||
|
if st[0] == 'U': |
||||||
if staged.search(output): |
conflicts.append(st) |
||||||
nb = execute( |
elif st[0] != ' ': |
||||||
['git', 'diff', '--staged', '--name-only', '--diff-filter=ACDMRT']) |
staged.append(st) |
||||||
status += '%s%s' % (symbols['staged'], nb) |
|
||||||
if unmerged.search(output): |
|
||||||
nb = execute(['git', 'diff', '--staged', '--name-only', '--diff-filter=U']) |
|
||||||
status += '%s%s' % (symbols['unmerged'], nb) |
|
||||||
if changed.search(output): |
|
||||||
nb = execute(['git', 'diff', '--name-only', '--diff-filter=ACDMRT']) |
|
||||||
status += '%s%s' % (symbols['changed'], nb) |
|
||||||
if untracked.search(output): |
|
||||||
status += symbols['untracked'] |
|
||||||
if status == '': |
|
||||||
status = symbols['clean'] |
|
||||||
|
|
||||||
remote = '' |
|
||||||
|
|
||||||
bline = lines[0] |
|
||||||
if bline.find('Not currently on any branch') != -1: |
|
||||||
branch = symbols['sha1'] + Popen([ |
|
||||||
'git', |
|
||||||
'rev-parse', |
|
||||||
'--short', |
|
||||||
'HEAD'], stdout=PIPE).communicate()[0][:-1] |
|
||||||
else: |
|
||||||
branch = bline.split(' ')[-1] |
|
||||||
bstatusline = lines[1] |
|
||||||
match = behead_re.match(bstatusline) |
|
||||||
if match: |
|
||||||
remote = symbols[match.groups()[0]] |
|
||||||
remote += match.groups()[2] |
|
||||||
elif lines[2:]: |
|
||||||
div_match = diverge_re.match(lines[2]) |
|
||||||
if div_match: |
|
||||||
remote = "{behind}{1}{ahead of}{0}".format( |
|
||||||
*div_match.groups(), **symbols) |
|
||||||
|
|
||||||
print('\n'.join([branch, remote, status])) |
out = ' '.join([ |
||||||
|
branch, |
||||||
|
str(ahead), |
||||||
|
str(behind), |
||||||
|
str(len(staged)), |
||||||
|
str(len(conflicts)), |
||||||
|
str(len(changed)), |
||||||
|
str(len(untracked)), |
||||||
|
]) |
||||||
|
print(out, end='') |
||||||
|
|||||||
@ -0,0 +1,21 @@ |
|||||||
|
#compdef jira |
||||||
|
#autoload |
||||||
|
|
||||||
|
local -a _1st_arguments |
||||||
|
_1st_arguments=( |
||||||
|
'new:create a new issue' |
||||||
|
'dashboard:open the dashboard' |
||||||
|
'reported:search for issues reported by a user' |
||||||
|
'assigned:search for issues assigned to a user' |
||||||
|
) |
||||||
|
|
||||||
|
_arguments -C \ |
||||||
|
':command:->command' \ |
||||||
|
'*::options:->options' |
||||||
|
|
||||||
|
case $state in |
||||||
|
(command) |
||||||
|
_describe -t commands "jira subcommand" _1st_arguments |
||||||
|
return |
||||||
|
;; |
||||||
|
esac |
||||||
@ -0,0 +1,27 @@ |
|||||||
|
# ------------------------------------------------------------------------------ |
||||||
|
# Author |
||||||
|
# ------ |
||||||
|
# |
||||||
|
# * Jerry Ling<jerryling315@gmail.com> |
||||||
|
# |
||||||
|
# ------------------------------------------------------------------------------ |
||||||
|
# Usgae |
||||||
|
# ----- |
||||||
|
# |
||||||
|
# man will be inserted before the command |
||||||
|
# |
||||||
|
# ------------------------------------------------------------------------------ |
||||||
|
|
||||||
|
man-command-line() { |
||||||
|
[[ -z $BUFFER ]] && zle up-history |
||||||
|
[[ $BUFFER != man\ * ]] && LBUFFER="man $LBUFFER" |
||||||
|
} |
||||||
|
zle -N man-command-line |
||||||
|
# Defined shortcut keys: [Esc]man |
||||||
|
bindkey "\e"man man-command-line |
||||||
|
|
||||||
|
|
||||||
|
# ------------------------------------------------------------------------------ |
||||||
|
# Also, you might want to use man-preview included in 'osx' plugin |
||||||
|
# just substitute "man" in the function with "man-preview" after you included OS X in |
||||||
|
# the .zshrc |
||||||
@ -0,0 +1,25 @@ |
|||||||
|
# Spring Boot oh-my-zsh plugin |
||||||
|
oh-my-zsh Spring Boot plugin |
||||||
|
|
||||||
|
## Spring Boot autocomplete plugin |
||||||
|
|
||||||
|
- Adds autocomplete options for all spring boot commands. |
||||||
|
|
||||||
|
## Manual Install |
||||||
|
|
||||||
|
$ cd ~/.oh-my-zsh/plugins |
||||||
|
$ git clone git@github.com:linux-china/oh-my-zsh-spring-boot-plugin.git spring |
||||||
|
|
||||||
|
Adjust your .zshrc file and add spring to plugins=(...) |
||||||
|
|
||||||
|
## Tips |
||||||
|
|
||||||
|
* Install Spring Cloud plugin: spring install org.springframework.cloud:spring-cloud-cli:1.0.2.RELEASE |
||||||
|
|
||||||
|
## Reference |
||||||
|
|
||||||
|
* Spring Boot: http://projects.spring.io/spring-boot/ |
||||||
|
* Spring Boot CLI: http://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/#cli |
||||||
|
|
||||||
|
Maintainer : linux_china ([@linux_china](https://twitter.com/linux_china)) |
||||||
|
|
||||||
@ -0,0 +1,29 @@ |
|||||||
|
#compdef spring 'spring' |
||||||
|
#autoload |
||||||
|
|
||||||
|
_spring() { |
||||||
|
|
||||||
|
local cword |
||||||
|
let cword=CURRENT-1 |
||||||
|
|
||||||
|
local hints |
||||||
|
hints=() |
||||||
|
|
||||||
|
local reply |
||||||
|
while read -r line; do |
||||||
|
reply=`echo "$line" | awk '{printf $1 ":"; for (i=2; i<NF; i++) printf $i " "; print $NF}'` |
||||||
|
hints+=("$reply") |
||||||
|
done < <(spring hint ${cword} ${words[*]}) |
||||||
|
|
||||||
|
if ((cword == 1)) { |
||||||
|
_describe -t commands 'commands' hints |
||||||
|
return 0 |
||||||
|
} |
||||||
|
|
||||||
|
_describe -t options 'options' hints |
||||||
|
_files |
||||||
|
|
||||||
|
return 0 |
||||||
|
} |
||||||
|
|
||||||
|
_spring "$@" |
||||||
@ -0,0 +1,9 @@ |
|||||||
|
# The Fuck |
||||||
|
|
||||||
|
[The Fuck](https://github.com/nvbn/thefuck) plugin — magnificent app which corrects your previous console command. |
||||||
|
|
||||||
|
## Usage |
||||||
|
Press `ESC` twice to correct previous console command. |
||||||
|
|
||||||
|
## Notes |
||||||
|
`Esc`-`Esc` key binding conflicts with [sudo](https://github.com/robbyrussell/oh-my-zsh/tree/master/plugins/sudo) plugin. |
||||||
@ -0,0 +1,17 @@ |
|||||||
|
if [[ -z $commands[thefuck] ]]; then |
||||||
|
echo 'thefuck is not installed, you should "pip install thefuck" first' |
||||||
|
return -1 |
||||||
|
fi |
||||||
|
|
||||||
|
# Register alias |
||||||
|
eval "$(thefuck --alias)" |
||||||
|
|
||||||
|
fuck-command-line() { |
||||||
|
local FUCK="$(THEFUCK_REQUIRE_CONFIRMATION=0 thefuck $(fc -ln -1 | tail -n 1) 2> /dev/null)" |
||||||
|
[[ -z $FUCK ]] && echo -n -e "\a" && return |
||||||
|
BUFFER=$FUCK |
||||||
|
zle end-of-line |
||||||
|
} |
||||||
|
zle -N fuck-command-line |
||||||
|
# Defined shortcut keys: [Esc] [Esc] |
||||||
|
bindkey "\e\e" fuck-command-line |
||||||
Loading…
Reference in new issue