[DRE-commits] [ruby-zentest] 02/03: expand autodiscovery to autotest/discover*.rb

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository ruby-zentest.

commit 7a2ae9eb221ded2cc07ae5f74ec5672cf94deca4
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Tue Mar 3 23:08:33 2015 -0300

    expand autodiscovery to autotest/discover*.rb
---
 debian/changelog                                   |  9 ++++++++
 ...nd-autodiscovery-to-autotest-discover-.rb.patch | 25 ++++++++++++++++++++++
 debian/patches/remove-require-rubygems.patch       |  2 +-
 debian/patches/series                              |  1 +
 4 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 46f8bc9..062bfed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+ruby-zentest (4.11.0-1) experimental; urgency=medium
+
+  * Team upload
+  * New upstream release
+  * 0001-Expand-autodiscovery-to-autotest-discover-.rb.patch: expand
+    autodiscovery to autotest/discover*.rb
+
+ -- Antonio Terceiro <terceiro at debian.org>  Tue, 03 Mar 2015 23:02:22 -0300
+
 ruby-zentest (4.9.5-1) unstable; urgency=low
 
   * New Upstream release
diff --git a/debian/patches/0001-Expand-autodiscovery-to-autotest-discover-.rb.patch b/debian/patches/0001-Expand-autodiscovery-to-autotest-discover-.rb.patch
new file mode 100644
index 0000000..5507bdd
--- /dev/null
+++ b/debian/patches/0001-Expand-autodiscovery-to-autotest-discover-.rb.patch
@@ -0,0 +1,25 @@
+From 1fa37890c1af8ec0635a47c0900af8258aef01ad Mon Sep 17 00:00:00 2001
+From: Antonio Terceiro <terceiro at softwarelivre.org>
+Date: Tue, 3 Mar 2015 23:04:48 -0300
+Subject: [PATCH] Expand autodiscovery to autotest/discover*.rb
+
+This allows projects to provide multiple auto discovery files for better
+organization
+
+Submitted upstream: https://github.com/seattlerb/zentest/pull/65
+
+---
+ lib/autotest.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/lib/autotest.rb
++++ b/lib/autotest.rb
+@@ -234,7 +234,7 @@ class Autotest
+     hacky_discovery = Gem::Specification.any? { |s| s.name =~ /^rspec/ }
+     $: << '.' if hacky_discovery
+ 
+-    Gem.find_files("autotest/discover").each do |f|
++    Gem.find_files("autotest/discover*").each do |f|
+       load f
+     end
+ 
diff --git a/debian/patches/remove-require-rubygems.patch b/debian/patches/remove-require-rubygems.patch
index 49216dc..f15109f 100644
--- a/debian/patches/remove-require-rubygems.patch
+++ b/debian/patches/remove-require-rubygems.patch
@@ -7,7 +7,7 @@ Last-Update: 2012-10-25
 
 --- a/lib/autotest.rb
 +++ b/lib/autotest.rb
-@@ -201,7 +201,8 @@
+@@ -205,7 +205,8 @@ class Autotest
    #
  
    def self.autodiscover
diff --git a/debian/patches/series b/debian/patches/series
index 91ffc24..458da31 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 remove-require-rubygems.patch
+0001-Expand-autodiscovery-to-autotest-discover-.rb.patch

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