diff options
| author | Samuel Giddins <segiddins@segiddins.me> | 2016-09-22 12:02:53 +0200 |
|---|---|---|
| committer | Samuel Giddins <segiddins@segiddins.me> | 2016-09-22 12:02:53 +0200 |
| commit | 23a17444609e469a05b6082ac0b7d799194dcb94 (patch) | |
| tree | a0b92099b0cc79e0e0aa210308399d6e14606697 | |
| parent | e941efb1b3657ebe28f4da64a469094014c51071 (diff) | |
| download | bundler-seg-2-0-enable-feature-flags.tar.gz | |
Default allow_offline_install and only_update_to_newer_versions to true on 2.0seg-2-0-enable-feature-flags
| -rw-r--r-- | lib/bundler/definition.rb | 2 | ||||
| -rw-r--r-- | lib/bundler/feature_flag.rb | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb index 12951cdf9c..6c8fc1ddde 100644 --- a/lib/bundler/definition.rb +++ b/lib/bundler/definition.rb @@ -886,7 +886,7 @@ module Bundler end def additional_base_requirements_for_resolve - return [] unless @locked_gems && Bundler.settings[:only_update_to_newer_versions] + return [] unless @locked_gems && Bundler.feature_flag.only_update_to_newer_versions? @locked_gems.specs.reduce({}) do |requirements, locked_spec| dep = Gem::Dependency.new(locked_spec.name, ">= #{locked_spec.version}") requirements[locked_spec.name] = DepProxy.new(dep, locked_spec.platform) diff --git a/lib/bundler/feature_flag.rb b/lib/bundler/feature_flag.rb index adbaf375f5..150cac1e67 100644 --- a/lib/bundler/feature_flag.rb +++ b/lib/bundler/feature_flag.rb @@ -14,8 +14,9 @@ module Bundler (1..10).each {|v| define_method("bundler_#{v}_mode?") { major_version >= v } } - settings_flag :allow_offline_install - settings_flag :plugins + settings_flag(:allow_offline_install) { bundler_2_mode? } + settings_flag(:only_update_to_newer_versions) { bundler_2_mode? } + settings_flag(:plugins) { @bundler_version >= Gem::Version.new("1.14") } def initialize(bundler_version) @bundler_version = Gem::Version.create(bundler_version) |