summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndre Arko <andre@arko.net>2015-06-07 23:01:29 -0700
committerAndre Arko <andre@arko.net>2015-06-07 23:01:29 -0700
commitaf54436f32489167f161dbd098f003b5def22c35 (patch)
tree445144d6964ed557a68f00f0b3529f828369bc1c
parentde5c595bee595b1c5a77c684b7f89f7c521fae5c (diff)
downloadbundler-af54436f32489167f161dbd098f003b5def22c35.tar.gz
put related code together
-rw-r--r--lib/bundler/cli.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/bundler/cli.rb b/lib/bundler/cli.rb
index 1bc25489fd..1c8d4993ab 100644
--- a/lib/bundler/cli.rb
+++ b/lib/bundler/cli.rb
@@ -8,10 +8,13 @@ module Bundler
def initialize(*args)
super
- current_cmd = args.last[:current_command].name
+
custom_gemfile = options[:gemfile] || Bundler.settings[:gemfile]
ENV['BUNDLE_GEMFILE'] = File.expand_path(custom_gemfile) if custom_gemfile
+
Bundler.settings[:retry] = options[:retry] if options[:retry]
+
+ current_cmd = args.last[:current_command].name
auto_install if AUTO_INSTALL_CMDS.include?(current_cmd)
rescue UnknownArgumentError => e
raise InvalidOption, e.message