ruby-changes:67418
From: David <ko1@a...>
Date: Tue, 31 Aug 2021 19:07:02 +0900 (JST)
Subject: [ruby-changes:67418] 97de4c02ad (master): [rubygems/rubygems] Remove now unnecessary code
https://git.ruby-lang.org/ruby.git/commit/?id=97de4c02ad From 97de4c02adf2c32c801eec5a683ae7d0c6dd6615 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@r...> Date: Sat, 31 Jul 2021 16:39:20 +0200 Subject: [rubygems/rubygems] Remove now unnecessary code https://github.com/rubygems/rubygems/commit/d74830d00b --- lib/bundler/cli/check.rb | 2 +- lib/bundler/definition.rb | 6 ------ lib/bundler/source.rb | 2 -- lib/bundler/source/rubygems.rb | 6 ------ lib/bundler/source_list.rb | 4 ---- 5 files changed, 1 insertion(+), 19 deletions(-) diff --git a/lib/bundler/cli/check.rb b/lib/bundler/cli/check.rb index 65c5133..4221fc7 100644 --- a/lib/bundler/cli/check.rb +++ b/lib/bundler/cli/check.rb @@ -15,7 +15,7 @@ module Bundler https://github.com/ruby/ruby/blob/trunk/lib/bundler/cli/check.rb#L15 definition.validate_runtime! begin - definition.resolve_only_locally! + definition.resolve_with_cache! not_installed = definition.missing_specs rescue GemNotFound, VersionConflict Bundler.ui.error "Bundler can't satisfy your Gemfile's dependencies." diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb index 2bd1290..621bda6 100644 --- a/lib/bundler/definition.rb +++ b/lib/bundler/definition.rb @@ -166,12 +166,6 @@ module Bundler https://github.com/ruby/ruby/blob/trunk/lib/bundler/definition.rb#L166 @multisource_allowed end - def resolve_only_locally! - @remote = false - sources.local_only! - resolve - end - def resolve_with_cache! sources.cached! resolve diff --git a/lib/bundler/source.rb b/lib/bundler/source.rb index 434112a..7bf493d 100644 --- a/lib/bundler/source.rb +++ b/lib/bundler/source.rb @@ -36,8 +36,6 @@ module Bundler https://github.com/ruby/ruby/blob/trunk/lib/bundler/source.rb#L36 def local!; end - def local_only!; end - def cached!; end def remote!; end diff --git a/lib/bundler/source/rubygems.rb b/lib/bundler/source/rubygems.rb index 2e0ecb1..298ff98 100644 --- a/lib/bundler/source/rubygems.rb +++ b/lib/bundler/source/rubygems.rb @@ -26,12 +26,6 @@ module Bundler https://github.com/ruby/ruby/blob/trunk/lib/bundler/source/rubygems.rb#L26 Array(options["remotes"]).reverse_each {|r| add_remote(r) } end - def local_only! - @specs = nil - @allow_local = true - @allow_remote = false - end - def local! return if @allow_local diff --git a/lib/bundler/source_list.rb b/lib/bundler/source_list.rb index d6310b7..b97206f 100644 --- a/lib/bundler/source_list.rb +++ b/lib/bundler/source_list.rb @@ -136,10 +136,6 @@ module Bundler https://github.com/ruby/ruby/blob/trunk/lib/bundler/source_list.rb#L136 different_sources?(lock_sources, replacement_sources) end - def local_only! - all_sources.each(&:local_only!) - end - def cached! all_sources.each(&:cached!) end -- cgit v1.1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/