cli.rb in bundler-1.5.2

- old
+ new

@@ -19,11 +19,11 @@
       Bundler::Retry.attempts = options[:retry] || Bundler.settings[:retry] || Bundler::Retry::DEFAULT_ATTEMPTS
       Bundler.rubygems.ui = UI::RGProxy.new(Bundler.ui)
     rescue UnknownArgumentError => e
       raise InvalidOption, e.message
     ensure
-      options ||= {}
+      self.options ||= {}
       Bundler.ui = UI::Shell.new(options)
       Bundler.ui.level = "debug" if options["verbose"]
     end
 
     check_unknown_options!(:except => [:config, :exec])
@@ -230,12 +230,10 @@
       if opts[:deployment] == false
         Bundler.settings.delete(:frozen)
         opts[:system] = true
       end
 
-      opts["no-cache"] ||= opts[:local]
-
       Bundler.settings[:path]     = nil if opts[:system]
       Bundler.settings[:path]     = "vendor/bundle" if opts[:deployment]
       Bundler.settings[:path]     = opts["path"] if opts["path"]
       Bundler.settings[:path]     ||= "bundle" if opts["standalone"]
       Bundler.settings[:bin]      = opts["binstubs"] if opts["binstubs"]
@@ -253,10 +251,10 @@
       Gem.load_env_plugins if Gem.respond_to?(:load_env_plugins)
 
       definition = Bundler.definition
       definition.validate_ruby!
       Installer.install(Bundler.root, definition, opts)
-      Bundler.load.cache if Bundler.root.join("vendor/cache").exist? && !opts["no-cache"]
+      Bundler.load.cache if Bundler.root.join("vendor/cache").exist? && !options["no-cache"]
 
       if Bundler.settings[:path]
         absolute_path = File.expand_path(Bundler.settings[:path])
         relative_path = absolute_path.sub(File.expand_path('.'), '.')
         Bundler.ui.confirm "Your bundle is complete!"