From d386a58f6f1865aaa35eda5af55cff3ff3cca4ca Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Thu, 15 Oct 2020 13:20:25 +0900 Subject: Merge bundler-2.2.0.rc.2 --- lib/bundler/plugin/index.rb | 2 +- lib/bundler/plugin/installer.rb | 2 +- lib/bundler/plugin/installer/rubygems.rb | 2 +- lib/bundler/plugin/source_list.rb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'lib/bundler/plugin') diff --git a/lib/bundler/plugin/index.rb b/lib/bundler/plugin/index.rb index 8aea92ca0c..819bc60588 100644 --- a/lib/bundler/plugin/index.rb +++ b/lib/bundler/plugin/index.rb @@ -133,7 +133,7 @@ module Bundler @hooks[event] || [] end - private + private # Reads the index file from the directory and initializes the instance # variables. diff --git a/lib/bundler/plugin/installer.rb b/lib/bundler/plugin/installer.rb index bcea3f0e45..26cec4f18c 100644 --- a/lib/bundler/plugin/installer.rb +++ b/lib/bundler/plugin/installer.rb @@ -41,7 +41,7 @@ module Bundler install_from_specs specs end - private + private def check_sources_consistency!(options) if options.key?(:git) && options.key?(:local_git) diff --git a/lib/bundler/plugin/installer/rubygems.rb b/lib/bundler/plugin/installer/rubygems.rb index 7ae74fa93b..e144c14b24 100644 --- a/lib/bundler/plugin/installer/rubygems.rb +++ b/lib/bundler/plugin/installer/rubygems.rb @@ -8,7 +8,7 @@ module Bundler "#{spec.name} #{spec.version}" end - private + private def requires_sudo? false # Will change on implementation of project level plugins diff --git a/lib/bundler/plugin/source_list.rb b/lib/bundler/plugin/source_list.rb index f0e212205f..b90a331d28 100644 --- a/lib/bundler/plugin/source_list.rb +++ b/lib/bundler/plugin/source_list.rb @@ -17,7 +17,7 @@ module Bundler path_sources + git_sources + rubygems_sources + [metadata_source] end - private + private def rubygems_aggregate_class Plugin::Installer::Rubygems -- cgit v1.2.3