Merge pull request #2212 from bsiegel/bundler_bi_function

Change bundler plugin's `bi` alias to a function

plugins/bundler/bundler.plugin.zsh

@@ -4,13 +4,31 @@ alias bp="bundle package"
 alias bo="bundle open"
 alias bu="bundle update"
 
-
 # The following is based on https://github.com/gma/bundler-exec
 
 bundled_commands=(annotate berks cap capify cucumber foodcritic foreman guard jekyll kitchen knife middleman nanoc rackup rainbows rake rspec ruby shotgun spec spin spork strainer tailor taps thin thor unicorn unicorn_rails puma)
 
 ## Functions
 
+bi() {
+  if _bundler-installed && _within-bundled-project; then
+    local bundler_version=`bundle version | cut -d' ' -f3`
+    if [[ $bundler_version > '1.4.0' || $bundler_version = '1.4.0' ]]; then
+      if [[ "$(uname)" == 'Darwin' ]]
+      then
+        local cores_num="$(sysctl hw.ncpu | awk '{print $2}')"
+      else
+        local cores_num="$(nproc)"
+      fi
+      bundle install --jobs=$cores_num $@
+    else
+      bundle install $@
+    fi
+  else
+    echo "Can't 'bundle install' outside a bundled project"
+  fi
+}
+
 _bundler-installed() {
   which bundle > /dev/null 2>&1
 }
@@ -32,22 +50,8 @@ _run-with-bundler() {
   fi
 }
 
-if _bundler-installed; then
-	bundler_version=`bundle version | cut -d' ' -f3`
-	if [[ $bundler_version > '1.4.0' || $bundler_version = '1.4.0' ]]; then
-		if [[ "$(uname)" == 'Darwin' ]]
-		then
-			local cores_num="$(sysctl hw.ncpu | awk '{print $2}')"
-		else
-			local cores_num="$(nproc)"
-		fi
-		eval "alias bi='bundle install --jobs=$cores_num'"
-	else
-		alias bi='bundle install' 
-	fi
-
-	## Main program
-	for cmd in $bundled_commands; do
+## Main program
+for cmd in $bundled_commands; do
   eval "function unbundled_$cmd () { $cmd \$@ }"
   eval "function bundled_$cmd () { _run-with-bundler $cmd \$@}"
   alias $cmd=bundled_$cmd
@@ -55,5 +59,5 @@ if _bundler-installed; then
   if which _$cmd > /dev/null 2>&1; then
         compdef _$cmd bundled_$cmd=$cmd
   fi
-	done
-fi
+done
+