[DRE-commits] [ruby-rspec-core] 01/02: fix file_path metadata, taking into account Debian installation path for rspec

[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-rspec-core.

commit 983bcee6898bef36f450c984e9edb8a8178dd7c3
Author: Cédric Boutillier <boutil at debian.org>
Date:   Thu Feb 6 13:26:25 2014 +0100

    fix file_path metadata, taking into account Debian installation path for rspec
---
 .../patches/fix_first_caller_from_outside_rspec.patch | 19 +++++++++++++++++++
 debian/patches/series                                 |  1 +
 2 files changed, 20 insertions(+)

diff --git a/debian/patches/fix_first_caller_from_outside_rspec.patch b/debian/patches/fix_first_caller_from_outside_rspec.patch
new file mode 100644
index 0000000..636fb3e
--- /dev/null
+++ b/debian/patches/fix_first_caller_from_outside_rspec.patch
@@ -0,0 +1,19 @@
+Description: adapt first_caller_from_outside_rspec to installation path on Debian
+ the path of RSpec in Debian does not match /lib/rspec/core
+ This was causing file_path metadata to be wrong, breaking file_path filters.
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=737734
+Author: Cédric Boutillier <boutil at debian.org>
+Forwarded: not-needed
+Last-Update: 2014-02-06
+
+--- a/lib/rspec/core/metadata.rb
++++ b/lib/rspec/core/metadata.rb
+@@ -88,7 +88,7 @@
+         end
+ 
+         def first_caller_from_outside_rspec
+-          self[:caller].detect {|l| l !~ /\/lib\/rspec\/core/}
++          self[:caller].detect {|l| l !~ /\/(lib|vendor_ruby)\/rspec\/core/}
+         end
+ 
+         def method_description_after_module?(parent_part, child_part)
diff --git a/debian/patches/series b/debian/patches/series
index bcbb2d2..d154bf8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ remove-rubygems-stuff-in-tests.patch
 remove-aruba-stuff-in-tests.patch
 fix-commandline-test.patch
 ruby_test_bin.patch
+fix_first_caller_from_outside_rspec.patch

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