summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--plugins/bundler-exec/bundler-exec.plugin.zsh34
-rw-r--r--plugins/bundler/bundler.plugin.zsh34
2 files changed, 34 insertions, 34 deletions
diff --git a/plugins/bundler-exec/bundler-exec.plugin.zsh b/plugins/bundler-exec/bundler-exec.plugin.zsh
deleted file mode 100644
index 3417ea81c..000000000
--- a/plugins/bundler-exec/bundler-exec.plugin.zsh
+++ /dev/null
@@ -1,34 +0,0 @@
-# This plugin is based on https://github.com/gma/bundler-exec
-# modify the bundled_commands if needed
-
-bundled_commands=(cap capify cucumber heroku rackup rails rake rspec ruby shotgun spec spork thin unicorn unicorn_rails)
-
-## Functions
-
-_bundler-installed() {
- which bundle > /dev/null 2>&1
-}
-
-_within-bundled-project() {
- local check_dir=$PWD
- while [ "$(dirname $check_dir)" != "/" ]; do
- [ -f "$check_dir/Gemfile" ] && return
- check_dir="$(dirname $check_dir)"
- done
- false
-}
-
-_run-with-bundler() {
- local command="$1"
- shift
- if _bundler-installed && _within-bundled-project; then
- bundle exec $command "$@"
- else
- $command "$@"
- fi
-}
-
-## Main program
-for cmd in $bundled_commands; do
- alias $cmd="_run-with-bundler $cmd"
-done
diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
index fb40e2cec..fcf3e85fc 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -1,3 +1,37 @@
alias be="bundle exec"
alias bi="bundle install"
alias bu="bundle update"
+
+# The following is based on https://github.com/gma/bundler-exec
+
+bundled_commands=(cap capify cucumber heroku rackup rails rake rspec ruby shotgun spec spork thin unicorn unicorn_rails)
+
+## Functions
+
+_bundler-installed() {
+ which bundle > /dev/null 2>&1
+}
+
+_within-bundled-project() {
+ local check_dir=$PWD
+ while [ "$(dirname $check_dir)" != "/" ]; do
+ [ -f "$check_dir/Gemfile" ] && return
+ check_dir="$(dirname $check_dir)"
+ done
+ false
+}
+
+_run-with-bundler() {
+ local command="$1"
+ shift
+ if _bundler-installed && _within-bundled-project; then
+ bundle exec $command "$@"
+ else
+ $command "$@"
+ fi
+}
+
+## Main program
+for cmd in $bundled_commands; do
+ alias $cmd="_run-with-bundler $cmd"
+done