Ver código fonte

Dropped rbenv integration.

Just having a script installed in the rbenv shims directory, and wanting
to be able to run that script on the command line, does not necessarily
imply that it should be part of your bundle.
Graham Ashton 13 anos atrás
pai
commit
3fafb9aa13
2 arquivos alterados com 2 adições e 26 exclusões
  1. 0 11
      README.md
  2. 2 15
      bundler-exec.sh

+ 0 - 11
README.md

@@ -55,14 +55,3 @@ use `which` to find the full path to executable and then run it, like
 this:
 
     $ $(which ruby) -e 'puts "hello"'
-
-## rbenv Integration
-
-If you have [rbenv][] installed, bundler-exec will hook itself up
-to all your rbenv shims without any intervention. If running `rbenv
-rehash` creates a new shim file, you'll need to reload bundler-exec,
-like so:
-
-    $ source ~/.bundler-exec.sh
-
-[rbenv]: https://github.com/sstephenson/rbenv

+ 2 - 15
bundler-exec.sh

@@ -6,18 +6,9 @@
 
 ## Functions
 
-rbenv-installed()
-{
-    which rbenv > /dev/null 2>&1
-}
-
 bundler-installed()
 {
-    if rbenv-installed; then
-        rbenv which bundle > /dev/null 2>&1
-    else
-        which bundle > /dev/null 2>&1
-    fi
+    which bundle > /dev/null 2>&1
 }
 
 within-bundled-project()
@@ -41,10 +32,7 @@ run-with-bundler()
 
 ## Main program
 
-if rbenv-installed; then
-    BUNDLED_COMMANDS=$(/bin/ls ~/.rbenv/shims)
-else
-    BUNDLED_COMMANDS="${BUNDLED_COMMANDS:-
+BUNDLED_COMMANDS="${BUNDLED_COMMANDS:-
 cap
 capify
 cucumber
@@ -73,7 +61,6 @@ turn
 unicorn
 unicorn_rails
 }"
-fi
 
 for CMD in $BUNDLED_COMMANDS; do
     if [[ $CMD != "bundle" && $CMD != "gem" ]]; then