From 13e4cc6c8e498ae5daae4862e604e1ca9966544e Mon Sep 17 00:00:00 2001 From: Samuel Giddins Date: Wed, 17 Feb 2016 23:12:52 -0600 Subject: [CLI] Ensure `bundle install` will always install --- lib/bundler/cli.rb | 4 ++++ lib/bundler/settings.rb | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/bundler/cli.rb b/lib/bundler/cli.rb index 1fed1b58f0..da6c7c0dfb 100644 --- a/lib/bundler/cli.rb +++ b/lib/bundler/cli.rb @@ -170,7 +170,11 @@ module Bundler map "i" => "install" def install require "bundler/cli/install" + no_install = Bundler.settings[:no_install] + Bundler.settings[:no_install] = false Install.new(options.dup).run + ensure + Bundler.settings[:no_install] = no_install end desc "update [OPTIONS]", "update the current environment" diff --git a/lib/bundler/settings.rb b/lib/bundler/settings.rb index 634d9dc14a..175c9a76db 100644 --- a/lib/bundler/settings.rb +++ b/lib/bundler/settings.rb @@ -3,7 +3,7 @@ require "uri" module Bundler class Settings - BOOL_KEYS = %w(frozen cache_all no_prune disable_local_branch_check disable_shared_gems ignore_messages gem.mit gem.coc silence_root_warning).freeze + BOOL_KEYS = %w(frozen cache_all no_prune disable_local_branch_check disable_shared_gems ignore_messages gem.mit gem.coc silence_root_warning no_install).freeze NUMBER_KEYS = %w(retry timeout redirect ssl_verify_mode).freeze DEFAULT_CONFIG = { :retry => 3, :timeout => 10, :redirect => 5 }.freeze -- cgit v1.2.1