From c65a53df811953b9f4117ff0b8014d869565bf9d Mon Sep 17 00:00:00 2001
From: Roey Darwish Dror <roey.ghost@gmail.com>
Date: Fri, 15 Jun 2012 10:07:22 +0300
Subject: Fixed unmached " in yum plugin
---
plugins/yum/yum.plugin.zsh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'plugins')
diff --git a/plugins/yum/yum.plugin.zsh b/plugins/yum/yum.plugin.zsh
index c9966f1b1..69abfc4ce 100644
--- a/plugins/yum/yum.plugin.zsh
+++ b/plugins/yum/yum.plugin.zsh
@@ -5,7 +5,7 @@ alias yp="yum info" # show package info
alias yl="yum list" # list packages
alias ygl="yum grouplist" # list package groups
alias yli="yum list installed" # print all installed packages
-alias ymc="yum makecache # rebuilds the yum package list
+alias ymc="yum makecache" # rebuilds the yum package list
alias yu="sudo yum update" # upgrate packages
alias yi="sudo yum install" # install package
--
cgit v1.2.3-70-g09d2
From 82f785bc6751dc7c199b5d1ea068567120b92511 Mon Sep 17 00:00:00 2001
From: James Walker <walkah@walkah.net>
Date: Mon, 18 Jun 2012 10:41:19 -0400
Subject: remove readlink call and clean up
---
plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
(limited to 'plugins')
diff --git a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
index afdad1bea..a93c8e863 100644
--- a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
+++ b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
@@ -10,11 +10,9 @@ for wrapsource in "/usr/local/bin/virtualenvwrapper.sh" "/etc/bash_completion.d/
# by placing a .venv file in the project root with a virtualenv name in it
function workon_cwd {
# Check that this is a Git repo
- GIT_DIR=`git rev-parse --git-dir 2> /dev/null`
+ PROJECT_ROOT=`git rev-parse --show-toplevel 2> /dev/null`
if (( $? == 0 )); then
- # Find the repo root and check for virtualenv name override
- GIT_DIR=`readlink -f $GIT_DIR`
- PROJECT_ROOT=`dirname "$GIT_DIR"`
+ # Check for virtualenv name override
ENV_NAME=`basename "$PROJECT_ROOT"`
if [[ -f "$PROJECT_ROOT/.venv" ]]; then
ENV_NAME=`cat "$PROJECT_ROOT/.venv"`
@@ -30,6 +28,7 @@ for wrapsource in "/usr/local/bin/virtualenvwrapper.sh" "/etc/bash_completion.d/
# Note: this only happens if the virtualenv was activated automatically
deactivate && unset CD_VIRTUAL_ENV
fi
+ unset PROJECT_ROOT
}
# New cd function that does the virtualenv magic
--
cgit v1.2.3-70-g09d2
From e9a9deacb09196a48a39adc827d861e1896f4c59 Mon Sep 17 00:00:00 2001
From: Tima Maslyuchenko <dudapip3@gmail.com>
Date: Mon, 18 Jun 2012 20:15:57 +0300
Subject: rbenv plugin now uses 'brew --prefix rbenv' command to find rbenv
folder
---
plugins/rbenv/rbenv.plugin.zsh | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
(limited to 'plugins')
diff --git a/plugins/rbenv/rbenv.plugin.zsh b/plugins/rbenv/rbenv.plugin.zsh
index ae37404cd..a0a64c7e4 100644
--- a/plugins/rbenv/rbenv.plugin.zsh
+++ b/plugins/rbenv/rbenv.plugin.zsh
@@ -1,5 +1,18 @@
+function is_homebrew_installed() {
+ type brew &> /dev/null
+}
+
+function is_rbenv_installed() {
+ brew --prefix rbenv &> /dev/null
+}
+
FOUND_RBENV=0
-for rbenvdir in "$HOME/.rbenv" "/usr/local/rbenv" "/opt/rbenv" ; do
+rbenvdirs=("$HOME/.rbenv" "/usr/local/rbenv" "/opt/rbenv")
+if is_homebrew_installed && is_rbenv_installed ; then
+ rbenvdirs=($(brew --prefix rbenv) "${rbenvdirs[@]}")
+fi
+
+for rbenvdir in "${rbenvdirs[@]}" ; do
if [ -d $rbenvdir/bin -a $FOUND_RBENV -eq 0 ] ; then
FOUND_RBENV=1
export RBENV_ROOT=$rbenvdir
--
cgit v1.2.3-70-g09d2
From 5931f64308cbf4b0a8ef740a6b4eda5834479bd7 Mon Sep 17 00:00:00 2001
From: Tima Maslyuchenko <dudapip3@gmail.com>
Date: Mon, 18 Jun 2012 21:29:24 +0300
Subject: sanitized code according to coding style
---
plugins/rbenv/rbenv.plugin.zsh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'plugins')
diff --git a/plugins/rbenv/rbenv.plugin.zsh b/plugins/rbenv/rbenv.plugin.zsh
index a0a64c7e4..a62dd5602 100644
--- a/plugins/rbenv/rbenv.plugin.zsh
+++ b/plugins/rbenv/rbenv.plugin.zsh
@@ -1,14 +1,14 @@
-function is_homebrew_installed() {
+_homebrew-installed() {
type brew &> /dev/null
}
-function is_rbenv_installed() {
+_rbenv-from-homebrew-installed() {
brew --prefix rbenv &> /dev/null
}
FOUND_RBENV=0
rbenvdirs=("$HOME/.rbenv" "/usr/local/rbenv" "/opt/rbenv")
-if is_homebrew_installed && is_rbenv_installed ; then
+if _homebrew-installed && _rbenv-from-homebrew-installed ; then
rbenvdirs=($(brew --prefix rbenv) "${rbenvdirs[@]}")
fi
--
cgit v1.2.3-70-g09d2
From 3aa0cb74d0a19a8053889a976404a7915585466e Mon Sep 17 00:00:00 2001
From: Volker Pacher <volker.pacher@gmail.com>
Date: Fri, 22 Jun 2012 18:27:21 +0100
Subject: added plugin for jruby
---
plugins/jruby/jruby.plugin.zsh | 3 +++
1 file changed, 3 insertions(+)
create mode 100755 plugins/jruby/jruby.plugin.zsh
(limited to 'plugins')
diff --git a/plugins/jruby/jruby.plugin.zsh b/plugins/jruby/jruby.plugin.zsh
new file mode 100755
index 000000000..58781fc72
--- /dev/null
+++ b/plugins/jruby/jruby.plugin.zsh
@@ -0,0 +1,3 @@
+# Aliases
+alias jrspec='jruby --debug -S rspec --debug'
+alias jprofile='jruby --profile.api -S rspec'
--
cgit v1.2.3-70-g09d2
From 5c37c85fb49a377b59115efc2aa132665982ac06 Mon Sep 17 00:00:00 2001
From: Volker Pacher <volker.pacher@gmail.com>
Date: Fri, 22 Jun 2012 18:33:11 +0100
Subject: added jexec
---
plugins/jruby/jruby.plugin.zsh | 1 +
1 file changed, 1 insertion(+)
(limited to 'plugins')
diff --git a/plugins/jruby/jruby.plugin.zsh b/plugins/jruby/jruby.plugin.zsh
index 58781fc72..bb7975b10 100755
--- a/plugins/jruby/jruby.plugin.zsh
+++ b/plugins/jruby/jruby.plugin.zsh
@@ -1,3 +1,4 @@
# Aliases
alias jrspec='jruby --debug -S rspec --debug'
alias jprofile='jruby --profile.api -S rspec'
+alias jexec='jruby -S'
--
cgit v1.2.3-70-g09d2