62 lines
1.9 KiB
Diff
62 lines
1.9 KiB
Diff
From 82960c262fea081cdd3df14ebe573ff1c4925d0c Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@riseup.net>
|
|
Date: Fri, 6 Aug 2021 12:21:23 +0200
|
|
Subject: [PATCH] Also load user installed rubygems plugins
|
|
|
|
---
|
|
lib/rubygems.rb | 4 +++-
|
|
test/rubygems/test_gem.rb | 25 +++++++++++++++++++++++++
|
|
2 files changed, 28 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/lib/rubygems.rb b/lib/rubygems.rb
|
|
index a631cde8bf8..17881e2e0e9 100644
|
|
--- a/lib/rubygems.rb
|
|
+++ b/lib/rubygems.rb
|
|
@@ -1063,7 +1063,9 @@ def self.load_plugin_files(plugins) # :nodoc:
|
|
# Find rubygems plugin files in the standard location and load them
|
|
|
|
def self.load_plugins
|
|
- load_plugin_files Gem::Util.glob_files_in_dir("*#{Gem.plugin_suffix_pattern}", plugindir)
|
|
+ Gem.path.each do |gem_path|
|
|
+ load_plugin_files Gem::Util.glob_files_in_dir("*#{Gem.plugin_suffix_pattern}", plugindir(gem_path))
|
|
+ end
|
|
end
|
|
|
|
##
|
|
diff --git a/test/rubygems/test_gem.rb b/test/rubygems/test_gem.rb
|
|
index 0d4b1571ca7..da154dac75b 100644
|
|
--- a/test/rubygems/test_gem.rb
|
|
+++ b/test/rubygems/test_gem.rb
|
|
@@ -1581,6 +1581,31 @@ def test_load_plugins
|
|
assert_equal %w[plugin], PLUGINS_LOADED
|
|
end
|
|
|
|
+ def test_load_user_installed_plugins
|
|
+ plugin_path = File.join "lib", "rubygems_plugin.rb"
|
|
+
|
|
+ Dir.chdir @tempdir do
|
|
+ FileUtils.mkdir_p 'lib'
|
|
+ File.open plugin_path, "w" do |fp|
|
|
+ fp.puts "class TestGem; PLUGINS_LOADED << 'plugin'; end"
|
|
+ end
|
|
+
|
|
+ foo = util_spec 'foo', '1' do |s|
|
|
+ s.files << plugin_path
|
|
+ end
|
|
+
|
|
+ install_gem_user foo
|
|
+ end
|
|
+
|
|
+ Gem.paths = { "GEM_PATH" => [Gem.dir, Gem.user_dir].join(File::PATH_SEPARATOR) }
|
|
+
|
|
+ gem 'foo'
|
|
+
|
|
+ Gem.load_plugins
|
|
+
|
|
+ assert_equal %w[plugin], PLUGINS_LOADED
|
|
+ end
|
|
+
|
|
def test_load_env_plugins
|
|
with_plugin('load') { Gem.load_env_plugins }
|
|
assert_equal :loaded, TEST_PLUGIN_LOAD rescue nil
|