[DRE-commits] [ruby-minitest] 07/08: drop load_plugins_ruby18.patch

[Cédric Boutillier]

This is an automated email from the git hooks/post-receive script.

boutil pushed a commit to branch master
in repository ruby-minitest.

commit 3de7848c3a6ebb798170ec2b4f6e6bccd47f766a
Author: Cédric Boutillier <boutil at debian.org>
Date:   Mon Dec 9 16:15:23 2013 +0100

    drop load_plugins_ruby18.patch
---
 debian/patches/load_plugins_ruby18.patch | 28 ----------------------------
 debian/patches/series                    |  1 -
 2 files changed, 29 deletions(-)

diff --git a/debian/patches/load_plugins_ruby18.patch b/debian/patches/load_plugins_ruby18.patch
deleted file mode 100644
index 7f0c6d6..0000000
--- a/debian/patches/load_plugins_ruby18.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: make load_plugins work with Ruby1.8 and without rubygems
- Without Gem.find_files, it will only search for MiniTest plugins in the
- $LOAD_PATH. To activate the original version, require "rubygems".
- It needs to work to load at least the pride_plugin shipped with MiniTest.
-Author: Cédric Boutillier <boutil at debian.org>
-Forwarded: not-needed
-Last-Update: 2013-06-12
-
---- a/lib/minitest.rb
-+++ b/lib/minitest.rb
-@@ -69,8 +69,16 @@
-     return unless self.extensions.empty?
- 
-     seen = {}
-+    if RUBY_VERSION =~ /1\.8/ and not (defined?(Gem) and Gem.method_defined?(:find_files))
-+      # code inspired from Gem.find_files
-+      list_plugins=$LOAD_PATH.map { |load_path|
-+        Dir[File.expand_path "minitest/*_plugin.rb", load_path]
-+      }.flatten.select { |file| File.file? file.untaint }.uniq
-+    else
-+      list_plugins=Gem.find_files("minitest/*_plugin.rb")
-+    end
- 
--    Gem.find_files("minitest/*_plugin.rb").each do |plugin_path|
-+    list_plugins.each do |plugin_path|
-       name = File.basename plugin_path, "_plugin.rb"
- 
-       next if seen[name]
diff --git a/debian/patches/series b/debian/patches/series
index 23ec7ea..e945768 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 disable-require-rubygems
 disable-some-tests
-load_plugins_ruby18.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-minitest.git